From e348a10862b7dac0c74ecba2e31801873df6afb5 Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Tue, 12 Jul 2022 16:31:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E9=80=8F=E6=B0=B4=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yada/CityExpandControllerr.java | 9 ++++---- .../framework/config/SecurityConfig.java | 2 +- .../ruoyi/system/domain_yada/CityFocusVO.java | 20 ++++++++++++---- .../system/domain_yada/OrientationVO.java | 11 +++++++++ .../system/mapper_yada/CityExpandMapper.java | 7 +++--- .../service_yada/ICityExpandService.java | 6 ++--- .../impl/CityExpandServiceimpl.java | 12 +++++----- .../mapper/system/CityExpandMapper.xml | 23 +++++++++++-------- .../resources/mapper/system/CityMapper.xml | 5 ++-- 9 files changed, 61 insertions(+), 34 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java index f814cccae..7b011d376 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java @@ -30,14 +30,13 @@ public class CityExpandControllerr /** * 获取城市扩张方位 * @param city - * @param cityCh * @param year * @return */ @RequestMapping(value = "/selectCityExpand",method = {RequestMethod.GET}) - public AjaxResult selectCityExpand(String city,String cityCh, String year) + public AjaxResult selectCityExpand(String city,String country, String year) { - List value=service.selectExpand(city,cityCh,year); + List value=service.selectExpand(city,country,year); return AjaxResult.success(value); } @@ -48,9 +47,9 @@ public class CityExpandControllerr * @return */ @RequestMapping(value = "/selectOrientation",method = {RequestMethod.GET}) - public AjaxResult selectOrientation(String city,String superior) + public AjaxResult selectOrientation(String city,String superior,String country) { - List value=service.selectOrientation(city,superior); + List value=service.selectOrientation(city,superior,country); return AjaxResult.success(value); } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index cdcff26ec..b58af4f19 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -114,7 +114,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter .antMatchers("/login", "/captcha/get", "/captcha/check").permitAll() .antMatchers("/*/api-docs").anonymous() .antMatchers("/druid/**").anonymous() - // 除上面外的所有请求全部需要鉴权认证 +// // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated() .and() .headers().frameOptions().disable(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java index e37346adc..a6b61d61f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java @@ -20,7 +20,9 @@ public class CityFocusVO extends SysBaseEntity private String yAxisPy; - private String cityCh; + private String cityEn; + + private String country; public String getId() { return id; @@ -78,11 +80,19 @@ public class CityFocusVO extends SysBaseEntity this.yAxisPy = yAxisPy; } - public String getCityCh() { - return cityCh; + public String getCityEn() { + return cityEn; } - public void setCityCh(String cityCh) { - this.cityCh = cityCh; + public void setCityEn(String cityEn) { + this.cityEn = cityEn; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OrientationVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OrientationVO.java index 566571adf..9997286e7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OrientationVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OrientationVO.java @@ -16,6 +16,9 @@ public class OrientationVO extends SysBaseEntity private String superior; + + private String country; + public String getId() { return id; } @@ -55,4 +58,12 @@ public class OrientationVO extends SysBaseEntity public void setSuperior(String superior) { this.superior = superior; } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java index 49c80fa1f..0223fc5da 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java @@ -14,12 +14,13 @@ import java.util.List; public interface CityExpandMapper { List selectExpand(@Param("city") String city, - @Param("cityCh") String cityCh, + @Param("country") String country, @Param("year") String year); List selectOrientation( @Param("city") String city, - @Param("superior") String superior); + @Param("superior") String superior, + @Param("country") String country); List selectInfrom(@Param("city") String city, - @Param("superior") String superior); + @Param("country") String country); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityExpandService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityExpandService.java index 8e167a41d..54de70915 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityExpandService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityExpandService.java @@ -13,9 +13,9 @@ import java.util.List; */ public interface ICityExpandService { - List selectExpand(String city,String cityCh,String year); + List selectExpand(String city,String country,String year); - List selectOrientation(String city, String superior); + List selectOrientation(String city, String superior,String country); - List selectInfrom(String city, String superior); + List selectInfrom(String city, String country); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java index 8337835af..24dcfac2d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java @@ -24,17 +24,17 @@ public class CityExpandServiceimpl implements ICityExpandService { private CityExpandMapper mapper; @Override - public List selectExpand(String city, String cityCh, String year) { - return mapper.selectExpand(city,cityCh,year); + public List selectExpand(String city, String country, String year) { + return mapper.selectExpand(city,country,year); } @Override - public List selectOrientation(String city, String superior) { - return mapper.selectOrientation(city,superior); + public List selectOrientation(String city, String superior,String country) { + return mapper.selectOrientation(city,superior,country); } @Override - public List selectInfrom(String city, String superior) { - return mapper.selectInfrom(city,superior); + public List selectInfrom(String city, String country) { + return mapper.selectInfrom(city,country); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml b/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml index d29a7508a..484a4d93e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml @@ -10,17 +10,18 @@ + - SELECT FROM extension_orientation where 1=1 @@ -29,6 +30,9 @@ AND superior = #{superior} + + AND country = #{country} + @@ -39,25 +43,26 @@ - + + diff --git a/ruoyi-system/src/main/resources/mapper/system/CityMapper.xml b/ruoyi-system/src/main/resources/mapper/system/CityMapper.xml index 9948281f9..b44db6a38 100644 --- a/ruoyi-system/src/main/resources/mapper/system/CityMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/CityMapper.xml @@ -40,12 +40,13 @@ + @@ -57,7 +58,7 @@ AND city = #{city} - AND superior = #{gj} + AND country = #{gj}