监控调阅任务

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 = "/dict/data/type/{dictType}")
-     public List<SysDictData> dictType(@PathVariable("dictType") String dictType, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @GetMapping(value = "/dict/data/bytype/{dictType}")
+     public List<SysDictData> selectDictByeType(@PathVariable("dictType") String dictType, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

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

@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -24,8 +25,8 @@ public class RemoteDictDataFallbackFactory implements FallbackFactory<RemoteDict
         return new RemoteDictDataService() {
 
             @Override
-            public List<SysDictData> dictType(String dictType, String source) {
-                return null;
+            public List<SysDictData> selectDictByeType(String dictType, String source) {
+                return new ArrayList<>();
             }
         };
     }

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

@@ -25,11 +25,6 @@ public class CoreMonitoringRetrievalTaskOneVo extends BaseEntity {
     private Long id;
 
     /**
-     * 计划id
-     */
-    private Long planId;
-
-    /**
      * 任务名称
      */
     @ApiModelProperty(value = "任务名称")
@@ -38,60 +33,10 @@ public class CoreMonitoringRetrievalTaskOneVo extends BaseEntity {
     /**
      * 调阅机构
      */
-    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")
@@ -125,43 +70,12 @@ public class CoreMonitoringRetrievalTaskOneVo extends BaseEntity {
     @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/retrieval/controller/CoreMonitoringRetrievalTaskController.java

@@ -72,7 +72,7 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
     @RequiresPermissions("core:task:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(coreMonitoringRetrievalTaskService.selectCoreMonitoringRetrievalTaskById(id));
+        return success(coreMonitoringRetrievalTaskService.selectCoreMonitoringRetrievalTaskOneVoById(id));
     }
 
     /**

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

@@ -6,6 +6,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskOneVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
@@ -84,4 +85,6 @@ public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonito
     void noCycleTask(List<TMonitoringRetrievalPlan> planList);
     void dayTask(LocalDate taskTime);
     void monthTask(LocalDate taskTime);
+
+    CoreMonitoringRetrievalTaskOneVo selectCoreMonitoringRetrievalTaskOneVoById(Long id);
 }

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

@@ -12,12 +12,10 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
+import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskOneVo;
 import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo;
 import com.xunmei.common.core.enums.RetrievalTaskCycle;
-import com.xunmei.common.core.utils.DateHelper;
-import com.xunmei.common.core.utils.DateUtils;
-import com.xunmei.common.core.utils.IDHelper;
-import com.xunmei.common.core.utils.Ymd;
+import com.xunmei.common.core.utils.*;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
@@ -91,7 +89,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         request.setPageSize(null);
         request.setPageNum(null);
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
-        List<SysDictData> listDict = RemoteCallHandlerExecutor.executeRemoteCall(() -> dictDataService.dictType("retrieval_task_status", SecurityConstants.INNER), ErrorMsgConstants.QUERY_DICT_DATA_ERROR);
+        List<SysDictData> listDict = RemoteCallHandlerExecutor.executeRemoteCall(() -> dictDataService.selectDictByeType("retrieval_task_status", SecurityConstants.INNER), ErrorMsgConstants.QUERY_DICT_DATA_ERROR);
         final TableDataInfo tableDataInfo = this.selectPage(request);
         if (ObjectUtil.isEmpty(tableDataInfo.getRows())) {
             throw new RuntimeException("导出数据为空!");
@@ -321,6 +319,15 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     }
 
+    @Override
+    public CoreMonitoringRetrievalTaskOneVo selectCoreMonitoringRetrievalTaskOneVoById(Long id) {
+        CoreMonitoringRetrievalTaskOneVo retrievalTaskOneVo = new CoreMonitoringRetrievalTaskOneVo();
+        CoreMonitoringRetrievalTask retrievalTask = coreMonitoringRetrievalTaskMapper.selectById(id);
+        BeanHelper.copyProperties(retrievalTaskOneVo, retrievalTask);
+
+        return null;
+    }
+
     /**
      * @param cycle    周期
      * @param taskTime 日期

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDictDataController.java

@@ -70,6 +70,17 @@ public class SysDictDataController extends BaseController
         }
         return success(data);
     }
+    @ApiOperation(value = "根据字典类型查询字典数据信息")
+    @GetMapping(value = "/bytype/{dictType}")
+    public List<SysDictData> dictByType(@PathVariable String dictType)
+    {
+        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+        if (StringUtils.isNull(data))
+        {
+            data = new ArrayList<SysDictData>();
+        }
+        return data;
+    }
 
     /**
      * 新增字典类型