防区缺陷修复

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/protection/ProtectionPageDto.java

@@ -33,6 +33,11 @@ public class ProtectionPageDto extends PageDto<ProtectionPageVo> {
      */
     private Date[] dateRange;
 
+    /**
+     * 最近几小时，优先于dateRange
+     */
+    private Integer hour;
+
     @JsonIgnore
     private Date startTime;
     @JsonIgnore

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ProtectionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.xunmei.core.resumption.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -50,12 +51,20 @@ public class ProtectionServiceImpl extends ServiceImpl<ProtectionMapper, Protect
             request.setOrgId(SecurityUtils.getLoginUser().getOrgId());
         }
         Page<ProtectionPageVo> page = request.getPageDto();
-        if (ObjectUtil.isNotEmpty(request.getDateRange()) && request.getDateRange().length == 2) {
+        if(ObjectUtil.isNotNull(request.getHour())){
+            Date end=new Date();
+            Date start=DateUtil.offset(end, DateField.HOUR,-request.getHour());
+            request.setStartTime(start);
+            request.setEndTime(end);
+        }else  if (ObjectUtil.isNotEmpty(request.getDateRange()) && request.getDateRange().length == 2) {
             Date startTime = new DateTime(request.getDateRange()[0]).setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
             Date endTime = new DateTime(request.getDateRange()[1]).setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
             request.setStartTime(startTime);
             request.setEndTime(endTime);
         }
+
+
+
         //按规则分页
         page = this.baseMapper.pageList(page, request);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -693,7 +693,9 @@ public class ResumptionTaskBusiness {
     public Boolean updateTaskStatus() {
         LambdaUpdateWrapper<Resumption> wrapper = new LambdaUpdateWrapper<Resumption>();
         Date date = DateUtil.beginOfDay(new Date());
-        wrapper.eq(Resumption::getStatus, 1).lt(Resumption::getPlanEndTime, date).set(Resumption::getStatus, 4);
+        wrapper.lt(Resumption::getPlanEndTime, date)
+                .in(Resumption::getStatus, Arrays.asList(1,2))//未开始、进行中
+                .set(Resumption::getStatus, 4);
         return resumptionService.update(wrapper);
     }