Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -8,6 +8,7 @@ import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
@@ -664,13 +665,6 @@ public class DateUtils {
         /*System.out.println(dateFormat(maxDateOfMonth(dateParse("2016-02", "yyyy-MM")), null));
         System.out.println(dateFormat(minDateOfMonth(dateParse("2016-03-31", null)), null));*/
 
-//        System.out.println(dateFormat(new Date(), CHN_DATE_PATTERN_YEAR));
-//        System.out.println(dateFormat(new Date(), CHN_DATE_PATTERN_MONTH));
-//        System.out.println(getWeekOfYear(new Date()));
-//        System.out.println(getQuarterStr(getMonth(dateParse("2021-5-11", null))));
-//        System.out.println(getWeekBeginDate(dateParse("2021-10-11", null)));
-//        System.out.println(getWeekEndDate(dateParse("2021-10-11", null)));
-        System.out.println(secondsToTimeStr(3600));
 
         List<String> beforeCurrentMonth = getBeforeCurrentMonth(3, true);
         System.out.println(beforeCurrentMonth);
@@ -688,6 +682,53 @@ public class DateUtils {
         return name;
     }
 
+    //获取当前时间下一整时分点 例如 传入17:18  返回 17:20
+    public static String getNextWholeMinute(String currentTimeString) {
+
+        // 定义日期时间字符串的格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        // 将字符串转换为 LocalDateTime
+        LocalDateTime currentTime = LocalDateTime.parse(currentTimeString, formatter);
+
+        int currentMinute = currentTime.getMinute();
+        int seconds = currentTime.getSecond();
+        int nanos = currentTime.getNano();
+
+        // 如果当前分钟已经是整时分点，则加上 60 分钟
+        if (currentMinute % 10 == 0 && seconds == 0 && nanos == 0) {
+            return currentTimeString;
+        }
+
+        // 否则计算下一个整时分点
+        LocalDateTime localDateTime = currentTime.withSecond(0).withNano(0).plusMinutes(10 - currentMinute % 10);
+
+        return    localDateTime.format(formatter);
+    }
+
+    //获取当前时间下一整时分点 例如 传入17:18  返回 17:20
+    public static String getBeforeWholeMinute(String currentTimeString) {
+
+        // 定义日期时间字符串的格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        // 将字符串转换为 LocalDateTime
+        LocalDateTime currentTime = LocalDateTime.parse(currentTimeString, formatter);
+
+        int currentMinute = currentTime.getMinute();
+        int seconds = currentTime.getSecond();
+        int nanos = currentTime.getNano();
+
+        // 如果当前分钟已经是整时分点，则加上 60 分钟
+        if (currentMinute % 10 == 0 && seconds == 0 && nanos == 0) {
+            return currentTimeString;
+        }
+
+        // 否则计算下一个整时分点
+        LocalDateTime localDateTime = currentTime.withSecond(0).withNano(0).minusMinutes(currentMinute % 10);
+        return    localDateTime.format(formatter);
+    }
+
     /**
      * 获取某月的日期List
      *

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

@@ -61,6 +61,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -176,6 +177,7 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
      */
     @Scheduled (cron = "${dataRequestScheduled.tanYin}")
     @Override
+   
     public void customerInfoList() {
         try {
             String startDate = LocalDate.now().minusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
@@ -221,6 +223,7 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
     @Scheduled (cron = "${dataRequestScheduled.tanYin}")
     @Async
     @Override
+    @PostConstruct
     public void stationList() {
         long ts = System.currentTimeMillis();
         log.info("-------碳银同步电站开始: {} ------- ", ts);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/FanHealthIndexDto.java

@@ -47,4 +47,7 @@ public class FanHealthIndexDto implements Serializable {
     private String orgCode;
     private List<String> gatewayIds;
     private String warningPeriod;
+    private String tableName;
+    private Long startDateTs;
+    private Long endDateTs;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/PvHealthIndexDto.java

@@ -46,5 +46,8 @@ public class PvHealthIndexDto {
     private String sortOne;
     private String sortsString;
     private String orgCode;
+    private String tableName;
+    private Long startDateTs;
+    private Long endDateTs;
     private List<String> gatewayIds;
 }

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

@@ -2999,6 +2999,7 @@ public class CommonServiceImpl {
             if (500 == newList.size() || i == pvHealthIndices.size() - 1) { // 载体list达到要求,进行批量操作
                 // 调用批量插入
                 pvHealthIndexMapper.saveBatchHealthIndexList(newList, "pv_health_index_moment", analysisType);
+//                pvHealthIndexMapper.saveBatchHealthIndexListNew(newList, "pv_health_index_moment_new", analysisType);
                 idxFanHealthIndexMapper.saveBatchHealthIndexLatestInfoPv(newList);
                 newList.clear();// 每次批量操作后,清空载体list,等待下次的数据填入
             }

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndexDay;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -107,4 +108,5 @@ public interface FanHealthIndexMapper extends BaseMapper<FanHealthIndex> {
                                                     @Param("tableName") String tableName,
                                                     @Param("analysisObjectType") String analysisObjectType);
 
+    int saveBatchHealthIndexListNew(@Param("list") List<FanHealthIndex> list, @Param("tableName") String tableName, @Param("analysisType") String analysisType);
 }

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

@@ -30,6 +30,7 @@ public interface PvHealthIndexMapper extends BaseMapper<PvHealthIndex> {
     List<PvHealthIndex> 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);
 
     int saveBatchHealthIndexList(@Param("list") List<PvHealthIndex> list, @Param("tableName") String tableName, @Param("analysisType") String analysisType);
+    int saveBatchHealthIndexListNew(@Param("list") List<PvHealthIndex> list, @Param("tableName") String tableName, @Param("analysisType") String analysisType);
 
 //    int saveBatchHealthIndexLatestInfo(@Param("list") List<PvHealthIndex> list, @Param("tableName") String tableName);
 
@@ -61,6 +62,8 @@ public interface PvHealthIndexMapper extends BaseMapper<PvHealthIndex> {
 
     List<PvHealthIndex> getInfoByPage(@Param("dto") PvHealthIndexDto dto);
 
+    long getTsByRecDate(@Param("tableName")String tableName,@Param("recDate")String recDate,@Param("sort")String sort);
+
     Integer getInfoByPageTotal(@Param("dto") PvHealthIndexDto dto);
 
     List<PvHealthIndex> getInfoList(@Param("startTime") String startTime,

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

@@ -554,4 +554,36 @@
             analysis_obj_type = #{analysisObjectType}
             and ts > #{startTime}
     </select>
+
+    <insert id="saveBatchHealthIndexListNew" >
+        insert into
+        ${tableName}
+        using fan_health_index_data_new TAGS (#{analysisType})
+        values
+        <foreach collection="list" separator="," item="item" index="index">
+        (
+        now,
+        #{item.recDate, jdbcType=VARCHAR},
+        #{item.analysisObjType, jdbcType=VARCHAR},
+        #{item.analysisObjSeq, jdbcType=VARCHAR},
+        #{item.weight, jdbcType=FLOAT},
+        #{item.healthIndex, jdbcType=FLOAT},
+        #{item.healthLevel, jdbcType=VARCHAR},
+        #{item.analysisStartTime, jdbcType=VARCHAR},
+        #{item.analysisEndTime, jdbcType=VARCHAR},
+        #{item.area, jdbcType=VARCHAR},
+        #{item.station, jdbcType=VARCHAR},
+        #{item.subSystem, jdbcType=VARCHAR},
+        #{item.number, jdbcType=VARCHAR},
+        #{item.equipmentName, jdbcType=VARCHAR},
+        #{item.gatewayId, jdbcType=VARCHAR},
+        #{item.indexAddress, jdbcType=VARCHAR},
+        #{item.anomaly, jdbcType=FLOAT},
+        #{item.pointName, jdbcType=VARCHAR},
+        #{item.analysisTime, jdbcType=VARCHAR},
+        #{item.kks, jdbcType=VARCHAR},
+        #{item.orgCode, jdbcType=VARCHAR}
+        )
+        </foreach>
+    </insert>
 </mapper>

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

@@ -199,12 +199,12 @@
     </select>
 
     <select id="getInfoByPage" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
-        SELECT * FROM pv_health_index_data
+        SELECT * FROM ${dto.tableName}
         <where>
             <if test="dto.analysisObjType!= null and dto.analysisObjType!= ''">analysis_obj_type = #{dto.analysisObjType}</if>
             <if test="dto.analysisType!= null and dto.analysisType!= ''">and analysis_type = #{dto.analysisType}</if>
-            <if test="dto.endDate!= null and dto.endDate!= ''">  and ts &lt;= #{dto.endDate} </if>
-            <if test="dto.startDate!= null and dto.startDate!= ''">  and  ts &gt;= #{dto.startDate} </if>
+            <if test="dto.endDateTs!= null and dto.endDateTs!= ''">  and ts &lt;= #{dto.endDateTs} </if>
+            <if test="dto.startDateTs!= null and dto.startDateTs!= ''">  and  ts &gt;= #{dto.startDateTs} </if>
             <if test="dto.area!= null and dto.area!= ''"> AND area = #{dto.area} </if>
             <if test="dto.subarray!= null and dto.subarray!= ''"> AND subarray = #{dto.subarray} </if>
             <if test="dto.pointName!= null and dto.pointName!= ''">AND point_name = #{dto.pointName} </if>
@@ -226,13 +226,18 @@
         limit #{dto.current}, #{dto.size}
     </select>
 
+    <select id="getTsByRecDate" resultType="long">
+        SELECT ts FROM analysis_data.${tableName}
+        where rec_date = #{recDate}  order by ts ${sort} limit 1   ;
+    </select>
+
     <select id="getInfoByPageTotal" resultType="java.lang.Integer">
         SELECT count(1) FROM pv_health_index_data
         <where>
             <if test="dto.analysisObjType!= null and dto.analysisObjType!= ''">analysis_obj_type = #{dto.analysisObjType}</if>
             <if test="dto.analysisType!= null and dto.analysisType!= ''">and analysis_type = #{dto.analysisType}</if>
-            <if test="dto.endDate!= null and dto.endDate!= ''">  and ts &lt;= #{dto.endDate} </if>
-            <if test="dto.startDate!= null and dto.startDate!= ''">  and  ts &gt;= #{dto.startDate} </if>
+            <if test="dto.endDateTs!= null and dto.endDateTs!= ''">  and ts &lt;= #{dto.endDateTs} </if>
+            <if test="dto.startDateTs!= null and dto.startDateTs!= ''">  and  ts &gt;= #{dto.startDateTs} </if>
             <if test="dto.area!= null and dto.area!= ''"> AND area = #{dto.area} </if>
             <if test="dto.subarray!= null and dto.subarray!= ''"> AND subarray = #{dto.subarray} </if>
             <if test="dto.pointName!= null and dto.pointName!= ''">AND point_name = #{dto.pointName} </if>
@@ -318,4 +323,35 @@
             analysis_obj_type = #{analysisObjectType}
             and ts > #{startTime}
     </select>
+
+    <insert id="saveBatchHealthIndexListNew">
+        insert into analysis_data.${tableName}
+        using analysis_data.pv_health_index_data_new TAGS (#{analysisType},#{recDate})
+        values
+        <foreach collection="list" separator="," item="item" index="index">
+            (
+            now,
+            #{item.analysisObjType, jdbcType=VARCHAR},
+            #{item.analysisObjSeq, jdbcType=VARCHAR},
+            #{item.weight, jdbcType=FLOAT},
+            #{item.healthIndex, jdbcType=FLOAT},
+            #{item.healthLevel, jdbcType=VARCHAR},
+            #{item.analysisStartTime, jdbcType=VARCHAR},
+            #{item.analysisEndTime, jdbcType=VARCHAR},
+            #{item.area, jdbcType=VARCHAR},
+            #{item.station, jdbcType=VARCHAR},
+            #{item.subarray, jdbcType=VARCHAR},
+            #{item.manufacturer, jdbcType=VARCHAR},
+            #{item.deviceType, jdbcType=VARCHAR},
+            #{item.equipmentName, jdbcType=VARCHAR},
+            #{item.gatewayId, jdbcType=VARCHAR},
+            #{item.indexAddress, jdbcType=VARCHAR},
+            #{item.anomaly, jdbcType=FLOAT},
+            #{item.pointName, jdbcType=VARCHAR},
+            #{item.orgCode, jdbcType=VARCHAR},
+            #{item.analysisTime, jdbcType=VARCHAR},
+            #{item.kks, jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/StationInfoDto.java

@@ -56,4 +56,10 @@ public class StationInfoDto  {
 
     @ApiModelProperty(value = "风险等级")
     private String riskLevel;
+    @ApiModelProperty(value = "系统名称默认值")
+    private String equipmentNameDefault;
+    @ApiModelProperty(value = "设备状态默认值")
+    private String subSystemDefault;
+    @ApiModelProperty(value = "变量状态默认值")
+    private String indexAddressDefault;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/StationBasicMapper.java

@@ -72,5 +72,6 @@ public interface StationBasicMapper extends BaseMapper<StationBasic> {
     StationBasicDto  getStationInfoByCode(@Param("stationCode")String stationCode);
 
     List<StationBasicDto>  getStationsByAreaCode(@Param("areaCode")String stationCode);
+    List<StationBasicDto> getStationBasicList();
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -213,4 +213,12 @@
             is_delete = 0
         ORDER BY sequence_nbr ASC
     </select>
+
+    <select id="getStationBasicList" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto">
+        SELECT
+        sequence_nbr AS sequenceNbr,
+        station_type stationType
+        FROM
+        station_basic
+    </select>
 </mapper>

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationCoordinateDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationInfoDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationRecordInfo;
@@ -63,6 +65,8 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
     @Autowired
     MapRegionServiceImpl mapRegionServiceImpl;
     private final String CZLX = "CZLX";
+    @Autowired
+    private RedisUtils redisUtils;
 
     /**
      * 分页查询
@@ -279,6 +283,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
     }
 
     public List<StationInfoDto> getStationList(String areaCode, String type) {
+        JSONArray stationSelectDefault =(JSONArray)redisUtils.get("STATION_FIRST_SELECT");
         //  场站信息列表 地图接口返回使用
         List<StationInfoDto> stationInfoDtoList = new LinkedList<>();
         //场站信息列表
@@ -338,6 +343,19 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
             stationInfoDto.setTitlePos(doubleList);
             stationInfoDto.setIndicatorData(indicatorList);
             stationInfoDto.setRiskLevel(stationRecordInfo.getRiskLevel());
+            //添加默认场站选中的值
+            if(!CollectionUtils.isEmpty(stationSelectDefault)){
+                for (Object o : stationSelectDefault) {
+                    if(o instanceof  JSONObject){
+                        JSONObject jsonObject=(JSONObject) o;
+                        if(stationRecordInfo.getStationId().equals(jsonObject.getLong("stationBasicId"))){
+                            stationInfoDto.setEquipmentNameDefault(jsonObject.getString("equipmentNameDefault"));
+                            stationInfoDto.setSubSystemDefault(jsonObject.getString("subSystemDefault"));
+                            stationInfoDto.setIndexAddressDefault(jsonObject.getString("indexAddressDefault"));
+                        }
+                    }
+                }
+            }
             stationInfoDtoList.add(stationInfoDto);
         });