1.模板消息推送过滤html标签

2.欠费类型改成动态的

java110-bean/src/main/java/com/java110/dto/fee/BillOweFeeDto.java

@@ -35,7 +35,15 @@ public class BillOweFeeDto extends PageDto implements Serializable {
     private String deadlineTime;
     private String payObjId;
     private String curBill;
+    private String feeTypeCd;
 
+    public String getFeeTypeCd() {
+        return feeTypeCd;
+    }
+
+    public void setFeeTypeCd(String feeTypeCd) {
+        this.feeTypeCd = feeTypeCd;
+    }
 
     public String getOweId() {
         return oweId;

java110-utils/src/main/java/com/java110/utils/util/StringUtil.java

@@ -550,4 +550,11 @@ public class StringUtil {
             return false;
         }
     }
+    public static String delHtmlTag(String str){
+        String newstr = "";
+        newstr = str.replaceAll("<[.[^>]]*>","");
+        newstr = newstr.replaceAll(" ", "");
+        return newstr;
+    }
+
 }

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

@@ -167,7 +167,8 @@ public class PublicWeChatPushMessageTemplate extends TaskSystemQuartz {
                     PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
                     templateMessage.setTemplate_id(templateId);
                     templateMessage.setTouser(appUserDto.getOpenId());
-                    data.setFirst(new Content("物业费缴费提醒"));
+                    /*data.setFirst(new Content("物业费缴费提醒"));*/
+                    data.setFirst(new Content(fee.getFeeTypeCd()+"提醒"));
                     data.setKeyword1(new Content(fee.getPayerObjName()));
                     data.setKeyword2(new Content(year + "年-" + month + "月"));
                     data.setKeyword3(new Content(fee.getAmountOwed()));

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

@@ -274,7 +274,7 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
             data.setFirst(new Content(noticeDto.getTitle()));
             data.setKeyword1(new Content(noticeDto.getTitle()));
             data.setKeyword2(new Content(noticeDto.getStartTime()));
-            data.setKeyword3(new Content(noticeDto.getContext()));
+            data.setKeyword3(new Content(StringUtil.delHtmlTag(noticeDto.getContext())));
             data.setRemark(new Content("如有疑问请联系相关物业人员"));
             templateMessage.setData(data);
             templateMessage.setUrl(wechatUrl + noticeDto.getNoticeId());
@@ -325,7 +325,7 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
             data.setFirst(new Content(noticeDto.getTitle()));
             data.setKeyword1(new Content(noticeDto.getTitle()));
             data.setKeyword2(new Content(noticeDto.getStartTime()));
-            data.setKeyword3(new Content(noticeDto.getContext()));
+            data.setKeyword3(new Content(StringUtil.delHtmlTag(noticeDto.getContext())));
             data.setRemark(new Content("如有疑问请联系相关物业人员"));
             templateMessage.setData(data);
             if (!StringUtil.isEmpty(wechatUrl)) {