From c2390305a6a5b02bc164547d960da41a915ff6c4 Mon Sep 17 00:00:00 2001 From: yujintao Date: Fri, 13 Mar 2020 16:16:37 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=90=88=E5=B9=B6kpi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/constant/RoleTypeKeyConstant.java | 15 + .../esua/epdc/dto/DeptLevelAndLeaderDTO.java | 50 + .../com/elink/esua/epdc/dto/SysRoleDTO.java | 2 +- .../elink/esua/epdc/dto/SysSimpleDictDTO.java | 4 +- .../dto/epdc/form/UserSysDeptInfoFormDTO.java | 4 - .../epdc-admin/epdc-admin-server/Dockerfile | 2 +- .../epdc-admin/epdc-admin-server/pom.xml | 39 + .../epdc/controller/SysDeptController.java | 48 +- .../epdc/controller/SysRoleController.java | 51 +- .../epdc/controller/SysUserController.java | 14 + .../com/elink/esua/epdc/dao/SysDeptDao.java | 36 + .../com/elink/esua/epdc/dao/SysRoleDao.java | 18 +- .../esua/epdc/service/SysDeptService.java | 37 +- .../esua/epdc/service/SysRoleService.java | 1 - .../epdc/service/impl/SysDeptServiceImpl.java | 84 +- .../epdc/service/impl/SysDictServiceImpl.java | 2 +- .../epdc/service/impl/SysRoleServiceImpl.java | 46 + .../epdc/service/impl/SysUserServiceImpl.java | 2 +- .../src/main/resources/logback-spring.xml | 10 +- .../src/main/resources/mapper/SysDeptDao.xml | 91 +- .../src/main/resources/mapper/SysRoleDao.xml | 15 + .../db/esua_epdc_events.pdman.json | 355 ++++- .../epdc/constant/ItemEvaluationLevel.java | 17 + .../comment/form/SubmitCommentFormDTO.java | 50 + .../dto/events/form/EventCountSqlFromDTO.java | 32 + .../epdc/enums/ItemHandleCategoryEnum.java | 3 +- .../epdc-events/epdc-events-server/Dockerfile | 2 +- .../epdc-events/epdc-events-server/pom.xml | 67 +- .../controller/CategoryController.java | 6 +- .../category/entity/CategoryEntity.java | 16 +- .../category/service/CategoryService.java | 6 +- .../service/impl/CategoryServiceImpl.java | 254 ++-- .../controller/AppEventCommentController.java | 10 +- .../comment/service/EventCommentService.java | 5 +- .../service/impl/EventCommentServiceImpl.java | 15 +- .../controller/EpdcEventsController.java | 36 +- .../modules/events/dao/EpdcEventsDao.java | 36 +- .../events/service/EpdcEventsService.java | 37 +- .../service/impl/EpdcEventsServiceImpl.java | 49 +- .../epdc/modules/feign/AdminFeignClient.java | 28 +- .../item/controller/ItemController.java | 65 +- .../esua/epdc/modules/item/dao/ItemDao.java | 95 +- .../item/entity/ItemEvaluateDeptEntity.java | 22 +- .../modules/item/service/ItemService.java | 77 +- .../impl/ItemEvaluateDeptServiceImpl.java | 5 +- .../item/service/impl/ItemServiceImpl.java | 120 +- .../src/main/resources/application.yml | 22 +- .../src/main/resources/logback-spring.xml | 8 +- .../resources/mapper/category/CategoryDao.xml | 6 +- .../resources/mapper/events/EpdcEventsDao.xml | 67 +- .../main/resources/mapper/item/ItemDao.xml | 102 ++ .../epdc-job/epdc-job-client/pom.xml | 5 + .../epdc-job/epdc-job-server/Dockerfile | 20 + .../epdc-job/epdc-job-server/pom.xml | 44 + .../controller/ScheduleJobController.java | 1 + .../elink/esua/epdc/dao/ScheduleJobDao.java | 7 +- .../elink/esua/epdc/feign/KpiFeignClient.java | 49 + .../fallback/KpiFeignClientFallBack.java | 27 + .../epdc/service/ScheduleJobKpiService.java | 38 + .../esua/epdc/service/ScheduleJobService.java | 6 +- .../impl/ScheduleJobKpiServiceImpl.java | 36 + .../service/impl/ScheduleJobServiceImpl.java | 6 + .../esua/epdc/task/KpiManualScoreTask.java | 30 + .../elink/esua/epdc/task/KpiMetaDataTask.java | 35 + .../com/elink/esua/epdc/task/KpiRuleTask.java | 34 + .../src/main/resources/application.yml | 21 + .../src/main/resources/logback-spring.xml | 10 +- .../main/resources/mapper/ScheduleJobDao.xml | 4 + .../esua/epdc/constant/KpiFieldConstant.java | 24 + .../esua/epdc/constant/KpiItemConstant.java | 15 + .../constant/KpiScheduleCodeConstant.java | 65 + .../esua/epdc/dto/EventCountFromDTO.java | 25 + .../esua/epdc/dto/KpiManualScoreDTO.java | 25 +- .../esua/epdc/dto/KpiManualScoreRuleDTO.java | 4 +- .../esua/epdc/dto/KpiManualScoreTempDTO.java | 2 +- .../elink/esua/epdc/dto/KpiMetaDataDTO.java | 113 ++ .../elink/esua/epdc/dto/KpiResultGridDTO.java | 177 +++ .../esua/epdc/dto/KpiResultSuperiorDTO.java | 144 ++ .../esua/epdc/dto/KpiTimeLimitItemDTO.java | 4 +- .../esua/epdc/dto/ScheduleJobParamDTO.java | 50 + .../epdc/dto/form/CategoryInfoFormDTO.java | 20 + .../dto/form/KpiMetaDataOfEventsFormDTO.java | 33 + .../dto/form/KpiRuleSaveOrUpdateFormDTO.java | 6 + .../dto/result/CategoryInfoResultDTO.java | 38 + .../result/KpiEvaluationAmountResultDTO.java | 36 + .../result/KpiEventReportAmountResultDTO.java | 30 + .../result/KpiItemHandleAmountResultDTO.java | 30 + .../KpiItemTimeLimitByDeptResultDTO.java | 48 + .../KpiManualScoreTemplateResultDTO.java | 51 +- .../dto/result/KpiRuleQueryResultDTO.java | 5 + .../elink/esua/epdc/enums/KpiCycleEnum.java | 82 +- .../esua/epdc/enums/KpiMetaDataEnum.java | 116 ++ .../epdc/enums/KpiResultGridDataEnum.java | 50 + .../esua/epdc/enums/KpiRuleModeEnum.java | 37 + .../epdc-kpi/epdc-kpi-server/Dockerfile | 2 +- .../epdc-kpi/epdc-kpi-server/pom.xml | 69 +- .../epdc/controller/KpiFormulaController.java | 2 +- .../controller/KpiManualScoreController.java | 49 +- .../KpiManualScoreRuleController.java | 2 +- .../controller/KpiMetaDataController.java | 110 ++ .../controller/KpiResultGridController.java | 125 ++ .../KpiResultSuperiorController.java | 111 ++ .../epdc/controller/KpiRuleController.java | 224 +-- .../controller/KpiRuleParamController.java | 2 +- .../KpiTimeLimitIssueController.java | 2 +- .../KpiTimeLimitItemController.java | 2 +- .../elink/esua/epdc/dao/KpiFormulaDao.java | 10 + .../esua/epdc/dao/KpiManualScoreDao.java | 42 +- .../elink/esua/epdc/dao/KpiMetaDataDao.java | 48 + .../elink/esua/epdc/dao/KpiResultGridDao.java | 97 ++ .../esua/epdc/dao/KpiResultSuperiorDao.java | 92 ++ .../com/elink/esua/epdc/dao/KpiRuleDao.java | 10 + .../elink/esua/epdc/dao/KpiRuleParamDao.java | 12 + .../esua/epdc/dao/KpiTimeLimitItemDao.java | 28 +- .../epdc/entity/KpiManualScoreEntity.java | 50 +- .../epdc/entity/KpiManualScoreRuleEntity.java | 5 +- .../esua/epdc/entity/KpiMetaDataEntity.java | 82 ++ .../esua/epdc/entity/KpiResultGridEntity.java | 107 ++ .../epdc/entity/KpiResultSuperiorEntity.java | 92 ++ .../epdc/entity/KpiTimeLimitItemEntity.java | 2 +- .../excel/KpiManualScoreTemplateExcel.java | 147 +- .../esua/epdc/excel/KpiMetaDataExcel.java | 78 + .../epdc/excel/KpiResultGridDetailExcel.java | 22 + .../esua/epdc/excel/KpiResultGridExcel.java | 56 + .../excel/KpiResultSuperiorDetailExcel.java | 35 + .../epdc/excel/KpiResultSuperiorExcel.java | 53 + .../esua/epdc/feign/AdminFeignClient.java | 46 +- .../esua/epdc/feign/EventFeignClient.java | 72 +- .../fallback/AdminFeignClientFallback.java | 55 +- .../fallback/EventFeignClientFallback.java | 38 +- .../esua/epdc/redis/KpiMetaDataRedis.java | 47 + .../esua/epdc/redis/KpiResultGridRedis.java | 47 + .../epdc/redis/KpiResultSuperiorRedis.java | 47 + .../esua/epdc/redis/KpiTimeLimitRedis.java | 71 + .../consumer/CategoryModifyConsumer.java | 45 + .../consumer/OrganizationModifyConsumer.java | 57 + .../epdc/rocketmq/dto/CategoryModifyDTO.java | 32 + .../rocketmq/dto/OrganizationModifyDTO.java | 37 + .../epdc/service/KpiManualScoreService.java | 31 + .../esua/epdc/service/KpiMetaDataService.java | 107 ++ .../epdc/service/KpiResultGridService.java | 107 ++ .../service/KpiResultSuperiorService.java | 109 ++ .../esua/epdc/service/KpiRuleService.java | 236 +-- .../epdc/service/KpiTimeLimitItemService.java | 12 + .../service/impl/KpiFormulaServiceImpl.java | 3 +- .../impl/KpiManualScoreRuleServiceImpl.java | 2 +- .../impl/KpiManualScoreServiceImpl.java | 1292 +++++++++++------ .../service/impl/KpiMetaDataServiceImpl.java | 579 ++++++++ .../impl/KpiResultGridServiceImpl.java | 307 ++++ .../impl/KpiResultSuperiorServiceImpl.java | 226 +++ .../epdc/service/impl/KpiRuleServiceImpl.java | 791 +++++++--- .../impl/KpiTimeLimitIssueServiceImpl.java | 9 +- .../impl/KpiTimeLimitItemServiceImpl.java | 156 +- .../com/elink/esua/epdc/utils/DeptUtils.java | 73 + .../esua/epdc/utils/KpiLocalDateUtils.java | 129 ++ .../src/main/resources/application.yml | 25 + .../main/resources/mapper/KpiFormulaDao.xml | 16 + .../resources/mapper/KpiManualScoreDao.xml | 85 +- .../main/resources/mapper/KpiMetaDataDao.xml | 37 + .../resources/mapper/KpiResultGridDao.xml | 132 ++ .../resources/mapper/KpiResultSuperiorDao.xml | 97 ++ .../src/main/resources/mapper/KpiRuleDao.xml | 17 + .../main/resources/mapper/KpiRuleParamDao.xml | 14 + .../resources/mapper/KpiTimeLimitItemDao.xml | 32 +- 164 files changed, 9054 insertions(+), 1719 deletions(-) create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/RoleTypeKeyConstant.java create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptLevelAndLeaderDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventCountSqlFromDTO.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/Dockerfile create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/KpiFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/KpiFeignClientFallBack.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiMetaDataTask.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiRuleTask.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiFieldConstant.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiItemConstant.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiScheduleCodeConstant.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/EventCountFromDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiMetaDataDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiResultGridDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiResultSuperiorDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/CategoryInfoFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiMetaDataOfEventsFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/CategoryInfoResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiEvaluationAmountResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiEventReportAmountResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiItemHandleAmountResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiItemTimeLimitByDeptResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiMetaDataEnum.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiRuleModeEnum.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultGridController.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultSuperiorController.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMetaDataDao.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultGridDao.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultSuperiorDao.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiMetaDataEntity.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiResultGridEntity.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiResultSuperiorEntity.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiMetaDataExcel.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridDetailExcel.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridExcel.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultSuperiorDetailExcel.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultSuperiorExcel.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiMetaDataRedis.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiResultGridRedis.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiResultSuperiorRedis.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiTimeLimitRedis.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/rocketmq/consumer/CategoryModifyConsumer.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/rocketmq/consumer/OrganizationModifyConsumer.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/CategoryModifyDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMetaDataService.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiResultGridService.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiResultSuperiorService.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultSuperiorServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/DeptUtils.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/KpiLocalDateUtils.java create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMetaDataDao.xml create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/RoleTypeKeyConstant.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/RoleTypeKeyConstant.java new file mode 100644 index 000000000..4ac881e24 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/RoleTypeKeyConstant.java @@ -0,0 +1,15 @@ +package com.elink.esua.epdc.constant; + +/** + * TypeKey 常量 + * + * @author work@yujt.net.cn + * @date 2019/12/18 10:10 + */ +public interface RoleTypeKeyConstant { + + /** + * 角色：网格长 + */ + String ROLE_GRID_LEADER = "gridLeader"; +} diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptLevelAndLeaderDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptLevelAndLeaderDTO.java new file mode 100644 index 000000000..a097e497a --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptLevelAndLeaderDTO.java @@ -0,0 +1,50 @@ +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 机构层级关系与机构负责人 + * + * @author work@yujt.net.cn + * @date 2019/12/18 10:55 + */ +@Data +public class DeptLevelAndLeaderDTO implements Serializable { + + private static final long serialVersionUID = 8264059305193996215L; + + /** + * 部门ID + */ + private Long deptId; + /** + * 部门名称 + */ + private String deptName; + /** + * 父所有部门ID + */ + private String parentDeptIds; + /** + * 父所有部门 + */ + private String parentDeptNames; + /** + * 所有部门ID + */ + private String allDeptIds; + /** + * 所有部门名称 + */ + private String allDeptNames; + /** + * 部门负责人名称 + */ + private String leaderName; + /** + * 部门负责人名称 + */ + private String typeKey; +} diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java index 306b2ebc6..74a07bb20 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java @@ -8,10 +8,10 @@ package com.elink.esua.epdc.dto; -import com.fasterxml.jackson.annotation.JsonProperty; 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.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDictDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDictDTO.java index 493c0f1cf..4ff6d87c6 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDictDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDictDTO.java @@ -28,4 +28,6 @@ public class SysSimpleDictDTO implements Serializable { @ApiModelProperty(value = "字典值") private String dictValue; -} \ No newline at end of file + @ApiModelProperty(value = "备注") + private String remark; +} diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java index 238a6ea6b..3f530eec5 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java @@ -16,14 +16,10 @@ public class UserSysDeptInfoFormDTO implements Serializable { /** * 主键集合 */ -// @NotEmpty(message = "deptIdList不能为空") -// @Valid private List deptIdList; /** * 部门类型键值 */ -// @NotEmpty(message = "部门类型不能为空") -// @Valid private List typeKeyList; } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/Dockerfile b/esua-epdc/epdc-admin/epdc-admin-server/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-admin/epdc-admin-server/Dockerfile +++ b/esua-epdc/epdc-admin/epdc-admin-server/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 103e4a080..8672f051f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -62,6 +62,12 @@ feign-httpclient 10.3.0 + + com.esua.epdc + epdc-events-client + 1.0.0 + compile + org.apache.rocketmq @@ -298,5 +304,38 @@ organizationGroup + + + prod_jinshui + + 9100 + prod + prod + + + true + 172.20.0.4:80 + + http://172.31.171.61:9411 + + wx6dcf544cdae7d4ec + 9e0882274ad3821400370312a56a8470 + + wxddb240334d09049f + 071b8c70da0d0482aaf79052e64f83bc + + + + + epdc + Elink@833066 + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 372629e95..cdfe26a50 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -131,6 +131,7 @@ public class SysDeptController { public Result getCompleteDept(@PathVariable("gridId") String gridId) { return sysDeptService.getCompleteDept(gridId); } + /** * 通过网格ID获取该网格所有上级机构 * @@ -141,7 +142,7 @@ public class SysDeptController { */ @GetMapping("getParentAndAllDept/{deptId}") public Result getParentAndAllDept(@PathVariable("deptId") String deptId) { - return sysDeptService.getParentAndAllDept(deptId); + return new Result().ok(sysDeptService.getParentAndAllDept(deptId)); } /** @@ -234,4 +235,49 @@ public class SysDeptController { PageData page = sysDeptService.listCompleteDeptDTO(params); return new Result>().ok(page); } + + /*** + * 获取所有网格 kpi模块原始数据 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2019/12/12 17:26 + */ + @GetMapping("listAllGridId") + public Result listAllGridId() { + return sysDeptService.listAllGridId(); + } + + /** + * 按部门类型，分页查询部门列表 + * + * @param typeKey 部门类型 + * @param pageSize 页容量 + * @param pageIndex 页码 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/12/17 16:03 + */ + @GetMapping("pageDeptIdByTypeKey/{typeKey}/{pageSize}/{pageIndex}") + public Result> pageDeptIdByTypeKey(@PathVariable("typeKey") String typeKey, + @PathVariable("pageSize") Integer pageSize, + @PathVariable("pageIndex") Integer pageIndex) { + return sysDeptService.pageDeptIdByTypeKey(typeKey, pageSize, pageIndex); + } + + + /** + * 根据部门id，获取部门层级关系，获取部门领导姓名 + * + * @param deptId 部门id + * @param leaderFlag 是否需要查询网格长姓名 0 否 、1 是 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/12/18 11:04 + */ + @GetMapping("getDeptInfoById/{deptId}/{leaderFlag}") + public Result getDeptInfoById(@PathVariable("deptId") Long deptId, + @PathVariable("leaderFlag") String leaderFlag) { + DeptLevelAndLeaderDTO dto = sysDeptService.getDeptInfoById(deptId, leaderFlag); + return new Result().ok(dto); + } } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java index dcf0b1f25..b9eab566e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java @@ -8,31 +8,31 @@ package com.elink.esua.epdc.controller; - import com.elink.esua.epdc.commons.tools.annotation.LogOperation; - import com.elink.esua.epdc.commons.tools.constant.Constant; - import com.elink.esua.epdc.commons.tools.page.PageData; - import com.elink.esua.epdc.commons.tools.utils.Result; - import com.elink.esua.epdc.commons.tools.validator.AssertUtils; - import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; - 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.SysRoleDTO; - import com.elink.esua.epdc.service.AppRoleMenuService; - import com.elink.esua.epdc.service.SysRoleDataScopeService; - import com.elink.esua.epdc.service.SysRoleMenuService; - import com.elink.esua.epdc.service.SysRoleService; - import io.swagger.annotations.Api; - import io.swagger.annotations.ApiImplicitParam; - import io.swagger.annotations.ApiImplicitParams; - import io.swagger.annotations.ApiOperation; - import org.springframework.beans.factory.annotation.Autowired; - import org.springframework.web.bind.annotation.*; - import springfox.documentation.annotations.ApiIgnore; - - import java.util.HashMap; - import java.util.List; - import java.util.Map; +import com.elink.esua.epdc.commons.tools.annotation.LogOperation; +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +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.SysRoleDTO; +import com.elink.esua.epdc.service.AppRoleMenuService; +import com.elink.esua.epdc.service.SysRoleDataScopeService; +import com.elink.esua.epdc.service.SysRoleMenuService; +import com.elink.esua.epdc.service.SysRoleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 角色管理 @@ -92,7 +92,6 @@ public class SysRoleController { //查询角色对应app菜单权限 List appMenuIdList = appRoleMenuService.getAppMenuIdList(id); data.setAppMenuIdList(appMenuIdList); - return new Result().ok(data); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index 44001d1db..466d45411 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java @@ -88,6 +88,20 @@ public class SysUserController { return new Result().ok(data); } + /** + * @param userId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 查询用户角色Id + * @Date 2020/2/3 8:13 + **/ + @GetMapping("getRoleIdList/{userId}") + public Result> getRoleIdList(@PathVariable("userId") Long userId) { + //用户角色列表 + List roleIdList = sysRoleUserService.getRoleIdList(userId); + return new Result>().ok(roleIdList); + } + @GetMapping("info") @ApiOperation("登录用户信息") public Result info(@ApiIgnore UserDetail user) { 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 38b7f3a57..8193bca28 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 @@ -9,6 +9,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.DeptTreeDTO; import com.elink.esua.epdc.dto.SysDeptDTO; @@ -156,4 +157,39 @@ public interface SysDeptDao extends BaseDao { List selectListCompleteDeptDTO(Map params); List selectListDeptTreeForEpiDemic(); + + + /*** + * 查询所有网格 + * @param + * @return java.util.List + * @author qushutong + * @date 2019/12/12 18:12 + */ + List selectListAllGridId(); + + /** + * 按部门类型，分页查询部门列表 + * + * @param typeKey 部门类型 + * @param pageSize 页容量 + * @param pageIndex 页码 + * @return java.util.List + * @author work@yujt.net.cn + * @date 2019/12/17 16:11 + */ + List pageDeptIdByTypeKey(@Param("typeKey") String typeKey, + @Param("pageSize") Integer pageSize, + @Param("pageIndex") Integer pageIndex); + + /** + * 根据部门id，查询该部门指定角色的用户姓名 + * + * @param deptId 部门id + * @param roleType 角色类型 + * @return java.lang.String + * @author work@yujt.net.cn + * @date 2019/12/18 13:45 + */ + String selectDeptLeaderName(@Param("deptId") Long deptId, @Param("roleType") String roleType); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java index 31de4510a..1310c61b0 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -12,6 +12,10 @@ import com.elink.esua.epdc.entity.SysRoleEntity; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.SysRoleEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** * 角色管理 @@ -22,4 +26,14 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SysRoleDao extends BaseDao { + /** + * 根据角色类型，获取机构的此类角色数量 + * + * @param roleType + * @param deptIdList + * @return java.util.List> + * @author work@yujt.net.cn + * @date 2019/12/18 10:20 + */ + List> selectAmountByRoleTpye(@Param("roleType") String roleType, @Param("deptIdList") List deptIdList); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index dcade417d..dd0b5b198 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -79,11 +79,11 @@ public interface SysDeptService extends BaseService { * 通过网格ID获取该网格所有上级机构 * * @param deptId - * @return com.elink.esua.epdc.commons.tools.utils.Result + * @return com.elink.esua.epdc.dto.CompleteDeptDTO * @author yujintao * @date 2019/9/7 09:13 */ - Result getParentAndAllDept(String deptId); + ParentAndAllDeptDTO getParentAndAllDept(String deptId); /** * 通过街道ID获取项目可流转部门 @@ -172,7 +172,6 @@ public interface SysDeptService extends BaseService { **/ List listUserSysDeptInfoResultDTO(UserSysDeptInfoFormDTO formDTO); - /*** * 组装所有部门 * @param @@ -212,18 +211,40 @@ public interface SysDeptService extends BaseService { /** * 获取用户部门多层结构（完整层级结构，包括顶级部门），用户前端显示，请求需携带token * - * @return com.elink.esua.epdc.dto.DeptOption * @author work@yujt.net.cn * @date 2020/1/28 10:40 */ DeptOption getAllDeptOptionByLoginUser(); + /*** + * 获取所有网格 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2019/12/12 17:29 + */ + Result> listAllGridId(); + /** - * 获取用户部门层级结构（街道-社区），用户前端显示，请求需携带token + * 按部门类型，分页查询部门列表 * - * @return com.elink.esua.epdc.dto.DeptOption + * @param typeKey 部门类型 + * @param pageSize 页容量 + * @param pageIndex 页码 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2019/12/17 16:05 + */ + Result> pageDeptIdByTypeKey(String typeKey, Integer pageSize, Integer pageIndex); + + /** + * 根据部门id，获取部门层级关系，获取部门领导姓名 + * + * @param deptId 部门id + * @param leaderFlag 是否需要查询网格长姓名 0 否 、1 是 + * @return com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO * @author work@yujt.net.cn - * @date 2020/2/10 13:38 + * @date 2019/12/18 11:05 */ DeptOption getMiddleByLoginUser(); @@ -235,4 +256,6 @@ public interface SysDeptService extends BaseService { * @date 2020/2/11 11:31 */ DeptOption getStreetByLoginUser(); + + DeptLevelAndLeaderDTO getDeptInfoById(Long deptId, String leaderFlag); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleService.java index 1e1ea15ef..7300f79ed 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleService.java @@ -35,5 +35,4 @@ public interface SysRoleService extends BaseService { void update(SysRoleDTO dto); void delete(Long[] ids); - } 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 4057c6d19..a7e54abf8 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 @@ -14,8 +14,14 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; +import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; +import com.elink.esua.epdc.commons.tools.constant.*; import com.elink.esua.epdc.commons.tools.constant.*; import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum; +import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.exception.ErrorCode; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; @@ -27,6 +33,7 @@ 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.commons.tools.utils.TreeUtils; +import com.elink.esua.epdc.constant.RoleTypeKeyConstant; import com.elink.esua.epdc.dao.SysDeptDao; import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; @@ -254,7 +261,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl getParentAndAllDept(String deptId) { + public ParentAndAllDeptDTO getParentAndAllDept(String deptId) { Long deptIdL = null; try { deptIdL = Long.parseLong(deptId.trim()); @@ -262,7 +269,7 @@ public class SysDeptServiceImpl extends BaseServiceImplgetCompleteDept:::部门ID格式转换异常:::deptId->{}", deptId); } if (null == deptIdL) { - return new Result().error("参数格式异常"); + throw new RenException("参数格式异常"); } CompleteDeptDTO completeDept = this.baseDao.getParentAndAllDept(deptIdL); ParentAndAllDeptDTO parentAndAllDeptDTO = new ParentAndAllDeptDTO(); @@ -285,11 +292,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl(userDtoList, iPage.getTotal()); } + @Override + public Result> listAllGridId() { + List gridIdList = baseDao.selectListAllGridId(); + + return new Result>().ok(gridIdList); + } + + @Override + public Result> pageDeptIdByTypeKey(String typeKey, Integer pageSize, Integer pageIndex) { + if (null == pageSize || null == pageIndex || pageSize < NumConstant.ONE || pageIndex < NumConstant.ONE) { + return new Result().error("参数错误"); + } + pageIndex = (pageIndex - NumConstant.ONE) * pageSize; + List deptIdList = baseDao.pageDeptIdByTypeKey(typeKey, pageSize, pageIndex); + return new Result().ok(deptIdList); + } + + @Override + public DeptLevelAndLeaderDTO getDeptInfoById(Long deptId, String leaderFlag) { + if (null == deptId || null == leaderFlag) { + return null; + } + SysDeptEntity sysDeptEntity = baseDao.selectById(deptId); + if (null == sysDeptEntity) { + return null; + } + String deptName = sysDeptEntity.getName(); + String pids = sysDeptEntity.getPids(); + // 上级机构id + String parentDeptIds = NumConstant.ZERO_STR.equals(pids) ? "" : pids; + // 全部机构id + String allDeptIds = StringUtils.isBlank(pids) ? String.valueOf(deptId) : + pids.concat(StrConstant.COMMA).concat(String.valueOf(deptId)); + + // 上级机构名称 + String parentDeptNames = ""; + if (StringUtils.isNotBlank(parentDeptIds)) { + String[] pidArray = parentDeptIds.split(StrConstant.COMMA); + List deptNameList = Lists.newArrayList(); + SysDeptEntity dept; + for (int i = 0; i < pidArray.length; i++) { + dept = baseDao.selectById(Long.parseLong(pidArray[i])); + deptNameList.add(dept.getName()); + } + parentDeptNames = StringUtils.join(deptNameList, StrConstant.HYPHEN); + } + // 全部机构名称 + String allDeptNames = StringUtils.isBlank(parentDeptNames) ? deptName : parentDeptNames.concat(StrConstant.HYPHEN).concat(deptName); + + DeptLevelAndLeaderDTO deptLevel = new DeptLevelAndLeaderDTO(); + deptLevel.setDeptId(deptId); + deptLevel.setDeptName(deptName); + deptLevel.setParentDeptIds(parentDeptIds); + deptLevel.setParentDeptNames(parentDeptNames); + deptLevel.setAllDeptIds(allDeptIds); + deptLevel.setAllDeptNames(allDeptNames); + deptLevel.setTypeKey(sysDeptEntity.getTypeKey()); + + if (YesOrNoEnum.YES.value().equals(leaderFlag)) { + String leaderName = baseDao.selectDeptLeaderName(deptId, RoleTypeKeyConstant.ROLE_GRID_LEADER); + deptLevel.setLeaderName(leaderName); + } + + redisUtils.set(RedisKeys.getDeptOptionKey(deptId), deptLevel); + return deptLevel; + } + /** * * 组织机构名称修改发送MQ消息 diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java index b3f79c64a..5b5a69ffa 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java @@ -134,7 +134,7 @@ public class SysDictServiceImpl extends BaseServiceImpl sdWrapper = new QueryWrapper<>(); - sdWrapper.select("dict_value", "dict_name"); + sdWrapper.select("dict_value", "dict_name","remark"); sdWrapper.eq("dict_type", dictType); sdWrapper.ne("dict_value", ""); sdWrapper.isNotNull("dict_value"); diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java index 7a509dc40..cb1e6613c 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java @@ -8,17 +8,23 @@ package com.elink.esua.epdc.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; +import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum; +import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; 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.constant.RoleTypeKeyConstant; import com.elink.esua.epdc.dao.SysRoleDao; +import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysRoleDTO; import com.elink.esua.epdc.entity.SysRoleEntity; import com.elink.esua.epdc.service.*; @@ -101,6 +107,8 @@ public class SysRoleServiceImpl extends BaseServiceImpl deptidList) { + if (RoleTypeKeyConstant.ROLE_GRID_LEADER.equals(roleType)) { + List> resultList = baseDao.selectAmountByRoleTpye(roleType, deptidList); + if (CollUtil.isEmpty(resultList)) { + return; + } + Map map; + String mapValue; + for (int i = 0; i < resultList.size(); i++) { + map = resultList.get(i); + + mapValue = map.get("typeKey").toString(); + if (!mapValue.equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) { + continue; + } + + mapValue = map.get("amount").toString(); + if (Integer.parseInt(mapValue) <= NumConstant.THREE) { + continue; + } + mapValue = map.get("id").toString(); + ParentAndAllDeptDTO parentAndAllDept = sysDeptService.getParentAndAllDept(mapValue); + throw new RenException("保存失败：" + parentAndAllDept.getAllDeptNames() + "，网格长多于3人"); + } + } } @Override @@ -130,6 +175,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl listGridWhileLeaderRegister(String mobile) { - + //TODO:该方法的获取组织结构不灵活，得重构 create by rongchao QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(FieldConstant.MOBILE, mobile) .eq(FieldConstant.DEL_FLAG, DelFlagEnum.NORMAL.value()); diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/logback-spring.xml index eadc4e16c..3fa19ae98 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/logback-spring.xml @@ -144,10 +144,10 @@ - - - - + + + + @@ -156,4 +156,4 @@ - \ No newline at end of file + diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml index 27e545402..d316d0c1f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml @@ -5,7 +5,7 @@ SELECT - sd.id, - sd.NAME, - sd.pid, - p.NAME AS parentName, - sd.pids, - NULL AS parentNames, - null as street, - null as community, - (case - when sd.type_key='grid_party' then sd.name - else null - end) as grid + sd.id, + sd.NAME, + sd.pid, + p.NAME AS parentName, + sd.pids, + NULL AS parentNames, + null as street, + null as community, + (case + when sd.type_key='grid_party' then sd.name + else null + end) as grid + FROM + sys_dept sd + LEFT JOIN sys_dept p ON ( sd.pid = p.id ) + WHERE + sd.del_flag = '0' + + AND sd.type_key in + + #{typeKey} + + + + AND sd.id IN + + #{deptId} + + + + + + + + + + diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml index 9a422e550..c8cc9d182 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml @@ -3,4 +3,19 @@ + diff --git a/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json b/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json index 65fe84ba5..b38ef5612 100644 --- a/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json +++ b/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json @@ -2679,8 +2679,361 @@ "defaultValue": "" } ] + }, + { + "title": "EPDC_HANDLE_CATEGORY", + "fields": [ + { + "name": "ID", + "type": "IdOrKey", + "remark": "", + "chnname": "主键", + "pk": true, + "notNull": true + }, + { + "name": "CATEGORY_CODE", + "type": "IdOrKey", + "remark": "", + "chnname": "处理类型编码", + "notNull": true + }, + { + "name": "CATEGORY_VAL", + "type": "Integer", + "remark": "", + "chnname": "处理类别值", + "notNull": true + }, + { + "name": "CATEGORY_LABEL", + "type": "VARCHAR_20", + "remark": "", + "chnname": "处理类别显示信息", + "notNull": true + }, + { + "name": "AVAILABLE", + "type": "YesNo", + "remark": "", + "chnname": "可用状态(0-不可用，1-可用)", + "notNull": true, + "defaultValue": "1" + }, + { + "name": "SORT", + "type": "Integer", + "remark": "", + "chnname": "排序", + "notNull": true, + "defaultValue": "0" + }, + { + "name": "REVISION", + "type": "Integer", + "remark": "", + "chnname": "乐观锁" + }, + { + "name": "CREATED_BY", + "type": "IdOrKey", + "remark": "", + "chnname": "创建人" + }, + { + "name": "CREATED_TIME", + "type": "DateTime", + "remark": "", + "chnname": "创建时间" + }, + { + "name": "UPDATED_BY", + "type": "IdOrKey", + "remark": "", + "chnname": "更新人" + }, + { + "name": "UPDATED_TIME", + "type": "DateTime", + "remark": "", + "chnname": "更新时间" + } + ], + "indexs": [], + "headers": [ + { + "fieldName": "chnname", + "relationNoShow": false + }, + { + "fieldName": "name", + "relationNoShow": false + }, + { + "fieldName": "type", + "relationNoShow": false + }, + { + "fieldName": "dataType", + "relationNoShow": true + }, + { + "fieldName": "remark", + "relationNoShow": true + }, + { + "fieldName": "pk", + "relationNoShow": false + }, + { + "fieldName": "notNull", + "relationNoShow": true + }, + { + "fieldName": "autoIncrement", + "relationNoShow": true + }, + { + "fieldName": "defaultValue", + "relationNoShow": true + }, + { + "fieldName": "relationNoShow", + "relationNoShow": true + }, + { + "fieldName": "uiHint", + "relationNoShow": true + } + ], + "chnname": "处理类别表", + "remark": "处理类别表" + }, + { + "title": "EPDC_HANDLE_ROLE_CATEGORY", + "fields": [ + { + "name": "ID", + "type": "IdOrKey", + "remark": "", + "chnname": "主键", + "pk": true, + "notNull": true + }, + { + "name": "ROLE_ID", + "type": "IdOrKey", + "remark": "", + "chnname": "角色ID", + "notNull": true + }, + { + "name": "CATEGORY_ID", + "type": "IdOrKey", + "remark": "", + "chnname": "处理类别ID", + "notNull": true + }, + { + "name": "REVISION", + "type": "Integer", + "remark": "", + "chnname": "乐观锁" + }, + { + "name": "CREATED_BY", + "type": "IdOrKey", + "remark": "", + "chnname": "创建人" + }, + { + "name": "CREATED_TIME", + "type": "DateTime", + "remark": "", + "chnname": "创建时间" + }, + { + "name": "UPDATED_BY", + "type": "IdOrKey", + "remark": "", + "chnname": "更新人" + }, + { + "name": "UPDATED_TIME", + "type": "DateTime", + "remark": "", + "chnname": "更新时间" + } + ], + "indexs": [], + "headers": [ + { + "fieldName": "chnname", + "relationNoShow": false + }, + { + "fieldName": "name", + "relationNoShow": false + }, + { + "fieldName": "type", + "relationNoShow": false + }, + { + "fieldName": "dataType", + "relationNoShow": true + }, + { + "fieldName": "remark", + "relationNoShow": true + }, + { + "fieldName": "pk", + "relationNoShow": false + }, + { + "fieldName": "notNull", + "relationNoShow": true + }, + { + "fieldName": "autoIncrement", + "relationNoShow": true + }, + { + "fieldName": "defaultValue", + "relationNoShow": true + }, + { + "fieldName": "relationNoShow", + "relationNoShow": true + }, + { + "fieldName": "uiHint", + "relationNoShow": true + } + ], + "chnname": "角色和处理类别关系表", + "remark": "角色和处理类别关系表" + }, + { + "title": "EPDC_HANDLE_ROLE_DEPT", + "fields": [ + { + "name": "ID", + "type": "IdOrKey", + "remark": "", + "chnname": "主键", + "pk": true, + "notNull": true + }, + { + "name": "ROLE_ID", + "type": "IdOrKey", + "remark": "", + "chnname": "角色ID", + "notNull": true + }, + { + "name": "DEPT_ID", + "type": "IdOrKey", + "remark": "", + "chnname": "部门ID", + "notNull": true + }, + { + "name": "DEPT_TYPE", + "type": "VARCHAR_50", + "remark": "", + "chnname": "部门机构类型", + "notNull": true + }, + { + "name": "REVISION", + "type": "Integer", + "remark": "", + "chnname": "乐观锁" + }, + { + "name": "CREATED_BY", + "type": "IdOrKey", + "remark": "", + "chnname": "创建人" + }, + { + "name": "CREATED_TIME", + "type": "DateTime", + "remark": "", + "chnname": "创建时间" + }, + { + "name": "UPDATED_BY", + "type": "IdOrKey", + "remark": "", + "chnname": "更新人" + }, + { + "name": "UPDATED_TIME", + "type": "DateTime", + "remark": "", + "chnname": "更新时间" + } + ], + "indexs": [], + "headers": [ + { + "fieldName": "chnname", + "relationNoShow": false + }, + { + "fieldName": "name", + "relationNoShow": false + }, + { + "fieldName": "type", + "relationNoShow": false + }, + { + "fieldName": "dataType", + "relationNoShow": true + }, + { + "fieldName": "remark", + "relationNoShow": true + }, + { + "fieldName": "pk", + "relationNoShow": false + }, + { + "fieldName": "notNull", + "relationNoShow": true + }, + { + "fieldName": "autoIncrement", + "relationNoShow": true + }, + { + "fieldName": "defaultValue", + "relationNoShow": true + }, + { + "fieldName": "relationNoShow", + "relationNoShow": true + }, + { + "fieldName": "uiHint", + "relationNoShow": true + } + ], + "chnname": "处理部门角色权限表", + "remark": "处理部门角色权限表" } - ] + ], + "graphCanvas": { + "nodes": [], + "edges": [] + }, + "associations": [] } ], "dataTypeDomains": { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java new file mode 100644 index 000000000..6c964433d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java @@ -0,0 +1,17 @@ +package com.elink.esua.epdc.constant; + + +/** + * @author: qushutong + * @Date: 2019/12/20 15:53 + * @Description: 评价结果：0-不满意，1-基本满意，2-非常满意 + */ +public interface ItemEvaluationLevel { + + String levaluationLevelBad = "0"; + + String levaluationLevelBetter = "1"; + + String levaluationLevelBest = "2"; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java new file mode 100644 index 000000000..1f6373f36 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java @@ -0,0 +1,50 @@ +package com.elink.esua.epdc.dto.comment.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.io.Serializable; + +/** + * @Description 议题提交评论DTO + * @Author yinzuomei + * @Date 2019/12/18 16:56 + */ +@Data +public class SubmitCommentFormDTO implements Serializable { + private static final long serialVersionUID = -3253699905608729529L; + + private String issueId; + + private String itemId; + + /** + * 父评论（被评论）ID + */ + private String faCommentId; + + @Size(min = 1, max = 500, message = "评论内容不能超过500字") + private String content; + + /** + * 评论人ID + */ + @NotBlank(message = "评论人ID不能为空") + private String userId; + + /** + * 评论人昵称 + */ + private String userName; + + /** + * 评论人头像 + */ + private String userFace; + + /** + * 党员标识（0-否，1-是） + */ + private String partyFlag; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventCountSqlFromDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventCountSqlFromDTO.java new file mode 100644 index 000000000..8fc8c086b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventCountSqlFromDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.events.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * @author: qushutong + * @Date: 2019/12/16 14:52 + * @Description: 查询参数 + */ +@Data +public class EventCountSqlFromDTO implements Serializable { + private static final long serialVersionUID = 4648104037156856679L; + /*** + * 网格id + */ + private Long gridId; + + /*** + * 月 季 年 0,1,2 + */ + private String type; + + /*** + * 0 是群众反应问题总数 1 群众反应问题响应数 + */ + private String responseType; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java index b25b09144..ec04877b7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java @@ -7,6 +7,7 @@ import java.util.List; /** * 项目处理类型枚举 + * * @Author LC * @Date 2019/9/16 14:00 */ @@ -28,7 +29,7 @@ public enum ItemHandleCategoryEnum { public static List getHandleCategoriesForGird(boolean selected) { List handleResultDTOS = new ArrayList<>(); - for (ItemHandleCategoryEnum e: + for (ItemHandleCategoryEnum e : ItemHandleCategoryEnum.values()) { if (e.getValue() != ItemHandleCategoryEnum.HANDLE_REPORT.getValue()) { ItemHandleResultDTO dto = new ItemHandleResultDTO(); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/Dockerfile b/esua-epdc/epdc-module/epdc-events/epdc-events-server/Dockerfile index d9a1f64c6..712051027 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/Dockerfile +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM adoptopenjdk/openjdk11 +FROM openjdk:8u242-jre-buster # 作者 MAINTAINER rongchao@elink-cn.com # 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index 4b6dba5c4..05455c3c4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -13,6 +13,11 @@ jar + + com.esua.epdc + epdc-kpi-client + 1.0.0 + com.esua.epdc epdc-events-client @@ -62,6 +67,10 @@ 1.0.0 compile + com.esua.epdc @@ -179,6 +188,14 @@ categoryGroup categoryGroup + @@ -206,11 +223,8 @@ test - - - - wx5d3e97461d248397 - bfed51b731e53db9affb9e6131e7ae12 + wxdd8530c5f4926766 + 5bf4fb813145431b3493a10aa7e041e9 wx9f20a46906ab2c3e dc13065f79429979d9f687d249eb5c4e @@ -223,6 +237,14 @@ categoryGroup categoryGroup + @@ -340,6 +362,41 @@ categoryGroup + + + prod_jinshui + + prod + + 9066 + + prod + + + wx6dcf544cdae7d4ec + 9e0882274ad3821400370312a56a8470 + + + wxddb240334d09049f + 071b8c70da0d0482aaf79052e64f83bc + + + 0 + 172.19.0.11 + 6379 + epdc!redis@master1405 + + + true + 172.20.0.4:80 + + + + + epdc + Elink@833066 + + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java index 2678142a1..a3d0e2eae 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java @@ -26,8 +26,8 @@ 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.category.CategoryDTO; import com.elink.esua.epdc.dto.category.CategoryOption; -import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO; -import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO; +import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO; +import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO; import com.elink.esua.epdc.modules.category.excel.CategoryExcel; import com.elink.esua.epdc.modules.category.service.CategoryService; import io.swagger.annotations.ApiOperation; @@ -134,7 +134,7 @@ public class CategoryController { /** * @param formDTO - * @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/4 9:43 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java index 79f60d255..f936febab 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java @@ -17,13 +17,13 @@ package com.elink.esua.epdc.modules.category.entity; -import com.baomidou.mybatisplus.annotation.*; - +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.util.Date; /** @@ -69,6 +69,11 @@ public class CategoryEntity extends BaseEntity { */ private Integer sort; + /** + * 第三方平台分类编码 + */ + private String infoCode; + /** * 删除标识 0：未删除 1：删除 */ @@ -99,11 +104,6 @@ public class CategoryEntity extends BaseEntity { @TableField(exist = false) private String label; - /** - * 第三方平台分类编码 - */ - private String infoCode; - /** * 启用标识（0-否，1-是） */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java index 967e6f85e..9165fdb1c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java @@ -21,8 +21,8 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.category.CategoryOption; -import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO; -import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO; +import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO; +import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO; import com.elink.esua.epdc.modules.category.entity.CategoryEntity; import org.springframework.web.multipart.MultipartFile; @@ -125,7 +125,7 @@ public interface CategoryService extends BaseService { /** * @param formDTO - * @return java.util.List + * @return java.util.List * @Author yinzuomei * @Description 根据id查询事件分类基本信息 * @Date 2019/12/4 9:43 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java index 1457a189c..e50472135 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java @@ -17,12 +17,14 @@ package com.elink.esua.epdc.modules.category.service.impl; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; +import com.elink.esua.epdc.commons.tools.constant.StrConstant; import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant; import com.elink.esua.epdc.commons.tools.exception.ErrorCode; import com.elink.esua.epdc.commons.tools.exception.RenException; @@ -35,8 +37,8 @@ import com.elink.esua.epdc.commons.tools.utils.TreeUtils; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.category.CategoryOption; import com.elink.esua.epdc.dto.category.CategoryTreeDTO; -import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO; -import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO; +import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO; +import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO; import com.elink.esua.epdc.modules.category.dao.CategoryDao; import com.elink.esua.epdc.modules.category.entity.CategoryEntity; import com.elink.esua.epdc.modules.category.redis.CategoryRedis; @@ -583,127 +585,141 @@ public class CategoryServiceImpl extends BaseServiceImpl().ok((CategoryOption) obj); } - /** - * @param formDTO - * @return java.util.List - * @Author yinzuomei - * @Description 根据id查询事件分类基本信息 - * @Date 2019/12/4 9:43 - **/ - @Override - public List listCategoryInfo(CategoryInfoFormDTO formDTO) { - List categoryInfoResultDTOList = new ArrayList<>(); - for (Long id : formDTO.getIds()) { - CategoryEntity entity = baseDao.getById(id); - if (null != entity) { - List parentNameList = new ArrayList<>(); - if (StringUtils.isNotBlank(entity.getPids())) { - String[] pidList = entity.getPids().split(","); - for (String pid : pidList) { - CategoryEntity parentEntity = baseDao.getById(Long.valueOf(pid)); - parentNameList.add(parentEntity.getCategoryName()); - } - } - CategoryInfoResultDTO categoryInfoResultDTO = ConvertUtils.sourceToTarget(entity, CategoryInfoResultDTO.class); - categoryInfoResultDTO.setParentNames(parentNameList); - categoryInfoResultDTOList.add(categoryInfoResultDTO); - } - } - return categoryInfoResultDTOList; - } - - /** - * @param - * @return void - * @Author yinzuomei - * @Description 组装事件类别 - * @Date 2019/12/3 18:18 - **/ - @Override - public void packageCategoryOption() { - List dtoList = baseDao.selectListCategoryTreeDTO(); - JSONObject node; - JSONArray headNodes = new JSONArray(); - for (CategoryTreeDTO categoryTreeDto : dtoList) { - - if (categoryTreeDto.getPid().longValue() == NumConstant.ZERO_L) { - node = new JSONObject(); - node.put("value", categoryTreeDto.getId()); - node.put("label", categoryTreeDto.getCategoryName()); - headNodes.add(node); - } - } + /** + * @param formDTO + * @return java.util.List + * @Author yinzuomei + * @Description 根据id查询事件分类基本信息 + * @Date 2019/12/4 9:43 + **/ + @Override + public List listCategoryInfo(CategoryInfoFormDTO formDTO) { + List result = Lists.newArrayList(); + CategoryInfoResultDTO categoryInfoResult; + + for (Long id : formDTO.getIds()) { + CategoryEntity entity = baseDao.getById(id); + if (null == entity) { + continue; + } + if(StringUtils.isBlank(entity.getPids())){ + categoryInfoResult = ConvertUtils.sourceToTarget(entity, CategoryInfoResultDTO.class); + result.add(categoryInfoResult); + continue; + } + List parentNameList = Lists.newArrayList(); + String[] pidList = entity.getPids().split(StrConstant.COMMA); + if (null != pidList && pidList.length > NumConstant.ZERO) { + CategoryEntity parentEntity; + for (int i = 0; i < pidList.length; i++) { + parentEntity = baseDao.getById(Long.valueOf(pidList[i])); + if (null != parentEntity) { + parentNameList.add(parentEntity.getCategoryName()); + } + } + } + categoryInfoResult = ConvertUtils.sourceToTarget(entity, CategoryInfoResultDTO.class); + if (CollUtil.isNotEmpty(parentNameList)) { + categoryInfoResult.setParentNames(StringUtils.join(parentNameList, StrConstant.HYPHEN)); + } + result.add(categoryInfoResult); + } + return result; + } + + /** + * @param + * @return void + * @Author yinzuomei + * @Description 组装事件类别 + * @Date 2019/12/3 18:18 + **/ + @Override + public void packageCategoryOption() { + List dtoList = baseDao.selectListCategoryTreeDTO(); + JSONObject node; + JSONArray headNodes = new JSONArray(); + for (CategoryTreeDTO categoryTreeDto : dtoList) { + + if (categoryTreeDto.getPid().longValue() == NumConstant.ZERO_L) { + node = new JSONObject(); + node.put("value", categoryTreeDto.getId()); + node.put("label", categoryTreeDto.getCategoryName()); + headNodes.add(node); + } + } + + // 用于存放所有父级节点 + JSONArray parent; + // 用于存放所有子级节点 + JSONArray allChildren = new JSONArray(); + JSONArray children; + // 用于存放单个子级节点 + JSONObject childNode; + + parent = headNodes; + // 存放其余未处理的类别(节点) + List others = this.getOtherCategory(dtoList, parent); + + while (!others.isEmpty()) { + for (int i = 0; i < parent.size(); i++) { + node = parent.getJSONObject(i); + children = new JSONArray(); + for (CategoryTreeDTO categoryTreeDto : others) { + if (categoryTreeDto.getPid().equals(node.get("value"))) { + childNode = new JSONObject(); + childNode.put("value", categoryTreeDto.getId()); + childNode.put("label", categoryTreeDto.getCategoryName()); + + children.add(childNode); + allChildren.add(childNode); + } + } + if (!children.isEmpty()) { + node.put("children", children); + } + } + parent = allChildren; + + others = this.getOtherCategory(others, parent); + + } - // 用于存放所有父级节点 - JSONArray parent; - // 用于存放所有子级节点 - JSONArray allChildren = new JSONArray(); - JSONArray children; - // 用于存放单个子级节点 - JSONObject childNode; - - parent = headNodes; - // 存放其余未处理的类别(节点) - List others = this.getOtherCategory(dtoList, parent); - - while (!others.isEmpty()) { - for (int i = 0; i < parent.size(); i++) { - node = parent.getJSONObject(i); - children = new JSONArray(); - for (CategoryTreeDTO categoryTreeDto : others) { - if (categoryTreeDto.getPid().equals(node.get("value"))) { - childNode = new JSONObject(); - childNode.put("value", categoryTreeDto.getId()); - childNode.put("label", categoryTreeDto.getCategoryName()); - - children.add(childNode); - allChildren.add(childNode); - } - } - if (!children.isEmpty()) { - node.put("children", children); - } - } - parent = allChildren; - - others = this.getOtherCategory(others, parent); - - } // JSONObject treeNodes = new JSONObject(); // treeNodes.put("options", headNodes); // logger.info(treeNodes.toJSONString()); - //存放到redis中 - List cache = Lists.newArrayList(); - cache.add(headNodes); - CategoryOption option = new CategoryOption(); - option.setOptions(cache.get(0)); - redisUtils.set(RedisKeys.getEventsCategoryKey(), option); - } - - /* - * @param dtoList 上次进行筛选的分类集合 - * @param parent 已处理过的上级节点 - * @return java.util.List - * @Author yinzuomei - * @Description 组装其余未处理过的分类集合 - * @Date 2019/12/3 17:27 - **/ - private List getOtherCategory(List dtoList, JSONArray parent) { - List already = Lists.newArrayList(); - for (int i = 0; i < parent.size(); i++) { - already.add((Long) parent.getJSONObject(i).get("value")); - } - - List others = Lists.newArrayList(); - - for (CategoryTreeDTO categoryTreeDto : dtoList) { - Long categoryTreeDtoId = categoryTreeDto.getId(); - if (!already.contains(categoryTreeDtoId)) { - others.add(categoryTreeDto); - } - } - return others; - } + //存放到redis中 + List cache = Lists.newArrayList(); + cache.add(headNodes); + CategoryOption option = new CategoryOption(); + option.setOptions(cache.get(0)); + redisUtils.set(RedisKeys.getEventsCategoryKey(), option); + } + + /* + * @param dtoList 上次进行筛选的分类集合 + * @param parent 已处理过的上级节点 + * @return java.util.List + * @Author yinzuomei + * @Description 组装其余未处理过的分类集合 + * @Date 2019/12/3 17:27 + **/ + private List getOtherCategory(List dtoList, JSONArray parent) { + List already = Lists.newArrayList(); + for (int i = 0; i < parent.size(); i++) { + already.add((Long) parent.getJSONObject(i).get("value")); + } + + List others = Lists.newArrayList(); + + for (CategoryTreeDTO categoryTreeDto : dtoList) { + Long categoryTreeDtoId = categoryTreeDto.getId(); + if (!already.contains(categoryTreeDtoId)) { + others.add(categoryTreeDto); + } + } + return others; + } /** * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java index a0dd8ef59..b488bc82c 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java @@ -21,8 +21,8 @@ import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO; -import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; +import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO; import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; @@ -48,13 +48,13 @@ public class AppEventCommentController { /**AppTopicCommentController * 提交评论或回复接口 - * @param commentFormDTO + * @param submitCommentFormDTO * @return */ @PostMapping("submit") - public Result submit(@RequestBody CommentFormDTO commentFormDTO){ - ValidatorUtils.validateEntity(commentFormDTO); - return eventCommentService.submit(commentFormDTO); + public Result submit(@RequestBody SubmitCommentFormDTO submitCommentFormDTO){ + ValidatorUtils.validateEntity(submitCommentFormDTO); + return eventCommentService.submit(submitCommentFormDTO); } /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java index 61afb820c..cc3ddf046 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java @@ -24,6 +24,7 @@ import com.elink.esua.epdc.dto.comment.EpdcCommentsAndAttitudeFromTopicFormDTO; import com.elink.esua.epdc.dto.comment.EventCommentDTO; import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; +import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO; import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; @@ -105,9 +106,9 @@ public interface EventCommentService extends BaseService { /** * 提交评论或回复接口 - * @param commentFormDTO + * @param submitCommentFormDTO */ - Result submit(CommentFormDTO commentFormDTO); + Result submit(SubmitCommentFormDTO submitCommentFormDTO); /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java index 4cb8f8e31..809088684 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java @@ -26,10 +26,9 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.EventsNoticeConstant; -import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.comment.*; -import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; +import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO; import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; @@ -44,7 +43,6 @@ import com.elink.esua.epdc.modules.comment.entity.EventCommentEntity; import com.elink.esua.epdc.modules.comment.service.EventCommentService; import com.elink.esua.epdc.modules.comment.service.EventCommentUserAttitudeService; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; -import com.elink.esua.epdc.modules.feign.UserFeignClient; import com.elink.esua.epdc.modules.issue.entity.IssueEntity; import com.elink.esua.epdc.modules.issue.service.IssueService; import com.elink.esua.epdc.modules.item.entity.ItemEntity; @@ -87,9 +85,6 @@ public class EventCommentServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -144,7 +139,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl userDTOResult=userFeignClient.getUserInfoById(commentFormDTO.getUserId()); - if(!userDTOResult.success()){ - return new Result().error("获取用户信息失败"); - } - commentEntity.setPartyFlag(userDTOResult.getData().getPartyFlag()); + commentEntity.setPartyFlag(commentFormDTO.getPartyFlag()); boolean isIssue = true; boolean isComment = true; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java index 7b93b2127..1c16b9432 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java @@ -31,6 +31,8 @@ import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO; import com.elink.esua.epdc.dto.events.EpdcRejectEventDetailDTO; import com.elink.esua.epdc.dto.events.EpdcRejectEventsDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; +import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; +import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; import com.elink.esua.epdc.modules.events.excel.EpdcEventsExcel; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; import org.springframework.beans.factory.annotation.Autowired; @@ -56,20 +58,20 @@ public class EpdcEventsController { @GetMapping("page") @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false) - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = epdcEventsService.listOfPendingReviewEvents(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { EpdcEventsDetailDTO data = epdcEventsService.getEvent(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody EpdcEventsDTO dto){ + public Result save(@RequestBody EpdcEventsDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -79,7 +81,7 @@ public class EpdcEventsController { } @PutMapping - public Result update(@RequestBody EpdcEventsDTO dto){ + public Result update(@RequestBody EpdcEventsDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); @@ -89,7 +91,7 @@ public class EpdcEventsController { } @DeleteMapping - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); @@ -107,6 +109,7 @@ public class EpdcEventsController { /** * 事件审核 + * * @Params: [dto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -120,20 +123,22 @@ public class EpdcEventsController { /** * 已驳回事件列表 + * * @Params: [params] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/6 15:11 */ @GetMapping("rejectEvents") @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false) - public Result> rejectEvents(@RequestParam Map params){ + public Result> rejectEvents(@RequestParam Map params) { PageData page = epdcEventsService.listOfRejectEvents(params); return new Result>().ok(page); } /** * 已驳回事件详情 + * * @Params: [id] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -146,11 +151,10 @@ public class EpdcEventsController { } /** - * * 初始化党群议事菜单消息 * - * @params [] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [] * @author liuchuang * @since 2019/10/30 13:43 */ @@ -171,4 +175,18 @@ public class EpdcEventsController { public Result checkTopicToIssueFlag(@PathVariable("topicId") String topicId) { return epdcEventsService.checkTopicToIssueFlag(topicId); } + + /*** + * 统计网格指定时间段内事件上报数与事件受理数 + * @param eventReportAmountFormDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2019/12/16 14:10 + */ + @PostMapping("statEventReportAmount") + public Result> statEventReportAmount(@RequestBody KpiMetaDataOfEventsFormDTO eventReportAmountFormDto) { + List dtoList = epdcEventsService.statEventReportAmount(eventReportAmountFormDto); + return new Result().ok(dtoList); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java index ba36e9b30..a2a7dd3ee 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java @@ -18,17 +18,17 @@ package com.elink.esua.epdc.modules.events.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.events.*; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; +import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; +import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; @@ -43,38 +43,47 @@ import java.util.Map; public interface EpdcEventsDao extends BaseDao { /** * 根据ID获取事件详情 + * * @Params: [id] * @Return: com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO * @Author: liuchuang * @Date: 2019/9/4 20:31 */ EpdcEventsDetailDTO selectOneOfEventDetailById(@Param("id") String id); + /** * 事件待审核列表 + * * @Params: [params] * @Return: java.util.List * @Author: liuchuang * @Date: 2019/9/5 19:42 */ List selectListOfPendingReviewEvents(Map params); + /** * 已驳回事件列表 + * * @Params: [] * @Return: java.util.List * @Author: liuchuang * @Date: 2019/9/6 15:04 */ List selectListOfRejectEvents(Map params); + /** * 已驳回事件详情 + * * @Params: [] * @Return: com.elink.esua.epdc.dto.events.EpdcRejectEventDetailDTO * @Author: liuchuang * @Date: 2019/9/6 14:46 */ EpdcRejectEventDetailDTO selectOneOfRejectEventDetail(@Param("id") String id); + /** * 评论列表 + * * @Params: [eventId] * @Return: java.util.List * @Author: liuchuang @@ -89,30 +98,35 @@ public interface EpdcEventsDao extends BaseDao { /** * 赞数+1 + * * @param eventId */ void updateApproveNumAdd(String eventId); /** * 踩数+1 + * * @param eventId */ void updateOpposeNumAdd(String eventId); /** * 赞数-1 + * * @param eventId */ void updateApproveNumSubtract(String eventId); /** * 踩数-1 + * * @param eventId */ void updateOpposeNumSubtract(String eventId); /** * 移动端-事件详情 + * * @Params: [eventId] * @Return: com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO * @Author: liuchuang @@ -121,18 +135,18 @@ public interface EpdcEventsDao extends BaseDao { EventAppDetailResultDTO selectOneOfEventDetail(String eventId); /** - * * 根据网格ID 状态获取事件数量 * - * @params [deptId, state] * @return int + * @params [deptId, state] * @author liuchuang * @since 2019/10/30 12:36 */ int selectCountOfDeptNotice(Long deptId, int state); /** - *根据网格id和状态获取议题状态统计 + * 根据网格id和状态获取议题状态统计 + * * @param deptIdList * @return */ @@ -140,11 +154,23 @@ public interface EpdcEventsDao extends BaseDao { /** * 查询待回应列表 + * * @param formDto * @return */ List listIssuePendingResponse(IssuePendingResponseFormDTO formDto); + /** + * 统计网格指定时间内事件上报数与事件受理数 + * + * @param kpiParamDto KPI模块参数 + * @param issueLimitHour 事件有效响应时限 + * @return java.util.List + * @author work@yujt.net.cn + * @date 2019/12/19 19:01 + */ + List statEventReportAmount(@Param("kpiParamDto") KpiMetaDataOfEventsFormDTO kpiParamDto, + @Param("issueLimitHour") int issueLimitHour); /** * * 查询需要修改组织机构信息事件 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java index 3c244a1a8..7ebf4678d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java @@ -25,9 +25,11 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; +import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.issue.IssueDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; +import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO; @@ -46,6 +48,7 @@ public interface EpdcEventsService extends BaseService { /** * 事件待审核列表 + * * @Params: [params] * @Return: com.elink.esua.epdc.commons.tools.page.PageData * @Author: liuchuang @@ -57,6 +60,7 @@ public interface EpdcEventsService extends BaseService { /** * 根据ID获取事件详情 + * * @Params: [id] * @Return: com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO * @Author: liuchuang @@ -68,6 +72,7 @@ public interface EpdcEventsService extends BaseService { /** * 发布议题 + * * @Params: [dto] * @Return: void * @Author: liuchuang @@ -81,6 +86,7 @@ public interface EpdcEventsService extends BaseService { /** * 事件审核 + * * @Params: [dto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -90,6 +96,7 @@ public interface EpdcEventsService extends BaseService { /** * 已驳回事件列表 + * * @Params: [params] * @Return: com.elink.esua.epdc.commons.tools.page.PageData * @Author: liuchuang @@ -99,6 +106,7 @@ public interface EpdcEventsService extends BaseService { /** * 已驳回事件详情 + * * @Params: [] * @Return: com.elink.esua.epdc.dto.events.EpdcRejectEventDetailDTO * @Author: liuchuang @@ -108,6 +116,7 @@ public interface EpdcEventsService extends BaseService { /** * 评论列表 + * * @Params: [eventId] * @Return: java.util.List * @Author: liuchuang @@ -122,12 +131,14 @@ public interface EpdcEventsService extends BaseService { /** * 赞数+1 + * * @param eventId */ void updateApproveNumAdd(String eventId); /** * 踩数+1 + * * @param eventId */ void updateOpposeNumAdd(String eventId); @@ -135,12 +146,14 @@ public interface EpdcEventsService extends BaseService { /** * 赞数-1 + * * @param eventId */ void updateApproveNumSubtract(String eventId); /** * 踩数-1 + * * @param eventId */ void updateOpposeNumSubtract(String eventId); @@ -148,6 +161,7 @@ public interface EpdcEventsService extends BaseService { /** * 更新浏览数 + * * @Params: [eventId] * @Return: boolean * @Author: liuchuang @@ -157,6 +171,7 @@ public interface EpdcEventsService extends BaseService { /** * 移动端-事件详情 + * * @Params: [eventId] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -165,22 +180,20 @@ public interface EpdcEventsService extends BaseService { Result getEventDetail(String eventId); /** - * * 菜单消息-议题待回应 * - * @params [deptId] * @return void + * @params [deptId] * @author liuchuang * @since 2019/10/30 17:23 */ void sendMenuNoticeOfEventRespond(Long deptId, Long userId); /** - * * 初始化党群议事菜单消息 * - * @params [] * @return void + * @params [] * @author liuchuang * @since 2019/10/30 13:43 */ @@ -188,6 +201,7 @@ public interface EpdcEventsService extends BaseService { /** * 根据状态和网格id查询书量 + * * @param deptIdList * @return */ @@ -195,17 +209,17 @@ public interface EpdcEventsService extends BaseService { /** * 待回应列表 + * * @param formDto * @return */ Result> listIssuePendingResponse(IssuePendingResponseFormDTO formDto); /** - * * 话题转议题 * - * @params [dto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [dto] * @author liuchuang * @since 2019/11/25 19:23 */ @@ -220,6 +234,17 @@ public interface EpdcEventsService extends BaseService { **/ Result checkTopicToIssueFlag(String topicId); + + /*** + * 统计网格指定时间内事件上报数与事件受理数 + * @param eventReportAmountFormDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2019/12/16 14:17 + */ + List statEventReportAmount(KpiMetaDataOfEventsFormDTO eventReportAmountFormDto); + + /** * * 事件修改组织机构信息 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index d9dabb534..6b3317d36 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -24,6 +24,8 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.redis.RedisKeys; +import com.elink.esua.epdc.commons.tools.redis.RedisUtils; 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; @@ -43,9 +45,11 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; +import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.issue.IssueDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; +import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; import com.elink.esua.epdc.modules.async.IssueOverseeResultsTask; import com.elink.esua.epdc.modules.async.NewsTask; @@ -111,6 +115,9 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl listOfPendingReviewEvents(Map params) { IPage page = getPage(params); @@ -249,7 +256,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl> listIssuePendingResponse(IssuePendingResponseFormDTO formDto) { List list; - if (formDto.getDeptId() > 0){ + if (formDto.getDeptId() > 0) { list = new ArrayList<>(); list.add(formDto.getDeptId()); - }else { + } else { list = SecurityUser.getUser().getDeptIdList(); } formDto.setDeptIdList(list); @@ -527,20 +533,20 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl cateList = categoryService.getPidListById(category); //所选分类标签为多级 - if(cateList != null && cateList.size() > 0) { + if (cateList != null && cateList.size() > 0) { // list第一个为一级分类标签 resultDto.setFirstCategoryCode(cateList.get(0).getCategoryCode()); //分类标签全称拼接:-分割 String name = ""; - for (int i = 0; i < cateList.size(); i++){ - if (i == cateList.size() -1){ + for (int i = 0; i < cateList.size(); i++) { + if (i == cateList.size() - 1) { name = name + cateList.get(i).getCategoryName(); - }else { + } else { name = name + cateList.get(i).getCategoryName() + "-"; } } @@ -564,18 +570,33 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl userMobiles){ + private void issueSmsNotification(EpdcEventsReviewFormDTO dto, List userMobiles) { // 审核操作发送短信 SmsNoticeFormDTO sms = new SmsNoticeFormDTO(); sms.setMobiles(userMobiles); if (EventIssueItemState.EVENT_REVIEW_PASS == dto.getEventState()) { // 审核通过 sms.setSmsTemplateType(SysSmsTemplateConstant.SMS_TEMPLATE_RESIDENTS_ISSUE_PASSED); - }else { + } else { sms.setSmsTemplateType(SysSmsTemplateConstant.SMS_TEMPLATE_RESIDENTS_ISSUE_NOT_PASS); } issueOverseeResultsTask.sendSmsNotice(sms); } + @Override + public List statEventReportAmount(KpiMetaDataOfEventsFormDTO eventReportAmountFormDto) { + // 议题有效响应时限 + int issueLimitHour = NumConstant.TWENTY; + + Object obj = redisUtils.get(RedisKeys.getKpiIssueTimeLimitKey()); + if (null != obj) { + issueLimitHour = Integer.parseInt(obj.toString()); + } + + List list = baseDao.statEventReportAmount(eventReportAmountFormDto, issueLimitHour); + + return list; + } + @Override @Transactional(rollbackFor = Exception.class) public void modifyOrganizationInfo(OrganizationModifyDTO dto) { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java index 7ca4195e9..baf418c97 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java @@ -71,23 +71,23 @@ public interface AdminFeignClient { @GetMapping("sys/deptgridplatform/selectByDeptId/{deptId}") Result getDeptGridPlatformDTO(@PathVariable("deptId") String deptId); - /** - * @Description: 根据部门id，查询部门下的所有用户手机号 - * @Param: [deptId] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-01-09 - */ + /** + * @Description: 根据部门id，查询部门下的所有用户手机号 + * @Param: [deptId] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-01-09 + */ @GetMapping(value ="sys/user/getUserPhoneByListDeptId", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getUserPhoneByListDeptId(List deptId); - /** - * @Description: 根据议题网格ID查询拥有这个网格数据权限且是网格长的角色，再根据角色查出所有用户手机号 - * @Param: [deptId] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-01-09 - */ + /** + * @Description: 根据议题网格ID查询拥有这个网格数据权限且是网格长的角色，再根据角色查出所有用户手机号 + * @Param: [deptId] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-01-09 + */ @GetMapping("sys/user/getSysGridLeaderPhone/{deptId}") Result> getSysGridLeaderPhone(@PathVariable("deptId") Long deptId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 80ab40693..914006d57 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -27,11 +27,14 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; import com.elink.esua.epdc.dto.events.form.EventDeleteCommentsFormDTO; +import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO; import com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO; +import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; +import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; import com.elink.esua.epdc.modules.item.excel.ItemExcel; import com.elink.esua.epdc.modules.item.service.ItemService; import org.springframework.beans.factory.annotation.Autowired; @@ -57,32 +60,34 @@ public class ItemController { /** * 项目列表 + * * @Params: [params] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/16 9:56 */ @GetMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = itemService.listOfItemsForPCEnd(params); return new Result>().ok(page); } /** * 项目处理详情 + * * @Params: [id] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang * @Date: 2019/9/16 9:56 */ @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { ItemDetailForPCEndResultDTO data = itemService.getItemDetailById(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody ItemDTO dto){ + public Result save(@RequestBody ItemDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); itemService.save(dto); @@ -90,7 +95,7 @@ public class ItemController { } @PutMapping - public Result update(@RequestBody ItemDTO dto){ + public Result update(@RequestBody ItemDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); itemService.update(dto); @@ -98,7 +103,7 @@ public class ItemController { } @DeleteMapping - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); itemService.delete(ids); @@ -113,6 +118,7 @@ public class ItemController { /** * 项目处理提交 + * * @Params: [dto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -126,21 +132,23 @@ public class ItemController { /** * 项目内容详情 + * * @Params: [id] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang * @Date: 2019/9/16 9:56 */ @GetMapping("contentDetail/{id}") - public Result getItemContentDetail(@PathVariable("id") String id){ + public Result getItemContentDetail(@PathVariable("id") String id) { ItemContentForPCEndResultDTO data = itemService.getItemContentDetail(id); return new Result().ok(data); } /** * 评论列表 + * * @Params: [params] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/6 18:58 */ @@ -152,6 +160,7 @@ public class ItemController { /** * 屏蔽评论 + * * @Params: [commentId] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -162,4 +171,44 @@ public class ItemController { return itemService.modifyCommentById(eventDeleteCommentsFormDTO.getCommentIds()); } + /*** + * kpi-统计群众对问题处理的满意度 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2019/12/18 10:27 + */ + @PostMapping("statPeopleEvaluationMetaData") + public Result> statPeopleEvaluationMetaData(@RequestBody KpiMetaDataOfEventsFormDTO metaDataFormDto) { + List list = itemService.statPeopleEvaluationMetaData(metaDataFormDto); + return new Result().ok(list); + } + + + /** + * kpi- 统计项目处理数 包括：网格呼叫总数，网格呼叫被响应数，网格呼叫被关闭数 + * + * @param metaDataFormDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2019/12/18 16:02 + */ + @PostMapping("statItemHandleAmountMetaData") + public Result> statItemHandleAmountMetaData(@RequestBody KpiMetaDataOfEventsFormDTO metaDataFormDto) { + List list = itemService.statItemHandleAmount(metaDataFormDto); + return new Result().ok(list); + } + + /*** + * kpi- 网格对项目处理的评价 不满意 满意 非常满意 统计 + * @param metaDataFormDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2019/12/20 15:37 + */ + @PostMapping("statGridEvaluationMetaData") + public Result> statGridEvaluationMetaData(@RequestBody KpiMetaDataOfEventsFormDTO metaDataFormDto) { + List list = itemService.statGridEvaluationMetaData(metaDataFormDto); + return new Result().ok(list); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 6f6f9e49c..e98b97c67 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -18,6 +18,8 @@ package com.elink.esua.epdc.modules.item.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO; +import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; @@ -26,6 +28,8 @@ import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; import com.elink.esua.epdc.dto.item.form.ItemStatisticsFormDTO; import com.elink.esua.epdc.dto.item.result.*; +import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; +import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; import com.elink.esua.epdc.modules.item.entity.ItemEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -44,6 +48,7 @@ public interface ItemDao extends BaseDao { /** * 根据议题ID获取项目信息 + * * @Params: [issueId] * @Return: com.elink.esua.epdc.dto.item.ItemDTO * @Author: liuchuang @@ -53,6 +58,7 @@ public interface ItemDao extends BaseDao { /** * 移动端-项目列表 + * * @Params: [formDto] * @Return: java.util.List * @Author: liuchuang @@ -61,11 +67,10 @@ public interface ItemDao extends BaseDao { List selectListOfItems(ItemFormDTO formDto, int[] states); /** - * * 移动端-我的项目列表 * - * @params [formDto, states] * @return java.util.List + * @params [formDto, states] * @author liuchuang * @since 2019/10/31 16:28 */ @@ -73,6 +78,7 @@ public interface ItemDao extends BaseDao { /** * 移动端-项目详情 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO * @Author: liuchuang @@ -82,14 +88,17 @@ public interface ItemDao extends BaseDao { /** * 工作端-项目列表 - * @Params: [formDto,deptIdList] + * + * @Params: [formDto, deptIdList] * @Return: java.util.List * @Author: lipengfei * @Date: 2019/11/19 16:50 */ - List selectListOfItemsByWork(ItemFormDTO formDto,List deptIdList); + List selectListOfItemsByWork(ItemFormDTO formDto, List deptIdList); + /** * 工作端-项目详情 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO * @Author: lipengfei @@ -100,6 +109,7 @@ public interface ItemDao extends BaseDao { /** * 移动端-议题分类统计 + * * @Params: [formDTO] * @Return: com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO * @Author: liuchuang @@ -108,9 +118,9 @@ public interface ItemDao extends BaseDao { ItemCategoryStatisticsResultDTO selectOneItemCategoryStatistics(ItemCategoryStatisticsFormDTO formDTO); - /** * PC端项目列表 + * * @Params: [params] * @Return: java.util.List * @Author: liuchuang @@ -120,6 +130,7 @@ public interface ItemDao extends BaseDao { /** * PC端项目详情 + * * @Params: [itemId] * @Return: com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO * @Author: liuchuang @@ -129,6 +140,7 @@ public interface ItemDao extends BaseDao { /** * 项目处理进度 + * * @Params: [issueId, itemId, outOrInside(0：内部数据， 1：外部数据)] * @Return: com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO * @Author: liuchuang @@ -138,6 +150,7 @@ public interface ItemDao extends BaseDao { /** * 业务端-项目处理进度 + * * @Params: [itemId] * @Return: com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO * @Author: liuchuang @@ -158,30 +171,29 @@ public interface ItemDao extends BaseDao { /** * 项目内容详情 + * * @Params: [itemId] * @Return: com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO * @Author: liuchuang * @Date: 2019/9/17 10:37 */ - ItemContentForPCEndResultDTO selectItemContentForPCEnd(String itemId); + ItemContentForPCEndResultDTO selectItemContentForPCEnd(String itemId); /** - * * 项目处理发送菜单消息 * - * @params [deptId, state] * @return int + * @params [deptId, state] * @author liuchuang * @since 2019/10/30 13:28 */ int selectCountOfItemDeptNotice(Long deptId, int state); /** - * * 根据吹哨部门ID统计吹哨部门待处理项目数量 * - * @params [deptId] * @return int + * @params [deptId] * @author liuchuang * @since 2019/10/30 13:33 */ @@ -189,6 +201,7 @@ public interface ItemDao extends BaseDao { /** * 移动端-项目统计 + * * @Params: [formDTO] * @Return: com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO * @Author: lipengfei @@ -196,6 +209,68 @@ public interface ItemDao extends BaseDao { */ ItemStatisticsResultDTO selectOneItemStatistics(ItemStatisticsFormDTO formDTO); + /** + * 绩效考核 - 项目 - 根据部门id,查询考核周期内群众满意度 + * + * @param metaDataFormDto + * @return java.util.List + * @author qushutong + * @date 2019/12/20 14:30 + */ + List selectListPeopleEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto); + + /*** + * 绩效考核 - 项目 - 网格对项目处理的评价 不满意 满意 非常满意 统计 + * @param metaDataFormDto + * @return java.util.List + * @author qushutong + * @date 2019/12/20 15:43 + */ + List selectListGridEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto); + + /*** + * 绩效考核 - 项目 - 网格吹哨总数 + * @param metaDataFormDto + * @param metaDataCode 元数据编码，不可变参数 ：KpiMetaDataEnum.GRID_CALL_SUPERIOR_AMOUNT.getValue() + * @return java.util.List + * @author qushutong + * @date 2019/12/18 16:23 + */ + List selectListItemGridCallAmount(@Param("metaDataFormDto") KpiMetaDataOfEventsFormDTO metaDataFormDto, + @Param("metaDataCode") String metaDataCode); + + /*** + * 绩效考核 - 项目 - 查询每个部门吹哨的所有项目，与项目吹哨时间 + * @param metaDataFormDto + * @return java.util.List + * @author qushutong + * @date 2019/12/19 17:16 + */ + List selctListItemTimeLimitByDept(KpiMetaDataOfEventsFormDTO metaDataFormDto); + + /** + * 绩效考核 - 项目 - 按部门id查询与项目有效响应时限 网格呼叫被响应总数 + * + * @param kpiItemTimeLimitByDeptList + * @param metaDataCode 元数据编码，不可变参数 ：KpiMetaDataEnum.GRID_CALL_SUPERIOR_RESP_AMOUNT.getValue() + * @return java.util.List + * @author qushutong + * @date 2019/12/23 13:27 + */ + List selectListItemRespondAmount(@Param("timeLimitList") List kpiItemTimeLimitByDeptList, + @Param("metaDataCode") String metaDataCode); + + /** + * 绩效考核 - 项目 - 按部门id查询与项目有效办结时限 网格呼叫被办结总数 + * + * @param kpiItemTimeLimitByDeptList + * @param metaDataCode 元数据编码， 不可变参数 ： KpiMetaDataEnum.GRID_CALL_SUPERIOR_CLOSE_AMOUNT.getValue() + * @return java.util.List + * @author qushutong + * @date 2019/12/23 13:37 + */ + List selectListItemCloseAmount(@Param("timeLimitList") List kpiItemTimeLimitByDeptList, + @Param("metaDataCode") String metaDataCode); /** * * 删除项目处理进度表历史记录 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEvaluateDeptEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEvaluateDeptEntity.java index 68a1a69cd..25478848d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEvaluateDeptEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEvaluateDeptEntity.java @@ -26,41 +26,41 @@ import lombok.EqualsAndHashCode; import java.util.Date; /** - * 部门满意度评价表 + * 部门满意度评价表 * * @author qu qu@elink-cn.com * @since v1.0.0 2019-09-17 */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("epdc_item_evaluate_dept") public class ItemEvaluateDeptEntity extends BaseEpdcEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * 项目ID - */ - private String itemId; + /** + * 项目ID + */ + private String itemId; /** * 被评价部门ID */ - private Long deptId; + private Long deptId; /** * 被评价部门名称 */ - private String deptName; + private String deptName; /** * 评价满意度 */ - private Integer evaluationLevel; + private Integer evaluationLevel; /** * 操作人部门ID */ - private Long createdDeptId; + private Long createdDeptId; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 2541e571a..f9e200d7c 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -21,11 +21,14 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; +import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; +import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; +import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; import com.elink.esua.epdc.modules.item.entity.ItemEntity; import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; @@ -53,6 +56,7 @@ public interface ItemService extends BaseService { /** * PC端项目列表 + * * @Params: [params] * @Return: com.elink.esua.epdc.commons.tools.page.PageData * @Author: liuchuang @@ -82,6 +86,7 @@ public interface ItemService extends BaseService { /** * 项目详情 + * * @Params: [id] * @Return: com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO * @Author: liuchuang @@ -121,6 +126,7 @@ public interface ItemService extends BaseService { /** * 根据议题ID获取项目信息 + * * @Params: [issueId] * @Return: com.elink.esua.epdc.modules.item.entity.ItemEntity * @Author: liuchuang @@ -130,16 +136,19 @@ public interface ItemService extends BaseService { /** * 移动端-项目列表 + * * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/9 16:47 */ Result> listItems(ItemFormDTO formDto); + /** * 项目列表-移动app端用 + * * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/10/19 16:47 */ @@ -147,6 +156,7 @@ public interface ItemService extends BaseService { /** * 移动端-项目详情 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -156,6 +166,7 @@ public interface ItemService extends BaseService { /** * 工作端-项目详情 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -166,14 +177,17 @@ public interface ItemService extends BaseService { /** * 工作端-获取满意度评价结果 + * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result { /** * 项目分类统计 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -191,6 +206,7 @@ public interface ItemService extends BaseService { /** * 项目处理进度 + * * @Params: [itemId, outOrInside(0：内部数据， 1：外部数据)] * @Return: java.util.List * @Author: liuchuang @@ -200,6 +216,7 @@ public interface ItemService extends BaseService { /** * 项目处理提交 + * * @Params: [dto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -209,6 +226,7 @@ public interface ItemService extends BaseService { /** * 项目内容详情 + * * @Params: [itemId] * @Return: com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO * @Author: liuchuang @@ -218,6 +236,7 @@ public interface ItemService extends BaseService { /** * 评论列表 + * * @Params: [params] * @Return: com.elink.esua.epdc.commons.tools.page.PageData * @Author: liuchuang @@ -227,6 +246,7 @@ public interface ItemService extends BaseService { /** * 屏蔽评论 + * * @Params: [commentId] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -236,30 +256,29 @@ public interface ItemService extends BaseService { /** * 我的项目列表 + * * @Params: [formDTO] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/17 13:37 */ Result> listItemsOfMine(ItemOfMineFormDTO formDTO); /** - * * 项目处理发送菜单消息 * - * @params [deptId] * @return void + * @params [deptId] * @author liuchuang * @since 2019/10/30 9:12 */ void sendItemHandleMenuNotice(Long deptId, Long userId); /** - * * 项目处理发送菜单消息-吹哨部门 * - * @params [deptIds] * @return void + * @params [deptIds] * @author liuchuang * @since 2019/10/30 12:26 */ @@ -267,6 +286,7 @@ public interface ItemService extends BaseService { /** * 项目统计 + * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -276,6 +296,7 @@ public interface ItemService extends BaseService { /** * 项目处理进度 + * * @Params: [itemId] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -284,33 +305,30 @@ public interface ItemService extends BaseService { List listOfItemHandleProgressByWork(String itemId); /** - * * 项目处理进度-居民端 * - * @params [itemId] * @return java.util.List + * @params [itemId] * @author liuchuang * @since 2019/12/24 9:03 */ List listOfItemHandleProgressByMobile(String itemId); /** - * * 拉取市北网格化平台项目进度情况 * - * @params [] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [] * @author liuchuang * @since 2019/12/25 13:28 */ Result queryItemHandle(); /** - * * 网格化平台处理情况回调 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/12/26 13:52 */ @@ -325,6 +343,35 @@ public interface ItemService extends BaseService { **/ Result> queryHandleCategories(); + + /*** + * kpi查询问题满意度 + * @param metaDataFormDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2019/12/18 10:30 + */ + List statPeopleEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto); + + /** + * 统计项目处理数 包括：网格呼叫总数，网格呼叫被响应数，网格呼叫被关闭数 + * + * @param metaDataFormDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2019/12/18 16:02 + */ + List statItemHandleAmount(KpiMetaDataOfEventsFormDTO metaDataFormDto); + + /*** + * 绩效考核 - 项目 - 网格对项目处理的评价 不满意 满意 非常满意 统计 + * @param metaDataFormDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2019/12/20 15:40 + */ + List statGridEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto); + /** * * 项目修改组织机构信息 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java index b9b928db4..19b391d72 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java @@ -16,6 +16,7 @@ */ package com.elink.esua.epdc.modules.item.service.impl; + import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.result.ItemDeptEvaluateResultDTO; @@ -31,7 +32,7 @@ import java.util.Arrays; import java.util.List; /** - * 部门满意度评价表 + * 部门满意度评价表 * * @author qu qu@elink-cn.com * @since v1.0.0 2019-09-17 @@ -50,7 +51,7 @@ public class ItemEvaluateDeptServiceImpl extends BaseServiceImpl evaluateDeptDTOS, String itemId, Long createdDeptId) { List evaluateDeptEntities = new ArrayList<>(); - for (ItemEvaluateDeptDTO dto: + for (ItemEvaluateDeptDTO dto : evaluateDeptDTOS) { ItemEvaluateDeptEntity entity = new ItemEvaluateDeptEntity(); entity.setDeptId(dto.getDeptId()); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 2a3c78bd6..eff99ef59 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -28,6 +28,8 @@ import com.elink.esua.epdc.commons.tools.enums.InterfaceLogBusinessTypeEnum; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.redis.RedisKeys; +import com.elink.esua.epdc.commons.tools.redis.RedisUtils; 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.*; @@ -39,14 +41,19 @@ import com.elink.esua.epdc.dto.MenuNoticeDTO; import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; +import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO; import com.elink.esua.epdc.dto.item.*; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; +import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; +import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; +import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO; import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum; import com.elink.esua.epdc.enums.ItemHandleCategoryEnum; +import com.elink.esua.epdc.enums.KpiMetaDataEnum; import com.elink.esua.epdc.gird.shibei.api.ShiBeiCityGridApi; import com.elink.esua.epdc.gird.shibei.constant.CommonConstants; import com.elink.esua.epdc.gird.shibei.contants.ApiConstants; @@ -94,6 +101,7 @@ import java.util.*; */ @Service public class ItemServiceImpl extends BaseServiceImpl implements ItemService { + private Logger logger = LogManager.getLogger(ItemServiceImpl.class); @Autowired @@ -107,10 +115,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Autowired private ItemHandleProcessService itemHandleProcessService; + @Autowired private ItemInformationService itemInformationService; - @Autowired private ItemEvaluateDeptService itemEvaluateDeptService; @@ -123,6 +131,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Autowired private ImgService imgService; + @Autowired + private RedisUtils redisUtils; + @Autowired private ImgDao imgDao; @@ -165,10 +176,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { Result resultdept = adminFeignClient.getSysDeptInfo(Long.parseLong(params.get("streetId").toString())); - SysDeptDTO dept =resultdept.getData(); + SysDeptDTO dept = resultdept.getData(); Object deptId = params.get("streetId"); if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(dept.getTypeKey())) { - params.put("districtDeptId",deptId); + params.put("districtDeptId", deptId); params.remove("streetId"); } } @@ -253,10 +264,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem List data = baseDao.selectListOfItems(formDto, states); return new Result>().ok(data); } + /** * 项目列表-移动app端用 + * * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/10/19 16:47 */ @@ -267,6 +280,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem List data = baseDao.selectListOfItemsByWork(formDto, SecurityUser.getUser().getDeptIdList()); return new Result>().ok(data); } + @Override public Result getItemDetailByWork(String id) { ItemDetailResultDTO resultDTO = baseDao.selectOneOfItemDetailForWork(id); @@ -427,14 +441,16 @@ public class ItemServiceImpl extends BaseServiceImpl implem return resultDTO; } + /** * 工作端-获取可吹哨部门 + * * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/19 16:34 */ @Override - public Result> whistlingDept(){ + public Result> whistlingDept() { UserDetail user = SecurityUser.getUser(); List deptResultDTOS = new ArrayList<>(); // 网格-可做操作和可流转部门 @@ -612,10 +628,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { - boolean reportFlag = this.checkReport(dto.getId()); - if (reportFlag) { - return new Result().error("当前项目已上报网格化平台"); - } + boolean reportFlag = this.checkReport(dto.getId()); + if (reportFlag) { + return new Result().error("当前项目已上报网格化平台"); + } handleProcessEntity.setState(dto.getHandleCategory()); informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_REPORT); GridDto gridDto = null; @@ -678,7 +694,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 通知部门Id（网格） itemInfoDto.setDeptId(entity.getGridId().toString()); itemInformationService.insert(itemInfoDto); - // 街道部门和区直部门 + // 街道部门和区直部门 } else if (OrganizationTypeConstant.ORG_TYPE_STREET_DEPT.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { //插入项目消息表（网格和街道） // 通知部门Id（网格） @@ -686,20 +702,20 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemInformationService.insert(itemInfoDto); //修改通知部门Id（街道Id） ItemInformationEntity itemInfoStreetDto = new ItemInformationEntity(); - BeanUtils.copyProperties(itemInfoDto,itemInfoStreetDto); + BeanUtils.copyProperties(itemInfoDto, itemInfoStreetDto); itemInfoStreetDto.setId(null); - Result result =adminFeignClient.getCompleteDept(entity.getGridId()); + Result result = adminFeignClient.getCompleteDept(entity.getGridId()); CompleteDeptDTO comDeptDto = result.getData(); itemInfoStreetDto.setDeptId(comDeptDto.getStreetId().toString()); itemInformationService.insert(itemInfoStreetDto); } - // 吹哨处理 - }else if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { - List deptList = dto.getDeptResultDTOS(); + // 吹哨处理 + } else if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { + List deptList = dto.getDeptResultDTOS(); // 拼接被吹哨部门 String whistlDept = ""; - for (int i =0; i < deptList.size(); i++) { - ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO)deptList.get(i); + for (int i = 0; i < deptList.size(); i++) { + ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO) deptList.get(i); if (i == 0) { whistlDept += indexDto.getDeptName(); } else { @@ -711,12 +727,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem for (ItemCirculationDeptResultDTO itemDto : deptList) { // 通知部门Id（被吹哨部门） ItemInformationEntity itemInfoEachDto = new ItemInformationEntity(); - BeanUtils.copyProperties(itemInfoDto,itemInfoEachDto); + BeanUtils.copyProperties(itemInfoDto, itemInfoEachDto); itemInfoEachDto.setId(null); itemInfoEachDto.setDeptId(itemDto.getDeptId().toString()); itemInformationService.insert(itemInfoEachDto); } - // 关闭和结案处理 + // 关闭和结案处理 } else { // 查询已吹哨部门 List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), SecurityUser.getDeptId()); @@ -724,7 +740,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem for (Long itemDeptId : oldDeptIds) { // 通知部门Id（被吹哨部门） ItemInformationEntity itemInfoEachDto = new ItemInformationEntity(); - BeanUtils.copyProperties(itemInfoDto,itemInfoEachDto); + BeanUtils.copyProperties(itemInfoDto, itemInfoEachDto); itemInfoEachDto.setId(null); itemInfoEachDto.setDeptId(itemDeptId.toString()); itemInformationService.insert(itemInfoEachDto); @@ -743,12 +759,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem this.sendWhistlingDeptItemHandleMenuNotice(Collections.singletonList(user.getDeptId()), null); } //项目外部处理意见图片保存 - if(dto.getOutHandleImages()!= null && dto.getOutHandleImages().size()>0){ - imgService.saveImages(dto.getOutHandleImages(),handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE); + if (dto.getOutHandleImages() != null && dto.getOutHandleImages().size() > 0) { + imgService.saveImages(dto.getOutHandleImages(), handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE); } //项目处理意见图片保存 - if(dto.getHandleImages()!= null && dto.getHandleImages().size()>0){ - imgService.saveImages(dto.getHandleImages(),handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_HANDLE); + if (dto.getHandleImages() != null && dto.getHandleImages().size() > 0) { + imgService.saveImages(dto.getHandleImages(), handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_HANDLE); } //居民端项目关闭、结案-短信通知 if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || @@ -896,12 +912,55 @@ public class ItemServiceImpl extends BaseServiceImpl implem newsTask.eventMenuNotice(menuNoticeDTO, userId); } } + @Override public Result getItemStatistics(ItemStatisticsFormDTO formDto) { ItemStatisticsResultDTO resultDTO = baseDao.selectOneItemStatistics(formDto); return new Result().ok(resultDTO); } + + + @Override + public List statPeopleEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto) { + return baseDao.selectListPeopleEvaluationMetaData(metaDataFormDto); + } + + @Override + public List statItemHandleAmount(KpiMetaDataOfEventsFormDTO metaDataFormDto) { + List kpiMetaDataDTOList = new ArrayList<>(); + // 按部门id查询 部门网格呼叫事件总数 + List callAmountOfDept = baseDao.selectListItemGridCallAmount(metaDataFormDto, KpiMetaDataEnum.GRID_CALL_SUPERIOR_AMOUNT.getValue()); + kpiMetaDataDTOList.addAll(callAmountOfDept); + + //查询各个街道的项目呼叫有效时间 有效结案时间 + List KpiItemTimeLimitByDeptList = baseDao.selctListItemTimeLimitByDept(metaDataFormDto); + for (KpiItemTimeLimitByDeptResultDTO itemTimeLimitByDept : KpiItemTimeLimitByDeptList) { + if (StringUtils.isBlank(itemTimeLimitByDept.getItemId()) || StringUtils.isBlank(itemTimeLimitByDept.getCatecoryId())) { + continue; + } + Map map = (Map) redisUtils.get(RedisKeys.getKpiItemTimeLimitKey(itemTimeLimitByDept.getCatecoryId())); + itemTimeLimitByDept.setValidCloseTime(map.get(KpiItemConstant.CLOSE_ITEM_TIME_LIMIT)); + itemTimeLimitByDept.setValidRespondTime(map.get(KpiItemConstant.RESPOND_ITEM_TIME_LIMIT)); + } + + // 按部门id查询与项目有效响应时限 网格呼叫被响应总数 + List itemRespondAmountByDeot = baseDao.selectListItemRespondAmount(KpiItemTimeLimitByDeptList, KpiMetaDataEnum.GRID_CALL_SUPERIOR_RESP_AMOUNT.getValue()); + kpiMetaDataDTOList.addAll(itemRespondAmountByDeot); + + // 按部门id查询与项目有效办结时限 网格呼叫被办结总数 + List itemCloseAmountByDeot = baseDao.selectListItemCloseAmount(KpiItemTimeLimitByDeptList, KpiMetaDataEnum.GRID_CALL_SUPERIOR_CLOSE_AMOUNT.getValue()); + kpiMetaDataDTOList.addAll(itemCloseAmountByDeot); + + return kpiMetaDataDTOList; + } + + @Override + public List statGridEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto) { + List list = baseDao.selectListGridEvaluationMetaData(metaDataFormDto); + return list; + } + /** * @param dto * @return void @@ -927,11 +986,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** - * * 保存接口调用日志 * - * @params [referenceId, businessType, interfaceName, successFlag, callMsgBody, returnMsgBody] * @return void + * @params [referenceId, businessType, interfaceName, successFlag, callMsgBody, returnMsgBody] * @author liuchuang * @since 2019/12/26 11:08 */ @@ -1102,7 +1160,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 获取已上报网格平台未结案的项目 List gridPlatformDTOList = itemGridPlatformService.listOfGridPlatformItemNotEnd(); // 拉取处理情况 - for (ItemGridPlatformDTO dto: + for (ItemGridPlatformDTO dto : gridPlatformDTOList) { SearchCaseProcessByTaskIdDto searchResultDot = shiBeiCityGridApi.searchCaseProcessByTaskId(dto.getTaskid()); String successFlag = YesOrNoEnum.NO.value(); @@ -1136,11 +1194,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** - * * 删除历史网格化平台处理记录 * - * @params [id] * @return void + * @params [id] * @author liuchuang * @since 2019/12/25 19:08 */ @@ -1156,18 +1213,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** - * * 保存新的网格化平台处理记录 * - * @params [progressList] * @return void + * @params [progressList] * @author liuchuang * @since 2019/12/25 19:27 */ private void insertNewHandleProcess(List progressList, String itemId, String itemGridPlatformId) { try { - for (SearchCaseProcessByTaskIdItemDto dto: + for (SearchCaseProcessByTaskIdItemDto dto : progressList) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); Date insertTime = sdf.parse(dto.getInserttime()); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml index 200fa69cd..f8feca0ee 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml @@ -1,3 +1,23 @@ +#server: +# port: @server.port@ +# servlet: +# context-path: /events +# +#nacos: +# config: +# server-addr: @nacos.server-addr@ +# type: YAML +# namespace: @nacos.config.namespace@ +# group: @nacos.config.group@ +# dataId: epdc-events-server +# bootstrap: +# enable: true +# log: +# enable: @nacos.config.bootstrap.log.enable@ +# +#spring: +# application: +# name: epdc-events-server server: port: @server.port@ servlet: @@ -34,7 +54,7 @@ spring: tx-service-group: epdc-events-server-fescar-service-group datasource: druid: - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: @spring.datasource.druid.url@ username: @spring.datasource.druid.username@ password: @spring.datasource.druid.password@ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml index 88e9cdde6..fd43813fe 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml @@ -147,10 +147,10 @@ - - - - + + + + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/CategoryDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/CategoryDao.xml index 2eaa42e63..59a2edc2b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/CategoryDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/CategoryDao.xml @@ -62,7 +62,8 @@ creator, create_date, updater, - update_date) + update_date, + info_code) values (#{item.id}, @@ -76,7 +77,8 @@ #{item.creator}, #{item.createDate}, #{item.updater}, - #{item.updateDate}) + #{item.updateDate}, + #{item.infoCode}) 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 14d41bcaa..a6ac97454 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 @@ -58,30 +58,30 @@ @@ -331,6 +331,29 @@ LIMIT #{pageIndex},#{pageSize} + + + + + + + + + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreDao.xml index b64f4b426..ac46f2ef4 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreDao.xml @@ -3,47 +3,13 @@ - - - - - - - - - - - - - - - - - - + + delete from epdc_kpi_manual_score where + rule_id = #{ruleId} and dept_id = #{deptId} and score_start_date = #{scoreStartDate} and score_end_date = #{scoreEndDate} + - - - - - - - - - - - - - - - - - - - - - - SELECT kmc.id, kmc.rule_id, @@ -63,18 +29,37 @@ kr.kpi_cycle, kmc.score_start_date, kmc.score_end_date - FROM - epdc_kpi_manual_score kmc - left join epdc_kpi_rule kr - on(kmc.RULE_ID=kr.id) + FROM epdc_kpi_manual_score kmc + left join epdc_kpi_rule kr on(kmc.RULE_ID=kr.id) WHERE kmc.del_flag = '0' - - AND kmc.rule_id =#{ruleId} - - - AND DATE_FORMAT( kmc.score_start_date, '%Y-%m' ) BETWEEN #{scoreStartDate} AND #{scoreStartDate} - + + AND kmc.rule_id =#{ruleId} + + + AND DATE_FORMAT( kmc.score_start_date, '%Y-%m' ) BETWEEN #{scoreStartDate} AND #{scoreStartDate} + + + AND kmc.all_dept_ids like concat('%',#{allDeptIds},'%') + ORDER BY kmc.CREATED_TIME DESC + + + + + UPDATE epdc_kpi_manual_score SET creator_dept_name = #{newDeptName}, UPDATED_TIME = NOW() WHERE creator_dept_id = #{deptId} + + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMetaDataDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMetaDataDao.xml new file mode 100644 index 000000000..9bd92b965 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMetaDataDao.xml @@ -0,0 +1,37 @@ + + + + + + + DELETE + FROM + epdc_kpi_meta_data + WHERE + + (#{metaListItem.deptId}=epdc_kpi_meta_data.dept_id + AND #{metaListItem.startDate}=epdc_kpi_meta_data.start_date + AND #{metaListItem.endDate}=epdc_kpi_meta_data.end_date + AND #{metaListItem.dataCode}=epdc_kpi_meta_data.data_code + ) + + + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml new file mode 100644 index 000000000..e8f3a2422 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml new file mode 100644 index 000000000..4a1e839b7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml @@ -0,0 +1,97 @@ + + + + + + + delete from epdc_kpi_result_superior where dept_id = #{deptId} and start_date = #{startDate} and end_date = #{endDate} + + + + + + + + + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleDao.xml index bc84be77b..e808b9720 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleDao.xml @@ -129,4 +129,21 @@ and ekr.id=#{id} + + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleParamDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleParamDao.xml index 2928504c6..358c5a535 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleParamDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleParamDao.xml @@ -19,4 +19,18 @@ delete from epdc_kpi_rule_param where rule_id=#{id} + + + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiTimeLimitItemDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiTimeLimitItemDao.xml index 83044e824..8c5aeae0b 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiTimeLimitItemDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiTimeLimitItemDao.xml @@ -3,22 +3,22 @@ - - - - - - - - - - - - - - - - + + delete from epdc_kpi_time_limit_item where category_id in + #{item} + + \ No newline at end of file From 2b7e0d21c3c1ea2ac5244300b8edee13fc3d8651 Mon Sep 17 00:00:00 2001 From: yujintao Date: Fri, 13 Mar 2020 16:19:18 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8A=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/commons/tools/utils/ModuleUtils.java | 68 ++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java index 4e135c8a6..b53566505 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java @@ -1,9 +1,16 @@ package com.elink.esua.epdc.commons.tools.utils; import com.alibaba.fastjson.JSON; +import com.elink.esua.epdc.commons.tools.constant.StrConstant; +import com.elink.esua.epdc.commons.tools.exception.RenException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.codec.CharEncoding; +import org.springframework.util.Base64Utils; +import java.io.UnsupportedEncodingException; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.UUID; /** @@ -41,7 +48,7 @@ public class ModuleUtils { * @date 2019/9/5 14:44 */ public static String generateUUID() { - return UUID.randomUUID().toString().replace("-", ""); + return UUID.randomUUID().toString().replace(StrConstant.HYPHEN, ""); } @@ -68,4 +75,63 @@ public class ModuleUtils { return str; } + /** + * 字符串转换为base64 + * + * @param params + * @return java.lang.String + * @author work@yujt.net.cn + * @date 2020/2/6 16:39 + */ + public static String encodeByBase64(String params) { + if (StringUtils.isEmpty(params)) { + return null; + } + try { + return Base64Utils.encodeToUrlSafeString(params.getBytes(CharEncoding.UTF_8)); + } catch (UnsupportedEncodingException e) { + throw new RenException("字符串编码方法异常"); + } + } + + /** + * base64解码 + * + * @param base64Str + * @return java.lang.String + * @author work@yujt.net.cn + * @date 2020/2/6 16:48 + */ + public static String decodeFromBase64(String base64Str) { + if (StringUtils.isEmpty(base64Str)) { + return null; + } + try { + return new String(Base64Utils.decodeFromUrlSafeString(base64Str), CharEncoding.UTF_8); + } catch (UnsupportedEncodingException e) { + throw new RenException("字符串编码方法异常"); + } + } + + /** + * 验证字符串是否是日期格式 + * + * @param str 被验证的字符串 + * @param dateFormat 指定日期格式 + * @return boolean + * @author work@yujt.net.cn + * @date 2020/2/7 10:53 + */ + public static boolean isValidDate(String str, String dateFormat) { + boolean convertSuccess = true; + // 指定日期格式 + SimpleDateFormat format = new SimpleDateFormat(dateFormat); + try { + format.setLenient(false); + format.parse(str); + } catch (ParseException e) { + convertSuccess = false; + } + return convertSuccess; + } } From 5a1b431f38a13af2456590e4eb1c0225c0f03f4c Mon Sep 17 00:00:00 2001 From: yujintao Date: Fri, 13 Mar 2020 16:49:05 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/NumConstant.java | 12 ++-- .../tools/constant/ServiceConstant.java | 9 +++ .../epdc/commons/tools/redis/RedisKeys.java | 56 ++++++++++++++++++- .../epdc/commons/tools/utils/DateUtils.java | 5 ++ .../commons/tools/utils/LocalDateUtils.java | 51 +++++++++++++++++ 5 files changed, 128 insertions(+), 5 deletions(-) create mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java index dc987077c..b7902105d 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java @@ -9,17 +9,21 @@ package com.elink.esua.epdc.commons.tools.constant; */ public interface NumConstant { + int TWO_NEG = -2; + int ONE_NEG = -1; int ZERO = 0; int ONE = 1; int TWO = 2; int THREE = 3; int FOUR = 4; int SIX = 6; - - int ONE_NEG = -1; - int TWO_NEG = -2; - + int SEVEN = 7; + int EIGHT = 8; + int NINE = 9; int TEN = 10; + int ELEVEN = 11; + int TWELVE = 12; + int FIFTEEN = 15; int TWENTY = 20; int THIRTY = 30; diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java index 1b06b164e..ced432c41 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java @@ -89,4 +89,13 @@ public interface ServiceConstant { * 数据分析模块 */ String EPDC_ANALYSIS_SERVER = "epdc-analysis-server"; + /** + * 积分模块 + */ + String EPDC_POINTS_SERVER = "epdc-points-server"; + + /** + * 开放接口模块 + */ + String EPDC_API_SERVER = "epdc-api-server"; } diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java index 0681bc02a..1ebb47bf5 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java @@ -141,7 +141,7 @@ public class RedisKeys { } /** - * 管理员部门层级关系 + * 管理员有数据权限的部门层级关系 * * @param userId 用户id * @return java.lang.String @@ -164,6 +164,18 @@ public class RedisKeys { return rootPrefix.concat("options:dept:user:all:").concat(String.valueOf(userId)); } + /** + * 存放部门层级关系，主要用于获取拼接后的部门id和部门名称 + * + * @param deptId + * @return java.lang.String + * @author work@yujt.net.cn + * @date 2019/12/20 20:34 + */ + public static String getDeptOptionKey(Long deptId) { + return rootPrefix.concat("options:dept:common:").concat(String.valueOf(deptId)); + } + /** * 事件分类 */ @@ -204,4 +216,46 @@ public class RedisKeys { public static String getCustomSentryPostKey(String postCode) { return rootPrefix.concat("custom:epidemic:sentryPost:").concat(postCode); } + + /** + * @Author wanggongfeng + * @Description常用语 + */ + public static String getPhraseListKey() { + return rootPrefix.concat("heart:phrase:list"); + } + + /** + * @param ruleCode 积分规则编码 + * @return java.lang.String + * @Author yinzuomei + * @Description 积分规则 + * @Date 2019/12/12 10:02 + **/ + public static String getPointsRuleKey(String ruleCode) { + return rootPrefix.concat("config:points:rule:").concat(ruleCode); + } + + /** + * 按项目分类设置项目响应/关闭时限 + * + * @param categoryId + * @return java.lang.String + * @author work@yujt.net.cn + * @date 2019/12/20 20:38 + */ + public static String getKpiItemTimeLimitKey(String categoryId) { + return rootPrefix.concat("config:kpi:itemtimelimit:").concat(categoryId); + } + + /** + * 存储议题响应/关闭时限 + * + * @return java.lang.String + * @author work@yujt.net.cn + * @date 2019/12/20 20:39 + */ + public static String getKpiIssueTimeLimitKey() { + return rootPrefix.concat("config:kpi:issuetimelimit"); + } } diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java index 3789283f4..0de5d2834 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java @@ -25,11 +25,16 @@ import java.util.Date; * @since 1.0.0 */ public class DateUtils { + /** 时间格式(yyyy-MM-dd) */ public final static String DATE_PATTERN = "yyyy-MM-dd"; + /** 时间格式(yyyy-MM-dd HH:mm:ss) */ public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss"; + /** 时间格式(yyyyMMddHHmmss) */ + public final static String DATE_TIME_NO_SPLIT = "yyyyMMddHHmmss"; + /** * 日期格式化 日期格式为：yyyy-MM-dd * @param date 日期 diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java new file mode 100644 index 000000000..133340b24 --- /dev/null +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java @@ -0,0 +1,51 @@ +package com.elink.esua.epdc.commons.tools.utils; + + +import java.time.*; +import java.util.Date; + +/** + * @author work@yujt.net.cn + * @date 2019/12/13 15:05 + */ +public class LocalDateUtils { + + + public static LocalDateTime dateToLocalDateTime(Date date) { + Instant instant = date.toInstant(); + ZoneId zone = ZoneId.systemDefault(); + return LocalDateTime.ofInstant(instant, zone); + } + + public static LocalDate dateToLocalDate(Date date) { + Instant instant = date.toInstant(); + ZoneId zone = ZoneId.systemDefault(); + LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone); + return localDateTime.toLocalDate(); + } + + public static YearMonth dateToYearMonth(Date date) { + LocalDate localDate = dateToLocalDate(date); + return YearMonth.of(localDate.getYear(), localDate.getMonthValue()); + } + + public static LocalTime dateToLocalTime(Date date) { + Instant instant = date.toInstant(); + ZoneId zone = ZoneId.systemDefault(); + LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone); + return localDateTime.toLocalTime(); + } + + public static Date localDateTimeToDate(LocalDateTime localDateTime) { + ZoneId zone = ZoneId.systemDefault(); + Instant instant = localDateTime.atZone(zone).toInstant(); + return Date.from(instant); + } + + public static Date localDateToDate(LocalDate localDate) { + ZoneId zone = ZoneId.systemDefault(); + Instant instant = localDate.atStartOfDay().atZone(zone).toInstant(); + return Date.from(instant); + } + +} 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 04/13] =?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 05/13] =?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 06/13] =?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 07/13] =?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