修改查询方法，增加查询条件

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" +
+        System.out.println("   --->>>启动成功！<<<---");
-                " .-------.       ____     __        \n" +
+//        System.out.println("(♥◠‿◠)ﾉﾞ    ლ(´ڡ`ლ)ﾞ  \n" +
-                " |  _ _   \\   喵   \\   \\   /  /    \n" +
+//                " .-------.       ____     __        \n" +
-                " | ( ' )  |   喵    \\  _. /  '       \n" +
+//                " |  _ _   \\      \\   \\   /  /    \n" +
-                " |(_ o _) /     喵   _( )_ .'         \n" +
+//                " | ( ' )  |       \\  _. /  '       \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
+//                " |(_ o _) /      _( )_ .'         \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+//                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
+//                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  |  \\    /  \\      /           \n" +
+//                " |  | \\ `'   /|   `-'  /           \n" +
-                " ''-'   `'-'    `-..-'              ");
+//                " |  |  \\    /  \\      /           \n" +
+//                " ''-'   `'-'    `-..-'              ");
     }
 
 }

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<AorestCoverageVO> eastVOSList= service.selectAorestCoverage();
+        List<AorestCoverageVO> eastVOSList= service.selectAorestCoverage(coverageVO.getRegion(),coverageVO.getParticularYear());
         return AjaxResult.success(eastVOSList);
     }
 
@@ -167,4 +167,6 @@ public class AorestCoverageController {
          return AjaxResult.success(diclist);
      }
 
