Merge branch 'gaodongdong' into dev_upgrade_rule

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

@@ -59,7 +59,7 @@ public class BubbleTipAction implements CustomerAction
 			ActionResultMessage<?> action = (ActionResultMessage<?>) constructor.newInstance(result);
 			String msgType = "message";
 			Object obj = action.execute(msgType, null);
-			result.setToipResponse((ToipResponse) obj);
+//			result.setToipResponse((ToipResponse) obj);
 		}
 		catch (Exception e)
 		{

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

@@ -30,9 +30,8 @@ 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.mq.WebMqttComponent;
 import com.yeejoin.amos.fas.business.action.result.ActionResult;
-import com.yeejoin.amos.fas.business.action.result.BubbleTipResult;
+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.result.message.ActionResultMessage;
 import com.yeejoin.amos.fas.business.feign.IDutyModeServer;
 import com.yeejoin.amos.fas.business.service.impl.RuleRunigSnapshotServiceImpl;
 import com.yeejoin.amos.fas.business.service.intfc.FireStengthService;
@@ -57,6 +56,8 @@ public class ContingencyAction implements CustomerAction {
     
     @Value("${auto-sys.push.type}")
     private String pushType;
+    @Value("${spring.application.name}")
+    private String serviceName;
     
     @Autowired
     private IContingencyInstance iContingencyInstance;
@@ -138,7 +139,7 @@ public class ContingencyAction implements CustomerAction {
     }
 
 
-    public void sendcmd(String msgType, Object contingency, BubbleTipResult result) {
+    public void sendcmd(String msgType, Object contingency, SafteyPlanResult result) {
 
         Constructor<?> constructor;
         try {
@@ -147,9 +148,10 @@ public class ContingencyAction implements CustomerAction {
                     .getConstructor(ActionResult.class);
             AbstractActionResultMessage<?> action = (AbstractActionResultMessage<?>) constructor.newInstance(result);
             if ("mqtt".equals(pushType.toLowerCase())) {
-            	ToipResponse toipResponse = action.buildResponse(msgType, contingency, result);
-                webMqttComponent.publish("/test/one", toipResponse.toJsonStr());
-            } else {
+            	ToipResponse toipResponse = action.buildResponse(msgType, contingency, result.toJson());
+            	String topic = String.format("/%s/%s", serviceName, "rule");
+                webMqttComponent.publish(topic, toipResponse.toJsonStr());
+            } else if ("websocket".equals(pushType.toLowerCase())){
             	action.execute(msgType, contingency);
             }
         } catch (Exception e) {
@@ -157,7 +159,6 @@ public class ContingencyAction implements CustomerAction {
         }
     }
 
-
     /**
      * @param stepCode     当前步骤编号
      * @param stepName     当前步骤名称
@@ -174,7 +175,7 @@ public class ContingencyAction implements CustomerAction {
         ContingencyRo contingencyRo = (ContingencyRo) paramObj;
         stopSnapshop(contingencyRo);
 
-        BubbleTipResult result = new BubbleTipResult();
+        SafteyPlanResult result = new SafteyPlanResult();
         Map<String, Object> tempmap1 = new HashMap<>();
         SetpEnum[] stepArr = SetpEnum.values();
         ArrayList list = new ArrayList();
@@ -223,7 +224,7 @@ public class ContingencyAction implements CustomerAction {
         content = instedParams(content, contingencyRo);
         iContingencyInstance.createInstanceRecord(contingencyRo.getBatchNo(), "", "DEFAULT", content, "MESSAGE", "");
         
-        BubbleTipResult result = new BubbleTipResult();
+        SafteyPlanResult result = new SafteyPlanResult();
         Map<String, Object> tempmap1 = new HashMap<>();
         try {
         	SimpleDateFormat sdf = new SimpleDateFormat("YYYY/MM/DD HH:mm:ss");
@@ -273,7 +274,7 @@ public class ContingencyAction implements CustomerAction {
         //转换智能辅助中的变量
         content = instedParams(content, contingencyRo);
 
-        BubbleTipResult result = new BubbleTipResult();
+        SafteyPlanResult result = new SafteyPlanResult();
         Map<String, Object> tempmap1 = new HashMap<>();
 
         tempmap1.put("icon", icon);
@@ -344,7 +345,7 @@ public class ContingencyAction implements CustomerAction {
         tips = instedParams(tips, contingencyRo);
 
 
-        BubbleTipResult result = new BubbleTipResult();
+        SafteyPlanResult result = new SafteyPlanResult();
         Map<String, Object> tempmap1 = new HashMap<>();
 
 
@@ -430,7 +431,7 @@ public class ContingencyAction implements CustomerAction {
         stopSnapshop(contingencyRo);
 
         //转换content中的变量
-        BubbleTipResult result = new BubbleTipResult();
+        SafteyPlanResult result = new SafteyPlanResult();
         Map<String, Object> tempmap1 = new HashMap<>();
         try {
         	SimpleDateFormat sdf = new SimpleDateFormat("YYYY/MM/DD HH:mm:ss");
@@ -484,7 +485,7 @@ public class ContingencyAction implements CustomerAction {
         stopSnapshop(contingencyRo);
 
 
-        BubbleTipResult result = new BubbleTipResult();
+        SafteyPlanResult result = new SafteyPlanResult();
         Map<String, Object> tempmap1 = new HashMap<>();
 
         tempmap1.put("key", actionName);
@@ -511,7 +512,7 @@ public class ContingencyAction implements CustomerAction {
         ContingencyRo contingencyRo = (ContingencyRo) paramObj;
         stopSnapshop(contingencyRo);
 
-        BubbleTipResult result = new BubbleTipResult();
+        SafteyPlanResult result = new SafteyPlanResult();
         Map<String, Object> tempmap1 = new HashMap<>();
         //转换content中的变量
         content = instedParams(content, contingencyRo);

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

@@ -15,7 +15,7 @@ public class CheckInputItemRo implements Serializable {
 	/**
 	 * 检查项id
 	 */
-	private long pointInputitemId;
+	private Long pointInputitemId;
 	
 	/**
 	 * 检查项状态

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

@@ -18,7 +18,7 @@ public class FireEquimentDataRo extends BasicsRo
 	private long fireEquimentId;
     private String fireEqumentName;
     @Label("设备id")
-    private long id;//监测点id
+    private Long id;//监测点id
     
     private String name;//名称
     private String unit;//单位

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

@@ -5,25 +5,25 @@ import com.yeejoin.amos.fas.dao.entity.BusinessEntity;
 
 public abstract class AbstractActionResult implements ActionResult{
 	
-	public ToipResponse toipResponse;
+//	public ToipResponse toipResponse;
 	/**
 	 * 智能体业务对象
 	 */
-	private BusinessEntity bizObj;
-	
-	public ToipResponse getToipResponse() {
-		return toipResponse;
-	}
-
-	public void setToipResponse(ToipResponse toipResponse) {
-		this.toipResponse = toipResponse;
-	}
-
-	public BusinessEntity getBizObj() {
-		return bizObj;
-	}
+//	private BusinessEntity bizObj;
+//	
+//	public ToipResponse getToipResponse() {
+//		return toipResponse;
+//	}
+//
+//	public void setToipResponse(ToipResponse toipResponse) {
+//		this.toipResponse = toipResponse;
+//	}
 
-	public void setBizObj(BusinessEntity bizObj) {
-		this.bizObj = bizObj;
-	}
+//	public BusinessEntity getBizObj() {
+//		return bizObj;
+//	}
+//
+//	public void setBizObj(BusinessEntity bizObj) {
+//		this.bizObj = bizObj;
+//	}
 }

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

+package com.yeejoin.amos.fas.business.action.result;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+
+public class SafteyPlanResult implements ActionResult{
+	
+	Map<String, Object> data = new HashMap<>();
+
+	@Override
+	public JSON toJson() {
+		return (JSON) JSON.toJSON(data);
+	}
+
+	@Override
+	public void addAll(List<Object> data) {
+	}
+
+	@Override
+	public void add(Object data) {
+		this.data.putAll((Map)data);
+	}
+
+	@Override
+	public List<?> getData() {
+
+		return null;
+	}
+
+}

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

 package com.yeejoin.amos.fas.business.action.result;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,14 +26,14 @@ public class SimpleResult  extends AbstractActionResult  implements ActionResult
 				result.put("value", entry.getValue());
 				results.add(result);
 			}
-		}		
+		}
 		return (JSON) JSON.toJSON(results);
 	}
 
 	@Override
 	public void addAll(List<Object> data)
 	{
-//		this.data.addAll((Collection<? extends Map<String, Object>>) data);
+		this.data.addAll((Collection<? extends Map<String, Object>>) data);
 	}
 
 	@Override

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/result/message/AbstractActionResultMessage.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.fas.business.action.result.message;
 
 import java.io.IOException;
 
