From 7b3b1cb76452258c3b554b6364ef5d50ed34542c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 11:40:14 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 194 ++++++++++++++++++++++++++++++------------------
1 files changed, 122 insertions(+), 72 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 347a265..7b8bb07 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -22,6 +22,7 @@
import com.doumee.service.business.HiddenDangerService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -60,6 +61,7 @@
|| Objects.isNull(hiddenDanger.getAreaId())
|| Objects.isNull(hiddenDanger.getCateId())
|| Objects.isNull(hiddenDanger.getApplyCheckUserId())
+ || Objects.isNull(hiddenDanger.getCheckUserId())
|| Objects.isNull(hiddenDanger.getSubmitTime())
|| StringUtils.isBlank(hiddenDanger.getContent())
){
@@ -67,6 +69,7 @@
}
hiddenDanger.setIsdeleted(Constants.ZERO);
hiddenDanger.setCreateDate(new Date());
+ hiddenDanger.setEditDate(new Date());
HiddenDangerParam hiddenDangerParam = hiddenDangerParamMapper.selectById(hiddenDanger.getAreaId());
if(Objects.isNull(hiddenDangerParam)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅鍖哄煙");
@@ -78,12 +81,17 @@
|| hiddenDangerParam.getMemberIds().indexOf(hiddenDanger.getApplyCheckUserId().toString())<0){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"闅愭偅鍖哄煙涓庡鐞嗕汉涓嶅尮閰�");
}
+ Member member = memberMapper.selectById(hiddenDanger.getCheckUserId());
+ if(Objects.isNull(member)|| !Constants.equalsInteger(member.getStatus(),Constants.ZERO) || Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌闅愭偅澶勭悊浜哄憳淇℃伅鎴栧凡琚鐢�");
+ }
hiddenDangerMapper.insert(hiddenDanger);
//瀛樺偍 鎿嶄綔鏃ュ織
HiddenDangerLog hiddenDangerLog = new HiddenDangerLog();
hiddenDangerLog.setIsdeleted(Constants.ZERO);
hiddenDangerLog.setCreateDate(new Date());
hiddenDangerLog.setCreator(hiddenDanger.getCreator());
+ hiddenDangerLog.setTitle("闅愭偅鎻愪氦");
hiddenDangerLog.setHiddenDangerId(hiddenDanger.getId());
hiddenDangerLog.setObjType(Constants.ZERO);
hiddenDangerLogMapper.insert(hiddenDangerLog);
@@ -96,7 +104,7 @@
multifile.setCreator(hiddenDanger.getCreator());
multifile.setIsdeleted(Constants.ZERO);
multifile.setObjId(hiddenDanger.getId());
- multifile.setObjType(Constants.multifileObjType.zero);
+ multifile.setObjType(Constants.MultiFile.HIDDEN_DANGER_SUBMIT.getKey());
multifile.setSortnum(i+1);
multifileMapper.insert(multifile);
}
@@ -148,20 +156,23 @@
.select("t1.name", HiddenDanger::getMemberName)
.select("t1.phone",HiddenDanger::getMemberPhone)
.select("t2.name",HiddenDanger::getCheckorName)
- .select("t3.phone",HiddenDanger::getCheckorPhone)
+ .select("t2.phone",HiddenDanger::getCheckorPhone)
.select("t4.company_name_path",HiddenDanger::getCompanyName);
queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId)
- .leftJoin("company t4 on t1.company_id=t4.id")
.leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
- .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId);
+ .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
+ .leftJoin("company t4 on t1.company_id=t4.id");
queryWrapper
.eq(HiddenDanger::getId, id).last("limit 1");
HiddenDanger model = hiddenDangerMapper.selectJoinOne(HiddenDanger.class,queryWrapper);
- if(model ==null || Constants.equalsObject(model.getIsdeleted(),Constants.ONE)){
+ if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
initFiles(model);
+
+
+
return model;
}
private void initFiles(HiddenDanger unionChange) {
@@ -172,8 +183,8 @@
,Constants.MultiFile.HIDDEN_DANGER_DEAL_AFTER.getKey()}))
.eq(Multifile::getIsdeleted,Constants.ZERO));
if(multifiles!=null){
- String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
- +systemDictDataBiz.queryByCode(Constants.OSS,Constants.HIDDEN_DANGER_FILE).getCode();
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.HIDDEN_DANGER_FILE).getCode();
for(Multifile f : multifiles){
if(StringUtils.isBlank(f.getFileurl())){
continue;
@@ -225,12 +236,12 @@
.select("t1.name", HiddenDanger::getMemberName)
.select("t1.phone",HiddenDanger::getMemberPhone)
.select("t2.name",HiddenDanger::getCheckorName)
- .select("t3.phone",HiddenDanger::getCheckorPhone)
+ .select("t2.phone",HiddenDanger::getCheckorPhone)
.select("t4.company_name_path",HiddenDanger::getCompanyName);
queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId)
- .leftJoin("company t4 on t1.company_id=t4.id")
.leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
- .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId);
+ .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
+ .leftJoin("company t4 on t1.company_id=t4.id");
queryWrapper
.eq(pageWrap.getModel().getId() != null, HiddenDanger::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, HiddenDanger::getCreator, pageWrap.getModel().getCreator())
@@ -249,7 +260,7 @@
.eq(pageWrap.getModel().getMemberId() != null, HiddenDanger::getMemberId, pageWrap.getModel().getMemberId())
.ge(pageWrap.getModel().getCheckDate() != null, HiddenDanger::getCheckDate, Utils.Date.getStart(pageWrap.getModel().getCheckDate()))
.le(pageWrap.getModel().getCheckDate() != null, HiddenDanger::getCheckDate, Utils.Date.getEnd(pageWrap.getModel().getCheckDate()))
- .eq(pageWrap.getModel().getChecklInfo() != null, HiddenDanger::getChecklInfo, pageWrap.getModel().getChecklInfo())
+ .eq(pageWrap.getModel().getCheckInfo() != null, HiddenDanger::getCheckInfo, pageWrap.getModel().getCheckInfo())
.eq(pageWrap.getModel().getCheckUserId() != null, HiddenDanger::getCheckUserId, pageWrap.getModel().getCheckUserId())
.eq(pageWrap.getModel().getAreaName() != null, HiddenDanger::getAreaName, pageWrap.getModel().getAreaName())
@@ -280,78 +291,30 @@
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void dealHiddenDanger(HiddenDanger hiddenDanger){
- if(Objects.isNull(hiddenDanger)
- || Objects.isNull(hiddenDanger.getId())
- || Objects.isNull(hiddenDanger.getDealTime())
- || Objects.isNull(hiddenDanger.getLoginUserInfo())
- || Objects.isNull(hiddenDanger.getStatus())
- ){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
- HiddenDanger model = hiddenDangerMapper.selectById(hiddenDanger.getId());
- if(Objects.isNull(model)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅鏁版嵁");
- }
- if (!model.getStatus().equals(Constants.ZERO)) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佸凡娴佽浆!");
- }
- if (!model.getCheckUserId().equals(hiddenDanger.getEditor())) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"澶勭悊浜洪潪褰撳墠浜哄憳锛�");
- }
- if(!(hiddenDanger.getStatus().equals(Constants.ONE)||hiddenDanger.getStatus().equals(Constants.TWO))){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓氬姟绫诲瀷閿欒锛�");
- }
- //鏁存敼鍓嶆枃浠�
- if(hiddenDanger.getStatus().equals(Constants.ONE)){
- List<Multifile> beforList = hiddenDanger.getDealBeforeFileList();
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(beforList)){
- for (int i = 0; i < beforList.size(); i++) {
- Multifile multifile = beforList.get(i);
- multifile.setCreateDate(new Date());
- multifile.setCreator(hiddenDanger.getEditor());
- multifile.setIsdeleted(Constants.ZERO);
- multifile.setObjId(hiddenDanger.getId());
- multifile.setObjType(Constants.multifileObjType.one);
- multifile.setSortnum(i+1);
- multifileMapper.insert(multifile);
- }
- }
- }
- List<Multifile> afterList = hiddenDanger.getDealAfterFileList();
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(afterList)){
- for (int i = 0; i < afterList.size(); i++) {
- Multifile multifile = afterList.get(i);
- multifile.setCreateDate(new Date());
- multifile.setCreator(hiddenDanger.getEditor());
- multifile.setIsdeleted(Constants.ZERO);
- multifile.setObjId(hiddenDanger.getId());
- multifile.setObjType(Constants.multifileObjType.two);
- multifile.setSortnum(i+1);
- multifileMapper.insert(multifile);
- }
- }
+ isParamValid(hiddenDanger);
+ dealFileBiz(hiddenDanger);
hiddenDanger.setEditor(hiddenDanger.getLoginUserInfo().getId());
hiddenDanger.setEditDate(new Date());
+ hiddenDanger.setCheckDate(hiddenDanger.getEditDate());
hiddenDangerMapper.updateById(hiddenDanger);
//瀛樺偍 鎿嶄綔鏃ュ織
HiddenDangerLog hiddenDangerLog = new HiddenDangerLog();
hiddenDangerLog.setIsdeleted(Constants.ZERO);
hiddenDangerLog.setCreateDate(new Date());
- hiddenDangerLog.setCreator(hiddenDanger.getCreator());
+ hiddenDangerLog.setCreator(hiddenDanger.getEditor());
hiddenDangerLog.setHiddenDangerId(hiddenDanger.getId());
+ hiddenDangerLog.setContent(hiddenDanger.getCheckInfo());
+ hiddenDangerLog.setTitle(hiddenDanger.getStatus().equals(Constants.ONE)?"闅愭偅澶勭悊":"闅愭偅閫�鍥�");
hiddenDangerLog.setObjType(hiddenDanger.getStatus().equals(Constants.ONE)?Constants.FOUR:Constants.TWO);
hiddenDangerLogMapper.insert(hiddenDangerLog);
}
-
- @Override
- @Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void transferHiddenDanger(HiddenDanger hiddenDanger){
+ private void isParamValid(HiddenDanger hiddenDanger) {
if(Objects.isNull(hiddenDanger)
|| Objects.isNull(hiddenDanger.getId())
|| Objects.isNull(hiddenDanger.getDealTime())
|| Objects.isNull(hiddenDanger.getLoginUserInfo())
- || Objects.isNull(hiddenDanger.getCheckUserId())
+ || Objects.isNull(hiddenDanger.getStatus())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -360,16 +323,100 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅鏁版嵁");
}
if (!model.getStatus().equals(Constants.ZERO)) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佸凡娴佽浆!");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佸凡娴佽浆,璇峰埛鏂版煡鐪�!");
}
- if (!model.getCheckUserId().equals(hiddenDanger.getEditor())) {
+ if (!model.getCheckUserId().equals(hiddenDanger.getLoginUserInfo().getMemberId())) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"澶勭悊浜洪潪褰撳墠浜哄憳锛�");
}
if(!(hiddenDanger.getStatus().equals(Constants.ONE)||hiddenDanger.getStatus().equals(Constants.TWO))){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓氬姟绫诲瀷閿欒锛�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇�,璇峰埛鏂版煡鐪嬶紒");
}
- if(model.getCheckUserId().equals(hiddenDanger.getCheckUserId())){
+ }
+
+ private void dealFileBiz(HiddenDanger hiddenDanger) {//鏁存敼鍓嶆枃浠�
+ List<Multifile> beforList = hiddenDanger.getDealBeforeFileList();
+ List<Multifile> fileList = new ArrayList<>();
+
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(beforList)){
+ boolean isTrue = false;
+ for (int i = 0; i < beforList.size(); i++) {
+ Multifile multifile = beforList.get(i);
+ if(StringUtils.isBlank(multifile.getFileurl())){
+ continue;
+ }
+ multifile.setCreateDate(new Date());
+ multifile.setCreator(hiddenDanger.getEditor());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjId(hiddenDanger.getId());
+ multifile.setCreator(hiddenDanger.getLoginUserInfo().getId());
+ multifile.setObjType(Constants.MultiFile.HIDDEN_DANGER_DEAL_BEFORE.getKey());
+ multifile.setSortnum(i+1);
+ fileList.add(multifile);
+ isTrue=true;
+ }
+ if(hiddenDanger.getStatus().equals(Constants.ONE) && !isTrue){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓澶勭悊鏁版嵁");
+ }
+ }
+ if(hiddenDanger.getStatus().equals(Constants.ONE)){
+ boolean isTrue = false;
+ List<Multifile> afterList = hiddenDanger.getDealAfterFileList();
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(afterList)){
+ for (int i = 0; i < afterList.size(); i++) {
+ Multifile multifile = afterList.get(i);
+ if(StringUtils.isBlank(multifile.getFileurl())){
+ continue;
+ }
+ multifile.setCreateDate(new Date());
+ multifile.setCreator(hiddenDanger.getEditor());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setCreator(hiddenDanger.getLoginUserInfo().getId());
+ multifile.setObjId(hiddenDanger.getId());
+ multifile.setObjType(Constants.MultiFile.HIDDEN_DANGER_DEAL_AFTER.getKey());
+ multifile.setSortnum(i+1);
+ fileList.add(multifile);
+ isTrue = true;
+ }
+ }
+ if(isTrue){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓澶勭悊鏁版嵁");
+ }
+ }
+ if(fileList.size()>0){
+ multifileMapper.insertBatchSomeColumn(fileList);
+ }
+ }
+
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void transferHiddenDanger(HiddenDanger hiddenDanger){
+ if(Objects.isNull(hiddenDanger)
+ || Objects.isNull(hiddenDanger.getId())
+ || Objects.isNull(hiddenDanger.getCheckUserId())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ HiddenDanger model = hiddenDangerMapper.selectJoinOne(HiddenDanger.class,new MPJLambdaWrapper<HiddenDanger>()
+ .selectAll(HiddenDanger.class)
+ .selectAs(Member::getName,HiddenDanger::getCheckorName)
+ .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
+ .eq(HiddenDanger::getId,hiddenDanger.getId()));
+ if(Objects.isNull(model)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅鏁版嵁");
+ }
+ if (!Constants.equalsInteger(model.getStatus(),Constants.ZERO)) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佸凡娴佽浆,璇峰埛鏂版煡鐪�!");
+ }
+ if (!Constants.equalsInteger(model.getCheckUserId(),hiddenDanger.getLoginUserInfo().getMemberId())) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"澶勭悊浜洪潪褰撳墠浜哄憳锛�");
+ }
+ if(Constants.equalsInteger(model.getCheckUserId(),hiddenDanger.getCheckUserId())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳硶杞氦缁欒嚜宸�");
+ }
+ Member member = memberMapper.selectById(hiddenDanger.getCheckUserId());
+ if(member == null || !Constants.equalsInteger(member.getType(), Constants.TWO) || Constants.equalsInteger(Constants.ONE,member.getIsdeleted())){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝杞氦浜轰俊鎭笉瀛樺湪锛岃鍒锋柊椤甸潰閲嶈瘯锛�");
}
hiddenDanger.setEditor(hiddenDanger.getLoginUserInfo().getId());
hiddenDanger.setEditDate(new Date());
@@ -378,7 +425,10 @@
HiddenDangerLog hiddenDangerLog = new HiddenDangerLog();
hiddenDangerLog.setIsdeleted(Constants.ZERO);
hiddenDangerLog.setCreateDate(new Date());
- hiddenDangerLog.setCreator(hiddenDanger.getCreator());
+ hiddenDangerLog.setCreator(hiddenDanger.getEditor());
+ hiddenDangerLog.setEditDate(hiddenDangerLog.getCreateDate());
+ hiddenDangerLog.setEditor(hiddenDanger.getCreator());
+ hiddenDangerLog.setTitle("杞氦缁�"+StringUtils.defaultString(member.getName()));
hiddenDangerLog.setHiddenDangerId(hiddenDanger.getId());
hiddenDangerLog.setObjType(Constants.ONE);
hiddenDangerLogMapper.insert(hiddenDangerLog);
--
Gitblit v1.9.3