From 12c99c99ed89d1d11318d9b4c6c295d35e21b1e7 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 20 八月 2025 18:30:00 +0800
Subject: [PATCH] 调整船运质检单号
---
src/main/resources/application-pro4.yml | 57 +++++++++++++++++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java | 20 ++++++
src/main/resources/logback-spring.xml | 36 ++++++++++++
src/main/resources/application-pro.yml | 10 +-
src/main/resources/application-pro5317_004.yml | 57 +++++++++++++++++++
5 files changed, 175 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
index 1fc4e5b..91a69dd 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -148,6 +148,12 @@
apiData.setRkjydh("14" + isCheckTime + difDay + api1102List.get(0).getRkywdh().substring(9));
}
}
+
+ //鑸硅繍浣跨敤鍏ュ簱鍗曟嵁鍙峰仛璐ㄦ鍗曞彿
+ if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
+ apiData.setRkjydh(api1102List.get(0).getRkywdh());
+ }
+
apiData.setQyrxm(sysData.getCheckUser());
//鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
apiData.setQyfs("2");
@@ -239,4 +245,18 @@
apiLogRep.save(apiLog);
}
}
+
+ public static void main(String[] args) {
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤锛岃嫢涓嶅尮閰嶏紝鍒欐洿鏀逛笟鍔℃椂闂翠负鍗曟嵁鍙锋墍鍦ㄧ殑鏃堕棿
+ String id = "142508200001";
+ String time = id.substring(2, 8);
+
+ String isCheckTime = "250821";
+ if (!isCheckTime.equals(time)) {
+ int difDay = 2;
+ String idd = "14" + isCheckTime + difDay + id.substring(9);
+ System.out.println(idd);
+ }
+
+ }
}
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index eb88f33..fcd2e16 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 涓婃捣鍢夊畾 -C鐩� pro ##########################
+########################## 骞夸笢娴蜂赴鍘� C-鐩� pro ##########################
server:
port: 8090
jetty:
@@ -9,13 +9,13 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://192.168.200.3:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
password: Abc123..
@@ -39,7 +39,7 @@
# Redis鐩稿叧閰嶇疆
redis:
database: 1
- host: 192.168.200.3
+ host: 127.0.0.1
port: 6379
password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
@@ -51,7 +51,7 @@
timeout: 6000
igds:
default:
- companyId: 5303
+ companyId: 5362
file-path: C:/IGDS-API/FILE/
img-path: C:/IGDS/FILE/
# 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
diff --git a/src/main/resources/application-pro4.yml b/src/main/resources/application-pro4.yml
new file mode 100644
index 0000000..b648ee3
--- /dev/null
+++ b/src/main/resources/application-pro4.yml
@@ -0,0 +1,57 @@
+########################## 娼槼澶╂鼎 ##########################
+server:
+ port: 8099
+ jetty:
+ max-http-post-size: 209715200
+ tomcat:
+ max-http-post-size: 209715200
+spring:
+ datasource:
+ #涓绘暟鎹簮
+ primary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_004?useUnicode=true&characterEncoding=utf-8
+ username: root
+ password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
+ #娆℃暟鎹簮
+ secondary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_master_v40?useUnicode=true&characterEncoding=utf-8
+ username: root
+ password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
+ jpa:
+ #涓籮pa閰嶇疆
+ primary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: update
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ #娆pa閰嶇疆
+ secondary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: none
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 13
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+igds:
+ default:
+ companyId: 5317
+
+ file-path: D:/IGDS-API-4/FILE/
+ img-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/src/main/resources/application-pro5317_004.yml b/src/main/resources/application-pro5317_004.yml
new file mode 100644
index 0000000..b648ee3
--- /dev/null
+++ b/src/main/resources/application-pro5317_004.yml
@@ -0,0 +1,57 @@
+########################## 娼槼澶╂鼎 ##########################
+server:
+ port: 8099
+ jetty:
+ max-http-post-size: 209715200
+ tomcat:
+ max-http-post-size: 209715200
+spring:
+ datasource:
+ #涓绘暟鎹簮
+ primary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_004?useUnicode=true&characterEncoding=utf-8
+ username: root
+ password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
+ #娆℃暟鎹簮
+ secondary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_master_v40?useUnicode=true&characterEncoding=utf-8
+ username: root
+ password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
+ jpa:
+ #涓籮pa閰嶇疆
+ primary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: update
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ #娆pa閰嶇疆
+ secondary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: none
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 13
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+igds:
+ default:
+ companyId: 5317
+
+ file-path: D:/IGDS-API-4/FILE/
+ img-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index d6c7d8d..826d15a 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -10,6 +10,7 @@
<!-- pro鏂囦欢璺緞 -->
<property name="PRO_LOG_HOME" value="C:/app/igds-api/log" />
<property name="PRO2_LOG_HOME" value="C:/app/igds-api2/log" />
+ <property name="PRO4_LOG_HOME" value="C:/app/igds-api4/log" />
<!-- linux鏂囦欢璺緞 -->
<property name="PRO_LINUX_HOME" value="/usr/local/igds-api/log" />
@@ -102,6 +103,41 @@
</root>
</springProfile>
+
+ <!-- 鐢熶骇鐜 -->
+ <springProfile name="pro4">
+ <!-- 姣忓ぉ浜х敓涓�涓枃浠� -->
+ <appender name="PRO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!-- 鏂囦欢璺緞 -->
+ <file>${PRO4_LOG_HOME}/${APP_MODEL}-info.log</file>
+ <!-- 鏃ュ織璁板綍鍣ㄧ殑婊氬姩绛栫暐锛屾寜鏃ユ湡锛屾寜澶у皬璁板綍 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 鏂囦欢鍚嶇О -->
+ <fileNamePattern>${PRO4_LOG_HOME}/${APP_MODEL}-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <!--鏃ュ織鏂囦欢淇濈暀澶╂暟 -->
+ <maxHistory>60</maxHistory>
+ <!-- 鏃ュ織澶у皬 -->
+ <timeBasedFileNamingAndTriggeringPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>100MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+ <charset>UTF-8</charset>
+ </encoder>
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <pattern>${PATTERN}</pattern>
+ </layout>
+ </appender>
+
+ <logger name="org.hibernate.tool" level="WARN"/>
+ <logger name="com.bstek.dorado" level="WARN"/>
+ <root level="info">
+ <appender-ref ref="PRO_FILE"/>
+ </root>
+ </springProfile>
+
<!-- 鐢熶骇鐜-linux -->
<springProfile name="linux">
<!-- 姣忓ぉ浜х敓涓�涓枃浠� -->
--
Gitblit v1.9.3