标注库功能的代码

PAS/src/main/java/cn/cslg/pas/service/ProjectExportService.java

@@ -28,17 +28,18 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
-* @author Administrator
-* @description 针对表【os_thematic_export(专题库数据导出记录)】的数据库操作Service
-* @createDate 2022-04-24 08:06:14
-*/
+ * @author Administrator
+ * @description 针对表【os_thematic_export(专题库数据导出记录)】的数据库操作Service
+ * @createDate 2022-04-24 08:06:14
+ */
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class ProjectExportService extends ServiceImpl<ProjectExportMapper, ProjectExport> {
 
     private final FileUtils fileUtils;
     private final LoginUtils loginUtils;
-    private  final  RequestService requestService;
+    private final RequestService requestService;
+
     public IPage<ProjectExport> getPageList(ProjectExportVO params) throws IOException {
         LambdaQueryWrapper<ProjectExport> queryWrapper = new LambdaQueryWrapper<>();
         if (params.getProjectId() != null) {
@@ -46,16 +47,16 @@ public class ProjectExportService extends ServiceImpl<ProjectExportMapper, Proje
         }
         queryWrapper.orderByDesc(ProjectExport::getCreateTime);
         IPage<ProjectExport> pageList = this.page(new Page<>(params.getCurrent(), params.getSize()), queryWrapper);
-       List<Integer> personIds = pageList.getRecords().stream().map(ProjectExport::getCreateBy).collect(Collectors.toList());
-        List<ProjectVO.Personnel> personnelList =new ArrayList<>();
-       if(personIds.size()!=0){
-           String jsonObject1 = requestService.getPersonnelFromPCS(personIds);
-           JSONArray jsonArray = JSON.parseArray(jsonObject1);
-           personnelList = jsonArray.toJavaList(ProjectVO.Personnel.class);
-       }
-            for(ProjectExport data: pageList.getRecords()) {
-                data.setCreateName(personnelList.stream().filter(item -> item.getId().equals(data.getCreateBy())).findFirst().orElse(new ProjectVO.Personnel()).getPersonnelName());
-            }
+        List<Integer> personIds = pageList.getRecords().stream().map(ProjectExport::getCreateBy).collect(Collectors.toList());
+        List<ProjectVO.Personnel> personnelList = new ArrayList<>();
+        if (personIds.size() != 0) {
+            String jsonObject1 = requestService.getPersonnelFromPCS(personIds);
+            JSONArray jsonArray = JSON.parseArray(jsonObject1);
+            personnelList = jsonArray.toJavaList(ProjectVO.Personnel.class);
+        }
+        for (ProjectExport data : pageList.getRecords()) {
+            data.setCreateName(personnelList.stream().filter(item -> item.getId().equals(data.getCreateBy())).findFirst().orElse(new ProjectVO.Personnel()).getPersonnelName());
+        }
         return pageList;
     }
 

PAS/src/main/java/cn/cslg/pas/service/TaskService.java

@@ -300,7 +300,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
             queryTaskDTO.setOrderBy("create_time");
         }
         //若要分页
-        if (queryTaskDTO.getCurrent() != null) {
+        if (queryTaskDTO.getCurrent() != null && queryTaskDTO.getSize() != null) {
             PageHelper.startPage(queryTaskDTO.getCurrent(), queryTaskDTO.getSize());
         }
         List<QueryTaskVO> tasks = taskMapper.queryTasks(queryTaskDTO);
@@ -348,29 +348,53 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
             }
 
             for (QueryTaskVO task : tasks) {
-                String taskName = "";
-                if (task.getType().equals(5)) {  //若是专利号导入任务
-                    if (task.getProjectName() != null) {
-                        taskName = "专利号导入到专题库【" + task.getProjectName() + "】中 - " + task.getCreateName();
-                    } else if (task.getReportName() != null) {
-                        taskName = "专利号导入到报告【" + task.getReportName() + "】中 - " + task.getCreateName();
-                    }
-                    task.setTaskName(taskName);
-                } else if (task.getType().equals(3) || task.getType().equals(4)) {  //若是检索式导入（欧专局或专利之星）
-                    if (task.getProjectName() != null) {
-                        taskName = "检索式导入到专题库【" + task.getProjectName() + "】中 - " + task.getCreateName();
-                    } else if (task.getReportName() != null) {
-                        taskName = "检索式导入到报告【" + task.getReportName() + "】中 - " + task.getCreateName();
-                    }
-                    task.setTaskName(taskName);
-                } else if (task.getType().equals(2)) {  //若是导出
-                    if (task.getProjectName() != null) {
-                        taskName = "从专题库【" + task.getProjectName() + "】导出 - " + task.getCreateName();
-                    } else if (task.getReportName() != null) {
-                        taskName = "从报告【" + task.getReportName() + "】导出 - " + task.getCreateName();
-                    }
-                    task.setTaskName(taskName);
+                String taskName = "";  //任务名称
+                String type = "";  //导入方式（Excel/专利号/检索式）
+                String to = "";  //导入到哪里（专题库/报告）
+                String toName = "";  //专题库或报告名称
+                if (task.getType().equals(5)) {
+                    type = "专利号";
+                } else if (task.getType().equals(3) || task.getType().equals(4)) {
+                    type = "检索式";
+                } else if (task.getType().equals(1)) {
+                    type = "Excel";
                 }
+                if (task.getProjectName() != null) {
+                    to = "专题库";
+                    toName = task.getProjectName();
+                } else if (task.getReportName() != null) {
+                    to = "报告";
+                    toName = task.getReportName();
+                }
+                if (task.getType().equals(2)) {  //导出任务
+                    taskName = to + "【" + toName + "】导出 - " + task.getCreateName();
+                } else {  //导入任务
+                    taskName = type + "导入到" + to + "【" + toName + "】 - " + task.getCreateName();
+                }
+                task.setTaskName(taskName);
+//                if (task.getType().equals(5)) {  //若是专利号导入任务
+//                    if (task.getProjectName() != null) {  //专题库
+//                        taskName = "专利号导入到专题库【" + task.getProjectName() + "】中 - " + task.getCreateName();
+//                    } else if (task.getReportName() != null) {  //报告
+//                        taskName = "专利号导入到报告【" + task.getReportName() + "】中 - " + task.getCreateName();
+//                    }
+//                    task.setTaskName(taskName);
+//                } else if (task.getType().equals(3) || task.getType().equals(4)) {  //若是检索式导入（欧专局或专利之星）
+//                    if (task.getProjectName() != null) {
+//                        taskName = "检索式导入到专题库【" + task.getProjectName() + "】中 - " + task.getCreateName();
+//                    } else if (task.getReportName() != null) {
+//                        taskName = "检索式导入到报告【" + task.getReportName() + "】中 - " + task.getCreateName();
+//                    }
+//                    task.setTaskName(taskName);
+//                } else if (task.getType().equals(2)) {  //若是导出
+//                    if (task.getProjectName() != null) {
+//                        taskName = "专题库【" + task.getProjectName() + "】导出 - " + task.getCreateName();
+//                    } else if (task.getReportName() != null) {
+//                        taskName = "报告【" + task.getReportName() + "】导出 - " + task.getCreateName();
+//                    }
+//                    task.setTaskName(taskName);
+//                }
+
             }
         }