item：三维预案人员获取修改

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

@@ -22,6 +22,7 @@ import com.yeejoin.amos.fas.business.dao.mapper.PlanOperationRecordMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IPlanDetailDao;
 import com.yeejoin.amos.fas.business.dao.repository.IPlanOperationRecordDao;
 import com.yeejoin.amos.fas.business.feign.IDutyModeServer;
+import com.yeejoin.amos.fas.business.feign.JcsFeign;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.service.impl.RuleRunigSnapshotServiceImpl;
 import com.yeejoin.amos.fas.business.service.intfc.*;
@@ -36,6 +37,7 @@ import com.yeejoin.amos.fas.common.enums.PlanRecordStatusEnum;
 import com.yeejoin.amos.fas.core.enums.NumberEnum;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.DateUtil;
+import com.yeejoin.amos.fas.core.util.ResponseModel;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import com.yeejoin.amos.fas.dao.entity.PlanDetail;
@@ -75,6 +77,9 @@ public class ContingencyAction implements CustomerAction {
     @Autowired
     private WebMqttComponent webMqttComponent;
 
+    @Autowired
+    private JcsFeign jcsFeign;
+
     @Value("${auto-sys.push.type}")
     private String pushType;
     @Value("${spring.application.name}")
@@ -180,24 +185,20 @@ public class ContingencyAction implements CustomerAction {
             stringStringMap = new HashMap<>();
             returnMap = new HashMap<>();
 
-            Date curDate = new Date();
-            JSONObject param = new JSONObject();
-            param.put("dutyDate", curDate);
-            Toke toke = remoteSecurityService.getServerToken();
-            CommonResponse commonResponse = dutyModeServer.dutyListByDate(toke.getAppKey(), toke.getProduct(), toke.getToke(), orgCode, param.toJSONString());
-
-            String JSONStr = JSON.toJSONString(commonResponse.getDataList());
+            ResponseModel responseModel = jcsFeign.dutyPersonList();
+            if ("SUCCESS".equals(responseModel.getDevMessage())) {
+                String JSONStr = JSON.toJSONString(responseModel.getResult());
                 JSONArray dataList = JSONObject.parseArray(JSONStr);
-            log.info(String.format("请求值班系统返回dataList：%s", dataList));
-
                 if (!ObjectUtils.isEmpty(dataList)) {
                     Map<String, String> finalReturnMap = returnMap;
                     dataList.forEach(x -> {
+                        Map<String, Object> resultMap = new HashMap<>();
                         JSONObject obj = (JSONObject) x;
-                    String name = obj.getString("position");
-                    finalReturnMap.put(name, obj.getString("dutyName"));
+                        finalReturnMap.put(obj.getString("postTypeName"), obj.getString("userName"));
                     });
                 }
+
+            }
             stringStringMap.put(batchNo, returnMap);
         }
         log.info(String.format("returnMap:【 %s 】", returnMap));

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

@@ -529,6 +529,15 @@ public class View3dServiceImpl implements IView3dService {
                 }
             }
         }
+        if (!map.containsKey("firePersonNumber")) {
+            map.put("firePersonNumber", 0);
+        }
+        if (!map.containsKey("dutyPersonNumber")) {
+            map.put("dutyPersonNumber", 0);
+        }
+        if (!map.containsKey("securityPersonNumber")) {
+            map.put("securityPersonNumber", 0);
+        }
         return map;
     }