+
+
 }

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<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
+        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia(eastVO.getYearMonth(),eastVO.getMonth());
              return AjaxResult.success(eastVOSList);
     }
 

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<OceanTemperatureVO> eastVOSList= temperatureService.selectOcean();
+        List<OceanTemperatureVO> eastVOSList= temperatureService.selectOcean(temperatureVO.getStartDate());
         return AjaxResult.success(eastVOSList);
     }
 

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<RegionVGIVO> vgivost= regionVGIService.selectRegion();
+        List<RegionVGIVO> vgivost= regionVGIService.selectRegion(regionVGIVO.getTypeName(),regionVGIVO.getParticularYear());
         return AjaxResult.success(vgivost);
     }
 

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<RegionalSystemVO> eastVOSList= systemService.selectRegional();
+        List<RegionalSystemVO> eastVOSList= systemService.selectRegional(response.getRegion(),response.getParticularYear());
         return AjaxResult.success(eastVOSList);
     }
 

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.setYearMonth(row.getCell(0).toString());
-                value.setMonth(Double.parseDouble(row.getCell(1).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()));

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<ThematicMapDomain> res= thematicMapService.selectAll();
+        List<ThematicMapDomain> res= thematicMapService.selectAll(thematicMapDomain.getPictureTime(),
+                thematicMapDomain.getPictureZh());
         return AjaxResult.success(res);
     }
     /**

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<UrbanVO> eastVOSList= urbanService.selectUrban();
+        List<UrbanVO> eastVOSList= urbanService.selectUrban(urbanVO.getName(),urbanVO.getParticularYear());
         return AjaxResult.success(eastVOSList);
     }
 

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<VegetationCoverageVO> eastVOSList= coverageService.selectVegetation();
+        List<VegetationCoverageVO> eastVOSList= coverageService.selectVegetation(coverageVO.getRegion(),coverageVO.getParticularYear());
         return AjaxResult.success(eastVOSList);
     }
 

ruoyi-admin/src/main/resources/application.yml

@@ -86,7 +86,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 300
 
 # MyBatis配置
 mybatis:

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;
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java

@@ -13,7 +13,8 @@ import java.util.List;
  */
 public interface AorestCoverageMapper {
 
-    List<AorestCoverageVO> selectAorestCoverage();
+    List<AorestCoverageVO> selectAorestCoverage(@Param("region") String region,
+                                                @Param("particularYear") String particularYear);
 
     Integer DelAorestCoverage(@Param("id") String id);
 

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java

@@ -13,7 +13,8 @@ import java.util.List;
  */
 public interface AustraliaMiddleEastMapper {
 
-    List<AustraliaMiddleEastVO> selectAustralia();
+    List<AustraliaMiddleEastVO> selectAustralia(@Param("yearMonth") String yearMonth,
+                                                @Param("month") String month);
 
     Integer DelAustralia(@Param("id") String id);
 

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<OceanTemperatureVO> selectOcean();
+    List<OceanTemperatureVO> selectOcean(@Param("startDate") LocalDate startDate);
 
     Integer DelOcean(@Param("id") String id);
 

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java

@@ -11,7 +11,8 @@ import java.util.List;
  */
 public interface RegionVGIMapper {
 
-    List<RegionVGIVO> selectRegion();
+    List<RegionVGIVO> selectRegion(@Param("typeName") String typeName,
+                                   @Param("particularYear") String particularYear);
 
     Integer DelRegion(@Param("id") String id);
 

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<RegionalSystemVO> selectRegional();
+    List<RegionalSystemVO> selectRegional(@Param("region") String region,
+                                          @Param("particularYear") String particularYear);
 
     Integer DelRegional(@Param("id") String id);
 

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<ThematicMapDomain> selectAllThematicMap();
+    List<ThematicMapDomain> selectAllThematicMap(@Param("pictureTime") LocalDateTime pictureTime,
+                                                 @Param("pictureZh") String pictureZh);
 
     /**
      * 删除专题图根据编号

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java

@@ -12,7 +12,8 @@ import java.util.List;
  */
 public interface UrbanMapper {
 
-    List<UrbanVO> selectUrban();
+    List<UrbanVO> selectUrban(@Param("name") String name,
+                              @Param("particularYear") String particularYear);
 
     Integer DelUrban(@Param("id") String id);
 

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java

@@ -11,7 +11,8 @@ import java.util.List;
  */
 public interface VegetationCoverageMapper {
 
-    List<VegetationCoverageVO> selectVegetation();
+    List<VegetationCoverageVO> selectVegetation(@Param("region") String region,
+                                                @Param("particularYear") String particularYear);
 
     Integer DelVegetation(@Param("id") String id);
 

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<AorestCoverageVO> selectAorestCoverage();
+    public List<AorestCoverageVO> selectAorestCoverage(String region,String particularYear);
 
     public Integer DelAorestCoverage(String id);
 

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<AustraliaMiddleEastVO> selectAustralia();
+    public  List<AustraliaMiddleEastVO> selectAustralia(String yearMonth,String month);
 
     public Integer DelAustralia(@Param("id") String id);
 

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<OceanTemperatureVO> selectOcean();
+    public List<OceanTemperatureVO> selectOcean(LocalDate startDate);
 
     public Integer DelOcean(@Param("id") String id);
 

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java

@@ -15,7 +15,7 @@ public interface IRegionVGIService {
      * 查询
      * @return
      */
-    public List<RegionVGIVO> selectRegion();
+    public List<RegionVGIVO> selectRegion(String typeName,String particularYear);
 
     /**
      * 删除

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<RegionalSystemVO> selectRegional();
+    public List<RegionalSystemVO> selectRegional(String region,String particularYear);
 
     public Integer DelRegional(@Param("id") String id);
 

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<UrbanVO> selectUrban();
+    public List<UrbanVO> selectUrban(String name, String particularYear);
 
     public Integer DelUrban(@Param("id") String id);
 

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<VegetationCoverageVO> selectVegetation();
+    public List<VegetationCoverageVO> selectVegetation(String region,String particularYear);
 
     public Integer DelVegetation(String id);
 

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<ThematicMapDomain> selectAll();
+    List<ThematicMapDomain> selectAll(LocalDateTime pictureTime, String pictureZh);
 
     /**
      * 删除专题图根据编号

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<AorestCoverageVO> selectAorestCoverage() {
+    public List<AorestCoverageVO> selectAorestCoverage(String region,String particularYear) {
-        return coverageMapper.selectAorestCoverage();
+        return coverageMapper.selectAorestCoverage(region,particularYear);
     }
 
     @Override

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<AustraliaMiddleEastVO> selectAustralia()
+    public List<AustraliaMiddleEastVO> selectAustralia(String yearMonth,String month)
     {
-        return australiaMiddleEastMapper.selectAustralia();
+        return australiaMiddleEastMapper.selectAustralia(yearMonth,month);
     }
 
     @Override

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<OceanTemperatureVO> selectOcean() {
+    public List<OceanTemperatureVO> selectOcean(LocalDate startDate) {
-        return oceanMapper.selectOcean();
+        return oceanMapper.selectOcean(startDate);
     }
 
     @Override

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<RegionVGIVO> selectRegion() {
+    public List<RegionVGIVO> selectRegion(String typeName,String particularYear) {
-        return vgiMapper.selectRegion();
+        return vgiMapper.selectRegion(typeName,particularYear);
     }
 
     @Override

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<RegionalSystemVO> selectRegional() {
+    public List<RegionalSystemVO> selectRegional(String region,String particularYear) {
-        return Regional.selectRegional();
+        return Regional.selectRegional(region,particularYear);
     }
 
     @Override

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<ThematicMapDomain> selectAll(){
+    public List<ThematicMapDomain> selectAll(LocalDateTime pictureTime,String pictureZh){
-        return thematicMapMapper.selectAllThematicMap();
+        return thematicMapMapper.selectAllThematicMap(pictureTime,pictureZh);
     }
 
     /**

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<UrbanVO> selectUrban() {
+    public List<UrbanVO> selectUrban(String name, String particularYear) {
-        return urbanMapper.selectUrban();
+        return urbanMapper.selectUrban(name,particularYear);
     }
 
     @Override

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<VegetationCoverageVO> selectVegetation() {
+    public List<VegetationCoverageVO> selectVegetation(String region,String particularYear) {
-        return coverageMapper.selectVegetation();
+        return coverageMapper.selectVegetation(region,particularYear);
     }
 
     @Override

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

@@ -24,7 +24,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</sql>
 
     <select id="selectAorestCoverage" resultMap="RM_AorestCoverage">
-        SELECT  <include refid="columns"/>  FROM  forest_coverage;
+        SELECT  <include refid="columns"/>  FROM  forest_coverage
+    WHERE 1=1
+        <if test="particularYear!= null and particularYear !=''">
+        AND particular_year = #{particularYear}
+        </if>
+        <if test="region!= null and region !=''">
+            AND region = #{typeName}
+        </if>
+
+
     </select>
 
     <delete id="DelAorestCoverage">

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

@@ -24,7 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</sql>
 
     <select id="selectAustralia" resultMap="RM_AustraliaMiddleEast">
-        SELECT  <include refid="columns"/>  FROM  central_and_eastern_australia;
+        SELECT  <include refid="columns"/>  FROM  central_and_eastern_australia
+        WHERE 1=1
+        <if test="yearMonth!= null and yearMonth !=''">
+            AND particular_month = #{yearMonth}
+        </if>
+        <if test="month!= null and month !=''">
+            AND month = #{month}
+        </if>
     </select>
 
     <delete id="DelAustralia">
@@ -44,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             created_by ,
             created_time
         ) VALUES (
-                     #{yearMonth,jdbcType=INTEGER},
+                     #{yearMonth,jdbcType=VARCHAR},
-                     #{month,jdbcType=INTEGER},
+                     #{month,jdbcType=VARCHAR},
                      #{sstAnomalyIndex,jdbcType=DOUBLE},
                      #{temperatureAnomolies,jdbcType=DOUBLE},
                      #{precipitationAnomolies,jdbcType=DOUBLE},

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

@@ -23,6 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOcean" resultMap="RM_Ocean">
         SELECT  <include refid="columns"/>  FROM  sea_surface_temperature_anomaly
+        WHERE 1=1
+        <if test="startDate!= null and startDate !=''">
+            AND startDate > #{startDate}
+        </if>
+
     </select>
 
     <delete id="DelOcean">

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

@@ -25,7 +25,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</sql>
 
     <select id="selectRegion" resultMap="RM_RegionVGI">
-        SELECT  <include refid="columns"/>  FROM  region_vgi;
+        SELECT  <include refid="columns"/>  FROM  region_vgi
+        WHERE 1=1
+        <if test="particularYear!= null and particularYear !=''">
+            AND particular_year = #{particularYear}
+        </if>
+        <if test="typeName!= null and typeName !=''">
+            AND type_name = #{typeName}
+        </if>
     </select>
 
     <delete id="DelRegion">

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

@@ -25,6 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectRegional" resultMap="RM_Regional">
         SELECT  <include refid="columns"/>  FROM  proportion_of_ecosystem_type_transfer
+        WHERE 1=1
+        <if test="particularYear!= null and particularYear !=''">
+            AND particular_year = #{particularYear}
+        </if>
+        <if test="region!= null and region !=''">
+            AND region = #{region}
+        </if>
     </select>
 
     <delete id="DelRegional">

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

@@ -14,7 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pictureType" column="picture_type"/>
         <result property="pictureTime" column="picture_time"/>
         <result property="picturePath" column="picture_path"/>
-        <result property="pictureTime" column="picture_time"/>
         <result property="remarks" column="remarks"/>
         <result property="createdBy" column="created_by"/>
         <result property="createdTime" column="created_time"/>
@@ -27,7 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</sql>
 
     <select id="selectAllThematicMap" resultMap="RM_ThematicMap">
-        SELECT  <include refid="columns"/>  FROM thematic_map;
+        SELECT  <include refid="columns"/>  FROM thematic_map
+        WHERE 1=1
+        <if test="pictureTime!= null and pictureTime !=''">
+            AND picture_time = #{pictureTime}
+        </if>
+        <if test="pictureZh!= null and pictureZh !=''">
+            AND picture_zh = #{pictureZh}
+        </if>
     </select>
 
     <delete id="deleteThematicMap">

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

@@ -23,6 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectUrban" resultMap="RM_Urban">
         SELECT  <include refid="columns"/>  FROM  urban_agglomeration_china
+        WHERE 1=1
+        <if test="particularYear!= null and particularYear !=''">
+            AND particular_year = #{particularYear}
+        </if>
+        <if test="name!= null and name !=''">
+            AND name = #{name}
+        </if>
     </select>
 
     <delete id="DelUrban">

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

@@ -25,6 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectVegetation" resultMap="RM_Vegetation">
         SELECT  <include refid="columns"/>  FROM  fvc_npp
+        WHERE 1=1
+        <if test="particularYear!= null and particularYear !=''">
+            AND particular_year = #{particularYear}
+        </if>
+        <if test="region != null and region !=''">
+            AND region = #{region}
+        </if>
     </select>
 
     <delete id="DelVegetation">