Selaa lähdekoodia

根据事件编码查询设备

李进 1 vuosi sitten
vanhempi
commit
9ae80e90fe

+ 1 - 0
device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -112,6 +112,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         QueryWrapper<DeviceEventMsg> queryWrapper = new QueryWrapper<DeviceEventMsg>()
                 .select(LambdaUtils.getUnderlineCaseName(DeviceEventMsg::getDeviceId) + "as " + LambdaUtils.getProperty(DeviceEventMsg::getDeviceId), "count(*) as " + countAs)
                 .eq(LambdaUtils.getUnderlineCaseName(DeviceEventMsg::getCode), eventList.getCode())
+                .between(LambdaUtils.getUnderlineCaseName(DeviceEventMsg::getCreateTime), eventList.getBeginTime(), eventList.getEndTime())
                 .groupBy(LambdaUtils.getUnderlineCaseName(DeviceEventMsg::getDeviceId))
                 .last(countAs + " >= " + eventList.getSize());
         List<DeviceEventMsg> list = deviceEventMsgService.list(queryWrapper);

+ 10 - 2
device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -43,12 +43,20 @@ public class DeviceInfoDto {
     public static class EventList {
 
         @NotBlank(message = "code不能为空")
-        @ApiModelProperty(value = "事件编码", hidden = true)
+        @ApiModelProperty(value = "事件编码", required = true)
         private String code;
 
         @NotNull(message = "size不能空")
-        @ApiModelProperty(value = "大于次数", hidden = true)
+        @ApiModelProperty(value = "大于等于次数", required = true)
         private Integer size;
+
+        @ApiModelProperty(value = "开始时间", required = true)
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime beginTime;
+
+        @ApiModelProperty(value = "结束时间", required = true)
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime endTime;
     }
 
     @Data