解决冲突

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java

@@ -38,7 +38,6 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionService {
     //定时任务执行频率 当前为10分钟一次
-   
 
 
     //锦浪云请求工具封装
@@ -149,7 +148,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 jpStation.setUserName(golangStationDetail.getUsername());
                 jpStation.setUserPhone(String.valueOf(golangStationDetail.getUsermobile()));
                 jpStation.setStationContact(String.valueOf(golangStationDetail.getMobile()).toLowerCase().replace("null", ""));
-                jpStation.setModuleCount(ObjectUtils.isEmpty(Math.toIntExact(golangStationDetail.getModule()))?0:Math.toIntExact(golangStationDetail.getModule()));
+                jpStation.setModuleCount(ObjectUtils.isEmpty(Math.toIntExact(golangStationDetail.getModule())) ? 0 : Math.toIntExact(golangStationDetail.getModule()));
                 //并网类型
                 jpStation.setState(GoLangConstant.stationStaus.get(String.valueOf(golangStationDetail.getState())));
                 jpStation.setThirdStationId(String.valueOf(golangStationDetail.getId()));
@@ -509,7 +508,6 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                         hygfjpInverterWarn = new HYGFJPInverterWarn();
                     }
                     hygfjpInverterWarn.setTime(System.currentTimeMillis());
-                    hygfjpInverterWarn.setTimeLong(System.currentTimeMillis());
                     hygfjpInverterWarn.setSnCode(alarmDto.getAlarmDeviceSn());
                     hygfjpInverterWarn.setThirdStationId(String.valueOf(alarmDto.getStationId()));
                     hygfjpInverterWarn.setLevel(GoLangConstant.alarmLevel.get(alarmDto.getAlarmLevel()));
@@ -517,7 +515,14 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                     hygfjpInverterWarn.setThirdCode(PVProducerInfoEnum.JLY.getCode());
                     hygfjpInverterWarn.setTreatment(alarmDto.getAdvice());
                     hygfjpInverterWarn.setStartTime(alarmDto.getAlarmBeginTime());
-                    hygfjpInverterWarn.setRecoverTime(alarmDto.getAlarmEndTime());
+                    hygfjpInverterWarn.setRecoverTime(null);
+                    if (!ObjectUtils.isEmpty(alarmDto.getAlarmEndTime())) {
+                        hygfjpInverterWarn.setRecoverTime(alarmDto.getAlarmEndTime());
+                    }
+                    hygfjpInverterWarn.setTimeLong(null);
+                    if (!ObjectUtils.isEmpty(alarmDto.getAlarmEndTime()) && !ObjectUtils.isEmpty(alarmDto.getAlarmEndTime())) {
+                        hygfjpInverterWarn.setTimeLong(alarmDto.getAlarmEndTime() - alarmDto.getAlarmBeginTime());
+                    }
                     hygfjpInverterWarn.setState(GoLangConstant.alarmstatus.get(alarmDto.getState()));
                     if (ObjectUtils.isEmpty(hygfjpInverterWarn.getCreatedTime())) {
                         hygfjpInverterWarn.setCreatedTime(System.currentTimeMillis());

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/ImasterDataServiceImpl.java

@@ -770,7 +770,6 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                         hygfjpInverterWarn = new HYGFJPInverterWarn();
                     }
                     hygfjpInverterWarn.setTime(System.currentTimeMillis());
-                    hygfjpInverterWarn.setTimeLong(System.currentTimeMillis());
                     hygfjpInverterWarn.setSnCode(alarmDto.getEsnCode());
                     hygfjpInverterWarn.setThirdStationId(String.valueOf(alarmDto.getStationCode()));
                     hygfjpInverterWarn.setLevel(ImasterConstant.alarmLevel.get(alarmDto.getLev().toString()));
