From aea84913899c656b90b385bb198c621eaf59cdea Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 15 Oct 2021 10:38:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E5=88=97=E8=A1=A8PC=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/controller/CityController.java | 2 +- .../main/java/com/elink/esua/epdc/dao/CityDao.java | 12 +++++++++++- .../com/elink/esua/epdc/service/CityService.java | 9 +++++++++ .../esua/epdc/service/impl/CityServiceImpl.java | 10 +++++++++- .../src/main/resources/mapper/CityDao.xml | 8 ++++++++ 5 files changed, 38 insertions(+), 3 deletions(-) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/CityController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/CityController.java index 2a4071f..6dcad49 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/CityController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/CityController.java @@ -113,7 +113,7 @@ public class CityController { */ @GetMapping("getSysAreaInfo") public Result getSysAreaInfo(CityAreaFormDTO dto) { - return cityService.getAreaInfo(dto); + return cityService.getSysAreaInfo(dto); } } \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/CityDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/CityDao.java index ac2703a..901ae99 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/CityDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/CityDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.epdc.form.CityAreaFormDTO; +import com.elink.esua.epdc.dto.epdc.form.SysCityAreaFormDTO; import com.elink.esua.epdc.entity.CityEntity; import org.apache.ibatis.annotations.Mapper; @@ -34,11 +35,20 @@ import java.util.List; public interface CityDao extends BaseDao { /** - * @describe: 行程上报获取省/市/区/街道/社区信息，通过pid + * @describe: 居民端-行程上报获取省/市/区/街道/社区信息，通过pid * @author wangtong * @date 2021/10/14 9:35 * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result */ List getAreaInfoByPid(CityAreaFormDTO dto); + + /** + * @describe: PC端-行程上报获取省/市/区/街道/社区信息，通过pid + * @author wangtong + * @date 2021/10/14 9:35 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List getSysAreaInfo(CityAreaFormDTO dto); } \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/CityService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/CityService.java index e068f67..e0b26ce 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/CityService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/CityService.java @@ -103,4 +103,13 @@ public interface CityService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result getAreaInfo(CityAreaFormDTO dto); + + /** + * @describe: PC端-行程上报获取省/市/区/街道/社区信息，通过pid + * @author wangtong + * @date 2021/10/14 9:35 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getSysAreaInfo(CityAreaFormDTO dto); } \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/CityServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/CityServiceImpl.java index ab0a14b..6214829 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/CityServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/CityServiceImpl.java @@ -20,13 +20,14 @@ package com.elink.esua.epdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.CityDao; import com.elink.esua.epdc.dto.CityDTO; import com.elink.esua.epdc.dto.epdc.form.CityAreaFormDTO; +import com.elink.esua.epdc.dto.epdc.form.SysCityAreaFormDTO; import com.elink.esua.epdc.entity.CityEntity; import com.elink.esua.epdc.redis.CityRedis; import com.elink.esua.epdc.service.CityService; @@ -112,4 +113,11 @@ public class CityServiceImpl extends BaseServiceImpl implem return new Result().ok(result); } + @Override + public Result getSysAreaInfo(CityAreaFormDTO dto) { + log.info("dto:"+dto); + List result = baseDao.getSysAreaInfo(dto); + return new Result().ok(result); + } + } \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/resources/mapper/CityDao.xml b/epdc-cloud-admin/src/main/resources/mapper/CityDao.xml index ad7bb71..8dc6889 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/CityDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/CityDao.xml @@ -24,6 +24,14 @@ WHERE pid=#{pid} order by sort asc + \ No newline at end of file