From 1cad14bca191807e18705c3a5526eda8151be439 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 14 四月 2025 23:10:22 +0800
Subject: [PATCH] 批量审核和图片保存bug
---
ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
index 6712c0c..2df405f 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
@@ -14,7 +14,6 @@
import com.ycl.mapper.message.SmsAuditMapper;
import com.ycl.mapper.user.UmsDepartManageMapper;
import com.ycl.service.message.ISmsAuditService;
-import com.ycl.service.message.factory.SmsSender;
import com.ycl.service.user.UmsAdminService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -25,7 +24,7 @@
/**
* <p>
- * 鐭俊瀹℃牳 鏈嶅姟瀹炵幇绫�
+ * 鐭俊瀹℃牳 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author mg
@@ -41,8 +40,6 @@
@Resource
private UmsAdminService adminService;
- @Resource
- private SmsSender smsSender;
@Override
public IPage<SmsAudit> list(SmsAudit smsAudit) {
@@ -72,16 +69,17 @@
queryDeptWrapper.in(UmsDepartManage::getUserId, ids);
List<UmsDepartManage> depts = umsDepartManageMapper.selectList(queryDeptWrapper);
//閮ㄩ棬鍘婚噸
- List<UmsDepartManage> uniques = depts.stream().collect(
- Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o->o.getDepartId()))),
- ArrayList::new));
+ List<UmsDepartManage> uniques = depts.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getDepartId()))), ArrayList::new));
List<Long> deptLeadIds = uniques.stream().map(UmsDepartManage::getDepartId).collect(Collectors.toList());
LambdaQueryWrapper<UmsDepartManage> queryDeptLeadWrapper = new LambdaQueryWrapper<>();
- queryDeptLeadWrapper.in(UmsDepartManage::getDepartId, deptLeadIds).eq(UmsDepartManage::getIsLeader,1);
+ queryDeptLeadWrapper.in(UmsDepartManage::getDepartId, deptLeadIds).eq(UmsDepartManage::getIsLeader, 1);
List<UmsDepartManage> deptLeads = umsDepartManageMapper.selectList(queryDeptLeadWrapper);
+
+ //瀹℃牳鍘婚噸
+ List<UmsDepartManage> uniqueLeads = deptLeads.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getUserId()))), ArrayList::new));
//娣诲姞鐭俊瀹℃牳
List<SmsAudit> audits = new ArrayList<>();
- for (UmsDepartManage depart : deptLeads) {
+ for (UmsDepartManage depart : uniqueLeads) {
SmsAudit audit = new SmsAudit();
audit.setMessageId(message.getId());
audit.setAuditId(depart.getUserId());
@@ -99,8 +97,7 @@
@Override
public Boolean checkSms(MessageSmsParam messageSmsParam) {
- switch (messageSmsParam.getStatus())
- {
+ switch (messageSmsParam.getStatus()) {
//鏈�氳繃
case 0:
noPassMethod(messageSmsParam);
@@ -114,6 +111,7 @@
}
return true;
}
+
@Transactional
public void passMethod(MessageSmsParam messageSmsParam) {
Message message = messageMapper.selectById(messageSmsParam.getMessageId());
@@ -123,8 +121,6 @@
//id鎹㈡垚鎵嬫満鍙�
String targetToPhone = adminService.getTargetTo(message.getTargetTo(), message.getChannelCode());
message.setTargetTo(targetToPhone);
- //鍙戦�佺煭淇�
- smsSender.sendSms(message);
Message updateMessage = new Message();
updateMessage.setSendTime(new Date());
@@ -135,20 +131,30 @@
LambdaQueryWrapper<Message> updateWrapper = new LambdaQueryWrapper<>();
updateWrapper.eq(Message::getMessageNumber, message.getMessageNumber());
messageMapper.update(updateMessage, updateWrapper);
-
- baseMapper.updateById(packageData(messageSmsParam));
+ //瀹℃牳鐭俊鏇存柊
+ updateSmsAudit(messageSmsParam);
}
+
@Transactional
public void noPassMethod(MessageSmsParam messageSmsParam) {
- baseMapper.updateById(packageData(messageSmsParam));
+ //瀹℃牳鐭俊鏇存柊
+ updateSmsAudit(messageSmsParam);
}
+
+ public void updateSmsAudit(MessageSmsParam messageSmsParam) {
+ SmsAudit smsAudit = packageData(messageSmsParam);
+ LambdaQueryWrapper<SmsAudit> smsAuditUpdate = new LambdaQueryWrapper<>();
+ smsAuditUpdate.eq(SmsAudit::getMessageId, messageSmsParam.getMessageId());
+ baseMapper.update(smsAudit, smsAuditUpdate);
+ }
+
public SmsAudit packageData(MessageSmsParam messageSmsParam) {
SmsAudit smsAudit = new SmsAudit();
- smsAudit.setId(messageSmsParam.getId());
+ smsAudit.setMessageId(messageSmsParam.getMessageId());
smsAudit.setAuditStatus(messageSmsParam.getStatus());
smsAudit.setAuditOpinion(messageSmsParam.getAuditOpinion());
smsAudit.setAuditResult(messageSmsParam.getResult());
- smsAudit.setAuditId(messageSmsParam.getUpdateUser());
+ smsAudit.setRealAuditId(messageSmsParam.getUpdateUser());
smsAudit.setUpdateTime(new Date());
smsAudit.setUpdateUser(messageSmsParam.getUpdateUser());
return smsAudit;
--
Gitblit v1.8.0