修改统计图代码

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanHealthIndexController.java

@@ -137,7 +137,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@ApiOperation(httpMethod = "GET",value = "预警监测测点层左侧列表",   notes = "预警监测风机层左侧列表")
 	@GetMapping(value = "/tableLeftByPointList")
-	public ResponseModel<Page<Map<String,Object>>> queryForLeftTableByPointList(@RequestParam(required = false) String STATION, @RequestParam(required = false)String HEALTHLEVEL,@RequestParam(required = false) String EQUIPMENTNAME,,@RequestParam(required = false)String POINTNAME,Integer current,Integer size) {
+	public ResponseModel<Page<Map<String,Object>>> queryForLeftTableByPointList(@RequestParam(required = false) String STATION, @RequestParam(required = false)String HEALTHLEVEL,@RequestParam(required = false) String EQUIPMENTNAME,@RequestParam(required = false)String POINTNAME,Integer current,Integer size) {
 		Page<Map<String,Object>> page = new Page<Map<String,Object>>();
 		page.setCurrent(current);
 		page.setSize(size);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvHealthIndexController.java

@@ -3,6 +3,7 @@ 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.biz.dto.IdxBizPvHealthIndexDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvHealthIndexServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -166,16 +167,20 @@ public class IdxBizPvHealthIndexController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "预警监测设备级统计",   notes = "预警监测设备级统计")
 	@GetMapping(value = "/queryForPointNum")
 	public ResponseModel<List<Map<String,Object>>> queryForLeftTableListByPointNum(@RequestParam(required = false) String STATION,@RequestParam(required = false) String SUBARRAY,@RequestParam(required = false) String  EQUIPMENTNAME) {
-		List<Map<String, Object>> maps = idxBizPvHealthIndexServiceImpl.warningData(STATION, SUBARRAY, EQUIPMENTNAME);
+		List<IdxBizPvWarningRecord> idxBizPvWarningRecordList = idxBizPvHealthIndexServiceImpl.warningData(STATION, SUBARRAY, EQUIPMENTNAME);
 		int total = idxBizPvHealthIndexServiceImpl.pointNum(STATION, SUBARRAY, EQUIPMENTNAME);
 
 		Map<String,Object> warningNum =new  HashMap<>();
-		warningNum.put("name","异常");
-		warningNum.put("value",maps.size());
+		warningNum.put("name","注意");
+		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count());
+		warningNum.put("name","警告");
+		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count());
+		warningNum.put("name","危险");
+		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("危险")).count());
 
 		Map<String,Object> pointNum =new  HashMap<>();
 		pointNum.put("name","正常");
-		pointNum.put("value",total  - maps.size());
+		pointNum.put("value",total  - idxBizPvWarningRecordList.size());
 
 		List<Map<String,Object>> list = new ArrayList<>();
 		list.add(pointNum);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizPvHealthIndexMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvHealthIndexDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvHealthIndex;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord;
 
 import java.util.List;
 import java.util.Map;
@@ -27,7 +28,7 @@ public interface IdxBizPvHealthIndexMapper extends BaseMapper<IdxBizPvHealthInde
     int queryForLeftTableListByPointCount(String STATION, String SUBARRAY, String HEALTHLEVEL, String EQUIPMENTNAME,String POINTNAME);
 
 
-    List<Map<String,Object>> warningData(String STATION, String SUBARRAY, String EQUIPMENTNAME);
+    List<IdxBizPvWarningRecord> warningData(String STATION, String SUBARRAY, String EQUIPMENTNAME);
     Integer pointNum(String STATION, String SUBARRAY, String EQUIPMENTNAME);
 
 

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvHealthIndexDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvHealthIndex;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvHealthIndexMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizPvHealthIndexService;
 import org.springframework.stereotype.Service;
@@ -61,7 +62,7 @@ public class IdxBizPvHealthIndexServiceImpl extends BaseService<IdxBizPvHealthIn
         return this.getBaseMapper().pointNum(STATION, SUBARRAY,EQUIPMENTNAME);
     }
 
-    public  List<Map<String,Object>> warningData(String STATION, String SUBARRAY , String EQUIPMENTNAME) {
+    public  List<IdxBizPvWarningRecord> warningData(String STATION, String SUBARRAY , String EQUIPMENTNAME) {
         return this.getBaseMapper().warningData(STATION, SUBARRAY, EQUIPMENTNAME);
     }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvHealthIndexMapper.xml

@@ -239,29 +239,22 @@
     </select>
 
 
-    <select id="warningData" resultType="map">
-        SELECT * FROM    (SELECT
-        cl. STATION,
-        cl. SUBARRAY,
-        cl.EQUIPMENT_NAME
+    <select id="warningData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord">
+        SELECT
+        *
         FROM
-            idx_biz_pv_point_process_variable_classification cl
-                INNER JOIN idx_biz_pv_warning_record re ON re.EQUIPMENT_NAME = cl.EQUIPMENT_NAME  AND re.STATION = cl.STATION AND re.SUBARRAY = cl.SUBARRAY
-                AND re.`STATUS` = 0
+        idx_biz_pv_warning_record re
         WHERE
-            cl.TAG_CODE = '分析变量'
-        GROUP BY cl.EQUIPMENT_NAME)  a
-        <where>
+        re.`STATUS` = 0
         <if test="EQUIPMENTNAME != '' and EQUIPMENTNAME != null">
-                AND a.EQUIPMENT_NAME = #{EQUIPMENTNAME}
+            AND re.EQUIPMENT_NAME = #{EQUIPMENTNAME}
         </if>
         <if test="SUBARRAY != null and  SUBARRAY != '' ">
-                AND a.SUBARRAY = #{SUBARRAY}
+            AND re.SUBARRAY = #{SUBARRAY}
         </if>
         <if test="STATION != null and  STATION != '' ">
-                AND a.STATION = #{STATION}
+            AND re.STATION = #{STATION}
         </if>
-        </where>
     </select>
 
     <select id="pointNum" resultType="int">