Song/xkrs_shate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
song 2023-06-20 09:57:03 +08:00
parent 2da5ba5137
commit 552afab108
3 changed files with 33 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/DateUploadController.java
View File

@ -166,6 +166,11 @@ public class DateUploadController {
return AjaxResult.success("成功"); return AjaxResult.success("成功");
} }
/**
* 添加方法
* @param dateUpload
* @return
*/
private List<DateUpload> infr(List<DateUpload> dateUpload) { private List<DateUpload> infr(List<DateUpload> dateUpload) {
for (int i = 0; i < dateUpload.size(); i++) { for (int i = 0; i < dateUpload.size(); i++) {
@ -214,16 +219,10 @@ public class DateUploadController {
DateUpload uploadValue = service.selectShp(name1, type, ""); DateUpload uploadValue = service.selectShp(name1, type, "");
// callExe1(name.replace(".tif", ""), MyThread1 demo = new MyThread1(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id()); FilePaths + dateUpload.get(i).getData_id(),
// callExe(name.replace(".tif", ""), ShpPaths + uploadValue.getData_id());
// FilePaths + dateUpload.get(i).getData_id(), demo.run();
// ShpPaths + uploadValue.getData_id());
//
// 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 } 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.get(i).setExtent1(dateUpload.get(i).getExtent().toString());
// DateUpload uploadValue = service.selectShp(name1, type, ""); DateUpload uploadValue = service.selectShp(name1, type, "");
// callExe1(name.replace(".tif", ""), MyThread1 demo = new MyThread1(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id()); FilePaths + dateUpload.get(i).getData_id(),
// callExe(name.replace(".tif", ""), ShpPaths + uploadValue.getData_id());
// FilePaths + dateUpload.get(i).getData_id(), demo.run();
// ShpPaths + uploadValue.getData_id());
// MyThread1 demo = new MyThread1(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id(),
// ShpPaths + uploadValue.getData_id());
// demo.run();
} else if (type1.equals("SUITABILITY")) { } else if (type1.equals("SUITABILITY")) {
String[] strs = dateUpload.get(i).getFileName().split("\\."); String[] strs = dateUpload.get(i).getFileName().split("\\.");
@ -323,15 +317,10 @@ public class DateUploadController {
DateUpload uploadValue = service.selectShp(name1, type, ""); DateUpload uploadValue = service.selectShp(name1, type, "");
// callExe1(name.replace(".tif", ""), MyThread1 demo = new MyThread1(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id()); FilePaths + dateUpload.get(i).getData_id(),
// callExe(name.replace(".tif", ""), ShpPaths + uploadValue.getData_id());
// FilePaths + dateUpload.get(i).getData_id(), demo.run();
// ShpPaths + uploadValue.getData_id());
// MyThread1 demo = new MyThread1(name.replace(".tif", ""),
// FilePaths + dateUpload.get(i).getData_id(),
// ShpPaths + uploadValue.getData_id());
// demo.run();
} else { } else {
String[] strs = dateUpload.get(i).getFileName().split("\\."); String[] strs = dateUpload.get(i).getFileName().split("\\.");
@ -361,17 +350,12 @@ public class DateUploadController {
dateUpload.get(i).setExtent1(dateUpload.get(i).getExtent().toString()); 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()); MyThread1 demo = new MyThread1(name.replace(".tif", ""),
// callExe(name.replace(".tif", ""), FilePaths + dateUpload.get(i).getData_id(),
// FilePaths + dateUpload.get(i).getData_id(), ShpPaths + uploadValue.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();
} }
} }

12
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -6,14 +6,14 @@ spring:
driver-class-name: org.postgresql.Driver driver-class-name: org.postgresql.Driver
druid: druid:
master: master:
# url: jdbc:postgresql://rs-middleware-postgres:5432/itba?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai url: jdbc:postgresql://rs-middleware-postgres:5432/itba?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
# username: gis username: gis
# password: AQBSdU5bT27AKxAAvKoWQdGpSuNRCHjC4B8DVA password: AQBSdU5bT27AKxAAvKoWQdGpSuNRCHjC4B8DVA
#url: jdbc:postgresql://192.168.2.9:5432/saudiArabia?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai #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 # url: jdbc:postgresql://121.36.229.60:5432/saudiArabia?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: sjs # username: sjs
password: song5325 # password: song5325
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

8
ruoyi-admin/src/main/resources/application.yml
View File

@ -60,16 +60,16 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
#host: rs-middleware-redis host: rs-middleware-redis
host: localhost #host: localhost
# 端口，默认为6379 # 端口，默认为6379
#port: 14096 #port: 14096
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 0 database: 0
# 密码 # 密码
#password: SenseTime@2019 password: SenseTime@2019
password: sdust2020 #password: sdust2020
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: lettuce: