监控调阅任务

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

@@ -0,0 +1,30 @@
+package com.xunmei.system.api;
+
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.constant.ServiceNameConstants;
+import com.xunmei.system.api.domain.SysDictData;
+import com.xunmei.system.api.factory.RemoteDictDataFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+import java.util.List;
+
+/**
+ * 字典服务
+ * 
+ * @author xunmei
+ */
+@FeignClient(contextId = "remoteDictDataService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteDictDataFallbackFactory.class)
+public interface RemoteDictDataService
+{
+    /**
+     * 字典服务，根据类型获取字典
+     *
+     * @param file 文件信息
+     * @return 结果
+     */
+    @GetMapping(value = "/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/factory/RemoteDictDataFallbackFactory.java

@@ -0,0 +1,32 @@
+package com.xunmei.system.api.factory;
+
+import com.xunmei.system.api.RemoteDictDataService;
+import com.xunmei.system.api.domain.SysDictData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 字典服务降级处理
+ *
+ * @author xunmei
+ */
+@Component
+public class RemoteDictDataFallbackFactory implements FallbackFactory<RemoteDictDataService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteDictDataFallbackFactory.class);
+
+    @Override
+    public RemoteDictDataService create(Throwable throwable) {
+        log.error("字典服务调用失败:{}", throwable.getMessage());
+        return new RemoteDictDataService() {
+
+            @Override
+            public List<SysDictData> dictType(String dictType, String source) {
+                return null;
+            }
+        };
+    }
+}

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

@@ -6,3 +6,4 @@ com.xunmei.system.api.factory.RemoteConfigFallbackFactory
 com.xunmei.system.api.factory.RemoteWorkTimesFallbackFactory
 com.xunmei.system.api.factory.RemoteSyncOrgAndUserFactory
 com.xunmei.system.api.factory.RemoteTaskFallbackFactory
+com.xunmei.system.api.factory.RemoteDictDataFallbackFactory

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/constant/ErrorMsgConstants.java

@@ -6,4 +6,5 @@ public class ErrorMsgConstants {
     public static final String REMOTE_CALL_ERROR = "远程调用错误: ";
 
     public static final String QUERY_ORG_DATA_ERROR = "获取机构信息失败!";
+    public static final String QUERY_DICT_DATA_ERROR = "获取字典信息失败!";
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/domain/CoreMonitoringRetrievalTask.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/domain/CoreMonitoringRetrievalTask.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.retrieval.domain;
+package com.xunmei.common.core.domain.retrieval.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/dto/RetrievalTaskPageDto.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/dto/RetrievalTaskPageDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.retrieval.dto;
+package com.xunmei.common.core.domain.retrieval.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/vo/CoreMonitoringRetrievalTaskVo.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/vo/CoreMonitoringRetrievalTaskVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.retrieval.vo;
+package com.xunmei.common.core.domain.retrieval.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -130,6 +130,8 @@ public class CoreMonitoringRetrievalTaskVo extends BaseEntity {
     @ApiModelProperty(value = "状态")
     private Long status;
 
+    private String statusText;
+
     /**
      * 角色id
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/dto/CoreMonitoringTaskRegistrationDTO.java

@@ -1,6 +1,6 @@
 package com.xunmei.core.access.dto;
 
-import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import lombok.Data;
 
 import java.util.Date;

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

@@ -11,9 +11,8 @@ import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper;
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationService;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
-import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
-import com.xunmei.core.retrieval.service.impl.CoreMonitoringRetrievalTaskServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,6 +1,5 @@
 package com.xunmei.core.retrieval.controller;
 
-import com.xunmei.common.core.domain.edu.dto.SysLearningMaterialsPageDto;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -8,8 +7,8 @@ import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
-import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
-import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,8 +35,8 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
 /**
  * 查询监控调阅任务列表
  */
-@ApiOperation(value = "查询CoreMonitoringRetrievalTask列表")
-@GetMapping("/list")
+    @ApiOperation(value = "查询CoreMonitoringRetrievalTask列表")
+    @GetMapping("/list")
     public TableDataInfo list(RetrievalTaskPageDto request) {
 
         return coreMonitoringRetrievalTaskService.selectPage( request);
@@ -106,4 +105,6 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(coreMonitoringRetrievalTaskService.deleteCoreMonitoringRetrievalTaskByIds(ids));
     }
+
+
 }

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

@@ -4,9 +4,9 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
-import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
-import com.xunmei.core.retrieval.vo.CoreMonitoringRetrievalTaskVo;
+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.CoreMonitoringRetrievalTaskVo;
 import org.apache.ibatis.annotations.Param;
 
 /**

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

@@ -1,15 +1,13 @@
 package com.xunmei.core.retrieval.service;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
-import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
-import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
 
 import javax.servlet.http.HttpServletResponse;
 

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

@@ -11,12 +11,14 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
-import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
-import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
 import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
-import com.xunmei.core.retrieval.vo.CoreMonitoringRetrievalTaskVo;
+import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo;
+import com.xunmei.system.api.RemoteDictDataService;
 import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import org.springframework.stereotype.Service;
@@ -43,6 +45,8 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
     @Resource
     private RemoteOrgService orgService;
+    @Resource
+    private RemoteDictDataService dictDataService;
 
     @Override
     public TableDataInfo selectPage(RetrievalTaskPageDto request) {
@@ -73,19 +77,22 @@ 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);
         final TableDataInfo tableDataInfo = this.selectPage(request);
         if (ObjectUtil.isEmpty(tableDataInfo.getRows())) {
             throw new RuntimeException("导出数据为空!");
         }
         List<CoreMonitoringRetrievalTaskVo> list = this.selectPage(request).getRows();
+        list.forEach(r->{
+            r.setStatusText(listDict.stream().filter(d->d.getDictValue().equals(r.getStatus())).findFirst().orElse(new SysDictData()).getDictLabel());
+        });
         list.forEach(r->r.setNo(list.indexOf(r)+1));
         ExcelWriter writer = ExcelUtil.getWriter(true);
         writer.addHeaderAlias("序号", "no");
         writer.addHeaderAlias("任务名称", "taskName");
         writer.addHeaderAlias("开始时间", "planStartTime");
         writer.addHeaderAlias("结束时间", "planEndTime");
-        writer.addHeaderAlias("状态", "");
+        writer.addHeaderAlias("状态", "statusText");
         writer.addHeaderAlias("调阅机构", "orgName");
         writer.addHeaderAlias("调阅角色", "roleName");
         writer.addHeaderAlias("调阅开始时间", "startTime");

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

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper">
 
-    <resultMap type="com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask" id="CoreMonitoringRetrievalTaskResult">
+    <resultMap type="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask" id="CoreMonitoringRetrievalTaskResult">
                 <result property="id" column="id"/>
                 <result property="planId" column="plan_id"/>
                 <result property="taskName" column="task_name"/>
@@ -37,7 +37,7 @@
         from core_monitoring_retrieval_task
     </sql>
 
-    <select id="selectCoreMonitoringRetrievalTaskList" parameterType="com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask"
+    <select id="selectCoreMonitoringRetrievalTaskList" parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask"
             resultMap="CoreMonitoringRetrievalTaskResult">
         <include refid="selectCoreMonitoringRetrievalTaskVo"/>
         <where>
@@ -64,7 +64,7 @@
             <include refid="selectCoreMonitoringRetrievalTaskVo"/>
             where id = #{id}
     </select>
-    <select id="selectPageList" resultType="com.xunmei.core.retrieval.vo.CoreMonitoringRetrievalTaskVo">
+    <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
         where 1=1
         <if test="request.orgId != null ">
@@ -92,7 +92,7 @@
         order by a.ymd_date desc
     </select>
 
-    <insert id="insertCoreMonitoringRetrievalTask" parameterType="com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask">
+    <insert id="insertCoreMonitoringRetrievalTask" parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
         insert into core_monitoring_retrieval_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
                     <if test="id != null">id,
@@ -200,7 +200,7 @@
         </trim>
     </insert>
 
-    <update id="updateCoreMonitoringRetrievalTask" parameterType="com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask">
+    <update id="updateCoreMonitoringRetrievalTask" parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
         update core_monitoring_retrieval_task
         <trim prefix="SET" suffixOverrides=",">
                     <if test="planId != null">plan_id =