修改预警统计数据对不上问题

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

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
-import cn.hutool.core.bean.BeanUtil;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.IdxBizFanWarningRecordDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointProcessVariableClassification;
-import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRecord;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRuleSet;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRuleSet;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanPointProcessVariableClassificationMapper;
@@ -18,21 +42,10 @@ import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanWarningRuleS
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvWarningRuleSetServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.FanWaringRecordMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord;
+
+import cn.hutool.core.bean.BeanUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.beanutils.BeanMap;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author system_generator
@@ -83,7 +96,8 @@ public class IdxBizFanWarningRecordController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<IdxBizFanWarningRecordDto> updateBySequenceNbrIdxBizFanWarningRecord(@RequestBody IdxBizFanWarningRecordDto model, @PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	public ResponseModel<IdxBizFanWarningRecordDto> updateBySequenceNbrIdxBizFanWarningRecord(
+			@RequestBody IdxBizFanWarningRecordDto model, @PathVariable(value = "sequenceNbr") String sequenceNbr) {
 		model.setSequenceNbr(sequenceNbr);
 		return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.updateWithModel(model));
 	}
@@ -97,7 +111,8 @@ public class IdxBizFanWarningRecordController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@DeleteMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
+			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 		return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.removeById(sequenceNbr));
 	}
 
@@ -124,8 +139,8 @@ public class IdxBizFanWarningRecordController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
-    public ResponseModel<Page<IdxBizFanWarningRecordDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
+	public ResponseModel<Page<IdxBizFanWarningRecordDto>> queryForPage(@RequestParam(value = "current") int current,
+			@RequestParam(value = "size") int size) {
 		Page<IdxBizFanWarningRecordDto> page = new Page<IdxBizFanWarningRecordDto>();
 		page.setCurrent(current);
 		page.setSize(size);
@@ -144,7 +159,6 @@ public class IdxBizFanWarningRecordController extends BaseController {
 		return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.queryForIdxBizFanWarningRecordList());
 	}
 
