From 90cddd7bcbb51fa7c5b4301a6772f37e56b73118 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 19 Mar 2020 15:00:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=8C=E7=94=9F=E4=BA=BA=E5=AF=BC=E8=A7=88?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/{GovOrgFormDTO.java => CustomerGridFormDTO.java} | 4 ++-- .../java/com/epmet/controller/CustomerGridController.java | 4 ++-- .../src/main/java/com/epmet/dao/CustomerGridDao.java | 4 ++-- .../src/main/java/com/epmet/service/CustomerGridService.java | 4 ++-- .../java/com/epmet/service/impl/CustomerGridServiceImpl.java | 4 ++-- .../src/main/resources/mapper/CustomerGridDao.xml | 2 +- ...rangerController.java => StrangerResiGuideController.java} | 2 +- .../src/main/java/com/epmet/feign/GovOrgFeignClient.java | 4 ++-- .../com/epmet/feign/fallback/GovOrgFeignClientFallBack.java | 4 ++-- .../java/com/epmet/service/impl/GridVisitedServiceImpl.java | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) rename epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/{GovOrgFormDTO.java => CustomerGridFormDTO.java} (90%) rename epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/{StrangerController.java => StrangerResiGuideController.java} (97%) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GovOrgFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridFormDTO.java similarity index 90% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GovOrgFormDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridFormDTO.java index 753ff28808..c3c237e83a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GovOrgFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridFormDTO.java @@ -24,11 +24,11 @@ import java.io.Serializable; /** - * 居民端-网格链接获取客户首页配置 + * epmet-user端调用gov-org端的入参 * @author sun */ @Data -public class GovOrgFormDTO implements Serializable { +public class CustomerGridFormDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 0be5ce4745..6f1512042d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -26,7 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.CustomerGridDTO; -import com.epmet.dto.form.GovOrgFormDTO; +import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.excel.CustomerGridExcel; import com.epmet.service.CustomerGridService; import org.springframework.beans.factory.annotation.Autowired; @@ -100,7 +100,7 @@ public class CustomerGridController { * @throws Exception */ @PostMapping("getcustomergridbygridid") - public Result getCustomerGridByGridId(@RequestBody GovOrgFormDTO formDTO){ + public Result getCustomerGridByGridId(@RequestBody CustomerGridFormDTO formDTO){ return customerGridService.getCustomerGridByGridId(formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 46ff83c5db..ab9ea706c9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -19,7 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.CustomerGridDTO; -import com.epmet.dto.form.GovOrgFormDTO; +import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.entity.CustomerGridEntity; import org.apache.ibatis.annotations.Mapper; @@ -32,5 +32,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface CustomerGridDao extends BaseDao { - CustomerGridDTO getCustomerGridByGridId(GovOrgFormDTO formDTO); + CustomerGridDTO getCustomerGridByGridId(CustomerGridFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index e468ac4d23..8a779d24ca 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -21,7 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; -import com.epmet.dto.form.GovOrgFormDTO; +import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.entity.CustomerGridEntity; import java.util.List; @@ -101,5 +101,5 @@ public interface CustomerGridService extends BaseService { * @return * @date 2020-03-17 */ - Result getCustomerGridByGridId(GovOrgFormDTO formDTO); + Result getCustomerGridByGridId(CustomerGridFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index d61637487d..15f785eb31 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -26,7 +26,7 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.CustomerGridDao; import com.epmet.dto.CustomerGridDTO; -import com.epmet.dto.form.GovOrgFormDTO; +import com.epmet.dto.form.CustomerGridFormDTO; import com.epmet.entity.CustomerGridEntity; import com.epmet.redis.CustomerGridRedis; import com.epmet.service.CustomerGridService; @@ -104,7 +104,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl getCustomerGridByGridId(GovOrgFormDTO formDTO) { + public Result getCustomerGridByGridId(CustomerGridFormDTO formDTO) { return new Result().ok(baseDao.getCustomerGridByGridId(formDTO)); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 5c585fb4b3..4bce97d08f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -31,7 +31,7 @@ customer_id, CONVERT ( grid_name USING gbk ) ASC -