fix: 设备离线预警记录查看

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/service/SensorAlarmServiceImpl.java

@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.coldchain.core.alarm.bean.SensorAlarm;
+import vip.xiaonuo.coldchain.core.alarm.enums.SensorAlarmType;
 import vip.xiaonuo.coldchain.core.alarm.mapper.SensorAlarmMapper;
 import vip.xiaonuo.coldchain.modular.app.param.Message;
 import vip.xiaonuo.coldchain.modular.app.param.MessagePageParam;
@@ -41,27 +42,20 @@ public class SensorAlarmServiceImpl extends ServiceImpl<SensorAlarmMapper, Senso
      */
     @Override
     public Page<Message> getMessages(MessagePageParam messagePageParam) {
-        if (messagePageParam.getType().equalsIgnoreCase("system")) {
-            return new Page<Message>();
-        } else {
-            // 创建分页对象
-            Page<Message> page = new Page<>(messagePageParam.getCurrent(), messagePageParam.getSize());
-            Page<SensorAlarm> sensorAlarmPage = getSensorAlarmPage(messagePageParam);
-            // 将查询结果转换成Message类型的分页对象
-            Page<Message> resultPage = new Page<>();
-            resultPage.setSize(messagePageParam.getSize());
-            resultPage.setCurrent(messagePageParam.getCurrent());
-            resultPage.setRecords(sensorAlarmPage.getRecords().stream().map(this::convertToMessage) // 转换为Message类型
-                    .collect(Collectors.toList()));
-            resultPage.setTotal(sensorAlarmPage.getTotal()); // 设置总数
-            return resultPage;
-        }
+        Page<SensorAlarm> sensorAlarmPage = getSensorAlarmPage(messagePageParam);
+        // 将查询结果转换成Message类型的分页对象
+        Page<Message> resultPage = new Page<>();
+        resultPage.setSize(messagePageParam.getSize());
+        resultPage.setCurrent(messagePageParam.getCurrent());
+        resultPage.setRecords(sensorAlarmPage.getRecords().stream().map(this::convertToMessage) // 转换为Message类型
+                .collect(Collectors.toList()));
+        resultPage.setTotal(sensorAlarmPage.getTotal()); // 设置总数
+        return resultPage;
     }
 
     /**
      * pc接口
      *
-     * @param messagePageParam
      * @return
      */
     public Page<SensorAlarm> getMessages(MonitorNoticePageParam monitorNoticePageParam) {
@@ -98,7 +92,12 @@ public class SensorAlarmServiceImpl extends ServiceImpl<SensorAlarmMapper, Senso
         String orgId = StpLoginUserUtil.getLoginUser().getOrgId();
         // 查询创建用户为当前用户的记录
         queryWrapper.lambda().eq(SensorAlarm::getCreateOrg, orgId);
-        queryWrapper.lambda().eq(SensorAlarm::getType, "0");
+        final String type = messagePageParam.getType();
+        if(StrUtil.isNotBlank(type) || type.trim().equalsIgnoreCase("system")){
+            queryWrapper.lambda().eq(SensorAlarm::getType, SensorAlarmType.SENSOR_OFFLINE.getDeviceCode());
+        }else{
+            queryWrapper.lambda().eq(SensorAlarm::getType, SensorAlarmType.DATA_ALARM.getDeviceCode());
+        }
         // 如果有关键词，进行模糊查询或者设备名等字段的精确查询
         if (ObjectUtil.isNotEmpty(messagePageParam.getKeyword())) {
             queryWrapper.lambda().and(q -> q.like(SensorAlarm::getMessage, messagePageParam.getKeyword()).or().like(SensorAlarm::getDeviceName, messagePageParam.getKeyword()));