2/6 lrj

RMS/RMS.iml

@@ -31,8 +31,6 @@
     <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-webmvc-core:1.6.6" level="project" />
     <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.6.6" level="project" />
     <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.1.12" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1" level="project" />
     <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.12" level="project" />
     <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.12" level="project" />
@@ -51,8 +49,6 @@
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.1" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.16" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.16" level="project" />
@@ -168,7 +164,6 @@
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.13.2" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.6.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: com.sun.mail:jakarta.mail:1.6.7" level="project" />
@@ -201,5 +196,35 @@
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.13.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.6.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.4" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:9.1" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.objenesis:objenesis:3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
   </component>
 </module>

RMS/src/main/java/cn/cslg/report/common/model/dto/CompareOrderDTO.java

@@ -0,0 +1,18 @@
+package cn.cslg.report.common.model.dto;
+
+import cn.cslg.report.common.utils.CacheUtils;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CompareOrderDTO {
+    private Integer report;
+    private List<orders> orders;
+    @Data
+    public static class orders{
+        private String patentNO;
+        private Integer order;
+    }
+
+}

RMS/src/main/java/cn/cslg/report/common/model/vo/SyneryVO.java

@@ -79,7 +79,7 @@ public class SyneryVO extends BaseVO {
     @Schema(description = "对比结果")
     private Integer compareResult;
     @Schema(description = "专利号")
-    private String patentNo;
+    private List<String> patentNos;
 
     /**
      * 备注

RMS/src/main/java/cn/cslg/report/common/model/vo/queryVo/QueryCMVO.java

@@ -24,4 +24,7 @@ public class QueryCMVO extends BaseVO {
     private Integer compareResult;
     @Schema(description = "专利号")
     private String patentNo;
+    @Schema(description = "标题")
+    private String title;
+
 }

RMS/src/main/java/cn/cslg/report/mapper/CompareMessageMapper.java

@@ -15,6 +15,6 @@ import java.util.List;
 @Mapper
 public interface CompareMessageMapper extends BaseMapper<CompareMessage> {
     List<CompareMessageVO> getCompareMessage(@Param("taskId") Integer taskId,@Param("patentNo") String patentNo);
-   IPage<String> getComparedMessage(Page<String> page,@Param("params") QueryCMVO queryCMVO);
+   List<String> getComparedMessage(@Param("params") QueryCMVO queryCMVO);
     List<String> getComparedMessageAll(@Param("params") QueryCMVO queryCMVO);
 }

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

@@ -199,13 +199,11 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
         map.put("splitType", map1.get("splitType"));
         return map;
     }
-
-
     public IPage<JSONObject> queryComparedMessage(QueryCMVO queryCMVO) throws IOException {
-        IPage<String> patentNos = this.baseMapper.getComparedMessage(new Page<>(queryCMVO.getCurrent(), queryCMVO.getSize()), queryCMVO);
+        List<String> patentNos = this.baseMapper.getComparedMessage(queryCMVO);
 
         IPage<JSONObject> ipage = new Page<JSONObject>();
-        if (patentNos.getRecords().size() == 0) {
+        if (patentNos.size() == 0) {
             ipage.setRecords(new ArrayList<>());
             ipage.setSize(0);
             ipage.setCurrent(queryCMVO.getCurrent());
@@ -216,15 +214,17 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
         PatentVO patentVO = new PatentVO();
         patentVO.setSize(100);
         patentVO.setCurrent(1);
-        patentVO.setPatentNos(patentNos.getRecords());
+        patentVO.setPatentNos(patentNos);
+        patentVO.setPatentNo(queryCMVO.getPatentNo());
+        patentVO.setPatentName(queryCMVO.getTitle());
         String res = outInterfaceService.getPatentFromPAS(patentVO, 1);
         JSONObject jsonObject = JSONObject.parseObject(res);
         JSONObject resData = JSONObject.parseObject(jsonObject.getString("data"));
         List<JSONObject> list = JSONArray.parseArray(resData.getString("records"), JSONObject.class);
         ipage.setRecords(list);
-        ipage.setTotal(patentNos.getTotal());
-        ipage.setSize(patentNos.getSize());
-        ipage.setCurrent(patentNos.getTotal());
+        ipage.setTotal(Integer.parseInt(resData.getString("total")));
+        ipage.setSize(Integer.parseInt(resData.getString("size")));
+        ipage.setCurrent(Integer.parseInt(resData.getString("current")));
         return ipage;
     }
 

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

@@ -630,6 +630,15 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
 //        PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(Task::getReportId, taskVO.getReportId());
+        if(taskVO.getTaskName()!=null){
+            lambdaQueryWrapper.eq(Task::getTaskName,taskVO.getTaskName());
+        }
+        if(taskVO.getTaskStatus()!=null){
+            lambdaQueryWrapper.eq(Task::getTaskStatus,taskVO.getTaskStatus());
+        }
+        if(taskVO.getTaskStatus()!=null){
+            lambdaQueryWrapper.eq(Task::getTaskStatus,taskVO.getTaskStatus());
+        }
         List<Task> records = this.page(new Page<>(taskVO.getCurrent(), taskVO.getSize()), lambdaQueryWrapper).getRecords();
         for (Task task : records) {
             Integer createID = task.getCreateID();
@@ -755,8 +764,8 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         queryCMVO.setCompareResult(syneryVO.getCompareResult());
         List<String> patentNos = new ArrayList<>();
         //无查询条件,单个专利
-        if (syneryVO.getPatentNo() != null) {
-            patentNos = Arrays.asList(syneryVO.getPatentNo());
+        if (syneryVO.getPatentNos() != null) {
+            patentNos =syneryVO.getPatentNos();
         }
         //无查询条件并且是对比过的专利
         else if ((patentVO == null || patentVO.getFiledOptions() == null || patentVO.getFiledOptions().size() == 0) && syneryVO.getIsAll() == 0) {

RMS/src/main/resources/mapper/CompareMessageMapper.xml

@@ -7,13 +7,15 @@
     </select>
 
     <select id="getComparedMessage" resultType="java.lang.String">
-        select DISTINCT f.SIGN_PATENT_NO from RMS_TEST.FEATURES f left join RMS_TEST.COMPARE_MESSAGE cm on f.ID =cm.FEATURE_ID
+        select DISTINCT f.SIGN_PATENT_NO from FEATURES f left join COMPARE_MESSAGE cm on f.ID =cm.FEATURE_ID
         <where>
             and f.REPORT_ID=#{params.reportId}
             and cm.ID is not null
             <if test="params.compareResult !=null">
              and   cm.COMPARE_RESULT=#{params.compareResult}
-
+            </if>
+            <if test="params.compareResult !=null">
+                and   cm.COMPARE_RESULT=#{params.compareResult}
             </if>
         </where>
 
@@ -31,7 +33,5 @@
                 and   cm.COMPARE_RESULT=#{params.compareResult}
             </if>
         </where>
-
-
     </select>
 </mapper>