Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -21,4 +21,6 @@ public class IndexDto {
     private String  value;
     private int  count;
     private String equipmentsIdx;
+    private String equipmentNumber; // 风机编码
+    private String equipmentIndexName; // 指标名称【风机状态名称】
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -154,7 +154,7 @@
     <select id="getStationListByRegionCode" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.TreeDto">
         select
             station_name as name,
-            station_code as code,
+            sequence_nbr as code,
             station_type as parentCode,
             sequence_nbr as id,
             '1' as isOnclick

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.dto.RunRecord;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.TreeDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.MonitorFanIndicator;
@@ -20,6 +21,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @Api(tags = "大屏相关API")
@@ -54,7 +56,19 @@ 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));
+    }
 
 
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "风机布置图 - 风机状态统计")
+    @GetMapping("/getFanStatusStatistics")
+    public ResponseModel<Map<String, Long>> getFanStatusStatistics(@RequestParam(value = "stationId", required = false) String stationId) {
+        return ResponseHelper.buildResponse(monitorFanIndicator.getFanStatusStatistics(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

@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sun.org.apache.bcel.internal.generic.RETURN;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.IndexDto;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.RunRecord;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.TreeDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.MonitorFanIndicator;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.Region;
@@ -18,17 +16,13 @@ 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;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.IMonitorFanIndicator;
 import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IMonitorFanIndicator;
 import com.yeejoin.amos.component.robot.BadRequest;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -47,8 +41,23 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     @Autowired
     private RegionMapper regionMapper;
+
+    @Autowired
+    InfluxDButils influxDButils;
+
+
+    @Autowired
+    SjglZsjZsbtzServiceImpl sjglZsjZsbtzServiceImpl;
+
+    @Autowired
+    TpriDmpDatabookServiceImpl tpriDmpDatabookServiceImpl;
+
+    @Autowired
+    StationDataTaskImpl stationDataTask;
+
     @Autowired
     InfluxDButils influxDButils;
+
     @Override
     public void UpdateMonitorFanIndicator(List<IndexDto> list) {
 
@@ -164,7 +173,28 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
      * @param indicator
      * @return
      */
-    public Object getIndicatoralueTotal(String gateway,String indicator){
+    public Object getIndicatoralueTotal(String gateway,String indicator) {
         return  monitorFanIndicatorregionMapper.getIndicatoralueTotal(gateway,indicator);
     }
+
+
+    private StationBasic getOneByStationNumber(String stationId) {
+        return stationBasicMapper.selectById(stationId);
+    }
+
+    public List<IndexDto> getFanStatusList(String stationId) {
+        StationBasic stationBasic = getOneByStationNumber(stationId);
+        String sql = String.format("SELECT equipmentNumber, equipmentIndexName FROM \"indicators_%s\" WHERE equipmentIndexName =~/^正常运行|告警运行|正常停机|故障停机|限功率|待机状态|维护状态|通讯中断$/ and value = 'true'", stationBasic.getFanGatewayId());
+        List<IndexDto> influxDBList = influxDButils.getListData(sql, IndexDto.class);
+        return influxDBList;
+    }
+
+    public Map<String, Long> getFanStatusStatistics(String stationId) {
+        StationBasic stationBasic = getOneByStationNumber(stationId);
+        String sql = String.format("SELECT equipmentNumber, equipmentIndexName FROM \"indicators_%s\" WHERE equipmentIndexName =~/^正常运行|告警运行|正常停机|故障停机|限功率|待机状态|维护状态|通讯中断$/ and value = 'true'", stationBasic.getFanGatewayId());
+        List<IndexDto> influxDBList = influxDButils.getListData(sql, IndexDto.class);
+        // key:状态   value:数量
+        Map<String, Long> collect = influxDBList.stream().collect(Collectors.groupingBy(IndexDto::getEquipmentIndexName, Collectors.counting()));
+        return collect;
+    }
 }
\ No newline at end of file