From 9cb1067d4c153f286484340d0a20635cf3a41b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Mon, 16 Mar 2020 14:10:25 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/UserController.java | 13 ++++++++++ .../java/com/elink/esua/epdc/dao/UserDao.java | 1 + .../elink/esua/epdc/service/UserService.java | 11 +++++++++ .../epdc/service/impl/UserServiceImpl.java | 24 +++++++++++++++---- .../src/main/resources/mapper/UserDao.xml | 3 ++- 5 files changed, 47 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index 42c1c4d9d..d6510112c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -142,4 +142,17 @@ public class UserController { public Result importExcel(@RequestParam("file") MultipartFile file,@RequestParam Map params) { return userService.insertUserList(file,params); } + + /*** + * 展示所有的 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/3/16 10:51 + */ + @GetMapping("alluserpage") + public Result> alluserpage(@RequestParam Map params) { + PageData page = userService.allUserPage(params); + return new Result>().ok(page); + } } 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 e53bb438b..202fde7ce 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 @@ -188,4 +188,5 @@ public interface UserDao extends BaseDao { * @since 2020/3/7 15:31 */ List selectListOfOrganizationInfo(String deptId); + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java index 30c7e0227..6cd43b92c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -308,4 +308,15 @@ public interface UserService extends BaseService { * @since 2020/3/7 1:23 */ void modifyOrganizationInfo(OrganizationModifyDTO dto); + + + /*** + * 所有用户 用来锁定已注册在别的微信里面的信息 + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @author qushutong + * @date 2020/3/16 10:53 + */ + PageData allUserPage(Map params); + } 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 1f2b7c0cc..47f211d84 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 @@ -863,7 +863,7 @@ public class UserServiceImpl extends BaseServiceImpl implem /** * @param gridIdList - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author yinzuomei * @Description 根据网格id查询网格下所有的用户 * @Date 2019/12/19 15:03 @@ -1124,18 +1124,18 @@ public class UserServiceImpl extends BaseServiceImpl implem } } + /** - * * 组织机构信息处理 * - * @params [dto, userList] * @return java.util.List + * @params [dto, userList] * @author liuchuang * @since 2020/3/7 15:22 */ private List handleOrganizationInfo(OrganizationModifyDTO dto, List userList) { List entities = new ArrayList<>(); - for (UserDTO user: userList) { + for (UserDTO user : userList) { UserEntity entity = new UserEntity(); if (StringUtils.isNotEmpty(user.getParentDeptIds()) && StringUtils.isNotEmpty(user.getParentDeptNames())) { List parentDeptIds = Arrays.asList(user.getParentDeptIds().split(",")); @@ -1164,4 +1164,20 @@ public class UserServiceImpl extends BaseServiceImpl implem return entities; } + + @Override + @DataSource(value = DataSourceNames.FIRST) + public PageData allUserPage(Map params) { + String[] paramKeys = new String[]{"nickname", "identityNo", "realName", "identityNo", "mobile", "startTime", "endTime"}; + if (AppUserUtils.isDefaultQuery(params, paramKeys)) { + List userDtoList = Lists.newArrayList(); + return new PageData<>(userDtoList, NumConstant.ZERO); + } + this.verifyParams(params); + // 查询当前用户所具有的的数据权限 + IPage iPage = this.getPage(params); + List userDtoList = this.baseDao.selectListUserDto(params); + return new PageData<>(userDtoList, iPage.getTotal()); + } + } 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 84f7768f2..ad3d2c4d8 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 @@ -70,7 +70,8 @@ ADDRESS, STATE, PARTY_FLAG, - ug.ALL_DEPT_NAMES AS myGridName + ug.ALL_DEPT_NAMES, + u.FACE_IMG FROM epdc_user u LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID From 034b2a1e5f1a1f41a5017670cb2d6fe795f7bb33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Mon, 16 Mar 2020 16:56:01 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/UserController.java | 15 +++++++ .../java/com/elink/esua/epdc/dao/UserDao.java | 10 +++++ .../elink/esua/epdc/service/UserService.java | 10 +++++ .../epdc/service/impl/UserServiceImpl.java | 14 +++++++ .../src/main/resources/mapper/UserDao.xml | 41 +++++++++++++++++++ 5 files changed, 90 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index d6510112c..232578ad7 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -155,4 +155,19 @@ public class UserController { PageData page = userService.allUserPage(params); return new Result>().ok(page); } + + + /*** + * 已认证居民 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/3/16 16:54 + */ + @GetMapping("authenticatedpage") + @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND") + public Result> authenticatedpage(@RequestParam Map params) { + PageData page = userService.authenticatedpage(params); + return new Result>().ok(page); + } } 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 202fde7ce..28ad8486c 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 @@ -189,4 +189,14 @@ public interface UserDao extends BaseDao { */ List selectListOfOrganizationInfo(String deptId); + + /*** + * 已认证用户 + * @param params + * @return java.util.List + * @author qushutong + * @date 2020/3/16 16:18 + */ + List selectAuthenticatedListUserDto(Map params); + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java index 6cd43b92c..533035a03 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -319,4 +319,14 @@ public interface UserService extends BaseService { */ PageData allUserPage(Map params); + + /*** + * 已认证列表 + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @author qushutong + * @date 2020/3/16 16:16 + */ + PageData authenticatedpage(Map params); + } 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 47f211d84..29a85f07c 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 @@ -1180,4 +1180,18 @@ public class UserServiceImpl extends BaseServiceImpl implem return new PageData<>(userDtoList, iPage.getTotal()); } + @Override + public PageData authenticatedpage(Map params) { + String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"}; + if (AppUserUtils.isDefaultQuery(params, paramKeys)) { + List userDtoList = Lists.newArrayList(); + return new PageData<>(userDtoList, NumConstant.ZERO); + } + this.verifyParams(params); + // 查询当前用户所具有的的数据权限 + IPage iPage = this.getPage(params); + List userDtoList = this.baseDao.selectAuthenticatedListUserDto(params); + return new PageData<>(userDtoList, iPage.getTotal()); + } + } 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 ad3d2c4d8..ade0566b3 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 @@ -410,4 +410,45 @@ FIND_IN_SET( #{deptId}, ALL_DEPT_IDS ) + + From 8d28271d82c15e5c4cb50c6eea159ef6c48de3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 17 Mar 2020 10:03:43 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=85=9A=E5=91=98=E5=88=97=E8=A1=A8=E6=89=80=E5=B1=9E?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=98=BE=E7=A4=BA=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/PartyMembersDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml index 535ddb8da..aedbc5d51 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml @@ -91,7 +91,7 @@ pm.CADRE_FLAG, pm.CREATED_BY,eu.CREATED_TIME, pm.DEPT_ID, pm.ID,pm.IDENTITY_NO,eu.MOBILE,pm.POST, pm.POST_VALUE,pm.REAL_NAME,pm.REGIST_FLAG,eu.REGISTER_TIME as registTime, - GROUP_CONCAT( ut.TAG_NAME ) TAG_NAME, pm.ALL_DEPT_NAMES as allDeptNames + GROUP_CONCAT( ut.TAG_NAME ) TAG_NAME, eu.ALL_DEPT_NAMES as allDeptNames FROM epdc_user eu LEFT JOIN epdc_party_members pm on pm.IDENTITY_NO = eu.IDENTITY_NO and pm.REAL_NAME = eu.REAL_NAME From 155e2ccc48d514ad861860c38b22901860e5c060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 17 Mar 2020 10:06:35 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=85=9A=E5=91=98=E5=88=97=E8=A1=A8=20=E5=A7=93?= =?UTF-8?q?=E5=90=8D=20=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E5=8F=96?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/PartyMembersDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml index aedbc5d51..71e9f1e0a 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml @@ -89,8 +89,8 @@ - - SELECT - eu.id AS userId, - eu.NICKNAME, - eu.FACE_IMG AS userAvatar, - eu.MOBILE, - r.LEADER_FLAG AS lordFlag, - eu.PARTY_FLAG AS partyMember, - 10 as STATE, - NULL AS auditOpinion, - r.GRID_ID AS gridId + eu.id AS userId, + eu.NICKNAME, + eu.FACE_IMG AS userAvatar, + eu.MOBILE, + r.LEADER_FLAG AS lordFlag, + eu.PARTY_FLAG AS partyMember, + 10 as STATE, + NULL AS auditOpinion, + r.GRID_ID AS gridId FROM - epdc_user_grid_relation r - LEFT JOIN epdc_user eu ON r.USER_ID = eu.ID + epdc_user_grid_relation r + LEFT JOIN epdc_user eu ON r.USER_ID = eu.ID WHERE - r.DEL_FLAG = '0' - AND eu.DEL_FLAG = '0' - and (eu.PARTY_FLAG='1' or r.LEADER_FLAG='1') - - AND r.GRID_ID in - - #{gridId} - - + r.DEL_FLAG = '0' + AND eu.DEL_FLAG = '0' + and (eu.PARTY_FLAG='1' or r.LEADER_FLAG='1') + + AND r.GRID_ID in + + #{gridId} + + SELECT - tmp.ID, - tmp.GROUP_NAME, - tmp.GROUP_AVATAR, - tmp.GROUP_CATEGORY, - tmp.STATE, - tmp.totalNum, - tmp.partyMemberNum, - tmp.unreadTopicNum, - tmp.latestTopicTime, - CASE - WHEN tmp.STATE = 0 THEN - '网格长会尽快审核您创建的社群，请耐心等待' - WHEN tmp.STATE = 5 THEN - tmp.PROCESSING_OPINIONS - WHEN ( - tmp.STATE = 10 - AND totalNum 1 - AND tmp.GROUP_CATEGORY = '1' - AND tmp.topicNum = 0 - ) THEN - '您的社群审核已通过，快加好友进来吧' ELSE '' - END AS description -FROM - ( - SELECT - gp.ID, - gp.GROUP_NAME, - gp.GROUP_AVATAR, - gp.GROUP_CATEGORY, - gp.STATE, - gp.PROCESSING_OPINIONS, - ( - SELECT - COUNT( t.ID ) - FROM - epdc_user_group t - WHERE - t.GROUP_ID = gp.ID - AND t.DEL_FLAG = '0' - AND t.STATE = 10 - ) AS totalNum, + t.ID, + t.GROUP_NAME, + t.GROUP_AVATAR, + t.GROUP_CATEGORY, + t.STATE, + t.totalNum, + t.partyMemberNum, + COUNT( DISTINCT ugpr.ID ) AS unreadTopicNum, + MAX( tp.CREATED_TIME ) AS latestTopicTime, +CASE + + WHEN t.STATE = 0 THEN + '网格长会尽快审核您创建的社群，请耐心等待' + WHEN t.STATE = 5 THEN + t.PROCESSING_OPINIONS + WHEN ( + t.STATE = 10 + AND t.totalNum 1 + AND t.GROUP_CATEGORY = '1' + AND COUNT( DISTINCT tp.ID ) = 0 + ) THEN + '您的社群审核已通过，快加好友进来吧' ELSE '' + END AS description + FROM ( SELECT - COUNT( t1.ID ) - FROM - epdc_user_group t1 - WHERE - t1.GROUP_ID = gp.ID - AND t1.DEL_FLAG = '0' - AND t1.STATE = 10 - AND t1.PARTY_MEMBER = '1' - ) AS partyMemberNum, - COUNT( DISTINCT ugpr.ID ) AS unreadTopicNum, - MAX( tp.CREATED_TIME ) AS latestTopicTime, - COUNT( DISTINCT tp.ID ) AS topicNum + gp.ID, + gp.GROUP_NAME, + gp.GROUP_AVATAR, + gp.GROUP_CATEGORY, + gp.STATE, + gp.PROCESSING_OPINIONS, + SUM( ugp.STATE = 10 ) AS totalNum, + SUM( ugp.PARTY_MEMBER = '1' ) AS partyMemberNum FROM epdc_group gp - RIGHT JOIN epdc_user_group ugp ON gp.ID = ugp.GROUP_ID + LEFT JOIN epdc_user_group ugp ON ugp.GROUP_ID = gp.ID AND ugp.DEL_FLAG = '0' - AND ugp.USER_ID = #{userId} AND ugp.STATE = 10 - LEFT JOIN epdc_group_topic_user_read ugpr ON gp.ID = ugpr.GROUP_ID - AND ugpr.DEL_FLAG = '0' - AND ugpr.USER_ID = #{userId} - AND ugpr.READ_FLAG = '0' - LEFT JOIN epdc_topic tp ON gp.ID = tp.GROUP_ID - AND tp.DEL_FLAG = '0' WHERE - gp.DEL_FLAG = '0' - AND gp.GRID_ID = #{gridId} - ]]> 20 + gp.ID IN ( + SELECT + gp.ID + FROM + epdc_group gp + RIGHT JOIN epdc_user_group ugp ON gp.ID = ugp.GROUP_ID + AND ugp.DEL_FLAG = '0' + AND ugp.STATE = 10 + AND ugp.USER_ID = #{userId} + WHERE + gp.DEL_FLAG = '0' + AND gp.STATE ]]> 20 + AND gp.GRID_ID = #{gridId} + ) GROUP BY gp.ID - ORDER BY - MAX( tp.CREATED_TIME ) DESC - ) tmp + ) t + LEFT JOIN epdc_group_topic_user_read ugpr ON t.ID = ugpr.GROUP_ID + AND ugpr.DEL_FLAG = '0' + AND ugpr.USER_ID = #{userId} + AND ugpr.READ_FLAG = '0' + LEFT JOIN epdc_topic tp ON t.ID = tp.GROUP_ID + AND tp.DEL_FLAG = '0' + GROUP BY + t.ID ORDER BY latestTopicTime DESC