7/25 被无效历史文件顺序修改

src/main/java/cn/cslg/pas/service/business/InvalidRecordService.java

@@ -388,21 +388,26 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         List<ReportAffair> reportAffairs = reportAffairService.list(queryWrapper);
         if (!reportAffairs.isEmpty()) {
             List<Integer> reportAffairIds = reportAffairs.stream()
-                    .sorted(Comparator.comparing(ReportAffair::getOccurredTime).reversed())
-                    .map(ReportAffair::getId).collect(Collectors.toList());
+                    .sorted(Comparator.comparing(ReportAffair::getOccurredTime, Comparator.nullsLast(Comparator.reverseOrder())))
+                    .map(ReportAffair::getId)
+                    .collect(Collectors.toList());
+
+            Map<Integer, Date> reportAffairTimeMap = reportAffairs.stream()
+                    .collect(Collectors.toMap(ReportAffair::getId, ReportAffair::getOccurredTime));
+
             LambdaQueryWrapper<AssoReportAffairFile> queryWrapper1 = new LambdaQueryWrapper<>();
             queryWrapper1.in(AssoReportAffairFile::getReportAffairId, reportAffairIds);
             List<AssoReportAffairFile> assoReportAffairFiles = assoReportAffairFileService.list(queryWrapper1);
+
             if (!assoReportAffairFiles.isEmpty()) {
-                fileGuids = assoReportAffairFiles.stream()
-                        .sorted(Comparator.comparing(file -> {
-                            for (ReportAffair reportAffair : reportAffairs) {
-                                if (reportAffair.getId() == file.getReportAffairId()) {
-                                    return reportAffair.getOccurredTime();
-                                }
-                            }
-                            return null;
-                        }))
+
+                List<AssoReportAffairFile> filteredFiles = assoReportAffairFiles.stream()
+                        .filter(assoFile -> reportAffairIds.contains(assoFile.getReportAffairId()))
+                        .collect(Collectors.toList());
+
+                fileGuids = filteredFiles.stream()
+                        .sorted(Comparator.comparing(file -> reportAffairTimeMap.getOrDefault(file.getReportAffairId(), null),
+                                Comparator.nullsLast(Comparator.naturalOrder())))
                         .map(AssoReportAffairFile::getFileGuid)
                         .collect(Collectors.toList());
             }

target/classes/application-dev.yml

@@ -1,18 +1,24 @@
 spring:
-  redis:
-    host: 192.168.1.24
-    port: 6379
-    database: 3
-    password: Xx0GWxdWQJxx6Swe
-    lettuce:
-      pool:
-        max-active: 20
-        max-idle: 20
-        min-idle: 0
-        max-wait: -1ms
-    timeout: 2000ms
+  rabbitmq:
+    host: 192.168.2.24
+    port: 5672
+    username: admin
+    password: 123456
+  data:
+   redis:
+     host: 192.168.2.24
+     port: 6379
+     database: 3
+     password: Xx0GWxdWQJxx6Swe
+     lettuce:
+       pool:
+         max-active: 20
+         max-idle: 20
+         min-idle: 0
+         max-wait: -1ms
+     timeout: 2000ms
   datasource:
-    url: jdbc:mysql://192.168.1.24:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.2.24:3306/pas_prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
     password: rrzTwWAYX8Gxh5JH
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -45,7 +51,7 @@ spring:
             threadsInheritContextClassLoaderOfInitializingThread: true
           dataSource:
             default:
-              URL: jdbc:mysql://192.168.1.24:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+              URL: jdbc:mysql://192.168.2.24:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
               user: root
               password: rrzTwWAYX8Gxh5JH
               driver: com.mysql.jdbc.Driver
@@ -57,9 +63,12 @@ spring:
       initialize-schema: always
 authorUrl: http://localhost:8871
 PCSUrl: http://localhost:8871
-#OPSUrl: http://192.168.1.24:5001
+#OPSUrl: http://192.168.2.24:5001
 OPSUrl: http://139.224.24.90:5001
-PASUrl: http://localhost:8877
-RMSUrl: http://localhost:8872
-FMSUrl: http://localhost:8801
-FileSource: 1
+PASUrl: http://localhost:8879
+FMSUrl: http://localhost:8803
+FileSource: 1
+ES:
+  patentVector: patent_vector
+  patent: wxpatent
+  config: 192.168.2.24

target/classes/application-prodNetIn.yml

@@ -1,6 +1,5 @@
 spring:
   redis:
-    host: 172.27.247.174
     port: 6379
     database: 3
     password: Xx0GWxdWQJxx6Swe
@@ -23,6 +22,9 @@ spring:
         login-password: Cslg2022+
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+  data:
+    redis:
+      host: 172.27.247.174
 authorUrl: http://localhost:8871
 
 PCSUrl: http://localhost:8871
@@ -32,3 +34,7 @@ PASUrl: http://localhost:8877
 RMSUrl: http://localhost:8872
 FMSUrl: http://localhost:8801
 FileSource: 3
+ES:
+  patentVector: patent_vector
+  patent: wxpatent
+  config: es-cn-em93o8856000ho9e7.elasticsearch.aliyuncs.com

target/classes/application-prodNetOut.yml

@@ -1,18 +1,19 @@
 spring:
-  redis:
-    host: 47.101.137.223
-    port: 6379
-    database: 3
-    password: Xx0GWxdWQJxx6Swe
-    lettuce:
-      pool:
-        max-active: 20
-        max-idle: 20
-        min-idle: 0
-        max-wait: -1ms
-    timeout: 2000ms
+  data:
+    redis:
+      host: 47.101.137.223
+      port: 6379
+      database: 3
+      password: Xx0GWxdWQJxx6Swe
+      lettuce:
+        pool:
+          max-active: 20
+          max-idle: 20
+          min-idle: 0
+          max-wait: -1ms
+      timeout: 2000ms
   datasource:
-    url: jdbc:mysql://47.101.137.223:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.101.137.223:3306/pas_prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
     password: TU5x6IeBi7rl
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -31,4 +32,7 @@ OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8877
 RMSUrl: http://localhost:8872
 FMSUrl: http://localhost:8801
-FileSource: 3
+FileSource: 3
+ES:
+  patent: patent
+  config: es-cn-em93o8856000ho9e7.public.elasticsearch.aliyuncs.com

target/classes/application-testNetIn.yml

@@ -1,18 +1,24 @@
 spring:
-  redis:
+  rabbitmq:
     host: 172.27.247.174
-    port: 6379
-    database: 3
-    password: Xx0GWxdWQJxx6Swe
-    lettuce:
-      pool:
-        max-active: 20
-        max-idle: 20
-        min-idle: 0
-        max-wait: -1ms
-    timeout: 2000ms
+    port: 5672
+    username: admin
+    password: 123456
+  data:
+    redis:
+      host: 172.27.247.174
+      port: 6379
+      database: 3
+      password: Xx0GWxdWQJxx6Swe
+      lettuce:
+        pool:
+          max-active: 20
+          max-idle: 20
+          min-idle: 0
+          max-wait: -1ms
+      timeout: 2000ms
   datasource:
-    url: jdbc:mysql://172.27.247.174:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://172.27.247.174:3306/pas_prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
     password: TU5x6IeBi7rl
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -20,7 +26,49 @@ spring:
     druid:
       stat-view-servlet:
         login-username: admin
-        login-password: 123456
+        login-password: Cslg2022+
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-authorUrl: http://localhost:8880
+  quartz:
+    #相关属性配置
+    properties:
+      org:
+        quartz:
+          scheduler:
+            instanceName: DefaultQuartzScheduler
+            instanceId: AUTO
+          jobStore:
+            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
+            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+            tablePrefix: QRTZ_
+            isClustered: false
+            clusterCheckinInterval: 10000
+            useProperties: false
+          threadPool:
+            class: org.quartz.simpl.SimpleThreadPool
+            threadCount: 10
+            threadPriority: 5
+            threadsInheritContextClassLoaderOfInitializingThread: true
+          dataSource:
+            default:
+              URL: jdbc:mysql://172.27.247.174:3306/pas_prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+              user: root
+              password: TU5x6IeBi7rl
+              driver: com.mysql.jdbc.Driver
+
+    #数据库方式
+    job-store-type: jdbc
+    #初始化表结构
+    jdbc:
+      initialize-schema: always
+authorUrl: http://localhost:8880
+PCSUrl: http://localhost:8880
+#OPSUrl: http://192.168.1.24:5001
+OPSUrl: http://139.224.24.90:5001
+PASUrl: http://localhost:8880
+FMSUrl: http://localhost:8803
+FileSource: 6
+ES:
+  patentVector: patent_vector
+  patent: wxpatent
+  config: es-cn-em93o8856000ho9e7.elasticsearch.aliyuncs.com

target/classes/application.yml

@@ -1,7 +1,7 @@
 server:
   servlet:
     context-path: /
-  port: 8877
+  port: 8879
 #  sa-token:
 #  activity-timeout: 18000
 #  token-name: token
@@ -20,7 +20,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: prodNetOut
+    active: dev
   jackson:
     default-property-inclusion: non_null
     serialization:
@@ -28,7 +28,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: Asia/Shanghai
 logging:
-  config: classpath:config/logback-spring.xml
+#  config: classpath:config/logback-spring.xml
   level:
     cn.cslg.pas.mapper: debug
 #mybatis
@@ -39,9 +39,10 @@ mybatis-plus:
       id-type: AUTO
       logic-delete-value: 0
       logic-not-delete-value: 1
+      update-strategy: ignored
   configuration:
     #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     map-underscore-to-camel-case: true
     cache-enabled: false
   mapper-locations: classpath:mapper/*.xml
-
+queueName: emailProd.queue