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 9b339de..e85a5c3 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 @@ -455,24 +455,16 @@ public class DateUploadController { @RequestMapping(value = "/delUploadFile", method = {RequestMethod.DELETE}) public AjaxResult delUploadFile(List id) { - List ids = id; - UploadFile file = new UploadFile(); - for (int i = 0; i < ids.size(); i++) { - Integer Seeding = 0; DateUpload value = service.selectDel(ids.get(i)); - String type1 = value.getType1(); String type = value.getType(); - if (type1.equals("EVALUATIONINDICATORS")) { - //value.getType2(); - String[] typeValue = value.getFileName().split("2"); String type2 = typeValue[0]; type2 = type2.substring(0, type2.length() - 1); @@ -481,10 +473,8 @@ public class DateUploadController { if (Seeding == 0) { return AjaxResult.error("没有此id单据!" + ids.get(i)); } - + continue; } - // && - // (type1.equals("RSIMAGES") || type1.equals("PLANTINGDISTRIBUTION") || type1.equals("VEGETATIONHEALTH")) else if (type.equals("VEGETATIONHEALTH")) { String[] typeValue = value.getFileName().split("_"); String resolution = typeValue[0]; @@ -494,7 +484,16 @@ public class DateUploadController { if (Seeding == 0) { return AjaxResult.error("没有此id单据!" + ids.get(i)); } - } else { + continue; + } + else if (type1.equals("BOUNDARIES") || type1.equals("RSIMAGES")) { + Seeding = service.DelUpload(ids.get(i)); + if (Seeding == 0) { + return AjaxResult.error("没有此id单据!" + ids.get(i)); + } + continue; + } + else { String[] typeValue = value.getFileName().split("_"); String type2 = typeValue[0]; @@ -503,8 +502,8 @@ public class DateUploadController { if (Seeding == 0) { return AjaxResult.error("没有此id单据!" + ids.get(i)); } + continue; } - } return AjaxResult.success("成功!"); @@ -557,17 +556,18 @@ public class DateUploadController { /** * 修改全部区域名称 + * * @return */ - @RequestMapping(value = "/updateAllRegionName",method = {RequestMethod.POST}) - public AjaxResult updateAllRegionName(@RequestBody RegionName regionName) - { + @RequestMapping(value = "/updateAllRegionName", method = {RequestMethod.POST}) + public AjaxResult updateAllRegionName(@RequestBody RegionName regionName) { - return landUseServices.updateAllRegionName(regionName.getRegionName()); + return landUseServices.updateAllRegionName(regionName.getRegionName()); } /** * 查询所有区域名称 + * * @return */ @RequestMapping(value = "/queryAllRegionName", method = {RequestMethod.GET}) 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 83164b5..c20bde1 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -18,8 +18,8 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口,默认为8080 - port: 6051 - #port: 9800 + #port: 6051 + port: 9800 servlet: # 应用的访问路径 context-path: / @@ -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: