解决冲突

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

@@ -481,30 +481,61 @@ public class IdxBizFanHealthIndexController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "预警监测设备级统计td 统计分类环图 ",   notes = "预警监测设备级统计td 统计分类环图")
 	@GetMapping(value = "/selectPointNum")
 	public ResponseModel<List<Map<String,Object>>> selectPointNum(@RequestParam(required = false) String STATION,@RequestParam(required = false) String SUBSYSTEM,@RequestParam(required = false) String  EQUIPMENTNAME) {
-		List<FanWarningRecord> idxBizPvWarningRecordList = fanWarningRecord.warningData(STATION,EQUIPMENTNAME ,SUBSYSTEM );
+	//	List<FanWarningRecord> idxBizPvWarningRecordList = fanWarningRecord.warningData(STATION,EQUIPMENTNAME ,SUBSYSTEM );
+		List<Map<String, Object>> maps = fanHealthIndexDayMapper.selectEquipStatusByEquipment( "测点", STATION,EQUIPMENTNAME);
 		int total = idxBizFanHealthIndexServiceImpl.pointNum(STATION, SUBSYSTEM, EQUIPMENTNAME);
 
-		Map<String,Object> map =new HashMap<>();
-		Map<String,Object> map1 =new HashMap<>();
-		Map<String,Object> warningNum =new HashMap<>();
-		Map<String,Object> pointNum =new  HashMap<>();
+//		Map<String,Object> map =new HashMap<>();
+//		Map<String,Object> map1 =new HashMap<>();
+//		Map<String,Object> warningNum =new HashMap<>();
+//		Map<String,Object> pointNum =new  HashMap<>();
+//
+//		map1.put("name","危险");
+//		map1.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("危险")).count());
+//		map.put("name","警告");
+//		map.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count());
+//		warningNum.put("name","注意");
+//		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count());
+//		pointNum.put("name","安全");
+//		pointNum.put("value",total  - idxBizPvWarningRecordList.size());
+//
+//		List<Map<String,Object>> list = new ArrayList<>();
+//		list.add(pointNum);
+//		list.add(warningNum);
+//		list.add(map);
+//		list.add(map1);
+//
+//		return ResponseHelper.buildResponse(list);
+		if (maps.size() == 4){
+			for (Map<String, Object> map : maps) {
+				map.put("name",map.get("healthlevel"));
+			}
+		} else {
 
-		map1.put("name","危险");
-		map1.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("危险")).count());
-		map.put("name","警告");
-		map.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count());
-		warningNum.put("name","注意");
-		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count());
-		pointNum.put("name","安全");
-		pointNum.put("value",total  - idxBizPvWarningRecordList.size());
+			List<String> levels = new ArrayList<>();
+			levels.add("安全");
+			levels.add("注意");
+			levels.add("警告");
+			levels.add("危险");
 
-		List<Map<String,Object>> list = new ArrayList<>();
-		list.add(pointNum);
-		list.add(warningNum);
-		list.add(map);
-		list.add(map1);
+			for (Map<String, Object> map : maps) {
+				map.put("name",map.get("healthlevel"));
+				String healthlevel = map.get("healthlevel").toString();
+				levels.remove(healthlevel);
+			}
 
-		return ResponseHelper.buildResponse(list);
+			if (levels.size()>0){
+				for (String s : levels) {
+					Map<String, Object> map = new HashMap<>();
+					map.put("name",s);
+					map.put("value",0);
+					map.put("sort",HealthLevelSortEnum.getCode(s));
+					maps.add(map);
+				}
+				maps = maps.stream().sorted(Comparator.comparingLong(e ->  Long.valueOf(e.get("sort").toString()))).collect(Collectors.toList());
+			}
+		}
+		return ResponseHelper.buildResponse(maps);
 	}
 
 
