From a71874bb31fc0ca16c81ebcd6ef9bd9d27dec030 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 01 十二月 2025 09:12:27 +0800
Subject: [PATCH] 功能开发
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java | 5 ++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java | 6 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java | 59 +++++++++++++++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 18 +++++----
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java | 3 +
6 files changed, 80 insertions(+), 12 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 d2a4ce5..3726846 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
@@ -108,6 +108,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/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java
index c0d9d91..5c8dec6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java
@@ -65,6 +65,9 @@
@Autowired
private JkVersionService jkVersionService;
+ @Autowired
+ private JkCabinetGridServiceImpl impl;
+
@LoginNoRequired
@ApiOperation("鑾峰彇閽ュ寵鏌淎PK鏈�鏂扮増鏈�")
@GetMapping("/getLastVersion")
@@ -243,9 +246,6 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
-
- @Autowired
- private JkCabinetGridServiceImpl impl;
@LoginNoRequired
@ApiOperation("testTimeOutBackAlarm")
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..2fbd3f0 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,7 @@
@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/dao/business/vo/CabinetInfoVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java
index f4f9f59..c8176a1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java
@@ -70,4 +70,7 @@
@ApiModelProperty(value = "閰掔簿妫�娴嬮厤缃�")
private CabinetConfigDataVO cabinetConfigDataVO;
+
+ @ApiModelProperty(value = "婵�娲绘枃浠跺湴鍧�")
+ private String activateFileUrl;
}
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..1292637 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;
@@ -61,6 +63,9 @@
@Autowired
private MemberMapper memberMapper;
+
+ @Autowired
+ private MultifileMapper multifileMapper;
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -113,6 +118,17 @@
jkCabinet.setAuthMemberId(String.join(",",jkCabinet.getAuthMemberIdList()));
jkCabinetMapper.insert(jkCabinet);
this.createGrid(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);
+ }
+
return jkCabinet.getId();
}
@@ -224,6 +240,23 @@
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 +307,19 @@
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;
}
@@ -585,6 +631,19 @@
categoryList.stream().map(i->i.getImgurlFull()).collect(Collectors.toList())
);
}
+
+
+ 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)&&StringUtils.isNotBlank(multifile.getFileurl())){
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.ACTIVATE).getCode();
+ cabinetInfoVO.setActivateFileUrl(prefixUrl + multifile.getFileurl());
+ }
return cabinetInfoVO;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 4ecfa18..cdc2091 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -175,7 +175,7 @@
Member insert = initAddMemberModel(member,loginUserInfo);
//娴峰悍浜哄憳鏂板涓氬姟
try {
- if(dealHkUserBiz(insert)){
+// if(dealHkUserBiz(insert)){
memberMapper.insert(insert);
//鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
// if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
@@ -184,9 +184,9 @@
//澶勭悊鍩硅鏈夋晥鏈熶笟鍔�
dealTrainTIme(member,0,loginUserInfo);
// }
- }else{
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
- }
+// }else{
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+// }
}catch (BusinessException e){
//濡傛灉鍙戠敓寮傚父锛屽垹闄ゅ凡缁忓垱寤虹殑浜哄憳淇℃伅
deleteHkUserBiz(new String[]{insert.getHkId()});
@@ -199,6 +199,7 @@
}
return insert;
}
+
public static SystemUser createSystemUser(Member insert,SystemDictDataBiz systemDictDataBiz) {
SystemUser user = new SystemUser();
// 鐢熸垚瀵嗙爜鐩�
@@ -397,9 +398,9 @@
if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭凡琚垹闄わ紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
}
- if(StringUtils.isBlank(company.getHkId())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭湭鍚屾瀹夐槻骞冲彴锛岃鍏堝墠寰�銆愮粍缁囩鐞嗐�戣彍鍗曡繘琛岀淮鎶わ紒");
- }
+// if(StringUtils.isBlank(company.getHkId())){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ粍缁囦俊鎭湭鍚屾瀹夐槻骞冲彴锛岃鍏堝墠寰�銆愮粍缁囩鐞嗐�戣彍鍗曡繘琛岀淮鎶わ紒");
+// }
member.setHkOrgId(company.getHkId());
member.setCompanyType(company.getType());
if(Constants.equalsInteger(company.getType(),Constants.ONE)){
@@ -1555,7 +1556,8 @@
.eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
.orderByAsc(Company::getSortnum)
- .orderByAsc(Position::getSortnum);
+ .orderByAsc(Position::getSortnum)
+ .orderByAsc(Member::getId);
// .orderByAsc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getPinyin)
// .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
--
Gitblit v1.9.3