Browse Source

查询待认证用户数量接口

dev
qushutong 6 years ago
parent
commit
bf952a5e14
  1. 18
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
  2. 18
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
  3. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
  4. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
  5. 9
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
  6. 34
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
  7. 37
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
  8. 10
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
  9. 5
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
  10. 176
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

18
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java

@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
* 工作端用户登录用户管理相关接口
@ -72,9 +73,20 @@ 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(@LoginUser TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto) {
return workUserService.listWorkLlist(userDetail, workUserFromDto);
}
/***
* 查询待认证用户数量
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Integer>
* @author qushutong
* @date 2019/11/19 10:54
*/
@GetMapping("unauthorizedAmount")
public Result<Integer> unauthorizedAmount(@LoginUser TokenDto userDetail,@RequestParam Map<String,Object> params){
return workUserService.getUnauthorizedAmount(userDetail,params);
}
}

18
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@ -11,12 +11,10 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback;
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.RequestBody;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* appuser端接口
@ -277,6 +275,7 @@ public interface UserFeignClient {
*/
@GetMapping("app-user/epdc-app/user/partyMemberDetail/{userId}")
Result<EpdcPartyMemberDetailDto> partyMemberDetail(@PathVariable("userId")String userId);
/***
* 用户列表
* @param workUserFromDto
@ -286,4 +285,15 @@ public interface UserFeignClient {
*/
@GetMapping("app-user/epdc-app/user/list")
Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto);
/***
* 查询待认证用户数量
* @param parame
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Integer>
* @author qushutong
* @date 2019/11/19 11:02
*/
@GetMapping("app-user/epdc-app/user/unauthorizedAmount")
Result<Integer> getUnauthorizedAmount(@RequestParam Map<String, Object> parame);
}

