Merge remote-tracking branch 'origin/V0.0.1' into V0.0.1

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteRetrievalTaskService.java

@@ -48,4 +48,12 @@ public interface RemoteRetrievalTaskService {
      */
     @GetMapping("/retrievalTask/monthTask")
     AjaxResult monthTask(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 修改未完成任务（待调阅和调阅中的任务）的状态为已超期
+     * @param source
+     * @return
+     */
+    @GetMapping("/retrievalTask/updateTaskStart")
+    AjaxResult updateTaskStart(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteRetrievalTaskFallbackFactory.java

@@ -40,6 +40,11 @@ public class RemoteRetrievalTaskFallbackFactory implements FallbackFactory<Remot
             public AjaxResult monthTask(String source) {
                 return AjaxResult.error("监控调阅每月任务生成服务调用失败,失败原因：" + throwable.getMessage());
             }
+
+            @Override
+            public AjaxResult updateTaskStart(String source) {
+                return AjaxResult.error("修改未完成任务的状态为已超期服务调用失败,失败原因：" + throwable.getMessage());
+            }
         };
     }
 }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/RetrievalTaskCycle.java

@@ -12,8 +12,8 @@ public enum RetrievalTaskCycle
     WEEKCYCLE(2, "每月"),
     MONTHCYCLE(3, "每月"),
     QUARTERCYCLE(4, "每季度"),
-    HALFYEARCYCLE(4, "每半年"),
-    YEARCYCLE(5, "每年");
+    HALFYEARCYCLE(5, "每半年"),
+    YEARCYCLE(6, "每年");
 
     private final Integer code;
     private final String info;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/utils/DateUtils.java

@@ -1,5 +1,7 @@
 package com.xunmei.common.core.utils;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.xunmei.common.core.domain.DateRange;
@@ -172,7 +174,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
                 endDateTime = localDate.atTime(LocalTime.MAX);
                 startTime = Date.from(startDateTime.atZone(ZoneId.systemDefault()).toInstant());
                 endTime = Date.from(endDateTime.atZone(ZoneId.systemDefault()).toInstant());
-                return new DateRange(startTime, endTime);
+                break;
             case 2: // week
                 LocalDate startOfWeek = localDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
                 LocalDate endOfWeek = localDate.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
@@ -180,7 +182,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
                 endDateTime = endOfWeek.atTime(LocalTime.MAX);
                 startTime = Date.from(startDateTime.atZone(ZoneId.systemDefault()).toInstant());
                 endTime = Date.from(endDateTime.atZone(ZoneId.systemDefault()).toInstant());
-                return new DateRange(startTime, endTime);
+                break;
             case 3: // month
                 LocalDate startOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth());
                 LocalDate endOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth());
@@ -188,7 +190,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
                 endDateTime = endOfMonth.atTime(LocalTime.MAX);
                 startTime = Date.from(startDateTime.atZone(ZoneId.systemDefault()).toInstant());
                 endTime = Date.from(endDateTime.atZone(ZoneId.systemDefault()).toInstant());
-                return new DateRange(startTime, endTime);
+                break;
             case 4: // quarter
                 Month month = localDate.getMonth();
                 int quarter = (month.getValue() - 1) / 3 + 1;
@@ -198,7 +200,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
                 endDateTime = endOfQuarter.atTime(LocalTime.MAX);
                 startTime = Date.from(startDateTime.atZone(ZoneId.systemDefault()).toInstant());
                 endTime = Date.from(endDateTime.atZone(ZoneId.systemDefault()).toInstant());
-                return new DateRange(startTime, endTime);
+                break;
             case 5: // half-year
                 int halfYear = (localDate.getMonthValue() - 1) / 6 + 1;
                 LocalDate startOfHalfYear = LocalDate.of(localDate.getYear(), (halfYear - 1) * 6 + 1, 1);
@@ -207,7 +209,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
                 endDateTime = endOfHalfYear.atTime(LocalTime.MAX);
                 startTime = Date.from(startDateTime.atZone(ZoneId.systemDefault()).toInstant());
                 endTime = Date.from(endDateTime.atZone(ZoneId.systemDefault()).toInstant());
-                return new DateRange(startTime, endTime);
+                break;
             case 6: // year
                 LocalDate startOfYear = localDate.with(TemporalAdjusters.firstDayOfYear());
                 LocalDate endOfYear = localDate.with(TemporalAdjusters.lastDayOfYear());
@@ -215,11 +217,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
                 endDateTime = endOfYear.atTime(LocalTime.MAX);
                 startTime = Date.from(startDateTime.atZone(ZoneId.systemDefault()).toInstant());
                 endTime = Date.from(endDateTime.atZone(ZoneId.systemDefault()).toInstant());
-                return new DateRange(startTime, endTime);
+                break;
             default: // unsupported planCycle
                 throw new IllegalArgumentException("Unsupported planCycle: " + planCycle);
         }
 
