代码合并

RMS/target/classes/application-dev.yml

@@ -1,8 +1,26 @@
 spring:
+  #    # 使用 smtp 协议
+  #  mail.protocol: smtps
+  #  mail.host: smtp.exmail.qq.com
+  #  mail.port: 465
+  #  mail.username: shenyongyi@china-wispro.com
+  #    # 授权码
+  #  mail.password: c3hY5cgAexhhr9HL
+  #  mail.test-connection: false
+  #  mail.properties.mail.smtp.auth: true
+  #  mail.properties.mail.debug: false
+  #  mail.properties.mail.mime.splitlongparameters: false
+  #  mail.default-encoding: UTF-8
+  # rabbitmq
+  rabbitmq:
+    host: 192.168.1.24
+    port: 5672
+    username: admin
+    password: 123456
   redis:
-    host: 47.101.137.223
+    host: 192.168.1.24
     port: 6379
-    database: 9
+    database: 3
     password: Xx0GWxdWQJxx6Swe
     lettuce:
       pool:
@@ -12,23 +30,23 @@ 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://192.168.1.24:3306/RMS_TEST?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
+    password: rrzTwWAYX8Gxh5JH
     dynamic:
       primary: rms
       datasource:
         pas:
-          url: jdbc:mysql://47.101.137.223:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          url: jdbc:mysql://192.168.1.24:3306/pas?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
+          password: rrzTwWAYX8Gxh5JH
         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://192.168.1.24:3306/RMS_TEST?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
+          password: rrzTwWAYX8Gxh5JH
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       stat-view-servlet:
@@ -36,7 +54,12 @@ spring:
         login-password: 123456
       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
+queueName: emailProd.queue
+RMSFile:  http://192.168.1.24:8011
+PASFile: http://192.168.1.24:8011
+PCSUrl: http://localhost:8871
+PASUrl: http://localhost:8877
+PCS: http://192.168.1.24:81
+RMSUrl: http://139.224.24.90:82
+#PAS: http://192.168.1.24:80
+PAS: http://192.168.1.9:8086

RMS/target/classes/application-prod.yml

@@ -1,28 +0,0 @@
-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
-  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
-    username: root
-    password: TU5x6IeBi7rl
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      stat-view-servlet:
-        login-username: admin
-        login-password: Cslg2022+
-      web-stat-filter:
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-springdoc:
-  api-docs:
-    enabled: false

RMS/target/classes/application-test.yml

@@ -1,40 +0,0 @@
-spring:
-  redis:
-    host: 47.101.137.223
-    port: 6379
-    database: 9
-    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/RMS_TEST?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
-    dynamic:
-      primary: rms
-      datasource:
-        pas:
-          url: jdbc:mysql://47.101.137.223:3306/pas?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
-        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
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          username: root
-          password: TU5x6IeBi7rl
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      stat-view-servlet:
-        login-username: admin
-        login-password: 123456
-      web-stat-filter:
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-queueName: mailTest.queue
-fileURL:  http://139.224.24.90:8082

RMS/target/classes/application.yml

@@ -1,35 +1,19 @@
 server:
   servlet:
     context-path: /
-  port: 8885
+  port: 8872
 sa-token:
   activity-timeout: 18000
   token-name: token
   token-style: tik
-  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
+  #是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
   is-concurrent: true
   timeout: 604800
 spring:
   thymeleaf:
     cache: false
     mode: HTML5
-    #    # 使用 smtp 协议
-    #  mail.protocol: smtps
-    #  mail.host: smtp.exmail.qq.com
-    #  mail.port: 465
-    #  mail.username: shenyongyi@china-wispro.com
-    #    # 授权码
-    #  mail.password: c3hY5cgAexhhr9HL
-    #  mail.test-connection: false
-    #  mail.properties.mail.smtp.auth: true
-    #  mail.properties.mail.debug: false
-    #  mail.properties.mail.mime.splitlongparameters: false
-    #  mail.default-encoding: UTF-8
-    # rabbitmq
-  rabbitmq.host: 47.101.137.223
-  rabbitmq.port: 5672
-  rabbitmq.username: admin
-  rabbitmq.password: 123456
+
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher

RMS/target/classes/mapper/AvoidDesignLittleDirectionMapper.xml

@@ -29,6 +29,31 @@
         where ID = #{reportId}
     </select>
 
+    <!--根据报告id关联特征表查询特征和回避设计方向数据-->
+    <!--List<AvoidFeaturesVO> selectWholeByReportId(Integer reportId);-->
+    <select id="selectWholeByReportId" resultMap="AllResultMap">
+        select f.ID,
+               SIGN_PATENT_NO,
+               CONTENT_OUT,
+               RIGHT_ID,
+               PARTNER_ID,
+               IS_FINAL,
+               f.REPORT_ID,
+               CONTENT,
+               EXPLAIN_TEXT,
+               SPLIT_BY,
+               RIGHT_NAME,
+               RIGHT_TYPE,
+               FEATURES_ORDER,
+               SPLIT_TYPE,
+               TASK_ID,
+               LITTLE_DIRECTION
+        from FEATURES f
+                 left join AVOIDDESIGN_LITTLE_DIRECTION l on f.ID = l.FEATURE_ID
+        where f.REPORT_ID = #{reportId}
+        order by f.ID
+    </select>
+
     <!--根据权要id和报告id关联查询特征和回避设计方向数据-->
     <!--List<AvoidFeaturesVO> selectWholeByRightIdAndReportId(Integer rightId, Integer reportId);-->
     <select id="selectWholeByRightIdAndReportId" resultMap="AllResultMap">

RMS/target/classes/mapper/ReportFieldMapper.xml

@@ -102,7 +102,7 @@
     <select id="getFieldPatentNos" parameterType="java.util.List" resultType="java.lang.String">
 
         select distinct c.PATENT_NO from COMPARE_FILES c <where>
-        <foreach collection="params" item="item" separator=" and ">
+        <foreach collection="params" item="item" separator=" or ">
             c.PATENT_NO in (
             select distinct a.PATENT_NO from COMPARE_FILES a left join  OS_PATENT_FIELD_PATENT_LINK b on a.PATENT_NO =b.PATENT_NO
             and b.CID=#{item.field}