优化代码

service-job/src/main/java/com/java110/job/adapt/applyRoomDiscount/MachineAdoptApplyRoomDiscountAdapt.java

@@ -30,6 +30,7 @@ import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -186,7 +187,7 @@ public class MachineAdoptApplyRoomDiscountAdapt extends DatabusAdaptImpl {
                 data.setKeyword4(new Content(paramIn.getString("createUserName") + "提交空置房申请需审批"));
                 data.setKeyword5(new Content(paramIn.getString("stateName")));
                 data.setRemark(new Content("请及时处理！"));
-                templateMessage.setData(data);
+                templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
                 //获取员工公众号地址
                 String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
                 templateMessage.setUrl(wechatUrl);
@@ -264,7 +265,7 @@ public class MachineAdoptApplyRoomDiscountAdapt extends DatabusAdaptImpl {
             data.setKeyword2(new Content(paramIn.getString("stateName")));
             data.setKeyword3(new Content(paramIn.getString("checkRemark")));
             data.setRemark(new Content("空置房申请验房已通过，系统已为您安排下一步审核流程，请耐心等待！"));
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
             //获取业主公众号地址
             String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);
@@ -341,7 +342,7 @@ public class MachineAdoptApplyRoomDiscountAdapt extends DatabusAdaptImpl {
             data.setKeyword2(new Content(paramIn.getString("stateName")));
             data.setKeyword3(new Content(paramIn.getString("checkRemark")));
             data.setRemark(new Content("感谢您的使用，如有疑问请联系相关物业人员。"));
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
             //获取业主公众号地址
             String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/adapt/applyRoomDiscount/MachineApplyRoomDiscountAdapt.java

@@ -23,6 +23,7 @@ import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -163,7 +164,8 @@ public class MachineApplyRoomDiscountAdapt extends DatabusAdaptImpl {
                 data.setKeyword4(new Content(paramIn.getString("createUserName") + "提交空置房申请，需进行现场验房"));
                 data.setKeyword5(new Content(paramIn.getString("stateName")));
                 data.setRemark(new Content("请及时处理！"));
-                templateMessage.setData(data);
+                templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
                 //获取员工公众号地址
                 String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
                 templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/adapt/applyRoomDiscount/MachineApprovalApplyRoomDiscountAdapt.java

@@ -23,6 +23,7 @@ import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.UrlCache;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -181,7 +182,8 @@ public class MachineApprovalApplyRoomDiscountAdapt extends DatabusAdaptImpl {
             data.setKeyword2(new Content(paramIn.getString("stateName")));
             data.setKeyword3(new Content(paramIn.getString("reviewRemark")));
             data.setRemark(new Content("感谢您的使用！"));
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
             //获取业主公众号地址
             String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);
@@ -258,7 +260,8 @@ public class MachineApprovalApplyRoomDiscountAdapt extends DatabusAdaptImpl {
             data.setKeyword2(new Content(paramIn.getString("stateName")));
             data.setKeyword3(new Content(paramIn.getString("reviewRemark")));
             data.setRemark(new Content("感谢您的使用，如有疑问请联系相关物业人员。"));
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
             //获取业主公众号地址
             String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/adapt/car/CarOutParkingAreaAdapt.java

@@ -151,7 +151,7 @@ public class CarOutParkingAreaAdapt extends DatabusAdaptImpl {
 
         String remark = getRemark(communityId, ownerCarDtos.get(0).getOwnerId());
         data.setRemark(new Content(remark));
-        templateMessage.setData(data);
+        templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
         //获取业主公众号地址
         String wechatUrl = UrlCache.getOwnerUrl();
         wechatUrl += "/#/pages/fee/oweFee";

service-job/src/main/java/com/java110/job/adapt/hcGov/visit/AddVisitAdapt.java

@@ -212,7 +212,8 @@ public class AddVisitAdapt extends DatabusAdaptImpl {
                     data.setKeyword4(new Content(ownerDtos.get(0).getName() + "提交的访客预约车辆-" + visitPo.getCarNum() + "，需要进行车辆审核。"));
                     data.setKeyword5(new Content("待审核"));
                     data.setRemark(new Content("请及时处理！"));
-                    templateMessage.setData(data);
+                    templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
                     //获取员工公众号地址
                     String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN, "STAFF_WECHAT_URL");
                     templateMessage.setUrl(wechatUrl);
@@ -307,7 +308,8 @@ public class AddVisitAdapt extends DatabusAdaptImpl {
                 data.setKeyword3(new Content(visitDtos.get(0).getStateRemark()));
                 data.setRemark(new Content("访客预约车辆审核未通过，请您合理安排出行！"));
             }
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
             //获取业主公众号地址
             String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/adapt/hcGov/visit/ExamineVisitAdapt.java

@@ -224,7 +224,8 @@ public class ExamineVisitAdapt extends DatabusAdaptImpl {
                 data.setKeyword4(new Content(ownerDtos.get(0).getName() + "提交的访客预约车辆-" + visitPo.getCarNum() + "，需要进行车辆审核。"));
                 data.setKeyword5(new Content("待审核"));
                 data.setRemark(new Content("请及时处理！"));
-                templateMessage.setData(data);
+                templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
                 //获取员工公众号地址
                 String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN, "STAFF_WECHAT_URL");
                 templateMessage.setUrl(wechatUrl);
@@ -323,7 +324,8 @@ public class ExamineVisitAdapt extends DatabusAdaptImpl {
                 data.setKeyword3(new Content(visitDtos.get(0).getCarStateRemark()));
                 data.setRemark(new Content("访客预约车辆审核未通过，请您合理安排出行！"));
             }
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
             //获取业主公众号地址
             String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/adapt/notice/MachineNoticeAdapt.java

@@ -31,6 +31,7 @@ import com.java110.utils.cache.MappingCache;
 import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -198,7 +199,7 @@ public class MachineNoticeAdapt extends DatabusAdaptImpl {
                 data.setKeyword2(new Content(paramIn.getString("startTime")));
                 data.setKeyword3(new Content(StringUtil.delHtmlTag(paramIn.getString("context"))));
                 data.setRemark(new Content("如有疑问请联系相关物业人员"));
-                templateMessage.setData(data);
+                templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
                 //获取员工公众号地址
                 String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
                 templateMessage.setUrl(wechatUrl);
@@ -264,7 +265,7 @@ public class MachineNoticeAdapt extends DatabusAdaptImpl {
                 data.setKeyword2(new Content(paramIn.getString("startTime")));
                 data.setKeyword3(new Content(StringUtil.delHtmlTag(paramIn.getString("context"))));
                 data.setRemark(new Content("如有疑问请联系相关物业人员"));
-                templateMessage.setData(data);
+                templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
                 //获取业主公众号地址
                 String wechatUrl = UrlCache.getOwnerUrl();
                 if (!StringUtil.isEmpty(wechatUrl) && wechatUrl.contains("?")) {

service-job/src/main/java/com/java110/job/adapt/propertyRightRegistration/MachineEditPropertyRightRegistration.java

@@ -21,6 +21,7 @@ import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -142,7 +143,8 @@ public class MachineEditPropertyRightRegistration extends DatabusAdaptImpl {
                     data.setKeyword4(new Content(paramIn.getString("name") + "提交的房屋产权修改申请" + "\r\n" + "申请时间：" + paramIn.getString("createTime")));
                     data.setKeyword5(new Content("待审核"));
                     data.setRemark(new Content("请及时处理！"));
-                    templateMessage.setData(data);
+                    templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
                     //获取员工公众号地址
                     String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
                     templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/adapt/propertyRightRegistration/MachinePropertyRightRegistration.java

@@ -21,6 +21,7 @@ import com.java110.intf.user.*;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -136,7 +137,8 @@ public class MachinePropertyRightRegistration extends DatabusAdaptImpl {
                     data.setKeyword4(new Content(paramIn.getString("name") + "提交的房屋产权登记申请" + "\r\n" + "申请时间：" + paramIn.getString("createTime")));
                     data.setKeyword5(new Content("待审核"));
                     data.setRemark(new Content("请及时处理！"));
-                    templateMessage.setData(data);
+                    templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
                     //获取员工公众号地址
                     String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
                     templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/adapt/purchase/allocationStorehouse/MachineAllocationStorehouse.java

@@ -20,6 +20,7 @@ import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -169,7 +170,8 @@ public class MachineAllocationStorehouse extends DatabusAdaptImpl {
                 data.setKeyword5(new Content(paramIn.getString("stateName")));
                 data.setRemark(new Content("请及时处理！"));
             }
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
             //获取员工公众号地址
             String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
             templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/adapt/purchase/purchaseApply/MachinePurchaseApplyAdapt.java

@@ -20,6 +20,7 @@ import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -188,7 +189,8 @@ public class MachinePurchaseApplyAdapt extends DatabusAdaptImpl {
             } else {
                 data.setRemark(new Content("请及时处理！"));
             }
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
             //获取员工公众号地址
             String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
             templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovation.java

@@ -20,6 +20,7 @@ import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.UrlCache;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
@@ -154,7 +155,8 @@ public class MachineRoomRenovation extends DatabusAdaptImpl {
             data.setKeyword2(new Content(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A)));
             data.setKeyword3(new Content("您的" + communityDtos.get(0).getName() + "小区" + paramIn.getString("roomName") + "房屋，有新的现场巡检记录，请您及时了解近期房屋装修状况！"));
             data.setRemark(new Content("如有其它问题，请联系" + communityDtos.get(0).getName() + "客服，联系电话" + tel + "，感谢您的使用。"));
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
             //获取业主公众号地址
             String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovationCompleted.java

@@ -21,6 +21,7 @@ import com.java110.intf.user.*;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -157,7 +158,7 @@ public class MachineRoomRenovationCompleted extends DatabusAdaptImpl {
                     data.setKeyword4(new Content(paramIn.getString("remark")));
                     data.setKeyword5(new Content("待验收"));
                     data.setRemark(new Content("感谢您的使用。"));
-                    templateMessage.setData(data);
+                    templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
                     //获取员工公众号地址
                     String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
                     templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovationDetail.java

@@ -25,6 +25,7 @@ import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
 import com.java110.intf.user.IRoomRenovationsInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.UrlCache;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -209,7 +210,8 @@ public class MachineRoomRenovationDetail extends DatabusAdaptImpl {
             data.setKeyword2(new Content(paramIn.getString("remark")));
             data.setKeyword3(new Content(paramIn.getString("createTime")));
             data.setRemark(new Content("如有任何疑问，请咨询" + communityDto.getName() + "客服部，咨询电话：" + tel + "。"));
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
             //获取业主公众号地址
             String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomToExamine.java

@@ -24,6 +24,7 @@ import com.java110.intf.user.IRoomRenovationsInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -207,7 +208,8 @@ public class MachineRoomToExamine extends DatabusAdaptImpl {
                 data.setKeyword4(new Content(paramIn.getString("stateName") + "\n" + "审核意见：" + paramIn.getString("examineRemark")));
             }
             data.setRemark(new Content("如有其它问题，请联系" + communityDto.getName() + "客服，联系电话" + tel + "，感谢您的使用。"));
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
             //获取员工公众号地址
             String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
             templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineSaveRoomRenovation.java

@@ -27,6 +27,7 @@ import com.java110.utils.cache.MappingCache;
 import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -196,7 +197,7 @@ public class MachineSaveRoomRenovation extends DatabusAdaptImpl {
                     data.setKeyword4(new Content(paramIn.getString("remark")));
                     data.setKeyword5(new Content("待审核"));
                     data.setRemark(new Content("感谢您的使用。"));
-                    templateMessage.setData(data);
+                    templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
                     //获取员工公众号地址
                     String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
                     templateMessage.setUrl(wechatUrl);
@@ -294,7 +295,8 @@ public class MachineSaveRoomRenovation extends DatabusAdaptImpl {
             data.setKeyword3(new Content(paramIn.getString("personTel")));
             data.setKeyword4(new Content(paramIn.getString("startTime") + "至" + paramIn.getString("endTime")));
             data.setRemark(new Content("物业联系电话：" + tel + "，请到物业管理处或通过手机缴纳装修押金！"));
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
             //获取业主公众号地址
             String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/task/attendance/PublishStaffAttendanceTaskTemplate.java

@@ -18,6 +18,7 @@ import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
 import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.job.quartz.TaskSystemQuartz;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -156,7 +157,8 @@ public class PublishStaffAttendanceTaskTemplate extends TaskSystemQuartz {
         data.setKeyword2(new Content(attendanceClassesTaskDetailDto.getValue()));
         data.setKeyword3(new Content("请到考勤机及时考勤"));
         data.setRemark(new Content("如有疑问请联系管理员"));
-        templateMessage.setData(data);
+        templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
 
         logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
         ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);

service-job/src/main/java/com/java110/job/task/fee/FeeDueReminderTemplate.java

@@ -37,6 +37,7 @@ import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
 import com.java110.job.quartz.TaskSystemQuartz;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.cache.UrlCache;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -326,7 +327,7 @@ public class FeeDueReminderTemplate extends TaskSystemQuartz {
             data.setKeyword2(new Content(communityName + location));
             data.setKeyword3(new Content(finishTime));
             data.setRemark(new Content("请您及时续费，以免影响您的正常使用！"));
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
             //获取业主公众号地址
             String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);

service-job/src/main/java/com/java110/job/task/inspection/PublishStaffInspectionTaskTemplate.java

@@ -20,6 +20,7 @@ import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.job.quartz.TaskSystemQuartz;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -173,7 +174,8 @@ public class PublishStaffInspectionTaskTemplate extends TaskSystemQuartz {
         data.setKeyword3(new Content(inspectionTaskDetailDto.getInspectionName() + "未巡检，请及时巡检"));
         data.setRemark(new Content("如有疑问请联系管理员"));
 
-        templateMessage.setData(data);
+        templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
 
         String staffWechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
         staffWechatUrl =  staffWechatUrl

service-job/src/main/java/com/java110/job/task/inspection/PublishTodayFinishInspectionTaskReportTemplate.java

@@ -22,6 +22,7 @@ import com.java110.job.quartz.TaskSystemQuartz;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -140,7 +141,8 @@ public class PublishTodayFinishInspectionTaskReportTemplate extends TaskSystemQu
             data.setKeyword2(new Content(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B)));
             data.setKeyword3(new Content("今日巡检情况已生成，请点击查看详情"));
             data.setRemark(new Content("感谢您的使用！"));
-            templateMessage.setData(data);
+            templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
             //获取员工公众号地址
             String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
             if(wechatUrl.endsWith("/")){

service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java

@@ -334,7 +334,8 @@ public class FeeCollectionPushMessageTemplate extends TaskSystemQuartz {
                             templateMessage.setMiniprogram(miniprogram);
                         }
                     }
-                    templateMessage.setData(data);
+                    templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
                     logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
                     ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
                     logger.info("微信模板返回内容:{}", responseEntity);

service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java

@@ -41,6 +41,7 @@ import com.java110.service.smo.ISaveSystemErrorSMO;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.WechatConstant;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.ExceptionUtil;
 import com.java110.utils.util.StringUtil;
@@ -389,7 +390,8 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
                 data.setKeyword2(new Content(noticeDto.getStartTime()));
                 data.setKeyword3(new Content(StringUtil.delHtmlTag(noticeDto.getContext())));
                 data.setRemark(new Content("如有疑问请联系相关物业人员"));
-                templateMessage.setData(data);
+                templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
                 if (!StringUtil.isEmpty(wechatUrl)) {
                     if (miniprogram == null) {
                         templateMessage.setUrl(wechatUrl + "/#/pages/notice/detail/detail?noticeId=" + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId() + "&communityId=" + noticeDto.getCommunityId());
@@ -476,7 +478,8 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
                         data.setKeyword2(new Content(noticeDto.getStartTime()));
                         data.setKeyword3(new Content(StringUtil.delHtmlTag(noticeDto.getContext())));
                         data.setRemark(new Content("如有疑问请联系相关物业人员"));
-                        templateMessage.setData(data);
+                        templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
                         //获取业主公众号地址
                         String wechatUrl = UrlCache.getOwnerUrl();
                         if (!StringUtil.isEmpty(wechatUrl) && wechatUrl.contains("?")) {
@@ -567,7 +570,8 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
                 data.setKeyword2(new Content(noticeDto.getStartTime()));
                 data.setKeyword3(new Content(StringUtil.delHtmlTag(noticeDto.getContext())));
                 data.setRemark(new Content("如有疑问请联系相关物业人员"));
-                templateMessage.setData(data);
+                templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
                 templateMessage.setUrl(wechatUrl + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId() + "&communityId=" + noticeDto.getCommunityId());
                 logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
                 responseEntity = outRestTemplate.postForEntity(sendTemplate + accessToken, JSON.toJSONString(templateMessage), String.class);