移除请求influxdb数据得

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

@@ -557,7 +557,7 @@ public class MonitorFanIdxController extends BaseController {
 
         Map<String, String> map = monitorFanIndicatorMapper.getMajorBoosterStationInfoBySort(gatewayId, equipName);
         String name = map.get("text").equals("1主变高压侧") || map.get("text").equals("1主变低压侧") ? map.get("text").substring(0, 3) : map.get("text");
-        String sql = " SELECT * FROM indicators_" + gatewayId + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='故障停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='停机 or 'equipmentIndexName ='停机' or equipmentIndexName ='停机') and value = 'true'";
+//        String sql = " SELECT * FROM indicators_" + gatewayId + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='故障停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='停机 or 'equipmentIndexName ='停机' or equipmentIndexName ='停机') and value = 'true'";
 
         Map<String, Object> switchUrl = monitorFanIndicatorImpl.getSwitchUrl(gatewayId, name);
         List<Map<String, Object>> statusMonitoring = monitorFanIndicator.getStatusGzp(gatewayId, "网络", name, null);

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

@@ -439,44 +439,44 @@ public class MonitoringServiceIMQTTmpl {
 
     @Scheduled(cron = "0 0/1 * * * *")
     public void getIndicatorsSwitchInfo() {
-        Integer current = 1;
-        Integer size = 99;
-        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("booster_gateway_id").eq("station_type", "FDZ"));
-        stationBasicList.forEach(stationBasic -> {
-            //获取系统的forntmodule  前期每次都查询 后续应该放到缓存中
-            List<Map<String, String>> boosterStationInfo = monitorFanIndicatorregionMapper.getBoosterStationInfo(stationBasic.getBoosterGatewayId());
-            for (int i = 0; i < boosterStationInfo.size(); i++) {
-                Map<String, String> map = boosterStationInfo.get(i);
-                sendIndicatorSwitch(stationBasic.getSequenceNbr().toString(), stationBasic.getBoosterGatewayId(), map.get("boosterName"));
-            }
-        });
+//        Integer current = 1;
+//        Integer size = 99;
+//        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("booster_gateway_id").eq("station_type", "FDZ"));
+//        stationBasicList.forEach(stationBasic -> {
+//            //获取系统的forntmodule  前期每次都查询 后续应该放到缓存中
+//            List<Map<String, String>> boosterStationInfo = monitorFanIndicatorregionMapper.getBoosterStationInfo(stationBasic.getBoosterGatewayId());
+//            for (int i = 0; i < boosterStationInfo.size(); i++) {
+//                Map<String, String> map = boosterStationInfo.get(i);
+//                sendIndicatorSwitch(stationBasic.getSequenceNbr().toString(), stationBasic.getBoosterGatewayId(), map.get("boosterName"));
+//            }
+//        });
     }
 
-    public void sendIndicatorSwitch(String stationId, String bootStationGateWayId, String frontMoudule) {
-        String sql = "SELECT * FROM indicators_" + bootStationGateWayId + " where frontModule = '" + frontMoudule + "' and systemType='开关'";
-        List<IndicatorsDto> indicatorsDtoList = influxDButils.getListData(sql, IndicatorsDto.class);
-        //过滤掉包含数字的开关
-        List<IndicatorsDto> result = indicatorsDtoList.stream().filter(indicatorsDto -> !indicatorsDto.getDisplayName().matches(".*\\d+.*")).collect(Collectors.toList());
-        HashMap<String, String> hashMap = new HashMap<>();
-        for (int i = 0; i < result.size(); i++) {
-            IndicatorsDto indicatorsDto = result.get(i);
-            //此处需要根据查询的结果来动态的给定图片的url路径。
-            hashMap.put("url" + i, "tetee");
-            hashMap.put("display" + i, indicatorsDto.getDisplayName());
-        }
-        Page<HashMap<String, String>> hashMapPage = new Page<>();
-        List<HashMap<String, String>> list = new ArrayList<>();
-        list.add(hashMap);
-        hashMapPage.setRecords(list);
-        hashMapPage.setTotal(list.size());
-        hashMapPage.setCurrent(1);
-        System.out.println(result.size());
-        try {
-            emqKeeper.getMqttClient().publish(stationId + bootStationGateWayId + "_topic", JSON.toJSON(hashMapPage).toString().getBytes("UTF-8"), 1, true);
-            logger.info(JSON.toJSONString(hashMapPage));
-            logger.info("-----------------发送升压站数据成功=================== 成功！");
-        } catch (Exception e) {
-            logger.info("-----------------发送升压站数据成功=================== 成功！");
-        }
-    }
+//    public void sendIndicatorSwitch(String stationId, String bootStationGateWayId, String frontMoudule) {
+//        String sql = "SELECT * FROM indicators_" + bootStationGateWayId + " where frontModule = '" + frontMoudule + "' and systemType='开关'";
+//        List<IndicatorsDto> indicatorsDtoList = influxDButils.getListData(sql, IndicatorsDto.class);
+//        //过滤掉包含数字的开关
+//        List<IndicatorsDto> result = indicatorsDtoList.stream().filter(indicatorsDto -> !indicatorsDto.getDisplayName().matches(".*\\d+.*")).collect(Collectors.toList());
+//        HashMap<String, String> hashMap = new HashMap<>();
+//        for (int i = 0; i < result.size(); i++) {
+//            IndicatorsDto indicatorsDto = result.get(i);
+//            //此处需要根据查询的结果来动态的给定图片的url路径。
+//            hashMap.put("url" + i, "tetee");
+//            hashMap.put("display" + i, indicatorsDto.getDisplayName());
+//        }
+//        Page<HashMap<String, String>> hashMapPage = new Page<>();
+//        List<HashMap<String, String>> list = new ArrayList<>();
+//        list.add(hashMap);
+//        hashMapPage.setRecords(list);
+//        hashMapPage.setTotal(list.size());
+//        hashMapPage.setCurrent(1);
+//        System.out.println(result.size());
+//        try {
+//            emqKeeper.getMqttClient().publish(stationId + bootStationGateWayId + "_topic", JSON.toJSON(hashMapPage).toString().getBytes("UTF-8"), 1, true);
+//            logger.info(JSON.toJSONString(hashMapPage));
+//            logger.info("-----------------发送升压站数据成功=================== 成功！");
+//        } catch (Exception e) {
+//            logger.info("-----------------发送升压站数据成功=================== 成功！");
+//        }
+//    }
 }