订阅消息4

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/WxmpMessageConstant.java

@@ -65,7 +65,9 @@ public interface WxmpMessageConstant {
 
     String PAGE = "page";
 
-    String PAGE_URL = "/subpages/mine/pages/message/skip";
+    String MESSAGE_PAGE_URL = "/subpages/mine/pages/message/skip";
+
+    String UPDATE_PAGE_URL = "/pages/index/subscribe?id=";
 
     int TITLE_LIMIT = 20;
 

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java

@@ -227,11 +227,11 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
                 EnvEnum envEnum = EnvEnum.getCurrentEnv();
                 //选填项
                 if (WxmpMessageConstant.RESI.equals(clientType)) {
-                    StringBuilder resiPage = new StringBuilder(WxmpMessageConstant.PAGE_URL);
+                    StringBuilder resiPage = new StringBuilder(WxmpMessageConstant.MESSAGE_PAGE_URL);
                     resiPage.append("?customerId=").append(customerId).append("&gridId=").append(msg.getGridId());
                     jsonObject.put(WxmpMessageConstant.PAGE, resiPage.toString());
                 } else if (WxmpMessageConstant.GOV_DB.equals(clientType)) {
-                    StringBuilder govPage = new StringBuilder(WxmpMessageConstant.PAGE_URL);
+                    StringBuilder govPage = new StringBuilder(WxmpMessageConstant.MESSAGE_PAGE_URL);
                     govPage.append("?customerId=").append(customerId).append("&staffId=").append(userId);
                     jsonObject.put(WxmpMessageConstant.PAGE, govPage.toString());
                 }
@@ -429,12 +429,12 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
                 EnvEnum envEnum = EnvEnum.getCurrentEnv();
                 //选填项
                 if (WxmpMessageConstant.RESI.equals(clientType)) {
-                    StringBuilder resiPage = new StringBuilder(WxmpMessageConstant.PAGE_URL);
+                    StringBuilder resiPage = new StringBuilder(WxmpMessageConstant.UPDATE_PAGE_URL);
-                    resiPage.append("?customerId=").append(customerId).append("&gridId=").append(msg.getGridId());
+                    resiPage.append(dataId);
                     jsonObject.put(WxmpMessageConstant.PAGE, resiPage.toString());
                 } else if (WxmpMessageConstant.GOV_DB.equals(clientType)) {
-                    StringBuilder govPage = new StringBuilder(WxmpMessageConstant.PAGE_URL);
+                    StringBuilder govPage = new StringBuilder(WxmpMessageConstant.UPDATE_PAGE_URL);
-                    govPage.append("?customerId=").append(customerId).append("&staffId=").append(userId);
+                    govPage.append(dataId);
                     jsonObject.put(WxmpMessageConstant.PAGE, govPage.toString());
                 }
                 //开发环境