修改bug

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

@@ -234,4 +234,12 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @ApiModelProperty(value = "机构编码")
     @TableField(value = "biz_org_code")
     private String bizOrgCode;
+
+    @ApiModelProperty(value = "站名称")
+    @TableField(value = "station_name")
+    private String stationName;
+
+    @ApiModelProperty(value = "站编码")
+    @TableField(value = "station_code")
+    private String stationCode;
 }

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

@@ -843,6 +843,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         equipmentSpecificAlarmLog.setId(null);
         equipmentSpecificAlarmLog.setCreateDate(new Date());
         equipmentSpecificAlarmLog.setEquipmentSpecificAlarmId(equipmentSpecificAlarm.getId());
+        equipmentSpecificAlarmLog.setStationCode(stationCode);
+        equipmentSpecificAlarmLog.setStationName(stationName);
         boolean bool = equipmentSpecificAlarmLogService.save(equipmentSpecificAlarmLog);
         // 同步告警消息给平台
         if (amosSwitch && bool) {

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

@@ -450,4 +450,16 @@
             END#
         </sql>
     </changeSet>
+    <changeSet author="keyong" id="1668587041">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_alarm_log" columnName="station_name"/>
+            </not>
+        </preConditions>
+        <comment>新增站属性字段</comment>
+        <sql>
+            ALTER TABLE `wl_equipment_specific_alarm_log` ADD COLUMN `station_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '换流站名称';
+            ALTER TABLE `wl_equipment_specific_alarm_log` ADD COLUMN `station_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '换流站编码';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -283,8 +283,8 @@
             ) createDate,
 	        wlesal.equipment_specific_name as equipmentSpecificName,
             wlesal.location,
-            wlesal.biz_org_code AS bizOrgCode,
-            wlesal.biz_org_name AS bizOrgName
+            wlesal.station_code AS stationCode,
+            wlesal.station_name AS stationName
         FROM wl_equipment_specific_alarm_log wlesal
         <where>
             <if test="param.alarmType == 'BREAKDOWN'">AND wlesal.type = #{param.alarmType}</if>
@@ -1372,7 +1372,8 @@
         location,
         emergency_level_color,
         IF
-        ( `wlesal`.`clean_time` IS NOT NULL, '已消除', '未消除' ) AS `cleanStatus`
+        ( `wlesal`.`clean_time` IS NOT NULL, '已消除', '未消除' ) AS `cleanStatus`,
+        wlesal.station_name AS sationName
         FROM
         `wl_equipment_specific_alarm_log` `wlesal`
         LEFT JOIN `wl_equipment_specific` `wles` ON `wlesal`.`equipment_specific_id` = `wles`.`id`