@@ -732,7 +763,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 				if (type.equals("0")){
 					seriesData.add(Double.parseDouble(df.format(obj.getHealthIndex())));
 				}else {
-					seriesData.add(obj.getAnomaly());
+					seriesData.add(obj.getAnomaly() > 7.5?7.5:obj.getAnomaly());
 				}
 				axisData.add(obj.getAnalysisTime());
 			}
@@ -753,7 +784,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 				if (type.equals("0")){
 					seriesData.add(Double.parseDouble(df.format(obj.getHealthIndex())));
 				}else {
-					seriesData.add(obj.getAnomaly());
+					seriesData.add(obj.getAnomaly() > 7.5?7.5:obj.getAnomaly());
 				}
 				axisData.add(obj.getAnalysisTime());
 			}
@@ -775,7 +806,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 				if (type.equals("0")){
 					seriesData.add(Double.parseDouble(df.format(obj.getHealthIndex())));
 				}else {
-					seriesData.add(obj.getAnomaly());
+					seriesData.add(obj.getAnomaly() > 7.5?7.5:obj.getAnomaly());
 				}
 				axisData.add(obj.getAnalysisTime());
 			}

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

@@ -420,7 +420,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 				if (type.equals("0")){
 					seriesData.add(Double.parseDouble(df.format(obj.getHealthIndex())));
 				}else {
-					seriesData.add(obj.getAnomaly());
+					seriesData.add(obj.getAnomaly() > 7.5?7.5:obj.getAnomaly());
 				}
 				axisData.add(obj.getAnalysisTime());
 			}
@@ -441,7 +441,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 				if (type.equals("0")){
 					seriesData.add(Double.parseDouble(df.format(obj.getHealthIndex())));
 				}else {
-					seriesData.add(obj.getAnomaly());
+					seriesData.add(obj.getAnomaly() > 7.5?7.5:obj.getAnomaly());
 				}
 				axisData.add(obj.getAnalysisTime());
 			}
@@ -463,7 +463,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 				if (type.equals("0")){
 					seriesData.add(Double.parseDouble(df.format(obj.getHealthIndex())));
 				}else {
-					seriesData.add(obj.getAnomaly());
+					seriesData.add(obj.getAnomaly() > 7.5?7.5:obj.getAnomaly());
 				}
 				axisData.add(obj.getAnalysisTime());
 			}

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