+import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.fas.business.action.result.AbstractActionResult;
 import com.yeejoin.amos.fas.business.action.result.ActionResult;
 import com.yeejoin.amos.fas.business.action.websocket.RuleWebSocket;
@@ -49,6 +50,15 @@ public abstract class AbstractActionResultMessage<R extends ToipResponse>
 		return toipResponse;
 	}
 
+	public ToipResponse buildResponse(String msgType, Object contingency, JSON msgContext)
+	{
+		ToipResponse toipResponse = new ToipResponse();
+		toipResponse.setMsgType(msgType);
+		toipResponse.setMsgContext(msgContext);
+		toipResponse.setContingency(contingency);
+		return toipResponse;
+	}
+	
 	/**
 	 * 
 	 * <pre>

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/result/message/SafteyPlanResultMessage.java

+package com.yeejoin.amos.fas.business.action.result.message;
+
+import com.yeejoin.amos.fas.business.action.result.ActionResult;
+import com.yeejoin.amos.fas.business.service.model.ToipResponse;
+
+public class SafteyPlanResultMessage  extends AbstractActionResultMessage<ToipResponse>{
+
+	public SafteyPlanResultMessage(ActionResult actionResult) {
+		this.actionResult = actionResult;
+	}
+	
+	@Override
+	protected Object getActionResultByDataFormat() {
+		return actionResult.toJson();
+	}
+
+}

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

@@ -22,6 +22,7 @@ import com.yeejoin.amos.fas.business.action.ContingencyAction;
 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.result.BubbleTipResult;
+import com.yeejoin.amos.fas.business.action.result.SafteyPlanResult;
 import com.yeejoin.amos.fas.business.dao.mapper.ImpAndFireEquipMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
 import com.yeejoin.amos.fas.business.dao.repository.IContingencyPlanInstanceRepository;
@@ -175,7 +176,7 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
             //Object result = remoteRuleServer.fireRuleFlow(contingencyRo, equipment.getReservePlan(),equipment.getName());
             ruleTrigger.publish(contingencyRo, equipment.getReservePlan(), ArrayUtils.toArray(equipment.getName()));
             
-    		BubbleTipResult result1         = new BubbleTipResult();
+            SafteyPlanResult result1         = new SafteyPlanResult();
     		Map<String, Object> tempmap2    = new HashMap<>();
     		tempmap2.put("refresh","refresh");
     		tempmap2.put("batchNo",batchNo);