From 372871c9d42968a9caf69ca9a4e392f2d3eee865 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 25 十二月 2024 18:39:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 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 9fb8713..914e063 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
@@ -11,6 +11,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.*;
+import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
@@ -91,7 +92,7 @@
@Override
public Integer sendSms(SmsEmail smsEmail) {
- if(StringUtils.isBlank(smsEmail.getPhone())){
+ if(StringUtils.isBlank(smsEmail.getPhone()) || smsEmail.getPhone().length() != 11 ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
String nowDate = DateUtil.getFomartDate(new Date(),"yyyy-MM-dd HH:mm:ss");
@@ -267,18 +268,32 @@
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){
+ if(Constants.equalsInteger(model.getType(),Constants.ONE)){
+ if(model.getPhone() == null){
model.setStatus(Constants.THREE);//鍙戦�佸け璐�
- model.setRemark("鐭俊浠诲姟鍙戦�佸け璐ワ紒"+e.getMessage());
+ 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());
+ }
}
+ }else if(Constants.equalsInteger(model.getType(),Constants.TWO)){
+ if(DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss",model.getInfo()).getTime() < System.currentTimeMillis()){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendMeetTemplateNotice(systemDictDataBiz,model,systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode());
+ model.setStatus(Constants.ONE);//鍙戦�佹垚鍔�
+ model.setRemark("寰俊閫氱煡鍙戦�佹垚鍔�");
+ }else{
+ model.setStatus(Constants.THREE);//鍙戦�佹垚鍔�
+ model.setRemark("寰俊閫氱煡鍙戦�佸け璐�");
+ }
+ }else{
+ continue;
}
model.setEditDate(new Date());
smsEmailMapper.updateById(model);
@@ -368,19 +383,24 @@
//寮�鍚煭淇￠�氱煡
if(Objects.nonNull(smsConfig) || Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
String content = systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode() + smsConfig.getContent();
- Visits visits = visitsMapper.selectById(objId);
+ Visits visits = visitsMapper.selectJoinOne(Visits.class,new MPJLambdaWrapper<Visits>().selectAll(Visits.class)
+ .selectAs(SystemUser::getMobile,Visits::getCreateMobile)
+ .leftJoin(SystemUser.class,SystemUser::getMemberId,Visits::getMemberId)
+ .eq(Visits::getId,objId)
+ .last(" limit 1")
+ );
if(Objects.nonNull(visits)){
if(objCode.equals(SmsConstants.visitReportingContent.visitReportingAuditSuccess)){
// 鎮ㄧ殑銆愯瀹㈡姤澶囥�戝凡缁忓鎵归�氳繃锛岃閫氱煡璁垮浜巤棰勭害鍏ュ洯寮�濮嬫椂闂磢鍚庝箻鍧恵杞︾墝鍙穧鍏ュ洯锛屽鏈夌枒闂紝璇疯仈绯昏璁夸汉銆�
content = content.replace("{棰勭害鍏ュ洯寮�濮嬫椂闂磢",DateUtil.getFomartDate(visits.getStarttime(),"yyyy-MM-dd HH:mm"))
.replace("{杞︾墝鍙穧",visits.getCarNos());
sendBusinessSms(emayService,smsEmailMapper,
- Arrays.asList(visits.getPhone().split(",")),SmsConstants.visitReport,content,visits.getId());
+ Arrays.asList(visits.getCreateMobile().split(",")),SmsConstants.visitReport,content,visits.getId());
}else if(objCode.equals(SmsConstants.visitReportingContent.visitReportingAuditFail)){
//鎮ㄧ殑銆愯瀹㈡姤澶囥�戝凡琚┏鍥烇紝椹冲洖鍘熷洜涓猴細{椹冲洖鍘熷洜}銆傚鏈夌枒闂紝璇疯仈绯诲鎵逛汉銆�
content = content.replace("{椹冲洖鍘熷洜}",msg);
sendBusinessSms(emayService,smsEmailMapper,
- Arrays.asList(visits.getPhone().split(",")),SmsConstants.visitReport,content,visits.getId());
+ Arrays.asList(visits.getCreateMobile().split(",")),SmsConstants.visitReport,content,visits.getId());
}else if(objCode.equals(SmsConstants.visitReportingContent.visitReportingTimeOutSignOut)){
//鎮ㄧ殑銆愯瀹㈡姤澶囥�戝凡浜巤棰勭害鍏ュ洯缁撴潫鏃堕棿}鍒版湡锛岃鍙婃椂绂诲満锛屽鏈夌枒闂紝璇疯仈绯昏璁夸汉
content = content.replace("{棰勭害鍏ュ洯缁撴潫鏃堕棿}",DateUtil.getFomartDate(visits.getEndtime(),"yyyy-MM-dd HH:mm"));
--
Gitblit v1.9.3