Revert "修改常量类"

This reverts commit 4762f3b260.

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";
 
-
     /**
      * 角色：网格长
      */

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";
+}

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));
     }
 
     /**

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;

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;

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<KpiMetaDataDao, KpiM
 
         List<Long> 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<KpiMetaDataDao, KpiM
             insertBatch(mataResponseDataEntityList);
 
             pageIndex++;
-            gridList = deptUtils.getDeptIdList(TypeKeyConstant.DEPT_GRID_PARTY, pageSize, pageIndex);
+            gridList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, pageSize, pageIndex);
         } while (CollUtil.isNotEmpty(gridList));
 
     }
@@ -191,7 +191,7 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
         List<KpiMetaDataDTO> kpiMetaDataDTOList;
         List<Long> 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<KpiMetaDataDao, KpiM
                 insertBatch(ConvertUtils.sourceToTarget(kpiMetaDataDTOList, KpiMetaDataEntity.class));
             }
             pageIndex++;
-            gridList = deptUtils.getDeptIdList(TypeKeyConstant.DEPT_GRID_PARTY, pageSize, pageIndex);
+            gridList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, pageSize, pageIndex);
         } while (CollUtil.isNotEmpty(gridList));
     }
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/DeptUtils.java

@@ -14,8 +14,6 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 /**
- * 获取部门信息
- *
  * @author work@yujt.net.cn
  * @date 2019/12/18 14:52
  */
@@ -39,10 +37,14 @@ public class DeptUtils {
      */
     public DeptLevelAndLeaderDTO getDeptLevelInfo(Long deptId, YesOrNoEnum yesOrNo) {
         DeptLevelAndLeaderDTO dto = (DeptLevelAndLeaderDTO) redisUtils.get(RedisKeys.getDeptOptionKey(deptId));
+
         if (null != dto) {
-            // 已取到网格长姓名或者不需要网格长姓名 直接返回
-            if ((StringUtils.isNotBlank(dto.getLeaderName()) || YesOrNoEnum.NO.value().equals(yesOrNo.value()))) {
+            if (YesOrNoEnum.NO.value().equals(yesOrNo.value())) {
                 return dto;
+            } else {
+                if (StringUtils.isNotBlank(dto.getLeaderName())) {
+                    return dto;
+                }
             }
         }
         Result<DeptLevelAndLeaderDTO> result = adminFeignClient.getDeptInfoById(deptId, yesOrNo.value());