Merge branch 'develop_dl_3.7.1.1' into develop_dl

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentIndex.java

@@ -125,4 +125,7 @@ public class EquipmentIndex extends BaseEntity {
     @TableField(value = "unit")
     private String unit;
 
+    @TableField(value = "alarm_rule")
+    private String alarmRule;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java

@@ -145,9 +145,6 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @TableField(exist = false)
     private String buildId;
 
-    @ApiModelProperty(value = "是否遥测")
-    @TableField(exist = false)
-    private Integer isTrend;
     @ApiModelProperty(value = "绑定视屏数量")
     @TableField(exist = false)
     private int num;
@@ -208,4 +205,12 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @ApiModelProperty(value = "网关标识")
     @TableField(value = "gateway_id")
     private String gatewayId;
+
+    @ApiModelProperty(value = "告警规则")
+    @TableField(value = "alarm_rule")
+    private String alarmRule;
+
+    @ApiModelProperty(value = "是否遥测")
+    @TableField(value = "is_trend")
+    private Boolean isTrend;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipmentIndexVO.java

@@ -90,4 +90,7 @@ public class EquipmentIndexVO {
     @ApiModelProperty(value = "装备指标名称")
     private String equipmentIndexName;
 
+    @ApiModelProperty(value = "告警规则")
+    private String alarmRule;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1585,6 +1585,8 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             equipmentSpecificIndex.setUnit(index.getUnit());
             equipmentSpecificIndex.setValueEnum(index.getValueEnum());
             equipmentSpecificIndex.setTypeCode(index.getTypeCode());
+            equipmentSpecificIndex.setIsTrend(index.getIsTrend());
+            equipmentSpecificIndex.setAlamReason(index.getAlarmRule());
             equipmentSpecificIndices.add(equipmentSpecificIndex);
         });
     }
@@ -1921,7 +1923,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                             iotIndexInfoVo.setType(equipmentSpecificIndex.getTypeName() != null ? equipmentSpecificIndex.getTypeName() : equipmentSpecificIndex.getIndexName());
 
                             iotIndexInfoVo.setNumber(deviceName);
-                            if (equipmentSpecificIndex.getIsTrend() == 1) {
+                            if (equipmentSpecificIndex.getIsTrend()) {
                                 BigDecimal val = new BigDecimal(String.valueOf(entry.getValue()));
                                 iotIndexInfoVo.setContent(equipmentSpecificIndex.getIndexName() + (val.setScale(2, BigDecimal.ROUND_HALF_UP)) + equipmentSpecificIndex.getIndexUnitName());
                             } else {

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -1174,4 +1174,20 @@
             UPDATE `wl_car` wc SET wc.use_type = '自购';
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1694055999">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_index" columnName="alarm_rule"/>
+            </not>
+        </preConditions>
+        <comment>新增字段 type_code</comment>
+        <sql>
+            alter table `wl_equipment_index` add column `alarm_rule` varchar(50) DEFAULT NULL COMMENT '告警规则';
+            alter table `wl_equipment_specific_index` add column `is_trend` bit(1) DEFAULT b'0' COMMENT '是否支持趋势查看(冗余自wl_equipment_index)';
+            alter table `wl_equipment_specific_index` add column `alarm_rule` varchar(50) DEFAULT NULL COMMENT '告警规则(冗余自wl_equipment_index)';
+            UPDATE wl_equipment_specific_index esi SET esi.is_trend = ( SELECT is_trend FROM wl_equipment_index wei WHERE esi.equipment_index_id = wei.id ),
+                                                       esi.alarm_rule = ( SELECT alarm_rule FROM wl_equipment_index wei WHERE esi.equipment_index_id = wei.id );
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/EquipmentIndexMapper.xml

@@ -158,7 +158,8 @@
 			 sort_num,
 			 type,
 			 is_trend,
-			 value_enum
+			 value_enum,
+		     alarm_rule AS alarmRule
 			 from
 			 wl_equipment_index
 			 where id = #{id}

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -67,7 +67,8 @@
 			TRIM(CONCAT_WS(' ',wes.position,sd.description)) AS location,
 			sd.warehouse_structure_id AS buildId,
             wes.biz_org_name AS bizOrgName,
-            wes.biz_org_code AS bizOrgCode
+            wes.biz_org_code AS bizOrgCode,
+            wesi.alarm_rule AS alarmRule
         FROM
             wl_equipment_specific_index AS wesi
             LEFT JOIN wl_equipment_specific AS wes