From d62a760ffcfe10fd45dff3eea79cfffea319ebaa Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 8 Sep 2020 15:02:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=AE=9A=E5=88=B6=E5=8A=9F=E8=83=BD=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4=E4=B8=BA=E4=B8=80=E4=B8=AA=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/FunctionDetailFromDTO.java | 7 +-- .../CustomerFunctionDetailController.java | 6 +- .../CustomerFunctionDetailService.java | 12 +--- .../CustomerFunctionDetailServiceImpl.java | 59 ++----------------- .../mapper/CustomerFunctionRoleDao.xml | 2 +- 5 files changed, 12 insertions(+), 74 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/FunctionDetailFromDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/FunctionDetailFromDTO.java index d8a8641ddb..dc8c61b904 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/FunctionDetailFromDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/FunctionDetailFromDTO.java @@ -33,7 +33,7 @@ public class FunctionDetailFromDTO implements Serializable { private String gridId; /** - * resi：居民端，work：工作端 + * resi：居民端，gov：工作端 */ @NotBlank(message = "所属端不能为空", groups = {AddUserInternalGroup.class, AddUserShowGroup.class}) private String clientType; @@ -43,11 +43,6 @@ public class FunctionDetailFromDTO implements Serializable { */ private String userId; - /** - * 所属端（居民端：resi 工作端：gov） - */ - private String fromApp; - /** * 用户角色key集合 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionDetailController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionDetailController.java index 76dff2a151..0778f3d989 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionDetailController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionDetailController.java @@ -107,8 +107,7 @@ public class CustomerFunctionDetailController { public Result> resiFunctionDetail(@LoginUser TokenDto tokenDto, @RequestBody FunctionDetailFromDTO formDTO) { ValidatorUtils.validateEntity(formDTO, FunctionDetailFromDTO.AddUserShowGroup.class); formDTO.setUserId(tokenDto.getUserId()); - formDTO.setFromApp(AppClientConstant.APP_RESI); - return new Result>().ok(customerFunctionDetailService.resiFunctionDetail(formDTO)); + return new Result>().ok(customerFunctionDetailService.resiAndWorkFunctionDetail(formDTO)); } /** @@ -122,8 +121,7 @@ public class CustomerFunctionDetailController { ValidatorUtils.validateEntity(formDTO, FunctionDetailFromDTO.AddUserInternalGroup.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - formDTO.setFromApp(AppClientConstant.APP_GOV); - return new Result>().ok(customerFunctionDetailService.workFunctionDetail(formDTO)); + return new Result>().ok(customerFunctionDetailService.resiAndWorkFunctionDetail(formDTO)); } /** diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFunctionDetailService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFunctionDetailService.java index 7571294f23..88c8e6d3bc 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFunctionDetailService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFunctionDetailService.java @@ -102,17 +102,9 @@ public interface CustomerFunctionDetailService extends BaseService resiFunctionDetail(FunctionDetailFromDTO formDTO); - - /** - * @param formDTO - * @return - * @Author sun - * @Description 工作端-根据所属端和客户Id查询客户定制功能列表 - **/ - List workFunctionDetail(FunctionDetailFromDTO formDTO); + List resiAndWorkFunctionDetail(FunctionDetailFromDTO formDTO); /** * 修改客户定制功能上下架 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java index 895b1da73b..7c7b58411f 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java @@ -137,7 +137,7 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl resiFunctionDetail(FunctionDetailFromDTO formDTO) { + public List resiAndWorkFunctionDetail(FunctionDetailFromDTO formDTO) { List restltList = new LinkedList<>(); //1.根据客户Id和所属端查询客户定制功能列表数据 logger.info(String.format("根据客户Id和所属端查询客户定制功能列表，对应客户Id->%s,所属端->%s", formDTO.getCustomerId(), formDTO.getClientType())); @@ -158,61 +158,14 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl> result = epmetUserOpenFeignClient.getUserRoleKeyList(dto); - if (!result.success()) { - throw new RenException(result.getCode()); - } - formDTO.setRoleKeyList(result.getData()); - - //3.根据用户拥有的角色查询客户的定制功能 - List listFunctionIds = customerFunctionRoleDao.selectFunctionList(formDTO); - - //4.封装结果数据 - listFunctionIds.forEach(id -> { - list.forEach(l -> { - if (id.equals(l.getFunctionId())) { - restltList.add(l); - } - }); - }); - } - - return restltList; - } - - /** - * @param formDTO - * @return - * @Author sun - * @Description 根据所属端和客户Id查询客户定制功能列表 - **/ - @Override - public List workFunctionDetail(FunctionDetailFromDTO formDTO) { - List restltList = new LinkedList<>(); - //1.根据客户Id和所属端查询客户定制功能列表数据 - logger.info(String.format("根据客户Id和所属端查询客户定制功能列表，对应客户Id->%s,所属端->%s", formDTO.getCustomerId(), formDTO.getClientType())); - List list = baseDao.selectFunctionDetailList(formDTO); - if (null != list && list.size() > NumConstant.ZERO) { - //1-1.设置自定义json数据（暂时为空） - try { - String join = String.join(",", new ArrayList<>()); - String customerParameter = java.net.URLEncoder.encode(join, "utf-8"); - list.forEach(l->{ - l.setCustomerParameter(customerParameter); - }); - } catch (Exception e) { - logger.error("CustomerFunctionDetailServiceImpl.resiAndWorkFunctionDetail->集合参数URLEncode失败"); - throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), e.getMessage()); + dto.setFromApp(formDTO.getClientType()); + //居民端需要传网格Id 热心居民的角色是在网格里的 + if(AppClientConstant.APP_RESI.equals(formDTO.getClientType())){ + dto.setGridId(formDTO.getGridId()); } - - //2.调用user服务，获取用户角色信息 - GetRoleKeyListFormDTO dto = new GetRoleKeyListFormDTO(); - dto.setUserId(formDTO.getUserId()); - dto.setFromApp(AppClientConstant.APP_GOV); Result> result = epmetUserOpenFeignClient.getUserRoleKeyList(dto); if (!result.success()) { + logger.error(String.format("调用user服务，获取用户角色信息失败，用户Id：%s ,所属端：%s", formDTO.getUserId(), formDTO.getClientType())); throw new RenException(result.getCode()); } formDTO.setRoleKeyList(result.getData()); diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionRoleDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionRoleDao.xml index 55099f38f6..2789f2c2a4 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionRoleDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionRoleDao.xml @@ -22,7 +22,7 @@ FROM customer_function_role WHERE del_flag = '0' AND customer_id = #{customerId} - AND from_app = #{fromApp} + AND from_app = #{clientType} role_key = #{roleKey}