Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/emqx/WarningRecordStatusMessage.java

 package com.yeejoin.amos.boot.module.jxiop.biz.emqx;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -7,9 +8,11 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRecord;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.HealthStatusIndicatorServiceImpl;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanWarningRecordServiceImpl;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvWarningRecordServiceImpl;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.*;
+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 lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +48,18 @@ public class WarningRecordStatusMessage extends EmqxListener {
     @Autowired
     private IdxBizPvWarningRecordServiceImpl idxBizPvWarningRecordService;
 
+    @Autowired
+    private FanWaringRecordMapper fanWaringRecordMapper;
+
+    @Autowired
+    private PvWaringRecordMapper pvWaringRecordMapper;
+
+    @Autowired
+    FanWarningRecordServiceImpl fanWarningRecordService;
+
+    @Autowired
+    PvWarningRecordServiceImpl pvWarningRecordService;
+
     @PostConstruct
     void init() throws Exception {
         new Thread(taskRunnable).start();
@@ -96,6 +111,13 @@ public class WarningRecordStatusMessage extends EmqxListener {
         lambda.in(IdxBizFanWarningRecord::getSequenceNbr, traceIds);
         idxBizFanWarningRecordService.update(lambda);
 
+        LambdaUpdateWrapper<FanWarningRecord> lambdaTd = new LambdaUpdateWrapper<>();
+        lambdaTd.set(FanWarningRecord::getDisposotionState, "已处置");
+        lambdaTd.set(FanWarningRecord::getStatus, "1");
+        lambdaTd.set(FanWarningRecord::getDisposotionDate, DateUtil.now());
+        lambdaTd.in(FanWarningRecord::getTs, traceIds);
+        fanWarningRecordService.update(lambdaTd);
+
     }
 
     public void jxIopUpdatePv(JSONArray analysisResult) {
@@ -108,5 +130,14 @@ public class WarningRecordStatusMessage extends EmqxListener {
         lambda.set(IdxBizPvWarningRecord::getDisposotionDate, new Date());
         lambda.in(IdxBizPvWarningRecord::getSequenceNbr, traceIds);
         idxBizPvWarningRecordService.update(lambda);
+
+        // td
+
+        LambdaUpdateWrapper<PvWarningRecord> lambdaTd = new LambdaUpdateWrapper<>();
+        lambdaTd.set(PvWarningRecord::getDisposotionState, "已处置");
+        lambdaTd.set(PvWarningRecord::getStatus, "1");
+        lambdaTd.set(PvWarningRecord::getDisposotionDate, DateUtil.now());
+        lambdaTd.in(PvWarningRecord::getTs, traceIds);
+        pvWarningRecordService.update(lambdaTd);
     }
 }

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.FanWaringRecordMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+@Service
+public class FanWarningRecordServiceImpl  extends BaseService<FanWarningRecord, FanWarningRecord, FanWaringRecordMapper> {
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.PvWaringRecordMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvWarningRecord;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+@Service
+public class PvWarningRecordServiceImpl extends BaseService<PvWarningRecord, PvWarningRecord, PvWaringRecordMapper> {
+}

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

 package com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -11,9 +15,14 @@ public interface FanWaringRecordMapper  extends BaseMapper<FanWarningRecord> {
 
  public List<Map<String,Object>> selectFanWarningNum(String station);
 
+
  public List<FanWarningRecord> warningData(String STATION,String EQUIPMENTNAME,String SUBSYSTEM);
 
  public List<FanWarningRecord> selectWarningPoint(String STATION,String EQUIPMENTNAME);
 
  public List<Map<String,Object>> selectEquipWarningTotal(String STATION,String EQUIPMENTNAME);
+
+ int saveBatchWarningRecords(@Param("list") List<FanWarningRecord> list);
+
+
 }

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

@@ -3,7 +3,11 @@ package com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvWarningRecord;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface PvWaringRecordMapper extends BaseMapper<PvWarningRecord> {
 
+    int saveBatchWarningRecords(@Param("list") List<PvWarningRecord> list);
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdengine/FanWarningRecord.java

@@ -3,9 +3,11 @@ package com.yeejoin.amos.boot.module.jxiop.biz.tdengine;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-@TableName(value = "", autoResultMap = true)
-public class FanWarningRecord {
+@TableName(value = "fan_warning_record", autoResultMap = true)
+public class FanWarningRecord implements Serializable {
     private Long ts;
     private String recDate;
     private String disposotionState;
@@ -25,4 +27,5 @@ public class FanWarningRecord {
     private String disposotionDate;
     private String kks;
     private String warningPeriod;
+    private String status;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdengine/PvWarningRecord.java

@@ -4,14 +4,15 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 @Data
-@TableName(value = "", autoResultMap = true)
-public class PvWarningRecord {
+@TableName(value = "pv_warning_record", autoResultMap = true)
+public class PvWarningRecord implements Serializable {
     private Long ts;
     private String recDate;
     private String disposotionState;
-    private String healthIndexSeq;
+    private String healthIndex;
     private String analysisPointId;
     private String warningName;
     private String arae;
@@ -28,4 +29,5 @@ public class PvWarningRecord {
     private String disposotionDate;
     private String kks;
     private String warningPeriod;
+    private String status;
 }

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

@@ -2,6 +2,60 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.FanWaringRecordMapper">
 
+<insert id="saveBatchWarningRecords">
+
+    insert
+    into
+        fan_warning_record
+<!--    (ts,-->
+<!--     rec_date,-->
+<!--     disposotion_state,-->
+<!--     health_index_seq,-->
+<!--     health_index,-->
+<!--     analysis_point_id,-->
+<!--     warning_name,-->
+<!--     arae,-->
+<!--     station,-->
+<!--     subarray,-->
+<!--     manufacturer,-->
+<!--     device_type,-->
+<!--     equipment_name,-->
+<!--     gateway_id,-->
+<!--     index_address,-->
+<!--     content,-->
+<!--     point_name,-->
+<!--     health_level,-->
+<!--     disposotion_date,-->
+<!--     kks,-->
+<!--     warning_period,-->
+<!--    status)-->
+    values
+    <foreach collection="list" separator="," item="item" index="index">
+    (#{item.ts, jdbcType=TIMESTAMP},
+        #{item.recDate, jdbcType=VARCHAR},
+        #{item.disposotionState, jdbcType=VARCHAR},
+<!--        #{item.healthIndexSeq, jdbcType=VARCHAR},-->
+        #{item.healthIndex, jdbcType=VARCHAR},
+        #{item.analysisPointId, jdbcType=VARCHAR},
+        #{item.warningName, jdbcType=VARCHAR},
+        #{item.arae, 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.content, jdbcType=VARCHAR},
+        #{item.pointName, jdbcType=VARCHAR},
+        #{item.healthLevel, jdbcType=VARCHAR},
+        #{item.disposotionDate, jdbcType=VARCHAR},
+        #{item.kks, jdbcType=VARCHAR},
+        #{item.warningPeriod, jdbcType=VARCHAR},
+        #{item.status, jdbcType=VARCHAR})
+    </foreach>
+
+    </insert>
+
     <select id="selectFanWarningNum" resultType="map">
 
         SELECT `b`.`EQUIPMENT_NAME` AS `EQUIPMENT_NAME`,

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.PvWaringRecordMapper">
+
+<insert id="saveBatchWarningRecords">
+    insert
+    into
+    pv_warning_record
+<!--    (ts,-->
+<!--    rec_date,-->
+<!--    disposotion_state,-->
+<!--    health_index_seq,-->
+<!--    health_index,-->
+<!--    analysis_point_id,-->
+<!--    warning_name,-->
+<!--    arae,-->
+<!--    station,-->
+<!--    subarray,-->
+<!--    manufacturer,-->
+<!--    device_type,-->
+<!--    equipment_name,-->
+<!--    gateway_id,-->
+<!--    index_address,-->
+<!--    content,-->
+<!--    point_name,-->
+<!--    health_level,-->
+<!--    disposotion_date,-->
+<!--    kks,-->
+<!--    warning_period,-->
+<!--    status)-->
+    values
+    <foreach collection="list" separator="," item="item" index="index">
+        (#{item.ts, jdbcType=TIMESTAMP},
+        #{item.recDate, jdbcType=VARCHAR},
+        #{item.disposotionState, jdbcType=VARCHAR},
+        #{item.healthIndex, jdbcType=VARCHAR},
+        #{item.analysisPointId, jdbcType=VARCHAR},
+        #{item.warningName, jdbcType=VARCHAR},
+        #{item.arae, 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.content, jdbcType=VARCHAR},
+        #{item.pointName, jdbcType=VARCHAR},
+        #{item.healthLevel, jdbcType=VARCHAR},
+        #{item.disposotionDate, jdbcType=VARCHAR},
+        #{item.kks, jdbcType=VARCHAR},
+        #{item.warningPeriod, jdbcType=VARCHAR},
+        #{item.status, jdbcType=VARCHAR})
+    </foreach>
+    </insert>
 </mapper>