+        return new DateRange(DateTime.of(startTime).setField(DateField.MILLISECOND, 0), DateTime.of(endTime).setField(DateField.MILLISECOND, 0));
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskMonitorInfoController.java

@@ -1,7 +1,6 @@
 package com.xunmei.core.access.controller;
 
-import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
+
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationMonitorDTO;
 import com.xunmei.core.access.service.ICoreMonitoringTaskMonitorInfoService;
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
@@ -9,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,17 +36,6 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
     @Autowired
     private ICoreMonitoringTaskRegistrationMonitorService coreMonitoringTaskRegistrationMonitorService;
 
-/*    *//**
-     * 查询调阅任务登记检查情况列表
-     *//*
-    @ApiOperation(value = "查询CoreMonitoringTaskMonitorInfo列表")
-    @RequiresPermissions("system:info:list")
-    @GetMapping("/list")
-    public TableDataInfo<CoreMonitoringTaskMonitorInfo> list(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
-        return null;
-    }*/
-
-
     /**
      * 获取调阅任务登记检查情况详细信息
      */
@@ -82,14 +69,4 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
         return toAjax(coreMonitoringTaskMonitorInfoService.updateCoreMonitoringTaskMonitorInfo(coreMonitoringTaskMonitorInfo));
     }
 
-/*    *//**
-     * 删除调阅任务登记检查情况
-     *//*
-    @ApiOperation(value = "删除CoreMonitoringTaskMonitorInfo")
-    @RequiresPermissions("system:info:remove")
-    @Log(title = "调阅任务登记检查情况", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(coreMonitoringTaskMonitorInfoService.deleteCoreMonitoringTaskMonitorInfoByIds(ids));
-    }*/
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationController.java

@@ -1,19 +1,16 @@
 package com.xunmei.core.access.controller;
 
-import java.util.List;
 
-import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
-import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
+
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationService;
-import com.xunmei.core.access.service.impl.CoreMonitoringTaskRegistrationServiceImpl;
-import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
+
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -84,15 +81,5 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         return toAjax(iCoreMonitoringTaskRegistrationService.updateCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
     }
-    /*
-     *//**
-     * 删除【请填写功能名称】
-     *//*
-    @ApiOperation(value = "删除CoreMonitoringTaskRegistration")
-    @RequiresPermissions("system:registration:remove")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(coreMonitoringTaskRegistrationService.deleteCoreMonitoringTaskRegistrationByIds(ids));
-    }*/
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationMonitorController.java

@@ -2,7 +2,6 @@ package com.xunmei.core.access.controller;
 
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
-import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
 import io.swagger.annotations.Api;
