diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java index 2fdfadb..7b6e8e9 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/data/service/impl/ImportTaskServiceImpl.java @@ -430,6 +430,31 @@ public class ImportTaskServiceImpl extends ServiceImpl imageFiles = new LinkedHashMap<>(); + Map videoFiles = new LinkedHashMap<>(); + for (FishImportResult.FishImportRow row : result.getRows()) { + if (row.getPicpthList() != null) { + for (Map pic : row.getPicpthList()) { + String name = pic.get("name"); + String path = pic.get("path"); + if (name != null && path != null) { + imageFiles.putIfAbsent(name, path); + } + } + } + if (row.getVdpthList() != null) { + for (Map vid : row.getVdpthList()) { + String name = vid.get("name"); + String path = vid.get("path"); + if (name != null && path != null) { + videoFiles.putIfAbsent(name, path); + } + } + } + } + result.setImageFiles(imageFiles); + result.setVideoFiles(videoFiles); } return result; diff --git a/backend/src/main/resources/application-devtw.yml b/backend/src/main/resources/application-devtw.yml index 64b040c..8b71822 100644 --- a/backend/src/main/resources/application-devtw.yml +++ b/backend/src/main/resources/application-devtw.yml @@ -13,11 +13,43 @@ spring: url: "${DB_MASTER_URL:jdbc:oracle:thin:@172.16.21.134:1521/SDLYZ}" username: "${DB_MASTER_USERNAME:QGC_REFA}" password: "${DB_MASTER_PASSWORD:Y4M4K1oCkL8U}" + initial-size: 5 + min-idle: 5 + max-active: 20 + max-wait: 60000 + keep-alive-between-time-millis: 120000 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + keep-alive: true + remove-abandoned: true + remove-abandoned-timeout: 1800 + log-abandoned: true + connection-properties: oracle.net.CONNECT_TIMEOUT=10000;oracle.jdbc.ReadTimeout=30000 slave: driverClassName: oracle.jdbc.OracleDriver url: "${DB_SLAVE_URL:jdbc:oracle:thin:@172.16.21.134:1521/SDLYZ}" username: "${DB_SLAVE_USERNAME:QGC_REFA}" password: "${DB_SLAVE_PASSWORD:Y4M4K1oCkL8U}" + initial-size: 5 + min-idle: 5 + max-active: 20 + max-wait: 60000 + min-evictable-idle-time-millis: 300000 + validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + keep-alive: true + keep-alive-between-time-millis: 120000 + time-between-eviction-runs-millis: 60000 + remove-abandoned: true + remove-abandoned-timeout: 1800 + log-abandoned: true + connection-properties: oracle.net.CONNECT_TIMEOUT=10000;oracle.jdbc.ReadTimeout=30000 jackson: date-format: yyyy-MM-dd HH:mm:ss