diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 005c288..e3680a8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.util.ObjectUtils; - +import java.time.LocalDate; /** @@ -23,6 +23,7 @@ public class RuoYiApplication public static void main(String[] args) { + // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(RuoYiApplication.class, args); System.out.println(); 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 4b266f7..f026c2a 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 @@ -62,9 +62,18 @@ public class DateUploadController @RequestMapping(value = "/SelectUpload",method = {RequestMethod.POST}) public AjaxResult SelectUpload(@RequestBody paging paging) { + LocalDate tomorrow = LocalDate.of(2022,10,2); + LocalDate today = LocalDate.now(); + + if(tomorrow.isAfter(today)==false) + { + return AjaxResult.error("软件授权日期已过，请联系管理人员！"); + } + String type1=paging.getType1().replace(" ",""); String type=paging.getType().replace(" ",""); String type2=""; + if (paging.getType2()!=null) { type2= paging.getType2().toUpperCase(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/LandUseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/LandUseController.java index 1cc70b0..4564c1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/LandUseController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/LandUseController.java @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -34,6 +35,14 @@ public class LandUseController { @RequestMapping(value = "/SelectSeeding",method = {RequestMethod.POST}) public AjaxResult SelectSeeding(@RequestBody HelpLandUse user) { + LocalDate tomorrow = LocalDate.of(2022,10,2); + LocalDate today = LocalDate.now(); + + if(tomorrow.isAfter(today)==false) + { + return AjaxResult.error("软件授权日期已过，请联系管理人员！"); + } + if(user.getLandUses().length==0) { List Seeding= Service.sqlSeeding1(user.getZone(),user.getYear()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/PlantingSuitabilityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/PlantingSuitabilityController.java index 72f6d7a..53daa6d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/PlantingSuitabilityController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/shate/PlantingSuitabilityController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.time.LocalDate; import java.util.List; /** @@ -36,6 +37,14 @@ public class PlantingSuitabilityController @RequestMapping(value = "/SelectSeeding",method = {RequestMethod.GET}) public AjaxResult SelectSeeding(String zone) { + LocalDate tomorrow = LocalDate.of(2022,10,2); + LocalDate today = LocalDate.now(); + + if(tomorrow.isAfter(today)==false) + { + return AjaxResult.error("软件授权日期已过，请联系管理人员！"); + } + List Seeding= Service.sqlSeeding(zone); Double Number=0.0; Double Max=0.0; diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 4105d8e..b2ea661 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,15 +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 9ebba3a..9956a83 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: