From 069509a18410c7d127f785fcbb6a7a32824656fb Mon Sep 17 00:00:00 2001 From: yujintao Date: Thu, 19 Dec 2019 09:31:00 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BF=AE=E6=94=B9=E5=B8=B8=E9=87=8F?= =?UTF-8?q?=E7=B1=BB"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4762f3b26006e9737e77232260fbdcbc1d73d1df. --- .../esua/epdc/constant/TypeKeyConstant.java | 23 +------------ .../constant/OrganizationTypeConstant.java | 34 +++++++++++++++++++ .../epdc/commons/tools/redis/RedisKeys.java | 2 +- .../service/impl/EpdcEventsServiceImpl.java | 1 + .../item/service/impl/ItemServiceImpl.java | 2 ++ .../service/impl/KpiMetaDataServiceImpl.java | 10 +++--- .../com/elink/esua/epdc/utils/DeptUtils.java | 10 +++--- 7 files changed, 50 insertions(+), 32 deletions(-) create mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/OrganizationTypeConstant.java diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/TypeKeyConstant.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/TypeKeyConstant.java index af2106323..9ef4895c4 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/TypeKeyConstant.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/TypeKeyConstant.java @@ -9,31 +9,10 @@ package com.elink.esua.epdc.constant; public interface TypeKeyConstant { /** - * 机构：区党委 - */ - String DEPT_DISTRICT_PARTY = "district_party"; - /** - * 机构：区直部门 - */ - String DEPT_DISTRICT_DEPT = "district_dept"; - /** - * 机构：街道党工委 - */ - String DEPT_STREET_PARTY = "street_party"; - /** - * 机构：街道部门 - */ - String DEPT_STREET_DEPT = "street_dept"; - /** - * 机构：社区党工委 - */ - String DEPT_COMMUNITY_PARTY = "community_party"; - /** - * 机构：网格党支部 + * 机构：基础网格 */ String DEPT_GRID_PARTY = "grid_party"; - /** * 角色：网格长 */ diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/OrganizationTypeConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/OrganizationTypeConstant.java new file mode 100644 index 000000000..c22fe453f --- /dev/null +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/OrganizationTypeConstant.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.commons.tools.constant; + +/** + * 机构类型 + * @Author LC + * @Date 2019/9/16 10:30 + */ +public interface OrganizationTypeConstant { + + /** + * 区党委 + */ + String ORG_TYPE_DISTRICT_PARTY = "district_party"; + /** + * 区直部门 + */ + String ORG_TYPE_DISTRICT_DEPT = "district_dept"; + /** + * 街道党工委 + */ + String ORG_TYPE_STREET_PARTY = "street_party"; + /** + * 街道部门 + */ + String ORG_TYPE_STREET_DEPT = "street_dept"; + /** + * 社区党工委 + */ + String ORG_TYPE_COMMUNITY_PARTY = "community_party"; + /** + * 网格党支部 + */ + String ORG_TYPE_GRID_PARTY = "grid_party"; +} 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 b927112fd..c5a45f95b 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 @@ -143,7 +143,7 @@ public class RedisKeys { * 部门关系 */ public static String getDeptOptionKey(Long deptId) { - return rootPrefix.concat("options:dept:common:").concat(String.valueOf(deptId)); + return rootPrefix.concat("options:dept:all:").concat(String.valueOf(deptId)); } /** 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 2628e83f8..fd2a23a59 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 @@ -22,6 +22,7 @@ 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.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.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; 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 a2cbc21cb..5adbd1f82 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 @@ -22,6 +22,7 @@ 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.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.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; @@ -49,6 +50,7 @@ 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.enums.ItemHandleCategoryEnum; +import com.elink.esua.epdc.enums.KpiCycleEnum; import com.elink.esua.epdc.enums.kpiDataEnum; import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java index 1382e9514..03aab96df 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java @@ -22,12 +22,12 @@ 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.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.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.constant.TypeKeyConstant; import com.elink.esua.epdc.dao.KpiMetaDataDao; import com.elink.esua.epdc.dto.EventCountFromDTO; import com.elink.esua.epdc.dto.KpiMetaDataDTO; @@ -122,7 +122,7 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl gridList; - gridList = deptUtils.getDeptIdList(TypeKeyConstant.DEPT_GRID_PARTY, pageSize, pageIndex); + gridList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, pageSize, pageIndex); do { EventCountFromDTO eventCountFromDto = new EventCountFromDTO(); @@ -144,7 +144,7 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl kpiMetaDataDTOList; List gridList; do { - gridList = deptUtils.getDeptIdList(TypeKeyConstant.DEPT_GRID_PARTY, pageSize, pageIndex); + gridList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, pageSize, pageIndex); monthFromDto.setGridIdList(gridList); monthFromDto.setType(KpiCycleEnum.KPI_CYCLE_MONTH.getValue()); @@ -211,7 +211,7 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl result = adminFeignClient.getDeptInfoById(deptId, yesOrNo.value());