diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 5eab88c93..478b430aa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -18,16 +18,17 @@ public class RuoYiApplication { // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(RuoYiApplication.class, args); - System.out.println("(♥◠‿◠)ノ゙ 我们一起学喵叫 ლ(´ڡ`ლ)゙ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ 喵 \\ \\ / / \n" + - " | ( ' ) | 喵 \\ _. / ' \n" + - " |(_ o _) / 喵 _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println(" --->>>启动成功!<<<---"); +// System.out.println("(♥◠‿◠)ノ゙ ლ(´ڡ`ლ)゙ \n" + +// " .-------. ____ __ \n" + +// " | _ _ \\ \\ \\ / / \n" + +// " | ( ' ) | \\ _. / ' \n" + +// " |(_ o _) / _( )_ .' \n" + +// " | (_,_).' __ ___(_ o _)' \n" + +// " | |\\ \\ | || |(_,_)' \n" + +// " | | \\ `' /| `-' / \n" + +// " | | \\ / \\ / \n" + +// " ''-' `'-' `-..-' "); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java index 00447d8ca..482c48917 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java @@ -21,6 +21,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.crypto.Data; +import java.io.InputStream; import java.security.Guard; import java.text.SimpleDateFormat; import java.time.LocalDateTime; @@ -41,15 +42,14 @@ public class AorestCoverageController { /** * 查询方法 - * @param response 响应头 - * @param request 客户端请求 + * 需要查询的字段参数 * @return 参数类 */ @RequestMapping(value = "/selectAorestCoverage",method = {RequestMethod.GET}) @ApiOperation(value = "查询方法",httpMethod = "GET") - public AjaxResult selectAorestCoverage(HttpServletResponse response, HttpServletRequest request) + public AjaxResult selectAorestCoverage( @RequestBody AorestCoverageVO coverageVO) { - List eastVOSList= service.selectAorestCoverage(); + List eastVOSList= service.selectAorestCoverage(coverageVO.getRegion(),coverageVO.getParticularYear()); return AjaxResult.success(eastVOSList); } @@ -167,4 +167,6 @@ public class AorestCoverageController { return AjaxResult.success(diclist); } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java index d63cf544f..98f0edea0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java @@ -32,15 +32,13 @@ public class AustraliaMiddleEastController /** * 查询方法 - * @param response 请求头 - * @param request 客户端请求 * @return 实体类 */ @ApiOperation(value = "查询方法",httpMethod = "GET") @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.GET}) - public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) + public AjaxResult SelectAustralia(@RequestBody AustraliaMiddleEastVO eastVO ) { - List eastVOSList= australiaMiddleEastService.selectAustralia(); + List eastVOSList= australiaMiddleEastService.selectAustralia(eastVO.getYearMonth(),eastVO.getMonth()); return AjaxResult.success(eastVOSList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java index 9d173a7f9..b3f2e7b1c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java @@ -33,15 +33,13 @@ public class OceanTemperatureController { /** * 查询方法 - * @param response 响应头 - * @param request 客户端请求 * @return 参数类 */ @RequestMapping(value = "/selectOcean",method = {RequestMethod.GET}) @ApiOperation(value = "查询方法",httpMethod = "GET") - public AjaxResult selectOcean(HttpServletResponse response, HttpServletRequest request) + public AjaxResult selectOcean(@RequestBody OceanTemperatureVO temperatureVO) { - List eastVOSList= temperatureService.selectOcean(); + List eastVOSList= temperatureService.selectOcean(temperatureVO.getStartDate()); return AjaxResult.success(eastVOSList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java index 7bd772c99..2b6390ca4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java @@ -32,15 +32,13 @@ public class RegionVGIController private IRegionVGIService regionVGIService; /** * 查询方法 - * @param response 响应头 - * @param request 客户端请求 * @return 参数类 */ @RequestMapping(value = "/SelectRegion",method = {RequestMethod.GET}) @ApiOperation(value = "查询方法",httpMethod = "GET") - public AjaxResult SelectRegion(HttpServletResponse response, HttpServletRequest request) + public AjaxResult SelectRegion(@RequestBody RegionVGIVO regionVGIVO) { - List vgivost= regionVGIService.selectRegion(); + List vgivost= regionVGIService.selectRegion(regionVGIVO.getTypeName(),regionVGIVO.getParticularYear()); return AjaxResult.success(vgivost); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java index 7e62948bd..66508678f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java @@ -34,15 +34,13 @@ public class RegionalSystemController { /** * 查询方法 - * @param response 响应头 - * @param request 客户端请求 * @return 参数类 */ @RequestMapping(value = "/selectRegional",method = {RequestMethod.GET}) @ApiOperation(value = "查询方法",httpMethod = "GET") - public AjaxResult selectRegional(HttpServletResponse response, HttpServletRequest request) + public AjaxResult selectRegional(@RequestBody RegionalSystemVO response) { - List eastVOSList= systemService.selectRegional(); + List eastVOSList= systemService.selectRegional(response.getRegion(),response.getParticularYear()); return AjaxResult.success(eastVOSList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java index 5dce08793..5a2018480 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java @@ -230,8 +230,8 @@ public class SpecialController { for (int i = 1; i < sheet.getLastRowNum() + 1; i++) { AustraliaMiddleEastVO value = new AustraliaMiddleEastVO(); Row row = sheet.getRow(i); - value.setYearMonth(Double.parseDouble(row.getCell(0).toString())); - value.setMonth(Double.parseDouble(row.getCell(1).toString())); + value.setYearMonth(row.getCell(0).toString()); + value.setMonth(row.getCell(1).toString()); value.setSstAnomalyIndex(Double.parseDouble(row.getCell(2).toString())); value.setTemperatureAnomolies(Double.parseDouble(row.getCell(3).toString())); value.setPrecipitationAnomolies(Double.parseDouble(row.getCell(4).toString())); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java index 6c4d7bec8..3a95f2c73 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java @@ -35,7 +35,6 @@ public class ThematicMapController { /** * 查询方法 * @param response 响应头 - * @param request 客户端请求 * @return 参数类 */ @ApiOperation("获取所有专题图") @@ -47,9 +46,10 @@ public class ThematicMapController { @ApiResponse(code =404,message = "未找到") }) @RequestMapping(value = "/get/all",method = {RequestMethod.GET}) - public AjaxResult selectAllThematicMap(HttpServletResponse response, HttpServletRequest request) + public AjaxResult selectAllThematicMap(HttpServletResponse response,@RequestBody ThematicMapDomain thematicMapDomain) { - List res= thematicMapService.selectAll(); + List res= thematicMapService.selectAll(thematicMapDomain.getPictureTime(), + thematicMapDomain.getPictureZh()); return AjaxResult.success(res); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java index dda699379..d95dcf485 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java @@ -39,9 +39,9 @@ public class UrbanController { */ @RequestMapping(value = "/selectUrban",method = {RequestMethod.GET}) @ApiOperation(value = "查询方法",httpMethod = "GET") - public AjaxResult selectUrban(HttpServletResponse response, HttpServletRequest request) + public AjaxResult selectUrban(HttpServletResponse response, HttpServletRequest request,@RequestBody UrbanVO urbanVO) { - List eastVOSList= urbanService.selectUrban(); + List eastVOSList= urbanService.selectUrban(urbanVO.getName(),urbanVO.getParticularYear()); return AjaxResult.success(eastVOSList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java index 04cd4e870..c08120aaa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java @@ -34,14 +34,13 @@ public class VegetationCoverageController { /** * 查询方法 * @param response 响应头 - * @param request 客户端请求 * @return 参数类 */ @RequestMapping(value = "/selectVegetation",method = {RequestMethod.GET}) @ApiOperation(value = "查询方法",httpMethod = "GET") - public AjaxResult selectVegetation(HttpServletResponse response, HttpServletRequest request) + public AjaxResult selectVegetation(HttpServletResponse response,@RequestBody VegetationCoverageVO coverageVO) { - List eastVOSList= coverageService.selectVegetation(); + List eastVOSList= coverageService.selectVegetation(coverageVO.getRegion(),coverageVO.getParticularYear()); return AjaxResult.success(eastVOSList); } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index e095e222b..8a97bdf3e 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -86,7 +86,7 @@ token: # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期(默认30分钟) - expireTime: 30 + expireTime: 300 # MyBatis配置 mybatis: diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java index 468819bd1..37a1e34ff 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java @@ -10,9 +10,9 @@ public class AustraliaMiddleEastVO extends SysBaseEntity { private String id; - private Double yearMonth; + private String yearMonth; - private Double month; + private String month; private Double sstAnomalyIndex; @@ -30,11 +30,11 @@ public class AustraliaMiddleEastVO extends SysBaseEntity this.id = id; } - public Double getYearMonth() { + public String getYearMonth() { return yearMonth; } - public void setYearMonth(Double yearMonth) { + public void setYearMonth(String yearMonth) { this.yearMonth = yearMonth; } @@ -70,11 +70,11 @@ public class AustraliaMiddleEastVO extends SysBaseEntity this.vaiAnomolies = vaiAnomolies; } - public Double getMonth() { + public String getMonth() { return month; } - public void setMonth(Double month) { + public void setMonth(String month) { this.month = month; } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java index 77aa5bbfc..c8b5418f2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java @@ -13,7 +13,8 @@ import java.util.List; */ public interface AorestCoverageMapper { - List selectAorestCoverage(); + List selectAorestCoverage(@Param("region") String region, + @Param("particularYear") String particularYear); Integer DelAorestCoverage(@Param("id") String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java index 3f2aceefa..aa2de864a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java @@ -13,7 +13,8 @@ import java.util.List; */ public interface AustraliaMiddleEastMapper { - List selectAustralia(); + List selectAustralia(@Param("yearMonth") String yearMonth, + @Param("month") String month); Integer DelAustralia(@Param("id") String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java index 4b2c6a0a7..35f85afe1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java @@ -4,6 +4,7 @@ import com.ruoyi.system.domain_yada.OceanTemperatureVO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.time.LocalDate; import java.util.List; /** @@ -13,7 +14,7 @@ import java.util.List; @Repository public interface OceanTemperatureMapper { - List selectOcean(); + List selectOcean(@Param("startDate") LocalDate startDate); Integer DelOcean(@Param("id") String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java index 601e56c28..f5eb99142 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java @@ -11,7 +11,8 @@ import java.util.List; */ public interface RegionVGIMapper { - List selectRegion(); + List selectRegion(@Param("typeName") String typeName, + @Param("particularYear") String particularYear); Integer DelRegion(@Param("id") String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java index 6f7a342d3..47c9c64cc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.system.mapper_yada; import com.ruoyi.system.domain_yada.RegionalSystemVO; import org.apache.ibatis.annotations.Param; +import java.time.LocalDate; import java.util.List; /** @@ -11,7 +12,8 @@ import java.util.List; */ public interface RegionalSystemMapper { - List selectRegional(); + List selectRegional(@Param("region") String region, + @Param("particularYear") String particularYear); Integer DelRegional(@Param("id") String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java index 3b03a98ab..c56743663 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java @@ -2,8 +2,10 @@ package com.ruoyi.system.mapper_yada; import com.ruoyi.system.domain_yada.ThematicMapDomain; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.time.LocalDateTime; import java.util.List; /** @@ -15,7 +17,8 @@ public interface ThematicMapMapper { * 获取所有专题图 * @return */ - List selectAllThematicMap(); + List selectAllThematicMap(@Param("pictureTime") LocalDateTime pictureTime, + @Param("pictureZh") String pictureZh); /** * 删除专题图根据编号 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java index eb3e201d6..fded526c3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java @@ -12,7 +12,8 @@ import java.util.List; */ public interface UrbanMapper { - List selectUrban(); + List selectUrban(@Param("name") String name, + @Param("particularYear") String particularYear); Integer DelUrban(@Param("id") String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java index 1b34d8d5b..5cdf1e04e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java @@ -11,7 +11,8 @@ import java.util.List; */ public interface VegetationCoverageMapper { - List selectVegetation(); + List selectVegetation(@Param("region") String region, + @Param("particularYear") String particularYear); Integer DelVegetation(@Param("id") String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java index 362f9ff7a..fb5f8cbfe 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java @@ -16,7 +16,7 @@ import java.util.List; */ public interface IAorestCoverageService { - public List selectAorestCoverage(); + public List selectAorestCoverage(String region,String particularYear); public Integer DelAorestCoverage(String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java index ad863b16d..1e7b21bb7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java @@ -12,7 +12,7 @@ import java.util.List; */ public interface IAustraliaMiddleEastService { - public List selectAustralia(); + public List selectAustralia(String yearMonth,String month); public Integer DelAustralia(@Param("id") String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java index 7191272d1..d6b95b4ca 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java @@ -4,6 +4,7 @@ import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; import com.ruoyi.system.domain_yada.OceanTemperatureVO; import org.apache.ibatis.annotations.Param; +import java.time.LocalDate; import java.util.List; /** @@ -13,7 +14,7 @@ import java.util.List; */ public interface IOceanTemperatureService { - public List selectOcean(); + public List selectOcean(LocalDate startDate); public Integer DelOcean(@Param("id") String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java index 489c2d448..9f3e40100 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java @@ -15,7 +15,7 @@ public interface IRegionVGIService { * 查询 * @return */ - public List selectRegion(); + public List selectRegion(String typeName,String particularYear); /** * 删除 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java index 77a381a51..272d29e4f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java @@ -13,7 +13,7 @@ import java.util.List; */ public interface IRegionalSystemService { - public List selectRegional(); + public List selectRegional(String region,String particularYear); public Integer DelRegional(@Param("id") String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java index 1955c293f..9dcbd12fe 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java @@ -12,7 +12,7 @@ import java.util.List; */ public interface IUrbanService { - public List selectUrban(); + public List selectUrban(String name, String particularYear); public Integer DelUrban(@Param("id") String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java index 350d0093e..d7bb24959 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java @@ -13,7 +13,7 @@ import java.util.List; */ public interface IVegetationCoverageService { - public List selectVegetation(); + public List selectVegetation(String region,String particularYear); public Integer DelVegetation(String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java index 2c46ef4b6..b57d66941 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service_yada; import com.ruoyi.system.domain_yada.ThematicMapDomain; +import java.time.LocalDateTime; import java.util.List; /** @@ -16,7 +17,7 @@ public interface ThematicMapService { * 获取全部专题图 * @return */ - List selectAll(); + List selectAll(LocalDateTime pictureTime, String pictureZh); /** * 删除专题图根据编号 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java index 206152212..b5da41228 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java @@ -26,8 +26,8 @@ public class AorestCoverageServiceimpl implements IAorestCoverageService { @Override - public List selectAorestCoverage() { - return coverageMapper.selectAorestCoverage(); + public List selectAorestCoverage(String region,String particularYear) { + return coverageMapper.selectAorestCoverage(region,particularYear); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java index d4ebed9a9..df0e040de 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java @@ -21,9 +21,9 @@ public class AustraliaMiddleEastServiceimpl implements IAustraliaMiddleEastServi private AustraliaMiddleEastMapper australiaMiddleEastMapper; @Override - public List selectAustralia() + public List selectAustralia(String yearMonth,String month) { - return australiaMiddleEastMapper.selectAustralia(); + return australiaMiddleEastMapper.selectAustralia(yearMonth,month); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java index ef5e0f0b8..596ee1917 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDate; import java.util.List; /** @@ -24,8 +25,8 @@ public class OceanTemperatureServiceimpl implements IOceanTemperatureService { @Override - public List selectOcean() { - return oceanMapper.selectOcean(); + public List selectOcean(LocalDate startDate) { + return oceanMapper.selectOcean(startDate); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java index 5cdd97392..b81114da3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java @@ -3,6 +3,7 @@ package com.ruoyi.system.service_yada.impl; import com.ruoyi.system.mapper_yada.RegionVGIMapper; import com.ruoyi.system.service_yada.IRegionVGIService; import com.ruoyi.system.domain_yada.RegionVGIVO; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,8 +22,8 @@ public class RegionVGIServiceimpl implements IRegionVGIService { private RegionVGIMapper vgiMapper; @Override - public List selectRegion() { - return vgiMapper.selectRegion(); + public List selectRegion(String typeName,String particularYear) { + return vgiMapper.selectRegion(typeName,particularYear); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java index 72121682b..b10e37b4e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java @@ -5,6 +5,7 @@ import com.ruoyi.system.domain_yada.RegionalSystemVO; import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper; import com.ruoyi.system.mapper_yada.RegionalSystemMapper; import com.ruoyi.system.service_yada.IRegionalSystemService; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,8 +25,8 @@ public class RegionalSystemServiceimpl implements IRegionalSystemService { @Override - public List selectRegional() { - return Regional.selectRegional(); + public List selectRegional(String region,String particularYear) { + return Regional.selectRegional(region,particularYear); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java index 3231ee023..35766d944 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java @@ -3,9 +3,11 @@ package com.ruoyi.system.service_yada.impl; import com.ruoyi.system.domain_yada.ThematicMapDomain; import com.ruoyi.system.mapper_yada.ThematicMapMapper; import com.ruoyi.system.service_yada.ThematicMapService; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.List; /** @@ -23,8 +25,8 @@ public class ThematicMapServiceImpl implements ThematicMapService { * @return */ @Override - public List selectAll(){ - return thematicMapMapper.selectAllThematicMap(); + public List selectAll(LocalDateTime pictureTime,String pictureZh){ + return thematicMapMapper.selectAllThematicMap(pictureTime,pictureZh); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java index bc536d5b1..db09793cd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java @@ -4,6 +4,7 @@ import com.ruoyi.system.domain_yada.UrbanVO; import com.ruoyi.system.mapper_yada.AorestCoverageMapper; import com.ruoyi.system.mapper_yada.UrbanMapper; import com.ruoyi.system.service_yada.IUrbanService; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,8 +24,8 @@ public class UrbanServiceimpl implements IUrbanService { @Override - public List selectUrban() { - return urbanMapper.selectUrban(); + public List selectUrban(String name, String particularYear) { + return urbanMapper.selectUrban(name,particularYear); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java index d578a5bf3..ede2c76f5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java @@ -5,6 +5,7 @@ import com.ruoyi.system.domain_yada.VegetationCoverageVO; import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper; import com.ruoyi.system.mapper_yada.VegetationCoverageMapper; import com.ruoyi.system.service_yada.IVegetationCoverageService; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,8 +26,8 @@ public class VegetationCoverageServiceimpl implements IVegetationCoverageService @Override - public List selectVegetation() { - return coverageMapper.selectVegetation(); + public List selectVegetation(String region,String particularYear) { + return coverageMapper.selectVegetation(region,particularYear); } @Override diff --git a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml index b8813301a..bd8b5c05b 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml @@ -24,7 +24,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml index 4078d0dbb..477653950 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml @@ -24,7 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -44,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" created_by , created_time ) VALUES ( - #{yearMonth,jdbcType=INTEGER}, - #{month,jdbcType=INTEGER}, + #{yearMonth,jdbcType=VARCHAR}, + #{month,jdbcType=VARCHAR}, #{sstAnomalyIndex,jdbcType=DOUBLE}, #{temperatureAnomolies,jdbcType=DOUBLE}, #{precipitationAnomolies,jdbcType=DOUBLE}, diff --git a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml index ddd304cf8..d4484da00 100644 --- a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml @@ -23,6 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml index 97a102cd7..e85eed99a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml @@ -25,7 +25,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml index 0a0b01c82..e3d7b6fc7 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml @@ -25,6 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml index 5f796b70f..a78000435 100644 --- a/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml @@ -14,7 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -27,7 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml index 779198a65..58e3e1be8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml @@ -23,6 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml index df3dd9245..6dc1a200e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml @@ -25,6 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"