From 8efa3ffe6b3fc75ecf5aa1fc89a631489d3a18fa Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 19 Mar 2020 14:18:01 +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=E5=88=9D=E5=A7=8B=E6=8F=90=E4=BA=A4v1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/OperCrmFeignClient.java | 2 +- .../java/com/epmet/feign/DemoFeignClient.java | 2 +- .../controller/CustomerGridController.java | 10 ++++-- .../epmet/service/CustomerGridService.java | 2 +- .../com/epmet/controller/HomeController.java | 12 ++++--- .../epmet/service/impl/HomeServiceImpl.java | 8 ++--- .../com/epmet/feign/GovOrgFeignClient.java | 8 +---- .../src/main/resources/bootstrap.yml | 2 ++ .../main/java/com/epmet/UserApplication.java | 2 ++ .../controller/GridVisitedController.java | 10 ++---- .../java/com/epmet/dao/GridVisitedDao.java | 2 +- .../service/impl/GridLatestServiceImpl.java | 9 +++-- .../service/impl/GridVisitedServiceImpl.java | 36 ++++++++++++++----- .../main/resources/mapper/GridVisitedDao.xml | 6 ++-- 14 files changed, 68 insertions(+), 43 deletions(-) diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java index a66d034f8e..77bcac25aa 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java @@ -4,7 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerDTO; import com.epmet.dto.result.ValidCustomerResultDTO; -import com.epmet.feign.impl.OperCrmFeignClientFallBack; +import com.epmet.feign.fallback.OperCrmFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/DemoFeignClient.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/DemoFeignClient.java index 1b0e38c53e..aaa5112b4d 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/DemoFeignClient.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/DemoFeignClient.java @@ -2,7 +2,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; -import com.epmet.feign.impl.DemoFeignClientFallBack; +import com.epmet.feign.fallback.DemoFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; 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 3cdebe5e03..0be5ce4745 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 @@ -92,9 +92,15 @@ public class CustomerGridController { ExcelUtils.exportExcelToTarget(response, null, list, CustomerGridExcel.class); } + /** + * 供epmet-user服务调用 查询客户网格表数据 + * @author sun + * @param formDTO + * @return + * @throws Exception + */ @PostMapping("getcustomergridbygridid") - public Result getCustomerGridByGridId(@RequestBody GovOrgFormDTO formDTO) throws Exception { - System.out.println("2222222222"); + public Result getCustomerGridByGridId(@RequestBody GovOrgFormDTO formDTO){ return customerGridService.getCustomerGridByGridId(formDTO); } 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 1e3045b9e6..e468ac4d23 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 @@ -96,7 +96,7 @@ public interface CustomerGridService extends BaseService { void delete(String[] ids); /** - * 根据客户Id查询用户数据 + * 根据网格Id查询用户数据 * @param formDTO * @return * @date 2020-03-17 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java index d6cfc63586..66ea831b6d 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java @@ -2,6 +2,7 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.constant.OperCustomizeConstant; import com.epmet.dto.form.ComponentListByCustomerFormDTO; import com.epmet.dto.form.CustomerHomeFormDTO; import com.epmet.dto.form.HomeDesignByCustomerFormDTO; @@ -10,7 +11,10 @@ import com.epmet.dto.result.ComponentListByCustomerResultDTO; import com.epmet.dto.result.HomeDesignByCustomerResultDTO; import com.epmet.service.HomeService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * @Description 客户定制化服务-首页相关接口 @@ -79,6 +83,7 @@ public class HomeController { } /** + * 供resi-guide服务调用 获取客户首页配置 * @param formDTO * @return com.epmet.commons.tools.utils.Result * @Author sun @@ -86,9 +91,8 @@ public class HomeController { **/ @PostMapping("gethomereleasebycustomer") public Result getHomeReleaseByCustomer(@RequestBody CustomerHomeFormDTO formDTO) { - System.out.println("33333"); - formDTO.setStatus("0"); - formDTO.setClientType("1"); + formDTO.setStatus(OperCustomizeConstant.STATUS);//已发布数据 + formDTO.setClientType("0");//居民端（token中获取） ValidatorUtils.validateEntity(formDTO); return homeService.getHomeReleaseByCustomer(formDTO); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java index 093507e308..e764eec02e 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java @@ -114,13 +114,13 @@ public class HomeServiceImpl implements HomeService { for(CommonComponentDesignResultDTO c:list){ usedComponent.add(c.getComponentId()); //所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区 - if("0".equals(c.getRegion())){ + if("titleList".equals(c.getRegion())){ resultDTO.setTitleList(c); - }else if("1".equals(c.getRegion())){ + }else if("topList".equals(c.getRegion())){ resultDTO.setTopList(c); - }else if("2".equals(c.getRegion())){ + }else if("functionList".equals(c.getRegion())){ flist.add(c); - }else if("3".equals(c.getRegion())){ + }else if("floatingList".equals(c.getRegion())){ resultDTO.setFloatingList(c); } } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index fe9f1d879b..b9d2f5b94b 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -2,17 +2,11 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.CustomerGridListQueryDTO; import com.epmet.dto.result.CustomerGridForStangerResultDTO; -import com.epmet.dto.result.CustomerGridListResultDTO; -import com.epmet.feign.impl.GovOrgFeginFallBack; +import com.epmet.feign.fallback.GovOrgFeginFallBack; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml index 6c5a00a25e..f067dc5e79 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml @@ -4,6 +4,8 @@ server: context-path: /resi/guide spring: + main: + allow-bean-definition-overriding: true application: name: resi-guide-server #环境 dev|test|prod diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java index 91f7b019da..8f8e583add 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java @@ -21,6 +21,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients; */ @SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients public class UserApplication { public static void main(String[] args) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java index 27519f2281..1f3d09d73c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridVisitedController.java @@ -23,9 +23,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; 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.GridLatestDTO; +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.GridVisitedDTO; import com.epmet.dto.form.VisitedFormDTO; import com.epmet.excel.GridVisitedExcel; @@ -96,16 +95,11 @@ public class GridVisitedController { /** * 网格访问记录表、最近访问网格表新增数据 * 网格访问记录表新增数据(一天一条) - * 最近访问表更新时间字段 + * 最近访问表更新访问时间字段 * @param formDTO */ @PostMapping("savelatestandvisited") public void saveLatestAndVisited(@RequestBody VisitedFormDTO formDTO) throws Exception { - System.out.println("1111111"); - gridVisitedService.saveLatestAndVisited(formDTO); - } - @GetMapping("getgridhome") - public void getValidCustomerList(VisitedFormDTO formDTO) throws Exception { gridVisitedService.saveLatestAndVisited(formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java index e00c9ebc70..b246bdabd5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java @@ -33,5 +33,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface GridVisitedDao extends BaseDao { - GridVisitedEntity getGridVisitedByIds(GridVisitedDTO formDTO); + GridVisitedDTO getGridVisitedByIds(GridVisitedDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java index be36d817db..ba4dcea6a1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java @@ -111,18 +111,21 @@ public class GridLatestServiceImpl extends BaseServiceImpl implements GridVisitedService { - @Autowired - private GridVisitedRedis gridVisitedRedis; @Autowired private GovOrgFeignClient govOrgFeignClient; @Autowired @@ -112,6 +109,12 @@ public class GridVisitedServiceImpl extends BaseServiceImpl