监控调阅任务

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

@@ -25,6 +25,6 @@ public interface RemoteDictDataService
      * @param file 文件信息
      * @return 结果
      */
-    @GetMapping(value = "/type/{dictType}")
+    @GetMapping(value = "/dict/data/type/{dictType}")
      public List<SysDictData> dictType(@PathVariable("dictType") String dictType, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

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

@@ -0,0 +1,51 @@
+package com.xunmei.system.api;
+
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.constant.ServiceNameConstants;
+import com.xunmei.common.core.domain.R;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.system.api.factory.RemoteRetrievalTaskFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.time.LocalDate;
+
+@FeignClient(contextId = "remoteRetrievalTaskService", value = ServiceNameConstants.CORE_SERVICE, fallbackFactory = RemoteRetrievalTaskFallbackFactory.class)
+public interface RemoteRetrievalTaskService {
+    /**
+     * 每天生成日任务 如果当天是周一还需生成周任务
+     *
+     * @return
+     */
+    @GetMapping("/retrievalTask/dayTask")
+    AjaxResult dayTask(@RequestParam("taskTime") LocalDate taskTime,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 1.1生成周期为每月，每季，每半年，每年的任务
+     * 4.1||10.1日生成周期为每月，每季
+     * 7.1日获取执行周期为每月，每季,每半年的 其他日期生成月任务
+     *
+     * @return
+     */
+    @GetMapping("/retrievalTask/monthTask")
+    AjaxResult monthTask(@RequestParam("taskTime") LocalDate taskTime,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    /**
+     * 每天生成日任务 如果当天是周一还需生成周任务
+     *
+     * @return
+     */
+    @GetMapping("/retrievalTask/dayTask")
+    AjaxResult dayTask(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 1.1生成周期为每月，每季，每半年，每年的任务
+     * 4.1||10.1日生成周期为每月，每季
+     * 7.1日获取执行周期为每月，每季,每半年的 其他日期生成月任务
+     *
+     * @return
+     */
+    @GetMapping("/retrievalTask/monthTask")
+    AjaxResult monthTask(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+}

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

@@ -1,30 +0,0 @@
-package com.xunmei.system.api;
-
-import com.xunmei.common.core.constant.ServiceNameConstants;
-import com.xunmei.common.core.domain.R;
-import com.xunmei.common.core.web.domain.AjaxResult;
-import com.xunmei.system.api.factory.RemoteRetrieveTaskFallbackFactory;
-import com.xunmei.system.api.factory.RemoteTaskFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@FeignClient(contextId = "remoteRetrieveTaskService", value = ServiceNameConstants.CORE_SERVICE, fallbackFactory = RemoteRetrieveTaskFallbackFactory.class)
-public interface RemoteRetrieveTaskService {
-    /**
-     * 每天生成日任务 如果当天是周一还需生成周任务
-     *
-     * @return
-     */
-    @GetMapping("/retrievalTask/dayTask")
-    R<AjaxResult> dayTask();
-
-    /**
-     * 1.1生成周期为每月，每季，每半年，每年的任务
-     * 4.1||10.1日生成周期为每月，每季
-     * 7.1日获取执行周期为每月，每季,每半年的 其他日期生成月任务
-     *
-     * @return
-     */
-    @GetMapping("/retrievalTask/monthTask")
-    R<AjaxResult> monthTask();
-}

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

@@ -0,0 +1,45 @@
+package com.xunmei.system.api.factory;
+
+import com.xunmei.common.core.domain.R;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.system.api.RemoteRetrievalTaskService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+
+@Component
+public class RemoteRetrievalTaskFallbackFactory implements FallbackFactory<RemoteRetrievalTaskService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+    @Override
+    public RemoteRetrievalTaskService create(Throwable throwable) {
+
+        log.error("监控调阅服务调用失败:{}", throwable.getMessage());
+        return new RemoteRetrievalTaskService()
+        {
+
+
+            @Override
+            public AjaxResult dayTask(LocalDate taskTime, String source) {
+                return AjaxResult.error("监控调阅每日每周任务生成服务调用失败，失败原因：" + throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult monthTask(LocalDate taskTime, String source) {
+                return AjaxResult.error("监控调阅每月任务生成服务调用失败,失败原因：" + throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult dayTask(String source) {
+                return AjaxResult.error("监控调阅每日每周任务生成服务调用失败,失败原因：" + throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult monthTask(String source) {
+                return AjaxResult.error("监控调阅每月任务生成服务调用失败,失败原因：" + throwable.getMessage());
+            }
+        };
+    }
+}

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

@@ -1,33 +0,0 @@
-package com.xunmei.system.api.factory;
-
-import com.xunmei.common.core.domain.R;
-import com.xunmei.common.core.web.domain.AjaxResult;
-import com.xunmei.system.api.RemoteRetrieveTaskService;
-import com.xunmei.system.api.RemoteTaskService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-@Component
-public class RemoteRetrieveTaskFallbackFactory implements FallbackFactory<RemoteRetrieveTaskService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
-    @Override
-    public RemoteRetrieveTaskService create(Throwable throwable) {
-
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteRetrieveTaskService()
-        {
-
-            @Override
-            public R<AjaxResult> dayTask() {
-                return null;
-            }
-
-            @Override
-            public R<AjaxResult> monthTask() {
-                return null;
-            }
-        };
-    }
-}

soc-api/soc-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -7,4 +7,4 @@ com.xunmei.system.api.factory.RemoteWorkTimesFallbackFactory
 com.xunmei.system.api.factory.RemoteSyncOrgAndUserFactory
 com.xunmei.system.api.factory.RemoteTaskFallbackFactory
 com.xunmei.system.api.factory.RemoteDictDataFallbackFactory
-com.xunmei.system.api.factory.RemoteRetrieveTaskFallbackFactory
+com.xunmei.system.api.factory.RemoteRetrievalTaskFallbackFactory

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/vo/CoreMonitoringRetrievalTaskOneVo.java

@@ -0,0 +1,167 @@
+package com.xunmei.common.core.domain.retrieval.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xunmei.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 监控调阅任务对象 core_monitoring_retrieval_task
+ *
+ * @author xunmei
+ * @date 2023-08-25
+ */
+@Data
+@ApiModel(value = "CoreMonitoringRetrievalTask对象", description = "监控调阅任务")
+public class CoreMonitoringRetrievalTaskOneVo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 计划id
+     */
+    private Long planId;
+
+    /**
+     * 任务名称
+     */
+    @ApiModelProperty(value = "任务名称")
+    private String taskName;
+
+    /**
+     * 调阅机构
+     */
+    private Long orgId;
+
+    /**
+     * 调阅机构
+     */
+    private String orgPath;
+
+    /**
+     * 调阅机构
+     */
+    @ApiModelProperty(value = "调阅机构")
+    private String orgName;
+
+    /**
+     * 年月日
+     */
+    private Date ymdDate;
+
+    /**
+     * 年
+     */
+    private Long ymdYear;
+
+    /**
+     * 半年
+     */
+    private Long ymdHalfyear;
+
+    /**
+     * 季度
+     */
+    private Long ymdQuarter;
+
+    /**
+     * 月
+     */
+    private Long ymdMonth;
+
+    /**
+     * 周
+     */
+    private Long ymdWeek;
+
+    /**
+     * 日
+     */
+    private Long ymdDay;
+
+    /**
+     * 周期无周期、每日、每周、每月、每季度、每半年、每年（0-6）
+     */
+    private Long cycle;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "开始时间")
+    private Date planStartTime;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "结束时间")
+    private Date planEndTime;
+
+    /**
+     * 调阅开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "调阅开始时间")
+    private Date startTime;
+
+    /**
+     * 调阅结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "调阅结束时间")
+    private Date endTime;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态")
+    private Long status;
+
+    private String statusText;
+
+    /**
+     * 角色id
+     */
+    private Long roleId;
+
+    private String roleName;
+
+    /**
+     * 调阅人
+     */
+    private Long retrievalUser;
+
+    private String retrievalUserName;
+
+    /**
+     * 第几次调阅（根据计划的频次计算的来）
+     */
+    private Long orderNum;
+
+    /**
+     * 批次号（同一计划多频次为一个批次号）
+     */
+    private Long batchNum;
+
+    /**
+     * 提交时间
+     */
+    private Date submitTime;
+
+    /**
+     * 异常数
+     */
+    @ApiModelProperty(value = "异常数")
+    private Long exceptionCount;
+
+
+    private Integer no;
+}

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

@@ -26,8 +26,8 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreMonitoringTaskRegistrationMapper, CoreMonitoringTaskRegistration> implements ICoreMonitoringTaskRegistrationService {
-  private static  final Long ONE=1L;
-  private static final Long TWO=2L;
+  private static  final Integer ONE=1;
+  private static final Integer TWO=2;
     @Autowired
     private CoreMonitoringTaskRegistrationMapper coreMonitoringTaskRegistrationMapper;
 @Autowired

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

@@ -65,9 +65,9 @@
             where id = #{id}
     </select>
     <select id="selectPageList" resultType="com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo">
-        select a.*,b.name as roleName,c.name as retrievalUserName from core_monitoring_retrieval_task a left join sys_role b on a.role_id = b.id left join sys_user c on a.retrieval_user = c.id
+        select a.*,b.role_name as roleName,c.name as retrievalUserName from core_monitoring_retrieval_task a left join sys_role b on a.role_id = b.id left join sys_user c on a.retrieval_user = c.id
         where 1=1
-        <if test="coreMonitoringTaskRegistrationDTO.orgId != null ">
+        <if test="request.orgId != null ">
             and a.org_id = #{request.orgId}
         </if>
         <if test="request.orgPath != null  and request.orgPath != ''">

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

@@ -3,11 +3,13 @@ package com.xunmei.job.task;
 
 import com.alibaba.fastjson.JSON;
 import com.xunmei.common.core.constant.SecurityConstants;
-import com.xunmei.common.core.domain.R;
-import com.xunmei.system.api.RemoteSyncOrgAndUserService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.system.api.RemoteRetrievalTaskService;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+import java.time.LocalDate;
+
 /**
  * 监控调阅定时任务
  *
@@ -16,14 +18,16 @@ import org.springframework.stereotype.Component;
 
 @Component("RetrievalTask")
 public class RetrievalTask {
-
+    @Resource
+    private RemoteRetrievalTaskService remoteRetrievalTaskService;
 
     /**
      * 每天生成日任务 如果当天是周一还需生成周任务
      */
-    public void RetrievalDayTask()
-    {
-
+    public void retrieveDayTask(LocalDate taskTime)
+    {   System.out.println("监控调阅每日每周任务生产服务有参"+taskTime);
+        AjaxResult result = remoteRetrievalTaskService.dayTask(taskTime, SecurityConstants.INNER);
+        System.out.println(JSON.toJSONString(result));
     }
     /**
      * 1.1生成周期为每月，每季，每半年，每年的任务
@@ -32,10 +36,30 @@ public class RetrievalTask {
      * 其他日期生成月任务
      *
      */
-    public void RetrievalMonthTask()
-    {
+    public void retrieveMonthTask(LocalDate taskTime)
+    {   System.out.println("监控调阅每月任务生产服务有参"+taskTime);
+        AjaxResult result = remoteRetrievalTaskService.monthTask(taskTime,SecurityConstants.INNER);
+        System.out.println(JSON.toJSONString(result));
+    }
 
+    public void retrieveDayTask()
+    {   System.out.println("监控调阅每日每周任务生产服务无参");
+        AjaxResult result = remoteRetrievalTaskService.dayTask(SecurityConstants.INNER);
+        System.out.println(JSON.toJSONString(result));
     }
+    /**
+     * 1.1生成周期为每月，每季，每半年，每年的任务
+     * 4.1||10.1日生成周期为每月，每季
+     * 7.1日获取执行周期为每月，每季,每半年的
+     * 其他日期生成月任务
+     *
+     */
+    public void retrieveMonthTask()
+    {   System.out.println("监控调阅每月任务生产服务无参");
+        AjaxResult result =  remoteRetrievalTaskService.monthTask(SecurityConstants.INNER);
+        System.out.println(JSON.toJSONString(result));
+    }
+