1、风电/光伏监测左侧列表查询按照时间周期查询

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

@@ -308,8 +308,8 @@ public class IdxBizPvHealthIndexController extends BaseController {
             date = DateUtil.offsetHour(date, -8);
             date = DateUtil.offsetMinute(date, -59);
             startTimeTop = DateUtil.format(date, DatePattern.NORM_DATETIME_PATTERN);
-            List<PvHealthIndexHour> pvHealthIndexHours = 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);
+            List<PvHealthIndexHour> pvHealthIndexHours = pvHealthIndexHourMapper.selectData(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName, (current - 1) * size, size, orgCode);
+            int total = pvHealthIndexHourMapper.selectDataTotal(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName,  orgCode);
             if (CollectionUtils.isEmpty(pvHealthIndexHours)) {
                 pvHealthIndexHours = pvHealthIndexHourMapper.selectLatestData(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, null, null, equipmentName, (current - 1) * size, size, orgCode);
                 if (CollectionUtils.isEmpty(pvHealthIndexHours)) {
@@ -334,8 +334,8 @@ public class IdxBizPvHealthIndexController extends BaseController {
             date = DateUtils.dateAddHours(date, -8);
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             startTimeTop = formatter.format(date);
-            List<PvHealthIndexMoment> pvHealthIndexMoments = 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);
+            List<PvHealthIndexMoment> pvHealthIndexMoments = pvHealthIndexMomentMapper.selectData(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName, (current - 1) * size, size, orgCode);
+            int total = pvHealthIndexMomentMapper.selectDataTotal(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName,  orgCode);
             if (CollectionUtils.isEmpty(pvHealthIndexMoments)) {
                 pvHealthIndexMoments = pvHealthIndexMomentMapper.selectLatestData(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, null, null, equipmentName, (current - 1) * size, size, orgCode);
                 if (CollectionUtils.isEmpty(pvHealthIndexMoments)) {

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

@@ -41,11 +41,11 @@ public interface PvHealthIndexHourMapper extends BaseMapper<PvHealthIndexHour> {
             , @Param("current")Integer current, @Param("size")Integer size,@Param("orgCode") String orgCode);
 
 
-    @Select("<script>" +
-            "SELECT count(1)" +
-            " FROM analysis_data.pv_health_index_hour WHERE   analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
+    @Select("<script>"+
+            "SELECT count(1) FROM (SELECT distinct `health_index` AS healthIndex,rec_date as recDate, `health_index` AS `value`, 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_hour 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> " +
@@ -53,10 +53,10 @@ 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>" +
-            "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
 //            "<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
+            "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </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, @Param("orgCode") String orgCode);
+    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,@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" +

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

@@ -44,11 +44,11 @@ public interface PvHealthIndexMomentMapper extends BaseMapper<PvHealthIndexMomen
 
 
 
-    @Select("<script>" +
-            "SELECT count(1)" +
-            " FROM analysis_data.pv_health_index_moment WHERE   analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
+    @Select("<script>"+
+            "SELECT count(1) FROM (SELECT distinct `health_index` AS healthIndex,rec_date as recDate, `health_index` AS `value`, 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_moment 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> " +
@@ -56,10 +56,10 @@ 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>" +
-            //"<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
-            "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
+//            "<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
+            "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </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, @Param("orgCode") String orgCode);
+    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,@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" +