From 39500edd05aced7a2d9debba5a243b756dd2a939 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 22 十月 2024 09:13:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 68 ++++++++++++++++++++++++++++++++--
1 files changed, 64 insertions(+), 4 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 3a29e32..474604d 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,15 +8,14 @@
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.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.SmsConstants;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.HiddenDangerLogMapper;
-import com.doumee.dao.business.HiddenDangerMapper;
-import com.doumee.dao.business.HiddenDangerParamMapper;
-import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.join.NoticesJoinMapper;
@@ -24,6 +23,7 @@
import com.doumee.dao.system.model.Notices;
import com.doumee.service.business.HiddenDangerLogService;
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;
@@ -65,6 +65,17 @@
@Autowired
private NoticesJoinMapper noticesJoinMapper;
+
+
+ @Autowired
+ private SmsConfigMapper smsConfigMapper;
+
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
+
+ @Autowired
+ private EmayService emayService;
+
@Override
public Integer create(HiddenDanger hiddenDanger) {
@@ -168,6 +179,17 @@
notices.setReaded(Constants.ZERO);
notices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.insert(notices);
+
+
+ if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getPhone())){
+ //鍙戦�佺煭淇￠�氱煡
+ SmsEmailServiceImpl.sendHiddenDangerSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,hiddenDangerMapper,hiddenDanger.getId(),
+ SmsConstants.hiddenDangerContent.hiddenDangerDealUser,
+ Arrays.asList(member.getPhone().split(","))
+ );
+ }
+
return hiddenDanger.getId();
@@ -301,6 +323,19 @@
.leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
.leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
.leftJoin("company t4 on t1.company_id=t4.id");
+
+ //鏁版嵁鏉冮檺寮�濮�--------------------start----------------
+ LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
+
+ if(userInfo!=null && userInfo.getCompanyIdList()!=null){
+ if( userInfo.getCompanyIdList().size() ==0){
+ //鍙兘鐪嬭嚜宸�
+ queryWrapper.eq(HiddenDanger::getCreator,userInfo.getId());
+ }else{
+ queryWrapper.in("t1.company_id" ,userInfo.getCompanyIdList());
+ }
+ }
+ //鏁版嵁鏉冮檺寮�濮�--------------------end----------------
queryWrapper
.eq(pageWrap.getModel().getId() != null, HiddenDanger::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, HiddenDanger::getCreator, pageWrap.getModel().getCreator())
@@ -378,6 +413,21 @@
.eq(Notices::getObjType,Constants.THREE)
.eq(Notices::getUserId,hiddenDanger.getLoginUserInfo().getMemberId())
);
+
+ if(Constants.equalsInteger(hiddenDanger.getStatus(),Constants.ONE)){
+ Member member = memberMapper.selectById(hiddenDanger.getMemberId());
+ if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getPhone())){
+ //鍙戦�佺煭淇￠�氱煡
+ SmsEmailServiceImpl.sendHiddenDangerSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,hiddenDangerMapper,hiddenDanger.getId(),
+ SmsConstants.hiddenDangerContent.hiddenDangerDealOver,
+ Arrays.asList(member.getPhone().split(","))
+ );
+ }
+
+ }
+
+
}
@@ -527,6 +577,16 @@
notices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.updateById(notices);
}
+
+
+ if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getPhone())){
+ //鍙戦�佺煭淇￠�氱煡
+ SmsEmailServiceImpl.sendHiddenDangerSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,hiddenDangerMapper,hiddenDanger.getId(),
+ SmsConstants.hiddenDangerContent.hiddenDangerDealUser,
+ Arrays.asList(member.getPhone().split(","))
+ );
+ }
}
--
Gitblit v1.9.3