From 552afab108f3a121e1a214c4b550f11f3f08f55c Mon Sep 17 00:00:00 2001 From: song <1921620649@qq.com> Date: Tue, 20 Jun 2023 09:57:03 +0800 Subject: [PATCH] no message --- .../shate/DateUploadController.java | 62 +++++++------------ .../src/main/resources/application-druid.yml | 12 ++-- .../src/main/resources/application.yml | 8 +-- 3 files changed, 33 insertions(+), 49 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/DateUploadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/DateUploadController.java index a568588..b852a08 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/DateUploadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/DateUploadController.java @@ -166,6 +166,11 @@ public class DateUploadController { return AjaxResult.success("成功"); } + /** + * 添加方法 + * @param dateUpload + * @return + */ private List infr(List dateUpload) { for (int i = 0; i < dateUpload.size(); i++) { @@ -214,16 +219,10 @@ public class DateUploadController { DateUpload uploadValue = service.selectShp(name1, type, ""); -// callExe1(name.replace(".tif", ""), -// FilePaths + dateUpload.get(i).getData_id()); -// callExe(name.replace(".tif", ""), -// FilePaths + dateUpload.get(i).getData_id(), -// ShpPaths + uploadValue.getData_id()); -// -// MyThread1 demo = new MyThread1(name.replace(".tif", ""), -// FilePaths + dateUpload.get(i).getData_id(), -// ShpPaths + uploadValue.getData_id()); -// demo.run(); + MyThread1 demo = new MyThread1(name.replace(".tif", ""), + FilePaths + dateUpload.get(i).getData_id(), + ShpPaths + uploadValue.getData_id()); + demo.run(); } else if (type1.equals("BOUNDARIES") || type1.equals("RSIMAGES"))//Boundaries { @@ -278,17 +277,12 @@ public class DateUploadController { dateUpload.get(i).setExtent1(dateUpload.get(i).getExtent().toString()); -// DateUpload uploadValue = service.selectShp(name1, type, ""); + DateUpload uploadValue = service.selectShp(name1, type, ""); -// callExe1(name.replace(".tif", ""), -// FilePaths + dateUpload.get(i).getData_id()); -// callExe(name.replace(".tif", ""), -// FilePaths + dateUpload.get(i).getData_id(), -// ShpPaths + uploadValue.getData_id()); -// MyThread1 demo = new MyThread1(name.replace(".tif", ""), -// FilePaths + dateUpload.get(i).getData_id(), -// ShpPaths + uploadValue.getData_id()); -// demo.run(); + MyThread1 demo = new MyThread1(name.replace(".tif", ""), + FilePaths + dateUpload.get(i).getData_id(), + ShpPaths + uploadValue.getData_id()); + demo.run(); } else if (type1.equals("SUITABILITY")) { String[] strs = dateUpload.get(i).getFileName().split("\\."); @@ -323,15 +317,10 @@ public class DateUploadController { DateUpload uploadValue = service.selectShp(name1, type, ""); -// callExe1(name.replace(".tif", ""), -// FilePaths + dateUpload.get(i).getData_id()); -// callExe(name.replace(".tif", ""), -// FilePaths + dateUpload.get(i).getData_id(), -// ShpPaths + uploadValue.getData_id()); -// MyThread1 demo = new MyThread1(name.replace(".tif", ""), -// FilePaths + dateUpload.get(i).getData_id(), -// ShpPaths + uploadValue.getData_id()); -// demo.run(); + MyThread1 demo = new MyThread1(name.replace(".tif", ""), + FilePaths + dateUpload.get(i).getData_id(), + ShpPaths + uploadValue.getData_id()); + demo.run(); } else { String[] strs = dateUpload.get(i).getFileName().split("\\."); @@ -361,17 +350,12 @@ public class DateUploadController { dateUpload.get(i).setExtent1(dateUpload.get(i).getExtent().toString()); - DateUpload uploadValue = service.selectShp(name1, type, ""); -// callExe1(name.replace(".tif", ""), -// FilePaths + dateUpload.get(i).getData_id()); -// callExe(name.replace(".tif", ""), -// FilePaths + dateUpload.get(i).getData_id(), -// ShpPaths + uploadValue.getData_id()); -// MyThread1 demo = new MyThread1(name.replace(".tif", ""), -// FilePaths + dateUpload.get(i).getData_id(), -// ShpPaths + uploadValue.getData_id()); -// demo.run(); + + MyThread1 demo = new MyThread1(name.replace(".tif", ""), + FilePaths + dateUpload.get(i).getData_id(), + ShpPaths + uploadValue.getData_id()); + demo.run(); } } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index b2ea661..414580c 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,14 +6,14 @@ spring: driver-class-name: org.postgresql.Driver druid: master: -# url: jdbc:postgresql://rs-middleware-postgres:5432/itba?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai -# username: gis -# password: AQBSdU5bT27AKxAAvKoWQdGpSuNRCHjC4B8DVA + url: jdbc:postgresql://rs-middleware-postgres:5432/itba?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai + username: gis + password: AQBSdU5bT27AKxAAvKoWQdGpSuNRCHjC4B8DVA #url: jdbc:postgresql://192.168.2.9:5432/saudiArabia?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai - url: jdbc:postgresql://121.36.229.60:5432/saudiArabia?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai - username: sjs - password: song5325 +# url: jdbc:postgresql://121.36.229.60:5432/saudiArabia?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai +# username: sjs +# password: song5325 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 5334517..58d3abb 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -60,16 +60,16 @@ spring: # redis 配置 redis: # 地址 - #host: rs-middleware-redis - host: localhost + host: rs-middleware-redis + #host: localhost # 端口，默认为6379 #port: 14096 port: 6379 # 数据库索引 database: 0 # 密码 - #password: SenseTime@2019 - password: sdust2020 + password: SenseTime@2019 + #password: sdust2020 # 连接超时时间 timeout: 10s lettuce: