修复bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -7,7 +7,6 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -18,7 +17,6 @@ import java.util.regex.Pattern;
 
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
 import com.yeejoin.amos.fas.core.enums.NumberEnum;
-import com.yeejoin.amos.fas.core.enums.ReserveEnum;
 import com.yeejoin.amos.fas.core.util.DateUtil;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import org.slf4j.Logger;
@@ -42,13 +40,11 @@ import com.yeejoin.amos.fas.business.action.el.ELEvaluationContext;
 import com.yeejoin.amos.fas.business.action.model.ContingencyEvent;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
 import com.yeejoin.amos.fas.business.action.model.DeviceRo;
-import com.yeejoin.amos.fas.business.action.model.SetpEnum;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
 import com.yeejoin.amos.fas.business.action.result.ActionResult;
 import com.yeejoin.amos.fas.business.action.result.SafteyPlanResult;
 import com.yeejoin.amos.fas.business.action.result.message.AbstractActionResultMessage;
 import com.yeejoin.amos.fas.business.action.util.ContingencyLogPublisher;
-import com.yeejoin.amos.fas.business.action.util.StepComparator;
 import com.yeejoin.amos.fas.business.feign.IDutyModeServer;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.service.impl.RuleRunigSnapshotServiceImpl;
@@ -214,50 +210,78 @@ public class ContingencyAction implements CustomerAction {
     /**
      * @param stepCode     当前步骤编号
      * @param stepName     当前步骤名称
-     * @param state        当前步骤状态
      * @param nextStepCode 下一步编号
      * @param nextStepName 下一步名称
-     * @param stepType     步骤类型，总览步骤、详细步骤
      * @param paramObj     预案对象
      */
-    @RuleMethod(methodLabel = "步骤更新", project = "换流站消防专项预案")
-    public void stepInfo(@MethodParam(paramLabel = "当前编号") String stepCode, 
-//    		@MethodParam(paramLabel = "步骤类型") String stepType, 
-    		@MethodParam(paramLabel = "对象") Object paramObj) {
+    @RuleMethod(methodLabel = "步骤更新(新)", project = "换流站消防专项预案")
+    public void stepInfoNew(@MethodParam(paramLabel = "当前步骤编号") String stepCode,
+                            @MethodParam(paramLabel = "当前步骤名称") String stepName,
+    		                @MethodParam(paramLabel = "下一步编号") String nextStepCode,
+                            @MethodParam(paramLabel = "下一步名称") String nextStepName,
+                         @MethodParam(paramLabel = "对象") Object paramObj) {
         ContingencyRo contingencyRo = (ContingencyRo) paramObj;
         stopSnapshop(contingencyRo);
 
         SafteyPlanResult result = new SafteyPlanResult();
         Map<String, Object> tempmap1 = new HashMap<>();
-        SetpEnum[] stepArr = SetpEnum.values();
         ArrayList list = new ArrayList();
-        HashMap preStep = new HashMap();
-        StepComparator comparator = new StepComparator();
-        Arrays.sort(stepArr, comparator);
-        
-        boolean flage = false;
-        SetpEnum pstep = null;
-        for (SetpEnum step : stepArr) {
-        	if (Long.valueOf(step.getValue()) == Long.valueOf(stepCode)) {
-        		if (!ObjectUtils.isEmpty(pstep)) {
-        			preStep.put("stepCode", pstep.getValue());
-            		preStep.put("stepName", pstep.getTitle());
-        		}
-        		flage = true;
-        	}
-        	if (flage) {
-        		HashMap map = new HashMap();
-        		map.put("stepCode", step.getValue());
-        		map.put("stepName", step.getTitle());
-        		list.add(map);
-        	}
-        	pstep = step;
-        }
-        
+        HashMap step = new HashMap();
+
+        step.put("stepCode", stepCode);
+        step.put("stepName", stepName);
+
+        HashMap nextmap = new HashMap();
+        nextmap.put("stepCode", nextStepCode);
+        nextmap.put("stepName", nextStepName);
+        list.add(step);
+        list.add(nextmap);
+
         tempmap1.put("step", list);
-        tempmap1.put("preStep", preStep);
+        tempmap1.put("preStep", new HashMap());
         result.add(tempmap1);
-        log.info("巡检消息发送规则" + JSONObject.toJSONString(result));
+        log.info("步骤更新(new)" + JSONObject.toJSONString(result));
+        this.sendcmd("steparea", contingencyRo, result);
+    }
+
+    @RuleMethod(methodLabel = "步骤更新", project = "换流站消防专项预案")
+    public void stepInfo(@MethodParam(paramLabel = "当前编号") String stepCode, 
+//    		@MethodParam(paramLabel = "步骤类型") String stepType, 
+    		@MethodParam(paramLabel = "对象") Object paramObj) {
+        ContingencyRo contingencyRo = (ContingencyRo) paramObj;
+        stopSnapshop(contingencyRo);
+//
+        SafteyPlanResult result = new SafteyPlanResult();
+//        Map<String, Object> tempmap1 = new HashMap<>();
+////        SetpEnum[] stepArr = SetpEnum.values();
+//        ArrayList list = new ArrayList();
+//        HashMap preStep = new HashMap();
+//        StepComparator comparator = new StepComparator();
+////        Arrays.sort(stepArr, comparator);
+//
+//        boolean flage = false;
+//        SetpEnum pstep = null;
+//        for (SetpEnum step : stepArr) {
+//        	if (Long.valueOf(step.getValue()) == Long.valueOf(stepCode)) {
+//        		if (!ObjectUtils.isEmpty(pstep)) {
+//        			preStep.put("stepCode", pstep.getValue());
+//            		preStep.put("stepName", pstep.getTitle());
+//        		}
+//        		flage = true;
+//        	}
+//        	if (flage) {
+//        		HashMap map = new HashMap();
+//        		map.put("stepCode", step.getValue());
+//        		map.put("stepName", step.getTitle());
+//        		list.add(map);
+//        	}
+//        	pstep = step;
+//        }
+//
+//        tempmap1.put("step", list);
+//        tempmap1.put("preStep", preStep);
+//        result.add(tempmap1);
+//        log.info("巡检消息发送规则" + JSONObject.toJSONString(result));
         this.sendcmd("steparea", contingencyRo, result);
     }
     
@@ -751,7 +775,7 @@ public class ContingencyAction implements CustomerAction {
         Map<String, Object> equipemtnPoints = pointCache.get(contingencyRo.getEquipmentId());
         
         tempmap1.put("type", "buttonCache");
-        tempmap1.put("content", equipemtnPoints.values());
+        tempmap1.put("content", ObjectUtils.isEmpty(equipemtnPoints) ? new ArrayList<>() : equipemtnPoints.values());
         result.add(tempmap1);
         
         this.sendcmd("message", paramObj, result);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/SetpEnum.java

-package com.yeejoin.amos.fas.business.action.model;
-
-import com.yeejoin.amos.component.rule.model.RuleConstants;
-
-//@Constants(value = SetpEnum.class)
-public enum SetpEnum  implements RuleConstants{
-	STEP0("0", "确认火灾", 0), 
-	STEP1("1", "停运换流阀、拨打报警电话", 1), 
-	STEP2("2", "开启水喷雾系统", 2), 
-	STEP3("3", "断开上级电源", 3),
-	STEP4("4", "开启油枕排油系统", 4),
-	STEP5("5", "消防炮“一键启动”", 5),
-//	STEP6("6", "消防供水", 6),
-	STEP7("7", "阀厅防护", 7),
-	STEP8("8", "本体排油", 8),
-	STEP9("9", "停运空调和水冷系统", 9),
-	STEP10("10", "驻站消防指挥权准备交接", 10),
-	STEP11("11", "驻站消防指挥权交接", 11),
-	STEP12("12", "电缆沟封堵", 12),
-	STEP13("13", "灭火指挥权交接", 13),
-	STEP14("14", "应急处置结束", 14);
-
-	
-	private String stepCode;
-	private String stepName;
-	private int order;
-	
-	SetpEnum(String stepCode, String stepName, int order) {
-		this.stepCode = stepCode;
-		this.stepName = stepName;
-		this.order = order;
-	}
-	
-	@Override
-	public String getValue() {
-		return stepCode;
-	}
-
-	@Override
-	public String getTitle() {
-		return stepName;
-	}
-	
-	public int getOrder() {
-		return order;
-	}
-
-	public static SetpEnum getStepByCode(String stepCode) {
-		for (SetpEnum setp : SetpEnum.values()) {
-			if (setp.stepCode.equals(stepCode)) {
-				return setp;
-			}
-		}
-		return null;
-	}
-}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/util/StepComparator.java

-package com.yeejoin.amos.fas.business.action.util;
-
-import java.util.Comparator;
-
-import com.yeejoin.amos.fas.business.action.model.SetpEnum;
-
-public class StepComparator implements Comparator<SetpEnum>{
-	@Override
-    public int compare(SetpEnum o1, SetpEnum o2) {
-        //对日期字段进行升序，如果欲降序可采用before方法
-        if(o1.getOrder() > o2.getOrder()) return 1;
-        return -1;
-    }
-}

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

@@ -5,7 +5,6 @@ import com.yeejoin.amos.component.rule.RuleTrigger;
 import com.yeejoin.amos.fas.business.action.ContingencyAction;
 import com.yeejoin.amos.fas.business.action.model.ContingencyEvent;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
-import com.yeejoin.amos.fas.business.action.model.SetpEnum;
 import com.yeejoin.amos.fas.business.action.util.ContingencyLogPublisher;
 import com.yeejoin.amos.fas.business.dao.mapper.FireEquipPointMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.ImpAndFireEquipMapper;
@@ -165,8 +164,8 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
             contingencyRo.setButtonCode(buttonCode);
             contingencyRo.setButtonState(buttonState);
             BeanUtils.copyProperties(contingencyOriginalData, contingencyRo);
-            SetpEnum step = SetpEnum.getStepByCode(stepCode);
-            contingencyRo.setStep(step.getValue());
+//            SetpEnum step = SetpEnum.getStepByCode(stepCode);
+            contingencyRo.setStep(stepCode);
             contingencyRo.setStepState(stepMap.get(stepKey));
 //            contingencyRo.setStep(stepCode);
             log.info("stepstate:" + contingencyRo.getStepState());

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

@@ -30,7 +30,6 @@ import com.google.common.collect.Sets;
 import com.yeejoin.amos.component.rule.RuleTrigger;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
 import com.yeejoin.amos.fas.business.action.model.FireEquimentDataRo;
-import com.yeejoin.amos.fas.business.action.model.SetpEnum;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttSubscribe;
 import com.yeejoin.amos.fas.business.dao.mapper.EquipmentSpecificMapper;
@@ -53,7 +52,6 @@ import com.yeejoin.amos.fas.business.util.RpnUtils;
 import com.yeejoin.amos.fas.business.util.StringUtil;
 import com.yeejoin.amos.fas.business.vo.EquipmentSpecificForRiskVo;
 import com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo;
-import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.business.vo.Toke;
 import com.yeejoin.amos.fas.business.vo.TopicEntityVo;
 import com.yeejoin.amos.fas.client.invoke.RsDataQueue;
@@ -414,7 +412,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         contingencyRo.setEquipmentName(equipment.getName());
         contingencyRo.setFireEquipmentId(String.valueOf(equipmentSpecific.getId()));
         contingencyRo.setFireEquipmentName(equipmentSpecific.getName());
-        contingencyRo.setStep(SetpEnum.STEP0.getValue());
+        contingencyRo.setStep("0");
         contingencyRo.setConfirm("NONE");
         contingencyRo.setFireTruckRoute(equipment.getFireTruckRoute());
         contingencyRo.setRunstep(false);

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

@@ -59,7 +59,6 @@ import com.yeejoin.amos.fas.business.action.model.DeviceRo;
 import com.yeejoin.amos.fas.business.action.model.FireEquimentDataRo;
 import com.yeejoin.amos.fas.business.action.model.ProtalDataRo;
 import com.yeejoin.amos.fas.business.action.model.RiskSourceRuleRo;
-import com.yeejoin.amos.fas.business.action.model.SetpEnum;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
 import com.yeejoin.amos.fas.business.bo.BindRegionBo;
 import com.yeejoin.amos.fas.business.bo.JpushMsgBo;
@@ -619,7 +618,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         contingencyRo.setEquipmentName(equipment.getName());
         contingencyRo.setFireEquipmentId(String.valueOf(fireEquipment.getId()));
         contingencyRo.setFireEquipmentName(fireEquipment.getName());
-        contingencyRo.setStep(SetpEnum.STEP0.getValue());
+        contingencyRo.setStep("0");
         contingencyRo.setConfirm("NONE");
         contingencyRo.setFireTruckRoute(equipment.getFireTruckRoute());
         contingencyRo.setRunstep(false);