6
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@ -12,6 +12,7 @@ import com.elink.esua.epdc.feign.UserFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
/**
* @author yujintao
@ -140,4 +141,9 @@ public class UserFeignClientFallback implements UserFeignClient {
public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getWorkUserList", workUserFromDto);
}
@Override
public Result<Integer> getUnauthorizedAmount(Map<String, Object> parame) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUnauthorizedAmount", parame);
}
}

10
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java

@ -9,6 +9,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
import java.util.List;
import java.util.Map;
/**
* 工作端用户登录用户管理 相关业务接口
@ -45,4 +46,13 @@ public interface WorkUserService {
* @date 2019/11/18 13:39
*/
Result<List<EpdcWorkUserResultDTO>> listWorkLlist(TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto);
/***
* 查询待认证用户数量
* @param
* @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, Map<String,Object> parame);
}

9
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java

@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* 工作端用户登录用户管理 相关业务实现
@ -69,6 +70,14 @@ public class WorkUserServiceImpl implements WorkUserService {
@Override
public Result<List<EpdcWorkUserResultDTO>> listWorkLlist(TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto) {
workUserFromDto.setUserId(userDetail.getUserId());
workUserFromDto.setDeptId(userDetail.getGridId());
return userFeignClient.getWorkUserList(workUserFromDto);
}
@Override
public Result<Integer> getUnauthorizedAmount(TokenDto userDetail, Map<String, Object> parame) {
parame.put("userId",userDetail.getUserId());
parame.put("deptId",userDetail.getGridId());
return userFeignClient.getUnauthorizedAmount(parame);
}
}

34
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* 对移动端开放
@ -170,7 +171,7 @@ public class EpdcAppUserController {
/**
* 社群添加好友列表
*
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
* @params [formDto]
* @author liuchuang
* @since 2019/10/23 16:22
@ -254,6 +255,7 @@ public class EpdcAppUserController {
/**
* 获取居民详情已认证或待认证提交信息待审核的居民用户
*
* @param userId 用户Id
* @return
*/
@ -264,23 +266,26 @@ public class EpdcAppUserController {
/**
* 获取党员详情已认证或未认证的党员用户
*
* @param userId
* @return
*/
@GetMapping("partyMemberDetail/{userId}")
public Result<EpdcPartyMemberDetailDto> partyMemberDetail(@PathVariable("userId") String userId){
public Result<EpdcPartyMemberDetailDto> partyMemberDetail(@PathVariable("userId") String userId) {
return userService.partyMemberDetail(userId);
}
/**
* 认证用户用户信息审核
* @param formDTO
* @return
*/
/**
* 认证用户用户信息审核
*
* @param formDTO
* @return
*/
@PostMapping("authenticateResident")
public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO) {
return userService.authenticateResident(formDTO);
}
/***
* 用户列表
* @param workUserFromDto
@ -289,7 +294,20 @@ public class EpdcAppUserController {
* @date 2019/11/18 13:47
*/
@GetMapping("list")
public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(@RequestBody EpdcWorkUserFromDTO workUserFromDto){
public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(@RequestBody EpdcWorkUserFromDTO workUserFromDto) {
return userService.getWorkUserList(workUserFromDto);
}
/***
* 查询待认证用户数量
* @param params
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Integer>
* @author qushutong
* @date 2019/11/19 13:25
*/
@GetMapping("unauthorizedAmount")
public Result<Integer> unauthorizedAmount(@RequestParam Map<String, Object> params) {
return userService.getAnauthorizedAmount(params);
}
}

37
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@ -104,38 +104,51 @@ public interface UserDao extends BaseDao<UserEntity> {
/**
* 获取居民详情已认证或待认证提交信息待审核的居民用户
*
* @param userId 用户Id
* @return
*/
EpdcResidentDetailResultDTO residentDetailByUserId(@Param("userId")String userId);
EpdcResidentDetailResultDTO residentDetailByUserId(@Param("userId") String userId);
/**
* 获取党员详情已认证或未认证的党员用户
*
* @param userId
* @return
*/
EpdcPartyMemberDetailDto partyMemberDetailByUserId(@Param("userId")String userId);
EpdcPartyMemberDetailDto partyMemberDetailByUserId(@Param("userId") String userId);
/**
* 未认证的党员用户
*
* @param userId
* @return
*/
EpdcPartyMemberDetailDto partyMemberDetailFaild(@Param("userId")String userId);
EpdcPartyMemberDetailDto partyMemberDetailFaild(@Param("userId") String userId);
/**
* 通过用户ID获取党员身份证号
*
* @param userId
* @return
*/
String getPartyMemberIdNoByUserID(@Param("userId")String userId);
/***
* 用户党员待审核列表
* @param workUserFromDto
* @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>
* @author qushutong
* @date 2019/11/18 19:28
*/
String getPartyMemberIdNoByUserID(@Param("userId") String userId);
/***
* 用户党员待审核列表
* @param workUserFromDto
* @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>
* @author qushutong
* @date 2019/11/18 19:28
*/
List<EpdcWorkUserResultDTO> selectWorkUserList(EpdcWorkUserFromDTO workUserFromDto);
/***
* 查询待认证用户数量
* @param params
* @return java.lang.Integer
* @author qushutong
* @date 2019/11/19 13:31
*/
Integer selectOneAnauthorizedAmount(Map<String, Object> params);
}

10
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@ -229,4 +229,14 @@ public interface UserService extends BaseService<UserEntity> {
* @date 2019/11/18 14:00
*/
Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto);
/***
* 查询待认证用户数量
* @param params
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Integer>
* @author qushutong
* @date 2019/11/19 13:28
*/
Result<Integer> getAnauthorizedAmount(Map<String,Object> params);
}

5
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@ -580,4 +580,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
return new Result<List<EpdcWorkUserResultDTO>>().ok(epdcWorkUserResultDTOS);
}
@Override
public Result<Integer> getAnauthorizedAmount(Map<String, Object> params) {
return new Result<Integer>().ok(baseDao.selectOneAnauthorizedAmount(params));
}
}

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

@ -62,35 +62,43 @@
</select>
<select id="selectListUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
SELECT
u.id,
u.REAL_NAME,
u.MOBILE,
u.REGISTER_TIME,
IDENTITY_NO,
ADDRESS,
STATE,
PARTY_FLAG
u.id,
u.REAL_NAME,
u.MOBILE,
u.REGISTER_TIME,
IDENTITY_NO,
ADDRESS,
STATE,
PARTY_FLAG
u.id,
u.REAL_NAME,
u.MOBILE,
u.REGISTER_TIME,
IDENTITY_NO,
STATE,
PARTY_FLAG
FROM
epdc_user u
LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID
epdc_user u
LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID
where
u.del_flag = '0'
<if test="startTime != '' and endTime != ''"> and u.register_time between #{startTime} and #{endTime}</if>
<if test="state != '' and state != null"> and u.state = #{state}</if>
<if test="realName != '' and realName != null"> and u.real_name like '%${realName}%'</if>
<if test="mobile != '' and mobile != null"> and u.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null"> and u.identity_no like '%${identityNo}%'</if>
<if test="partyFlag != '' and partyFlag != null"> and u.party_flag = #{partyFlag}</if>
<if test="streetId != '' and streetId != null"> and ug.street_id = #{streetId}</if>
<if test="communityId != '' and communityId != null"> and ug.community_id = #{communityId}</if>
<if test="gridId != '' and gridId != null"> and ug.grid_id = #{gridId}</if>
u.del_flag = '0'
<if test="startTime != '' and endTime != ''">and u.register_time between #{startTime} and #{endTime}</if>
<if test="state != '' and state != null">and u.state = #{state}</if>
<if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
<if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
<if test="partyFlag != '' and partyFlag != null">and u.party_flag = #{partyFlag}</if>
<if test="streetId != '' and streetId != null">and ug.street_id = #{streetId}</if>
<if test="communityId != '' and communityId != null">and ug.community_id = #{communityId}</if>
<if test="gridId != '' and gridId != null">and ug.grid_id = #{gridId}</if>
GROUP BY
u.ID
u.ID
ORDER BY
u.register_time desc
u.register_time desc
</select>
<!-- 根据userId获取居民详情(已认证或待认证(提交信息待审核)的居民用户) -->
<resultMap id="EpdcResidentDetailResultDtoMap" type="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO">
<resultMap id="EpdcResidentDetailResultDtoMap"
type="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO">
<id column="id" property="userId"/>
<result column="REAL_NAME" property="realName"/>
<result column="IDENTITY_NO" property="identityNo"/>
@ -99,7 +107,7 @@
<result column="DWELLING_PLACE" property="dwellingPlace"/>
<result column="PARTY_FLAG" property="partyFlag"/>
<result column="state" property="state"/>
<collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO" >
<collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO">
<result column="completeName" property="completeName"/>
<result column="leaderFlag" property="leaderFlag"/>
</collection>
@ -127,53 +135,53 @@
<select id="selectListOfInviteUsers" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO">
SELECT
ID AS userId,
NICKNAME,
FACE_IMG AS userAvatar,
PARTY_FLAG AS partyMember,
MOBILE
ID AS userId,
NICKNAME,
FACE_IMG AS userAvatar,
PARTY_FLAG AS partyMember,
MOBILE
FROM
epdc_user
epdc_user
WHERE
DEL_FLAG = '0'
AND GRID_ID = #{gridId}
AND ID NOT IN
<foreach item="userId" collection="userIds" open="(" separator="," close=")">
#{userId}
</foreach>
<if test="mobile != null and mobile != ''">
and MOBILE = #{mobile}
</if>
<if test="road != null and road != ''">
and ROAD like concat('%', #{road}, '%')
</if>
<if test="lastName != null and lastName != ''">
and LAST_NAME like concat('%', #{lastName}, '%')
</if>
DEL_FLAG = '0'
AND GRID_ID = #{gridId}
AND ID NOT IN
<foreach item="userId" collection="userIds" open="(" separator="," close=")">
#{userId}
</foreach>
<if test="mobile != null and mobile != ''">
and MOBILE = #{mobile}
</if>
<if test="road != null and road != ''">
and ROAD like concat('%', #{road}, '%')
</if>
<if test="lastName != null and lastName != ''">
and LAST_NAME like concat('%', #{lastName}, '%')
</if>
ORDER BY
CONVERT(NICKNAME USING gbk) ASC,
REGISTER_TIME
CONVERT(NICKNAME USING gbk) ASC,
REGISTER_TIME
</select>
<resultMap id="partMemberDetail" type="com.elink.esua.epdc.dto.epdc.result.EpdcPartyMemberDetailDto">
<id column="userId" property="userId" />
<result column="realName" property="realName" />
<result column="identityNo" property="identityNo" />
<result column="road" property="road" />
<result column="villageName" property="villageName" />
<result column="dwellingPlace" property="dwellingPlace" />
<result column="authenticatedFlag" property="authenticatedFlag" />
<result column="streetName" property="streetName" />
<result column="communityName" property="communityName" />
<result column="gridName" property="gridName" />
<result column="partyFlag" property="partyFlag" />
<result column="cadreFlag" property="cadreFlag" />
<collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO" >
<id column="userId" property="userId"/>
<result column="realName" property="realName"/>
<result column="identityNo" property="identityNo"/>
<result column="road" property="road"/>
<result column="villageName" property="villageName"/>
<result column="dwellingPlace" property="dwellingPlace"/>
<result column="authenticatedFlag" property="authenticatedFlag"/>
<result column="streetName" property="streetName"/>
<result column="communityName" property="communityName"/>
<result column="gridName" property="gridName"/>
<result column="partyFlag" property="partyFlag"/>
<result column="cadreFlag" property="cadreFlag"/>
<collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO">
<result column="completeName" property="completeName"/>
<result column="leaderFlag" property="leaderFlag"/>
</collection>
<collection property="tagNameList" ofType="java.lang.String" >
<result column="tagName" />
<collection property="tagNameList" ofType="java.lang.String">
<result column="tagName"/>
</collection>
</resultMap>
@ -274,4 +282,48 @@
AND eu.id = #{userId}
</select>
<!--获取用户列表-->
<select id="selectWorkUserList" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
SELECT
u.ID as userId,
u.NICKNAME as nickname,
u.REGISTER_TIME as registerTime,
u.FACE_IMG as faceImg
FROM
epdc_user_grid_relation ug_l
LEFT JOIN epdc_user_grid_relation ug_r ON ug_l.GRID_ID = ug_r.GRID_ID
LEFT JOIN epdc_user u ON ug_r.USER_ID = u.ID
WHERE
ug_l.USER_ID = #{userId}
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' )
GROUP BY
u.ID
ORDER BY
u.CREATED_TIME DESC
LIMIT #{pageIndex},#{pageSize}
</select>
<!--查询待认证用户数量-->
<select id="selectOneAnauthorizedAmount" resultType="Integer">
SELECT
COUNT(u.ID)
FROM
epdc_user_grid_relation ug_l
LEFT JOIN epdc_user_grid_relation ug_r ON ug_l.GRID_ID = ug_r.GRID_ID
LEFT JOIN epdc_user u ON ug_r.USER_ID = u.ID
WHERE
ug_l.USER_ID = #{userId}
AND ug_l.LEADER_FLAG = '1'
AND u.STATE = '1'
<if test='allGridFlag=="0"'>
AND ug_r.GRID_ID = #{deptId}
</if>
</select>
</mapper>

Loading…
Cancel
Save