缺少装备的预案启动报错

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

@@ -107,12 +107,12 @@ 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());
             //预案启动
@@ -123,20 +123,24 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                 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());
                 if (equipment == null) {
                     result.setMessage(ReserveEnum.NOEQUIP.getText());
+                    return result;
                 }
                 //电力设备绑定装备
                 List<EquipmentFireEquipment> equipmentFireEquipmentList = equipmentFireEquipmentDao.findAllByEquipmentId(equipmentList.get(0).getFireEquipmentId());
                 if (equipmentFireEquipmentList.size() == 0) {
                     result.setMessage(ReserveEnum.NOFIRE.getText());
+                    return result;
                 }
                 //查询设备
                 EquipmentSpecificForRiskVo equipmentSpecific = equipmentSpecificMapper.getOneById(equipmentFireEquipmentList.get(0).getFireEquipmentId());
                 if (equipmentSpecific == null) {
                     result.setMessage(ReserveEnum.NOFIRE.getText());
+                    return result;
                 }
 
                 //插入运行记录表
@@ -152,7 +156,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                 planOperationRecord.setEquipmentName(equipmentSpecific.getName());
                 planOperationRecord.setEquipmentId(equipmentSpecific.getId());
                 planOperationRecord.setFireEquipmentId(equipment.getId());
-                if (ContingencyPlanStatusEnum.SIMULATION_START.getCode() == vo.getStatus()) {
+                if (ContingencyPlanStatusEnum.SIMULATION_START.getCode().equals(vo.getStatus())) {
                     planOperationRecord.setExecutionType(ExecutionTypeEnum.PLANCHECK.getCode());
                 } else {
                     planOperationRecord.setExecutionType(ExecutionTypeEnum.FIREMANAGEMENT.getCode());
@@ -237,13 +241,13 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
             if(planRules.size()==0){
                 return ReserveEnum.PLAN_RULE_IS_DELETE;
             }
-            //判断预案文档是否删除
+            //判断预案装备是否删除
             List<PlanEquipment>  planEquipments =  planEquipmentDao.findByPlanId(Long.valueOf(vo.getPlanId()));
-            if(planEquipments.size()==0){
+            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())) {