修改代码

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

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.ColModel;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.DataGridMock;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.ResultsData;
@@ -37,13 +39,17 @@ public class DeviceController extends BaseController {
 
     @Autowired
     MonitorFanIndicatorImpl monitorFanIndicatorImpl;
+    @Autowired
+    StationBasicMapper stationBasicMapper;
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取每个风机实时告警数据")
     @GetMapping("/nationwide")
     public ResponseModel<ResultsData> getNationWideInfo(@RequestParam(value = "current") int current,@RequestParam
                     (value = "size") int size,@RequestParam(value = "stationBasicId") String stationBasicId,@RequestParam(value = "equipmentNumber" , required = false ) String equipmentNumber) {
-        ResultsData resultsData=monitorFanIndicatorImpl.getNationWideInfo( current,  size,  stationBasicId,  equipmentNumber);
+        StationBasic stationBasic = stationBasicMapper.selectById(stationBasicId);
+        String fanGatewayId = stationBasic.getFanGatewayId();
+        ResultsData resultsData=monitorFanIndicatorImpl.getNationWideInfo( current,  size,  fanGatewayId,  equipmentNumber);
         return ResponseHelper.buildResponse(resultsData);
     }
 

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

@@ -19,6 +19,7 @@ import io.swagger.annotations.ApiOperation;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -331,7 +332,7 @@ public class MonitorFanIdxController extends BaseController {
     }
 
 
-
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "模拟量接口Api")
     @GetMapping("/getAnalogQuantity")
     public ResponseModel<IPage<Map<String, Object>>> getAnalogQuantity(@RequestParam(value = "stationId")String stationId,String frontModule) {
@@ -351,12 +352,15 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "集电线路图左侧 集电线列表")
     @GetMapping("/jdTree")
-    public ResponseModel<IPage<Map<String, Object>>> getStatusJDX(@RequestParam(value = "stationId")String stationId) {
-        StationBasic stationBasic = stationBasicMapper.selectById(stationId);
-        String gatewayId = stationBasic.getBoosterGatewayId();
-        String werks = stationBasic.getStationNumber();
-         monitorFanIndicator.getStatusJDX(gatewayId, "集电线" ,werks,stationBasic.getSequenceNbr().toString());
-
+    @Scheduled(cron = "0/10 * * * * ? ")
+    public ResponseModel<IPage<Map<String, Object>>> getStatusJDX() {
+        LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
+        List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper);
+        for (StationBasic stationBasic : stationBasics) {
+            String gatewayId = stationBasic.getBoosterGatewayId();
+            String werks = stationBasic.getStationNumber();
+            monitorFanIndicator.getStatusJDX(gatewayId, "集电线", werks, stationBasic.getSequenceNbr().toString());
+        }
         return  CommonResponseUtil.success();
     }
 
@@ -364,6 +368,7 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "集电线路图右侧 风机列表")
     @GetMapping("/fjList")
+    @Scheduled(cron = "0/10 * * * * ? ")
     public ResponseModel getListByFJ() {
 
 

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

@@ -697,7 +697,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
 
     public void getStatusJDX(String gatewayId, String dataName, String werks,String stationId){
-        String sql =   " SELECT * FROM indicators_"+gatewayId+"  WHERE frontModule =~/集电线路/ and systemType = '光字牌'";
+        String sql =   " SELECT * FROM indicators_"+gatewayId+"  WHERE frontModule =~/集电/ and systemType = '光字牌'";
         List<IndicatorsDto> listData = influxDButils.getListData(sql, IndicatorsDto.class);
         TpriDmpDatabook tpriDmpDatabookByDataName = tpriDmpDatabookServiceImpl.getTpriDmpDatabookByDataName(dataName);
         List<SjglZsjZsbtz> sjglZsjZsbtzList = sjglZsjZsbtzServiceImpl.getSjglZsjZsbtzList(tpriDmpDatabookByDataName.getDataid(), werks);