diff --git a/src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java b/src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java new file mode 100644 index 00000000..3f05c8f1 --- /dev/null +++ b/src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java @@ -0,0 +1,14 @@ +package com.glxp.api.res.sync; + +import lombok.Data; + +import java.util.List; + +@Data +public class BaseSyncResponse { + + private String taskId; + private List files; + private String updateTime; + +} diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncBusOrderResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncBusOrderResponse.java index ccb8df58..fb6f7365 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncBusOrderResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncBusOrderResponse.java @@ -7,9 +7,8 @@ import lombok.Data; import java.util.List; @Data -public class SpsSyncBusOrderResponse { +public class SpsSyncBusOrderResponse extends BaseSyncResponse { - private String taskId; private List purOrderEntities; private List purOrderDetailEntities; diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java index a1fb2d0f..df075a27 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncBusResponse.java @@ -8,10 +8,9 @@ import lombok.Data; import java.util.List; @Data -public class SpsSyncBusResponse { +public class SpsSyncBusResponse extends BaseSyncResponse { //同步任务ID - private String taskId; private List bussinessTypeEntities; private List busTypeChangeEntities; private List thrBusTypeOriginEntities; diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncDataResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncDataResponse.java index 2ff379cd..39ef5746 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncDataResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncDataResponse.java @@ -6,10 +6,8 @@ import lombok.Data; import java.util.List; @Data -public class SpsSyncDataResponse { +public class SpsSyncDataResponse extends BaseSyncResponse { - //同步任务ID - private String taskId; //用户信息 List authAdminList; diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncOrderResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncOrderResponse.java index 56aa1312..2330e66a 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncOrderResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncOrderResponse.java @@ -6,16 +6,12 @@ import lombok.Data; import java.util.List; @Data -public class SpsSyncOrderResponse { - +public class SpsSyncOrderResponse extends BaseSyncResponse { //同步任务ID - private String taskId; List orderEntities; List codeEntities; List orderDetailBizEntities; List orderDetailCodeEntities; List orderDetailResultEntities; List orderInvoiceEntities; - - } diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java index a664f7f7..6a669cf6 100644 --- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java +++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java @@ -103,6 +103,7 @@ public class SpsSyncDownloadService { List orderDetailCodeEntities = new ArrayList<>(); List orderDetailResultEntities = new ArrayList<>(); List orderInvoiceEntities = new ArrayList<>(); + List syncFiles = new ArrayList<>(); if (CollUtil.isNotEmpty(orderEntities)) { for (IoOrderEntity orderEntity : orderEntities) { @@ -114,6 +115,11 @@ public class SpsSyncDownloadService { List bizEntities = orderDetailBizService.findByOrderId(orderEntity.getBillNo()); if (CollUtil.isNotEmpty(bizEntities)) { orderDetailBizEntities.addAll(bizEntities); + for (IoOrderDetailBizEntity bizEntity : bizEntities) { + if (StrUtil.isNotEmpty(bizEntity.getCheckFileName())) { + syncFiles.add(bizEntity.getCheckFileName()); + } + } } @@ -130,11 +136,21 @@ public class SpsSyncDownloadService { List invoiceEntities = orderInvoiceService.findByBillNo(orderEntity.getBillNo()); if (CollUtil.isNotEmpty(invoiceEntities)) { + + for (IoOrderInvoiceEntity orderInvoiceEntity : invoiceEntities) { + if (StrUtil.isNotEmpty(orderInvoiceEntity.getLicenseUrl())) { + syncFiles.add(orderInvoiceEntity.getLicenseUrl()); + } + } + orderInvoiceEntities.addAll(invoiceEntities); + + } } } + syncOrderResponse.setFiles(syncFiles); syncOrderResponse.setCodeEntities(codeEntities); syncOrderResponse.setOrderDetailBizEntities(orderDetailBizEntities); syncOrderResponse.setOrderDetailCodeEntities(orderDetailCodeEntities); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 00000000..79ecbc91 --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,53 @@ +server: + port: 9993 +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + jdbc-url: jdbc:mysql://127.0.0.1:3306/udi_spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: 123456 + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 + redis: + database: 10 + host: 127.0.0.1 + port: 6379 + # password: 123456 + timeout: 300 + jedis: + pool: + max-active: 8 + max-wait: -1 + max-idle: 8 + min-idle: 0 + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + servlet: + multipart: + max-file-size: 500MB + max-request-size: 500MB + +ok: + http: + connect-timeout: 3000 + read-timeout: 3000 + write-timeout: 3000 + max-idle-connections: 200 + keep-alive-duration: 300 + + +logging: + level: + com.glxp.api.dao: debug + +file_path: d:/udi/udiwms/udiwmsfile/ +back_file_path: d:/share/udisps/back/ +UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df +UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test +SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs + +API_KEY: 1101 +API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L diff --git a/src/main/resources/application-ljy.yml b/src/main/resources/application-ljy.yml new file mode 100644 index 00000000..44b87a4c --- /dev/null +++ b/src/main/resources/application-ljy.yml @@ -0,0 +1,53 @@ +server: + port: 9993 +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_spms_ljy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: Glxp@6066 + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 + redis: + database: 10 + host: 127.0.0.1 + port: 6404 + # password: 123456 + timeout: 300 + jedis: + pool: + max-active: 8 + max-wait: -1 + max-idle: 8 + min-idle: 0 + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + servlet: + multipart: + max-file-size: 500MB + max-request-size: 500MB + +ok: + http: + connect-timeout: 3000 + read-timeout: 3000 + write-timeout: 3000 + max-idle-connections: 200 + keep-alive-duration: 300 + + +logging: + level: + com.glxp.api.dao: debug + +file_path: /udi/udiwms/udiwmsfile/ +back_file_path: /share/udisps/back/ +UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df +UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test +SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs + +API_KEY: 1101 +API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L diff --git a/src/main/resources/application-wmd.yml b/src/main/resources/application-wmd.yml new file mode 100644 index 00000000..44b87a4c --- /dev/null +++ b/src/main/resources/application-wmd.yml @@ -0,0 +1,53 @@ +server: + port: 9993 +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_spms_ljy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: Glxp@6066 + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 + redis: + database: 10 + host: 127.0.0.1 + port: 6404 + # password: 123456 + timeout: 300 + jedis: + pool: + max-active: 8 + max-wait: -1 + max-idle: 8 + min-idle: 0 + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + servlet: + multipart: + max-file-size: 500MB + max-request-size: 500MB + +ok: + http: + connect-timeout: 3000 + read-timeout: 3000 + write-timeout: 3000 + max-idle-connections: 200 + keep-alive-duration: 300 + + +logging: + level: + com.glxp.api.dao: debug + +file_path: /udi/udiwms/udiwmsfile/ +back_file_path: /share/udisps/back/ +UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df +UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test +SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs + +API_KEY: 1101 +API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L diff --git a/src/main/resources/application-wqq.yml b/src/main/resources/application-wqq.yml new file mode 100644 index 00000000..5cfcea0b --- /dev/null +++ b/src/main/resources/application-wqq.yml @@ -0,0 +1,53 @@ +server: + port: 9993 +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_spms_wqq?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: Glxp@6066 + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 + redis: + database: 10 + host: 127.0.0.1 + port: 6405 + # password: 123456 + timeout: 300 + jedis: + pool: + max-active: 8 + max-wait: -1 + max-idle: 8 + min-idle: 0 + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + servlet: + multipart: + max-file-size: 500MB + max-request-size: 500MB + +ok: + http: + connect-timeout: 3000 + read-timeout: 3000 + write-timeout: 3000 + max-idle-connections: 200 + keep-alive-duration: 300 + + +logging: + level: + com.glxp.api.dao: debug + +file_path: /udi/udiwms/udiwmsfile/ +back_file_path: /share/udisps/back/ +UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df +UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test +SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs + +API_KEY: 1101 +API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L