浏览代码

修改消息转json方法

yucheng 3 年之前
父节点
当前提交
68b0d404b6

+ 23 - 12
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/basic/utils/DigitalMessageHelper.java

@@ -1,10 +1,13 @@
 package com.persagy.dmp.rwd.basic.utils;
 
-import cn.hutool.json.JSONUtil;
-import com.persagy.dmp.common.model.entity.BaseEntity;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.persagy.dmp.amqp.handler.RabbitMessageSender;
-import com.persagy.dmp.rwd.basic.constant.DigitalMessageConstant;
 import com.persagy.dmp.basic.model.DigitalManageMessage;
+import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.entity.BaseEntity;
+import com.persagy.dmp.rwd.basic.constant.DigitalMessageConstant;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -14,10 +17,13 @@ import org.springframework.stereotype.Component;
  * @date 2021-06-25
  */
 @Component
+@Slf4j
 public class DigitalMessageHelper {
 
     @Autowired
     private RabbitMessageSender messageSender;
+    @Autowired
+    private ObjectMapper objectMapper;
 
     /**
      * 发送消息
@@ -33,15 +39,20 @@ public class DigitalMessageHelper {
         message.setOldObj(oldVO);
         message.setNewObj(newVO);
         // 同步消息
-        if(syncFlag) {
-            messageSender.sendAndReceive(DigitalMessageConstant.MESSAGE_EXCHANGE,
-                    DigitalMessageConstant.MESSAGE_ROUTING,
-                    JSONUtil.toJsonStr(message));
-        } else {
-            // 异步消息
-            messageSender.send(DigitalMessageConstant.MESSAGE_EXCHANGE,
-                    DigitalMessageConstant.MESSAGE_ROUTING,
-                    JSONUtil.toJsonStr(message));
+        try {
+            if(syncFlag) {
+                messageSender.sendAndReceive(DigitalMessageConstant.MESSAGE_EXCHANGE,
+                        DigitalMessageConstant.MESSAGE_ROUTING,
+                        objectMapper.writeValueAsString(message));
+            } else {
+                // 异步消息
+                    messageSender.send(DigitalMessageConstant.MESSAGE_EXCHANGE,
+                            DigitalMessageConstant.MESSAGE_ROUTING,
+                            objectMapper.writeValueAsString(message));
+            }
+        } catch (JsonProcessingException e) {
+            log.error(e.getMessage(), e);
+            throw new BusinessException("消息格式有误!");
         }
     }
 }

+ 2 - 2
dmp-business/dmp-rwd/src/main/resources/mapper/DigitalMigrateMapper.xml

@@ -54,7 +54,7 @@
         SELECT `id`,`name`,`local_id`,
           `local_name`,`group_code`,`project_id`,`obj_type`,`class_code`,
           `grouping`,`infos`,`virtual_info_codes`,`create_app`,`update_app`,
-          '0',date_format(now(), '%Y%m%d%h%i%s'),null,null,1
+          '0',date_format(now(), '%Y%m%d%h%i%s'),null,null,`valid`
         FROM `${schema}`.`rwd_object_${groupCode}_${projectId}`
     </insert>
     <insert id="migrateRelation">
@@ -65,7 +65,7 @@
         SELECT `id`,`graph_id`,`graph_code`,
           `rel_code`,`rel_value`,`group_code`,`project_id`,`obj_from`,`obj_to`,
           `create_app`,`update_app`,
-          '0',date_format(now(), '%Y%m%d%h%i%s'),null,null,1
+          '0',date_format(now(), '%Y%m%d%h%i%s'),null,null,`status`
         FROM `${schema}`.`rwd_relation_${groupCode}_${projectId}`
     </insert>