消息系统优化

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/messageWaitSend/MessageWaitSendManagerImpl.java

@@ -3,6 +3,7 @@ package cn.com.taiji.msgw.manager.messageWaitSend;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import cn.com.taiji.common.pub.BeanTools;
 import cn.com.taiji.core.model.comm.protocol.ats.weiXin.WxMiniSendMessageResponse;
@@ -137,7 +138,8 @@ public class MessageWaitSendManagerImpl extends AbstractCommManager implements M
 //                        JsonTools.json2Object(sendDetails.getRequestDataJson(), WxMiniSendMessageRequest.class);
                 messageRequest.setTemplateId(sendDetails.getModelId());
                 messageRequest.setWxOpenId(sendDetails.getReceiverId());
-                messageRequest.setDataObject(sendDetails.getRequestDataJson());
+                Map<String, Object> map = JsonTools.json2Map(sendDetails.getRequestDataJson(), String.class, Object.class);
+                messageRequest.setDataObject(map);
 //                messageRequest.setSendTime(LocalDateTime.now());
                 messageRequest.setTitle(sendDetails.getTitle());
                 WxMiniSendMessageResponse response = jsonPostRepeat(messageRequest);
@@ -177,7 +179,9 @@ public class MessageWaitSendManagerImpl extends AbstractCommManager implements M
                 messageRequest.setTitle(sendDetails.getTitle());
                 messageRequest.setTemplateId(sendDetails.getModelId());
                 messageRequest.setMpOpenId(sendDetails.getReceiverId());
-                messageRequest.setData(sendDetails.getRequestDataJson());
+                Map<String, Object> map = JsonTools.json2Map(sendDetails.getRequestDataJson(), String.class, Object.class);
+//                messageRequest.setDataObject(map);
+                messageRequest.setData(map);
 //                        JsonTools.json2Object(sendDetails.getRequestDataJson(), WxMpSendMessageRequest.class);
                 WxMpSendMessageResponse response = jsonPostRepeat(messageRequest);
                 if (response.getSent() == null){