Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

不透水面修改

Browse Source
This commit is contained in:
songjinsheng 2022-07-12 16:31:23 +08:00
parent 2a64885193
commit e348a10862
9 changed files with 61 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java
View File

@ -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<CityFocusVO> value=service.selectExpand(city,cityCh,year);
List<CityFocusVO> 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<OrientationVO> value=service.selectOrientation(city,superior);
List<OrientationVO> value=service.selectOrientation(city,superior,country);
return AjaxResult.success(value);
}

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
View File

@ -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();

20
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java
View File

@ -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;
}
}

11
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OrientationVO.java
View File

@ -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;
}
}

7
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java
View File

@ -14,12 +14,13 @@ import java.util.List;
public interface CityExpandMapper {
List<CityFocusVO> selectExpand(@Param("city") String city,
@Param("cityCh") String cityCh,
@Param("country") String country,
@Param("year") String year);
List<OrientationVO> selectOrientation( @Param("city") String city,
@Param("superior") String superior);
@Param("superior") String superior,
@Param("country") String country);
List<CityInformation> selectInfrom(@Param("city") String city,
@Param("superior") String superior);
@Param("country") String country);
}

6
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ICityExpandService.java
View File

@ -13,9 +13,9 @@ import java.util.List;
*/
public interface ICityExpandService {
List<CityFocusVO> selectExpand(String city,String cityCh,String year);
List<CityFocusVO> selectExpand(String city,String country,String year);
List<OrientationVO> selectOrientation(String city, String superior);
List<OrientationVO> selectOrientation(String city, String superior,String country);
List<CityInformation> selectInfrom(String city, String superior);
List<CityInformation> selectInfrom(String city, String country);
}

12
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java
View File

@ -24,17 +24,17 @@ public class CityExpandServiceimpl implements ICityExpandService {
private CityExpandMapper mapper;
@Override
public List<CityFocusVO> selectExpand(String city, String cityCh, String year) {
return mapper.selectExpand(city,cityCh,year);
public List<CityFocusVO> selectExpand(String city, String country, String year) {
return mapper.selectExpand(city,country,year);
}
@Override
public List<OrientationVO> selectOrientation(String city, String superior) {
return mapper.selectOrientation(city,superior);
public List<OrientationVO> selectOrientation(String city, String superior,String country) {
return mapper.selectOrientation(city,superior,country);
}
@Override
public List<CityInformation> selectInfrom(String city, String superior) {
return mapper.selectInfrom(city,superior);
public List<CityInformation> selectInfrom(String city, String country) {
return mapper.selectInfrom(city,country);
}
}

23
ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml
View File

@ -10,17 +10,18 @@
<result property="city" column="city"/>
<result property="areaValue" column="area_value"/>
<result property="superior" column="superior"/>
<result property="country" column="country"/>
<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
id,position,city,area_value,superior,created_by,created_time,country
]]>
</sql>
<select id="selectOrientation" resultMap="RM_Expand">
<select id="selectOrientation" resultMap="RM_Orientation">
SELECT <include refid="columns_ore"/> FROM extension_orientation
where 1=1
<if test="city!= null and city !=''">
@ -29,6 +30,9 @@
<if test="superior!= null and superior !=''">
AND superior = #{superior}
</if>
<if test="country!= null and country !=''">
AND country = #{country}
</if>
</select>
<resultMap id="RM_Expand" type="com.ruoyi.system.domain_yada.CityFocusVO">
@ -39,25 +43,26 @@
<result property="yAxis" column="y_axis"/>
<result property="xAxisPy" column="x_axis_py"/>
<result property="yAxisPy" column="y_axis_py"/>
<result property="cityCh" column="city_ch"/>
<result property="cityEn" column="city_en"/>
<result property="country" column="country"/>
<result property="createBy" column="created_by"/>
<result property="createTime" column="created_time"/>
</resultMap>
<sql id="columns">
<![CDATA[
id,year,city,x_axis,y_axis,x_axis_py,y_axis_py,city_ch
id,year,city,x_axis,y_axis,x_axis_py,y_axis_py,city_en,country
]]>
</sql>
<select id="selectExpand" resultMap="RM_Expand">
SELECT <include refid="columns"/> FROM Urban_center_of_gravity
SELECT <include refid="columns"/> FROM urban_center_of_gravity
where 1=1
<if test="city!= null and city !=''">
AND city = #{city}
</if>
<if test="cityCh!= null and cityCh !=''">
AND city_ch = #{cityCh}
<if test="country!= null and country !=''">
AND country = #{country}
</if>
<if test="year!= null and year !=''">
AND year = #{year}
@ -90,8 +95,8 @@
<if test="city!= null and city !=''">
AND city = #{city}
</if>
<if test="superior!= null and superior !=''">
AND superior = #{superior}
<if test="country!= null and country !=''">
AND country = #{country}
</if>
</select>

5
ruoyi-system/src/main/resources/mapper/system/CityMapper.xml
View File

@ -40,12 +40,13 @@
<result property="position" column="position"/>
<result property="areaValue" column="area_Value"/>
<result property="superior" column="superior"/>
<result property="country" column="country"/>
<result property="createTime" column="created_Time"/>
<result property="createBy" column="created_By"/>
</resultMap>
<sql id="columns1">
<![CDATA[
id,city,superior,area_Value,position,created_Time,created_By
id,city,superior,area_Value,position,created_Time,created_By,country
]]>
</sql>
@ -57,7 +58,7 @@
AND city = #{city}
</if>
<if test="gj!= null and gj !=''">
AND superior = #{gj}
AND country = #{gj}
</if>
</select>