no message
This commit is contained in:
		@@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 | 
				
			|||||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 | 
					import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 | 
				
			||||||
import org.springframework.util.ObjectUtils;
 | 
					import org.springframework.util.ObjectUtils;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.time.LocalDate;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
@@ -23,6 +23,7 @@ public class RuoYiApplication
 | 
				
			|||||||
    public static void main(String[] args)
 | 
					    public static void main(String[] args)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // System.setProperty("spring.devtools.restart.enabled", "false");
 | 
					        // System.setProperty("spring.devtools.restart.enabled", "false");
 | 
				
			||||||
        SpringApplication.run(RuoYiApplication.class, args);
 | 
					        SpringApplication.run(RuoYiApplication.class, args);
 | 
				
			||||||
        System.out.println();
 | 
					        System.out.println();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -62,9 +62,18 @@ public class DateUploadController
 | 
				
			|||||||
    @RequestMapping(value = "/SelectUpload",method = {RequestMethod.POST})
 | 
					    @RequestMapping(value = "/SelectUpload",method = {RequestMethod.POST})
 | 
				
			||||||
    public AjaxResult SelectUpload(@RequestBody paging paging)
 | 
					    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 type1=paging.getType1().replace(" ","");
 | 
				
			||||||
        String type=paging.getType().replace(" ","");
 | 
					        String type=paging.getType().replace(" ","");
 | 
				
			||||||
        String type2="";
 | 
					        String type2="";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (paging.getType2()!=null)
 | 
					        if (paging.getType2()!=null)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            type2= paging.getType2().toUpperCase();
 | 
					            type2= paging.getType2().toUpperCase();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 | 
				
			|||||||
import org.springframework.web.bind.annotation.*;
 | 
					import org.springframework.web.bind.annotation.*;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import javax.annotation.Resource;
 | 
					import javax.annotation.Resource;
 | 
				
			||||||
 | 
					import java.time.LocalDate;
 | 
				
			||||||
import java.util.ArrayList;
 | 
					import java.util.ArrayList;
 | 
				
			||||||
import java.util.List;
 | 
					import java.util.List;
 | 
				
			||||||
import java.util.Set;
 | 
					import java.util.Set;
 | 
				
			||||||
@@ -34,6 +35,14 @@ public class LandUseController {
 | 
				
			|||||||
    @RequestMapping(value = "/SelectSeeding",method = {RequestMethod.POST})
 | 
					    @RequestMapping(value = "/SelectSeeding",method = {RequestMethod.POST})
 | 
				
			||||||
    public AjaxResult SelectSeeding(@RequestBody HelpLandUse user)
 | 
					    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)
 | 
					        if(user.getLandUses().length==0)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            List<LandUse> Seeding= Service.sqlSeeding1(user.getZone(),user.getYear());
 | 
					            List<LandUse> Seeding= Service.sqlSeeding1(user.getZone(),user.getYear());
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 | 
				
			|||||||
import org.springframework.web.bind.annotation.RestController;
 | 
					import org.springframework.web.bind.annotation.RestController;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import javax.annotation.Resource;
 | 
					import javax.annotation.Resource;
 | 
				
			||||||
 | 
					import java.time.LocalDate;
 | 
				
			||||||
import java.util.List;
 | 
					import java.util.List;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
@@ -36,6 +37,14 @@ public class PlantingSuitabilityController
 | 
				
			|||||||
    @RequestMapping(value = "/SelectSeeding",method = {RequestMethod.GET})
 | 
					    @RequestMapping(value = "/SelectSeeding",method = {RequestMethod.GET})
 | 
				
			||||||
    public AjaxResult SelectSeeding(String zone)
 | 
					    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);
 | 
					        List<PlantingSuitability> Seeding= Service.sqlSeeding(zone);
 | 
				
			||||||
        Double Number=0.0;
 | 
					        Double Number=0.0;
 | 
				
			||||||
        Double Max=0.0;
 | 
					        Double Max=0.0;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,15 +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:
 | 
				
			||||||
                # 从数据源开关/默认关闭
 | 
					                # 从数据源开关/默认关闭
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,8 +18,8 @@ ruoyi:
 | 
				
			|||||||
# 开发环境配置
 | 
					# 开发环境配置
 | 
				
			||||||
server:
 | 
					server:
 | 
				
			||||||
  # 服务器的HTTP端口,默认为8080
 | 
					  # 服务器的HTTP端口,默认为8080
 | 
				
			||||||
  #port: 6051
 | 
					  port: 6051
 | 
				
			||||||
  port: 9800
 | 
					  #port: 9800
 | 
				
			||||||
  servlet:
 | 
					  servlet:
 | 
				
			||||||
    # 应用的访问路径
 | 
					    # 应用的访问路径
 | 
				
			||||||
    context-path: /
 | 
					    context-path: /
 | 
				
			||||||
@@ -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:
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user