Merge branch 'dev_mess_party' into dev_temp

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/controller/WxmpUpdateSendDataController.java

@@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.WxmpUpdateSendDataDTO;
 import com.epmet.excel.WxmpUpdateSendDataExcel;
 import com.epmet.service.WxmpUpdateSendDataService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -45,7 +46,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("wxmpupdatesenddata")
 public class WxmpUpdateSendDataController {
-    
+
     @Autowired
     private WxmpUpdateSendDataService wxmpUpdateSendDataService;
 
@@ -57,6 +58,9 @@ public class WxmpUpdateSendDataController {
 
     @GetMapping("{id}")
     public Result<WxmpUpdateSendDataDTO> get(@PathVariable("id") String id){
+        if (StringUtils.isBlank(id) || "undefined".equals(id)){
+            return new Result().error(8000,"id不能为空");
+        }
         WxmpUpdateSendDataDTO data = wxmpUpdateSendDataService.get(id);
         return new Result<WxmpUpdateSendDataDTO>().ok(data);
     }
@@ -91,4 +95,4 @@ public class WxmpUpdateSendDataController {
         ExcelUtils.exportExcelToTarget(response, null, list, WxmpUpdateSendDataExcel.class);
     }
 
-}
+}

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);
-                    resiPage.append("?customerId=").append(customerId).append("&gridId=").append(msg.getGridId());
+                    StringBuilder resiPage = new StringBuilder(WxmpMessageConstant.UPDATE_PAGE_URL);
+                    resiPage.append(dataId);
                     jsonObject.put(WxmpMessageConstant.PAGE, resiPage.toString());
                 } else if (WxmpMessageConstant.GOV_DB.equals(clientType)) {
-                    StringBuilder govPage = new StringBuilder(WxmpMessageConstant.PAGE_URL);
-                    govPage.append("?customerId=").append(customerId).append("&staffId=").append(userId);
+                    StringBuilder govPage = new StringBuilder(WxmpMessageConstant.UPDATE_PAGE_URL);
+                    govPage.append(dataId);
                     jsonObject.put(WxmpMessageConstant.PAGE, govPage.toString());
                 }
                 //开发环境