Merge remote-tracking branch 'origin/developer' into developer

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TanYinAlramInfo.java

@@ -21,6 +21,10 @@ import lombok.NoArgsConstructor;
 @TableName (value = "tanyin_alram_info", autoResultMap = true)
 public class TanYinAlramInfo {
 
+    @ApiModelProperty ("唯一序号")
+    @TableField ("id")
+    private String id;
+
     @ApiModelProperty ("项目编号")
     @TableField ("project_no")
     private String projectNo;

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

@@ -821,6 +821,8 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
 									} else {
 										if (StringUtils.isNotEmpty(jpInverter.getSnCode().trim())) {
 											jpInverterMapper.insert(jpInverter);
+										} else {
+											logger.warn("-------科士达同步采集器详情/逆变器 snCode 为空！------- jpInverter => " + JSON.toJSONString(jpInverter));
 										}
 									}
 

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

@@ -14,6 +14,7 @@ import java.util.stream.Stream;
 
 import javax.annotation.PostConstruct;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -69,6 +70,7 @@ import cn.hutool.core.date.DateUtil;
 import fastjson.JSON;
 
 @Service
+@Slf4j
 public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionService {
 	@Autowired
 	private SofarRequestUtil requestUtil;
@@ -497,15 +499,15 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
 //                        tdJpStation.setCreatedTime(System.currentTimeMillis());
 //                        tdJpStationMapper.insert(tdJpStation);
 //                    }
-					Map<String, Object> requestInfo3 = new HashMap<>();
-					requestInfo3.put("stationId", sunlightDto.getId());
-					requestInfo3.put("deviceType", "COLLECTOR");
-					String param3 = JSON.toJSONString(requestInfo3);
-					List<SofarInverter> jsonObject3 = requestUtil.getResPonse(SoFarConstant.nbqlist,
-							SoFarConstant.requestPost, param3, SoFarConstant.deviceListItems, SofarInverter.class);
+// 					Map<String, Object> requestInfo3 = new HashMap<>();
+// 					requestInfo3.put("stationId", sunlightDto.getId());
+// 					requestInfo3.put("deviceType", "COLLECTOR");
+// 					String param3 = JSON.toJSONString(requestInfo3);
+// 					List<SofarInverter> jsonObject3 = requestUtil.getResPonse(SoFarConstant.nbqlist,
+// 							SoFarConstant.requestPost, param3, SoFarConstant.deviceListItems, SofarInverter.class);
 					// 逆变器信信息
 					this.inverterList(jsonObject2, jpStation, maps);
-					this.collectorDetail(jsonObject3, jpStation);
+					// this.collectorDetail(jsonObject3, jpStation);
 					// 报警列表无法获取ruleId了 首航更新接口了
 					this.inverAlramInfo(jpStation);
 				}
@@ -516,6 +518,15 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
 					jpStationMapper.insert(jpStation);
 				}
 			}
+			// 获取采集器信息
+			Map<String, Object> requestInfo3 = new HashMap<>();
+			requestInfo3.put("stationId", sunlightDto.getId());
+			requestInfo3.put("deviceType", "COLLECTOR");
+			String param3 = JSON.toJSONString(requestInfo3);
+			List<SofarInverter> jsonObject3 = requestUtil.getResPonse(SoFarConstant.nbqlist,
+					SoFarConstant.requestPost, param3, SoFarConstant.deviceListItems, SofarInverter.class);
+			// 逆变器信信息
+			this.collectorDetail(jsonObject3, jpStation);
 
 			// 电站报表
 			// 户用场站日发电量

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

