From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 16 十月 2024 15:59:38 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 270 +++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 206 insertions(+), 64 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 44f211d..3a29e32 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 @@ -1,5 +1,6 @@ package com.doumee.service.business.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -10,6 +11,7 @@ import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; +import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.Utils; import com.doumee.dao.business.HiddenDangerLogMapper; import com.doumee.dao.business.HiddenDangerMapper; @@ -17,12 +19,17 @@ import com.doumee.dao.business.MemberMapper; import com.doumee.dao.business.model.*; import com.doumee.dao.system.MultifileMapper; +import com.doumee.dao.system.join.NoticesJoinMapper; import com.doumee.dao.system.model.Multifile; +import com.doumee.dao.system.model.Notices; import com.doumee.service.business.HiddenDangerLogService; 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.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -39,10 +46,13 @@ @Autowired private HiddenDangerMapper hiddenDangerMapper; + @Autowired private MultifileMapper multifileMapper; + @Autowired private SystemDictDataBiz systemDictDataBiz; + @Autowired private MemberMapper memberMapper; @@ -53,6 +63,9 @@ private HiddenDangerLogMapper hiddenDangerLogMapper; + @Autowired + private NoticesJoinMapper noticesJoinMapper; + @Override public Integer create(HiddenDanger hiddenDanger) { if(Objects.isNull(hiddenDanger) @@ -60,16 +73,24 @@ || Objects.isNull(hiddenDanger.getAreaId()) || Objects.isNull(hiddenDanger.getCateId()) || Objects.isNull(hiddenDanger.getApplyCheckUserId()) + || Objects.isNull(hiddenDanger.getCheckUserId()) || Objects.isNull(hiddenDanger.getSubmitTime()) || StringUtils.isBlank(hiddenDanger.getContent()) ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } + hiddenDanger.setMemberId(hiddenDanger.getLoginUserInfo().getMemberId()); 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(),"鏈煡璇㈠埌闅愭偅鍖哄煙"); + } + + HiddenDangerParam hiddenDangerCate = hiddenDangerParamMapper.selectById(hiddenDanger.getCateId()); + if(Objects.isNull(hiddenDangerCate)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅绫诲瀷"); } hiddenDanger.setCreator(hiddenDanger.getLoginUserInfo().getId()); hiddenDanger.setAreaName(hiddenDangerParam.getName()); @@ -78,17 +99,22 @@ || 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); - List<Multifile> multifiles = hiddenDanger.getMultifileList(); + List<Multifile> multifiles = hiddenDanger.getSubmitFileList(); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifiles)){ for (int i = 0; i < multifiles.size(); i++) { Multifile multifile = multifiles.get(i); @@ -96,11 +122,52 @@ 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); } } + String title = "[闅愭偅闅忔墜鎷峕鎻愭姤浜�-"+hiddenDanger.getLoginUserInfo().getRealname(); + //json鏁版嵁 + Map<String,Object> jsonMap = new HashMap<>(); + jsonMap.put("area", "鍙戠幇鍖哄煙:" + hiddenDangerParam.getName()); + jsonMap.put("cate", "闅愭偅绫诲瀷:" + hiddenDangerCate.getName()); + jsonMap.put("sTime", "鍙戠幇鏃堕棿:" + DateUtil.DateToStr(hiddenDanger.getSubmitTime() , "yyyy-MM-dd HH:mm")); + //榛樿鐢熸垚涓�鏉� 鐢宠浜虹殑鏁版嵁 鏍囪鍒犻櫎鐘舵�佺敤浜庡鐞嗗埌 浠诲姟涓績锛堟垜鍙戣捣锛変娇鐢� + Notices createNotices = new Notices(); + createNotices.setCreateDate(new Date()); + createNotices.setIsdeleted(Constants.ONE); + createNotices.setObjId(hiddenDanger.getId()); + createNotices.setObjType(Constants.THREE); + createNotices.setType(Constants.THREE); + createNotices.setTitle(title); + createNotices.setParam1(JSONObject.toJSONString(jsonMap)); + createNotices.setStatus(Constants.ZERO); + createNotices.setReaded(Constants.ZERO); + createNotices.setSendacopy(Constants.ZERO); + createNotices.setParam2("0"); + createNotices.setParam3(hiddenDanger.getLoginUserInfo().getMemberId().toString()); + createNotices.setInfo("寰�"+member.getName()+"澶勭悊"); + noticesJoinMapper.insert(createNotices); + + //瀛樺偍澶勭悊浜虹殑閫氱煡娑堟伅 + Notices notices = new Notices(); + notices.setId(null); + notices.setCreateDate(new Date()); + notices.setIsdeleted(Constants.ZERO); + notices.setTitle(title); + notices.setParam1(JSONObject.toJSONString(jsonMap)); + notices.setParam2("0"); + notices.setObjId(hiddenDanger.getId()); + notices.setObjType(Constants.THREE); + notices.setType(Constants.THREE); + notices.setEditDate(new Date()); + notices.setUserId(hiddenDanger.getCheckUserId()); + notices.setStatus(Constants.ZERO); + notices.setSendacopy(Constants.ZERO); + notices.setReaded(Constants.ZERO); + notices.setInfo("寰�"+member.getName()+"澶勭悊"); + noticesJoinMapper.insert(notices); return hiddenDanger.getId(); @@ -252,9 +319,10 @@ .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()) + .like(pageWrap.getModel().getCompanyName() != null,"t4.company_name_path",pageWrap.getModel().getCompanyName()) .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName()) .or().like(Member::getPhone,pageWrap.getModel().getMemberName())) @@ -283,78 +351,42 @@ @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); + //澶勭悊寰呭姙淇℃伅 + noticesJoinMapper.update(null,new UpdateWrapper<Notices>() + .lambda() + .set(Notices::getReaded,Constants.ONE) + .set(Notices::getStatus,Constants.ONE) + .set(Notices::getParam2,hiddenDanger.getStatus()) + .set(Notices::getParam4,hiddenDanger.getLoginUserInfo().getMemberId()) + .eq(Notices::getObjId,hiddenDanger.getId()) + .eq(Notices::getObjType,Constants.THREE) + .eq(Notices::getUserId,hiddenDanger.getLoginUserInfo().getMemberId()) + ); + } - - @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); } @@ -363,16 +395,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.insert(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()); @@ -381,10 +497,36 @@ 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); + Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>() + .lambda() + .eq(Notices::getObjId,hiddenDanger.getId()) + .eq(Notices::getObjType,Constants.THREE) + .eq(Notices::getUserId,hiddenDanger.getLoginUserInfo().getMemberId()) + .last(" limit 1 ") + ); + if(Objects.nonNull(notices)){ + Notices newNotices = new Notices(); + BeanUtils.copyProperties(notices,newNotices); + newNotices.setId(null); + newNotices.setCreateDate(new Date()); + newNotices.setParam2("0"); + newNotices.setUserId(hiddenDanger.getCheckUserId()); + newNotices.setInfo("寰�"+member.getName()+"澶勭悊"); + noticesJoinMapper.insert(newNotices); + notices.setStatus(Constants.ONE); + notices.setParam2("3"); + notices.setEditDate(new Date()); + notices.setReaded(Constants.ONE); + notices.setInfo("寰�"+member.getName()+"澶勭悊"); + noticesJoinMapper.updateById(notices); + } } -- Gitblit v1.9.3