Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerState.java

@@ -2,7 +2,9 @@ package com.yeejoin.amos.latentdanger.common.enums;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -47,7 +49,7 @@ public interface LatentDangerState {
         /**
          * 隐患二次审核确认
          */
-        隐患二次审核确认("隐患二次审核确认", "secondConfirm", "taskDispatch","onSiteConfirm", "1", ""),
+        隐患二次审核确认("隐患二次审核确认", "secondConfirm", "taskDispatch","onSiteConfirm", "1", "auditRecordPage"),
         /**
          * 整改任务分配
          */
@@ -187,15 +189,14 @@ public interface LatentDangerState {
             return enumName;
         }
 
-        public static String getEnumUrlByCode(String code) {
-            String enumUrl = "";
-            for(SupervisionDangerStateEnum type: SupervisionDangerStateEnum.values()) {
-                if (type.getCode().equals(code)) {
-                    enumUrl = type.getUrl();
-                    break;
-                }
+        public static Map<String, String> getEnumMapByCode(String code) {
+            Map<String, String> map = new HashMap<>();
+            SupervisionDangerStateEnum dangerEnum = getEnumByCode(code);
+            if (!ValidationUtil.isEmpty(dangerEnum)){
+                map.put("processState", dangerEnum.getProcessState());
+                map.put("url", dangerEnum.getUrl());
             }
-            return enumUrl;
+            return map;
         }
 
         public static List<Map<String, String>> getEnumList() {

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

@@ -55,8 +55,8 @@ public class RuleDangerService {
         LatentDangerRo latentDangerRo = buildLatentDangerRo(latentDanger, ruleType);
         Map<String, String> extras = !ValidationUtil.isEmpty(latentDangerRo.getExtras()) ? latentDangerRo.getExtras() : new HashMap<>();
         // 跳转url
-        String url = LatentDangerState.SupervisionDangerStateEnum.getEnumUrlByCode(latentDanger.getDangerState());
-        extras.put("url", url);
+        Map<String, String> enumMapByCode = LatentDangerState.SupervisionDangerStateEnum.getEnumMapByCode(latentDanger.getDangerState());
+        extras.putAll(enumMapByCode);
         latentDangerRo.setExtras(extras);
         latentDangerRo.setExcuteStateName(excuteStateName);
         latentDangerRo.setIsSendWeb(true);
@@ -91,6 +91,7 @@ public class RuleDangerService {
         if (!ValidationUtil.isEmpty(type)){
             Map<String, String> map = new HashMap<>();
             map.put("type", type);
+            map.put("id", String.valueOf(latentDanger.getId()));
             latentDangerRo.setExtras(map);
         }
         return latentDangerRo;