-
 	/**
 	 * 根据sequenceNbr查询
 	 *
@@ -158,18 +172,19 @@ public class IdxBizFanWarningRecordController extends BaseController {
 
 		LambdaQueryWrapper<IdxBizFanWarningRuleSet> query = new LambdaQueryWrapper<>();
 		query.eq(IdxBizFanWarningRuleSet::getAnalysisPointId, ANALYSISPOINTID);
-        List<IdxBizFanWarningRuleSet> idxBizFanWarningRecordList = idxBizFanWarningRuleSetService.getBaseMapper().selectList(query);
+		List<IdxBizFanWarningRuleSet> idxBizFanWarningRecordList = idxBizFanWarningRuleSetService.getBaseMapper()
+				.selectList(query);
 		Map<String, Object> map = new HashMap<>();
 		for (int i = 0; i < idxBizFanWarningRecordList.size(); i++) {
 			IdxBizFanWarningRuleSet idxBizFanWarningRecord = idxBizFanWarningRecordList.get(i);
 			if (idxBizFanWarningRecord.getWarningName().equals("注意")) {
 				map.putAll(BeanUtil.beanToMap(idxBizFanWarningRecord));
 			} else if (idxBizFanWarningRecord.getWarningName().equals("警告")) {
-                //警告周期
+				// 警告周期
 				map.put("jgWarningCycle", idxBizFanWarningRecord.getWarningCycle());
 				map.put("jgWarningIf", idxBizFanWarningRecord.getWarningIf());
 			} else if (idxBizFanWarningRecord.getWarningName().equals("危险")) {
-                //警告周期
+				// 警告周期
 				map.put("wxWarningCycle", idxBizFanWarningRecord.getWarningCycle());
 				map.put("wxWarningIf", idxBizFanWarningRecord.getWarningIf());
 			}
@@ -177,7 +192,6 @@ public class IdxBizFanWarningRecordController extends BaseController {
 		return ResponseHelper.buildResponse(map);
 	}
 
-
 	/**
 	 * 根据pointId修改信息
 	 *
@@ -190,15 +204,16 @@ public class IdxBizFanWarningRecordController extends BaseController {
 	public ResponseModel<Boolean> updateByPointInfo(@RequestBody JSONObject analysisInfo) {
 		LambdaQueryWrapper<IdxBizFanWarningRuleSet> query = new LambdaQueryWrapper<>();
 		query.eq(IdxBizFanWarningRuleSet::getAnalysisPointId, analysisInfo.get("analysisPointId"));
-        List<IdxBizFanWarningRuleSet> idxBizFanWarningRecordList = idxBizFanWarningRuleSetService.getBaseMapper().selectList(query);
+		List<IdxBizFanWarningRuleSet> idxBizFanWarningRecordList = idxBizFanWarningRuleSetService.getBaseMapper()
+				.selectList(query);
 		for (IdxBizFanWarningRuleSet idxBizFanWarningRuleSet : idxBizFanWarningRecordList) {
 			BeanUtil.copyProperties(analysisInfo, idxBizFanWarningRuleSet, "sequenceNbr", "warningName");
 			if (idxBizFanWarningRuleSet.getWarningName().equals("警告")) {
-                //警告周期
+				// 警告周期
 				idxBizFanWarningRuleSet.setWarningIf(analysisInfo.get("jgWarningIf").toString());
 				idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString());
 			} else if (idxBizFanWarningRuleSet.getWarningName().equals("危险")) {
-                //警告周期
+				// 警告周期
 				idxBizFanWarningRuleSet.setWarningIf(analysisInfo.get("wxWarningIf").toString());
 				idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString());
 			}
@@ -207,7 +222,6 @@ public class IdxBizFanWarningRecordController extends BaseController {
 		return ResponseHelper.buildResponse(b);
 	}
 
-
 	/**
 	 * 根据sequenceNbr查询
 	 *
@@ -221,18 +235,19 @@ public class IdxBizFanWarningRecordController extends BaseController {
 
 		LambdaQueryWrapper<IdxBizPvWarningRuleSet> query = new LambdaQueryWrapper<>();
 		query.eq(IdxBizPvWarningRuleSet::getAnalysisPointId, ANALYSISPOINTID);
-        List<IdxBizPvWarningRuleSet> idxBizPvWarningRecordList = idxBizPvWarningRuleSetService.getBaseMapper().selectList(query);
+		List<IdxBizPvWarningRuleSet> idxBizPvWarningRecordList = idxBizPvWarningRuleSetService.getBaseMapper()
+				.selectList(query);
 		Map<String, Object> map = new HashMap<>();
 		for (int i = 0; i < idxBizPvWarningRecordList.size(); i++) {
 			IdxBizPvWarningRuleSet idxBizPvWarningRecord = idxBizPvWarningRecordList.get(i);
 			if (idxBizPvWarningRecord.getWarningName().equals("注意")) {
 				map.putAll(BeanUtil.beanToMap(idxBizPvWarningRecord));
 			} else if (idxBizPvWarningRecord.getWarningName().equals("警告")) {
-                //警告周期
+				// 警告周期
 				map.put("jgWarningCycle", idxBizPvWarningRecord.getWarningCycle());
 				map.put("jgWarningIf", idxBizPvWarningRecord.getWarningIf());
 			} else if (idxBizPvWarningRecord.getWarningName().equals("危险")) {
-                //警告周期
+				// 警告周期
 				map.put("wxWarningCycle", idxBizPvWarningRecord.getWarningCycle());
 				map.put("wxWarningIf", idxBizPvWarningRecord.getWarningIf());
 			}
@@ -240,7 +255,6 @@ public class IdxBizFanWarningRecordController extends BaseController {
 		return ResponseHelper.buildResponse(map);
 	}
 
-
 	/**
 	 * 根据pointId修改信息
 	 *
@@ -253,15 +267,16 @@ public class IdxBizFanWarningRecordController extends BaseController {
 	public ResponseModel<Boolean> updateByPointInfoPv(@RequestBody JSONObject analysisInfo) {
 		LambdaQueryWrapper<IdxBizPvWarningRuleSet> query = new LambdaQueryWrapper<>();
 		query.eq(IdxBizPvWarningRuleSet::getAnalysisPointId, analysisInfo.get("analysisPointId"));
-        List<IdxBizPvWarningRuleSet> idxBizFanWarningRecordList = idxBizPvWarningRuleSetService.getBaseMapper().selectList(query);
+		List<IdxBizPvWarningRuleSet> idxBizFanWarningRecordList = idxBizPvWarningRuleSetService.getBaseMapper()
+				.selectList(query);
 		for (IdxBizPvWarningRuleSet idxBizPvWarningRuleSet : idxBizFanWarningRecordList) {
 			BeanUtil.copyProperties(analysisInfo, idxBizPvWarningRuleSet, "sequenceNbr", "warningName");
 			if (idxBizPvWarningRuleSet.getWarningName().equals("警告")) {
-                //警告周期
+				// 警告周期
 				idxBizPvWarningRuleSet.setWarningIf(analysisInfo.get("jgWarningIf").toString());
 				idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString());
 			} else if (idxBizPvWarningRuleSet.getWarningName().equals("危险")) {
-                //警告周期
+				// 警告周期
 				idxBizPvWarningRuleSet.setWarningIf(analysisInfo.get("wxWarningIf").toString());
 				idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString());
 			}
@@ -270,7 +285,6 @@ public class IdxBizFanWarningRecordController extends BaseController {
 		return ResponseHelper.buildResponse(b);
 	}
 
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@GetMapping(value = "/stringToMap")
 	@ApiOperation(httpMethod = "get", value = "字符串转为对象格式", notes = "字符串转为对象格式")
@@ -293,16 +307,17 @@ public class IdxBizFanWarningRecordController extends BaseController {
 		LambdaQueryWrapper<IdxBizPvWarningRuleSet> query = new LambdaQueryWrapper<>();
 		List<String> analysisPointIds = Arrays.asList(analysisInfo.get("analysisPointIds").toString().split(","));
 		query.in(IdxBizPvWarningRuleSet::getAnalysisPointId, analysisPointIds);
-        List<IdxBizPvWarningRuleSet> idxBizFanWarningRecordList = idxBizPvWarningRuleSetService.getBaseMapper().selectList(query);
+		List<IdxBizPvWarningRuleSet> idxBizFanWarningRecordList = idxBizPvWarningRuleSetService.getBaseMapper()
+				.selectList(query);
 		for (IdxBizPvWarningRuleSet idxBizPvWarningRuleSet : idxBizFanWarningRecordList) {
 			BeanUtil.copyProperties(analysisInfo, idxBizPvWarningRuleSet, "analysisPointIds");
 			if (idxBizPvWarningRuleSet.getWarningName().equals("警告")) {
-                //警告周期
+				// 警告周期
 				if (StringUtils.isNotBlank(analysisInfo.getString("jgWarningCycle"))) {
 					idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString());
 				}
 			} else if (idxBizPvWarningRuleSet.getWarningName().equals("危险")) {
-                //警告周期
+				// 警告周期
 				if (StringUtils.isNotBlank(analysisInfo.getString("wxWarningCycle"))) {
 					idxBizPvWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString());
 				}
@@ -312,7 +327,6 @@ public class IdxBizFanWarningRecordController extends BaseController {
 		return ResponseHelper.buildResponse(b);
 	}
 
-
 	/**
 	 * 根据pointId修改信息
 	 *
@@ -326,16 +340,17 @@ public class IdxBizFanWarningRecordController extends BaseController {
 		LambdaQueryWrapper<IdxBizFanWarningRuleSet> query = new LambdaQueryWrapper<>();
 		List<String> analysisPointIds = Arrays.asList(analysisInfo.get("analysisPointIds").toString().split(","));
 		query.in(IdxBizFanWarningRuleSet::getAnalysisPointId, analysisPointIds);
-        List<IdxBizFanWarningRuleSet> idxBizFanWarningRecordList = idxBizFanWarningRuleSetService.getBaseMapper().selectList(query);
+		List<IdxBizFanWarningRuleSet> idxBizFanWarningRecordList = idxBizFanWarningRuleSetService.getBaseMapper()
+				.selectList(query);
 		for (IdxBizFanWarningRuleSet idxBizFanWarningRuleSet : idxBizFanWarningRecordList) {
 			BeanUtil.copyProperties(analysisInfo, idxBizFanWarningRuleSet, "analysisPointIds");
 			if (idxBizFanWarningRuleSet.getWarningName().equals("警告")) {
-                //警告周期
+				// 警告周期
 				if (StringUtils.isNotBlank(analysisInfo.getString("jgWarningCycle"))) {
 					idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("jgWarningCycle").toString());
 				}
 			} else if (idxBizFanWarningRuleSet.getWarningName().equals("危险")) {
-                //警告周期
+				// 警告周期
 				if (StringUtils.isNotBlank(analysisInfo.getString("wxWarningCycle"))) {
 					idxBizFanWarningRuleSet.setWarningCycle(analysisInfo.get("wxWarningCycle").toString());
 				}
@@ -350,40 +365,67 @@ public class IdxBizFanWarningRecordController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "查询各风机预警状况", notes = "查询各风机预警状况")
 	public ResponseModel<Map<String, Object>> selectFanWarningNum(@RequestParam String station) {
 
-
 		LambdaQueryWrapper<IdxBizFanPointProcessVariableClassification> wrapper = new LambdaQueryWrapper<>();
 		wrapper.select(IdxBizFanPointProcessVariableClassification::getEquipmentName);
 		wrapper.eq(IdxBizFanPointProcessVariableClassification::getStation, station);
 		wrapper.groupBy(IdxBizFanPointProcessVariableClassification::getEquipmentName);
 		wrapper.last(" ORDER BY RIGHT(EQUIPMENT_NAME,6) desc");
-        List<IdxBizFanPointProcessVariableClassification> variableClassificationList = idxBizFanPointProcessVariableClassificationMapper.selectList(wrapper);
-
-
-        Map<String, Object> resultMap = new HashMap<>();
-        List<String> gatewayIds = this.getGatewayIds();
-        List<Map<String, Object>> maps = fanWaringRecordMapper.selectFanWarningNum(station, gatewayIds);
-        Map<String, Map<String, Object>> equipmentNameInfoMap = maps.stream().collect(Collectors.toMap(t -> t.get("EQUIPMENT_NAME").toString(), t -> t));
+		List<IdxBizFanPointProcessVariableClassification> variableClassificationList = idxBizFanPointProcessVariableClassificationMapper
+				.selectList(wrapper);
+
+		QueryWrapper<FanWarningRecord> lambdaQw = new QueryWrapper<>();
+		lambdaQw.select("COUNT(1) AS c,equipment_name AS equipmentname,warning_name AS warningname");
+		lambdaQw.lambda().eq(FanWarningRecord::getStation, station);
+		lambdaQw.lambda().eq(FanWarningRecord::getDisposotionState, "待确认");
+		lambdaQw.lambda().groupBy(FanWarningRecord::getEquipmentName);
+		lambdaQw.lambda().groupBy(FanWarningRecord::getWarningName);
+		List<Map<String, Object>> lists = fanWaringRecordMapper.selectMaps(lambdaQw);
+
+//		Map<String, Object> resultMap = new HashMap<>();
+//		List<String> gatewayIds = this.getGatewayIds();
+//		List<Map<String, Object>> maps = fanWaringRecordMapper.selectFanWarningNum(station, gatewayIds);
+//		Map<String, Map<String, Object>> equipmentNameInfoMap = maps.stream()
+//				.collect(Collectors.toMap(t -> t.get("EQUIPMENT_NAME").toString(), t -> t));
 
 		List<Integer> wxList = new ArrayList<>();
 		List<Integer> zyList = new ArrayList<>();
 		List<Integer> jgList = new ArrayList<>();
 		List<String> list = new ArrayList<>();
-        for (Map<String, Object> map : maps) {
-            wxList.add(Integer.valueOf(map.get("危险").toString()));
-            zyList.add(Integer.valueOf(map.get("注意").toString()));
-            jgList.add(Integer.valueOf(map.get("警告").toString()));
-            list.add(map.get("EQUIPMENT_NAME").toString());
 
+		Map<String, Map<String, Integer>> countMap = new HashMap<>();
+		for (Map<String, Object> map : lists) {
+			String equipmentName = String.valueOf(map.get("equipmentname"));
+			int count = Integer.valueOf(String.valueOf(map.get("c")));
+			String warningName = String.valueOf(map.get("warningname"));
+			Map<String, Integer> equipMap = countMap.get(equipmentName);
+			if (equipMap == null) {
+				equipMap = new HashMap<>();
 			}
+			equipMap.put(warningName, count);
+			countMap.put(equipmentName, equipMap);
+		}
+
 		variableClassificationList.forEach(item -> {
-            if (!equipmentNameInfoMap.containsKey(item.getEquipmentName())) {
+			Map<String, Integer> equipMap = countMap.get(item.getEquipmentName());
+			if (equipMap != null) {
+				wxList.add(equipMap.get("危险") != null ? equipMap.get("危险") : 0);
+				zyList.add(equipMap.get("注意") != null ? equipMap.get("注意") : 0);
+				jgList.add(equipMap.get("警告") != null ? equipMap.get("警告") : 0);
+			} else {
 				wxList.add(0);
 				zyList.add(0);
 				jgList.add(0);
-                list.add(item.getEquipmentName());
 			}
+			list.add(item.getEquipmentName());
 		});
 
+//		for (Map<String, Object> map : maps) {
+//			wxList.add(Integer.valueOf(map.get("危险").toString()));
+//			zyList.add(Integer.valueOf(map.get("注意").toString()));
+//			jgList.add(Integer.valueOf(map.get("警告").toString()));
+//			list.add(map.get("EQUIPMENT_NAME").toString());
+//
+//		}
 
 		HashMap<String, Object> wxMapResult = new HashMap<>();
 		wxMapResult.put("data", wxList);
@@ -395,6 +437,7 @@ public class IdxBizFanWarningRecordController extends BaseController {
 		jgMapResult.put("data", jgList);
 		jgMapResult.put("name", "警告");
 
+		Map<String, Object> resultMap = new HashMap<String, Object>();
 		List<Map<String, Object>> hashMaps = Arrays.asList(wxMapResult, zyMapResult, jgMapResult);
 		resultMap.put("axisData", list);
 		resultMap.put("seriesData", hashMaps);
@@ -402,28 +445,69 @@ public class IdxBizFanWarningRecordController extends BaseController {
 
 	}
 
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@GetMapping(value = "/selectEquipWarningTotal")
 	@ApiOperation(httpMethod = "GET", value = "预警信息统计富文本", notes = "预警信息统计富文本")
-    public ResponseModel<Map<String, Object>> selectEquipWarningTotal(@RequestParam String STATION, @RequestParam String EQUIPMENTNAME) {
-        List<String> gatewayIds = this.getGatewayIds();
-        Map<String, Object> maps = fanWaringRecordMapper.selectEquipWarningTotal(STATION, EQUIPMENTNAME, gatewayIds);
+	public ResponseModel<Map<String, Object>> selectEquipWarningTotal(@RequestParam String STATION,
+			@RequestParam String EQUIPMENTNAME) {
+//		List<String> gatewayIds = this.getGatewayIds();
+//		Map<String, Object> maps = fanWaringRecordMapper.selectEquipWarningTotal(STATION, EQUIPMENTNAME, gatewayIds);
+		QueryWrapper<FanWarningRecord> lambdaQw = new QueryWrapper<>();
+		lambdaQw.select("COUNT(1) AS c,warning_name AS warningname");
+		lambdaQw.lambda().eq(FanWarningRecord::getStation, STATION);
+		lambdaQw.lambda().eq(FanWarningRecord::getDisposotionState, "待确认");
+		lambdaQw.lambda().eq(FanWarningRecord::getEquipmentName, EQUIPMENTNAME);
+		lambdaQw.lambda().groupBy(FanWarningRecord::getEquipmentName);
+		lambdaQw.lambda().groupBy(FanWarningRecord::getWarningName);
+		List<Map<String, Object>> lists = fanWaringRecordMapper.selectMaps(lambdaQw);
+		Map<String, Object> maps = new HashMap<>();
+		maps.put("zhuyi", 0);
+		maps.put("weixian", 0);
+		maps.put("jinggao", 0);
+		int total = 0;
+		for (Map<String, Object> map : lists) {
+			if ("注意".equals(String.valueOf(map.get("warningname")))) {
+				maps.put("zhuyi", map.get("c"));
+				total+=Integer.valueOf(String.valueOf(map.get("c")));
+			} else if ("危险".equals(String.valueOf(map.get("warningname")))) {
+				maps.put("weixian", map.get("c"));
+				total+=Integer.valueOf(String.valueOf(map.get("c")));
+			} else if ("警告".equals(String.valueOf(map.get("warningname")))) {
+				maps.put("jinggao", map.get("c"));
+				total+=Integer.valueOf(String.valueOf(map.get("c")));
+			}
+		}
+		maps.put("total", total);
 		return ResponseHelper.buildResponse(maps);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@GetMapping(value = "/selectWarningPoint")
 	@ApiOperation(httpMethod = "GET", value = "预警监测设备右侧预警重复列表", notes = "预警监测设备右侧预警重复列表")
-    public ResponseModel<Page<FanWarningRecord>> selectFanWarningNum(@RequestParam String STATION, @RequestParam String EQUIPMENTNAME, @RequestParam Integer current, @RequestParam Integer size) {
+	public ResponseModel<Page<FanWarningRecord>> selectWarningPoint(@RequestParam String STATION,
+			@RequestParam String EQUIPMENTNAME, @RequestParam Integer current, @RequestParam Integer size) {
 		Page<FanWarningRecord> page = new Page<>();
 		page.setCurrent(current);
 		page.setSize(size);
-        List<String> gatewayIds = this.getGatewayIds();
-        List<FanWarningRecord> maps = fanWaringRecordMapper.selectWarningPoint(STATION, EQUIPMENTNAME, (current - 1) * size, size, gatewayIds);
-        page.setRecords(maps);
-        int total = fanWaringRecordMapper.selectWarningPointTotal(STATION, EQUIPMENTNAME);
+		// List<String> gatewayIds = this.getGatewayIds();
+		LambdaQueryWrapper<FanWarningRecord> lambdaQw = new LambdaQueryWrapper<>();
+		lambdaQw.eq(FanWarningRecord::getStation, STATION);
+		lambdaQw.eq(FanWarningRecord::getEquipmentName, EQUIPMENTNAME);
+		lambdaQw.eq(FanWarningRecord::getDisposotionState, "待确认");
+
+		int total = fanWaringRecordMapper.selectCount(lambdaQw);
 		page.setTotal(total);
+
+		lambdaQw.orderByDesc(FanWarningRecord::getTs);
+		String limit = "LIMIT " + (current - 1) * size + "," + size;
+		lambdaQw.last(limit);
+		List<FanWarningRecord> list = fanWaringRecordMapper.selectList(lambdaQw);
+
+		// List<FanWarningRecord> maps =
+		// fanWaringRecordMapper.selectWarningPoint(STATION, EQUIPMENTNAME, (current -
+		// 1) * size, size, gatewayIds);
+		page.setRecords(list);
+
 		return ResponseHelper.buildResponse(page);
 	}
 

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

 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.IdxBizPvWarningRecordDto;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvWarningRecordServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.IdxBizPvWarningRecordDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointProcessVariableClassification;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvPointProcessVariableClassification;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvPointProcessVariableClassificationMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvWarningRecordServiceImpl;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.PvWaringRecordMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvWarningRecord;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvWarningRecord;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 
@@ -30,6 +54,14 @@ public class IdxBizPvWarningRecordController extends BaseController {
     @Autowired
     IdxBizPvWarningRecordServiceImpl idxBizPvWarningRecordServiceImpl;
 
+    
+	@Autowired
+	PvWaringRecordMapper pvWaringRecordMapper;
+	
+	
+	@Autowired
+	IdxBizPvPointProcessVariableClassificationMapper idxBizPvPointProcessVariableClassificationMapper;
+	
     /**
      * 新增
      *
@@ -112,4 +144,161 @@ public class IdxBizPvWarningRecordController extends BaseController {
 	public ResponseModel<List<IdxBizPvWarningRecordDto>> selectForList() {
 	    return ResponseHelper.buildResponse(idxBizPvWarningRecordServiceImpl.queryForIdxBizPvWarningRecordList());
 	}
+	
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/selectFanWarningNum")
+	@ApiOperation(httpMethod = "GET", value = "查询各风机预警状况", notes = "查询各风机预警状况")
+	public ResponseModel<Map<String, Object>> selectFanWarningNum(@RequestParam String station) {
+
+		LambdaQueryWrapper<IdxBizPvPointProcessVariableClassification> wrapper = new LambdaQueryWrapper<>();
+		wrapper.select(IdxBizPvPointProcessVariableClassification::getSubarray);
+		wrapper.eq(IdxBizPvPointProcessVariableClassification::getStation, station);
+		wrapper.groupBy(IdxBizPvPointProcessVariableClassification::getSubarray);
+		wrapper.last(" ORDER BY RIGHT(SUBARRAY,6) desc");
+		List<IdxBizPvPointProcessVariableClassification> variableClassificationList = idxBizPvPointProcessVariableClassificationMapper
+				.selectList(wrapper);
+
+		QueryWrapper<PvWarningRecord> lambdaQw = new QueryWrapper<>();
+		lambdaQw.select("COUNT(1) AS c,subarray AS subarray,warning_name AS warningname");
+		lambdaQw.lambda().eq(PvWarningRecord::getStation, station);
+		lambdaQw.lambda().eq(PvWarningRecord::getDisposotionState, "待确认");
+		lambdaQw.lambda().groupBy(PvWarningRecord::getSubarray);
+		lambdaQw.lambda().groupBy(PvWarningRecord::getWarningName);
+		List<Map<String, Object>> lists = pvWaringRecordMapper.selectMaps(lambdaQw);
+
+//		Map<String, Object> resultMap = new HashMap<>();
+//		List<String> gatewayIds = this.getGatewayIds();
+//		List<Map<String, Object>> maps = fanWaringRecordMapper.selectFanWarningNum(station, gatewayIds);
+//		Map<String, Map<String, Object>> equipmentNameInfoMap = maps.stream()
+//				.collect(Collectors.toMap(t -> t.get("EQUIPMENT_NAME").toString(), t -> t));
+
+		List<Integer> wxList = new ArrayList<>();
+		List<Integer> zyList = new ArrayList<>();
+		List<Integer> jgList = new ArrayList<>();
+		List<String> list = new ArrayList<>();
+
+		Map<String, Map<String, Integer>> countMap = new HashMap<>();
+		for (Map<String, Object> map : lists) {
+			String subarray = String.valueOf(map.get("subarray"));
+			int count = Integer.valueOf(String.valueOf(map.get("c")));
+			String warningName = String.valueOf(map.get("warningname"));
+			Map<String, Integer> equipMap = countMap.get(subarray);
+			if (equipMap == null) {
+				equipMap = new HashMap<>();
+			}
+			equipMap.put(warningName, count);
+			countMap.put(subarray, equipMap);
+		}
+
+		variableClassificationList.forEach(item -> {
+			Map<String, Integer> equipMap = countMap.get(item.getSubarray());
+			if(equipMap!=null) 
+			{
+				wxList.add(equipMap.get("危险") != null ? equipMap.get("危险") : 0);
+				zyList.add(equipMap.get("注意") != null ? equipMap.get("注意") : 0);
+				jgList.add(equipMap.get("警告") != null ? equipMap.get("警告") : 0);
+			}else 
+			{
+				wxList.add(0);
+				zyList.add(0);
+				jgList.add(0);
+			}
+			list.add(item.getSubarray());
+		});
+
+//		for (Map<String, Object> map : maps) {
+//			wxList.add(Integer.valueOf(map.get("危险").toString()));
+//			zyList.add(Integer.valueOf(map.get("注意").toString()));
+//			jgList.add(Integer.valueOf(map.get("警告").toString()));
+//			list.add(map.get("EQUIPMENT_NAME").toString());
+//
+//		}
+
+		HashMap<String, Object> wxMapResult = new HashMap<>();
+		wxMapResult.put("data", wxList);
+		wxMapResult.put("name", "危险");
+		HashMap<String, Object> zyMapResult = new HashMap<>();
+		zyMapResult.put("data", zyList);
+		zyMapResult.put("name", "注意");
+		HashMap<String, Object> jgMapResult = new HashMap<>();
+		jgMapResult.put("data", jgList);
+		jgMapResult.put("name", "警告");
+
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		List<Map<String, Object>> hashMaps = Arrays.asList(wxMapResult, zyMapResult, jgMapResult);
+		resultMap.put("axisData", list);
+		resultMap.put("seriesData", hashMaps);
+		return ResponseHelper.buildResponse(resultMap);
+
+	}
+	
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/selectEquipWarningTotal")
+	@ApiOperation(httpMethod = "GET", value = "预警信息统计富文本", notes = "预警信息统计富文本")
+	public ResponseModel<Map<String, Object>> selectEquipWarningTotal(@RequestParam String STATION,
+			@RequestParam String EQUIPMENTNAME) {
+//		List<String> gatewayIds = this.getGatewayIds();
+//		Map<String, Object> maps = fanWaringRecordMapper.selectEquipWarningTotal(STATION, EQUIPMENTNAME, gatewayIds);
+		QueryWrapper<PvWarningRecord> lambdaQw = new QueryWrapper<>();
+		lambdaQw.select("COUNT(1) AS c,warning_name AS warningname");
+		lambdaQw.lambda().eq(PvWarningRecord::getStation, STATION);
+		lambdaQw.lambda().eq(PvWarningRecord::getDisposotionState, "待确认");
+		lambdaQw.lambda().eq(PvWarningRecord::getEquipmentName, EQUIPMENTNAME);
+		lambdaQw.lambda().groupBy(PvWarningRecord::getEquipmentName);
+		lambdaQw.lambda().groupBy(PvWarningRecord::getWarningName);
+		List<Map<String, Object>> lists = pvWaringRecordMapper.selectMaps(lambdaQw);
+		Map<String, Object> maps = new HashMap<>();
+		maps.put("zhuyi", 0);
+		maps.put("weixian", 0);
+		maps.put("jinggao", 0);
+		int total = 0;
+		for (Map<String, Object> map : lists) {
+			if ("注意".equals(String.valueOf(map.get("warningname")))) {
+				maps.put("zhuyi", map.get("c"));
+				total+=Integer.valueOf(String.valueOf(map.get("c")));
+			} else if ("危险".equals(String.valueOf(map.get("warningname")))) {
+				maps.put("weixian", map.get("c"));
+				total+=Integer.valueOf(String.valueOf(map.get("c")));
+			} else if ("警告".equals(String.valueOf(map.get("warningname")))) {
+				maps.put("jinggao", map.get("c"));
+				total+=Integer.valueOf(String.valueOf(map.get("c")));
+			}
+		}
+		maps.put("total", total);
+		return ResponseHelper.buildResponse(maps);
+	}
+
+
+	
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/selectWarningPoint")
+	@ApiOperation(httpMethod = "GET", value = "预警监测设备右侧预警重复列表", notes = "预警监测设备右侧预警重复列表")
+	public ResponseModel<Page<PvWarningRecord>> selectWarningPoint(@RequestParam String STATION,
+			@RequestParam String EQUIPMENTNAME, @RequestParam Integer current, @RequestParam Integer size) {
+		Page<PvWarningRecord> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		// List<String> gatewayIds = this.getGatewayIds();
+		LambdaQueryWrapper<PvWarningRecord> lambdaQw = new LambdaQueryWrapper<>();
+		lambdaQw.eq(PvWarningRecord::getStation, STATION);
+		lambdaQw.eq(PvWarningRecord::getEquipmentName, EQUIPMENTNAME);
+		lambdaQw.eq(PvWarningRecord::getDisposotionState, "待确认");
+	
+
+		int total = pvWaringRecordMapper.selectCount(lambdaQw);
+		page.setTotal(total);
+
+		lambdaQw.orderByDesc(PvWarningRecord::getTs);
+		String limit = "LIMIT " + (current - 1) * size + "," + size;
+		lambdaQw.last(limit);
+		List<PvWarningRecord> list = pvWaringRecordMapper.selectList(lambdaQw);
+
+		// List<PvWarningRecord> maps =
+		// fanWaringRecordMapper.selectWarningPoint(STATION, EQUIPMENTNAME, (current -
+		// 1) * size, size, gatewayIds);
+		page.setRecords(list);
+
+		return ResponseHelper.buildResponse(page);
+	}
+
 }