完善场站可燃气体浓度报警

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/gasbasic/GasAlarmController.java

@@ -138,6 +138,7 @@ public class GasAlarmController {
             m.put("latestThreshold", latest != null ? latest.getMaxValue() : null);
             m.put("latestCreateTime", latest != null && latest.getCreateTime() != null ? latest.getCreateTime().format(FMT) : null);
             m.put("latestAlarmLevel", latest != null ? latest.getAlarmLevel() : null);
+            m.put("latestAlarmContent", latest != null ? latest.getAlarmContent() : null);
             WorkOrder order = latest == null ? null : orderMap.get(latest.getId());
             m.put("latestAlarmId", latest == null ? null : latest.getId());
             m.put("latestHasWorkOrder", order != null);

pipe-network-service/zksy-system/src/main/java/com/zksy/base/alarm/domain/AlarmData.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-@TableName(value ="alarm_data")
+@TableName(value ="app_user.alarm_data")
 @Data
 public class AlarmData implements Serializable {
     @TableField(exist = false)

pipe-network-service/zksy-system/src/main/resources/mapper/base/AlarmDataMapper.xml

@@ -20,7 +20,7 @@
 
     <select id="selectLatestPage" resultType="com.zksy.base.alarm.domain.AlarmData">
         SELECT a.*
-        FROM alarm_data a
+        FROM app_user.alarm_data a
         LEFT JOIN app_user.warning_type wt ON wt.warning_code = a.warning_code
         <where>
             <if test="deviceCodes != null and deviceCodes.size() > 0">
@@ -49,7 +49,7 @@
             </if>
             AND NOT EXISTS (
                 SELECT 1
-                FROM alarm_data newer
+                FROM app_user.alarm_data newer
                 WHERE newer.device_code = a.device_code
                   AND (
                       COALESCE(newer.create_time, newer.create_time) &gt; COALESCE(a.create_time, a.create_time)