规则修改代码适配

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

@@ -12,12 +12,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.client.RestTemplate;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yeejoin.amos.fas.business.action.result.ActionResult;
@@ -26,6 +22,8 @@ import com.yeejoin.amos.fas.business.action.result.message.ActionResultMessage;
 import com.yeejoin.amos.fas.business.service.impl.RuleRunigSnapshotServiceImpl;
 import com.yeejoin.amos.fas.business.service.intfc.FireStengthService;
 import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance;
+import com.yeejoin.amos.fas.business.service.intfc.IRiskSourceService;
+import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
 import com.yeejoin.amos.fas.business.service.model.ContingencyRo;
 import com.yeejoin.amos.fas.business.util.StringUtil;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
@@ -43,11 +41,13 @@ public class ContingencyAction implements CustomerAction {
     @Autowired
     private FireStengthService fireStrengthService;
 
-    private RestTemplate restTemplate = new RestTemplate();
+   // private RestTemplate restTemplate = new RestTemplate();
 
-    @Value("${bussunis.domain}")
-    private String bussunisDomain ;
+   // @Value("${bussunis.domain}")
+   // private String bussunisDomain ;
 
+    @Autowired
+    private IRiskSourceService riskSourceService;
 
     private static Map<String, String> OPERATE_RECORD_ID = new HashMap<>();
 
@@ -289,10 +289,10 @@ public class ContingencyAction implements CustomerAction {
 
     private boolean sendButton(String batchNo,String contingencyPlanId,String equipmentId,String actionName,String buttonJson)    {
 
-        String url = bussunisDomain+ "/api/risksource/contingency/setup";
+      //  String url = bussunisDomain+ "/api/risksource/contingency/setup";
 
         ObjectMapper objectMapper = new ObjectMapper();
-        Map<String,Object> map = new HashMap<>();
+        //Map<String,Object> map = new HashMap<>();
 
         /**
          * batchNo
@@ -306,24 +306,30 @@ public class ContingencyAction implements CustomerAction {
         try {
             Map button = objectMapper.readValue(buttonJson,Map.class);
             Map operateInstance = (Map)((List)button.get("operate")).get(0);
-            map.put("batchNo",batchNo);
-            map.put("actionName",actionName);
-            map.put("equipmentId",equipmentId);
-            map.put("stepCode",button.get("stepCode"));
-            map.put("buttonCode",operateInstance.get("code"));
-            map.put("confirm","CONFIRM");
-            map.put("stepState",operateInstance.get("stepState"));
-            map.put("contingencyPlanId",contingencyPlanId);
-
-            HttpEntity<Map> entity = new HttpEntity<>(map);
-            restTemplate.exchange(url, HttpMethod.POST,entity,Map.class);
+//            map.put("batchNo",batchNo);
+//            map.put("actionName",actionName);
+//            map.put("equipmentId",equipmentId);
+//            map.put("stepCode",button.get("stepCode"));
+//            map.put("buttonCode",operateInstance.get("code"));
+//            map.put("confirm","CONFIRM");
+//            map.put("stepState",operateInstance.get("stepState"));
+//            map.put("contingencyPlanId",contingencyPlanId);
+            ContingencyDeviceStatus contingencyDeviceStatus = new ContingencyDeviceStatus();
+            contingencyDeviceStatus.setActionName(actionName);
+            contingencyDeviceStatus.setButtonCode(String.valueOf(operateInstance.get("code")));
+            contingencyDeviceStatus.setConfirm("CONFIRM");
+            contingencyDeviceStatus.setContingencyPlanId(contingencyPlanId);
+            contingencyDeviceStatus.setEquipmentId(equipmentId);
+            contingencyDeviceStatus.setStepCode(String.valueOf(button.get("stepCode")));
+            contingencyDeviceStatus.setStepState(String.valueOf(operateInstance.get("stepState")));
+            riskSourceService.queryContingencyDeviceStatus(contingencyDeviceStatus);
+           //HttpEntity<Map> entity = new HttpEntity<>(map);
+          //  restTemplate.exchange(url, HttpMethod.POST,entity,Map.class);
 
         } catch (IOException e) {
             e.printStackTrace();
         }
 
-
-
         return false;
     }
 

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

@@ -54,6 +54,4 @@ emqx.user-name=super
 emqx.password=a123456
 
 Push.fegin.name=PPMESSAGEPUSHSERVICE15
-dutyMode.fegin.name=AMOS-DUTY
-
-bussunis.domain=http://172.16.10.183:8083
\ No newline at end of file
+dutyMode.fegin.name=AMOS-DUTY
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/application-docker.properties

@@ -54,6 +54,4 @@ emqx.user-name=super
 emqx.password=a123456
 
 Push.fegin.name=AMOS-PUSH
-dutyMode.fegin.name=AMOS-DUTY
-
-bussunis.domain=http://172.16.10.183:8083
\ No newline at end of file
+dutyMode.fegin.name=AMOS-DUTY
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/application-test.properties

@@ -54,6 +54,4 @@ emqx.user-name=super
 emqx.password=a123456
 
 Push.fegin.name=PPMESSAGEPUSHSERVICE15
-dutyMode.fegin.name=AMOS-DUTY
-
-bussunis.domain=http://172.16.10.183:8083
\ No newline at end of file
+dutyMode.fegin.name=AMOS-DUTY
\ No newline at end of file