2/8

RMS/RMS.iml

@@ -31,6 +31,8 @@
     <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" />
@@ -49,6 +51,8 @@
     <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" />
@@ -164,6 +168,7 @@
     <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" />
@@ -196,35 +201,5 @@
     <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/service/BaseService.java

@@ -1,6 +1,7 @@
 package cn.cslg.report.service;
 
 import cn.cslg.report.common.core.base.Constants;
+import cn.cslg.report.common.core.exception.PermissionException;
 import cn.cslg.report.common.model.dto.TaskWebSocketDTO;
 import cn.cslg.report.common.model.dto.UploadFileDTO;
 import cn.cslg.report.common.model.vo.LoginVO;
@@ -313,6 +314,13 @@ public class BaseService {
                     taskParams.setIndex((int) rowIndex);
                     try {
                     String res =     outInterfaceService.importPatents(taskParams);
+                    JSONObject jsonObject =JSONObject.parseObject(res);
+                    if(jsonObject.get("code").toString().equals("0")){
+                        importTask.setState(3);
+                        importTask.updateById();
+                        WebSocketServer.sendInfo(Response.error("部分数据上传成功" + "\n" + "成功条数:" + i + "失败条数:" + (total-i)),taskParams.getUserId());
+                        throw new PermissionException("上传失败");
+                    }
                         if((int) rowIndex==taskParams.getTotal())
                         {
                             importTask.setState(1);
@@ -322,6 +330,7 @@ public class BaseService {
                             importTask.setFinishTime(formatter.parse(formatter.format(date)));
                             importTask.updateById();
                         }
+
                         //通过WebSocket 在每一次循环结束后 向前端发送完成进度
                         WebSocketServer.sendInfo(Response.websocket(new TaskWebSocketDTO()
                                 .setTaskId(taskParams.getTaskId())
@@ -337,6 +346,8 @@ public class BaseService {
                         importTask.setState(3);
                         importTask.updateById();
                         e.printStackTrace();
+                        WebSocketServer.sendInfo(Response.error("部分数据上传成功" + "\n" + "成功条数:" + i + "失败条数:" + (total-i)),taskParams.getUserId());
+                        return;
                     }
                 }
                 }

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

@@ -40,9 +40,6 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         if (importTask.getReportId() != null) {
             queryWrapper.eq(ImportTask::getReportId, importTask.getReportId());
         }
-        if (importTask.getState() != null) {
-            queryWrapper.eq(ImportTask::getState, importTask.getState());
-        }
         queryWrapper.orderByDesc(ImportTask::getCreateDate);
         if (importTask.getCurrent() != null && importTask.getSize() != null) {
             IPage<ImportTask> importTaskIPage = this.page(new Page<>(importTask.getCurrent(), importTask.getSize()), queryWrapper);

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

@@ -64,10 +64,10 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
     private final ReportFieldPatentLinkService reportFieldPatentLinkService;
     private final CompareMessageService compareMessageService;
     private final CompareFilesService compareFilesService;
-    @Value("${fileURL}")
-    private String fileURL;
+    @Value("${RMSFile}")
+    private String rmsFile;
     @Value("${PASFile}")
-    private String url;
+    private String pasFile;
     public String reportDocument(ReportDocument reportDocument) {
 
         return Response.success();
@@ -267,7 +267,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
             patentListMap.put("abstractStr", item.get("abstractStr"));
             patentListMap.put("compareFileName", "对比文件" + (order ));
             patentListMap.put("applicationDate", item.get("applicationDate"));
-            patentListMap.put("abstractPath", fileURL + item.get("abstractPath"));
+            patentListMap.put("abstractPath", pasFile + item.get("abstractPath"));
             patentListMap.put("disclosures", disclosures);
             patentListMap.put("order",order);
             patentListMaps.add(patentListMap);
@@ -745,7 +745,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
         //专利权人
         patentMap.put("rightPerson", rightPerson);
         //图示
-        patentMap.put("abstractPath", url + patent.get("abstractPath"));
+        patentMap.put("abstractPath", pasFile + patent.get("abstractPath"));
         patentMap.put("name", patent.get("name"));
         //查询专利权要
         String resBody2 = outInterfaceService.getPatentRightFromPAS(patentNo);

RMS/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ spring:
         max-wait: -1ms
     timeout: 2000ms
   datasource:
-    url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.101.137.223:3306/RMS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: TU5x6IeBi7rl
@@ -25,7 +25,7 @@ spring:
           username: root
           password: TU5x6IeBi7rl
         rms:
-          url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          url: jdbc:mysql://47.101.137.223:3306/RMS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
           driver-class-name: com.mysql.cj.jdbc.Driver
           username: root
           password: TU5x6IeBi7rl
@@ -37,6 +37,9 @@ spring:
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
 queueName: mail.queue
-fileURL:  http://139.224.24.90:8082
-PCSUrl:  http://localhost:8880
-PASUrl:  http://localhost:8879
+RMSFile:  http://139.224.24.90:8011
+PASFile: http://139.224.24.90:8011
+PCSUrl: http://localhost:8871
+PASUrl: http://localhost:8877
+PCS: http://139.224.24.90:81
+PAS: http://139.224.24.90:80

RMS/src/main/resources/application-prod2.0.yml

@@ -1,6 +1,6 @@
 spring:
   redis:
-    host: 47.101.137.223
+    host: 172.27.247.174
     port: 6379
     database: 3
     password: Xx0GWxdWQJxx6Swe
@@ -12,7 +12,7 @@ spring:
         max-wait: -1ms
     timeout: 2000ms
   datasource:
-    url: jdbc:mysql://47.101.137.223:3306/RMS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://172.27.247.174:3306/RMS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: TU5x6IeBi7rl
@@ -40,9 +40,9 @@ springdoc:
   api-docs:
     enabled: false
 queueName: emailProd.queue
-fileURL:  http://139.224.24.90:8011
+RMSFile:  http://139.224.24.90:8084
 PASFile: http://139.224.24.90:8011
 PCSUrl: http://localhost:8871
 PASUrl: http://localhost:8877
 PCS: http://139.224.24.90:81
-PAS: http://139.224.24.90:83
+PAS: http://139.224.24.90:80

RMS/src/main/resources/application.yml

@@ -43,7 +43,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: prod2.0
+    active: dev
   jackson:
     default-property-inclusion: non_null
     serialization: