*）修改消防监督消息

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -2059,7 +2059,6 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             latentDanger.setPhotoUrls(Joiner.on(",").join(latentDangerDto.getPhotoUrl()));
         }
         this.updateById(latentDanger);
-
         DangerExecuteSubmitDto executeSubmitDto = new DangerExecuteSubmitDto();
         LatentDangerExecuteParam executeParam = new LatentDangerExecuteParam();
         if (ValidationUtil.isEmpty(executeType) ||

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/async/AsyncTask.java

@@ -13,6 +13,7 @@ import com.yeejoin.amos.latentdanger.business.param.JPushTypeEnum;
 import com.yeejoin.amos.latentdanger.business.param.PushMsgParam;
 import com.yeejoin.amos.latentdanger.business.util.DateUtil;
 import com.yeejoin.amos.latentdanger.business.util.Toke;
+import com.yeejoin.amos.latentdanger.common.enums.LatentDangerState;
 import com.yeejoin.amos.latentdanger.common.enums.MsgSubscribeEnum;
 import com.yeejoin.amos.latentdanger.dao.entity.LatentDanger;
 import com.yeejoin.amos.latentdanger.dao.entity.Msg;
@@ -166,12 +167,10 @@ public class AsyncTask {
         RequestContext.setProduct(requestContextModel.getProduct());
         RequestContext.setAppKey(requestContextModel.getAppKey());
         MessageModel model = new MessageModel();
-        model.setTitle(latentDanger.getDangerName());
-        String body = String.format("隐患名称：%s；隐患级别：%s；治理方式：%s",
-                latentDanger.getDangerName(), latentDanger.getDangerLevelName(), latentDanger.getReformTypeName());
+        String body = String.format("隐患名称：%s；隐患级别：%s；治理方式：%s, 推送时间：%s",
+                latentDanger.getDangerName(), latentDanger.getDangerLevelName(), latentDanger.getReformTypeName(), DateUtil.date2LongStr(new Date()));
         model.setBody(body);
-        model.setIsSendApp(true);
-        model.setMsgType(msgType);
+        getMessageModel(model, latentDanger);
         try {
             List<RoleModel> result = Privilege.roleClient.queryRoleList(roleName, null).getResult();
             if (result.size() > 0) {
@@ -179,7 +178,6 @@ public class AsyncTask {
                 List<String> userIds = userModels.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
                 model.setRecivers(userIds);
             }
-            model.setRelationId(String.valueOf(latentDanger.getId()));
             Systemctl.messageClient.create(model);
         } catch (Exception e) {
             e.printStackTrace();
@@ -195,19 +193,38 @@ public class AsyncTask {
         RequestContext.setProduct(requestContextModel.getProduct());
         RequestContext.setAppKey(requestContextModel.getAppKey());
         MessageModel model = new MessageModel();
-        model.setTitle(latentDanger.getDangerName());
         String body = String.format("隐患名称：%s；隐患级别：%s；治理方式：%s, 推送时间：%s",
                 latentDanger.getDangerName(), latentDanger.getDangerLevelName(), latentDanger.getReformTypeName(), DateUtil.date2LongStr(new Date()));
         model.setBody(body);
         model.setIsSendWeb(true);
-        model.setIsSendApp(true);
-        model.setMsgType(msgType);
         model.setRecivers(userIds);
+        getMessageModel(model, latentDanger);
         try {
-            model.setRelationId(String.valueOf(latentDanger.getId()));
             Systemctl.messageClient.create(model);
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
+
+    private MessageModel getMessageModel(MessageModel model, LatentDanger latentDanger) {
+        String type = null;
+        latentDanger.getDangerState();
+        LatentDangerState.SupervisionDangerStateEnum stateEnum =
+                LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(latentDanger.getDangerState());
+        if (!ValidationUtil.isEmpty(stateEnum)) {
+            if (stateEnum.getProcessState().equals("1")) {
+                type = "1";
+            } else if (stateEnum.getProcessState().equals("4")) {
+                type = "2";
+            }
+        }
+        if (!ValidationUtil.isEmpty(type)){
+            model.getExtras().put("type", type);
+        }
+        model.setTitle(latentDanger.getDangerName());
+        model.setIsSendApp(true);
+        model.setMsgType(msgType);
+        model.setRelationId(String.valueOf(latentDanger.getId()));
+        return model;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/core/async/AsyncTask.java

@@ -327,7 +327,7 @@ public class AsyncTask {
 			model.setMsgType(msgType);
 			model.setRelationId(String.valueOf(plan.getId()));
 			model.setRecivers(userIds);
-//			remoteSecurityService.addMessage(requestContextModel, model);
+			remoteSecurityService.addMessage(requestContextModel, model);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -355,7 +355,7 @@ public class AsyncTask {
 			model.setMsgType(msgType);
 			model.setRelationId(String.valueOf(plan.getId()));
 			model.setRecivers(recivers);
-//			remoteSecurityService.addMessage(requestContextModel, model);
+			remoteSecurityService.addMessage(requestContextModel, model);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}