统计

portal-service-common/src/main/java/com/hfln/portal/common/dto/data/event/EventListDTO.java

@@ -1,13 +1,13 @@
 package com.hfln.portal.common.dto.data.event;
 
-import com.hfln.portal.common.vo.BaseVO;
+import com.hfln.portal.common.vo.BaseDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class EventListDTO extends BaseVO {
+public class EventListDTO extends BaseDto {
     /**
      * 主键ID
      */

portal-service-common/src/main/java/com/hfln/portal/common/request/event/AlarmEventParams.java

@@ -23,4 +23,7 @@ public class AlarmEventParams extends PageVo {
 
     @Schema(description = "结束时间 格式yyyy-MM-dd")
     private LocalDate createTimeEnd;
+
+    @Schema(description = "事件类型 0:异常滞留 1:异常消失 2:异常起夜 3:异常入厕")
+    private Integer eventType;
 }

portal-service-common/src/main/java/com/hfln/portal/common/request/event/StayTimeParams.java

@@ -25,4 +25,7 @@ public class StayTimeParams extends PageVo {
 
     @Schema(description = "结束时间 格式yyyy-MM-dd")
     private LocalDate createTimeEnd;
+
+    @Schema(description = "类型 0:一般滞留事件 2:马桶滞留事件")
+    private Integer type;
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/AlarmEventServiceImpl.java

@@ -32,7 +32,15 @@ public class AlarmEventServiceImpl extends ServiceImpl<AlarmEventMapper, AlarmEv
             queryWrapper.ge(AlarmEvent::getCreateTime, params.getCreateTimeStart());
         }
         if (Objects.nonNull(params.getCreateTimeEnd())) {
-            queryWrapper.le(AlarmEvent::getCreateTime, params.getCreateTimeEnd());
+            queryWrapper.lt(AlarmEvent::getCreateTime, params.getCreateTimeEnd().plusDays(1));
+        }
+
+        if (params.getDevId() != null) {
+            queryWrapper.eq(AlarmEvent::getDevId, params.getDevId());
+        }
+
+        if (params.getEventType() != null) {
+            queryWrapper.eq(AlarmEvent::getEventType, params.getEventType());
         }
 
         // 4. 设置排序

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/EventServiceImpl.java

@@ -30,7 +30,11 @@ public class EventServiceImpl extends ServiceImpl<EventListMapper, EventList> im
             queryWrapper.ge(EventList::getCreateTime, params.getCreateTimeStart());
         }
         if (Objects.nonNull(params.getCreateTimeEnd())) {
-            queryWrapper.le(EventList::getCreateTime, params.getCreateTimeEnd());
+            queryWrapper.lt(EventList::getCreateTime, params.getCreateTimeEnd().plusDays(1));
+        }
+
+        if (Objects.nonNull(params.getDevId())) {
+            queryWrapper.eq(EventList::getDevId, params.getDevId());
         }
 
         // 4. 设置排序

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/StayTimeServiceImpl.java

@@ -31,7 +31,14 @@ public class StayTimeServiceImpl extends ServiceImpl<StayTimeMapper, StayTime> i
             queryWrapper.ge(StayTime::getCreateTime, params.getCreateTimeStart());
         }
         if (Objects.nonNull(params.getCreateTimeEnd())) {
-            queryWrapper.le(StayTime::getCreateTime, params.getCreateTimeEnd());
+            queryWrapper.lt(StayTime::getCreateTime, params.getCreateTimeEnd().plusDays(1));
+        }
+
+        if (params.getDevId() != null) {
+            queryWrapper.eq(StayTime::getDevId, params.getDevId());
+        }
+        if (params.getType() != null) {
+            queryWrapper.eq(StayTime::getType, params.getType());
         }
 
         // 4. 设置排序