From a33f46cb148d25659b68ba2989735f9298921386 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Fri, 3 Apr 2020 13:44:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9Fadmin=E6=A8=A1=E5=9D=97mq?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-admin/epdc-admin-server/pom.xml      |  8 ++++----
 .../producer/OrganizationModifyProducer.java  | 20 +++++++++----------
 .../epdc/service/impl/SysDeptServiceImpl.java | 20 +++++++++----------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
index b80db976..25fb339e 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
@@ -150,8 +150,8 @@
                 <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
                 <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
                 <!--RocketMQ-->
-                <!--<rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
-                <rocketmq.producer.group>jinshui-organizationGroup</rocketmq.producer.group>-->
+                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
+                <rocketmq.producer.group>jinshui-organizationGroup</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>
@@ -175,8 +175,8 @@
                 <work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
                 <work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
                 <!--RocketMQ-->
-                <!--<rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
-                <rocketmq.producer.group>jinshui-organizationGroup</rocketmq.producer.group>-->
+                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
+                <rocketmq.producer.group>jinshui-organizationGroup</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/rocketmq/producer/OrganizationModifyProducer.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/rocketmq/producer/OrganizationModifyProducer.java
index fa04810c..525d70f8 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/rocketmq/producer/OrganizationModifyProducer.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/rocketmq/producer/OrganizationModifyProducer.java
@@ -18,8 +18,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class OrganizationModifyProducer {
 
-//    @Autowired
-//    private RocketMQTemplate rocketMQTemplate;
+    @Autowired
+    private RocketMQTemplate rocketMQTemplate;
 
     /**
      *
@@ -31,13 +31,13 @@ public class OrganizationModifyProducer {
      * @since 2020/3/6 21:09
      */
     public void sendMessage(String topic, String tag, String keys, String body) {
-//        Message message = new Message(topic, tag, keys, body.getBytes());
-//        try {
-//            SendResult sendResult = rocketMQTemplate.getProducer().send(message);
-//            log.info("EPDC-ADMIN-SERVER发送消息结果：{sendStatus:{}, topic:{}, msgId:{}}", sendResult.getSendStatus(), topic, sendResult.getMsgId());
-//        } catch (Exception e) {
-//            log.error("EPDC-ADMIN-SERVER发送消息异常：{topic:{}, tag:{}, keys:{}, body:{}}", topic, tag, keys, body);
-//            e.printStackTrace();
-//        }
+        Message message = new Message(topic, tag, keys, body.getBytes());
+        try {
+            SendResult sendResult = rocketMQTemplate.getProducer().send(message);
+            log.info("EPDC-ADMIN-SERVER发送消息结果：{sendStatus:{}, topic:{}, msgId:{}}", sendResult.getSendStatus(), topic, sendResult.getMsgId());
+        } catch (Exception e) {
+            log.error("EPDC-ADMIN-SERVER发送消息异常：{topic:{}, tag:{}, keys:{}, body:{}}", topic, tag, keys, body);
+            e.printStackTrace();
+        }
     }
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index 65438dec..71f67d30 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -749,15 +749,15 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
      */
     private void sendMqMessage(SysDeptDTO dto) {
         // 获取旧信息
-//        SysDeptEntity entity = baseDao.getById(dto.getId());
-//        if (!dto.getName().equals(entity.getName())) {
-//            OrganizationModifyDTO body = new OrganizationModifyDTO();
-//            body.setDeptId(dto.getId());
-//            body.setOldDeptName(entity.getName());
-//            body.setNewDeptName(dto.getName());
-//            body.setTypeKey(entity.getTypeKey());
-//            organizationModifyProducer.sendMessage(RocketMqConstant.MQ_TOPIC_ORGANIZATION, RocketMqConstant.MQ_TAG_ORGANIZATION,
-//                    dto.getId().toString(), JSONObject.toJSONString(body));
-//        }
+        SysDeptEntity entity = baseDao.getById(dto.getId());
+        if (!dto.getName().equals(entity.getName())) {
+            OrganizationModifyDTO body = new OrganizationModifyDTO();
+            body.setDeptId(dto.getId());
+            body.setOldDeptName(entity.getName());
+            body.setNewDeptName(dto.getName());
+            body.setTypeKey(entity.getTypeKey());
+            organizationModifyProducer.sendMessage(RocketMqConstant.MQ_TOPIC_ORGANIZATION, RocketMqConstant.MQ_TAG_ORGANIZATION,
+                    dto.getId().toString(), JSONObject.toJSONString(body));
+        }
     }
 }