预警监测bug修改

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

@@ -370,8 +370,8 @@ public class IdxBizFanWarningRecordController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/selectEquipWarningTotal")
 	@ApiOperation(httpMethod = "GET", value = "预警信息统计富文本", notes = "预警信息统计富文本")
-	public ResponseModel<List<Map<String,Object>>> selectEquipWarningTotal(@RequestParam String STATION,@RequestParam String EQUIPMENTNAME) {
-		List<Map<String, Object>> maps = fanWaringRecordMapper.selectEquipWarningTotal(STATION,EQUIPMENTNAME);
+	public ResponseModel<Map<String,Object>> selectEquipWarningTotal(@RequestParam String STATION,@RequestParam String EQUIPMENTNAME) {
+		Map<String, Object> maps = fanWaringRecordMapper.selectEquipWarningTotal(STATION,EQUIPMENTNAME);
 
 		return ResponseHelper.buildResponse(maps);
 	}

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

@@ -507,7 +507,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/selectWarningPoint")
 	@ApiOperation(httpMethod = "GET", value = "预警监测设备右侧预警重复列表", notes = "预警监测设备右侧预警重复列表")
-	public ResponseModel<Page<PvWarningRecord>> selectFanWarningNum(@RequestParam String STATION,@RequestParam String EQUIPMENTNAME,@RequestParam String SUBARRAY,Integer current,Integer size) {
+	public ResponseModel<Page<PvWarningRecord>> selectFanWarningNum(@RequestParam String STATION,@RequestParam String EQUIPMENTNAME,@RequestParam(required = false) String SUBARRAY,Integer current,Integer size) {
 		Page<PvWarningRecord> page = new Page<>();
 		page.setCurrent(current);
 		page.setSize(size);
@@ -522,10 +522,10 @@ public class IdxBizPvHealthIndexController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/selectEquipWarningTotal")
 	@ApiOperation(httpMethod = "GET", value = "预警信息统计富文本", notes = "预警信息统计富文本")
-	public ResponseModel<List<Map<String,Object>>> selectEquipWarningTotal(@RequestParam String STATION,@RequestParam String EQUIPMENTNAME,@RequestParam String SUBARRAY) {
-		List<Map<String, Object>> maps = pvWaringRecordMapper.selectEquipWarningTotal(STATION,EQUIPMENTNAME,SUBARRAY);
+	public ResponseModel<Map<String,Object>> selectEquipWarningTotal(@RequestParam String STATION,@RequestParam String EQUIPMENTNAME,@RequestParam(required = false) String SUBARRAY) {
+		Map<String, Object> map = pvWaringRecordMapper.selectEquipWarningTotal(STATION,EQUIPMENTNAME,SUBARRAY);
 
-		return ResponseHelper.buildResponse(maps);
+		return ResponseHelper.buildResponse(map);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)

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

@@ -22,7 +22,7 @@ public interface FanWaringRecordMapper  extends BaseMapper<FanWarningRecord> {
  public List<FanWarningRecord> selectWarningPoint(String STATION,String EQUIPMENTNAME,Integer current,Integer size);
  public int selectWarningPointTotal(String STATION,String EQUIPMENTNAME);
 
- public List<Map<String,Object>> selectEquipWarningTotal(String STATION,String EQUIPMENTNAME);
+ public Map<String,Object> selectEquipWarningTotal(String STATION,String EQUIPMENTNAME);
 
  int saveBatchWarningRecords(@Param("list") List<FanWarningRecord> list);
 

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, analysis_time,station,equipment_name AS equipmentName,  ( 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, 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" +
             " 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/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvWaringRecordMapper.java

@@ -20,7 +20,7 @@ public interface PvWaringRecordMapper extends BaseMapper<PvWarningRecord> {
     List<PvWarningRecord> selectWarningPoint(String STATION, String EQUIPMENTNAME, String SUBARRAY,Integer current,Integer size);
     int selectWarningPointTotal(String STATION, String EQUIPMENTNAME, String SUBARRAY);
 
-    List<Map<String, Object>> selectEquipWarningTotal(String STATION, String EQUIPMENTNAME, String SUBARRAY);
+    Map<String, Object> selectEquipWarningTotal(String STATION, String EQUIPMENTNAME, String SUBARRAY);
 
 
     List<PvWarningRecord> getInfoByPage(@Param("dto") FanHealthIndexDto dto);

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

@@ -224,6 +224,7 @@
         GROUP BY
         `b`.`STATION`,
         `b`.`EQUIPMENT_NAME`
+        limit 1
     </select>
 
 <select id="getInfoByPage" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvWarningRecord">