From cc0d840070c24ceb20180a41f0323bdc0ee03347 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 13 一月 2025 16:25:49 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 100 insertions(+), 20 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 a920b7b..5908401 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
@@ -8,28 +8,34 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.SmsConstants;
import com.doumee.core.utils.Utils;
+import com.doumee.core.wx.wxPlat.WxPlatConstants;
+import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
+import com.doumee.dao.business.dao.SmsConfigMapper;
+import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.MultifileMapper;
+
+import com.doumee.dao.system.SystemUserMapper;
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.dao.system.model.SystemUser;
import com.doumee.service.business.HiddenDangerService;
import com.doumee.service.business.third.EmayService;
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;
@@ -54,6 +60,9 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
+ private SystemUserMapper systemUserMapper;
+
+ @Autowired
private MemberMapper memberMapper;
@Autowired
@@ -76,6 +85,9 @@
@Autowired
private EmayService emayService;
+ @Autowired
+ private WxNoticeConfigMapper wxNoticeConfigMapper;
+
@Override
public Integer create(HiddenDanger hiddenDanger) {
@@ -91,6 +103,10 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
hiddenDanger.setMemberId(hiddenDanger.getLoginUserInfo().getMemberId());
+ Member createMember = memberMapper.selectById(hiddenDanger.getMemberId());
+ if(Objects.isNull(createMember)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍒涘缓浜轰俊鎭�");
+ }
hiddenDanger.setIsdeleted(Constants.ZERO);
hiddenDanger.setCreateDate(new Date());
hiddenDanger.setEditDate(new Date());
@@ -103,6 +119,7 @@
if(Objects.isNull(hiddenDangerCate)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅绫诲瀷");
}
+ hiddenDanger.setCategoryName(hiddenDangerCate.getName());
hiddenDanger.setCreator(hiddenDanger.getLoginUserInfo().getId());
hiddenDanger.setAreaName(hiddenDangerParam.getName());
hiddenDanger.setStatus(Constants.ZERO);
@@ -190,8 +207,31 @@
);
}
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ SystemUser systemUser = systemUserMapper.selectById(hiddenDanger.getLoginUserInfo().getId());
+ hiddenDanger.setMemberName(systemUser.getRealname());
+ //鎻愪氦浜虹殑寰俊鍏紬鍙烽�氱煡
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
+ wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,hiddenDanger,
+ WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(systemUser.getOpenid().split(",")));
+ }
+ SystemUser checkUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId())
+ .last(" limit 1 "));
+ //澶勭悊浜虹殑寰俊鍏紬鍙烽�氱煡
+ if(Objects.nonNull(checkUser)&&StringUtils.isNotBlank(checkUser.getOpenid())){
+ wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,hiddenDanger,
+ WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(checkUser.getOpenid().split(",")));
+ }
return hiddenDanger.getId();
}
@@ -244,7 +284,7 @@
.leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
.leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
.leftJoin("company t4 on t1.company_id=t4.id")
- .leftJoin("company t5 on t.duty_company_id=t5.id");
+ .leftJoin("company t5 on t2.company_id=t5.id");
queryWrapper
.eq(HiddenDanger::getId, id).last("limit 1");
@@ -326,7 +366,7 @@
.leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
.leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
.leftJoin("company t4 on t1.company_id=t4.id")
- .leftJoin("company t5 on t.duty_company_id=t5.id");
+ .leftJoin("company t5 on t2.company_id=t5.id");
//鏁版嵁鏉冮檺寮�濮�--------------------start----------------
LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
@@ -354,7 +394,6 @@
.eq(pageWrap.getModel().getStatus() != null, HiddenDanger::getStatus, pageWrap.getModel().getStatus())
.eq(pageWrap.getModel().getApplyCheckUserId() != null, HiddenDanger::getApplyCheckUserId, pageWrap.getModel().getApplyCheckUserId())
.eq(pageWrap.getModel().getCateId() != null, HiddenDanger::getCateId, pageWrap.getModel().getCateId())
- .eq(pageWrap.getModel().getDutyCompanyId() != null, HiddenDanger::getDutyCompanyId, pageWrap.getModel().getDutyCompanyId())
.eq(pageWrap.getModel().getContent() != null, HiddenDanger::getContent, pageWrap.getModel().getContent())
.eq(pageWrap.getModel().getMemberId() != null, HiddenDanger::getMemberId, pageWrap.getModel().getMemberId())
.ge(pageWrap.getModel().getCheckDate() != null, HiddenDanger::getCheckDate, Utils.Date.getStart(pageWrap.getModel().getCheckDate()))
@@ -387,8 +426,6 @@
return hiddenDangerMapper.selectCount(wrapper);
}
-
-
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void dealHiddenDanger(HiddenDanger hiddenDanger){
@@ -398,6 +435,12 @@
hiddenDanger.setEditDate(new Date());
hiddenDanger.setCheckDate(hiddenDanger.getEditDate());
hiddenDangerMapper.updateById(hiddenDanger);
+ HiddenDanger model = hiddenDangerMapper.selectById(hiddenDanger.getId());
+ HiddenDangerParam hiddenDangerCate = hiddenDangerParamMapper.selectById(model.getCateId());
+ if(Objects.isNull(hiddenDangerCate)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅绫诲瀷");
+ }
+ model.setCategoryName(hiddenDangerCate.getName());
//瀛樺偍 鎿嶄綔鏃ュ織
HiddenDangerLog hiddenDangerLog = new HiddenDangerLog();
hiddenDangerLog.setIsdeleted(Constants.ZERO);
@@ -420,20 +463,30 @@
.eq(Notices::getUserId,hiddenDanger.getLoginUserInfo().getMemberId())
);
+ SystemUser memberUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getMemberId,model.getMemberId()));
if(Constants.equalsInteger(hiddenDanger.getStatus(),Constants.ONE)){
- Member member = memberMapper.selectById(hiddenDanger.getMemberId());
- if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getPhone())){
+ if(Objects.nonNull(memberUser) && StringUtils.isNotBlank(memberUser.getMobile())){
//鍙戦�佺煭淇￠�氱煡
SmsEmailServiceImpl.sendHiddenDangerSms(systemDictDataBiz,
emayService,smsEmailMapper,smsConfigMapper,hiddenDangerMapper,hiddenDanger.getId(),
SmsConstants.hiddenDangerContent.hiddenDangerDealOver,
- Arrays.asList(member.getPhone().split(","))
+ Arrays.asList(memberUser.getMobile().split(","))
);
}
-
}
-
-
+ model.setCheckorName(hiddenDanger.getLoginUserInfo().getRealname());
+ model.setMemberName(memberUser.getRealname());
+ //澶勭悊浜虹殑寰俊鍏紬鍙烽�氱煡
+ if(Objects.nonNull(memberUser)&&StringUtils.isNotBlank(memberUser.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendHiddenDangerDealTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,model,
+ WxPlatConstants.hiddenDangerContent.hiddenDangerDeal,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(memberUser.getOpenid().split(",")));
+ }
}
@@ -546,6 +599,12 @@
if(member == null || !Constants.equalsInteger(member.getType(), Constants.TWO) || Constants.equalsInteger(Constants.ONE,member.getIsdeleted())){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝杞氦浜轰俊鎭笉瀛樺湪锛岃鍒锋柊椤甸潰閲嶈瘯锛�");
}
+ HiddenDangerParam hiddenDangerCate = hiddenDangerParamMapper.selectById(model.getCateId());
+ if(Objects.isNull(hiddenDangerCate)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅绫诲瀷");
+ }
+ model.setCategoryName(hiddenDangerCate.getName());
+ hiddenDanger.setCategoryName(hiddenDangerCate.getName());
hiddenDanger.setEditor(hiddenDanger.getLoginUserInfo().getId());
hiddenDanger.setEditDate(new Date());
hiddenDangerMapper.updateById(hiddenDanger);
@@ -565,6 +624,7 @@
.eq(Notices::getObjId,hiddenDanger.getId())
.eq(Notices::getObjType,Constants.THREE)
.eq(Notices::getUserId,hiddenDanger.getLoginUserInfo().getMemberId())
+ .orderByDesc(Notices::getId)
.last(" limit 1 ")
);
if(Objects.nonNull(notices)){
@@ -584,15 +644,35 @@
noticesJoinMapper.updateById(notices);
}
-
- if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getPhone())){
+ SystemUser memberUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getMemberId,model.getMemberId()));
+ if(Objects.isNull(memberUser)||StringUtils.isBlank(memberUser.getRealname())){
+ return;
+ }
+ hiddenDanger.setMemberName(memberUser.getRealname());
+ model.setMemberName(memberUser.getRealname());
+ SystemUser checkUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId()));
+ if(Objects.nonNull(checkUser) && StringUtils.isNotBlank(checkUser.getMobile())){
//鍙戦�佺煭淇￠�氱煡
SmsEmailServiceImpl.sendHiddenDangerSms(systemDictDataBiz,
emayService,smsEmailMapper,smsConfigMapper,hiddenDangerMapper,hiddenDanger.getId(),
SmsConstants.hiddenDangerContent.hiddenDangerDealUser,
- Arrays.asList(member.getPhone().split(","))
+ Arrays.asList(checkUser.getMobile().split(","))
);
}
+
+ //澶勭悊浜虹殑寰俊鍏紬鍙烽�氱煡
+ if(Objects.nonNull(checkUser)&&StringUtils.isNotBlank(checkUser.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,model,
+ WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(checkUser.getOpenid().split(",")));
+ }
}
--
Gitblit v1.9.3