czt
2025-08-20 12c99c99ed89d1d11318d9b4c6c295d35e21b1e7
调整船运质检单号
已修改3个文件
已添加2个文件
180 ■■■■■ 文件已修改
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-pro.yml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-pro4.yml 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-pro5317_004.yml 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/logback-spring.xml 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
            }
    }
}
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/
  # çœå¹³å°RSA密钥对信息
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:
    #主jpa配置
    primary:
      show-sql: true
      properties:
        hibernate:
          hbm2ddl:
            auto: update
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
    #次jpa配置
    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/
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:
    #主jpa配置
    primary:
      show-sql: true
      properties:
        hibernate:
          hbm2ddl:
            auto: update
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
    #次jpa配置
    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/
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">
        <!-- æ¯å¤©äº§ç”Ÿä¸€ä¸ªæ–‡ä»¶ -->