From 151fb64baab7acef30cbb2f5d457f4cbf157ddb5 Mon Sep 17 00:00:00 2001 From: yujintao Date: Tue, 26 Nov 2019 19:05:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=9A=84=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiAppUserController.java | 13 ---- .../controller/ApiWorkUserController.java | 29 +++++-- .../esua/epdc/feign/UserFeignClient.java | 2 +- .../esua/epdc/service/AppUserService.java | 9 --- .../esua/epdc/service/WorkUserService.java | 25 +++++-- .../epdc/service/impl/AppUserServiceImpl.java | 15 ---- .../service/impl/WorkUserServiceImpl.java | 40 +++++++--- .../epdc/form/EpdcAppRemoveGridFormDTO.java | 25 +++---- .../form/EpdcUnauthorizedAmountFromDTO.java | 26 +++---- .../dto/epdc/form/EpdcWorkUserFromDTO.java | 21 ++---- .../controller/EpdcAppUserController.java | 4 +- .../java/com/elink/esua/epdc/dao/UserDao.java | 2 +- .../impl/UserGridRelationServiceImpl.java | 43 +++++------ .../epdc/service/impl/UserServiceImpl.java | 9 --- .../src/main/resources/mapper/UserDao.xml | 75 ++++++++++--------- 15 files changed, 162 insertions(+), 176 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 3acb8c0a7..3dc1c81e7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -230,17 +230,4 @@ public class ApiAppUserController { return appUserService.prepareCompleteUserInfo(tokenDto); } - /** - * @param tokenDto - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 解除与网格的关联 - * @Date 2019/11/22 14:16 - **/ - @PostMapping("removeGrid") - public Result removeGrid(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppRemoveGridFormDTO formDto) { - ValidatorUtils.validateEntity(formDto); - return appUserService.removeGrid(tokenDto, formDto); - } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java index 3a24964e5..72e402f25 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java @@ -103,8 +103,8 @@ public class ApiWorkUserController { * @date 2019/11/18 13:53 */ @GetMapping("list") - public Result> getUserList(@LoginUser TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto) { - return workUserService.listWorkUser(userDetail, workUserFromDto); + public Result> getUserList(EpdcWorkUserFromDTO workUserFromDto) { + return workUserService.listWorkUser(workUserFromDto); } /*** @@ -115,20 +115,20 @@ public class ApiWorkUserController { * @date 2019/11/19 10:54 */ @GetMapping("unauthorizedAmount") - public Result unauthorizedAmount(@LoginUser TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto) { - return workUserService.getUnauthorizedAmount(userDetail, fromDto); + public Result unauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) { + return workUserService.getUnauthorizedAmount(fromDto); } /** - * @param userDetail + * 首页面板 获取工作端APP菜单 + * * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author yinzuomei - * @Description 首页面板 获取工作端APP菜单 * @Date 2019/11/20 10:42 **/ @GetMapping("indexPanel") - public Result> indexPanel(@LoginUser TokenDto userDetail) { - return workUserService.indexPanel(userDetail); + public Result> indexPanel() { + return workUserService.indexPanel(); } /** @@ -156,4 +156,17 @@ public class ApiWorkUserController { public Result> listUserGrid(String userId) { return workUserService.listUserGrid(userId); } + + /** + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 解除与网格的关联 + * @Date 2019/11/22 14:16 + **/ + @PostMapping("removeGrid") + public Result removeGrid(@RequestBody EpdcAppRemoveGridFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return workUserService.removeGrid(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 485197c68..dfe2a598d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -284,7 +284,7 @@ public interface UserFeignClient { * @author qushutong * @date 2019/11/18 13:47 */ - @GetMapping("app-user/epdc-app/user/list") + @GetMapping("app-user/epdc-app/user/listForWork") Result> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 0315165cf..4240885a0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -188,13 +188,4 @@ public interface AppUserService { */ Result prepareCompleteUserInfo(TokenDto tokenDto); - /** - * @param tokenDto - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 解除与网格的关联 - * @Date 2019/11/22 14:17 - **/ - Result removeGrid(TokenDto tokenDto, EpdcAppRemoveGridFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java index 9c52e7fa9..5452cb9d7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java @@ -70,25 +70,26 @@ public interface WorkUserService { * @author qushutong * @date 2019/11/18 13:39 */ - Result> listWorkUser(TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto); + Result> listWorkUser(EpdcWorkUserFromDTO workUserFromDto); - /*** + /** * 查询待认证用户数量 - * @param + * + * @param fromDto * @return com.elink.esua.epdc.commons.tools.utils.Result * @author qushutong * @date 2019/11/19 10:56 */ - Result getUnauthorizedAmount(TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto); + Result getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto); /** - * @param userDetail + * 首页面板 获取工作端APP菜单 + * * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author yinzuomei - * @Description 首页面板 获取工作端APP菜单 * @Date 2019/11/20 10:43 **/ - Result> indexPanel(TokenDto userDetail); + Result> indexPanel(); /** * @param formDTO @@ -108,4 +109,14 @@ public interface WorkUserService { * @date 2019/11/26 15:52 */ Result> listUserGrid(String userId); + + /** + * 解除与网格的关联 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Date 2019/11/22 14:17 + **/ + Result removeGrid(EpdcAppRemoveGridFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 0a6d5ca15..c3858c5a6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -748,21 +748,6 @@ public class AppUserServiceImpl implements AppUserService { return new Result().error("获取用户信息失败"); } - /** - * @param tokenDto - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 解除与网格的关联 - * @Date 2019/11/22 14:17 - **/ - @Override - public Result removeGrid(TokenDto tokenDto, EpdcAppRemoveGridFormDTO formDto) { - formDto.setCurrentLoginGrid(tokenDto.getGridId()); - formDto.setUserId(tokenDto.getUserId()); - return userFeignClient.removeGrid(formDto); - } - /** * 组装个人完善信息对象 * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index e744f95c0..f2a1507a5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java @@ -6,6 +6,8 @@ import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO; import com.elink.esua.epdc.common.token.dto.WorkUserTokenFormDTO; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.SysUserDTO; @@ -110,21 +112,25 @@ public class WorkUserServiceImpl implements WorkUserService { * 获取用户待审核列表 * @param userDetail * @param workUserFromDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2019/11/19 10:00 */ @Override - public Result> listWorkUser(TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto) { - workUserFromDto.setUserId(userDetail.getUserId()); - workUserFromDto.setDeptId(userDetail.getGridId()); + public Result> listWorkUser(EpdcWorkUserFromDTO workUserFromDto) { + if (null == workUserFromDto.getGridId()) { + UserDetail user = SecurityUser.getUser(); + workUserFromDto.setGridIdList(user.getDeptIdList()); + } return userFeignClient.getWorkUserList(workUserFromDto); } @Override - public Result getUnauthorizedAmount(TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto) { - fromDto.setDeptId(userDetail.getGridId()); - fromDto.setUserId(userDetail.getUserId()); + public Result getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) { + if (null == fromDto.getGridId()) { + UserDetail user = SecurityUser.getUser(); + fromDto.setGridIdList(user.getDeptIdList()); + } return userFeignClient.getUnauthorizedAmount(fromDto); } @@ -159,11 +165,12 @@ public class WorkUserServiceImpl implements WorkUserService { * @Date 2019/11/20 10:43 **/ @Override - public Result> indexPanel(TokenDto userDetail) { - if (null == userDetail || StringUtils.isBlank(userDetail.getMobile())) { + public Result> indexPanel() { + String mobile = SecurityUser.getUser().getMobile(); + if (StringUtils.isBlank(mobile)) { return new Result().error("获取用户信息失败"); } - return adminFeignClient.indexPanel(userDetail.getMobile()); + return adminFeignClient.indexPanel(mobile); } /** @@ -182,4 +189,17 @@ public class WorkUserServiceImpl implements WorkUserService { public Result> listUserGrid(String userId) { return userFeignClient.listUserGrid(userId); } + + /** + * 解除与网格的关联 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Date 2019/11/22 14:17 + **/ + @Override + public Result removeGrid(EpdcAppRemoveGridFormDTO formDto) { + return userFeignClient.removeGrid(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java index 522858b0e..15d1f9399 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java @@ -12,19 +12,16 @@ import java.io.Serializable; */ @Data public class EpdcAppRemoveGridFormDTO implements Serializable { - private static final long serialVersionUID = 9115962990383560832L; - /** - * 网格ID - */ - @NotBlank(message = "网格ID不能为空") - private String gridId; + private static final long serialVersionUID = 9115962990383560832L; + /** + * 网格ID + */ + @NotBlank(message = "网格ID不能为空") + private String gridId; - /** - * 当前登录网格id - */ - private Long currentLoginGrid; - /** - * 用户id - */ - private String userId; + /** + * 用户id + */ + @NotBlank(message = "用户ID不能为空") + private String userId; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java index 79eb87c12..071a6ef77 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java @@ -2,35 +2,29 @@ package com.elink.esua.epdc.dto.epdc.form; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; /** - * @author: qushutong - * @Date: 2019/11/19 19:00 - * @Description: 查询待认证用户数量 + * @author: qushutong + * @Date: 2019/11/19 19:00 + * @Description: 查询待认证用户数量 */ @Data public class EpdcUnauthorizedAmountFromDTO implements Serializable { private static final long serialVersionUID = 5060358136725588037L; /** - * 用户id + * 网格长管理的所有网格 + * 查询所有网格的数据时传入 */ - @NotBlank(message = "用户ID不能为空") - private String userId; + private List gridIdList; /** - * 用户所属网格ID + * 网格长管理的某一个网格 + * 查询单个网格的数据时传入 */ - @NotNull(message = "用户网格ID不能为空") - private Long deptId; + private Long gridId; - /** - * 是否查询用户管理的所有网格的数据 0否 1是 - */ - @NotBlank(message = "是否查询用户管理的所有网格的数据不能为空") - private String allGridFlag; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java index 677e312e2..695a21fc7 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; /** * @author: qushutong @@ -27,16 +28,10 @@ public class EpdcWorkUserFromDTO implements Serializable { private String partyFlag; /** - * 用户id + * 用户管理的某个网格 + * 不传时，查询用户管理的所有网格 */ - @NotBlank(message = "用户ID不能为空") - private String userId; - - /** - * 用户所属网格ID - */ - @NotNull(message = "用户网格ID不能为空") - private Long deptId; + private Long gridId; /** * 页码 @@ -56,9 +51,7 @@ public class EpdcWorkUserFromDTO implements Serializable { @NotBlank(message = "时间戳不能为空") private String timestamp; - /** - * 是否查询用户管理的所有网格的数据 0否 1是 - */ - @NotBlank(message = "是否查询用户管理的所有网格的数据不能为空") - private String allGridFlag; + + private List gridIdList; + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java index 945d28812..9976e509e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java @@ -293,8 +293,8 @@ public class EpdcAppUserController { * @author qushutong * @date 2019/11/18 13:47 */ - @GetMapping("list") - public Result> getWorkUserList(@RequestBody EpdcWorkUserFromDTO workUserFromDto) { + @GetMapping("listForWork") + public Result> listUserForWork(@RequestBody EpdcWorkUserFromDTO workUserFromDto) { return userService.getWorkUserList(workUserFromDto); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java index e424c5819..f40974593 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -151,5 +151,5 @@ public interface UserDao extends BaseDao { * @author qushutong * @date 2019/11/19 13:31 */ - Integer selectOneAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto); + int selectOneAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java index f7a829378..9ab403d3a 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java @@ -55,6 +55,7 @@ import java.util.Map; public class UserGridRelationServiceImpl extends BaseServiceImpl implements UserGridRelationService { @Autowired private RedisUtils redisUtils; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -174,35 +175,35 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl map = redisUtils.hGetAll(key); Long currentGridId = userGridRelationEntity.getGridId(); - if (map.containsKey("gridId") && currentGridId.equals(Long.valueOf(map.get("gridId").toString()))) { + if (map.containsKey(FieldConstant.GRID_ID_HUMP) && currentGridId.toString().equals(map.get(FieldConstant.GRID_ID_HUMP).toString())) { redisUtils.delete(RedisKeys.getCpUserKey(userGridRelationEntity.getUserId())); } } - /** - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 解除与网格的关联 - * @Date 2019/11/22 14:31 - **/ - @Override - public Result removeGrid(EpdcAppRemoveGridFormDTO formDto) { - this.delete(formDto.getUserId(),Long.valueOf(formDto.getGridId())); - String key = RedisKeys.getCpUserKey(formDto.getUserId()); - Map map = redisUtils.hGetAll(key); - if (map.containsKey("gridId") && formDto.getCurrentLoginGrid().equals(Long.valueOf(map.get("gridId").toString()))) { - redisUtils.delete(RedisKeys.getCpUserKey(formDto.getUserId())); - } - return new Result(); - } + /** + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 解除与网格的关联 + * @Date 2019/11/22 14:31 + **/ + @Override + public Result removeGrid(EpdcAppRemoveGridFormDTO formDto) { + this.delete(formDto.getUserId(), Long.valueOf(formDto.getGridId())); + String key = RedisKeys.getCpUserKey(formDto.getUserId()); + Map map = redisUtils.hGetAll(key); + if (map.containsKey(FieldConstant.GRID_ID_HUMP) && formDto.getGridId().equals(map.get(FieldConstant.GRID_ID_HUMP).toString())) { + redisUtils.delete(RedisKeys.getCpUserKey(formDto.getUserId())); + } + return new Result(); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index bc8b6dc8c..8261abc46 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -609,15 +609,6 @@ public class UserServiceImpl extends BaseServiceImpl implem public Result> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) { int pageIndex = (workUserFromDto.getPageIndex() - NumConstant.ONE) * workUserFromDto.getPageSize(); workUserFromDto.setPageIndex(pageIndex); - String authenticatedFlag = workUserFromDto.getAuthenticatedFlag(); - if (YesOrNoEnum.NO.value().equals(authenticatedFlag)) { - authenticatedFlag = NumConstant.ONE_STR; - } else if (YesOrNoEnum.YES.value().equals(authenticatedFlag)) { - authenticatedFlag = NumConstant.THREE_STR; - } else { - throw new RenException("数据不匹配"); - } - workUserFromDto.setAuthenticatedFlag(authenticatedFlag); List epdcWorkUserResultDTOS = baseDao.selectWorkUserList(workUserFromDto); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 5745587cb..3a0fb066b 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -259,54 +259,57 @@ AND eu.id = #{userId} -