1.修改消息

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/ExecutionTypeEnum.java

@@ -5,7 +5,7 @@ package com.yeejoin.amos.fas.common.enums;
  */
 
 public enum ExecutionTypeEnum {
-    PLANCHECK("预案验证",0),
+     PLANCHECK("预案验证",0),
     FIREMANAGEMENT("火灾处置",1);
     /**
      * 名称，描述

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/BaseController.java

@@ -66,7 +66,7 @@ public class BaseController {
 	protected static final int DEFAULT_PAGE_SIZE = 10;
 	
 	 @Autowired
-	    private RedisTemplate<String, String> redisTemplate;
+	 private RedisTemplate<String, String> redisTemplate;
 	  
 
 	protected String getToken() {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/PlanDetailMapper.java

@@ -45,4 +45,8 @@ public interface PlanDetailMapper {
     List<PlanDetailVo> filterList(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight, @Param("start") int start, @Param("size") int size);
 
     List<String> getRuleIdByEquipment(@Param("id")  Long id);
+
+
+    PlanDetailVo getPlanDetailByEquipmentId(@Param("fire_equipment_id")  Long fireEquipmentId);
+
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyPlanService.java

@@ -23,14 +23,19 @@ public interface IContingencyPlanService {
 
     String DELETE_SYNC_PLAN_DOC = "DELETE_SYNC_PLAN_DOC";
     String DELETE_SYNC_PLAN_RULE = "urule/package/remove";
-    String DELETE_SYNC_PLAN_EQUIP = "DELETE_SYNC_PLAN_EQUIP";
+    String VIEW_3D_OPEN_STATUS = "/view/3d/page";
+    /**
+     * 3d用戶在线redis key前缀
+     */
+    String KEY_VIEW_3D_PAGE = "KEY_VIEW_3D_PAGE_";
 
-    ContingencyPlanResponseVo   planStart(ContingencyPlanParamVo vo, Toke toke) throws Exception;
+    ContingencyPlanResponseVo planStart(ContingencyPlanParamVo vo, Toke toke) throws Exception;
 
-    ContingencyPlanParamVo equipmentScene(Long equipmentId,String riskType );
+    ContingencyPlanParamVo equipmentScene(Long equipmentId, String riskType);
 
     /**
      * 创建
+     *
      * @param planDetail
      * @return
      */
@@ -39,6 +44,7 @@ public interface IContingencyPlanService {
 
     /**
      * 编辑
+     *
      * @param planDetail
      * @return
      */
@@ -47,6 +53,7 @@ public interface IContingencyPlanService {
 
     /**
      * 单个详情
+     *
      * @param id
      * @return
      */
@@ -54,6 +61,7 @@ public interface IContingencyPlanService {
 
     /**
      * 启用
+     *
      * @param idList
      * @return
      */
@@ -61,6 +69,7 @@ public interface IContingencyPlanService {
 
     /**
      * 停用
+     *
      * @param idList
      * @return
      */
@@ -68,6 +77,7 @@ public interface IContingencyPlanService {
 
     /**
      * 删除
+     *
      * @param idList
      * @return
      */
@@ -76,12 +86,13 @@ public interface IContingencyPlanService {
 
     /**
      * 分页查询
-     * @param page 分页
-     * @param planName 预案名称
-     * @param classifyId 预案类型
-     * @param planRange 适用范围
-     * @param editOrgName 编写部门
-     * @param implementationTimeLeft 实施时间左界限
+     *
+     * @param page                    分页
+     * @param planName                预案名称
+     * @param classifyId              预案类型
+     * @param planRange               适用范围
+     * @param editOrgName             编写部门
+     * @param implementationTimeLeft  实施时间左界限
      * @param implementationTimeRight 实施时间右界限
      * @return Page
      */
@@ -89,18 +100,21 @@ public interface IContingencyPlanService {
 
     /**
      * 查询预案使用的文档ID
+     *
      * @return
      */
     Map<Long, Long> getPlanUsedDocs();
 
     /**
      * 查询预案使用的规则ID
+     *
      * @return
      */
     Map<String, Long> getPlanUsedRules();
 
     /**
      * 查询预案使用的装备ID
+     *
      * @return
      */
     Map<Long, Long> getPlanUsedEquipments();
@@ -112,7 +126,7 @@ public interface IContingencyPlanService {
 
     Map<String, Object> firstGetRecord(String batchNo);
 
-    List<HashMap<String,Object>> getRecordList(String batchNo);
+    List<HashMap<String, Object>> getRecordList(String batchNo);
 
     Page recordListByPage(Page page, Long planId, String planName, List<Long> classifyId, Date startTimeLeft, Date startTimeRight, Integer executionType, Integer planPattern);
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/ContingencyPlanParamVo.java

 package com.yeejoin.amos.fas.business.vo;
 
 
-//请求参数
+import lombok.Data;
+
+/**
+ * @author DELL
+ */
+@Data
 public class ContingencyPlanParamVo {
 
+	public Long fireEquipmentId;
+
 	public String planId;
 
 	public Integer status;
@@ -11,44 +18,5 @@ public class ContingencyPlanParamVo {
 	public String riskType;
 	public String userName;
 	public String userId;
-	public String getPlanId() {
-		return planId;
-	}
-
-	public void setPlanId(String planId) {
-		this.planId = planId;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	public String getRiskType() {
-		return riskType;
-	}
-
-	public void setRiskType(String riskType) {
-		this.riskType = riskType;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
 }
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/config/ApplicationRunnerImpl.java

@@ -24,7 +24,7 @@ public class ApplicationRunnerImpl implements ApplicationRunner {
     private IContingencyPlanService contingencyPlanService;
 
     @Override
-    public void run(ApplicationArguments args) throws Exception {
+    public void run(ApplicationArguments args) {
         equipmentHandlerService.subscribeTopic();
         contingencyPlanService.subscribeTopic();
     }

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/PlanDetailMapper.xml

@@ -121,4 +121,16 @@
        AND equip.is_delete != 1
        AND rule.is_delete  !=1
   </select>
+  <select id="getPlanDetailByEquipmentId" resultType="com.yeejoin.amos.fas.business.vo.PlanDetailVo">
+      select
+        d.id,
+        d.status
+      from
+      c_plan_detail d,
+      c_plan_equipment e
+      where e.plan_id = d.id
+      and e.fire_equipment_id=#{fireEquipmentId}
+      and d.is_delete = false
+      limit 1
+   </select>
 </mapper>
\ No newline at end of file