From 2deac0844f4a49455129dfa8e3a76e1c509f094d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 06 十一月 2025 11:17:52 +0800
Subject: [PATCH] 钥匙柜信息处理
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 1 +
server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java | 4 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2 +-
5 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index ce60ff7..3c92e2c 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -107,6 +107,7 @@
// 璁垮鏉ヨ閰嶇疆
public static final String VISIT_CONFIG = "VISIT_CONFIG";
public static final String MEMBER_IMG = "MEMBER_IMG";
+ public static final String ACTIVATE = "ACTIVATE";
public static final String PLATFORM_EVENT_IMG = "PLATFORM_EVENT_IMG";
public static final String VISIT_NOTICE = "VISIT_NOTICE";
public static final String TIME_OUT_CONFIG = "TIME_OUT_CONFIG";
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java b/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
index ca29dc8..1467c96 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
@@ -63,8 +63,8 @@
@ExcelColumn(name="绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬")
private Integer type;
- @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0闅愭偅鐜板満鎯呭喌 1闅愭偅澶勭悊鍓嶆儏鍐� 2闅愭偅澶勭悊鍚庢儏鍐� 3闅愭偅閫�鍥炶鏄� 4浼氳瀹ゆ枃浠�", example = "1")
- @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0闅愭偅鐜板満鎯呭喌 1闅愭偅澶勭悊鍓嶆儏鍐� 2闅愭偅澶勭悊鍚庢儏鍐� 3闅愭偅閫�鍥炶鏄� 4浼氳瀹ゆ枃浠�")
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0闅愭偅鐜板満鎯呭喌 1闅愭偅澶勭悊鍓嶆儏鍐� 2闅愭偅澶勭悊鍚庢儏鍐� 3闅愭偅閫�鍥炶鏄� 4浼氳瀹ゆ枃浠� 5閽ュ寵鏌滄縺娲绘枃浠�", example = "1")
+ @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0闅愭偅鐜板満鎯呭喌 1闅愭偅澶勭悊鍓嶆儏鍐� 2闅愭偅澶勭悊鍚庢儏鍐� 3闅愭偅閫�鍥炶鏄� 4浼氳瀹ゆ枃浠� 5閽ュ寵鏌滄縺娲绘枃浠�")
private Integer objType;
@ApiModelProperty(value = "鏂囦欢鍦板潃")
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 86e11a3..9dc10e9 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: test
+ active: dev
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
index 2c437fd..aad438a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.system.model.Multifile;
import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -163,5 +164,8 @@
@TableField(exist = false)
private List<String> authMemberIdList;
+ @ApiModelProperty(value = "婵�娲绘枃浠�")
+ @TableField(exist = false)
+ private Multifile activateFile;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
index 7f25156..e94500a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
@@ -12,6 +12,8 @@
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.*;
+import com.doumee.dao.system.MultifileMapper;
+import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
@@ -46,6 +48,9 @@
@Autowired
private JkCabinetMapper jkCabinetMapper;
+
+ @Autowired
+ private MultifileMapper multifileMapper;
@Autowired
private CategoryMapper categoryMapper;
@@ -112,6 +117,18 @@
jkCabinet.setManagerId(String.join(",",jkCabinet.getManagerIdList()));
jkCabinet.setAuthMemberId(String.join(",",jkCabinet.getAuthMemberIdList()));
jkCabinetMapper.insert(jkCabinet);
+
+ if(Objects.nonNull(jkCabinet.getActivateFile())){
+ Multifile multifile = jkCabinet.getActivateFile();
+ multifile.setCreateDate(new Date());
+ multifile.setEditDate(multifile.getCreateDate());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjId(jkCabinet.getId());
+ multifile.setObjType(Constants.FIVE);
+ multifileMapper.insert(multifile);
+ }
+
+
this.createGrid(jkCabinet);
return jkCabinet.getId();
}
@@ -224,6 +241,21 @@
jkCabinet.setManagerId(String.join(",",jkCabinet.getManagerIdList()));
jkCabinet.setAuthMemberId(String.join(",",jkCabinet.getAuthMemberIdList()));
jkCabinetMapper.updateById(jkCabinet);
+ multifileMapper.update(new UpdateWrapper<Multifile>().lambda()
+ .set(Multifile::getIsdeleted,Constants.ONE)
+ .eq(Multifile::getObjType,Constants.FIVE)
+ .eq(Multifile::getObjId,jkCabinet.getId())
+ );
+ if(Objects.nonNull(jkCabinet.getActivateFile())){
+ Multifile multifile = jkCabinet.getActivateFile();
+ multifile.setId(null);
+ multifile.setCreateDate(new Date());
+ multifile.setEditDate(multifile.getCreateDate());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjId(jkCabinet.getId());
+ multifile.setObjType(Constants.FIVE);
+ multifileMapper.insert(multifile);
+ }
}
@Override
@@ -274,6 +306,18 @@
jkCabinet.getAuthMemberId().split(",")
));
}
+ Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>()
+ .lambda()
+ .eq(Multifile::getObjType,Constants.FIVE)
+ .eq(Multifile::getObjId,jkCabinet.getId())
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .last(" limit 1 "));
+ if(Objects.nonNull(multifile)){
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.ACTIVATE).getCode();
+ multifile.setFileurlFull(prefixUrl + multifile.getFileurl());
+ jkCabinet.setActivateFile(multifile);
+ }
return jkCabinet;
}
--
Gitblit v1.9.3