From eb275c6d06d3c27fd30bbf4975d27c93d7f56eb2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十二月 2024 18:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 126 ++++++++++++++++++++++++++++++++---------
1 files changed, 97 insertions(+), 29 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index c453c2c..ab15d31 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -1,7 +1,6 @@
package com.doumee.service.business.impl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,13 +8,11 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.*;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.SmsEmailService;
@@ -27,7 +24,6 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.net.URLEncoder;
import java.util.*;
import java.util.Date;
@@ -46,6 +42,8 @@
@Autowired
@Lazy
private EmayService emayService;
+ @Autowired
+ private SmsConfigMapper smsConfigMapper;
@Value("${debug_model}")
private boolean debugModel;
@@ -96,28 +94,27 @@
)>=3){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝瓒呭嚭鍙戦�佹鏁帮紝璇风◢鍚庨噸璇曪紒");
}
-
String code = Constants.getRandom6Num();
-
- String content = systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode()+"楠岃瘉鐮佷负锛�"+code+"锛屾楠岃瘉鐮佹湁鏁堜负3鍒嗛挓銆傝鍕挎硠闇�";
-
-// boolean result= emayService.sendSingleSms(smsEmail.getPhone(),content);
- emayService.sendSmsByHk(smsEmail.getPhone(),content);
-// if(!result){
-// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐭俊楠岃瘉鐮佸彂閫佸け璐ワ紝璇风◢鍚庨噸璇曪紒");
-// }
-
- smsEmail.setRemark(code);
- smsEmail.setIsdeleted(Constants.ZERO);
- smsEmail.setCreateDate(new Date());
- smsEmail.setStatus(Constants.ZERO);
- smsEmail.setType(Constants.ZERO);
- smsEmail.setTitle("鐭俊楠岃瘉鐮�");
- smsEmail.setContent(content);
- smsEmail.setObjType(Constants.ZERO+"");
- smsEmailMapper.insert(smsEmail);
-
- return smsEmail.getId();
+ SmsConfig smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getObjType,
+ SmsConstants.inventCode).last(" limit 1 "));
+ //寮�鍚煭淇￠�氱煡
+ if(Objects.nonNull(smsConfig) || Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
+ if(StringUtils.isNotBlank(smsConfig.getContent())){
+ String content = smsConfig.getContent().replace("{楠岃瘉鐮亇",code);
+ emayService.sendSmsByHk(smsEmail.getPhone(),content);
+ smsEmail.setRemark(code);
+ smsEmail.setIsdeleted(Constants.ZERO);
+ smsEmail.setCreateDate(new Date());
+ smsEmail.setStatus(Constants.ZERO);
+ smsEmail.setType(Constants.ZERO);
+ smsEmail.setTitle("鐭俊楠岃瘉鐮�");
+ smsEmail.setContent(content);
+ smsEmail.setObjType(Constants.ZERO+"");
+ smsEmailMapper.insert(smsEmail);
+ return smsEmail.getId();
+ }
+ }
+ return null;
}
@@ -254,6 +251,32 @@
QueryWrapper<SmsEmail> wrapper = new QueryWrapper<>(smsEmail);
return smsEmailMapper.selectCount(wrapper);
}
+ @Override
+ public void sendWaitingSmsNotice(){
+ LambdaQueryWrapper<SmsEmail> wrapper = new LambdaQueryWrapper<SmsEmail>()
+ .eq(SmsEmail::getIsdeleted,Constants.ZERO)
+ .eq(SmsEmail::getStatus,Constants.TWO);
+ List<SmsEmail> smsEmails = smsEmailMapper.selectList(wrapper);
+ if(smsEmails!=null && smsEmails.size()>0){
+ for(SmsEmail model : smsEmails){
+ if(model.getPhone() == null){
+ model.setStatus(Constants.THREE);//鍙戦�佸け璐�
+ model.setRemark("鎵嬫満鍙蜂负绌猴紝鍙栨秷浠诲姟鍙戦�侊紒");
+ }else{
+ try {
+ emayService.sendSmsByHk(model.getPhone(),model.getContent());
+ model.setStatus(Constants.ONE);//鍙戦�佹垚鍔�
+ model.setRemark("鐭俊浠诲姟鍙戦�佹垚鍔�");
+ }catch (Exception e){
+ model.setStatus(Constants.THREE);//鍙戦�佸け璐�
+ model.setRemark("鐭俊浠诲姟鍙戦�佸け璐ワ紒"+e.getMessage());
+ }
+ }
+ model.setEditDate(new Date());
+ smsEmailMapper.updateById(model);
+ }
+ }
+ }
/**
* 璁垮鐢宠涓氬姟鐭俊閫氱煡
@@ -357,6 +380,53 @@
sendBusinessSms(emayService,smsEmailMapper,
auditUser,SmsConstants.platformBook,content,visits.getId());
}
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ public static void sendVisitReportTimeOutSms(SystemDictDataBiz systemDictDataBiz, EmayService emayService , com.doumee.dao.business.dao.SmsEmailMapper smsEmailMapper ,
+ SmsConfigMapper smsConfigMapper,
+ String objCode, String msg,List<String> mobiles){
+ try{
+ SmsConfig smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
+ objCode).last(" limit 1 "));
+ //寮�鍚煭淇￠�氱煡
+ if(Objects.nonNull(smsConfig) || Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
+ String content = systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode() + smsConfig.getContent();
+ //瓒呮椂鐗规畩澶勭悊
+ if(smsConfig.getCode().equals(SmsConstants.visitReportingContent.visitReportingTimeOutSignOutNum)){
+ //浠婃棩杩樻湁{鏈绂绘暟閲弣涓瀹㈡姤澶囪溅杈嗘湭绂诲満锛岃鍓嶅線PC绔煡鐪嬭缁嗕俊鎭��
+ content = content.replace("{鏈绂绘暟閲弣",msg);
+ sendBusinessSms(emayService,smsEmailMapper,
+ mobiles,SmsConstants.visitReport,content,0);
+ return;
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+ public static void sendVisitTimeOutSms(SystemDictDataBiz systemDictDataBiz, EmayService emayService , com.doumee.dao.business.dao.SmsEmailMapper smsEmailMapper ,
+ SmsConfigMapper smsConfigMapper,
+ String objCode, String msg,List<String> mobiles){
+ try{
+ SmsConfig smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
+ objCode).last(" limit 1 "));
+ //寮�鍚煭淇￠�氱煡
+ if(Objects.nonNull(smsConfig) || Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
+ String content = systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode() + smsConfig.getContent();
+ //瓒呮椂鐗规畩澶勭悊
+ if(smsConfig.getCode().equals(SmsConstants.visitContent.visitTimeOutSignOutNum)){
+ //浠婃棩杩樻湁{鏈绂绘暟閲弣涓瀹㈡姤澶囪溅杈嗘湭绂诲満锛岃鍓嶅線PC绔煡鐪嬭缁嗕俊鎭��
+ content = content.replace("{鏈绂绘暟閲弣",msg);
+ sendBusinessSms(emayService,smsEmailMapper,
+ mobiles,SmsConstants.visit,content,0);
+ return;
}
}
}catch (Exception e){
@@ -545,8 +615,6 @@
smsEmail.setObjId(objId);
smsEmailMapper.insert(smsEmail);
emayService.sendSmsByHk(phone,content);
-
-
}
}
--
Gitblit v1.9.3