From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java
index 7bc2a7c..b3c9029 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java
@@ -48,7 +48,6 @@
@Override
public Integer create(JkVersion jkVersion) {
if(Objects.isNull(jkVersion)
- || Objects.isNull(jkVersion.getType())
|| Objects.isNull(jkVersion.getIsForce())
|| StringUtils.isBlank(jkVersion.getVersionInfo())
|| StringUtils.isBlank(jkVersion.getFileUrl())
@@ -56,7 +55,7 @@
|| StringUtils.isBlank(jkVersion.getName())
|| StringUtils.isBlank(jkVersion.getContent())
){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
LoginUserInfo loginUserInfo = jkVersion.getLoginUserInfo();
jkVersion.setCreateDate(new Date());
@@ -64,6 +63,7 @@
jkVersion.setEditDate(jkVersion.getCreateDate());
jkVersion.setEditor(jkVersion.getCreator());
jkVersion.setIsdeleted(Constants.ZERO);
+ jkVersion.setType(Constants.ZERO);
jkVersionMapper.insert(jkVersion);
return jkVersion.getId();
}
@@ -94,7 +94,6 @@
public void updateById(JkVersion jkVersion) {
if(Objects.isNull(jkVersion)
|| Objects.isNull(jkVersion.getId())
- || Objects.isNull(jkVersion.getType())
|| Objects.isNull(jkVersion.getIsForce())
|| StringUtils.isBlank(jkVersion.getVersionInfo())
|| StringUtils.isBlank(jkVersion.getFileUrl())
@@ -177,4 +176,25 @@
QueryWrapper<JkVersion> wrapper = new QueryWrapper<>(jkVersion);
return jkVersionMapper.selectCount(wrapper);
}
+
+
+
+ @Override
+ public JkVersion getLastVersion(){
+ JkVersion jkVersion = jkVersionMapper.selectOne(new QueryWrapper<JkVersion>().lambda()
+ .eq(JkVersion::getIsdeleted,Constants.ZERO)
+ .eq(JkVersion::getType,Constants.ZERO)
+ .orderByDesc(JkVersion::getVersionNum)
+ .last("limit 1")
+ );
+ if(Objects.nonNull(jkVersion)){
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.APP_FILE).getCode();
+ jkVersion.setFullFileUrl(path + jkVersion.getFileUrl());
+ }
+ return jkVersion;
+ }
+
+
+
}
--
Gitblit v1.9.3