@@ -178,7 +178,7 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
     @Override
     public void customerInfoList() {
         try {
-            String startDate = LocalDate.now().minusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            String startDate = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             String endDate = LocalDate.now().plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             log.info("-------碳银同步项目信息开始: {} ------- ", sdf.format(new Date()));
             Map<String, Object> params = MapBuilder.<String, Object>create()
@@ -465,7 +465,7 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
         if (jpInverter == null || StringUtils.isEmpty(jpInverter.getSnCode())) {
             return;
         }
-        String startDate = LocalDate.now().minusYears(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        String startDate = LocalDate.now().minusWeeks(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         String endDate = LocalDate.now().plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         Map<String, Object> params = MapBuilder.<String, Object>create()
                                                .put("sn", jpInverter.getSnCode())
@@ -483,13 +483,19 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
             tanYinAlramInfo.setCreateTime(System.currentTimeMillis());
             tanYinAlramInfoMapper.insert(tanYinAlramInfo);
 
-            HYGFJPInverterWarn hygfjpInverterWarn = new HYGFJPInverterWarn();
+            HYGFJPInverterWarn hygfjpInverterWarn = hygfjpInverterWarnMapper
+                    .selectOne(new QueryWrapper<HYGFJPInverterWarn>().eq("sn_code", tanYinAlramInfo.getSn())
+                                                                     .eq("warn_id", tanYinAlramInfo.getId())
+                                                                     .eq("third_station_id", String.valueOf(tanYinAlramInfo.getProjectNo())));
+            if (com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isEmpty(hygfjpInverterWarn)) {
+                hygfjpInverterWarn = new HYGFJPInverterWarn();
+            }
             // 做查询
             hygfjpInverterWarn.setTime(System.currentTimeMillis());
             hygfjpInverterWarn.setSnCode(tanYinAlramInfo.getSn());
             hygfjpInverterWarn.setThirdStationId(jpStation.getThirdStationId());
             hygfjpInverterWarn.setLevel(tanYinAlramInfo.getLevel());
-            hygfjpInverterWarn.setWarnId(tanYinAlramInfo.getCode());
+            hygfjpInverterWarn.setWarnId(tanYinAlramInfo.getId());
             hygfjpInverterWarn.setAmosCompanyCode(jpStation.getAmosCompanyCode());
             hygfjpInverterWarn.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             hygfjpInverterWarn.setStationName(jpStation.getName());
@@ -827,7 +833,6 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
                 tdHYGFInverterTotalGenerateMapper.insert(tdHYGFInverterTotalGenerate);
             }
 
-            inverAlramInfo(jpInverter, jpStation);
         }
 
     }

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

@@ -179,7 +179,7 @@ public class SurveyInformationServiceImpl
 						&& PowerStationProcessStateEnum.不通过.getName().equals(powerStation.getProcessStatus())) {
 
 				} else {
-					throw new BadRequest("勘察中，请稍后再试！");
+					throw new BadRequest("此数据已被其他人操作，请返回重新刷新！");
 				}
 
 			}

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

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -402,13 +403,16 @@ public class IdxBizFanHealthIndexController extends BaseController {
 			orgCode =gatewayIds.get(0)+"%";
 		}
 		List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, orgCode);
-
+		int total = fanHealthIndexDayMapper.selectDataTotal(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,orgCode);
+		if(CollectionUtils.isEmpty(fanHealthIndexDays)){
+			fanHealthIndexDays = fanHealthIndexDayMapper.selectLatestData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, null, null,0,1, orgCode);
+			total = 1;
+		}
 		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,orgCode);
 		page.setRecords(fanHealthIndexDays);
 		page.setTotal(total);
 //		page.setTotal(Long.valueOf(fanHealthIndexDays.size()));
@@ -455,7 +459,13 @@ public class IdxBizFanHealthIndexController extends BaseController {
 		List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null, orgCode);
 
 		Map<String,Object> map = new HashMap<>();
-		map.put("value",Double.parseDouble(df.format(Double.parseDouble(fanHealthIndexDays.get(0).getValue()))));
+		//预防查询结果为空
+		if(CollectionUtils.isEmpty(fanHealthIndexDays)){
+			map.put("value",0);
+		}else{
+			map.put("value",Double.parseDouble(df.format(Double.parseDouble(fanHealthIndexDays.get(0).getValue()))));
+		}
+
 		return ResponseHelper.buildResponse(map);
 	}
 

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

@@ -23,6 +23,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -279,12 +280,16 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			Date date = DateUtils.dateAddHours(startDayTime, -9);
 			startTimeTop = DateUtil.format(date,DatePattern.NORM_DATETIME_PATTERN);
 			List<PvHealthIndexDay> fanHealthIndexDays = pvHealthIndexDayMapper.selectData(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName,(current-1)*size,size, orgCode);
+			int total = pvHealthIndexDayMapper.selectDataTotal(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName, orgCode);
 
+			if(CollectionUtils.isEmpty(fanHealthIndexDays)){
+				fanHealthIndexDays = pvHealthIndexDayMapper.selectLatestData(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, null, null, equipmentName, 0,1,orgCode);
+				total = 1;
+			}
 			fanHealthIndexDays.forEach(item -> {
 				item.setHealthIndex(Double.parseDouble(df.format(item.getHealthIndex())));
 			});
 
-			int total = pvHealthIndexDayMapper.selectDataTotal(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName, orgCode);
 			Page page = new Page<>();
 			page.setCurrent(current);
 			page.setSize(size);
