解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanWarningRecord.java

@@ -151,4 +151,11 @@ public class IdxBizFanWarningRecord{
      */
     @TableField("KKS")
     private String kks;
+
+    /**
+     * 预警周期
+     */
+    @TableField("WARNING_PERIOD")
+    private String warningPeriod;
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvWarningRecord.java

@@ -152,4 +152,10 @@ public class IdxBizPvWarningRecord{
      */
     @TableField("KKS")
     private String kks;
+
+    /**
+     * 预警周期
+     */
+    @TableField("WARNING_PERIOD")
+    private String warningPeriod;
 }

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

@@ -230,6 +230,7 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizPvWarningRecord.setWarningName(level);
                     idxBizPvWarningRecord.setCONTENT(idxBizPvHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
                     idxBizPvWarningRecord.setRecDate(time);
+                    idxBizPvWarningRecord.setWarningPeriod("按时刻");
                     idxBizPvWarningRecord.setManufacturer(idxBizPvHealthIndices.get(0).getManufacturer());
                     idxBizPvWarningRecord.setPointName(idxBizPvHealthIndices.get(0).getPointName());
                     idxBizPvWarningRecord.setHealthIndexSeq(idxBizPvHealthIndices.get(0).getHealthIndex().toString());
@@ -374,6 +375,7 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizPvWarningRecord.setWarningName(level);
                     idxBizPvWarningRecord.setCONTENT(idxBizPvHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
                     idxBizPvWarningRecord.setRecDate(time);
+                    idxBizPvWarningRecord.setWarningPeriod("按小时");
                     idxBizPvWarningRecord.setManufacturer(idxBizPvHealthIndices.get(0).getManufacturer());
                     idxBizPvWarningRecord.setPointName(idxBizPvHealthIndices.get(0).getPointName());
                     idxBizPvWarningRecord.setHealthIndexSeq(idxBizPvHealthIndices.get(0).getHealthIndex().toString());
@@ -512,6 +514,7 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizPvWarningRecord.setWarningName(level);
                     idxBizPvWarningRecord.setCONTENT(idxBizPvHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
                     idxBizPvWarningRecord.setRecDate(time);
+                    idxBizPvWarningRecord.setWarningPeriod("按天");
                     idxBizPvWarningRecord.setManufacturer(idxBizPvHealthIndices.get(0).getManufacturer());
                     idxBizPvWarningRecord.setPointName(idxBizPvHealthIndices.get(0).getPointName());
                     idxBizPvWarningRecord.setHealthIndexSeq(idxBizPvHealthIndices.get(0).getHealthIndex().toString());
@@ -652,6 +655,7 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizFanWarningRecord.setWarningName(level);
                     idxBizFanWarningRecord.setCONTENT(idxBizFanHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
                     idxBizFanWarningRecord.setRecDate(time);
+                    idxBizFanWarningRecord.setWarningPeriod("按时刻");
                     idxBizFanWarningRecord.setNumber(idxBizFanHealthIndices.get(0).getNumber());
                     idxBizFanWarningRecord.setPointName(idxBizFanHealthIndices.get(0).getPointName());
                     idxBizFanWarningRecord.setHealthIndexSeq(idxBizFanHealthIndices.get(0).getHealthIndex().toString());
@@ -791,6 +795,7 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizFanWarningRecord.setWarningName(level);
                     idxBizFanWarningRecord.setCONTENT(idxBizFanHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
                     idxBizFanWarningRecord.setRecDate(time);
+                    idxBizFanWarningRecord.setWarningPeriod("按小时");
                     idxBizFanWarningRecord.setNumber(idxBizFanHealthIndices.get(0).getNumber());
                     idxBizFanWarningRecord.setHealthIndexSeq(idxBizFanHealthIndices.get(0).getHealthIndex().toString());
                     idxBizFanWarningRecord.setHealthLevel(idxBizFanHealthIndices.get(0).getHealthLevel());
@@ -932,6 +937,7 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizFanWarningRecord.setWarningName(level);
                     idxBizFanWarningRecord.setCONTENT(idxBizFanHealthIndices.get(0).getPointName() + "连续"+content+"健康指数<"+num );
                     idxBizFanWarningRecord.setRecDate(time);
+                    idxBizFanWarningRecord.setWarningPeriod("按天");
                     idxBizFanWarningRecord.setNumber(idxBizFanHealthIndices.get(0).getNumber());
                     idxBizFanWarningRecord.setHealthIndexSeq(idxBizFanHealthIndices.get(0).getHealthIndex().toString());
                     idxBizFanWarningRecord.setHealthLevel(idxBizFanHealthIndices.get(0).getHealthLevel());