From 7cdea6d16a8b9f74800792ea412ad8b51c4df7f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 17:48:38 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 77 insertions(+), 7 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 10ea27c..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;
@@ -46,10 +46,13 @@
@Autowired
private HiddenDangerMapper hiddenDangerMapper;
+
@Autowired
private MultifileMapper multifileMapper;
+
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
@Autowired
private MemberMapper memberMapper;
@@ -62,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) {
@@ -84,6 +98,7 @@
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(),"鏈煡璇㈠埌闅愭偅绫诲瀷");
@@ -143,7 +158,7 @@
createNotices.setSendacopy(Constants.ZERO);
createNotices.setParam2("0");
createNotices.setParam3(hiddenDanger.getLoginUserInfo().getMemberId().toString());
- createNotices.setInfo("澶勭悊涓�");
+ createNotices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.insert(createNotices);
//瀛樺偍澶勭悊浜虹殑閫氱煡娑堟伅
@@ -162,7 +177,19 @@
notices.setStatus(Constants.ZERO);
notices.setSendacopy(Constants.ZERO);
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();
@@ -296,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())
@@ -317,6 +357,7 @@
.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()))
@@ -367,10 +408,26 @@
.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())
);
+
+ 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(","))
+ );
+ }
+
+ }
+
+
}
@@ -448,7 +505,7 @@
}
}
if(fileList.size()>0){
- multifileMapper.insertBatchSomeColumn(fileList);
+ multifileMapper.insert(fileList);
}
}
@@ -509,14 +566,27 @@
BeanUtils.copyProperties(notices,newNotices);
newNotices.setId(null);
newNotices.setCreateDate(new Date());
- newNotices.setParam2("3");
+ 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);
}
+
+
+ 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