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

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);
 

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

@@ -554,4 +554,35 @@
             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}
+        )
+    </insert>
 </mapper>

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

@@ -318,4 +318,36 @@
             analysis_obj_type = #{analysisObjectType}
             and ts > #{startTime}
     </select>
+
+    <insert id="saveBatchHealthIndexListNew">
+        insert into ${tableName}
+        using pv_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.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.analysisTime, jdbcType=VARCHAR},
+            #{item.kks, jdbcType=VARCHAR},
+            #{item.orgCode, jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
 </mapper>