获取对比文件接口修改 2023/2/22

.idea/workspace.xml

@@ -5,31 +5,44 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e7cd156b-23fc-410f-9ecc-be34a2e87174" name="Default Changelist" comment="12chenyi">
-      <change afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/config/WebMvcConfig.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/config/WebSocketConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/config/WebSocketConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/PatentVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/PatentVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/CompareController.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/CompareController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/PASPatentVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/PASPatentVO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/BaseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/BaseController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/TaskService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/resources/mapper/AssoTaskPersonelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/resources/mapper/AssoTaskPersonelMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/WebSocketConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/WebSocketConfig.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PatentVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PatentVO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/AvoidDesignDirectionController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/AvoidDesignDirectionController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/CompareMessageMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/mapper/CompareMessageMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/IAvoidDesignDirectionService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/IAvoidDesignDirectionService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/application-prod.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/application-test.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/application-test.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/InnerInterceptor/LizzMybatisIntercepts.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/config/InnerInterceptor/LizzMybatisIntercepts.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO$Field.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO$Field.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO$Sort.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO$Sort.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO$Tree.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO$Tree.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/PASPatentVO.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/ProductDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/dto/ProductDTO.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO$DP.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO$DP.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO$PerRole.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO$PerRole.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/PersonnelVO.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/BaseController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/BaseController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ProductController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ProductController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/AssoProductFile.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/AssoProductFile.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Report.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/Report.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/BaseService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/BaseService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareFilesService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareFilesService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareMessageService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareMessageService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareScenariosService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareScenariosService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/FeatureService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/FeatureService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ImportTaskService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ImportTaskService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportDocumentService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportDocumentService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/TaskService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/TaskService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/AvoidDesignDirectionServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/AvoidDesignDirectionServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/mapper/AssoTaskPersonelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/mapper/AssoTaskPersonelMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/mapper/CompareMessageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/mapper/CompareMessageMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/AssoProductFileServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/AssoProductFileServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/ProductServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/impl/ProductServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/test-classes/cn/cslg/report/mapper/AssoAvoidDesignWholeLittleDirectionMapperTests.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/test-classes/cn/cslg/report/mapper/AvoidDesignLittleDirectionMapperTests.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/test-classes/cn/cslg/report/mapper/AvoidDesignWholeDirectionMapperTests.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/test-classes/cn/cslg/report/mapper/AvoidFeatureMapperTests.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/rms/rms-debug.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-debug.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/rms/rms-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-error.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/rms/rms-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-info.log" afterDir="false" />
@@ -50,7 +63,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="master" />
+        <entry key="$PROJECT_DIR$" value="prod" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -66,13 +79,13 @@
   <component name="HighlightingSettingsPerFile">
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/AssoTaskPersonelService.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/resources/application.yml" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/RMS/src/main/resources/application-dev.yml" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/BaseController.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/config/InnerInterceptor/LizzMybatisIntercepts.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportService.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/utils/auth/TreeUtils.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/BaseService.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/PersonnelVO.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/RMS/src/main/resources/application-dev.yml" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="ProjectId" id="2JADGkpubIwxnMp31DlLxSpGoB3" />
@@ -96,7 +109,7 @@
     <property name="SONARLINT_PRECOMMIT_ANALYSIS" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/RMS/src/main/resources" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
@@ -109,6 +122,7 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\RMS\RMS\src\main\resources" />
       <recent name="E:\IDEAProject\RMS_Backend\RMS\src\main\java\cn\cslg\report" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
@@ -121,17 +135,6 @@
     </key>
   </component>
   <component name="RunManager">
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="Application" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="RMS" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="cn.cslg.report.Application" />
@@ -160,6 +163,7 @@
       <workItem from="1675647264099" duration="26450000" />
       <workItem from="1675732443639" duration="22610000" />
       <workItem from="1675819315507" duration="11585000" />
+      <workItem from="1677028604553" duration="4531000" />
     </task>
     <task id="LOCAL-00001" summary="12.20 陈宇">
       <created>1671533439152</created>
@@ -245,7 +249,14 @@
       <option name="project" value="LOCAL" />
       <updated>1675672469033</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="修改配置文件">
