diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 3122ec2540..8acbdd9bf6 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -141,8 +141,8 @@ http://127.0.0.1:8090 - - http://localhost:8091 + + http://127.0.0.1:8091 http://127.0.0.1:8092 diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 36fabb7b50..94d5e8a27a 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -127,6 +127,7 @@ spring: - Path=${server.servlet.context-path}/resi/guide/** filters: - StripPrefix=1 + - CpAuth=true #政府端组织管理 - id: gov-org-server uri: @gateway.routes.gov-org-server.uri@ @@ -179,6 +180,7 @@ renren: - /epmetuser/** - /gov/org/** - /oper/access/** + - /resi/guide/** management: endpoints: web: @@ -239,6 +241,7 @@ epmet: - /epmetuser/** - /gov/org/** - /oper/access/** + - /resi/guide/** swaggerUrls: jwt: diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java index 2588109776..0e6ecfe1bc 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java @@ -180,4 +180,5 @@ public class DemoController { public Result getSysUserInfoById(@RequestParam("id") Long id) { return demoService.getSysUserInfoById(id); } + } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index aae3501816..5a854a7ef4 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -3,7 +3,6 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerGridDTO; -import com.epmet.feign.impl.GovOrgFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -17,4 +16,5 @@ import org.springframework.web.bind.annotation.PathVariable; public interface GovOrgFeignClient { @GetMapping("gov/org/customergrid/getcustomergrid/{id}") Result getcustomergrid(@PathVariable("id") String id); + } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java index 38cfe6ef29..612f736267 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java @@ -154,4 +154,5 @@ public interface DemoService extends BaseService { * @Date 2020/3/20 9:37 **/ Result getSysUserInfoById(Long id); + } 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 916f123040..fec741f5e4 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 @@ -94,11 +94,6 @@ public class CustomerGridController { ExcelUtils.exportExcelToTarget(response, null, list, CustomerGridExcel.class); } - @GetMapping("getcustomergrid/{id}") - public Result getcustomergrid(@PathVariable("id") String id){ - CustomerGridDTO data = customerGridService.get(id); - return new Result().ok(data); - } /** * 供epmet-user服务调用 查询客户网格表数据 * @author sun @@ -124,4 +119,9 @@ public class CustomerGridController { return customerGridService.listGridForStrangerByOrder(listCustomerGridFormDTO); } + @GetMapping("getcustomergrid/{id}") + public Result getcustomergrid(@PathVariable("id") String id){ + CustomerGridDTO data = customerGridService.get(id); + return new Result().ok(data); + } } 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 66ea831b6d..e528ed9b83 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 @@ -92,7 +92,6 @@ public class HomeController { @PostMapping("gethomereleasebycustomer") public Result getHomeReleaseByCustomer(@RequestBody CustomerHomeFormDTO formDTO) { 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 5a23466015..68d3faff90 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 @@ -116,24 +116,31 @@ public class HomeServiceImpl implements HomeService { @Override public Result getHomeReleaseByCustomer(CustomerHomeFormDTO formDTO) { HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO(); + //根据客户id,所属端获取客户首页配置的设计稿 List list = customerHomeDetailDao.getHomeReleaseByCustomer(formDTO); - List flist = new ArrayList();//功能组件 - List usedComponent=new ArrayList<>();//使用的组件集合 + List titlelist=new ArrayList(); + List toplist=new ArrayList(); + List functionlist=new ArrayList(); + List floatlist=new ArrayList(); + //List usedComponent=new ArrayList<>();//使用过的组件集合 for(CommonComponentDesignResultDTO c:list){ - usedComponent.add(c.getComponentId()); + //usedComponent.add(c.getComponentId()); //所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区 - if("titleList".equals(c.getRegion())){ - resultDTO.setTitleList(c); - }else if("topList".equals(c.getRegion())){ - resultDTO.setTopList(c); - }else if("functionList".equals(c.getRegion())){ - flist.add(c); - }else if("floatingList".equals(c.getRegion())){ - resultDTO.setFloatingList(c); + if(ReginConstant.titleList.equals(c.getRegion())){ + titlelist.add(c); + }else if(ReginConstant.topList.equals(c.getRegion())){ + toplist.add(c); + }else if(ReginConstant.functionList.equals(c.getRegion())){ + functionlist.add(c); + }else if(ReginConstant.floatingList.equals(c.getRegion())){ + floatlist.add(c); } } - resultDTO.setFunctionList(flist); - resultDTO.setUsedComponentIdList(usedComponent); + resultDTO.setTitleList(titlelist); + resultDTO.setTopList(toplist); + resultDTO.setFloatingList(floatlist); + resultDTO.setFunctionList(functionlist); + //resultDTO.setUsedComponentIdList(usedComponent); return new Result().ok(resultDTO); } } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java index 37e8471cfc..5f97343835 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java @@ -17,6 +17,8 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.CustomerGridListFormDTO; @@ -52,8 +54,8 @@ public class StrangerResiGuideController { * @Date 2020/3/16 **/ @PostMapping("getgridhome") - public Result getValidCustomerList(@RequestBody StrangerFormDTO formDTO) throws Exception { - return strangerAccessRecordService.getgridhome(formDTO); + public Result getValidCustomerList( @LoginUser TokenDto tokenDTO, @RequestBody StrangerFormDTO formDTO) throws Exception { + return strangerAccessRecordService.getgridhome(tokenDTO, formDTO); } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java index e793afd026..c0c0824075 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java @@ -2,6 +2,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.StrangerAccessRecordDTO; import com.epmet.dto.form.CustomerGridListFormDTO; @@ -105,5 +106,5 @@ public interface StrangerAccessRecordService extends BaseService getgridhome(StrangerFormDTO formDTO); + Result getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO); } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java index 3a1c5b78b3..5858a5b795 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.StrangerAccessRecordDao; @@ -177,31 +178,32 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl getgridhome(StrangerFormDTO formDTO) { + public Result getgridhome(TokenDto tokenDTO, StrangerFormDTO formDTO) { //token里边有所属端 userId这些参数 前台传递customerID和gridId //1:调用epmet-user服务查询数据 新建网格记录数据 VisitedFormDTO vi = new VisitedFormDTO(); vi.setGridId(formDTO.getGridId()); vi.setCustomerId(formDTO.getCustomerId()); - //vi.setUserId(token获取); + vi.setUserId(tokenDTO.getUserId());//token中获取userId epmetUserFeignClient.saveLatestAndVisited(vi); //2:调用ope-customize服务 获取首页发布数据 - Result res = getCustomerHomeData(formDTO.getCustomerId()); + Result res = getCustomerHomeData(formDTO.getCustomerId(),tokenDTO.getClient()); return res; } /** * 调用oper-customize服务 获取首页发布数据 - * @param customerId + * @param customerId 客户Id + * @param clientType 所属端 * @return * @author sun */ - public Result getCustomerHomeData(String customerId){ + public Result getCustomerHomeData(String customerId,String clientType){ CustomerHomeFormDTO dto = new CustomerHomeFormDTO(); dto.setCustomerId(customerId); - //dto.setClientType(token中获取);//居民端 + dto.setClientType(clientType);//居民端 return operCustomizeFeignClient.getHomeReleaseByCustomer(dto); } diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 020b93702c..3662cbc04d 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -64,6 +64,18 @@ io.github.openfeign feign-httpclient + + com.epmet + gov-org-client + 2.0.0 + compile + + + com.epmet + gov-org-client + 2.0.0 + compile + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java index 118e08a214..a3810e7268 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java @@ -143,11 +143,10 @@ public class GridVisitedServiceImpl extends BaseServiceImpl