From e1008dbb1fa76874a28c06913b95c16d18acdfa7 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 11 十一月 2022 17:54:52 +0800
Subject: [PATCH] 短信模块 消息列表

---
 ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java |   28 +++++++++++-----------------
 1 files changed, 11 insertions(+), 17 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 ceedd48..4323e14 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
@@ -4,7 +4,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.common.util.CommonUtils;
+import com.ycl.controller.video.common.util.CommonUtils;
 import com.ycl.dto.message.MessageSmsParam;
 import com.ycl.entity.message.Message;
 import com.ycl.entity.message.SmsAudit;
@@ -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,18 +69,14 @@
         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<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 : uniqueLeads) {
@@ -104,8 +97,7 @@
 
     @Override
     public Boolean checkSms(MessageSmsParam messageSmsParam) {
-        switch (messageSmsParam.getStatus())
-        {
+        switch (messageSmsParam.getStatus()) {
             //鏈�氳繃
             case 0:
                 noPassMethod(messageSmsParam);
@@ -119,6 +111,7 @@
         }
         return true;
     }
+
     @Transactional
     public void passMethod(MessageSmsParam messageSmsParam) {
         Message message = messageMapper.selectById(messageSmsParam.getMessageId());
@@ -128,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());
@@ -143,17 +134,20 @@
         //瀹℃牳鐭俊鏇存柊
         updateSmsAudit(messageSmsParam);
     }
+
     @Transactional
     public void noPassMethod(MessageSmsParam 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);
+        baseMapper.update(smsAudit, smsAuditUpdate);
     }
+
     public SmsAudit packageData(MessageSmsParam messageSmsParam) {
         SmsAudit smsAudit = new SmsAudit();
         smsAudit.setMessageId(messageSmsParam.getMessageId());

--
Gitblit v1.8.0