+      <created>1676962553299</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1676962553299</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -269,7 +280,8 @@
     <MESSAGE value="12chenyi" />
     <MESSAGE value=" 2/6 lrj" />
     <MESSAGE value="2/6 lrj" />
-    <option name="LAST_COMMIT_MESSAGE" value="2/6 lrj" />
+    <MESSAGE value="修改配置文件" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改配置文件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

RMS/src/main/java/cn/cslg/report/common/model/PASPatentVO.java

@@ -92,6 +92,7 @@ public class PASPatentVO extends BaseVO {
     private List<String> patentNos;
     private List<String> notInPatentNos;
     private Integer reportId;
+    private Integer State;
     @Data
     public static class Sort {
         private String order;

RMS/src/main/java/cn/cslg/report/controller/BaseController.java

@@ -11,6 +11,7 @@ import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.Report;
 import cn.cslg.report.service.BaseService;
 import cn.cslg.report.service.OutInterfaceService;
+import cn.cslg.report.service.business.CompareFilesService;
 import cn.cslg.report.service.business.ReportService;
 import cn.cslg.report.service.business.SystemDictItemService;
 import cn.dev33.satoken.stp.StpUtil;
@@ -43,6 +44,8 @@ public class BaseController {
     private final SystemDictItemService systemDictItemService;
     private final OutInterfaceService outInterfaceService;
     private final ReportService reportService;
+    private final CompareFilesService compareFilesService;
+
     @PostMapping("/login")
     @Operation(summary = "登录")
     public String login(@RequestBody LoginVO loginVO) throws IOException {
@@ -185,9 +188,9 @@ public class BaseController {
         return  outInterfaceService.getPatentQueryTree(projectId);
     }
     @PostMapping("/getPatentListPAS")
-    @Operation(summary = "获得自定义字段的选项")
+    @Operation(summary = "根据分析系统筛选获得专利")
     public String getPatentListPAS(@RequestBody PASPatentVO params) throws IOException {
-        return  outInterfaceService.getPatentListFromPAS(params);
+        return  compareFilesService.getCompareFileFromPas(params);
     }
 
 

RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java

@@ -548,8 +548,6 @@ public class OutInterfaceService {
 
     public String getPatentListFromPAS(PASPatentVO params) throws IOException {
         OkHttpClient okHttpClient = new OkHttpClient();
-        Report report =reportService.getById(params.getReportId());
-        params.setProjectId(report.getProjectId());
         LambdaQueryWrapper<ImportTask> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ImportTask::getReportId, params.getReportId());
         String param = new Gson().toJson(params);

RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.java

@@ -1,5 +1,6 @@
 package cn.cslg.report.service.business;
 
+import cn.cslg.report.common.model.PASPatentVO;
 import cn.cslg.report.common.model.dto.CompareOrderDTO;
 import cn.cslg.report.common.model.dto.CustomFieldLabelDTO;
 
@@ -482,4 +483,57 @@ else if(patentVO.getOrderItem()!=null&&patentVO.getOrderItem().equals("SysOrder"
         }
         return orders;
     }
+
+    /**
+     * @param patentVO
+     * @return 标的专利号和数量 map
+     * @throws IOException
+     * @function 根据PatentVO里的条件（分页）模糊查询标的专利号和数量
+     */
+    public String getCompareFileFromPas(PASPatentVO patentVO) throws IOException {
+        LambdaQueryWrapper<CompareFiles> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(CompareFiles::getReportId, patentVO.getReportId());
+        //根据报告id 获取文件对比表的详情
+        List<CompareFiles> compareFiles = this.list(queryWrapper);
+        //获取文件对比表的详情的专利号
+        List<String> patentNos = compareFiles.stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
+        String res;
+        //1 代表已添加
+        if (patentVO.getState() == 1) {
+            patentVO.setPatentNos(patentNos);
+            patentVO.setProjectId(-1);
+            res = outInterfaceService.getPatentListFromPAS(patentVO);
+        } else {
+            //根据标的专利号和报告id找到报告
+            LambdaQueryWrapper<Report> wrapper1 = new LambdaQueryWrapper<>();
+            wrapper1.select(Report::getSignPatentNo);
+            wrapper1.eq(Report::getId, patentVO.getReportId());
+            //获取标的专利号
+            if (reportService.list(wrapper1).size() == 0) {
+                return "";
+            }
+
+            Report report =reportService.getById(patentVO.getReportId());
+            patentVO.setProjectId(report.getProjectId());
+            patentVO.setNotInPatentNos(patentNos);
+            res = outInterfaceService.getPatentListFromPAS(patentVO);
+        }
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        JSONObject resData = JSONObject.parseObject(jsonObject.getString("data"));
+        List<JSONObject> list = JSONArray.parseArray(resData.getString("records"), JSONObject.class);
+        List<String> temNos = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            //查到专利的专利号在标的内拿到
+            if (patentNos.contains(list.get(i).get("patentNo").toString())) {
+                temNos.add(list.get(i).get("patentNo").toString());
+            }
+        }
+        //根据报告id获取对比文件的数量
+        int i = compareFilesMapper.selectedTotal(patentVO.getReportId());
+        Map<String, Object> map = new HashMap<>();
+        map.put("datas", resData);
+        map.put("select", temNos);
+        map.put("selectedTotal", i);
+        return Response.success(map);
+    }
 }

RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java

@@ -693,7 +693,6 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
         String[] ds = date.split("-");
         map.put("sys", new SystemMO(ds[0], ds[1], ds[2], "", "reportName"));
         map.put("patentMap", patentMap);
-        map.put("",patentNo);
         // 为表格的显示绑定行循环
         LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
         HtmlRenderPolicy htmlRenderPolicy = new HtmlRenderPolicy();

logs/rms/rms-debug.log

@@ -26800,3 +26800,108 @@
 [rms:0.0.0.0:8885] [,] 2023-02-08 15:56:41.943 DEBUG 27020 [http-nio-8885-exec-6] cn.cslg.report.mapper.FeatureMapper.selectList ==>  Preparing: SELECT ID,SIGN_PATENT_NO,CONTENT_OUT,CONTENT,RIGHT_ID,PARTNER_ID,IS_FINAL,REPORT_ID,EXPLAIN_TEXT,SPLIT_BY,SPLIT_Type,RIGHT_NAME,RIGHT_TYPE,FEATURES_ORDER,Task_ID FROM FEATURES WHERE (SIGN_PATENT_NO = ? AND REPORT_ID = ? AND PARTNER_ID IN (?,?))
 [rms:0.0.0.0:8885] [,] 2023-02-08 15:56:41.943 DEBUG 27020 [http-nio-8885-exec-6] cn.cslg.report.mapper.FeatureMapper.selectList ==> Parameters: CN106954152B(String), 578(Integer), 114(Integer), 114(Integer)
 [rms:0.0.0.0:8885] [,] 2023-02-08 15:56:42.330 DEBUG 27020 [http-nio-8885-exec-6] cn.cslg.report.mapper.FeatureMapper.selectList <==      Total: 19
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.512 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.546 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: 
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.575 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 20
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.591 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.592 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_STATE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.594 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 6
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.595 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.596 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.598 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 7
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.600 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.600 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: TASK_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.602 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 4
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.604 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.604 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: COMPARE_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:38:48.606 DEBUG 11708 [http-nio-8872-exec-1] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 3
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.362 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.362 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: 
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.365 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 20
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.366 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.367 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_STATE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.369 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 6
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.370 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.370 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.373 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 7
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.374 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.374 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: TASK_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.376 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 4
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.378 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.379 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: COMPARE_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:09.381 DEBUG 11708 [http-nio-8872-exec-4] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 3
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.583 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.584 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: 
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.586 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 20
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.588 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.588 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_STATE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.590 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 6
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.592 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.592 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.594 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 7
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.596 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.597 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: TASK_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.599 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 4
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.600 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.601 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: COMPARE_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:15.603 DEBUG 11708 [http-nio-8872-exec-2] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 3
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.901 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.903 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: 
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.906 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 20
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.909 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.909 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_STATE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.911 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 6
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.913 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.914 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.915 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 7
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.916 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.917 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: TASK_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.919 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 4
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.921 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.922 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: COMPARE_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:12:21.924 DEBUG 11708 [http-nio-8872-exec-3] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 3
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.787 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.788 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: 
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.790 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 20
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.791 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.791 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_STATE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.793 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 6
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.795 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.795 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.797 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 7
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.799 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.799 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: TASK_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.801 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 4
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.802 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.802 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: COMPARE_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:26.804 DEBUG 11708 [http-nio-8872-exec-5] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 3
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.097 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.098 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: 
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.100 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 20
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.101 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.102 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_STATE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.104 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 6
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.105 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.105 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.106 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 7
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.108 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.108 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: TASK_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.110 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 4
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.111 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.111 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: COMPARE_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:13:42.113 DEBUG 11708 [http-nio-8872-exec-6] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 3
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.858 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.858 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: 
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.860 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 20
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.861 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.862 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_STATE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.863 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 6
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.864 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.865 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: REPORT_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.866 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 7
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.867 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.867 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: TASK_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.869 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 4
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.870 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==>  Preparing: SELECT ID,DICT_PARENT_KEY,DICT_CHILD_LABEL,DICT_CHILD_VALUE FROM SYS_DICT_ITEM WHERE (DICT_PARENT_KEY = ?)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.871 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList ==> Parameters: COMPARE_TYPE(String)
+[rms:0.0.0.0:8872] [,] 2023-02-21 16:14:11.873 DEBUG 11708 [http-nio-8872-exec-7] cn.cslg.report.mapper.SystemDictItemMapper.selectList <==      Total: 3

logs/rms/rms-error.log

@@ -22524,3 +22524,39 @@ Caused by: java.net.SocketTimeoutException: Read timed out
 [rms:0.0.0.0:8885] [,] 2023-02-08 15:46:23.623 ERROR 27020 [http-nio-8885-exec-7] cn.cslg.report.common.core.annotation.LoggerAspect 异常代码:java.lang.IndexOutOfBoundsException
异常信息:Index: 0, Size: 0
异常方法:cn.cslg.report.controller.TaskController.look()
请求参数:862;"CN106954152B";null;
 [rms:0.0.0.0:8885] [,] 2023-02-08 15:48:51.567 ERROR 27020 [http-nio-8885-exec-5] cn.cslg.report.common.core.annotation.LoggerAspect 异常代码:java.lang.IndexOutOfBoundsException
异常信息:Index: 0, Size: 0
异常方法:cn.cslg.report.controller.TaskController.look()
请求参数:862;"CN106954152B";null;
 [rms:0.0.0.0:8885] [,] 2023-02-08 15:55:16.286 ERROR 27020 [http-nio-8885-exec-6] cn.cslg.report.common.core.annotation.LoggerAspect 异常代码:java.lang.IndexOutOfBoundsException
异常信息:Index: 0, Size: 0
异常方法:cn.cslg.report.controller.TaskController.look()
请求参数:862;"CN106954152B";null;
+[rms:0.0.0.0:8872] [,] 2023-02-21 15:12:55.559 ERROR 5628 [main] org.springframework.boot.SpringApplication Application run failed
+
+org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'rabbitMQConfig': Injection of autowired dependencies failed; nested exception is java.lang.IllegalArgumentException: Could not resolve placeholder 'queueName' in value "${queueName}"
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:405)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1431)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:619)
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:542)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335)
+	at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:953)
+	at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:918)
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:583)
+	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145)
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:740)
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:415)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1312)
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1301)
+	at cn.cslg.report.Application.main(Application.java:16)
+Caused by: java.lang.IllegalArgumentException: Could not resolve placeholder 'queueName' in value "${queueName}"
+	at org.springframework.util.PropertyPlaceholderHelper.parseStringValue(PropertyPlaceholderHelper.java:180)
+	at org.springframework.util.PropertyPlaceholderHelper.replacePlaceholders(PropertyPlaceholderHelper.java:126)
+	at org.springframework.core.env.AbstractPropertyResolver.doResolvePlaceholders(AbstractPropertyResolver.java:239)
+	at org.springframework.core.env.AbstractPropertyResolver.resolveRequiredPlaceholders(AbstractPropertyResolver.java:210)
+	at org.springframework.context.support.PropertySourcesPlaceholderConfigurer.lambda$processProperties$0(PropertySourcesPlaceholderConfigurer.java:191)
+	at org.springframework.beans.factory.support.AbstractBeanFactory.resolveEmbeddedValue(AbstractBeanFactory.java:936)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1330)
+	at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1309)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:656)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:639)
+	at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119)
+	at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399)
+	... 17 common frames omitted
+