Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmNoticeServiceImpl.java

@@ -2,6 +2,7 @@ package com.usky.iot.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -73,7 +74,7 @@ public class BaseAlarmNoticeServiceImpl extends AbstractCrudService<BaseAlarmNot
     public CommonPage<BaseAlarmNotice> page(BaseAlarmListVO baseAlarmListVO){
         IPage<BaseAlarmNotice> page = new Page<>(baseAlarmListVO.getCurrent(),baseAlarmListVO.getSize());
         LambdaQueryWrapper<BaseAlarmNotice> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(StringUtils.isNotBlank(baseAlarmListVO.getAlarmType()),BaseAlarmNotice::getTypeCode,
+        queryWrapper.in(CollectionUtils.isNotEmpty(baseAlarmListVO.getAlarmType()),BaseAlarmNotice::getTypeCode,
                 baseAlarmListVO.getAlarmType())
                 .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarmNotice::getProductCode,
                         baseAlarmListVO.getProductCode())

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmServiceImpl.java

@@ -184,13 +184,27 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
         List<BaseAlarm> list = new ArrayList<>();
 
         LambdaQueryWrapper<BaseAlarm> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(StringUtils.isNotBlank(baseAlarmListVO.getDeviceId()),BaseAlarm::getDeviceId,baseAlarmListVO.getDeviceId())
-                .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarm::getProductCode,baseAlarmListVO.getProductCode())
-                .eq(StringUtils.isNotBlank(baseAlarmListVO.getAlarmType()),BaseAlarm::getAlarmType,baseAlarmListVO.getAlarmType())
-                .eq(null != baseAlarmListVO.getHandleStatus(),BaseAlarm::getHandleStatus,baseAlarmListVO.getHandleStatus())
-                .between(StringUtils.isNotBlank(baseAlarmListVO.getStartTime()) && StringUtils.isNotBlank(baseAlarmListVO.getEndTime()),BaseAlarm::getAlarmTime,baseAlarmListVO.getStartTime(),baseAlarmListVO.getEndTime())
-                .eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId())
-                .orderByDesc(BaseAlarm::getId);
+        if (baseAlarmListVO.getTypeCode().equals("1")){
+            queryWrapper.eq(StringUtils.isNotBlank(baseAlarmListVO.getDeviceId()),BaseAlarm::getDeviceId,baseAlarmListVO.getDeviceId())
+                    .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarm::getProductCode,baseAlarmListVO.getProductCode())
+                    .in(CollectionUtils.isNotEmpty(baseAlarmListVO.getAlarmType()),BaseAlarm::getAlarmType,
+                            baseAlarmListVO.getAlarmType())
+                    .eq(null != baseAlarmListVO.getHandleStatus(),BaseAlarm::getHandleStatus,baseAlarmListVO.getHandleStatus())
+                    .between(StringUtils.isNotBlank(baseAlarmListVO.getStartTime()) && StringUtils.isNotBlank(baseAlarmListVO.getEndTime()),BaseAlarm::getAlarmTime,baseAlarmListVO.getStartTime(),baseAlarmListVO.getEndTime())
+                    .eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId())
+                    .eq(BaseAlarm::getAlarmGrade,1)
+                    .orderByDesc(BaseAlarm::getId);
+        }else if (baseAlarmListVO.getTypeCode().equals("2")){
+            queryWrapper.eq(StringUtils.isNotBlank(baseAlarmListVO.getDeviceId()),BaseAlarm::getDeviceId,baseAlarmListVO.getDeviceId())
+                    .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarm::getProductCode,baseAlarmListVO.getProductCode())
+                    .in(CollectionUtils.isNotEmpty(baseAlarmListVO.getAlarmType()),BaseAlarm::getAlarmType,
+                            baseAlarmListVO.getAlarmType())
+                    .eq(null != baseAlarmListVO.getHandleStatus(),BaseAlarm::getHandleStatus,baseAlarmListVO.getHandleStatus())
+                    .between(StringUtils.isNotBlank(baseAlarmListVO.getStartTime()) && StringUtils.isNotBlank(baseAlarmListVO.getEndTime()),BaseAlarm::getAlarmTime,baseAlarmListVO.getStartTime(),baseAlarmListVO.getEndTime())
+                    .eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId())
+                    .ne(BaseAlarm::getAlarmGrade,1)
+                    .orderByDesc(BaseAlarm::getId);
+        }
         List<BaseAlarm> records = this.list(queryWrapper);
         if(records.size()>0){
             List<String> devList = new ArrayList<>();
@@ -393,7 +407,8 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
         LambdaQueryWrapper<BaseAlarm> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper
                 .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarm::getProductCode,baseAlarmListVO.getProductCode())
-                .eq(StringUtils.isNotBlank(baseAlarmListVO.getAlarmType()),BaseAlarm::getAlarmType,baseAlarmListVO.getAlarmType())
+                .in(CollectionUtils.isNotEmpty(baseAlarmListVO.getAlarmType()),BaseAlarm::getAlarmType,
+                        baseAlarmListVO.getAlarmType())
                 .eq(null != baseAlarmListVO.getHandleStatus(),BaseAlarm::getHandleStatus,baseAlarmListVO.getHandleStatus())
                 .between(StringUtils.isNotBlank(baseAlarmListVO.getStartTime()) && StringUtils.isNotBlank(baseAlarmListVO.getEndTime()),BaseAlarm::getAlarmTime,baseAlarmListVO.getStartTime(),baseAlarmListVO.getEndTime())
                 .orderByDesc(BaseAlarm::getId);

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/BaseAlarmListVO.java

@@ -2,6 +2,8 @@ package com.usky.iot.service.vo;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class BaseAlarmListVO {
     /**
@@ -36,7 +38,7 @@ public class BaseAlarmListVO {
     /**
      * 告警类型
      */
-    private String alarmType;
+    private List<String> alarmType;
 
     /**
      * 处理状态;0 未处理，1 已处理
@@ -53,4 +55,9 @@ public class BaseAlarmListVO {
      */
     private String endTime;
 
+    /**
+     * 报警分类（1、报警 2、隐患）
+     */
+    private String typeCode;
+
 }