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 7fe13ad1d..fb53b0afb 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,5 +1,35 @@ -package com.ruoyi.web.controller.yada;/** +package com.ruoyi.web.controller.yada; + +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.domain_yada.CityFocusVO; +import com.ruoyi.system.service_yada.ICityExpandService; +import org.apache.ibatis.annotations.Param; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.xml.crypto.Data; +import java.util.List; + +/** + * 城市扩张 * @Author: JinSheng Song * @Date: 2022/7/1 10:09 - */public class CityExpandControllerr { + */ + +@RestController +@RequestMapping(value = "/CityExpand",produces = "application/json;charset=UTF-8") +public class CityExpandControllerr +{ + @Resource + private ICityExpandService service; + + @RequestMapping(value = "/selectCityExpand",method = {RequestMethod.GET}) + public AjaxResult selectCityExpand(@Param("city") String city,@Param("cityCh") String cityCh, + @Param("year") String year) + { + List value=service.selectExpand(city,cityCh,year); + return AjaxResult.success(value); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java index da45de275..feb2326c6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java @@ -75,7 +75,7 @@ public class ThematicMapController { List res= thematicMapService.selMapServers(chartName,chartType); return AjaxResult.success(res); } - + /** * 删除方法 * @param id id 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 707a3a278..e37346adc 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 @@ -1,5 +1,88 @@ -package com.ruoyi.system.domain_yada;/** +package com.ruoyi.system.domain_yada; + +/** * @Author: JinSheng Song * @Date: 2022/7/1 10:15 - */public class CityFocusVO { + */ +public class CityFocusVO extends SysBaseEntity +{ + private String id; + + private String xAxis; + + private String yAxis; + + private String city; + + private String year; + + private String xAxisPy; + + private String yAxisPy; + + private String cityCh; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getxAxis() { + return xAxis; + } + + public void setxAxis(String xAxis) { + this.xAxis = xAxis; + } + + public String getyAxis() { + return yAxis; + } + + public void setyAxis(String yAxis) { + this.yAxis = yAxis; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getYear() { + return year; + } + + public void setYear(String year) { + this.year = year; + } + + public String getxAxisPy() { + return xAxisPy; + } + + public void setxAxisPy(String xAxisPy) { + this.xAxisPy = xAxisPy; + } + + public String getyAxisPy() { + return yAxisPy; + } + + public void setyAxisPy(String yAxisPy) { + this.yAxisPy = yAxisPy; + } + + public String getCityCh() { + return cityCh; + } + + public void setCityCh(String cityCh) { + this.cityCh = cityCh; + } } 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 cae63148f..e80f05370 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,5 +1,17 @@ -package com.ruoyi.system.mapper_yada;/** +package com.ruoyi.system.mapper_yada; + +import com.ruoyi.system.domain_yada.CityFocusVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** * @Author: JinSheng Song * @Date: 2022/7/1 10:12 - */public class CityExpandMapper { + */ +public interface CityExpandMapper { + + List selectExpand(@Param("city") String city, + @Param("cityCh") String cityCh, + @Param("year") String year); } 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 7173d98fa..2a5b62949 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,5 +1,15 @@ -package com.ruoyi.system.service_yada;/** +package com.ruoyi.system.service_yada; + +import com.ruoyi.system.domain_yada.CityFocusVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** * @Author: JinSheng Song * @Date: 2022/7/1 10:11 - */public interface ICityExpandService { + */ +public interface ICityExpandService { + + List selectExpand(String city,String cityCh,String year); } 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 db830f074..6e37bb674 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,5 +1,28 @@ -package com.ruoyi.system.service_yada.impl;/** +package com.ruoyi.system.service_yada.impl; + +import com.ruoyi.system.domain_yada.CityFocusVO; +import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper; +import com.ruoyi.system.mapper_yada.CityExpandMapper; +import com.ruoyi.system.service_yada.ICityExpandService; +import org.springframework.stereotype.Service; + + +import javax.annotation.Resource; +import java.util.List; + +/** * @Author: JinSheng Song * @Date: 2022/7/1 10:12 - */public class CityExpandServiceimpl { + */ +@Service +public class CityExpandServiceimpl implements ICityExpandService { + + + @Resource + private CityExpandMapper mapper; + + @Override + public List selectExpand(String city, String cityCh, String year) { + return mapper.selectExpand(city,cityCh,year); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml b/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml index e69de29bb..f651df181 100644 --- a/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file