@@ -11,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,19 +31,6 @@ import com.xunmei.common.security.annotation.RequiresPermissions;
 public class CoreMonitoringTaskRegistrationMonitorController extends BaseController {
     @Autowired
     private ICoreMonitoringTaskRegistrationMonitorService coreMonitoringTaskRegistrationMonitorService;
-/*
-*//**
- * 查询调阅任务登记监控列表
- *//*
-@ApiOperation(value = "查询CoreMonitoringTaskRegistrationMonitor列表")
-@RequiresPermissions("system:monitor:list")
-@GetMapping("/list")
-    public TableDataInfo<CoreMonitoringTaskRegistrationMonitor> list(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
-
-      //  return coreMonitoringTaskRegistrationMonitorService.selectPage( coreMonitoringTaskRegistrationMonitor);
-   return  null;
-    }*/
-
 
 
     /**
@@ -79,15 +64,4 @@ public class CoreMonitoringTaskRegistrationMonitorController extends BaseControl
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
         return toAjax(coreMonitoringTaskRegistrationMonitorService.updateCoreMonitoringTaskRegistrationMonitor(coreMonitoringTaskRegistrationMonitor));
     }
-/*
-    *//**
-     * 删除调阅任务登记监控
-     *//*
-    @ApiOperation(value = "删除CoreMonitoringTaskRegistrationMonitor")
-    @RequiresPermissions("system:monitor:remove")
-    @Log(title = "调阅任务登记监控" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids) {
-        return toAjax(coreMonitoringTaskRegistrationMonitorService.deleteCoreMonitoringTaskRegistrationMonitorByIds(ids));
-    }*/
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/TMonitoringRetrievalPlan.java

@@ -3,6 +3,7 @@ package com.xunmei.core.access.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.common.core.web.domain.BaseEntity;
@@ -50,8 +51,10 @@ public class TMonitoringRetrievalPlan extends BaseEntity {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
     @ApiModelProperty(value = "开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
     @ApiModelProperty(value = "结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
     @ApiModelProperty(value = "下发类型0自建1下发")
     private Integer createType;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/ICoreMonitoringTaskMonitorInfoService.java

@@ -2,7 +2,6 @@ package com.xunmei.core.access.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationMonitorDTO;
 
@@ -63,11 +62,5 @@ public interface ICoreMonitoringTaskMonitorInfoService extends IService<CoreMoni
      */
     int deleteCoreMonitoringTaskMonitorInfoById(Long id);
 
-    /**
-     * 查询调阅任务登记检查情况分页数据
-     *
-     * @param coreMonitoringTaskMonitorInfo 查询条件对象
-     * @return Page
-     */
-  //  TableDataInfo<CoreMonitoringTaskMonitorInfo> selectPage(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo);
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/ICoreMonitoringTaskRegistrationMonitorService.java

@@ -2,7 +2,6 @@ package com.xunmei.core.access.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/ICoreMonitoringTaskRegistrationService.java

@@ -2,7 +2,6 @@ package com.xunmei.core.access.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
 
@@ -63,11 +62,4 @@ public interface ICoreMonitoringTaskRegistrationService extends IService<CoreMon
      */
     int deleteCoreMonitoringTaskRegistrationById(Long id);
 
-    /**
-     * 查询【请填写功能名称】分页数据
-     *
-     * @param coreMonitoringTaskRegistration 查询条件对象
-     * @return Page
-     */
-  //  TableDataInfo<CoreMonitoringTaskRegistration> selectPage(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskMonitorInfoServiceImpl.java

@@ -12,15 +12,13 @@ import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationMonitorDTO;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskMonitorInfoMapper;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMonitorMapper;
 import com.xunmei.core.access.service.ICoreMonitoringTaskMonitorInfoService;
-import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
+
 
 
 /**
@@ -36,38 +34,6 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
     @Autowired
     private CoreMonitoringTaskRegistrationMonitorMapper coreMonitoringTaskRegistrationMonitorMapper;
 
-/*    @Override
-    public TableDataInfo<CoreMonitoringTaskMonitorInfo> selectPage(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
-        //未删除
-        coreMonitoringTaskMonitorInfo.setDeleted(0L);
-        Page<CoreMonitoringTaskMonitorInfo> page;
-        //分页
-        if (coreMonitoringTaskMonitorInfo.getPageNum()!=null&&coreMonitoringTaskMonitorInfo.getPageSize()!=null)
-        {
-            page = new Page<>(coreMonitoringTaskMonitorInfo.getPageNum(), coreMonitoringTaskMonitorInfo.getPageSize());
-        }else{
-            page = new Page<>();
-        }
-        //查询条件
-        QueryWrapper<CoreMonitoringTaskMonitorInfo> query = new QueryWrapper<>(coreMonitoringTaskMonitorInfo);
-        //下穿
-        if (coreMonitoringTaskMonitorInfo.getCheckSub()){
-            List<Long> ids = orgService.selectCheckSubOrgIdList(coreMonitoringTaskMonitorInfo.getOrgId());
-            //清空前端传递的org_id
-            coreMonitoringTaskMonitorInfo.setOrgId(null);
-            //添加in条件
-            query.in("org_id",ids);
-        }
-        //时间范围查询
-        if (coreMonitoringTaskMonitorInfo.getParams().get("beginTime")!=null&&coreMonitoringTaskMonitorInfo.getParams().get("endTime")!=null){
-            query.between("create_time", coreMonitoringTaskMonitorInfo.getParams().get("beginTime"), coreMonitoringTaskMonitorInfo.getParams().get("endTime"));
-        }
-        //获取数据
-        page = coreMonitoringTaskMonitorInfoMapper.selectPage(page, query);
-        //抓换为TableDataInfo适配前端
-        return TableDataInfo.build(page);
-    }*/
-
 
     /**
      * 查询调阅任务登记检查情况
@@ -140,7 +106,7 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
         coreMonitoringTaskRegistrationMonitor.setUpdateTime(DateUtils.getNowDate());
         coreMonitoringTaskRegistrationMonitor.setUpdateBy(SecurityUtils.getUsername());
         coreMonitoringTaskRegistrationMonitorMapper.updateById(coreMonitoringTaskRegistrationMonitor);
-        QueryWrapper queryWrapper=new QueryWrapper();
+        QueryWrapper<CoreMonitoringTaskMonitorInfo> queryWrapper=new QueryWrapper();
         queryWrapper.eq("task_monitor_id",coreMonitoringTaskRegistrationMonitor.getId());
         coreMonitoringTaskMonitorInfoMapper.delete(queryWrapper);
         int i = 0;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationMonitorServiceImpl.java

@@ -1,10 +1,7 @@
 package com.xunmei.core.access.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 
+import java.util.List;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.utils.DateUtils;
@@ -36,39 +33,6 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
     @Autowired
     private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;
 
-/*    @Override
-    public TableDataInfo<CoreMonitoringTaskRegistrationMonitor> selectPage(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
-        //未删除
-        coreMonitoringTaskRegistrationMonitor.setDeleted(0L);
-        Page<CoreMonitoringTaskRegistrationMonitor> page;
-        //分页
-        if (coreMonitoringTaskRegistrationMonitor.getPageNum()!=null&&coreMonitoringTaskRegistrationMonitor.getPageSize()!=null)
-        {
-            page = new Page<>(coreMonitoringTaskRegistrationMonitor.getPageNum(), coreMonitoringTaskRegistrationMonitor.getPageSize());
-        }else{
-            page = new Page<>();
-        }
-        //查询条件
-        QueryWrapper<CoreMonitoringTaskRegistrationMonitor> query = new QueryWrapper<>(coreMonitoringTaskRegistrationMonitor);
-        //下穿
-        if (coreMonitoringTaskRegistrationMonitor.getCheckSub()){
-            List<Long> ids = orgService.selectCheckSubOrgIdList(coreMonitoringTaskRegistrationMonitor.getOrgId());
-            //清空前端传递的org_id
-            coreMonitoringTaskRegistrationMonitor.setOrgId(null);
-            //添加in条件
-            query.in("org_id",ids);
-        }
-        //时间范围查询
-        if (coreMonitoringTaskRegistrationMonitor.getParams().get("beginTime")!=null&&coreMonitoringTaskRegistrationMonitor.getParams().get("endTime")!=null){
-            query.between("create_time", coreMonitoringTaskRegistrationMonitor.getParams().get("beginTime"), coreMonitoringTaskRegistrationMonitor.getParams().get("endTime"));
-        }
-        //获取数据
-        page = coreMonitoringTaskRegistrationMonitorMapper.selectPage(page, query);
-        //抓换为TableDataInfo适配前端
-        return TableDataInfo.build(page);
-    }*/
-
-
     /**
      * 查询调阅任务登记监控
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationServiceImpl.java

@@ -16,11 +16,7 @@ import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
 import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
-
 import java.util.Arrays;
 import java.util.List;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -1,7 +1,5 @@
 package com.xunmei.core.access.service.impl;
 
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,10 +25,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
+
 
 /**
  * 监控调阅计划Service业务层处理
@@ -41,8 +37,8 @@ import java.util.function.Function;
 @Lazy
 @Service
 public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoringRetrievalPlanMapper, TMonitoringRetrievalPlan> implements ITMonitoringRetrievalPlanService {
-    private static final Long MINUS_ONE = -1L;
-    private static final Long ZERO = 0L;
+    private static final Integer MINUS_ONE = -1;
+    private static final Integer ZERO = 0;
     @Autowired
     private TMonitoringRetrievalPlanMapper tMonitoringRetrievalPlanMapper;
     @Autowired
@@ -58,7 +54,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     @Override
     public TableDataInfo<TMonitoringRetrievalPlan> selectPage(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         //未删除
-        tMonitoringRetrievalPlan.setIsDeleted(ZERO);
+        tMonitoringRetrievalPlan.setIsDeleted(ZERO.longValue());
         Page<TMonitoringRetrievalPlan> page;
         //分页
         if (tMonitoringRetrievalPlan.getPageNum() != null && tMonitoringRetrievalPlan.getPageSize() != null) {
@@ -73,7 +69,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         QueryWrapper<TMonitoringRetrievalPlan> query = new QueryWrapper<>(tMonitoringRetrievalPlan);
         //下穿
         tMonitoringRetrievalPlan.setCheckSub(true);
-        List<SysOrg> data = remoteOrgService.selectSysOrgByParentId(MINUS_ONE, SecurityConstants.INNER);
+        List<SysOrg> data = remoteOrgService.selectSysOrgByParentId(MINUS_ONE.longValue(), SecurityConstants.INNER);
         if (null == tMonitoringRetrievalPlan.getOrgId()) {
             tMonitoringRetrievalPlan.setOrgId(data.get(0).getId());
         }
@@ -117,10 +113,10 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     public int distribute(Long id) {
         //查询
         TMonitoringRetrievalPlan tMonitoringRetrievalPlan = tMonitoringRetrievalPlanMapper.selectById(id);
-        tMonitoringRetrievalPlan.setPlanStatus(0);
+        tMonitoringRetrievalPlan.setPlanStatus(ZERO);
         tMonitoringRetrievalPlanMapper.updateById(tMonitoringRetrievalPlan);
-        List<SysOrg> list = remoteOrgService.selectSysOrgByParentId(MINUS_ONE, SecurityConstants.INNER);
-        Integer i = 0;
+        List<SysOrg> list = remoteOrgService.selectSysOrgByParentId(MINUS_ONE.longValue(), SecurityConstants.INNER);
+        Integer i = ZERO;
         List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
         for (SysOrg l : list) {
             TMonitoringRetrievalPlan monitoringRetrievalPlan = new TMonitoringRetrievalPlan();
@@ -134,20 +130,21 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             monitoringRetrievalPlan.setRoleId(tMonitoringRetrievalPlan.getRoleId());
             monitoringRetrievalPlan.setPlanCycle(tMonitoringRetrievalPlan.getPlanCycle());
             monitoringRetrievalPlan.setPlanFrequency(tMonitoringRetrievalPlan.getPlanFrequency());
-            monitoringRetrievalPlan.setPlanStatus(0);
+            monitoringRetrievalPlan.setPlanStatus(ZERO);
             monitoringRetrievalPlan.setCreateBy(SecurityUtils.getUsername());
             monitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
             monitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
             monitoringRetrievalPlan.setCreateTime(DateUtils.getNowDate());
             monitoringRetrievalPlan.setDescription(tMonitoringRetrievalPlan.getDescription());
             monitoringRetrievalPlan.setCreateType(1);
+            monitoringRetrievalPlan.setId(IdWorker.getId());
             i = tMonitoringRetrievalPlanMapper.insert(monitoringRetrievalPlan);
             tMonitoringRetrievalPlans.add(monitoringRetrievalPlan);
-            if (i < 0) {
+            if (i < ZERO) {
                 return i;
             }
         }
-        if (tMonitoringRetrievalPlan.getPlanCycle().equals("0")) {
+        if (tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString())) {
             iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
         }
         return i;
@@ -182,20 +179,21 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
         SysRole sysRole = remoteRoleService.getRoleById(tMonitoringRetrievalPlan.getRoleId(), SecurityConstants.INNER);
         tMonitoringRetrievalPlan.setRoleName(sysRole.getRoleName());
+        long id = IdWorker.getId();
+        tMonitoringRetrievalPlan.setId(id);
         if (tMonitoringRetrievalPlan.getOrgType().equals("1")) {
             tMonitoringRetrievalPlan.setPlanStatus(1);
-            tMonitoringRetrievalPlan.setCreateType(0);
+            tMonitoringRetrievalPlan.setCreateType(ZERO);
         } else {
-            tMonitoringRetrievalPlan.setPlanStatus(0);
+            tMonitoringRetrievalPlan.setPlanStatus(ZERO);
             tMonitoringRetrievalPlan.setCreateType(1);
             //无周期调用
-            if (tMonitoringRetrievalPlan.getPlanCycle().equals("0")) {
+            if (tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString())) {
                 List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
                 tMonitoringRetrievalPlans.add(tMonitoringRetrievalPlan);
                 iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
             }
         }
-        tMonitoringRetrievalPlan.setId(IdWorker.getId());
         return tMonitoringRetrievalPlanMapper.insert(tMonitoringRetrievalPlan);
     }
 
@@ -219,7 +217,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
      */
     @Override
     public int deleteTMonitoringRetrievalPlanByIds(Long[] ids) {
-        int i = 0;
+        int i = ZERO;
         for (Long id : ids) {
             TMonitoringRetrievalPlan tMonitoringRetrievalPlan = new TMonitoringRetrievalPlan();
             tMonitoringRetrievalPlan.setIsDeleted(2L);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/AppRuleController.java

@@ -5,9 +5,9 @@ import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.annotation.RequiresPermissions;
-import com.xunmei.core.resumption.domain.AppRule;
 import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
 import com.xunmei.core.resumption.dto.appRule.AppRuleListForOrgDto;
+import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
 import com.xunmei.core.resumption.service.IAppRuleService;
 import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
 import io.swagger.annotations.ApiOperation;
@@ -34,8 +34,8 @@ public class AppRuleController  extends BaseController {
     @ApiOperation(value = "查询规范列表")
     @GetMapping("page")
     @RequiresPermissions("resumption:rule")
-    public TableDataInfo getAppRulePage(AppRule appRule) {
-        final TableDataInfo appRulePage = appRuleService.getAppRulePage(appRule);
+    public TableDataInfo getAppRulePage(AppRulePageDto query) {
+        final TableDataInfo appRulePage = appRuleService.getAppRulePage(query);
         return appRulePage;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppRule.java

@@ -28,15 +28,15 @@ public class AppRule extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
-    @ApiModelProperty(value = "规范类型id")
+    @ApiModelProperty(value = "履职内容库类型id")
     @TableField("type")
     private String type;
 
-    @ApiModelProperty(value = "规范名称")
+    @ApiModelProperty(value = "履职内容库名称")
     @TableField("name")
     private String name;
 
-    @ApiModelProperty(value = "受检机构类型")
+    @ApiModelProperty(value = "履职机构类型")
     @TableField("org_type")
     private String orgType;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRule/AppRulePageDto.java

@@ -0,0 +1,21 @@
+package com.xunmei.core.resumption.dto.appRule;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.xunmei.common.core.web.domain.PageDto;
+import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
+import io.swagger.annotations.ApiModelProperty;
+
+public class AppRulePageDto extends PageDto<AppRulePageVo> {
+    @ApiModelProperty(value = "履职内容库名称")
+    private String name;
+
+    @ApiModelProperty(value = "履职内容库类型id")
+    private String type;
+
+    @ApiModelProperty(value = "履职机构类型")
+    private String orgType;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "是否下穿查询")
+    private Boolean checkSub = false;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/AppRuleMapper.java

@@ -3,6 +3,7 @@ package com.xunmei.core.resumption.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.core.resumption.domain.AppRule;
+import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
 import com.xunmei.core.resumption.dto.appRuleItem.AppRulePointSelectPageDto;
 import com.xunmei.core.resumption.vo.appRule.AppRuleGroupVo;
 import com.xunmei.core.resumption.vo.appRule.AppRuleInfoVo;
@@ -26,7 +27,7 @@ import java.util.List;
 @Repository
 public interface AppRuleMapper extends BaseMapper<AppRule> {
 
-    Page<AppRulePageVo> selectPageByCondition(@Param("page") Page<AppRulePageVo> page, @Param("appRule") AppRule appRule);
+    Page<AppRulePageVo> selectPageByCondition(@Param("page") Page<AppRulePageVo> page, @Param("appRule") AppRulePageDto appRule);
 
     List<AppRuleGroupVo> getRuleGroupList();
 

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

@@ -7,6 +7,7 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.resumption.domain.AppRule;
 import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
 import com.xunmei.core.resumption.dto.appRule.AppRuleListForOrgDto;
+import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
 import com.xunmei.core.resumption.vo.appRule.AppRuleInfoVo;
 import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
 
@@ -22,7 +23,7 @@ import java.util.List;
  */
 public interface IAppRuleService extends IService<AppRule> {
 
-    TableDataInfo getAppRulePage(AppRule appRule);
+    TableDataInfo getAppRulePage(AppRulePageDto query);
 
     List<AppRulePageVo> getAllAppRule();
 

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

@@ -9,6 +9,7 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.resumption.domain.AppRule;
 import com.xunmei.core.resumption.dto.appRule.AppRuleListForOrgDto;
+import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
 import com.xunmei.core.resumption.mapper.AppRuleMapper;
 import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
 import com.xunmei.core.resumption.service.IAppRuleService;
@@ -44,9 +45,9 @@ public class AppRuleServiceImpl extends ServiceImpl<AppRuleMapper, AppRule> impl
     RemoteOrgService remoteOrgService;
 
     @Override
-    public TableDataInfo getAppRulePage(AppRule appRule) {
-        Page<AppRulePageVo> page = appRule.<AppRulePageVo>getPage();
-        page = appRuleMapper.selectPageByCondition(page, appRule);
+    public TableDataInfo getAppRulePage(AppRulePageDto query) {
+        Page<AppRulePageVo> page = query.getPageDto();
+        page = appRuleMapper.selectPageByCondition(page, query);
 
         return TableDataInfo.success(page);
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/controller/CoreMonitoringRetrievalTaskController.java

@@ -145,4 +145,18 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
         }
     }
 
+    /**
+     * 修改未完成任务（待调阅和调阅中的任务）的状态为已超期
+     * @return
+     */
+    @InnerAuth
+    @GetMapping("/updateTaskStart")
+    public AjaxResult updateTaskStart() {
+        try {
+            coreMonitoringRetrievalTaskService.updateTaskStart();
+            return AjaxResult.success("修改任务状态成功");
+        } catch (Exception e) {
+            return AjaxResult.error("修改任务状态失败" + e.getMessage());
+        }
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.retrieval.mapper;
 
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -76,4 +77,6 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
     List<TaskDataVo> selectTaskDataVoListByRetrievalTaskId(@Param("taskId") Long id);
 
     CoreMonitoringRetrievalTaskOneVo selectOneById(@Param("taskId") Long id);
+
+    void updateTaskStart(@Param("dateTimeNew") Date dateTimeNew);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/ICoreMonitoringRetrievalTaskService.java

@@ -87,4 +87,6 @@ public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonito
     void monthTask(LocalDate taskTime);
 
     CoreMonitoringRetrievalTaskOneVo selectCoreMonitoringRetrievalTaskOneVoById(Long id);
+
+    void updateTaskStart();
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -1,10 +1,14 @@
 package com.xunmei.core.retrieval.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
@@ -328,13 +332,19 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     @Override
     public CoreMonitoringRetrievalTaskOneVo selectCoreMonitoringRetrievalTaskOneVoById(Long id) {
         CoreMonitoringRetrievalTaskOneVo retrievalTaskOneVo = coreMonitoringRetrievalTaskMapper.selectOneById(id);
-       /* CoreMonitoringRetrievalTask retrievalTask = this.getById(id);
-        BeanHelper.copyProperties(retrievalTaskOneVo, retrievalTask);*/
         List<TaskDataVo>  taskDataVoList = coreMonitoringRetrievalTaskMapper.selectTaskDataVoListByRetrievalTaskId(id);
         retrievalTaskOneVo.setTaskDataVoList(taskDataVoList);
         return retrievalTaskOneVo;
     }
 
+    @Override
+    public void updateTaskStart() {
+        LocalDate dateTime =  LocalDate.now();
+        Date dateTimeNew = Date.from(dateTime.atStartOfDay(ZoneId.systemDefault()).toInstant());
+        DateUtil.endOfDay(dateTimeNew).setField(DateField.MILLISECOND, 0);
+        coreMonitoringRetrievalTaskMapper.updateTaskStart(dateTimeNew);
+    }
+
     /**
      * @param cycle    周期
      * @param taskTime 日期
@@ -350,7 +360,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getPlanStatus, 0);
         queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getIsDeleted, 0);
         queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getCreateType, 1);
-        List<TMonitoringRetrievalPlan> planList = itMonitoringRetrievalPlanService.list();
+        List<TMonitoringRetrievalPlan> planList = itMonitoringRetrievalPlanService.list(queryWrapper);
         //按计划生成任务
         for (TMonitoringRetrievalPlan plan : planList) {
             //获取计划关联的机构
@@ -373,7 +383,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
      */
     private List<CoreMonitoringRetrievalTask> buildCoreMonitoringRetrievalTask(TMonitoringRetrievalPlan plan, LocalDate taskTime, SysOrg sysOrg) {
         List<CoreMonitoringRetrievalTask> taskList = new ArrayList<>();
-        Long batchNum = IDHelper.id();
+        Long batchNum = IdWorker.getId();
         for (int i = 0; i < plan.getPlanFrequency(); i++) {
             CoreMonitoringRetrievalTask task = this.buildCoreMonitoringRetrievalTask(batchNum, i + 1, plan, sysOrg, taskTime);
             taskList.add(task);
@@ -397,13 +407,13 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         DateRange dateRange = null;
         if (Integer.parseInt(plan.getPlanCycle()) == RetrievalTaskCycle.NOCYCLE.getCode()) {
             //无周期任务获取计划时间//重计划中获取
-            dateRange = new  DateRange(plan.getStartTime(), plan.getEndTime());
+            dateRange = new  DateRange(DateUtil.beginOfDay(plan.getStartTime()).setField(DateField.MILLISECOND, 0), DateUtil.endOfDay(plan.getEndTime()).setField(DateField.MILLISECOND, 0));
         } else {
             //周期任务获取计划时间
             dateRange = DateUtils.getStartAndEnd(dateTime, Integer.parseInt(plan.getPlanCycle()));
         }
         CoreMonitoringRetrievalTask task = new CoreMonitoringRetrievalTask();
-        task.setId(IDHelper.id());
+        task.setId(IdWorker.getId());
         task.setTaskName(plan.getPlanName() + "第" + frequency + "次调阅");
         task.setCycle(plan.getPlanCycle());
         task.setOrgId(sysOrg.getId());
@@ -412,7 +422,6 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         task.setBatchNum(batchNum);
         task.setPlanId(plan.getId());
         task.setOrderNum(frequency);
-        System.out.println(dateRange.getStartTime() + "---" + dateRange.getEndTime());
         task.setPlanStartTime(dateRange.getStartTime());
         task.setPlanEndTime(dateRange.getEndTime());
         task.setYmdDate(ymd.getDate());
@@ -424,6 +433,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         task.setYmdDay(ymd.getDay());
         task.setRoleId(plan.getRoleId());
         task.setStatus("0");
+        task.setCreateTime(DateTime.now());
         return task;
     }
 

soc-modules/soc-modules-core/src/main/resources/mapper/device/ProtectionMapper.xml

@@ -38,6 +38,7 @@
         <if test="request.startTime!=null and request.endTime!=null">
             and a.status_update_time >= #{request.startTime} and  a.status_update_time&lt;=#{request.endTime}
         </if>
+        order by id desc
     </select>
 <!--    <select id="pageLog" resultType="com.xunmei.core.resumption.vo.protection.ProtectionLogPageVo">-->
 <!--        select a.id, a.name as name,a.status as status,a.status_update_time,a.status_updator_name-->

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -309,6 +309,9 @@
         </trim>
         where id = #{id}
     </update>
+    <update id="updateTaskStart">
+        update core_monitoring_retrieval_task set status=3 where #{dateTimeNew}>plan_end_time and status!=2
+    </update>
 
     <delete id="deleteCoreMonitoringRetrievalTaskById" parameterType="Long">
         delete

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/task/RetrievalTask.java

@@ -1,21 +1,24 @@
 package com.xunmei.job.task;
 
 
+import cn.hutool.core.lang.UUID;
 import com.alibaba.fastjson.JSON;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.system.api.RemoteRetrievalTaskService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * 监控调阅定时任务
  *
  * @author xunmei
  */
-
+@Slf4j
 @Component("RetrievalTask")
 public class RetrievalTask {
     @Resource
@@ -24,10 +27,12 @@ public class RetrievalTask {
     /**
      * 每天生成日任务 如果当天是周一还需生成周任务
      */
-    public void retrieveDayTaskByDate(LocalDate taskTime)
-    {   System.out.println("监控调阅每日每周任务生产服务有参"+taskTime);
-        AjaxResult result = remoteRetrievalTaskService.dayTask(taskTime, SecurityConstants.INNER);
-        System.out.println(JSON.toJSONString(result));
+    public void retrieveDayTaskByDate(String taskTime)
+    {   String id = UUID.fastUUID().toString();
+        log.info("开始执行监控调阅每日每周任务生成定时任务，当前任务 id:{},当前时间:{},参数:{}", id, new Date(), JSON.toJSONString(taskTime));
+        LocalDate dateTime = LocalDate.parse(taskTime);
+        AjaxResult result = remoteRetrievalTaskService.dayTask(dateTime, SecurityConstants.INNER);
+        log.info("监控调阅每日每周任务生成定时任务执行结束，当前任务 id:{},当前时间:{},结果:{}", id, new Date(), JSON.toJSONString(result));
     }
     /**
      * 1.1生成周期为每月，每季，每半年，每年的任务
@@ -36,16 +41,19 @@ public class RetrievalTask {
      * 其他日期生成月任务
      *
      */
-    public void retrieveMonthTaskByDate(LocalDate taskTime)
-    {   System.out.println("监控调阅每月任务生产服务有参"+taskTime);
-        AjaxResult result = remoteRetrievalTaskService.monthTask(taskTime,SecurityConstants.INNER);
-        System.out.println(JSON.toJSONString(result));
+    public void retrieveMonthTaskByDate(String taskTime)
+    {   String id = UUID.fastUUID().toString();
+        log.info("开始执行监控调阅每月季度半年年任务生成定时任务，当前任务 id:{},当前时间:{},参数:{}", id, new Date(), JSON.toJSONString(taskTime));
+        LocalDate dateTime = LocalDate.parse(taskTime);
+        AjaxResult result = remoteRetrievalTaskService.monthTask(dateTime,SecurityConstants.INNER);
+        log.info("监控调阅每月季度半年年任务生成定时任务执行结束，当前任务 id:{},当前时间:{},结果:{}", id, new Date(), JSON.toJSONString(result));
     }
 
     public void retrieveDayTask()
-    {   System.out.println("监控调阅每日每周任务生产服务无参");
+    {   String id = UUID.fastUUID().toString();
+        log.info("开始执行监控调阅每日每周任务生成定时任务，当前任务 id:{},当前时间:{},无参数", id, new Date());
         AjaxResult result = remoteRetrievalTaskService.dayTask(SecurityConstants.INNER);
-        System.out.println(JSON.toJSONString(result));
+        log.info("监控调阅每日每周任务生成定时任务执行结束，当前任务 id:{},当前时间:{},结果:{}", id, new Date(), JSON.toJSONString(result));
     }
     /**
      * 1.1生成周期为每月，每季，每半年，每年的任务
@@ -55,9 +63,16 @@ public class RetrievalTask {
      *
      */
     public void retrieveMonthTask()
-    {   System.out.println("监控调阅每月任务生产服务无参");
+    {   String id = UUID.fastUUID().toString();
+        log.info("开始执行监控调阅每月季度半年年任务生成定时任务，当前任务 id:{},当前时间:{},无参数", id, new Date());
         AjaxResult result =  remoteRetrievalTaskService.monthTask(SecurityConstants.INNER);
-        System.out.println(JSON.toJSONString(result));
+        log.info("监控调阅每月季度半年年任务生成定时任务执行结束，当前任务 id:{},当前时间:{},结果:{}", id, new Date(), JSON.toJSONString(result));
+    }
+    public void updateTaskStart()
+    {   String id = UUID.fastUUID().toString();
+        log.info("开始执行监控调阅任务超期定时任务，当前任务 id:{},当前时间:{},无参数", id, new Date());
+        AjaxResult result =  remoteRetrievalTaskService.updateTaskStart(SecurityConstants.INNER);
+        log.info("监控调阅任务超期定时任务执行结束，当前任务 id:{},当前时间:{},结果:{}", id, new Date(), JSON.toJSONString(result));
     }