From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage

---
 src/main/java/com/highdatas/mdm/util/pool/MqClient.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/highdatas/mdm/util/pool/MqClient.java b/src/main/java/com/highdatas/mdm/util/pool/MqClient.java
index 73f64a0..f2446f7 100644
--- a/src/main/java/com/highdatas/mdm/util/pool/MqClient.java
+++ b/src/main/java/com/highdatas/mdm/util/pool/MqClient.java
@@ -1,5 +1,6 @@
 package com.highdatas.mdm.util.pool;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.highdatas.mdm.service.ISysDispenseConfigService;
 import com.highdatas.mdm.util.DbUtils;
@@ -47,13 +48,18 @@
         return mqResult;
     }
 
+
+
+
     private MqResult sendMqEntity(String url, MqEntity mqEntity) {
-        Map<String, Object> dataMap = DbUtils.beanToMap(mqEntity);
-        Object msgBody = dataMap.get("msgBody");
+        JSONObject mqJsonObject = (JSONObject) JSON.toJSON(mqEntity);
+        JSONObject msgBody = mqJsonObject.getJSONObject("msgBody");
+        Map<String, Object> dataMap = DbUtils.JsonObjectToHashMap(mqJsonObject);
         String bodyStr = JSONObject.toJSONString(msgBody);
         dataMap.put("msgBody", bodyStr);
         dataMap.remove("increment");
         dataMap.remove("pageSize");
+        dataMap.remove("logId");
         dataMap.remove("type");
         dataMap.remove("userId");
         dataMap.remove("maintainId");
@@ -61,6 +67,9 @@
         dataMap.remove("dataId");
         dataMap.remove("pageNo");
         dataMap.remove("msgCode");
+        dataMap.remove("totalSize");
+
+//        dataMap.put("msgTagName", "datas");
         String s = HttpUtils.HttpRestClientByObjectParams(url, HttpMethod.POST, dataMap,null, null,MediaType.APPLICATION_JSON);
         MqResult mqResult = JSONObject.parseObject(s, MqResult.class);
         return mqResult;

--
Gitblit v1.8.0