From de8c6a49fb8bcddc4b7ac654fef862ddaeabad53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Fri, 29 Nov 2019 09:26:02 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java index 88e6e8086..e229b167c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java @@ -19,7 +19,7 @@ public class ItemStatisticsFormDTO implements Serializable { /** * 部门ID */ - private String deptId; + private Long deptId; /** * 部门ID列表 */ From 328a17794fa2ecf4d37bb1153422f41e2b6da694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Fri, 29 Nov 2019 09:43:29 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/item/result/ItemStatisticsResultDTO.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemStatisticsResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemStatisticsResultDTO.java index 2f39ae004..d4a3537a9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemStatisticsResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemStatisticsResultDTO.java @@ -15,18 +15,18 @@ public class ItemStatisticsResultDTO implements Serializable { /** * 待处理数量 */ - private String pendingHandleNum; + private Integer pendingHandleNum; /** * 已结案数量 */ - private String closingCaseNum; + private Integer closingCaseNum; /** * 已关闭数量 */ - private String closedNum; + private Integer closedNum; /** * 消息数量 */ - private String noticeNum; + private Integer noticeNum; } From f7448db216a1c1eec1e8a3471d55d4b3801f9a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Fri, 29 Nov 2019 10:01:37 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=A4=BE=E7=BE=A4=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BB=93=E6=9E=84=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/events/EpdcEventsDao.xml | 6 +++-- .../main/resources/mapper/issue/IssueDao.xml | 3 ++- .../main/resources/mapper/item/ItemDao.xml | 3 ++- .../main/resources/mapper/group/GroupDao.xml | 27 ++++++++++++------- .../main/resources/mapper/topic/TopicDao.xml | 9 ++++--- 5 files changed, 32 insertions(+), 16 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index 2e1e6cd3a..c83bd412a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -68,7 +68,8 @@ AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} - AND temp.grid_id = #{gridId} + AND (temp.GRID_ID = #{gridId} + OR find_in_set(#{gridId},temp.ALL_DEPT_IDS)) AND (find_in_set(#{streetId},temp.PARENT_DEPT_IDS) @@ -96,7 +97,8 @@ AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} - AND temp.grid_id = #{gridId} + AND (temp.GRID_ID = #{gridId} + OR find_in_set(#{gridId},temp.ALL_DEPT_IDS)) AND find_in_set(#{streetId},temp.PARENT_DEPT_IDS) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 0c023ef1a..b551bc37d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -24,7 +24,8 @@ AND DATE_FORMAT( issue.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} - AND issue.GRID_ID = #{gridId} + AND (issue.GRID_ID = #{gridId} + OR find_in_set(#{gridId},issue.ALL_DEPT_IDS)) AND (find_in_set(#{streetId},issue.PARENT_DEPT_IDS) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 6de92e905..321dee8ed 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -402,7 +402,8 @@ AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} - AND item.GRID_ID = #{gridId} + AND (item.GRID_ID = #{gridId} + OR find_in_set(#{gridId},item.ALL_DEPT_IDS)) AND (find_in_set(#{streetId},item.PARENT_DEPT_IDS) diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml index 684365f26..d319fed6a 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml @@ -22,13 +22,16 @@ AND gp.STATE = #{state} - AND gp.GRID_ID = #{gridId} + AND (gp.GRID_ID = #{gridId} + OR find_in_set(#{gridId},gp.ALL_DEPT_IDS)) - AND gp.STREET_ID = #{streetId} + AND (find_in_set(#{streetId},gp.PARENT_DEPT_IDS) + OR find_in_set(#{streetId},gp.ALL_DEPT_IDS)) - AND gp.COMMUNITY_ID = #{communityId} + AND (find_in_set(#{communityId},gp.PARENT_DEPT_IDS) + OR find_in_set(#{communityId},gp.ALL_DEPT_IDS)) ORDER BY gp.GROUP_CATEGORY, gp.CREATED_TIME DESC @@ -200,13 +203,16 @@ gp.DEL_FLAG = '0' AND gp.STATE IN ( 10, 15 ) - AND gp.GRID_ID = #{gridId} + AND (gp.GRID_ID = #{gridId} + OR find_in_set(#{gridId},gp.ALL_DEPT_IDS)) - AND gp.STREET_ID = #{streetId} + AND (find_in_set(#{streetId},gp.PARENT_DEPT_IDS) + OR find_in_set(#{streetId},gp.ALL_DEPT_IDS)) - AND gp.COMMUNITY_ID = #{communityId} + AND (find_in_set(#{communityId},gp.PARENT_DEPT_IDS) + OR find_in_set(#{communityId},gp.ALL_DEPT_IDS)) AND DATE_FORMAT( gp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} @@ -234,13 +240,16 @@ gp.DEL_FLAG = '0' AND gp.STATE IN ( 10, 15 ) - AND gp.GRID_ID = #{gridId} + AND (gp.GRID_ID = #{gridId} + OR find_in_set(#{gridId},gp.ALL_DEPT_IDS)) - AND gp.STREET_ID = #{streetId} + AND (find_in_set(#{streetId},gp.PARENT_DEPT_IDS) + OR find_in_set(#{streetId},gp.ALL_DEPT_IDS)) - AND gp.COMMUNITY_ID = #{communityId} + AND (find_in_set(#{communityId},gp.PARENT_DEPT_IDS) + OR find_in_set(#{communityId},gp.ALL_DEPT_IDS)) AND DATE_FORMAT( gp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml index 84fb0cf11..f5270850d 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml @@ -201,13 +201,16 @@ temp.DEL_FLAG = '0' AND temp.STATE IN ( 0, 5, 20 ) - AND temp.STREET_ID = #{streetId} + AND (find_in_set(#{streetId},temp.PARENT_DEPT_IDS) + OR find_in_set(#{streetId},temp.ALL_DEPT_IDS)) - AND temp.COMMUNITY_ID = #{communityId} + AND (find_in_set(#{communityId},temp.PARENT_DEPT_IDS) + OR find_in_set(#{communityId},temp.ALL_DEPT_IDS)) - AND temp.grid_id = #{gridId} + AND (temp.GRID_ID = #{gridId} + OR find_in_set(#{gridId},temp.ALL_DEPT_IDS)) AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} From e9ae1bd2c135cb465f47b2c25a5898d21f259f66 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Fri, 29 Nov 2019 10:14:53 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/constant/WorkAppMenuConstant.java | 36 ++++++++ .../form/WorkAppMenuStatisticsFormDTO.java | 22 +++++ .../WorkAppMenuStatisticsResultDTO.java | 27 ++++++ .../controller/ApiWorkUserController.java | 16 ++++ .../esua/epdc/service/WorkUserService.java | 15 ++- .../service/impl/WorkUserServiceImpl.java | 91 ++++++++++++++++++- 6 files changed, 204 insertions(+), 3 deletions(-) create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/WorkAppMenuConstant.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/WorkAppMenuStatisticsFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/WorkAppMenuStatisticsResultDTO.java diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/WorkAppMenuConstant.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/WorkAppMenuConstant.java new file mode 100644 index 000000000..4fc62cafa --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/WorkAppMenuConstant.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.constant; + +/** + * + * 工作端-首页菜单常量 + * + * @Author：liuchuang + * @Date：2019/11/28 19:04 + */ +public interface WorkAppMenuConstant { + + /** + * 议题管理-待回应 + */ + String WORK_APP_MENU_CODE_ISSUE_WAITING_RESPOND = "10001"; + + /** + * 议题管理-待处理 + */ + String WORK_APP_MENU_CODE_ISSUE_WAITING_HANDLE = "10002"; + + /** + * 项目管理-待处理 + */ + String WORK_APP_MENU_CODE_ITEM_WAITING_HANDLE = "10003"; + + /** + * 用户管理-待认证居民 + */ + String WORK_APP_MENU_CODE_USER_RESIDENTS_TO_BE_CERTIFIED = "10004"; + + /** + * 消息 + */ + String WORK_APP_MENU_CODE_NOTICE = "10005"; +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/WorkAppMenuStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/WorkAppMenuStatisticsFormDTO.java new file mode 100644 index 000000000..5f7c5329e --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/WorkAppMenuStatisticsFormDTO.java @@ -0,0 +1,22 @@ +package com.elink.esua.epdc.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * + * 工作端小程序首页菜单消息数量Form DTO + * + * @Author：liuchuang + * @Date：2019/11/29 9:14 + */ +@Data +public class WorkAppMenuStatisticsFormDTO implements Serializable { + private static final long serialVersionUID = 4881526875170357671L; + + /** + * 部门ID + */ + private Long deptId; +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/WorkAppMenuStatisticsResultDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/WorkAppMenuStatisticsResultDTO.java new file mode 100644 index 000000000..3a98d3912 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/WorkAppMenuStatisticsResultDTO.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * + * 工作端小程序首页菜单消息数量 + * + * @Author：liuchuang + * @Date：2019/11/28 19:53 + */ +@Data +public class WorkAppMenuStatisticsResultDTO implements Serializable { + private static final long serialVersionUID = -8971266834441830462L; + + /** + * 菜单编码 + */ + private String menuCode; + + /** + * 菜单消息数量 + */ + private Integer menuNum; +} 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 fc2359dbe..b4d435095 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 @@ -7,6 +7,8 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO; +import com.elink.esua.epdc.dto.form.WorkAppMenuStatisticsFormDTO; +import com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO; import com.elink.esua.epdc.service.WorkUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -167,4 +169,18 @@ public class ApiWorkUserController { ValidatorUtils.validateEntity(formDto); return workUserService.removeGrid(formDto); } + + /** + * + * 首页菜单消息数量显示 + * + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/11/28 19:56 + */ + @GetMapping("indexStatistics") + public Result> indexStatistics(WorkAppMenuStatisticsFormDTO formDto) { + return workUserService.indexStatistics(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 5452cb9d7..83f306436 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 @@ -5,11 +5,11 @@ import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; -import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO; +import com.elink.esua.epdc.dto.form.WorkAppMenuStatisticsFormDTO; +import com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO; import java.util.List; -import java.util.Map; /** * 工作端，用户登录、用户管理 相关业务接口 @@ -119,4 +119,15 @@ public interface WorkUserService { * @Date 2019/11/22 14:17 **/ Result removeGrid(EpdcAppRemoveGridFormDTO formDto); + + /** + * + * 首页菜单消息数量显示 + * + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author liuchuang + * @since 2019/11/28 20:03 + */ + Result> indexStatistics(WorkAppMenuStatisticsFormDTO 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 2e3a1c65c..1809a95fa 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 @@ -10,14 +10,22 @@ 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.constant.WorkAppMenuConstant; import com.elink.esua.epdc.dto.SysUserDTO; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; -import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO; +import com.elink.esua.epdc.dto.form.WorkAppMenuStatisticsFormDTO; +import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO; +import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; +import com.elink.esua.epdc.dto.item.form.ItemStatisticsFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO; +import com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.ResourceFeignClient; import com.elink.esua.epdc.feign.UserFeignClient; +import com.elink.esua.epdc.service.WorkIssueService; +import com.elink.esua.epdc.service.WorkItemService; import com.elink.esua.epdc.service.WorkUserService; import com.elink.esua.epdc.utils.WxMaServiceUtils; import me.chanjar.weixin.common.error.WxErrorException; @@ -25,6 +33,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -47,6 +56,12 @@ public class WorkUserServiceImpl implements WorkUserService { @Autowired private WxMaServiceUtils wxMaServiceUtils; + @Autowired + private WorkIssueService workIssueService; + + @Autowired + private WorkItemService workItemService; + @Override public Result getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto) { // 获取openId @@ -202,4 +217,78 @@ public class WorkUserServiceImpl implements WorkUserService { public Result removeGrid(EpdcAppRemoveGridFormDTO formDto) { return userFeignClient.removeGrid(formDto); } + + @Override + public Result> indexStatistics(WorkAppMenuStatisticsFormDTO formDto) { + if (null == SecurityUser.getUser()) { + return new Result>().error("获取当前登录用户信息失败"); + } + // 获取当前用户菜单信息 + Result> adminResult = adminFeignClient.indexPanel(SecurityUser.getUser().getMobile()); + if (!adminResult.success()) { + return new Result>().error(adminResult.getMsg()); + } + // 议题管理菜单消息数量统计 + IssueStateStatisticsFormDTO issueFormDto = new IssueStateStatisticsFormDTO(); + issueFormDto.setDeptId(formDto.getDeptId()); + Result issueResult = workIssueService.stateStatistics(issueFormDto); + // 项目管理菜单消息数量统计 + ItemStatisticsFormDTO itemFormDto = new ItemStatisticsFormDTO(); + itemFormDto.setDeptId(formDto.getDeptId()); + Result itemResult = workItemService.getItemStatistics(itemFormDto); + // 用户管理菜单消息数量统计 + EpdcUnauthorizedAmountFromDTO unauthorizedFromDto = new EpdcUnauthorizedAmountFromDTO(); + unauthorizedFromDto.setGridId(formDto.getDeptId()); + Result unauthorizedResult = this.getUnauthorizedAmount(unauthorizedFromDto); + + // 组装返回数据 + List resultDtoList = new ArrayList<>(); + for (EpdcAppIndexPanelResultDTO indexPanelDto: + adminResult.getData()) { + for (EpdcAppChildNavResultDTO childDto: + indexPanelDto.getChildNav()) { + WorkAppMenuStatisticsResultDTO resultDto = null; + switch (childDto.getNavCode()) { + case WorkAppMenuConstant.WORK_APP_MENU_CODE_ISSUE_WAITING_RESPOND: + resultDto = this.packageMenuData(childDto.getNavCode(), issueResult.getData().getPendingResponseNum()); + break; + case WorkAppMenuConstant.WORK_APP_MENU_CODE_ISSUE_WAITING_HANDLE: + resultDto = this.packageMenuData(childDto.getNavCode(), issueResult.getData().getPendingHandleNum()); + break; + case WorkAppMenuConstant.WORK_APP_MENU_CODE_ITEM_WAITING_HANDLE: + resultDto = this.packageMenuData(childDto.getNavCode(), itemResult.getData().getPendingHandleNum()); + break; + case WorkAppMenuConstant.WORK_APP_MENU_CODE_USER_RESIDENTS_TO_BE_CERTIFIED: + resultDto = this.packageMenuData(childDto.getNavCode(), unauthorizedResult.getData()); + break; + case WorkAppMenuConstant.WORK_APP_MENU_CODE_NOTICE: + resultDto = this.packageMenuData(childDto.getNavCode(), itemResult.getData().getNoticeNum()); + break; + default: + break; + } + if (null != resultDto) { + resultDtoList.add(resultDto); + } + } + } + + return new Result>().ok(resultDtoList); + } + + /** + * + * 组装菜单数据 + * + * @params [menuCode, menuNum] + * @return com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO + * @author liuchuang + * @since 2019/11/29 9:58 + */ + private WorkAppMenuStatisticsResultDTO packageMenuData(String menuCode, Integer menuNum) { + WorkAppMenuStatisticsResultDTO resultDto = new WorkAppMenuStatisticsResultDTO(); + resultDto.setMenuCode(menuCode); + resultDto.setMenuNum(menuNum); + return resultDto; + } } From b1f2eb9350b39ac1b28f9aeb1e6698f55f72fbee Mon Sep 17 00:00:00 2001 From: liuchuang Date: Fri, 29 Nov 2019 10:23:29 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 1809a95fa..268dc343a 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 @@ -247,6 +247,9 @@ public class WorkUserServiceImpl implements WorkUserService { adminResult.getData()) { for (EpdcAppChildNavResultDTO childDto: indexPanelDto.getChildNav()) { + if (NumConstant.ZERO_STR.equals(childDto.getNumFlag())) { + continue; + } WorkAppMenuStatisticsResultDTO resultDto = null; switch (childDto.getNavCode()) { case WorkAppMenuConstant.WORK_APP_MENU_CODE_ISSUE_WAITING_RESPOND: From 620a92d24c4448e2b439dc6183839db817b46b28 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Fri, 29 Nov 2019 10:49:35 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E2=80=9C=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E2=80=9D=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcAppUserController.java | 1 - .../PartyAuthenticationFailedEntity.java | 40 +++++++++---------- .../esua/epdc/entity/PartyMembersEntity.java | 34 ++++++++-------- .../service/impl/PartyMembersServiceImpl.java | 2 - .../epdc/service/impl/UserServiceImpl.java | 10 +++-- 5 files changed, 44 insertions(+), 43 deletions(-) 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 9976e509e..3084a59de 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 @@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; /** * 对移动端开放 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java index 862d20235..d5d2e15ed 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java @@ -78,26 +78,6 @@ public class PartyAuthenticationFailedEntity extends BaseEpdcEntity { */ private Date registTime; - /** - * 街道名称 - */ - private String streetName; - - /** - * 街道ID - */ - private Long streetId; - - /** - * 社区名称 - */ - private String communityName; - - /** - * 社区ID - */ - private Long communityId; - /** * 网格名称 */ @@ -133,4 +113,24 @@ public class PartyAuthenticationFailedEntity extends BaseEpdcEntity { */ private String address; + /*** + *所有部门名称 + */ + private String allDeptNames; + + /*** + *所有部门ID + */ + private String allDeptIds; + + /*** + *父所有部门 + */ + private String parentDeptNames; + + /*** + *父所有部门 + */ + private String parentDeptIds; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java index 3eb40dd29..d4828519a 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java @@ -73,22 +73,6 @@ public class PartyMembersEntity extends BaseEpdcEntity { * 注册时间 */ private Date registTime; - /** - * 街道名称 - */ - private String streetName; - /** - * 街道ID - */ - private long streetId; - /** - * 社区名称 - */ - private String communityName; - /** - * 社区ID - */ - private long communityId; /** * 网格名称 */ @@ -101,5 +85,23 @@ public class PartyMembersEntity extends BaseEpdcEntity { * 部门ID */ private long deptId; + /*** + *所有部门名称 + */ + private String allDeptNames; + + /*** + *所有部门ID + */ + private String allDeptIds; + + /*** + *父所有部门 + */ + private String parentDeptNames; + /*** + *父所有部门 + */ + private String parentDeptIds; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java index bafb55126..5e8dc6044 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java @@ -162,8 +162,6 @@ public class PartyMembersServiceImpl extends BaseServiceImpl implem String identityNo = userDto.getIdentityNo(); if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { PartyMembersEntity partyMembersEntity = new PartyMembersEntity(); - partyMembersEntity.setStreetId(userGridRelation.getStreetId()); - partyMembersEntity.setStreetName(userGridRelation.getStreet()); - partyMembersEntity.setCommunityId(userGridRelation.getCommunityId()); - partyMembersEntity.setCommunityName(userGridRelation.getCommunity()); + //修改数据库结构 + partyMembersEntity.setAllDeptNames(userGridRelation.getStreet()+"-"+userGridRelation.getCommunity()+"-"+userGridRelation.getGrid()); + partyMembersEntity.setAllDeptIds(userGridRelation.getStreetId()+","+userGridRelation.getCommunityId()+","+userGridRelation.getGridId()); + partyMembersEntity.setParentDeptNames(userGridRelation.getStreet()+"-"+userGridRelation.getCommunity()); + partyMembersEntity.setParentDeptIds(userGridRelation.getStreetId()+","+userGridRelation.getCommunityId()); + partyMembersEntity.setGridId(userGridRelation.getGridId()); partyMembersEntity.setGridName(userGridRelation.getGrid()); partyMembersEntity.setRegistFlag(YesOrNoEnum.YES.value()); From bd5145e9de36a6326c55a860d95731fbb97066e1 Mon Sep 17 00:00:00 2001 From: yujintao Date: Fri, 29 Nov 2019 11:25:21 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=B1=82=E7=BA=A7=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/SysDeptServiceImpl.java | 152 ++++++++---------- 1 file changed, 70 insertions(+), 82 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index e6db05968..3240a44a8 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -35,6 +35,7 @@ import com.elink.esua.epdc.feign.GroupFeignClient; import com.elink.esua.epdc.service.SysDeptService; import com.elink.esua.epdc.service.SysUserService; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -255,14 +256,14 @@ public class SysDeptServiceImpl extends BaseServiceImpl dataScopeDeptList = userDetail.getDeptIdList(); @@ -341,16 +341,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl parentDeptIdList = Lists.newArrayList(); - // 一级节点 相当于市区，此处虽然组装，但并没有应用第一级节点 - JSONArray NodeListLevel_1 = new JSONArray(); + // 所有父级节点 此处为第一次获取，为顶级节点，相当于市区 + JSONArray parentNodeArray = new JSONArray(); JSONObject node; for (int i = 0; i < headDepts.size(); i++) { // 父节点主键 @@ -358,102 +355,93 @@ public class SysDeptServiceImpl extends BaseServiceImpl cache = Lists.newArrayList(); + Map object; + while (CollUtil.isNotEmpty(dataScopeDeptList)) { + // 通过上级节点组装所有下级节点 + object = this.packageChildrenNodeArray(parentNodeArray, dataScopeDeptList, parentDeptIdList); + + dataScopeDeptList = (List) object.get("scope"); + parentDeptIdList = (List) object.get("pids"); + + parentNodeArray = (JSONArray) object.get("node"); + cache.add(parentNodeArray); } - // 查询所有一级节点的下级部门，用于组装 二级节点 + DeptOption option = new DeptOption(); + option.setOptions(cache.get(0)); + + redisUtils.set(RedisKeys.getAdminUserDeptOptionKey(userId), option); + } + + /** + * 组装下级结构节点 + * + * @param allParentNode 所有的上级机构节点 + * @param dataScopeDeptList 拥有数据权限的部门 + * @param parentDeptIdList 上级部门id + * @return java.util.Map + * @author work@yujt.net.cn + * @date 2019/11/29 10:27 + */ + private Map packageChildrenNodeArray(JSONArray allParentNode, List dataScopeDeptList, List parentDeptIdList) { + List childDepts = baseDao.selectChildrenDeptNode(dataScopeDeptList, parentDeptIdList); + parentDeptIdList = Lists.newArrayList(); - // 所有二级节点 相当于街道 - JSONArray NodeListLevel_2 = new JSONArray(); - // 某个一级节点下所有的二级节点 + // 用于存储所有子节点 + JSONArray allChildrenNode = new JSONArray(); + // 某个父节点下所有的子节点 JSONArray childrenNodeList; - // 单个 二级节点 + // 单个 子节点 JSONObject nodeChild; - // 单个 一级节点 - JSONObject nodeParent; - - for (int i = 0; i < NodeListLevel_1.size(); i++) { - // 一个父节点 - nodeParent = NodeListLevel_1.getJSONObject(i); - // 一个父节点的所有下级节点 - childrenNodeList = new JSONArray(); - for (int j = 0; j < childDepts.size(); j++) { - deptId = childDepts.get(j).getId(); - - if (nodeParent.get(value).equals(String.valueOf(childDepts.get(j).getPid()))) { - nodeChild = new JSONObject(); - nodeChild.put(label, childDepts.get(j).getName()); - nodeChild.put(value, String.valueOf(deptId)); - childrenNodeList.add(nodeChild); - - NodeListLevel_2.add(nodeChild); - parentDeptIdList.add(deptId); - } - } - } + // 单个 父节点 + JSONObject nodeParent; + Long deptId; - // 查询所有二级节点的下级部门，用于组装 三级节点 - childDepts = baseDao.selectChildrenDeptNode(dataScopeDeptList, parentDeptIdList); - parentDeptIdList = Lists.newArrayList(); + for (int i = 0; i < allParentNode.size(); i++) { - // 所有三级节点 相当于社区 - JSONArray NodeListLevel_3 = new JSONArray(); - for (int i = 0; i < NodeListLevel_2.size(); i++) { - // 一个父节点 - nodeParent = NodeListLevel_2.getJSONObject(i); - // 一个父节点的所有下级节点 + nodeParent = allParentNode.getJSONObject(i); + // 用于存储 一个父节点的所有下级节点 childrenNodeList = new JSONArray(); for (int j = 0; j < childDepts.size(); j++) { deptId = childDepts.get(j).getId(); - if (nodeParent.get(value).equals(String.valueOf(childDepts.get(j).getPid()))) { + if (nodeParent.get("value").equals(String.valueOf(childDepts.get(j).getPid()))) { nodeChild = new JSONObject(); - nodeChild.put(label, childDepts.get(j).getName()); - nodeChild.put(value, String.valueOf(deptId)); + nodeChild.put("label", childDepts.get(j).getName()); + nodeChild.put("value", String.valueOf(deptId)); childrenNodeList.add(nodeChild); - NodeListLevel_3.add(nodeChild); + allChildrenNode.add(nodeChild); parentDeptIdList.add(deptId); } } - if(childrenNodeList.size() > 0){ - nodeParent.put(children, childrenNodeList); + if (childrenNodeList.size() > 0) { + nodeParent.put("children", childrenNodeList); } } - // 查询所有三级节点的下级部门，用于组装 四级节点 - childDepts = baseDao.selectChildrenDeptNode(dataScopeDeptList, parentDeptIdList); - - - for (int i = 0; i < NodeListLevel_3.size(); i++) { - // 父节点 - nodeParent = NodeListLevel_3.getJSONObject(i); - childrenNodeList = new JSONArray(); - - for (int j = 0; j < childDepts.size(); j++) { - deptId = childDepts.get(j).getId(); - - if (nodeParent.get(value).equals(String.valueOf(childDepts.get(j).getPid()))) { - nodeChild = new JSONObject(); - nodeChild.put(label, childDepts.get(j).getName()); - nodeChild.put(value, String.valueOf(deptId)); - childrenNodeList.add(nodeChild); - } - } - if(childrenNodeList.size() > 0){ - nodeParent.put(children, childrenNodeList); + List newDataScopeList = Lists.newArrayList(); + for (int i = 0; i < dataScopeDeptList.size(); i++) { + deptId = dataScopeDeptList.get(i); + if (!parentDeptIdList.contains(deptId)) { + newDataScopeList.add(deptId); } } - - DeptOption option = new DeptOption(); - option.setOptions(NodeListLevel_2); - - redisUtils.set(RedisKeys.getAdminUserDeptOptionKey(userId), option); + dataScopeDeptList = newDataScopeList; + Map result = Maps.newHashMap(); + result.put("node", allChildrenNode); + result.put("scope", dataScopeDeptList); + result.put("pids", parentDeptIdList); + return result; } } From f5a054cdcdfb02d9c43dc7ff5fb84a4188cb627d Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Fri, 29 Nov 2019 12:47:05 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/epdc/form/EpdcUserQueryFormDTO.java | 71 -------------- .../epdc/result/EpdcUserQueryResultDTO.java | 27 ------ .../UserAuthenticateHistoryController.java | 2 +- .../esua/epdc/controller/UserController.java | 15 --- .../java/com/elink/esua/epdc/dao/UserDao.java | 27 +----- .../epdc/entity/UserGridRelationEntity.java | 23 ++++- .../elink/esua/epdc/service/UserService.java | 9 -- .../epdc/service/impl/UserServiceImpl.java | 21 ----- .../src/main/resources/mapper/UserDao.xml | 92 +++---------------- 9 files changed, 37 insertions(+), 250 deletions(-) delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserQueryFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserQueryResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserQueryFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserQueryFormDTO.java deleted file mode 100644 index 002bc077f..000000000 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserQueryFormDTO.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.elink.esua.epdc.dto.epdc.form; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description 居民管理[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询入参DTO - * @Author yinzuomei - * @Date 2019/11/28 15:50 - */ -@Data -public class EpdcUserQueryFormDTO implements Serializable { - private static final long serialVersionUID = -6726464735906160180L; - - /** - * 姓名 - */ - private String realName; - - /** - * 手机号 - */ - private String mobile; - - /** - * 身份证号 - */ - private String identityNo; - - /** - * 注册开始日期 - */ - private String startTime; - - /** - * 注册结束日期 - */ - private String endTime; - - /** - * 是否是党员 - */ - private String partyFlag; - - /** - * 状态 - */ - private String state; - - /** - * 当前页码 - */ - private int page; - - /** - * 每页条数 - */ - private int limit; - - /** - * 所属机构 - */ - private List deptIdList; - - /** - * 所属机构字符串 - */ - private String deptIdListStr; -} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserQueryResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserQueryResultDTO.java deleted file mode 100644 index 0481f06e7..000000000 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserQueryResultDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.elink.esua.epdc.dto.epdc.result; - -import com.elink.esua.epdc.dto.UserDTO; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description 居民管理[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询返参DTO - * @Author yinzuomei - * @Date 2019/11/28 16:13 - */ -@Data -public class EpdcUserQueryResultDTO implements Serializable { - private static final long serialVersionUID = -7375391737870073472L; - - /** - * 总记录数 - */ - private int total; - - /** - * 居民信息列表 - */ - private List list; -} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java index 627841bdb..94db73b55 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java @@ -48,7 +48,7 @@ import java.util.Map; * @since v1.0.0 2019-11-21 */ @RestController -@RequestMapping(Constant.EPDC_APP+"userauthenticatehistory") +@RequestMapping("userauthenticatehistory") public class UserAuthenticateHistoryController { @Autowired 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 35e58f847..0a56c1aed 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 @@ -27,8 +27,6 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserQueryFormDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserQueryResultDTO; import com.elink.esua.epdc.enums.AppUserStatesEnum; import com.elink.esua.epdc.excel.UserExcel; import com.elink.esua.epdc.service.UserService; @@ -59,19 +57,6 @@ public class UserController { return new Result>().ok(page); } - /** - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询方法 - * @Date 2019/11/28 16:01 - **/ - @PostMapping("query") - public Result query(@RequestBody EpdcUserQueryFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); - return userService.listUserDTO(formDTO); - } - @GetMapping("{id}") public Result get(@PathVariable("id") String id) { UserDTO data = userService.get(id); 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 b87cc585b..bd02252ff 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 @@ -18,17 +18,11 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; -import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserQueryFormDTO; -import com.elink.esua.epdc.dto.epdc.result.*; -import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO; +import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.entity.UserEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -154,21 +148,4 @@ public interface UserDao extends BaseDao { */ int selectOneAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto); - /** - * @param formDTO - * @return java.util.List - * @Author yinzuomei - * @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询方法 - * @Date 2019/11/28 16:23 - **/ - List selectListUserDTO(EpdcUserQueryFormDTO formDTO); - - /** - * @param formDTO - * @return int - * @Author yinzuomei - * @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询总记录数 - * @Date 2019/11/28 16:23 - **/ - int selectCountOfUserDTO(EpdcUserQueryFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java index 0f8514f36..1addcae49 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java @@ -28,7 +28,7 @@ import java.util.Date; /** * 网格长与网格关系表 * - * @author work@yujt.net.cn + * @author work@yujt.net.cn * @since v1.0.0 2019-10-23 */ @Data @@ -63,4 +63,23 @@ public class UserGridRelationEntity extends BaseEpdcEntity { */ private String leaderFlag; -} \ No newline at end of file + /*** + *所有部门名称 + */ + private String allDeptNames; + + /*** + *所有部门ID + */ + private String allDeptIds; + + /*** + *父所有部门 + */ + private String parentDeptNames; + + /*** + *父所有部门 + */ + private String parentDeptIds; +} 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 d24cde005..eaff0357f 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 @@ -238,13 +238,4 @@ public interface UserService extends BaseService { * @date 2019/11/19 13:28 */ Result getAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto); - - /** - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询方法 - * @Date 2019/11/28 16:17 - **/ - Result listUserDTO(EpdcUserQueryFormDTO formDTO); } 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 d0fba42af..1955f39e3 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 @@ -645,26 +645,5 @@ public class UserServiceImpl extends BaseServiceImpl implem public Result getAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) { return new Result().ok(baseDao.selectOneAnauthorizedAmount(fromDto)); } - /** - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询方法 - * @Date 2019/11/28 16:17 - **/ - @Override - public Result listUserDTO(EpdcUserQueryFormDTO formDTO) { - EpdcUserQueryResultDTO data = new EpdcUserQueryResultDTO(); - int pageIndex = (formDTO.getPage() - NumConstant.ONE) * formDTO.getLimit(); - formDTO.setPage(pageIndex); - if (null != formDTO.getDeptIdList() && formDTO.getDeptIdList().size() > 0) { - formDTO.setDeptIdListStr(formDTO.getDeptIdList().stream().map(String::valueOf).collect(Collectors.joining(","))); - } - List userDTOList = baseDao.selectListUserDTO(formDTO); - int total = baseDao.selectCountOfUserDTO(formDTO); - data.setTotal(total); - data.setList(userDTOList); - return new Result().ok(data); - } } 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 991f68153..ac714d80a 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 @@ -66,11 +66,7 @@ ADDRESS, STATE, PARTY_FLAG, - CONCAT( - ifnull(ug.STREET,''), - '-',ug.COMMUNITY, - '-',ug.GRID - ) AS myGridName + ug.ALL_DEPT_NAMES AS myGridName FROM epdc_user u LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID @@ -82,9 +78,18 @@ and u.mobile like '%${mobile}%' and u.identity_no like '%${identityNo}%' and u.party_flag = #{partyFlag} - and ug.street_id = #{streetId} - and ug.community_id = #{communityId} - and ug.grid_id = #{gridId} + + AND (find_in_set(#{streetId},ug.PARENT_DEPT_IDS) + OR find_in_set(#{streetId},ug.ALL_DEPT_IDS)) + + + AND (find_in_set(#{communityId},ug.PARENT_DEPT_IDS) + OR find_in_set(#{communityId},ug.ALL_DEPT_IDS)) + + + and (ug.grid_id = #{gridId} + OR find_in_set(#{gridId},ug.ALL_DEPT_IDS)) + GROUP BY u.ID ORDER BY @@ -305,75 +310,4 @@ - - - - - From 81167d7fa6f6b23d3dac6c31e69c9a40db934119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Fri, 29 Nov 2019 13:49:36 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=8B=BC=E6=8E=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dao/SysDeptDao.java | 10 +++++ .../epdc/service/impl/SysDeptServiceImpl.java | 38 +++++++++++-------- .../src/main/resources/mapper/SysDeptDao.xml | 19 ++++++++++ 3 files changed, 52 insertions(+), 15 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java index 2f92fb044..5b9ea4e70 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java @@ -75,6 +75,16 @@ public interface SysDeptDao extends BaseDao { */ CompleteDeptDTO getCompleteDept(@Param("gridId") Long gridId); + /** + * 通过网格ID获取该网格所有上级机构 + * + * @param deptId + * @return com.elink.esua.epdc.dto.CompleteDeptDTO + * @author yujintao + * @date 2019/9/7 09:20 + */ + CompleteDeptDTO getParentAndAllDept(@Param("gridId") Long deptId); + /** * 通过街道ID获取项目可流转部门 * diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index e6db05968..2510c8ffc 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -249,22 +249,30 @@ public class SysDeptServiceImpl extends BaseServiceImpl +