修改授权日期

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();

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();
@@ -78,7 +87,7 @@ public class DateUploadController
         {
             if (name.equals("1"))
             {
-                name="M_Heal";
+                name="M_Heal%";
             }
             else if(name.equals("2"))
             {

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<LandUse> Seeding= Service.sqlSeeding1(user.getZone(),user.getYear());

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<PlantingSuitability> Seeding= Service.sqlSeeding(zone);
         Double Number=0.0;
         Double Max=0.0;

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:
                 # 从数据源开关/默认关闭

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:

ruoyi-system/src/main/resources/mapper/system/DateUploadMapper.xml

@@ -238,7 +238,7 @@
     </delete>
 
     <delete id="seedSuccess">
-        DELETE FROM #{seed_Success}
+        DELETE FROM "seed_Success"
         WHERE zone = #{zone}
           and image_date =#{imageDate}
     </delete>