升压站大图API补充

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -302,6 +302,37 @@ public class MonitorFanIdxController extends BaseController {
 
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "升压站光字牌/压板状态API-通用")
+    @GetMapping("/getStatusGzpAndYb")
+    public ResponseModel getStatusGzp(@RequestParam(value = "stationId") String stationId,
+                                      @RequestParam(value = "frontModule") String frontModule) {
+        StationBasic stationBasic = stationBasicMapper.selectById(stationId);
+        String gatewayId = stationBasic.getBoosterGatewayId();
+        Map<String, String> map = monitorFanIndicatorMapper.getMajorBoosterStationInfoBySort(gatewayId, frontModule);
+        String name = map.get("text").contains("主变")?map.get("text").substring(0,3):map.get("text");
+        HashMap<String, String> stringStringHashMap = new HashMap<>();
+        stringStringHashMap.put("gzp", "光字牌");
+        stringStringHashMap.put("ybzt", "压板状态");
+        stringStringHashMap.put("agzp", "A套保护光字牌");
+        stringStringHashMap.put("bgzp", "B套保护光字牌");
+        for (Map.Entry<String, String> stringStringEntry : stringStringHashMap.entrySet()) {
+            List<Map<String, Object>> statusMonitoring = monitorFanIndicator.getStatusGzp(gatewayId ,stringStringEntry.getValue(), name);
+            IPage<Map<String,Object>> result = new Page<>();
+            result.setRecords(statusMonitoring);
+            result.setCurrent(1);
+            result.setTotal(statusMonitoring.size());
+            try {
+                emqKeeper.getMqttClient().publish(String.format("%s/%s/%s", stationId, frontModule, stringStringEntry.getKey()), JSON.toJSONString(result).getBytes(),0,false);
+            } catch (MqttException e) {
+                e.printStackTrace();
+            }
+        }
+        return ResponseHelper.buildResponse(null);
+    }
+
+
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "集电线路图左侧 集电线列表")
     @GetMapping("/jdTree")
     public ResponseModel<IPage<Map<String, Object>>> getStatusJDX(@RequestParam(value = "stationId")String stationId) {

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -671,9 +671,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         List<Map<String,Object>> statusMaps = new ArrayList<>();
             for (IndicatorsDto listDatum : listData) {
                 Map<String, Object> statusMap = new HashMap<>();
-                statusMap.put("data",statusMap.get("displayName"));
-                statusMap.put("state",statusMap.get("state").equals("true")? 1:0);
-                statusMap.put("title",statusMap.get("state").equals("true")?"断":"通");
+                statusMap.put("data",listDatum.getDisplayName());
+                statusMap.put("state",listDatum.getState().equals("true")? 1:0);
+                statusMap.put("title",listDatum.getState().equals("true")?"断":"通");
                 statusMaps.add(statusMap);
             }
         return  statusMaps;