From b51521dac7e12ea9f1d718c889c925958bde2656 Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Tue, 28 Jun 2022 11:58:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/yada/CityController.java | 15 ++++- .../com/ruoyi/system/domain_yada/CityVo.java | 10 ++-- .../system/domain_yada/GlobalTypeVO.java | 10 ++++ .../system/domain_yada/OrientationVO.java | 58 +++++++++++++++++++ .../ruoyi/system/mapper_yada/CityMapper.java | 5 +- .../system/service_yada/ICityService.java | 5 ++ .../service_yada/impl/CityServiceimpl.java | 6 ++ .../resources/mapper/system/CityMapper.xml | 44 ++++++++++++-- .../mapper/system/GlobalTypeMapper.xml | 3 +- 9 files changed, 143 insertions(+), 13 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OrientationVO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityController.java index 440184b0b..8a3936a26 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityController.java @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.yada; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.system.domain_yada.CityVo; +import com.ruoyi.system.domain_yada.OrientationVO; import com.ruoyi.system.service_yada.ICityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,12 +18,15 @@ import java.util.List; * 城市 */ @RestController -@RequestMapping(value = "/business-service/api/City") +@RequestMapping(value = "/business-service/api/City", produces = "application/json;charset=UTF-8") @Api(tags = "城市") public class CityController { @Resource private ICityService cityService; + + + @RequestMapping(value = "/getImpervious",method = {RequestMethod.GET}) @ApiOperation(value = "不透水面面积",httpMethod = "GET") public AjaxResult getImpervious(String city,String country) @@ -30,4 +34,13 @@ public class CityController List cityVos=cityService.selectCity(city,country); return AjaxResult.success(cityVos); } + + + @RequestMapping(value = "/getOrientation",method = {RequestMethod.GET}) + @ApiOperation(value = "不透水面扩张方向",httpMethod = "GET") + public AjaxResult getOrientation(String city,String country) + { + List cityVos=cityService.selectOrientation(city,country); + return AjaxResult.success(cityVos); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityVo.java index 0425ab5ee..13b5759a8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityVo.java @@ -32,7 +32,7 @@ public class CityVo extends SysBaseEntity private Double imperviousSurfaceExpansionCntribution ; - private String countryIdentification; + private String superior; public String getId() { return id; @@ -100,11 +100,11 @@ public class CityVo extends SysBaseEntity this.imperviousSurfaceExpansionCntribution = imperviousSurfaceExpansionCntribution; } - public String getCountryIdentification() { - return countryIdentification; + public String getSuperior() { + return superior; } - public void setCountryIdentification(String countryIdentification) { - this.countryIdentification = countryIdentification; + public void setSuperior(String superior) { + this.superior = superior; } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java index de15e7b67..8ad864b2b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java @@ -17,6 +17,8 @@ public class GlobalTypeVO extends SysBaseEntity { private Double area; + private Double areaChange; + private int particularYear; public String getId() { @@ -66,4 +68,12 @@ public class GlobalTypeVO extends SysBaseEntity { public void setParticularYear(int particularYear) { this.particularYear = particularYear; } + + public Double getAreaChange() { + return areaChange; + } + + public void setAreaChange(Double areaChange) { + this.areaChange = areaChange; + } } 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 new file mode 100644 index 000000000..566571adf --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OrientationVO.java @@ -0,0 +1,58 @@ +package com.ruoyi.system.domain_yada; + +/** + * @Author: JinSheng Song + * @Date: 2022/6/24 15:04 + */ +public class OrientationVO extends SysBaseEntity +{ + private String id; + + private String city; + + private String position; + + private Double areaValue; + + private String superior; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + + public Double getAreaValue() { + return areaValue; + } + + public void setAreaValue(Double areaValue) { + this.areaValue = areaValue; + } + + public String getSuperior() { + return superior; + } + + public void setSuperior(String superior) { + this.superior = superior; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityMapper.java index 1c068247f..fe0b45f47 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.system.mapper_yada; import com.ruoyi.system.domain_yada.CityVo; +import com.ruoyi.system.domain_yada.OrientationVO; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,6 +13,7 @@ import java.util.List; */ public interface CityMapper { - List selectCity(String city,String gj); + List selectCity(@Param("city") String city, @Param("gj") String gj); + List selectOrientation(@Param("city") String city, @Param("gj") String gj); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityService.java index 8491932a7..a477c4267 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service_yada; import com.ruoyi.system.domain_yada.CityVo; +import com.ruoyi.system.domain_yada.OrientationVO; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,4 +13,7 @@ import java.util.List; public interface ICityService { List selectCity(String city, String gj); + + + List selectOrientation(String city, String gj); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityServiceimpl.java index e17272564..88f937cc3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityServiceimpl.java @@ -1,6 +1,7 @@ package com.ruoyi.system.service_yada.impl; import com.ruoyi.system.domain_yada.CityVo; +import com.ruoyi.system.domain_yada.OrientationVO; import com.ruoyi.system.mapper_yada.AorestCoverageMapper; import com.ruoyi.system.mapper_yada.CityMapper; import com.ruoyi.system.service_yada.ICityService; @@ -22,4 +23,9 @@ public class CityServiceimpl implements ICityService { public List selectCity(String city, String gj) { return cityMapper.selectCity(city,gj); } + + @Override + public List selectOrientation(String city, String gj) { + return cityMapper.selectOrientation(city,gj); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/CityMapper.xml b/ruoyi-system/src/main/resources/mapper/system/CityMapper.xml index 3b24fe734..9948281f9 100644 --- a/ruoyi-system/src/main/resources/mapper/system/CityMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/CityMapper.xml @@ -11,20 +11,54 @@ - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml index 5ed298ce6..18043c61f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml @@ -12,13 +12,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +