修改业务端接口获取用户信息的方式

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);
-    }
 }

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<List<EpdcWorkUserResultDTO>> getUserList(@LoginUser TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto) {
+    public Result<List<EpdcWorkUserResultDTO>> getUserList(EpdcWorkUserFromDTO workUserFromDto) {
-        return workUserService.listWorkUser(userDetail, workUserFromDto);
+        return workUserService.listWorkUser(workUserFromDto);
     }
 
     /***
@@ -115,20 +115,20 @@ public class ApiWorkUserController {
      * @date 2019/11/19 10:54
      */
     @GetMapping("unauthorizedAmount")
-    public Result<Integer> unauthorizedAmount(@LoginUser TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto) {
+    public Result<Integer> unauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) {
-        return workUserService.getUnauthorizedAmount(userDetail, fromDto);
+        return workUserService.getUnauthorizedAmount(fromDto);
     }
 
     /**
-     * @param userDetail
+     * 首页面板 获取工作端APP菜单
+     *
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>>
      * @Author yinzuomei
-     * @Description 首页面板 获取工作端APP菜单
      * @Date 2019/11/20 10:42
      **/
     @GetMapping("indexPanel")
-    public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(@LoginUser TokenDto userDetail) {
+    public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel() {
-        return workUserService.indexPanel(userDetail);
+        return workUserService.indexPanel();
     }
 
     /**
@@ -156,4 +156,17 @@ public class ApiWorkUserController {
     public Result<List<EpdcUserGridResultDTO>> 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);
+    }
 }

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<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto);
 
 

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<EpdcCompleteUserInfoDTO> 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);
 }

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<List<EpdcWorkUserResultDTO>> listWorkUser(TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto);
+    Result<List<EpdcWorkUserResultDTO>> listWorkUser(EpdcWorkUserFromDTO workUserFromDto);
 
-    /***
+    /**
      * 查询待认证用户数量
-     * @param
+     *
+     * @param fromDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Integer>
      * @author qushutong
      * @date 2019/11/19 10:56
      */
-    Result<Integer> getUnauthorizedAmount(TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto);
+    Result<Integer> getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
 
     /**
-     * @param userDetail
+     * 首页面板 获取工作端APP菜单
+     *
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>>
      * @Author yinzuomei
-     * @Description 首页面板 获取工作端APP菜单
      * @Date 2019/11/20 10:43
      **/
-    Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(TokenDto userDetail);
+    Result<List<EpdcAppIndexPanelResultDTO>> indexPanel();
 
     /**
      * @param formDTO
@@ -108,4 +109,14 @@ public interface WorkUserService {
      * @date 2019/11/26 15:52
      */
     Result<List<EpdcUserGridResultDTO>> 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);
 }

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);
-    }
-
     /**
      * 组装个人完善信息对象
      *

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;
@@ -115,16 +117,20 @@ public class WorkUserServiceImpl implements WorkUserService {
      * @date 2019/11/19 10:00
      */
     @Override
-    public Result<List<EpdcWorkUserResultDTO>> listWorkUser(TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto) {
+    public Result<List<EpdcWorkUserResultDTO>> listWorkUser(EpdcWorkUserFromDTO workUserFromDto) {
-        workUserFromDto.setUserId(userDetail.getUserId());
+        if (null == workUserFromDto.getGridId()) {
-        workUserFromDto.setDeptId(userDetail.getGridId());
+            UserDetail user = SecurityUser.getUser();
+            workUserFromDto.setGridIdList(user.getDeptIdList());
+        }
         return userFeignClient.getWorkUserList(workUserFromDto);
     }
 
     @Override
-    public Result<Integer> getUnauthorizedAmount(TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto) {
+    public Result<Integer> getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) {
-        fromDto.setDeptId(userDetail.getGridId());
+        if (null == fromDto.getGridId()) {
-        fromDto.setUserId(userDetail.getUserId());
+            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<List<EpdcAppIndexPanelResultDTO>> indexPanel(TokenDto userDetail) {
+    public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel() {
-        if (null == userDetail || StringUtils.isBlank(userDetail.getMobile())) {
+        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<List<EpdcUserGridResultDTO>> 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);
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java

@@ -19,12 +19,9 @@ public class EpdcAppRemoveGridFormDTO implements Serializable {
     @NotBlank(message = "网格ID不能为空")
     private String gridId;
 
-	/**
-	 * 当前登录网格id
-	 */
-	private Long currentLoginGrid;
     /**
      * 用户id
      */
+    @NotBlank(message = "用户ID不能为空")
     private String userId;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java

@@ -2,9 +2,8 @@ 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;
 
 
 /**
@@ -17,20 +16,15 @@ public class EpdcUnauthorizedAmountFromDTO implements Serializable {
     private static final long serialVersionUID = 5060358136725588037L;
 
     /**
-     * 用户id
+     * 网格长管理的所有网格
+     * 查询所有网格的数据时传入
      */
-    @NotBlank(message = "用户ID不能为空")
+    private List<Long> gridIdList;
-    private String userId;
 
     /**
-     * 用户所属网格ID
+     * 网格长管理的某一个网格
+     * 查询单个网格的数据时传入
      */
-    @NotNull(message = "用户网格ID不能为空")
+    private Long gridId;
-    private Long deptId;
 
-    /**
-     * 是否查询用户管理的所有网格的数据 0否 1是
-     */
-    @NotBlank(message = "是否查询用户管理的所有网格的数据不能为空")
-    private String allGridFlag;
 }

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 Long gridId;
-    private String userId;
-
-    /**
-     * 用户所属网格ID
-     */
-    @NotNull(message = "用户网格ID不能为空")
-    private Long deptId;
 
     /**
      * 页码
@@ -56,9 +51,7 @@ public class EpdcWorkUserFromDTO implements Serializable {
     @NotBlank(message = "时间戳不能为空")
     private String timestamp;
 
-    /**
+
-     * 是否查询用户管理的所有网格的数据 0否 1是
+    private List<Long> gridIdList;
-     */
+
-    @NotBlank(message = "是否查询用户管理的所有网格的数据不能为空")
-    private String allGridFlag;
 }

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")
+    @GetMapping("listForWork")
-    public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(@RequestBody EpdcWorkUserFromDTO workUserFromDto) {
+    public Result<List<EpdcWorkUserResultDTO>> listUserForWork(@RequestBody EpdcWorkUserFromDTO workUserFromDto) {
         return userService.getWorkUserList(workUserFromDto);
     }
 

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<UserEntity> {
      * @author qushutong
      * @date 2019/11/19 13:31
      */
-    Integer selectOneAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
+    int selectOneAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
 }

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<UserGridRelationDao, UserGridRelationEntity> implements UserGridRelationService {
     @Autowired
     private RedisUtils redisUtils;
+
     @Override
     public PageData<UserGridRelationDTO> page(Map<String, Object> params) {
         IPage<UserGridRelationEntity> page = baseDao.selectPage(
@@ -174,16 +175,16 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelatio
      * @Description 解绑
      * @Date 2019/11/21 18:06
      **/
-    @Transactional(rollbackFor = Exception.class)
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void unbindGridHandle(String id) {
         UserGridRelationEntity userGridRelationEntity = this.baseDao.selectById(id);
-//        this.baseDao.deleteById(id);
+        // 修改删除标志
-        this.delete(userGridRelationEntity.getUserId(),userGridRelationEntity.getGridId());//修改删除标志
+        this.delete(userGridRelationEntity.getUserId(), userGridRelationEntity.getGridId());
         String key = RedisKeys.getCpUserKey(userGridRelationEntity.getUserId());
         Map<String, Object> 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()));
         }
     }
@@ -200,7 +201,7 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelatio
         this.delete(formDto.getUserId(), Long.valueOf(formDto.getGridId()));
         String key = RedisKeys.getCpUserKey(formDto.getUserId());
         Map<String, Object> map = redisUtils.hGetAll(key);
-		if (map.containsKey("gridId") && formDto.getCurrentLoginGrid().equals(Long.valueOf(map.get("gridId").toString()))) {
+        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();

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<UserDao, UserEntity> implem
     public Result<List<EpdcWorkUserResultDTO>> 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<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS = baseDao.selectWorkUserList(workUserFromDto);
 

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -259,7 +259,6 @@
             AND eu.id = #{userId}
     </select>
 
-
     <!--获取用户列表-->
     <select id="selectWorkUserList" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
         SELECT
@@ -268,45 +267,49 @@
             u.REGISTER_TIME as registerTime,
             u.FACE_IMG as faceImg
         FROM
-        epdc_user_grid_relation ug_l
+            epdc_user_grid_relation ug
-        LEFT JOIN epdc_user_grid_relation ug_r ON ug_l.GRID_ID = ug_r.GRID_ID
+            LEFT JOIN epdc_user u ON ug.USER_ID = u.ID
-        LEFT JOIN epdc_user u ON ug_r.USER_ID = u.ID
         WHERE
-        ug_l.USER_ID = #{userId}
+            u.PART_FLAG = #{partyFlag}
-        AND ug_l.LEADER_FLAG = '1'
-        AND u.STATE = #{authenticatedFlag}
-        AND u.PART_FLAG = #{partyFlag}
-        <if test='allGridFlag=="0"'>
-            AND ug_r.GRID_ID = #{deptId}
-        </if>
-        AND u.CREATED_TIME &lt;= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
-        AND ug_l.DEL_FLAG = '0'
-        AND ug_r.DEL_FLAG = '0'
             AND u.DEL_FLAG = '0'
+            AND ug.DEL_FLAG = '0'
+            <choose>
+                <when test='authenticatedFlag != null authenticatedFlag == "0"'>
+                    and u.STATE = '1'
+                </when>
+                <otherwise>and u.STATE = '3'</otherwise>
+            </choose>
+            <choose>
+                <when test="gridId != null">AND ug.GRID_ID = #{gridId}</when>
+                <otherwise>
+                    AND ug.GRID_ID in
+                    <foreach collection="gridIdList" item="item" open="(" separator="," close=")" >
+                        #{item}
+                    </foreach>
+                </otherwise>
+            </choose>
         GROUP BY
             u.ID
-        ORDER BY
+        ORDER BY u.CREATED_TIME DESC
-        u.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
     <!--查询待认证用户数量-->
     <select id="selectOneAnauthorizedAmount" resultType="Integer">
         SELECT
-        COUNT(u.ID)
+            COUNT(DISTINCT(u.ID))
         FROM
-        epdc_user_grid_relation ug_l
+            epdc_user_grid_relation ug
-        LEFT JOIN epdc_user_grid_relation ug_r ON ug_l.GRID_ID = ug_r.GRID_ID
+            LEFT JOIN epdc_user u ON u.ID = ug.USER_ID
-        LEFT JOIN epdc_user u ON ug_r.USER_ID = u.ID
+        WHERE u.DEL_FLAG = '0' AND ug.DEL_FLAG = '0' AND u.STATE = '1'
-        WHERE
+            <choose>
-        ug_l.USER_ID = #{userId}
+                <when test="gridId != null">AND ug.GRID_ID = #{gridId}</when>
-        AND ug_l.LEADER_FLAG = '1'
+                <otherwise>
-        AND u.STATE = '1'
+                    AND ug.GRID_ID in
-        <if test='allGridFlag=="0"'>
+                    <foreach collection="gridIdList" item="item" open="(" separator="," close=")" >
-            AND ug_r.GRID_ID = #{deptId}
+                        #{item}
-        </if>
+                    </foreach>
-        AND ug_l.DEL_FLAG = '0'
+                </otherwise>
-        AND ug_r.DEL_FLAG = '0'
+            </choose>
-        AND u.DEL_FLAG = '0'
     </select>
 </mapper>