新增1不透水面信息,扩张方位
This commit is contained in:
parent
9665ec2690
commit
b94ce7f31b
@ -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<CityFocusVO> 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<OrientationVO> 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<CityInformation> value= service.selectInfrom(city,superior);
|
||||
return AjaxResult.success(value);
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
@ -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;
|
||||
}
|
||||
}
|
@ -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<CityFocusVO> selectExpand(@Param("city") String city,
|
||||
@Param("cityCh") String cityCh,
|
||||
@Param("year") String year);
|
||||
|
||||
List<OrientationVO> selectOrientation( @Param("city") String city,
|
||||
@Param("superior") String superior);
|
||||
|
||||
List<CityInformation> selectInfrom(@Param("city") String city,
|
||||
@Param("superior") String superior);
|
||||
}
|
||||
|
@ -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<CityFocusVO> selectExpand(String city,String cityCh,String year);
|
||||
|
||||
List<OrientationVO> selectOrientation(String city, String superior);
|
||||
|
||||
List<CityInformation> selectInfrom(String city, String superior);
|
||||
}
|
||||
|
@ -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<CityFocusVO> selectExpand(String city, String cityCh, String year) {
|
||||
return mapper.selectExpand(city,cityCh,year);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<OrientationVO> selectOrientation(String city, String superior) {
|
||||
return mapper.selectOrientation(city,superior);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<CityInformation> selectInfrom(String city, String superior) {
|
||||
return mapper.selectInfrom(city,superior);
|
||||
}
|
||||
}
|
||||
|
@ -4,6 +4,33 @@
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.system.mapper_yada.CityExpandMapper">
|
||||
|
||||
<resultMap id="RM_Orientation" type="com.ruoyi.system.domain_yada.OrientationVO">
|
||||
<result property="id" column="id"/>
|
||||
<result property="position" column="position"/>
|
||||
<result property="city" column="city"/>
|
||||
<result property="areaValue" column="area_value"/>
|
||||
<result property="superior" column="superior"/>
|
||||
<result property="createBy" column="created_by"/>
|
||||
<result property="createTime" column="created_time"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="columns_ore">
|
||||
<![CDATA[
|
||||
id,position,city,area_value,superior,created_by,created_time
|
||||
]]>
|
||||
</sql>
|
||||
|
||||
<select id="selectOrientation" resultMap="RM_Expand">
|
||||
SELECT <include refid="columns_ore"/> FROM extension_orientation
|
||||
where 1=1
|
||||
<if test="city!= null and city !=''">
|
||||
AND city = #{city}
|
||||
</if>
|
||||
<if test="superior!= null and superior !=''">
|
||||
AND superior = #{superior}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<resultMap id="RM_Expand" type="com.ruoyi.system.domain_yada.CityFocusVO">
|
||||
<result property="id" column="id"/>
|
||||
<result property="year" column="year"/>
|
||||
@ -37,4 +64,35 @@
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<resultMap id="RM_Inform" type="com.ruoyi.system.domain_yada.CityInformation">
|
||||
<result property="id" column="id"/>
|
||||
<result property="year" column="year"/>
|
||||
<result property="city" column="city"/>
|
||||
<result property="area" column="area"/>
|
||||
<result property="imperviousSurfaceArea" column="impervious_surface_area"/>
|
||||
<result property="imperviousSurfaceCoverage" column="impervious_surface_coverage"/>
|
||||
<result property="speed" column="speed"/>
|
||||
<result property="strength" column="strength"/>
|
||||
<result property="contribution" column="contribution"/>
|
||||
<result property="superior" column="superior"/>
|
||||
<result property="country" column="country"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="columns_Infrom">
|
||||
<![CDATA[
|
||||
id,year,city,area,impervious_surface_area,impervious_surface_coverage,speed,strength,contribution,superior,country
|
||||
]]>
|
||||
</sql>
|
||||
|
||||
<select id="selectInfrom" resultMap="RM_Inform">
|
||||
SELECT <include refid="columns_Infrom"/> FROM urban_impervious_surface
|
||||
where 1=1
|
||||
<if test="city!= null and city !=''">
|
||||
AND city = #{city}
|
||||
</if>
|
||||
<if test="superior!= null and superior !=''">
|
||||
AND superior = #{superior}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
</mapper>
|
Loading…
Reference in New Issue
Block a user