From 992dd0cdea25df19651b243082171404bb796cbf Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 26 十月 2022 18:07:31 +0800
Subject: [PATCH] 统一处理bug

---
 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java |    9 ++
 ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java |  106 +++++++++++++++++++---------------
 ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java  |   16 +++--
 ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java            |    6 ++
 4 files changed, 82 insertions(+), 55 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index bb6d7fe..221963e 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -156,8 +156,15 @@
         }
         //瀵圭敤鎴峰悕绯荤粺榛樿娣诲姞
         //umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
-        baseMapper.updateById(umsAdmin);
+        //娣诲姞閮ㄩ棬
+        UmsDepartManage departManage = new UmsDepartManage();
+        departManage.setUserId(umsAdmin.getId());
+        departManage.setDepartId(umsAdmin.getDepartmentId());
+        departManage.setCreateTime(new Date());
+        departManage.setUpdateTime(new Date());
+        umsDepartManageMapper.insert(departManage);
 
+        baseMapper.updateById(umsAdmin);
         return umsAdmin;
     }
 
diff --git a/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java b/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
index 80264b1..0dd83bd 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
@@ -16,6 +16,12 @@
 @Data
 @ApiModel("娑堟伅鍙傛暟浣�")
 public class MessageParam extends BasePageVO {
+
+    /**
+     * 涓婚敭id
+     */
+    @ApiModelProperty(value = "涓婚敭id")
+    private Long id;
     /**
      * 鏍囬
      */
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java b/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
index c504416..011851c 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
@@ -1,6 +1,7 @@
 package com.ycl.service.message.factory;
 
 import com.ycl.common.constant.ChannelCode;
+import com.ycl.common.util.CommonUtils;
 import com.ycl.common.util.UtilNumber;
 import com.ycl.dto.message.MessageParam;
 import com.ycl.entity.message.Message;
@@ -42,56 +43,67 @@
     @Override
     public Message sendMessage(MessageParam messageParam) {
         Message message = new Message();
-        String messageNumber = UtilNumber.getNumber("MC", 6);
         List<Message> messages = new ArrayList<>();
-        BeanUtils.copyProperties(messageParam, message);
-        //鐖禝d涓�0
-        message.setParentId(0L);
-        //鐢熸垚娑堟伅缂栫爜
-        message.setMessageNumber(messageNumber);
-        //鐢熸垚榛樿鍙傛暟
-        //鍙戦�佹椂闂�
-        if (message.getSendTime() == null) {
-            message.setSendTime(new Date());
-        }
-        message.setIsView(0);
-        message.setVersion(0);
-        message.setIsScan(1);
-        message.setCreateTime(new Date());
-        message.setUpdateTime(new Date());
-        message.setCreateUser(messageParam.getCreateUser());
-        message.setUpdateUser(messageParam.getCreateUser());
-        messageMapper.insert(message);
-        String[] ids = messageParam.getTargetTo().split(",");
-        for (String id : ids) {
-            Message messageAdd = new Message();
-            BeanUtils.copyProperties(messageParam, messageAdd);
-            //璁剧疆鐖剁被Id
-            messageAdd.setParentId(message.getId());
-            //璁剧疆鎺ユ敹鑰�
-            messageAdd.setTargetTo(id);
-            //鐢熸垚8浣嶉殢鏈烘暟娑堟伅缂栫爜
-            messageAdd.setMessageNumber(messageNumber);
-            //鍙戦�佹椂闂�
-            if (messageAdd.getSendTime() == null) {
-                messageAdd.setSendTime(new Date());
-            }
-            if (ChannelCode.MAIL.equals(messageParam.getChannelCode())) {
-                messageAdd.setIsScan(1);
-            } else {
-                messageAdd.setIsScan(0);
-            }
+        if (CommonUtils.isEmpty(messageParam.getId())) {
+            String messageNumber = UtilNumber.getNumber("MC", 6);
+            BeanUtils.copyProperties(messageParam, message);
+            //鐖禝d涓�0
+            message.setParentId(0L);
+            //鐢熸垚娑堟伅缂栫爜
+            message.setMessageNumber(messageNumber);
             //鐢熸垚榛樿鍙傛暟
-            messageAdd.setCreateTime(new Date());
-            messageAdd.setUpdateTime(new Date());
-            messageAdd.setCreateUser(messageParam.getCreateUser());
-            messageAdd.setUpdateUser(messageParam.getCreateUser());
-            messageAdd.setIsView(0);
-            messageAdd.setVersion(0);
-            messages.add(messageAdd);
+            //鍙戦�佹椂闂�
+            if (message.getSendTime() == null) {
+                message.setSendTime(new Date());
+            }
+            message.setIsView(0);
+            message.setVersion(0);
+            message.setIsScan(1);
+            message.setCreateTime(new Date());
+            message.setUpdateTime(new Date());
+            message.setCreateUser(messageParam.getCreateUser());
+            message.setUpdateUser(messageParam.getCreateUser());
+            messageMapper.insert(message);
+        } else {
+            message.setId(messageParam.getId());
+            BeanUtils.copyProperties(messageParam, message);
+            message.setUpdateTime(new Date());
+            message.setUpdateUser(messageParam.getCreateUser());
+            messageMapper.updateById(message);
         }
-        //鎵归噺鏂板
-        iMessageService.saveBatch(messages);
+        //鍙戝竷娑堟伅
+        if (message.getStatus() == 1) {
+            String[] ids = messageParam.getTargetTo().split(",");
+            for (String id : ids) {
+                Message messageAdd = new Message();
+                BeanUtils.copyProperties(messageParam, messageAdd);
+                //璁剧疆鐖剁被Id
+                messageAdd.setParentId(message.getId());
+                //璁剧疆鎺ユ敹鑰�
+                messageAdd.setTargetTo(id);
+                //鐢熸垚8浣嶉殢鏈烘暟娑堟伅缂栫爜
+                messageAdd.setMessageNumber(message.getMessageNumber());
+                //鍙戦�佹椂闂�
+                if (messageAdd.getSendTime() == null) {
+                    messageAdd.setSendTime(new Date());
+                }
+                if (ChannelCode.MAIL.equals(messageParam.getChannelCode())) {
+                    messageAdd.setIsScan(1);
+                } else {
+                    messageAdd.setIsScan(0);
+                }
+                //鐢熸垚榛樿鍙傛暟
+                messageAdd.setCreateTime(new Date());
+                messageAdd.setUpdateTime(new Date());
+                messageAdd.setCreateUser(messageParam.getCreateUser());
+                messageAdd.setUpdateUser(messageParam.getCreateUser());
+                messageAdd.setIsView(0);
+                messageAdd.setVersion(0);
+                messages.add(messageAdd);
+            }
+            //鎵归噺鏂板
+            iMessageService.saveBatch(messages);
+        }
         return message;
     }
 }
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java b/ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java
index b272553..395ad74 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java
@@ -53,13 +53,15 @@
     public Message sendMessage(MessageParam messageParam) {
         //鍏ュ簱淇濆瓨
         Message message = innerSender.sendMessage(messageParam);
-        //鍙戣捣瀹℃牳
-        iSmsAuditService.startAuditSms(message);
-        //id鎹㈡垚閭鍙�
-        String targetToMail = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
-        message.setTargetTo(targetToMail);
-        //鍙戦�侀偖浠�
-        sendMail(message);
+        if (messageParam.getStatus() == 1) {
+            //鍙戣捣瀹℃牳
+            iSmsAuditService.startAuditSms(message);
+            //id鎹㈡垚閭鍙�
+            String targetToMail = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
+            message.setTargetTo(targetToMail);
+            //鍙戦�侀偖浠�
+            sendMail(message);
+        }
         return message;
     }
 

--
Gitblit v1.8.0