bug修改

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/IndexDto.java

@@ -27,4 +27,5 @@ public class IndexDto {
     private String frontModule;
     private String unit; // 单位
     private String F;//风机编号  -- 适应大屏
+    private String state; // 指标名称【风机状态名称】
 }

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

@@ -22,6 +22,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @RestController
 @Api(tags = "大屏相关API")
@@ -60,8 +61,18 @@ public class MonitorFanIdxController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "风机布置图 - 风机状态列表")
     @GetMapping("/getFanStatusList")
-    public ResponseModel<List<IndexDto>> getFanStatusList(@RequestParam(value = "stationId", required = false) String stationId) {
-        return ResponseHelper.buildResponse(monitorFanIndicator.getFanStatusList(stationId));
+    public ResponseModel<IPage<IndexDto>> getFanStatusList(@RequestParam(value = "stationId", required = false) String stationId,
+                                                           @RequestParam(value = "current", required = false) int current,
+                                                           @RequestParam(value = "size", required = false) int size) {
+        List<IndexDto> fanStatusList = monitorFanIndicator.getFanStatusList(stationId);
+        Page<IndexDto> page = new Page<>(current, size);
+        List<IndexDto> collect = fanStatusList.stream()
+                .skip((long) (current - 1) * size)
+                .limit(size)
+                .collect(Collectors.toList());
+        page.setTotal(fanStatusList.size());
+        page.setRecords(collect);
+        return ResponseHelper.buildResponse(page);
     }
 
 

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

@@ -240,13 +240,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     public List<IndexDto> getFanStatusList(String stationId) {
         StationBasic stationBasic = getOneByStationNumber(stationId);
-        String sql = String.format("SELECT equipmentNumber as F, equipmentIndexName FROM \"indicators_%s\" WHERE equipmentIndexName =~/^正常运行|告警运行|正常停机|故障停机|限功率|待机状态|维护状态|通讯中断$/ and value = 'true'", stationBasic.getFanGatewayId());
+        String sql = String.format("SELECT equipmentNumber, equipmentIndexName as state FROM \"indicators_%s\" WHERE equipmentIndexName =~/^正常运行|告警运行|正常停机|故障停机|限功率|待机状态|维护状态|通讯中断$/ and value = 'true'", stationBasic.getFanGatewayId());
         List<IndexDto> influxDBList = influxDButils.getListData(sql, IndexDto.class);
-        Map<String, String> collect = influxDBList.stream().collect(Collectors.toMap(IndexDto::getF, IndexDto::getEquipmentIndexName));
-        String sqlEquipNumList = String.format("SELECT (DISTINCT equipmentNumber) as F FROM \"indicators_%s\"", stationBasic.getFanGatewayId());
+        Map<String, String> collect = influxDBList.stream().collect(Collectors.toMap(IndexDto::getEquipmentNumber, IndexDto::getState));
+        String sqlEquipNumList = String.format("SELECT (DISTINCT equipmentNumber) as equipmentNumber FROM \"indicators_%s\"", stationBasic.getFanGatewayId());
         List<IndexDto> equipNumList = influxDButils.getListData(sqlEquipNumList, IndexDto.class);
         equipNumList.forEach(item -> {
-            item.setEquipmentIndexName(collect.get(item.getF()));
+            item.setState(collect.get(item.getEquipmentNumber()));
         });
         return equipNumList;
     }