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 fb53b0afb..1d96c7c06 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 @@ -1,7 +1,10 @@ package com.ruoyi.web.controller.yada; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.framework.web.domain.Server; import com.ruoyi.system.domain_yada.CityFocusVO; +import com.ruoyi.system.domain_yada.CityInformation; +import com.ruoyi.system.domain_yada.OrientationVO; import com.ruoyi.system.service_yada.ICityExpandService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,11 +28,43 @@ public class CityExpandControllerr @Resource private ICityExpandService service; + /** + * 获取城市扩张方位 + * @param city + * @param cityCh + * @param year + * @return + */ @RequestMapping(value = "/selectCityExpand",method = {RequestMethod.GET}) - public AjaxResult selectCityExpand(@Param("city") String city,@Param("cityCh") String cityCh, - @Param("year") String year) + public AjaxResult selectCityExpand(String city,String cityCh, String year) { List value=service.selectExpand(city,cityCh,year); return AjaxResult.success(value); } + + /** + * 获取不透水面扩张方位 + * @param city + * @param superior + * @return + */ + @RequestMapping(value = "/selectOrientation",method = {RequestMethod.GET}) + public AjaxResult selectOrientation(String city,String superior) + { + List value=service.selectOrientation(city,superior); + return AjaxResult.success(value); + } + + /** + * 获取城市不透水面各种信息 + * @param city + * @param superior + * @return + */ + @RequestMapping(value = "/selectInformation",method = {RequestMethod.GET}) + public AjaxResult selectInformation(String city,String superior){ + List value= service.selectInfrom(city,superior); + return AjaxResult.success(value); + + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityInformation.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityInformation.java new file mode 100644 index 000000000..6a6ca344d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityInformation.java @@ -0,0 +1,137 @@ +package com.ruoyi.system.domain_yada; + +/** + * @Author: JinSheng Song + * @Date: 2022/7/1 13:55 + */ +public class CityInformation +{ + private String id; + + /** + * 城市 + */ + private String city; + /** + * 面积 + */ + private String area; + /** + * 年份 + */ + private String year; + /** + * 不透水面面积km + */ + private String imperviousSurfaceArea; + /** + * 不透水面覆盖率% + */ + private String imperviousSurfaceCoverage; + /** + * 不透水面扩张速度km/y + */ + private String speed; + /** + * 不透水面扩张强度% + */ + private String strength; + /** + * 不透水面扩张贡献度% + */ + private String contribution; + /** + * 所属国家 + */ + private String superior; + + private String country; + + 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 getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getYear() { + return year; + } + + public void setYear(String year) { + this.year = year; + } + + public String getImperviousSurfaceArea() { + return imperviousSurfaceArea; + } + + public void setImperviousSurfaceArea(String imperviousSurfaceArea) { + this.imperviousSurfaceArea = imperviousSurfaceArea; + } + + public String getImperviousSurfaceCoverage() { + return imperviousSurfaceCoverage; + } + + public void setImperviousSurfaceCoverage(String imperviousSurfaceCoverage) { + this.imperviousSurfaceCoverage = imperviousSurfaceCoverage; + } + + public String getSpeed() { + return speed; + } + + public void setSpeed(String speed) { + this.speed = speed; + } + + public String getStrength() { + return strength; + } + + public void setStrength(String strength) { + this.strength = strength; + } + + public String getContribution() { + return contribution; + } + + public void setContribution(String contribution) { + this.contribution = contribution; + } + + public String getSuperior() { + return superior; + } + + 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/domain_yada/Orientation.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Orientation.java new file mode 100644 index 000000000..d0128d961 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Orientation.java @@ -0,0 +1,60 @@ +package com.ruoyi.system.domain_yada; + +/** + * @Author: JinSheng Song + * @Date: 2022/7/1 11:08 + */ +public class Orientation extends SysBaseEntity{ + + private String id; + + private String city; + /** + * 扩张方位 + */ + private String position; + + private String 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 String getAreaValue() { + return areaValue; + } + + public void setAreaValue(String 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/CityExpandMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java index e80f05370..49c80fa1f 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 @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper_yada; import com.ruoyi.system.domain_yada.CityFocusVO; +import com.ruoyi.system.domain_yada.CityInformation; +import com.ruoyi.system.domain_yada.OrientationVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,4 +16,10 @@ public interface CityExpandMapper { List selectExpand(@Param("city") String city, @Param("cityCh") String cityCh, @Param("year") String year); + + List selectOrientation( @Param("city") String city, + @Param("superior") String superior); + + List selectInfrom(@Param("city") String city, + @Param("superior") String superior); } 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 2a5b62949..8e167a41d 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 @@ -1,6 +1,8 @@ package com.ruoyi.system.service_yada; import com.ruoyi.system.domain_yada.CityFocusVO; +import com.ruoyi.system.domain_yada.CityInformation; +import com.ruoyi.system.domain_yada.OrientationVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,4 +14,8 @@ import java.util.List; public interface ICityExpandService { List selectExpand(String city,String cityCh,String year); + + List selectOrientation(String city, String superior); + + List selectInfrom(String city, String superior); } 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 6e37bb674..8337835af 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 @@ -1,6 +1,8 @@ package com.ruoyi.system.service_yada.impl; import com.ruoyi.system.domain_yada.CityFocusVO; +import com.ruoyi.system.domain_yada.CityInformation; +import com.ruoyi.system.domain_yada.OrientationVO; import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper; import com.ruoyi.system.mapper_yada.CityExpandMapper; import com.ruoyi.system.service_yada.ICityExpandService; @@ -25,4 +27,14 @@ public class CityExpandServiceimpl implements ICityExpandService { public List selectExpand(String city, String cityCh, String year) { return mapper.selectExpand(city,cityCh,year); } + + @Override + public List selectOrientation(String city, String superior) { + return mapper.selectOrientation(city,superior); + } + + @Override + public List selectInfrom(String city, String superior) { + return mapper.selectInfrom(city,superior); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml b/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml index f651df181..d29a7508a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml @@ -4,6 +4,33 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + + @@ -37,4 +64,35 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file