@@ -778,6 +777,8 @@ public class ImasterDataServiceImpl implements ImasterDataService {
                     hygfjpInverterWarn.setThirdCode(PVProducerInfoEnum.HUAWEI.getCode());
                     hygfjpInverterWarn.setTreatment(alarmDto.getDevName());
                     hygfjpInverterWarn.setStartTime(alarmDto.getRaiseTime());
+                    hygfjpInverterWarn.setRecoverTime(null);
+                    hygfjpInverterWarn.setTimeLong(null);
                     hygfjpInverterWarn.setState(ImasterConstant.alarmstatus.get(alarmDto.getStatus().toString()));
                     if (ObjectUtils.isEmpty(hygfjpInverterWarn.getCreatedTime())) {
                         hygfjpInverterWarn.setCreatedTime(System.currentTimeMillis());

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java

 package com.yeejoin.amos.api.householdapi.face.service.impl;
 
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -1053,12 +1054,12 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
         if (!CollectionUtils.isEmpty(result)) {
             for (KsolarAlarmDto ksolarAlarmDto : result) {
                 if (!ObjectUtils.isEmpty(ksolarAlarmDto.getInverterId())) {
-                    String startTime = ksolarAlarmDto.getSaveTime();
-                    String recoverTime = ksolarAlarmDto.getRemoveTime();
-                    String pattern = "yyyy-MM-dd HH:mm:ss";
-                    SimpleDateFormat sdf = new SimpleDateFormat(pattern);
-                    Date startTimeL = sdf.parse(startTime);
-                    Date recoverTimeL = sdf.parse(recoverTime);
+//                    String startTime = ksolarAlarmDto.getSaveTime();
+//                    String recoverTime = ksolarAlarmDto.getRemoveTime();
+//                    String pattern = "yyyy-MM-dd HH:mm:ss";
+//                    SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+//                    Date startTimeL = sdf.parse(startTime);
+//                    Date recoverTimeL = sdf.parse(recoverTime);
 
                     String snCode=null;
 
@@ -1072,7 +1073,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     }
                     HYGFJPInverterWarn hygfjpInverterWarn = hygfjpInverterWarnMapper.selectOne(new QueryWrapper<HYGFJPInverterWarn>()
                             .eq("sn_code",snCode)
-                            .eq("start_time", startTimeL.getTime())
+                            .eq("start_time",DateUtil.parse(ksolarAlarmDto.getSaveTime(), DatePattern.NORM_DATETIME_PATTERN).getTime())
                             .eq("third_code", PVProducerInfoEnum.KSOLAR.getCode())
                             .eq("third_station_id", ksolarAlarmDto.getStationId())
                     );
@@ -1081,16 +1082,22 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                     }
 
                     hygfjpInverterWarn.setTime(System.currentTimeMillis());
-                    hygfjpInverterWarn.setTimeLong(System.currentTimeMillis());
                     hygfjpInverterWarn.setSnCode(snCode);
                     hygfjpInverterWarn.setThirdStationId(ksolarAlarmDto.getStationId());
                     hygfjpInverterWarn.setLevel(KSolarConstant.alarmLevel.get(ksolarAlarmDto.getLevels()));
                     hygfjpInverterWarn.setContent(ksolarAlarmDto.getMessage());
                     hygfjpInverterWarn.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
                     hygfjpInverterWarn.setTreatment(ksolarAlarmDto.getSolution());
-                    hygfjpInverterWarn.setStartTime(startTimeL.getTime());
-                    hygfjpInverterWarn.setRecoverTime(recoverTimeL.getTime());
+                    hygfjpInverterWarn.setStartTime(DateUtil.parse(ksolarAlarmDto.getSaveTime(), DatePattern.NORM_DATETIME_PATTERN).getTime());
                     hygfjpInverterWarn.setState(KSolarConstant.alarmstatus.get(ksolarAlarmDto.getStatus()));
+                    hygfjpInverterWarn.setTimeLong(null);
+                    hygfjpInverterWarn.setRecoverTime(null);
+                    if(StringUtils.isNotBlank(ksolarAlarmDto.getRemoveTime())){
+                        hygfjpInverterWarn.setRecoverTime(DateUtil.parse(ksolarAlarmDto.getRemoveTime(), DatePattern.NORM_DATETIME_PATTERN).getTime());
+                    }
+                    if(!ObjectUtils.isEmpty(ksolarAlarmDto.getSaveTime())&&!ObjectUtils.isEmpty(ksolarAlarmDto.getRemoveTime())){
+                        hygfjpInverterWarn.setTimeLong(hygfjpInverterWarn.getRecoverTime()-hygfjpInverterWarn.getStartTime());
+                    }
                     if (ObjectUtils.isEmpty(hygfjpInverterWarn.getCreatedTime())) {
                         hygfjpInverterWarn.setCreatedTime(System.currentTimeMillis());
                         hygfjpInverterWarnMapper.insert(hygfjpInverterWarn);

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

@@ -35,6 +35,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.POST;
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -66,6 +67,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 	FanHealthIndexMomentMapper fanHealthIndexMomentMapper;
     @Autowired
 	FanWaringRecordMapper fanWarningRecord;
+    public final DecimalFormat df = new DecimalFormat("#.0");
     /**
      * 新增
      *
@@ -381,7 +383,15 @@ public class IdxBizFanHealthIndexController extends BaseController {
 			startTimeTop = formatter.format(startDate);
 		}
 		List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
+
+		fanHealthIndexDays.forEach(item -> {
+			double roundedNumber = Double.parseDouble(df.format(item.getHealthIndex()));
+			item.setHealthIndex(roundedNumber);
+		});
+
+		int total = fanHealthIndexDayMapper.selectDataTotal(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
 		page.setRecords(fanHealthIndexDays);
+		page.setTotal(total);
 		page.setTotal(Long.valueOf(fanHealthIndexDays.size()));
 		return ResponseHelper.buildResponse(page);
 	}
@@ -421,7 +431,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 		List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null);
 
 		Map<String,Object> map = new HashMap<>();
-		map.put("value",fanHealthIndexDays.get(0).getValue());
+		map.put("value",Double.parseDouble(df.format(fanHealthIndexDays.get(0).getValue())));
 		return ResponseHelper.buildResponse(map);
 	}
 
@@ -706,7 +716,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 
 			for (FanHealthIndexDay obj : fanHealthIndexDays) {
 				if (type.equals("0")){
-					seriesData.add(obj.getHealthIndex().intValue());
+					seriesData.add(Double.parseDouble(df.format(obj.getHealthIndex())));
 				}else {
 					seriesData.add(obj.getAnomaly());
 				}
@@ -727,7 +737,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 			fanHealthIndexHours=	fanHealthIndexHours.stream().sorted(Comparator.comparing(FanHealthIndexHour::getAnalysisTime)).collect(Collectors.toList());
 			for (FanHealthIndexHour obj : fanHealthIndexHours) {
 				if (type.equals("0")){
-					seriesData.add(obj.getHealthIndex().intValue());
+					seriesData.add(Double.parseDouble(df.format(obj.getHealthIndex())));
 				}else {
 					seriesData.add(obj.getAnomaly());
 				}
@@ -749,7 +759,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 			fanHealthIndexMoments=	fanHealthIndexMoments.stream().sorted(Comparator.comparing(FanHealthIndexMoment::getAnalysisTime)).collect(Collectors.toList());
 			for (FanHealthIndexMoment obj : fanHealthIndexMoments) {
 				if (type.equals("0")){
-					seriesData.add(obj.getHealthIndex().intValue());
+					seriesData.add(Double.parseDouble(df.format(obj.getHealthIndex())));
 				}else {
 					seriesData.add(obj.getAnomaly());
 				}

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

@@ -379,10 +379,15 @@ public class IdxBizFanWarningRecordController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/selectWarningPoint")
 	@ApiOperation(httpMethod = "GET", value = "预警监测设备右侧预警重复列表", notes = "预警监测设备右侧预警重复列表")
-	public ResponseModel<List<FanWarningRecord>> selectFanWarningNum(@RequestParam String STATION,@RequestParam String EQUIPMENTNAME) {
-		List<FanWarningRecord> maps = fanWaringRecordMapper.selectWarningPoint(STATION,EQUIPMENTNAME);
-
-		return ResponseHelper.buildResponse(maps);
+	public ResponseModel<Page<FanWarningRecord>> selectFanWarningNum(@RequestParam String STATION,@RequestParam String EQUIPMENTNAME,@RequestParam Integer current,@RequestParam Integer size) {
+		Page<FanWarningRecord> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		List<FanWarningRecord> maps = fanWaringRecordMapper.selectWarningPoint(STATION,EQUIPMENTNAME,(current-1)*size,size);
+		page.setRecords(maps);
+		int total = fanWaringRecordMapper.selectWarningPointTotal(STATION, EQUIPMENTNAME);
+		page.setTotal(total);
+		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/IdxBizPvHealthIndexController.java

@@ -227,7 +227,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@ApiOperation(httpMethod = "GET",value = "TD 光伏场站/设备列表通用接口",   notes = "TD 光伏场站/设备列表通用接口")
 	@GetMapping(value = "/pointHealthIndexTable")
-	public ResponseModel<Object> pointHealthIndexTable(@RequestParam(value = "area",required = false) String area,
+	public ResponseModel<Page> pointHealthIndexTable(@RequestParam(value = "area",required = false) String area,
 													   @RequestParam(value = "station",required = false) String station,
 													   @RequestParam(value = "analysisObjType",required = false) String analysisObjType,
 													   @RequestParam(value = "analysisType",required = false) String analysisType,
@@ -239,6 +239,8 @@ public class IdxBizPvHealthIndexController extends BaseController {
 													   @RequestParam(value = "healthLevel",required = false) String healthLevel,
 													   @RequestParam(value = "type",required = false) String type,
 													   @RequestParam(value = "requiredType",required = false) String requiredType,
+													   @RequestParam(value = "current",required = false) Integer current,
+													   @RequestParam(value = "size",required = false) Integer size,
 													   @RequestParam(value = "subarray",required = false) String subarray){
 
 
@@ -249,8 +251,14 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			startTimeTop = formatter.format(date);
 
-			List<PvHealthIndexDay> fanHealthIndexDays = pvHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
-			return 	ResponseHelper.buildResponse(fanHealthIndexDays);
+			List<PvHealthIndexDay> fanHealthIndexDays = pvHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
+			int total = pvHealthIndexDayMapper.selectDataTotal(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
+			Page page = new Page<>();
+			page.setCurrent(current);
+			page.setSize(size);
+			page.setRecords(fanHealthIndexDays);
+			page.setTotal(total);
+			return 	ResponseHelper.buildResponse(page);
 		}else if (requiredType.equals("按小时")){
 			int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
 			String day = DateUtils.getDateNowShortStr();
@@ -263,15 +271,28 @@ public class IdxBizPvHealthIndexController extends BaseController {
 				e.printStackTrace();
 			}
 
-			List<PvHealthIndexHour> fanHealthIndexHours = pvHealthIndexHourMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
-			return 	ResponseHelper.buildResponse(fanHealthIndexHours);
+			List<PvHealthIndexHour> fanHealthIndexHours = pvHealthIndexHourMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
+			int total = pvHealthIndexHourMapper.selectDataTotal(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
+
+			Page page = new Page<>();
+			page.setCurrent(current);
+			page.setSize(size);
+			page.setRecords(fanHealthIndexHours);
+			page.setTotal(total);
+			return 	ResponseHelper.buildResponse(page);
 		}else {
 			Date date = DateUtils.dateAddMinutes(null,-9);
 			date = DateUtils.dateAddHours(date, -8);
 			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			startTimeTop = formatter.format(date);
-			List<PvHealthIndexMoment> fanHealthIndexMoments = pvHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
-			return 	ResponseHelper.buildResponse(fanHealthIndexMoments);
+			List<PvHealthIndexMoment> fanHealthIndexMoments = pvHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
+			Page page = new Page<>();
+			page.setCurrent(current);
+			page.setSize(size);
+			page.setRecords(fanHealthIndexMoments);
+			int total = pvHealthIndexMomentMapper.selectDataTotal(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
+			page.setTotal(total);
+			return 	ResponseHelper.buildResponse(page);
 		}
 	}
 
@@ -291,6 +312,8 @@ public class IdxBizPvHealthIndexController extends BaseController {
 													   @RequestParam(value = "healthLevel",required = false) String healthLevel,
 													   @RequestParam(value = "type",required = false) String type,
 													   @RequestParam(value = "requiredType",required = false) String requiredType,
+													   @RequestParam(value = "current",required = false) Integer current,
+													   @RequestParam(value = "size",required = false) Integer size,
 													   @RequestParam(value = "subarray",required = false) String subarray) {
 
 		Map<String,Object> result = new HashMap<>();
@@ -306,7 +329,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 			startTimeTop = formatter.format(startDate);
 
-			List<PvHealthIndexDay> fanHealthIndexDays = pvHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
+			List<PvHealthIndexDay> fanHealthIndexDays = pvHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
 			fanHealthIndexDays=	fanHealthIndexDays.stream().sorted(Comparator.comparing(PvHealthIndexDay::getAnalysisTime)).collect(Collectors.toList());
 
 			for (PvHealthIndexDay obj : fanHealthIndexDays) {
@@ -328,7 +351,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			}
 			Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 			startTimeTop = formatter.format(startDate);
-			List<PvHealthIndexHour> fanHealthIndexHours = pvHealthIndexHourMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
+			List<PvHealthIndexHour> fanHealthIndexHours = pvHealthIndexHourMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null);
 			fanHealthIndexHours=	fanHealthIndexHours.stream().sorted(Comparator.comparing(PvHealthIndexHour::getAnalysisTime)).collect(Collectors.toList());
 			for (PvHealthIndexHour obj : fanHealthIndexHours) {
 				if (type.equals("0")){
@@ -350,7 +373,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 			startTimeTop = formatter.format(startDate);
 
-			List<PvHealthIndexMoment> fanHealthIndexMoments = pvHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
+			List<PvHealthIndexMoment> fanHealthIndexMoments = pvHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null);
 			fanHealthIndexMoments=	fanHealthIndexMoments.stream().sorted(Comparator.comparing(PvHealthIndexMoment::getAnalysisTime)).collect(Collectors.toList());
 			for (PvHealthIndexMoment obj : fanHealthIndexMoments) {
 				if (type.equals("0")){
@@ -400,10 +423,15 @@ public class IdxBizPvHealthIndexController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/selectWarningPoint")
 	@ApiOperation(httpMethod = "GET", value = "预警监测设备右侧预警重复列表", notes = "预警监测设备右侧预警重复列表")
-	public ResponseModel<List<PvWarningRecord>> selectFanWarningNum(@RequestParam String STATION,@RequestParam String EQUIPMENTNAME,@RequestParam String SUBARRAY) {
-		List<PvWarningRecord> maps = pvWaringRecordMapper.selectWarningPoint(STATION,EQUIPMENTNAME,SUBARRAY);
-
-		return ResponseHelper.buildResponse(maps);
+	public ResponseModel<Page<PvWarningRecord>> selectFanWarningNum(@RequestParam String STATION,@RequestParam String EQUIPMENTNAME,@RequestParam String SUBARRAY,Integer current,Integer size) {
+		Page<PvWarningRecord> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		List<PvWarningRecord> maps = pvWaringRecordMapper.selectWarningPoint(STATION,EQUIPMENTNAME,SUBARRAY,(current-1)*size,size);
+		page.setRecords(maps);
+		int total = pvWaringRecordMapper.selectWarningPointTotal(STATION, EQUIPMENTNAME,SUBARRAY);
+		page.setTotal(total);
+		return ResponseHelper.buildResponse(page);
 	}
 
 

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

@@ -29,6 +29,21 @@ public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> {
 
 
     @Select("<script>"+
+            "SELECT count(1) 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> " +
+            "<if test='indexAddress!= null'> AND index_address = #{indexAddress} </if> " +
+            "<if test='pointName!= null'>AND point_name = #{pointName} </if> " +
+            "<if test='station!= null'>AND station = #{station} </if>" +
+            "<if test='healthLevel!= null'>AND health_level = #{healthLevel} </if>" +
+            "<if test='subSystem!= null'>AND sub_system = #{subSystem} </if> " +
+            "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
+            "</script>")
+    int selectDataTotal(@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("equipmentName")String equipmentName,@Param("subSystem")String subSystem,@Param("analysisType")String analysisType,@Param("analysisObjType")String analysisObjType,@Param("station")String station,@Param("pointName")String pointName, @Param("indexAddress")String indexAddress,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop);
+
+
+    @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='area!= null'> AND area = #{area} </if> " +
             "<if test='station!= null'>AND station = #{station} </if>" +

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

@@ -19,7 +19,8 @@ public interface FanWaringRecordMapper  extends BaseMapper<FanWarningRecord> {
 
  public List<FanWarningRecord> warningData(String STATION,String EQUIPMENTNAME,String SUBSYSTEM);
 
- public List<FanWarningRecord> selectWarningPoint(String STATION,String EQUIPMENTNAME);
+ 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);
 

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

@@ -21,7 +21,26 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
             "<if test='healthLevel!= null '>AND health_level = #{healthLevel} </if>" +
             "<if test='subarray!= null'>AND subarray = #{subarray} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
+            "order by health_index "+
+            "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
-    List<PvHealthIndexDay> selectData(@Param("station")String station,@Param("analysisType")String analysisType,@Param("indexAddress")String indexAddress,@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("analysisObjType")String analysisObjType, @Param("subarray")String subarray, @Param("pointName")String pointName,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @Param("equipmentName")String equipmentName);
+    List<PvHealthIndexDay> selectData(@Param("station")String station,@Param("analysisType")String analysisType,@Param("indexAddress")String indexAddress,@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("analysisObjType")String analysisObjType, @Param("subarray")String subarray, @Param("pointName")String pointName,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @Param("equipmentName")String equipmentName
+            , @Param("current")Integer current, @Param("size")Integer size);
+
+
+    @Select("<script>"+
+            "SELECT count(1)" +
+            " 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> " +
+            "<if test='area!= null '> AND area = #{area} </if> " +
+            "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
+            "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +
+            "<if test='station!= null'>AND station = #{station} </if>" +
+            "<if test='healthLevel!= null '>AND health_level = #{healthLevel} </if>" +
+            "<if test='subarray!= null'>AND subarray = #{subarray} </if> " +
+            "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
+            "</script>")
+    int selectDataTotal(@Param("station")String station,@Param("analysisType")String analysisType,@Param("indexAddress")String indexAddress,@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("analysisObjType")String analysisObjType, @Param("subarray")String subarray, @Param("pointName")String pointName,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @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/PvHealthIndexHourMapper.java

@@ -21,7 +21,24 @@ public interface PvHealthIndexHourMapper extends BaseMapper<PvHealthIndexHour> {
             "<if test='healthLevel!= null '>AND health_level = #{healthLevel} </if>" +
             "<if test='subarray!= null'>AND subarray = #{subarray} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
+            "order by health_index "+
+            "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
-    List<PvHealthIndexHour> selectData (@Param("healthLevel")String healthLevel, @Param("area")String area, @Param("equipmentName")String equipmentName, @Param("subarray")String subarray, @Param("analysisType")String analysisType, @Param("analysisObjType")String analysisObjType, @Param("station")String station, @Param("pointName")String pointName, @Param("indexAddress")String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop);
+    List<PvHealthIndexHour> selectData (@Param("healthLevel")String healthLevel, @Param("area")String area, @Param("equipmentName")String equipmentName, @Param("subarray")String subarray, @Param("analysisType")String analysisType, @Param("analysisObjType")String analysisObjType, @Param("station")String station, @Param("pointName")String pointName, @Param("indexAddress")String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop
+                                      , @Param("current")Integer current, @Param("size")Integer size);
+    @Select("<script>"+
+            "SELECT count(1)" +
+            " FROM analysis_data.pv_health_index_hour 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> " +
+            "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
+            "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +
+            "<if test='station!= null'>AND station = #{station} </if>" +
+            "<if test='healthLevel!= null '>AND health_level = #{healthLevel} </if>" +
+            "<if test='subarray!= null'>AND subarray = #{subarray} </if> " +
+            "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
+            "</script>")
+    int selectDataTotal(@Param("healthLevel")String healthLevel, @Param("area")String area, @Param("equipmentName")String equipmentName, @Param("subarray")String subarray, @Param("analysisType")String analysisType, @Param("analysisObjType")String analysisObjType, @Param("station")String station, @Param("pointName")String pointName, @Param("indexAddress")String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop);
 
 }

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

@@ -21,6 +21,25 @@ public interface PvHealthIndexMomentMapper extends BaseMapper<PvHealthIndexMomen
             "<if test='healthLevel!= null '>AND health_level = #{healthLevel} </if>" +
             "<if test='subarray!= null'>AND subarray = #{subarray} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
+            "order by health_index "+
+            "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
-    List<PvHealthIndexMoment> selectData(@Param("healthLevel")String healthLevel, @Param("area")String area, @Param("equipmentName")String equipmentName, @Param("subarray")String subarray, @Param("analysisType")String analysisType, @Param("analysisObjType")String analysisObjType, @Param("station")String station, @Param("pointName")String pointName, @Param("indexAddress")String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop);
+    List<PvHealthIndexMoment> selectData(@Param("healthLevel")String healthLevel, @Param("area")String area, @Param("equipmentName")String equipmentName, @Param("subarray")String subarray, @Param("analysisType")String analysisType, @Param("analysisObjType")String analysisObjType, @Param("station")String station, @Param("pointName")String pointName, @Param("indexAddress")String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop
+            , @Param("current")Integer current, @Param("size")Integer size);;
+
+    @Select("<script>"+
+            "SELECT count(1)" +
+            " FROM analysis_data.pv_health_index_moment 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> " +
+            "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
+            "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +
+            "<if test='station!= null'>AND station = #{station} </if>" +
+            "<if test='healthLevel!= null '>AND health_level = #{healthLevel} </if>" +
+            "<if test='subarray!= null'>AND subarray = #{subarray} </if> " +
+            "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
+            "</script>")
+    int selectDataTotal(@Param("healthLevel")String healthLevel, @Param("area")String area, @Param("equipmentName")String equipmentName, @Param("subarray")String subarray, @Param("analysisType")String analysisType, @Param("analysisObjType")String analysisObjType, @Param("station")String station, @Param("pointName")String pointName, @Param("indexAddress")String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop);
+
 }

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

@@ -17,7 +17,8 @@ public interface PvWaringRecordMapper extends BaseMapper<PvWarningRecord> {
 
     public List<Map<String,Object>> selectFanWarningNum(String station);
 
-    List<PvWarningRecord> selectWarningPoint(String STATION, String EQUIPMENTNAME, String SUBARRAY);
+    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);
 

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

@@ -135,6 +135,35 @@
         rec_date ,
         content,
         warning_name
+        limit #{current},#{size}
+    </select>
+
+
+    <select id="selectWarningPointTotal" resultType="int">
+        select count(1) from (SELECT
+        a.station,
+        a.warning_name,
+        a.content,
+        a.equipment_name,
+        a.point_name,
+        a.rec_date
+        from
+        analysis_data.fan_warning_record a
+        where
+        a.status = 0
+        <if test="STATION != null and  STATION != '' ">
+            AND a.station = #{STATION}
+        </if>
+        <if test="EQUIPMENTNAME != '' and EQUIPMENTNAME != null">
+            AND a.equipment_name = #{EQUIPMENTNAME}
+        </if>
+        group by
+        station,
+        equipment_name,
+        point_name,
+        rec_date ,
+        content,
+        warning_name) b
     </select>
 
     <select id="selectEquipWarningTotal" resultType="map">

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

@@ -147,9 +147,40 @@
         rec_date ,
         content,
         warning_name
+        limit #{current},#{size}
     </select>
 
 
+    <select id="selectWarningPointTotal"  resultType="int">
+        SELECT
+        a.station,
+        a.warning_name,
+        a.content,
+        a.equipment_name,
+        a.point_name,
+        a.rec_date
+        from
+        analysis_data.pv_warning_record a
+        where
+        a.status = 0
+        <if test="STATION != null and  STATION != '' ">
+            AND a.station = #{STATION}
+        </if>
+        <if test="EQUIPMENTNAME != '' and EQUIPMENTNAME != null">
+            AND a.equipment_name = #{EQUIPMENTNAME}
+        </if>
+        <if test="SUBARRAY != '' and SUBARRAY != null">
+            AND a.subarray = #{SUBARRAY}
+        </if>
+        group by
+        station,
+        equipment_name,
+        point_name,
+        rec_date ,
+        content,
+        warning_name
+    </select>
+
     <select id="selectEquipWarningTotal" resultType="map">
         SELECT
         `STATION` AS `STATION`,