@@ -136,7 +136,7 @@ public class TdInfoQueryController {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/getFanWarningRecordInfo")
     @ApiOperation(httpMethod = "POST", value = "分页查询健康指数信息 - 风电", notes = "分页查询健康指数信息 - 风电")
-    public ResponseModel<Page<FanWarningRecord>> getFanWarningRecordInfo(@RequestBody FanHealthIndexDto dto) throws ParseException {
+    public ResponseModel<Page<Map<String,Object>>> getFanWarningRecordInfo(@RequestBody FanHealthIndexDto dto) throws ParseException {
         if (CharSequenceUtil.isNotEmpty(dto.getStartDate())) {
             String startDate = dto.getStartDate();
             Date date = DateUtils.dateParse(startDate, DATE_TIME_PATTERN);
@@ -149,7 +149,7 @@ public class TdInfoQueryController {
             String endDateString = DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN);
             dto.setEndDate(endDateString);
         }
-        Page<FanWarningRecord> resultPage = new Page<>(dto.getCurrent(), dto.getSize());
+        Page<Map<String,Object>> resultPage = new Page<>(dto.getCurrent(), dto.getSize());
         dto.setCurrent((dto.getCurrent() - 1) * dto.getSize());
         List<Map<String, String>> orderWeight = dto.getSorts().stream().sorted(Comparator.comparing(t -> Integer.parseInt(t.get("orderWeight")))).collect(Collectors.toList());
         List<String> orderByList = new ArrayList<>();
@@ -160,7 +160,7 @@ public class TdInfoQueryController {
         }
         String join = String.join(",", orderByList);
         dto.setOrderColumns(join);
-        List<FanWarningRecord> fanWarningRecordsIPage = fanWaringRecordMapper.getInfoByPage(dto);
+        List<Map<String,Object>> fanWarningRecordsIPage = fanWaringRecordMapper.getInfoByPage(dto);
         Integer infoByPageTotal = fanWaringRecordMapper.getInfoByPageTotal(dto);
         resultPage.setRecords(fanWarningRecordsIPage);
         resultPage.setTotal(infoByPageTotal);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanHealthIndexDayMapper.java

@@ -11,7 +11,7 @@ import java.util.Map;
 
 public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> {
     @Select("<script>"+
-            "SELECT `health_index` AS healthIndex,anomaly, `health_index` AS `value`,  analysis_time AS  analysisTime, station,equipment_name AS equipmentName,point_name as pointName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_day WHERE analysis_obj_type = #{analysisObjType}" +
+            "SELECT `health_index` AS healthIndex,anomaly, `health_index` AS `value`, substr(analysis_time,1,10) as   analysisTime, station,equipment_name AS equipmentName,point_name as pointName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_day WHERE analysis_obj_type = #{analysisObjType}" +
             "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
             "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null'> AND area = #{area} </if> " +
@@ -52,4 +52,13 @@ public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> {
     List<Map<String,Object>> selectEquipStatusByStation(@Param("area")String area,@Param("analysisObjType")String analysisObjType,@Param("station")String station);
 
     List<Map<String, Object>> getHealthInfoByArea();
+
+    @Select("<script>"+
+            "SELECT  station, health_level as healthlevel,( CASE HEALTH_LEVEL WHEN '危险' THEN 4 WHEN '警告' THEN 3 WHEN '注意' THEN 2 ELSE 1 END ) AS sort, count( 1 ) AS `value` FROM analysis_data.fan_health_index_day WHERE analysis_obj_type = #{analysisObjType} AND ts >= TODAY()-8h" +
+            "<if test='station!= null'>AND station = #{station} </if>" +
+            "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
+            " GROUP BY station,health_level,equipment_name  order by sort"+
+            "</script>")
+    List<Map<String,Object>> selectEquipStatusByEquipment(@Param("analysisObjType")String analysisObjType,@Param("station")String station,@Param("equipmentName")String equipmentName);
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanWaringRecordMapper.java

@@ -28,7 +28,7 @@ public interface FanWaringRecordMapper  extends BaseMapper<FanWarningRecord> {
 
  List<Map<String, Object>> getAllEquipAlarmInfo();
 
- List<FanWarningRecord> getInfoByPage(@Param("dto") FanHealthIndexDto dto);
+ List<Map<String,Object>> getInfoByPage(@Param("dto") FanHealthIndexDto dto);
 
  Integer getInfoByPageTotal(@Param("dto") FanHealthIndexDto dto);
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexDayMapper.java

@@ -11,7 +11,7 @@ import java.util.Map;
 
 public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
     @Select("<script>"+
-            "SELECT `health_index` AS healthIndex,`health_index` AS `value`, rec_date AS recDate, anomaly, analysis_time,station,equipment_name AS equipmentName, point_name as pointName, index_address as indexAddress, ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status" +
+            "SELECT `health_index` AS healthIndex,`health_index` AS `value`, rec_date AS recDate, anomaly, substr(analysis_time,1,10) as analysisTime,station,equipment_name AS equipmentName, point_name as pointName, index_address as indexAddress, ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status" +
             " FROM analysis_data.pv_health_index_day WHERE  analysis_obj_type = #{analysisObjType}" +
             "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
             "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanWarningRecord.xml

@@ -208,7 +208,7 @@
         `b`.`EQUIPMENT_NAME`
     </select>
 
-<select id="getInfoByPage" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord">
+<select id="getInfoByPage" resultType="map">
     SELECT * FROM fan_warning_record
     <where>
         <if test="dto.area!= null and dto.area!= ''"> AND arae = #{dto.area} </if>