From a104131e652172f82f92f57c04bd94cdfd4c5dad Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 11 十二月 2024 17:51:56 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 90 ++++++++++++++++++++++++++++++++-------------
1 files changed, 64 insertions(+), 26 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 55fbde4..26effca 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
@@ -23,9 +23,11 @@
import com.doumee.dao.business.model.*;
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.dao.system.model.SystemUser;
import com.doumee.service.business.HiddenDangerService;
import com.doumee.service.business.third.EmayService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -54,6 +56,9 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private SystemUserMapper systemUserMapper;
@Autowired
private MemberMapper memberMapper;
@@ -112,6 +117,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,7 +196,6 @@
noticesJoinMapper.insert(notices);
- WxPlatNotice wxPlatNotice = new WxPlatNotice();
if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getPhone())){
//鍙戦�佺煭淇￠�氱煡
SmsEmailServiceImpl.sendHiddenDangerSms(systemDictDataBiz,
@@ -200,23 +205,33 @@
);
}
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ SystemUser systemUser = systemUserMapper.selectById(hiddenDanger.getLoginUserInfo().getId());
+ hiddenDanger.setMemberName(systemUser.getRealname());
//鎻愪氦浜虹殑寰俊鍏紬鍙烽�氱煡
- if(Objects.nonNull(createMember)&&StringUtils.isNotBlank(createMember.getOpenid())){
- wxPlatNotice.sendHiddenDangerUploadTemplateNotice(
+ 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(createMember.getOpenid().split(",")));
- }
- //澶勭悊浜虹殑寰俊鍏紬鍙烽�氱煡
- if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
- wxPlatNotice.sendHiddenDangerUploadTemplateNotice(
- wxNoticeConfigMapper,hiddenDanger,
- WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(",")));
+ 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();
}
@@ -422,6 +437,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);
@@ -444,26 +465,29 @@
.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(","))
);
}
}
- Member createMember = memberMapper.selectById(hiddenDanger.getMemberId());
+ model.setCheckorName(hiddenDanger.getLoginUserInfo().getRealname());
+ model.setMemberName(memberUser.getRealname());
//澶勭悊浜虹殑寰俊鍏紬鍙烽�氱煡
- if(Objects.nonNull(createMember)&&StringUtils.isNotBlank(createMember.getOpenid())){
+ if(Objects.nonNull(memberUser)&&StringUtils.isNotBlank(memberUser.getOpenid())){
WxPlatNotice wxPlatNotice = new WxPlatNotice();
- wxPlatNotice.sendHiddenDangerDealTemplateNotice(
- wxNoticeConfigMapper,hiddenDanger,
+ wxPlatNotice.sendHiddenDangerDealTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,model,
WxPlatConstants.hiddenDangerContent.hiddenDangerDeal,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(createMember.getOpenid().split(",")));
+ Arrays.asList(memberUser.getOpenid().split(",")));
}
}
@@ -577,6 +601,11 @@
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(),"鏈煡璇㈠埌闅愭偅绫诲瀷");
+ }
+ hiddenDanger.setCategoryName(hiddenDangerCate.getName());
hiddenDanger.setEditor(hiddenDanger.getLoginUserInfo().getId());
hiddenDanger.setEditDate(new Date());
hiddenDangerMapper.updateById(hiddenDanger);
@@ -615,24 +644,33 @@
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());
+ 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(member)&&StringUtils.isNotBlank(member.getOpenid())){
+ if(Objects.nonNull(checkUser)&&StringUtils.isNotBlank(checkUser.getOpenid())){
WxPlatNotice wxPlatNotice = new WxPlatNotice();
- wxPlatNotice.sendHiddenDangerUploadTemplateNotice(
+ wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,hiddenDanger,
WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
- Arrays.asList(member.getOpenid().split(",")));
+ Arrays.asList(checkUser.getOpenid().split(",")));
}
}
--
Gitblit v1.9.3