feat：“报警增加等级“

src/main/java/com/szwl/controller/AlarmRecordIndexController.java

@@ -62,35 +62,33 @@ public class AlarmRecordIndexController {
         String clientId = alarmRecordVo.getClientId();
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId, clientId);
-//        List<TEquipment> list = equipmentService.list(query);
-//        TEquipment equipment = list.get(0);
         TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
             return "添加报警记录失败";
         }
 
-        // 获取今天的日期
-        LocalDate today = LocalDate.now();
-        // 获取今天的0时0分0秒
-        LocalDateTime startOfDay = today.atTime(LocalTime.MIN);
-        // 获取今天的23时59分59秒999毫秒
-        LocalDateTime endOfDay = today.atTime(LocalTime.MAX);
-        // 转换为Date对象
-        Date startDate = Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
-        Date endDate = Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
-        // 查询当天是否已有报警，如果有就消除掉
-        LambdaQueryWrapper<TAlarmRecord> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(TAlarmRecord::getClientId, clientId);
-        queryWrapper.eq(TAlarmRecord::getIsEliminate, 0);
-        queryWrapper.gt(TAlarmRecord::getCreateDate, startDate);
-        queryWrapper.le(TAlarmRecord::getCreateDate, endDate);
-        List<TAlarmRecord> list = alarmRecordService.list(queryWrapper);
-        if (list.size() > 0) {
-            for (TAlarmRecord tAlarmRecord : list) {
-                tAlarmRecord.setIsEliminate(1);
-                alarmRecordService.updateById(tAlarmRecord);
-            }
-        }
+//        // 获取今天的日期
+//        LocalDate today = LocalDate.now();
+//        // 获取今天的0时0分0秒
+//        LocalDateTime startOfDay = today.atTime(LocalTime.MIN);
+//        // 获取今天的23时59分59秒999毫秒
+//        LocalDateTime endOfDay = today.atTime(LocalTime.MAX);
+//        // 转换为Date对象
+//        Date startDate = Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
+//        Date endDate = Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
+//        // 查询当天是否已有报警，如果有就消除掉
+//        LambdaQueryWrapper<TAlarmRecord> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper.eq(TAlarmRecord::getClientId, clientId);
+//        queryWrapper.eq(TAlarmRecord::getIsEliminate, 0);
+//        queryWrapper.gt(TAlarmRecord::getCreateDate, startDate);
+//        queryWrapper.le(TAlarmRecord::getCreateDate, endDate);
+//        List<TAlarmRecord> list = alarmRecordService.list(queryWrapper);
+//        if (!list.isEmpty()) {
+//            for (TAlarmRecord tAlarmRecord : list) {
+//                tAlarmRecord.setIsEliminate(1);
+//                alarmRecordService.updateById(tAlarmRecord);
+//            }
+//        }
 
         Integer type = equipment.getType();
         Long adminId = equipment.getAdminId();
@@ -114,6 +112,9 @@ public class AlarmRecordIndexController {
         alarmRecord.setRemark(alarmRecordVo.getRemark());
         alarmRecord.setOccurrenceTime(alarmRecordVo.getOccurrenceTime());
         alarmRecord.setIsEliminate(0);
+        if (alarmRecordVo.getLevel() != null) {
+            alarmRecord.setLevel(alarmRecordVo.getLevel());
+        }
         alarmRecordService.save(alarmRecord);
         TAdmin admin = adminService.getById(adminId);
         String email = admin.getEmail();
@@ -139,7 +140,7 @@ public class AlarmRecordIndexController {
         }
         if (ifForeign.equals("1")) {
             String subject = "Error message from Cotton Candy Machine";
-            StringBuffer content = new StringBuffer();
+            StringBuilder content = new StringBuilder();
             String str1 = " <b>Machine name: </b>";
             String str2 = "<br>" + " <b>Error message: </b>";
             String str3 = "<br>" + " Time&Date: ";
@@ -267,7 +268,6 @@ public class AlarmRecordIndexController {
         TAlarmRecord alarmRecord = alarmRecordService.getById(Long.valueOf(id));
         alarmRecord.setIsEliminate(1);
         alarmRecordService.updateById(alarmRecord);
-//        return JsonMessage.success("success");
         return "success";
     }
 

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -277,7 +277,7 @@ public class TEquipmentController {
 //            query1.le(TAlarmRecord::getOccurrenceTime, date_end);
             query1.gt(TAlarmRecord::getCreateDate, date_start);
             query1.le(TAlarmRecord::getCreateDate, date_end);
-            query1.orderByDesc(TAlarmRecord::getOccurrenceTime);
+            query1.orderByDesc(TAlarmRecord::getOccurrenceTime).orderByDesc(TAlarmRecord::getLevel);
             List<TAlarmRecord> alarmRecordList = tAlarmRecordService.list(query1);
             if (alarmRecordList.size() > 0) {
                 equipmentDTO.setHasTodayAlarm(true);

src/main/java/com/szwl/mapper/xml/TAlarmRecordMapper.xml

@@ -21,11 +21,12 @@
         <result column="personage_id" property="personageId" />
         <result column="type" property="type" />
         <result column="is_eliminate" property="isEliminate" />
+        <result column="level" property="level" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_date, modify_date, alarm_content, client_id, remark, admin_level, equipment_id, name, occurrence_time, admin_id, admin_user_name, agency_id, merchant_id, personage_id, type, is_eliminate
+        id, create_date, modify_date, alarm_content, client_id, remark, admin_level, equipment_id, name, occurrence_time, admin_id, admin_user_name, agency_id, merchant_id, personage_id, type, is_eliminate, level
     </sql>
     <!-- 获取今天所有机器全部警告-->
     <select id="getAlarmList" parameterType="java.lang.Long" resultMap="BaseResultMap">

src/main/java/com/szwl/model/dto/AlarmRecordVo.java

@@ -1,9 +1,12 @@
 package com.szwl.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.Date;
 
+@Data
 public class AlarmRecordVo {
 
     /**
@@ -24,35 +27,6 @@ public class AlarmRecordVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date occurrenceTime;
 
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    public String getAlarmContent() {
-        return alarmContent;
-    }
-
-    public void setAlarmContent(String alarmContent) {
-        this.alarmContent = alarmContent;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Date getOccurrenceTime() {
-        return occurrenceTime;
-    }
-
-    public void setOccurrenceTime(Date occurrenceTime) {
-        this.occurrenceTime = occurrenceTime;
-    }
+    @ApiModelProperty(value = "报警等级，1-5，5为最高等级")
+    private Integer level;
 }

src/main/java/com/szwl/model/entity/TAlarmRecord.java

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2022-04-27
+ * @since 2024-07-15
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -70,5 +70,8 @@ public class TAlarmRecord implements Serializable {
     @ApiModelProperty(value = "报警是否消除;0：没有，1：已消除")
     private Integer isEliminate;
 
+    @ApiModelProperty(value = "报警等级，1-5，5为最高等级")
+    private Integer level;
+
 
 }