td相关 - 预警光伏和风电 详情页面修改

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

@@ -7,6 +7,10 @@ import com.yeejoin.amos.boot.module.jxiop.biz.constants.CommonConstans;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.IAlarmInfoDetailService;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.FanWaringRecordMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.PvWaringRecordMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvWarningRecord;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,10 +47,18 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
     @Autowired
     IdxBizPvPointVarCorrelationMapper idxBizPvPointVarCorrelationMapper;
 
+    @Autowired
+    private FanWaringRecordMapper fanWaringRecordMapper;
+
+
+    @Autowired
+    private PvWaringRecordMapper pvWaringRecordMapper;
+
+
     @Override
     public Map<String, Object> getAlramInfoDetailOfFan(String id) {
         Map<String, Object> result = new HashMap<>();
-        IdxBizFanWarningRecord idxBizFanWarningRecord = idxBizFanWarningRecordMapper.selectById(id);
+        FanWarningRecord idxBizFanWarningRecord = fanWaringRecordMapper.getInfoByTs(Long.valueOf(id));
         //获取告警信息
         result.put("warningInfo", getFanAlarmInfoMap(idxBizFanWarningRecord));
         //获取工况组合来源
@@ -83,7 +95,7 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
     @Override
     public Map<String, Object> getAlramInfoDetailOfPv(String id) {
         Map<String, Object> result = new HashMap<>();
-        IdxBizPvWarningRecord idxBizPvWarningRecord = idxBizPvWarningRecordMapper.selectById(id);
+        PvWarningRecord idxBizPvWarningRecord = pvWaringRecordMapper.getInfoByTs(Long.valueOf(id));
         //告警信息
         result.put("warningInfo", getPvAlarmInfoMap(idxBizPvWarningRecord));
         //---------------工况组合来源
@@ -122,7 +134,7 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
      * @param idxBizFanWarningRecord
      * @return 告警信息
      */
-    public HashMap<String, String> getFanAlarmInfoMap(IdxBizFanWarningRecord idxBizFanWarningRecord) {
+    public HashMap<String, String> getFanAlarmInfoMap(FanWarningRecord idxBizFanWarningRecord) {
 
         HashMap<String, String> alarmInfoMap = new HashMap<>();
         //测点名称
@@ -130,11 +142,11 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
         //告警周期
         alarmInfoMap.put("waringPeriod", CommonConstans.waringPeriodStatus.get(idxBizFanWarningRecord.getWarningPeriod()));
         //告警时间
-        alarmInfoMap.put("waringTime", DateUtil.format(idxBizFanWarningRecord.getRecDate(), CommonConstans.waringPeriodDateFormate.get(idxBizFanWarningRecord.getWarningPeriod())));
+        alarmInfoMap.put("waringTime", DateUtil.format(DateUtil.parse(idxBizFanWarningRecord.getRecDate(), DatePattern.NORM_DATETIME_PATTERN), CommonConstans.waringPeriodDateFormate.get(idxBizFanWarningRecord.getWarningPeriod())));
         //预警等级
         alarmInfoMap.put("waringLevel", idxBizFanWarningRecord.getWarningName());
         //预警触发规则
-        alarmInfoMap.put("waringRule", idxBizFanWarningRecord.getCONTENT());
+        alarmInfoMap.put("waringRule", idxBizFanWarningRecord.getContent());
         return alarmInfoMap;
     }
 
@@ -143,7 +155,7 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
      * @param idxBizPvWarningRecord
      * @return 告警信息
      */
-    public HashMap<String, String> getPvAlarmInfoMap(IdxBizPvWarningRecord idxBizPvWarningRecord) {
+    public HashMap<String, String> getPvAlarmInfoMap(PvWarningRecord idxBizPvWarningRecord) {
 
         HashMap<String, String> alarmInfoMap = new HashMap<>();
         //测点名称
@@ -151,11 +163,11 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
         //告警周期
         alarmInfoMap.put("waringPeriod", CommonConstans.waringPeriodStatus.get(idxBizPvWarningRecord.getWarningPeriod()));
         //告警时间
-        alarmInfoMap.put("waringTime", DateUtil.format(idxBizPvWarningRecord.getRecDate(), CommonConstans.waringPeriodDateFormate.get(idxBizPvWarningRecord.getWarningPeriod())));
+        alarmInfoMap.put("waringTime", DateUtil.format(DateUtil.parse(idxBizPvWarningRecord.getRecDate(), DatePattern.NORM_DATETIME_PATTERN), CommonConstans.waringPeriodDateFormate.get(idxBizPvWarningRecord.getWarningPeriod())));
         //预警等级
         alarmInfoMap.put("waringLevel", idxBizPvWarningRecord.getWarningName());
         //预警触发规则
-        alarmInfoMap.put("waringRule", idxBizPvWarningRecord.getCONTENT());
+        alarmInfoMap.put("waringRule", idxBizPvWarningRecord.getContent());
         return alarmInfoMap;
     }
 
@@ -164,10 +176,10 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
      * @param idxBizFanWarningRecord
      * @return
      */
-    public HashMap<String, Object> getFanAlarmTrendAndAlarmAbnormalityList(IdxBizFanWarningRecord idxBizFanWarningRecord) {
+    public HashMap<String, Object> getFanAlarmTrendAndAlarmAbnormalityList(FanWarningRecord idxBizFanWarningRecord) {
         HashMap<String, Object> result = new HashMap<>();
         HashMap<String, Object> alarmTrendMap = new HashMap<>();
-        HashMap<String,Object> maxValueAndWaringCycle = getWaringCycleAndMaxValueByWaring(idxBizFanWarningRecord.getWarningPeriod(),idxBizFanWarningRecord.getCONTENT(),idxBizFanWarningRecord.getPointName());
+        HashMap<String,Object> maxValueAndWaringCycle = getWaringCycleAndMaxValueByWaring(idxBizFanWarningRecord.getWarningPeriod(),idxBizFanWarningRecord.getContent(),idxBizFanWarningRecord.getPointName());
         Integer warningCycle = Integer.valueOf(maxValueAndWaringCycle.get("warningCycle").toString());
         alarmTrendMap.put("maxValue", maxValueAndWaringCycle.get("maxValue"));
         alarmTrendMap.put("warningCycle", warningCycle);
@@ -176,7 +188,7 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
                 .eq("GATEWAY_ID", idxBizFanWarningRecord.getGatewayId())
                 .eq("INDEX_ADDRESS", idxBizFanWarningRecord.getIndexAddress())
                 .eq("ANALYSIS_TYPE", idxBizFanWarningRecord.getWarningPeriod())
-                .le("ANALYSIS_TIME", DateUtil.offsetMinute(idxBizFanWarningRecord.getRecDate(), 1))
+                .le("ANALYSIS_TIME", DateUtil.offsetMinute(DateUtil.parse(idxBizFanWarningRecord.getRecDate(), DatePattern.NORM_DATETIME_PATTERN), 1))
                 .orderByDesc("ANALYSIS_TIME")
                 .last("limit 30"));
         List<String> xDatas = new ArrayList<>();
@@ -217,10 +229,10 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
      * @param idxBizPvWarningRecord
      * @return
      */
-    public HashMap<String, Object> getPvAlarmTrendAndAlarmAbnormalityList(IdxBizPvWarningRecord idxBizPvWarningRecord) {
+    public HashMap<String, Object> getPvAlarmTrendAndAlarmAbnormalityList(PvWarningRecord idxBizPvWarningRecord) {
         HashMap<String, Object> result = new HashMap<>();
         HashMap<String, Object> alarmTrendMap = new HashMap<>();
-        HashMap<String,Object> maxValueAndWaringCycle = getWaringCycleAndMaxValueByWaring(idxBizPvWarningRecord.getWarningPeriod(),idxBizPvWarningRecord.getCONTENT(),idxBizPvWarningRecord.getPointName());
+        HashMap<String,Object> maxValueAndWaringCycle = getWaringCycleAndMaxValueByWaring(idxBizPvWarningRecord.getWarningPeriod(),idxBizPvWarningRecord.getContent(),idxBizPvWarningRecord.getPointName());
         Integer warningCycle = Integer.valueOf(maxValueAndWaringCycle.get("warningCycle").toString());
         alarmTrendMap.put("maxValue", maxValueAndWaringCycle.get("maxValue"));
         alarmTrendMap.put("warningCycle", warningCycle);
@@ -229,7 +241,7 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
                 .eq("GATEWAY_ID", idxBizPvWarningRecord.getGatewayId())
                 .eq("INDEX_ADDRESS", idxBizPvWarningRecord.getIndexAddress())
                 .eq("ANALYSIS_TYPE", idxBizPvWarningRecord.getWarningPeriod())
-                .le("ANALYSIS_TIME", DateUtil.offsetMinute(idxBizPvWarningRecord.getRecDate(), 1))
+                .le("ANALYSIS_TIME", DateUtil.offsetMinute(DateUtil.parse(idxBizPvWarningRecord.getRecDate(), DatePattern.NORM_DATETIME_PATTERN), 1))
                 .orderByDesc("ANALYSIS_TIME")
                 .last("limit 30"));
         List<String> xDatas = new ArrayList<>();
@@ -397,7 +409,7 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
      * @param idxBizFanWarningRecord
      * @return
      */
-    public HashMap<String, Object> getSourceInfoMapFan(IdxBizFanWarningRecord idxBizFanWarningRecord) {
+    public HashMap<String, Object> getSourceInfoMapFan(FanWarningRecord idxBizFanWarningRecord) {
         List<IdxBizFanPointVarCorrelation> idxBizFanPointVarCorrelationList = idxBizFanPointVarCorrelationMapper
                 .selectList(new QueryWrapper<IdxBizFanPointVarCorrelation>().eq("EQUIPMENT_NAME", idxBizFanWarningRecord.getEquipmentName()));
         Map<String, Double> idxBizFanPointVarCorrelationListValues = new HashMap<>();
@@ -423,7 +435,7 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
      * @param idxBizPvWarningRecord
      * @return
      */
-    public HashMap<String, Object> getSourceInfoMapPv(IdxBizPvWarningRecord idxBizPvWarningRecord) {
+    public HashMap<String, Object> getSourceInfoMapPv(PvWarningRecord idxBizPvWarningRecord) {
         List<IdxBizPvPointVarCorrelation> idxBizPvPointVarCorrelationList = idxBizPvPointVarCorrelationMapper
                 .selectList(new QueryWrapper<IdxBizPvPointVarCorrelation>().eq("EQUIPMENT_NAME", idxBizPvWarningRecord.getEquipmentName()));
         Map<String, Double> idxBizPvPointVarCorrelationListValues = new HashMap<>();

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

@@ -30,4 +30,6 @@ public interface FanWaringRecordMapper  extends BaseMapper<FanWarningRecord> {
 
  Integer getInfoByPageTotal(@Param("dto") FanHealthIndexDto dto);
 
+ FanWarningRecord getInfoByTs(@Param("ts") Long ts);
+
 }

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

@@ -25,4 +25,6 @@ public interface PvWaringRecordMapper extends BaseMapper<PvWarningRecord> {
     List<PvWarningRecord> getInfoByPage(@Param("dto") FanHealthIndexDto dto);
 
     Integer getInfoByPageTotal(@Param("dto") FanHealthIndexDto dto);
+
+    PvWarningRecord getInfoByTs(@Param("ts") Long ts);
 }

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

@@ -211,4 +211,8 @@
         <if test="dto.startDate!= null and dto.startDate!= ''">  and  ts &gt;= #{dto.startDate} </if>
     </where>
     </select>
+
+<select id="getInfoByTs" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord">
+    select * from analysis_data.fan_warning_record where ts = #{ts,jdbcType=TIMESTAMP} limit 1
+    </select>
 </mapper>

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

@@ -195,7 +195,7 @@
     </select>
 
 <select id="getInfoByPage" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvWarningRecord">
-    SELECT * FROM fan_warning_record
+    SELECT * FROM pv_warning_record
     <where>
         <if test="dto.area!= null and dto.area!= ''"> AND arae = #{dto.area} </if>
         <if test="dto.station!= null and dto.station!= ''">AND station = #{dto.station} </if>
@@ -214,7 +214,7 @@
     </select>
 
 <select id="getInfoByPageTotal" resultType="java.lang.Integer">
-    SELECT count(1) FROM fan_warning_record
+    SELECT count(1) FROM pv_warning_record
     <where>
         <if test="dto.area!= null and dto.area!= ''"> AND arae = #{dto.area} </if>
         <if test="dto.station!= null and dto.station!= ''">AND station = #{dto.station} </if>
@@ -227,4 +227,8 @@
         <if test="dto.startDate!= null and dto.startDate!= ''">  and  ts &gt;= #{dto.startDate} </if>
     </where>
     </select>
+
+<select id="getInfoByTs" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvWarningRecord">
+    select * from analysis_data.pv_warning_record where ts = #{ts,jdbcType=TIMESTAMP} limit 1
+    </select>
 </mapper>