From 2a648851939e231131978d7b349118fafa1c5db5 Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Fri, 8 Jul 2022 14:46:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/web/controller/yada/GlobalTypeController.java | 7 +++---- .../web/controller/yada/VegetationCoverageController.java | 4 ++-- .../com/ruoyi/system/mapper_yada/GlobalTypeMapper.java | 2 +- .../system/mapper_yada/VegetationCoverageMapper.java | 3 +-- .../com/ruoyi/system/service_yada/IGlobalTypeService.java | 2 +- .../system/service_yada/IVegetationCoverageService.java | 2 +- .../system/service_yada/impl/GlobalTypeServiceimpl.java | 4 ++-- .../service_yada/impl/VegetationCoverageServiceimpl.java | 4 ++-- .../src/main/resources/mapper/system/RegionVGIMapper.xml | 2 +- .../resources/mapper/system/VegetationCoverageMapper.xml | 8 ++++---- 10 files changed, 18 insertions(+), 20 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java index 60716f416..0a6e18146 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java @@ -33,15 +33,14 @@ public class GlobalTypeController { /** * 查询方法 - * @param response 响应头 - * @param request 客户端请求 + * @return 参数类 */ @RequestMapping(value = "/selectGlobalType",method = {RequestMethod.POST}) @ApiOperation(value = "查询方法",httpMethod = "POST") - public AjaxResult selectGlobalType(HttpServletResponse response, HttpServletRequest request,@RequestBody GlobalTypeVO TypeVO) + public AjaxResult selectGlobalType() { - List eastVOSList= typeService.selectGlobalType(TypeVO.getTypeName(),TypeVO.getParticularYear()); + List eastVOSList= typeService.selectGlobalType(); 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 8fff6fb69..6408f3bf8 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 @@ -37,9 +37,9 @@ public class VegetationCoverageController { */ @RequestMapping(value = "/selectVegetation",method = {RequestMethod.GET}) @ApiOperation(value = "查询方法",httpMethod = "GET") - public AjaxResult selectVegetation() + public AjaxResult selectVegetation(String type) { - List eastVOSList= coverageService.selectVegetation(); + List eastVOSList= coverageService.selectVegetation(type); return AjaxResult.success(eastVOSList); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java index 8366c5ce6..1857f52fa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java @@ -11,7 +11,7 @@ import java.util.List; */ public interface GlobalTypeMapper { - List selectGlobalType(@Param("typeName") String typeName, @Param("particularYear") Integer particularYear); + List selectGlobalType(/*@Param("typeName") String typeName, @Param("particularYear") Integer particularYear*/); Integer DelGlobalType(@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 c8bbe124e..3ed4b64e1 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,8 +11,7 @@ import java.util.List; */ public interface VegetationCoverageMapper { - List selectVegetation(/*@Param("region") String region, - @Param("particularYear") String particularYear*/); + List selectVegetation(@Param("type") String type); Integer DelVegetation(@Param("id") String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java index 08804ac47..6d37a8197 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java @@ -13,7 +13,7 @@ import java.util.List; */ public interface IGlobalTypeService { - public List selectGlobalType(String typeName, Integer particularYear); + public List selectGlobalType(/*String typeName, Integer particularYear*/); public Integer DelGlobalType(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 c3e141b91..b0f6428fc 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(/*String region,String particularYear*/); + public List selectVegetation(String type); public Integer DelVegetation(String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java index a86b6c23f..694609d3e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java @@ -26,8 +26,8 @@ public class GlobalTypeServiceimpl implements IGlobalTypeService { @Override - public List selectGlobalType(String typeName, Integer particularYear) { - return typeMapper.selectGlobalType(typeName, particularYear); + public List selectGlobalType(/*String typeName, Integer particularYear*/) { + return typeMapper.selectGlobalType(/*typeName, 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 69d7fd586..77be86694 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 @@ -26,8 +26,8 @@ public class VegetationCoverageServiceimpl implements IVegetationCoverageService @Override - public List selectVegetation(/*String region,String particularYear*/) { - return coverageMapper.selectVegetation(/*region,particularYear*/); + public List selectVegetation(String type) { + return coverageMapper.selectVegetation(type); } @Override diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml index 14c408696..333479f41 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT FROM fvc_npp - - - - + WHERE 1=1 + + AND type = #{type} +