Merge branch 'dev_upgrade-1225' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into eqintegration

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

@@ -107,36 +107,41 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
         //状态校验
         ReserveEnum reserveEnum = this.runCheck(vo);
         result.setMessage(reserveEnum.getText());
-        if (ReserveEnum.THISRUNNING.getStatus() == reserveEnum.getStatus()) {
+        if (ReserveEnum.THISRUNNING.getStatus().equals(reserveEnum.getStatus())) {
             List<PlanOperationRecord> recordList = planOperationRecordDao.findByPlanId1(Long.valueOf(vo.getPlanId()));
             result.setMessage(ReserveEnum.THISRUNNING.getText());
             result.setBatchNo(recordList.get(0).getBatchNo());
             return result;
-        } else if (ReserveEnum.RUN.getStatus() == reserveEnum.getStatus()) {
+        } else if (ReserveEnum.RUN.getStatus().equals(reserveEnum.getStatus())) {
             Optional<PlanDetail> PlanDetailOp = planDetailDao.findById(Long.valueOf(vo.getPlanId()));
             List<PlanEquipment> equipmentList = planEquipmentDao.findByPlanId(PlanDetailOp.get().getId());
             //预案启动
             if (PlanDetailOp.get() != null) {
-                //电力设备
-                Equipment equipment = equipmentService.queryOne(equipmentList.get(0).getFireEquipmentId());
                 //获取规则名称
                 List<PlanRule> planRuleList = planRuleDao.getPlanDocsByPlanId(Long.valueOf(vo.getPlanId()));
                 if (planRuleList.size() == 0) {
                     result.setMessage(ReserveEnum.NOPLAN.getText());
+                    return result;
                 }
-                equipment.setReservePlan("换流站消防专项预案" + "/" + planRuleList.get(0).getRuleId());
+                //电力设备
+                Equipment equipment = equipmentService.queryOne(equipmentList.get(0).getFireEquipmentId());
                 if (equipment == null) {
                     result.setMessage(ReserveEnum.NOEQUIP.getText());
+                    return result;
                 }
+                equipment.setReservePlan("换流站消防专项预案" + "/" + planRuleList.get(0).getRuleId());
+
                 //电力设备绑定装备
                 List<EquipmentFireEquipment> equipmentFireEquipmentList = equipmentFireEquipmentDao.findAllByEquipmentId(equipmentList.get(0).getFireEquipmentId());
                 if (equipmentFireEquipmentList.size() == 0) {
-                    result.setMessage(ReserveEnum.NOFIRE.getText());
+                    result.setMessage("该预案保护的电力设备尚未绑定配套的火灾报警设备");
+                    return result;
                 }
                 //查询设备
                 EquipmentSpecificForRiskVo equipmentSpecific = equipmentSpecificMapper.getOneById(equipmentFireEquipmentList.get(0).getFireEquipmentId());
                 if (equipmentSpecific == null) {
-                    result.setMessage(ReserveEnum.NOFIRE.getText());
+                    result.setMessage("该预案保护的电力设备尚未绑定配套的火灾报警设备");
+                    return result;
                 }
 
                 //插入运行记录表
@@ -150,7 +155,9 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                 planOperationRecord.setStartUserName(vo.getUserName());
                 planOperationRecord.setEquipmentCode(equipmentSpecific.getCode());
                 planOperationRecord.setEquipmentName(equipmentSpecific.getName());
-                if (ContingencyPlanStatusEnum.SIMULATION_START.getCode() == vo.getStatus()) {
+                planOperationRecord.setEquipmentId(equipmentSpecific.getId());
+                planOperationRecord.setFireEquipmentId(equipment.getId());
+                if (ContingencyPlanStatusEnum.SIMULATION_START.getCode().equals(vo.getStatus())) {
                     planOperationRecord.setExecutionType(ExecutionTypeEnum.PLANCHECK.getCode());
                 } else {
                     planOperationRecord.setExecutionType(ExecutionTypeEnum.FIREMANAGEMENT.getCode());
@@ -226,8 +233,22 @@ 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.isEmpty()){
+                return ReserveEnum.PLAN_EQUIP_IS_DELETE;
+            }
             List<PlanOperationRecord> recordList = planOperationRecordDao.findByPlanId1(Long.valueOf(vo.getPlanId()));
-            if (recordList.size() > 0 && vo.getStatus()!=ContingencyPlanStatusEnum.ONGOING.getCode()) {
+            if (recordList.size() > 0 && !vo.getStatus().equals(ContingencyPlanStatusEnum.ONGOING.getCode())) {
                 return ReserveEnum.THISRUNNING;
             }
             if (ContingencyPlanStatusEnum.SIMULATION_START.getCode().equals(vo.getStatus())) {
@@ -476,9 +497,9 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     @Override
     public Boolean delete(List<Long> idList) {
         planDetailMapper.updateIsDeleteByIdList(idList, true);
-//        planDocMapper.updateIsDeleteByPlanIdList(idList, true);
-//        planEquipmentMapper.updateIsDeleteByPlanIdList(idList, true);
-//        planRuleMapper.updateIsDeleteByPlanIdList(idList, true);
+        planDocMapper.updateIsDeleteByPlanIdList(idList, true);
+        planEquipmentMapper.updateIsDeleteByPlanIdList(idList, true);
+        planRuleMapper.updateIsDeleteByPlanIdList(idList, true);
         return true;
     }
 

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

@@ -592,15 +592,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);
+        }
     }
 
 
@@ -705,7 +705,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             List<Long> failIds = Lists.newArrayList();
             List<Long> successIds = Lists.newArrayList();
             fmeaPointInputitems.forEach(fmeaPointInputitem -> {
-                CheckInputItemRo checkInputItemRo = map.get(fmeaPointInputitem.getInputItemId());
+                CheckInputItemRo checkInputItemRo = map.get(fmeaPointInputitem.getPointInputitemId());
                 if (checkInputItemRo.getStatus().equals("2")) {
                     failIds.add(fmeaPointInputitem.getId());
                     fmeaIds.add(fmeaPointInputitem.getFmeaId());
@@ -1953,8 +1953,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

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

@@ -50,6 +50,8 @@
       , cpor.plan_pattern planPattern
       , cpor.start_user_name startUserName
       , cpd.plan_name planName
+      , cpor.equipment_id equipmentId
+      , cpor.fire_equipment_id fireEquipmentId
       , (SELECT classify_name FROM c_plan_classify_tree cpct WHERE id = cpd.classify_id) classifyName
       , cpd.plan_range planRange
       , TIMESTAMPDIFF(SECOND, cpor.start_time, cpor.end_time) spendTime

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

@@ -104,7 +104,7 @@
         where
             b.point_id = #{pointId}
         and
-            b.input_item_id in
+            b.id in
             <foreach collection="inputIds" item="item" index="index" separator="," open="(" close=")">
                 #{item}
             </foreach>

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

@@ -36,10 +36,11 @@
 			eq.address,
 			eq.building,
 			eq.room,
-			frs.name riskSourceName
+		    if (frs.name is null,frss.name,frs.name) as  riskSourceName
 		FROM
 			f_equipment eq
 		left join f_risk_source frs on frs.id = eq.risk_source_id
+		left join f_risk_source frss on frss.source_id = eq.risk_source_id
 		<trim prefix="WHERE" prefixOverrides="AND ">
 			<if test="name !=null and name != ''"> and (eq.name like concat(concat("%",#{name}),"%") or eq.code like concat(concat("%",#{name}),"%"))</if>
 			<if test="id != null and id != ''"> and eq.id = #{id}</if>