bug修改提交

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/PlanOperationRecord.java

@@ -83,5 +83,16 @@ public class PlanOperationRecord extends BasicEntity {
      */
     @Column(name="equipment_name")
     private String equipmentName;
+
+    /**
+     * 装备id
+     */
+    @Column(name="equipment_id")
+    private Long equipmentId;
+    /**
+     * 电力装备id
+     */
+    @Column(name="fire_equipment_id")
+    private Long fireEquipmentId;
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

@@ -44,5 +44,5 @@ 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);
 
-    String getRuleIdByEquipment(@Param("id")  Long id);
+    List<String> getRuleIdByEquipment(@Param("id")  Long id);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanDocDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import com.yeejoin.amos.fas.dao.entity.PlanDoc;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -21,4 +22,7 @@ public interface IPlanDocDao extends BaseDao<PlanDoc, Long> {
     List<PlanDoc> findAllByPlanIdIn(List<Long> planId);
 
     List<PlanDoc> findAllByIsDelete(Boolean isDelete);
+
+    @Query(value="SELECT * from c_plan_doc where plan_id in (?1) AND is_delete = 0 ", nativeQuery = true)
+    List<PlanDoc> findAllByPlanId(Long planId);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanEquipmentDao.java

@@ -20,12 +20,14 @@ public interface IPlanEquipmentDao extends BaseDao<PlanEquipment, Long> {
     void deleteByPlanId(long planId);
 
     List<PlanEquipment> getPlanDocsByPlanId(Long planId);
-
+    @Query(value="SELECT * from c_plan_equipment where plan_id = ?1 AND is_delete = 0 ", nativeQuery = true)
     List<PlanEquipment> findByPlanId(Long planId);
 
     List<PlanEquipment> findAllByIsDelete(Boolean isDelete);
 
     List<PlanEquipment> findAllByPlanIdIn(List<Long> planId);
 
+    @Query(value="SELECT * from c_plan_equipment where  fire_equipment_id in (?1) AND is_delete = 0 ", nativeQuery = true)
     List<PlanEquipment> findAllByFireEquipmentIdIn(List<Long> id);
+
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanRuleDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
-import com.yeejoin.amos.fas.dao.entity.PlanDoc;
 import com.yeejoin.amos.fas.dao.entity.PlanRule;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <h1><h1>
@@ -23,4 +22,7 @@ public interface IPlanRuleDao  extends BaseDao<PlanRule, Long>{
     List<PlanRule> findAllByIsDelete(Boolean isDelete);
 
     List<PlanRule> findAllByPlanIdIn(List<Long> planIds);
+
+    @Query(value="SELECT * from c_plan_rule where plan_id in (?1) AND is_delete = 0 ", nativeQuery = true)
+    List<PlanRule> findAllByPlanId(Long planId);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/IDutyModeServer.java

@@ -8,8 +8,8 @@ import com.yeejoin.amos.fas.core.util.CommonResponse;
 
 @FeignClient(name="${dutyMode.fegin.name}", fallback=DutyModeServerFallback.class, configuration=FeignConfiguration.class)
 public interface IDutyModeServer {
-	
-	@RequestMapping(value = "/duty/listByDay", method = RequestMethod.POST,consumes = "application/json")
+
+	@RequestMapping(value = "/duty/duty/listByDay", method = RequestMethod.POST,consumes = "application/json")
 	public CommonResponse dutyListByDay(
 			@RequestHeader(name="appKey",required = true) String appKey,
 			@RequestHeader(name="product",required = true) String product,
@@ -17,7 +17,7 @@ public interface IDutyModeServer {
 			@RequestHeader(name="orgCode",required = true) String orgCode,
 			@RequestBody String param);
 
-	@RequestMapping(value = "/duty/dutyListByDate", method = RequestMethod.POST,consumes = "application/json")
+	@RequestMapping(value = "/duty/duty/dutyListByDate", method = RequestMethod.POST,consumes = "application/json")
 	public CommonResponse dutyListByDate(
 			@RequestHeader(name="appKey",required = true) String appKey,
 			@RequestHeader(name="product",required = true) String product,

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java

@@ -196,8 +196,9 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
 
                 contingencyRo.setEquipmentCode(equipment.getCode());
 
-                String plan = this.getNumberPlan(Long.parseLong(contingencyRo.getEquipmentId()));
-                ruleTrigger.publish(contingencyRo, "换流站消防专项预案/" + plan, ArrayUtils.toArray(equipment.getName()));
+                List<String> plan = this.getNumberPlan(Long.parseLong(contingencyRo.getEquipmentId()));
+
+                ruleTrigger.publish(contingencyRo, "换流站消防专项预案/" + plan.get(0), ArrayUtils.toArray(equipment.getName()));
 
                 publisherPlanLog(stepCode, buttonCode, batchNo);
             }
@@ -309,8 +310,8 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
         iContingencyOriginalDataDao.updateByButtonStep(step, batchNo);
     }
 
-    public String getNumberPlan(Long id) {
-        String ruleId = planDetailMapper.getRuleIdByEquipment(id);
+    public List<String>  getNumberPlan(Long id) {
+        List<String> ruleId = planDetailMapper.getRuleIdByEquipment(id);
         return ruleId;
     }
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -150,6 +150,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                 planOperationRecord.setStartUserName(vo.getUserName());
                 planOperationRecord.setEquipmentCode(equipmentSpecific.getCode());
                 planOperationRecord.setEquipmentName(equipmentSpecific.getName());
+                planOperationRecord.setEquipmentId(equipmentSpecific.getId());
+                planOperationRecord.setFireEquipmentId(equipment.getId());
                 if (ContingencyPlanStatusEnum.SIMULATION_START.getCode() == vo.getStatus()) {
                     planOperationRecord.setExecutionType(ExecutionTypeEnum.PLANCHECK.getCode());
                 } else {
@@ -226,6 +228,20 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     public ReserveEnum runCheck(ContingencyPlanParamVo vo) throws Exception {
         if (EquipmentRiskTypeEnum.HZGJ.getCode().equals(vo.getRiskType()) || StringUtils.isBlank(vo.getRiskType())) {
 
+            List<PlanDoc>  planDocs =  planDocDao.findAllByPlanId(Long.valueOf(vo.getPlanId()));
+            if(planDocs.size()==0){
+                return ReserveEnum.PLAN_DOC_IS_DELETE;
+            }
+            //判断预案文档是否删除
+            List<PlanRule>  planRules =  planRuleDao.findAllByPlanId(Long.valueOf(vo.getPlanId()));
+            if(planRules.size()==0){
+                return ReserveEnum.PLAN_RULE_IS_DELETE;
+            }
+            //判断预案文档是否删除
+            List<PlanEquipment>  planEquipments =  planEquipmentDao.findByPlanId(Long.valueOf(vo.getPlanId()));
+            if(planEquipments.size()==0){
+                return ReserveEnum.PLAN_EQUIP_IS_DELETE;
+            }
             List<PlanOperationRecord> recordList = planOperationRecordDao.findByPlanId1(Long.valueOf(vo.getPlanId()));
             if (recordList.size() > 0 && vo.getStatus()!=ContingencyPlanStatusEnum.ONGOING.getCode()) {
                 return ReserveEnum.THISRUNNING;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -591,15 +591,15 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
         contingencyRo.setTelemetryMap(telemetryMap);
 
-        String plan = this.getNumberPlan(Long.parseLong(contingencyRo.getEquipmentId()));
-        log.debug("开始调用规则");
-        Object result = ruleTrigger.publish(contingencyRo, equipment.getReservePlan(), ArrayUtils.toArray(equipment.getName()));
-
-        log.debug("规则调用返回==", result);
-
-        ContingencyOriginalData contingencyOriginalData = new ContingencyOriginalData();
-        BeanUtils.copyProperties(contingencyRo, contingencyOriginalData);
-        iContingencyOriginalDataDao.save(contingencyOriginalData);
+        List<String> plan = this.getNumberPlan(Long.parseLong(contingencyRo.getEquipmentId()));
+        if(plan.size()>0){
+            log.debug("开始调用规则");
+            Object result = ruleTrigger.publish(contingencyRo, "换流站消防专项预案/" + plan.get(0), ArrayUtils.toArray(equipment.getName()));
+            log.debug("规则调用返回==", result);
+            ContingencyOriginalData contingencyOriginalData = new ContingencyOriginalData();
+            BeanUtils.copyProperties(contingencyRo, contingencyOriginalData);
+            iContingencyOriginalDataDao.save(contingencyOriginalData);
+        }
     }
 
 
@@ -1918,8 +1918,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         return null;
     }
 
-    public String getNumberPlan(Long id){
-        String  ruleId =  planDetailMapper.getRuleIdByEquipment(id);
+    public List<String> getNumberPlan(Long id){
+        List<String>  ruleId =  planDetailMapper.getRuleIdByEquipment(id);
         return ruleId;
     }
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/core/enums/ReserveEnum.java

@@ -17,7 +17,10 @@ public enum ReserveEnum {
     NOFIRENOPLAN(5, "非火灾告警没有预案"),
     PLANSTATUSERROR(6,"预案启动状态不正确"),
     NOPLAN(7,"预案模型未绑定预案"),
-    THISRUNNING(8, "此预案正在启动中");
+    THISRUNNING(8, "此预案正在启动中"),
+    PLAN_DOC_IS_DELETE(9, "预案文档已经被删除，无法启动"),
+    PLAN_RULE_IS_DELETE(10, "预案规则已经被删除，无法启动"),
+    PLAN_EQUIP_IS_DELETE(10, "电力设备已经被删除，无法启动");
     private Integer status;
     private String text;
 

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

@@ -115,5 +115,7 @@
 		LEFT JOIN  f_equipment equipment ON equipment.id =  equip.fire_equipment_id
     where
        equipment.id = #{id}
+       AND equip.is_delete != 1
+       AND rule.is_delete  !=1
   </select>
 </mapper>
\ No newline at end of file