@@ -297,10 +302,14 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			date = DateUtil.offsetMinute(date,-59);
 			startTimeTop = DateUtil.format(date,DatePattern.NORM_DATETIME_PATTERN);
 			List<PvHealthIndexHour> fanHealthIndexHours = pvHealthIndexHourMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, orgCode);
+			int total = pvHealthIndexHourMapper.selectDataTotal(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop, orgCode);
+			if(CollectionUtils.isEmpty(fanHealthIndexHours)){
+				fanHealthIndexHours = pvHealthIndexHourMapper.selectLatestData(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, null, null, equipmentName, 0,1,orgCode);
+				total = 1;
+			}
 			fanHealthIndexHours.forEach(item -> {
 				item.setHealthIndex(Double.parseDouble(df.format(item.getHealthIndex())));
 			});
-			int total = pvHealthIndexHourMapper.selectDataTotal(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop, orgCode);
 
 			Page page = new Page<>();
 			page.setCurrent(current);
@@ -314,6 +323,11 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			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,(current-1)*size,size, orgCode);
+			int total = pvHealthIndexMomentMapper.selectDataTotal(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop, orgCode);
+			if(CollectionUtils.isEmpty(fanHealthIndexMoments)){
+				fanHealthIndexMoments = pvHealthIndexMomentMapper.selectLatestData(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, null, null, equipmentName, 0,1,orgCode);
+				total = 1;
+			}
 			fanHealthIndexMoments.forEach(item -> {
 				item.setHealthIndex(Double.parseDouble(df.format(item.getHealthIndex())));
 			});
@@ -321,7 +335,6 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			page.setCurrent(current);
 			page.setSize(size);
 			page.setRecords(fanHealthIndexMoments);
-			int total = pvHealthIndexMomentMapper.selectDataTotal(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop, orgCode);
 			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

@@ -88,4 +88,24 @@ public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> {
                                             @Param("orgCode") String orgCode
     );
 
+    @Select("<script>" +
+            "SELECT distinct `health_index` AS healthIndex,anomaly,rec_date as recDate, `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} and org_code  is not null" +
+            "<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>" +
+            "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
+            "order by ts " +
+            "<if test='current != null and size != null'>limit ${current},${size} </if>" +
+            "</script>")
+    List<FanHealthIndexDay> selectLatestData(@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,
+                                       @Param("current") Integer current, @Param("size") Integer size,
+                                       @Param("orgCode") String orgCode
+    );
+
 }

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

@@ -109,4 +109,34 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
                                       @Param("equipmentName")String equipmentName
             , @Param("current")Integer current, @Param("size")Integer size,@Param("orgCode") String orgCode);
 
+
+    @Select("<script>"+
+            "SELECT distinct `health_index` AS healthIndex,rec_date as recDate, `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} and org_code  is not null" +
+            "<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>" +
+            "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
+            "order by health_index "+
+            "<if test='current != null and size != null'>limit ${current},${size} </if>" +
+            "</script>")
+    List<PvHealthIndexDay> selectLatestData(@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,@Param("orgCode") String orgCode);
+
 }

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

@@ -76,4 +76,34 @@ public interface PvHealthIndexHourMapper extends BaseMapper<PvHealthIndexHour> {
                                            @Param("endTimeTop") String endTimeTop,
                                            @Param("equipmentName") String equipmentName
             , @Param("current") Integer current, @Param("size") Integer size, @Param("orgCode") String orgCode);
+
+
+    @Select("<script>"+
+            "SELECT distinct `health_index` AS healthIndex,rec_date as recDate, `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} and org_code  is not null" +
+            "<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>" +
+            "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
+            "order by health_index "+
+            "<if test='current != null and size != null'>limit ${current},${size} </if>" +
+            "</script>")
+    List<PvHealthIndexHour> selectLatestData(@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,@Param("orgCode") String orgCode);
 }

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

@@ -76,4 +76,33 @@ public interface PvHealthIndexMomentMapper extends BaseMapper<PvHealthIndexMomen
                                            @Param("endTimeTop") String endTimeTop,
                                            @Param("equipmentName") String equipmentName
             , @Param("current") Integer current, @Param("size") Integer size, @Param("orgCode") String orgCode);
+
+    @Select("<script>"+
+            "SELECT distinct `health_index` AS healthIndex,rec_date as recDate, `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} and org_code  is not null" +
+            "<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>" +
+            "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
+            "order by health_index "+
+            "<if test='current != null and size != null'>limit ${current},${size} </if>" +
+            "</script>")
+    List<PvHealthIndexMoment> selectLatestData(@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,@Param("orgCode") String orgCode);
 }