Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DimAgencyConstant.java

@@ -0,0 +1,10 @@
+package com.epmet.constant;
+
+public interface DimAgencyConstant {
+
+    String TYPE_ALL = "all";
+    String TYPE_SELF = "self";
+
+    String TYPE_SELF_ID_SUFFIX = "-self";
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimAgencyEntity.java

@@ -58,6 +58,11 @@ public class DimAgencyEntity extends BaseEpmetEntity {
      */
 	private String pids;
 
+	/**
+	 * 机关维度类型。self:机关本身自己,all:机关自己+下级+网格+部门等
+	 */
+	private String agencyDimType;
+
     /**
      * 所有上级名称,以-连接
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java

@@ -25,6 +25,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DimAgencyConstant;
 import com.epmet.constant.RobotConstant;
 import com.epmet.constant.StatsSubject;
 import com.epmet.dao.stats.DimAgencyDao;
@@ -44,7 +45,6 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 机关维度
@@ -125,22 +125,47 @@ public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgenc
     @Override
     public void initAgencyDims(List<CustomerAgencyEntity> agencies) {
         for (CustomerAgencyEntity agency : agencies) {
-            DimAgencyEntity dimAgencyEntity = new DimAgencyEntity();
-            dimAgencyEntity.setAgencyName(agency.getOrganizationName());
-            dimAgencyEntity.setAllParentName(agency.getAllParentName());
-            dimAgencyEntity.setCustomerId(agency.getCustomerId());
-            dimAgencyEntity.setLevel(agency.getLevel());
-            dimAgencyEntity.setPid(agency.getPid());
-            dimAgencyEntity.setPids(agency.getPids());
-            dimAgencyEntity.setCreatedBy(RobotConstant.DIMENSION_ROBOT);
-            dimAgencyEntity.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
-            dimAgencyEntity.setId(agency.getId());
-            baseDao.insert(dimAgencyEntity);
+            initAgencyAllDim(agency);
+            initAgencySelfDim(agency);
         }
 
         lastExecRecordDao.updateExecTimeBySubject(new Date(), StatsSubject.DIM_AGENCY);
     }
 
+    public void initAgencyAllDim(CustomerAgencyEntity agency) {
+        DimAgencyEntity dimAgencyEntity = new DimAgencyEntity();
+        dimAgencyEntity.setAgencyName(agency.getOrganizationName());
+        dimAgencyEntity.setAllParentName(agency.getAllParentName());
+        dimAgencyEntity.setCustomerId(agency.getCustomerId());
+        dimAgencyEntity.setLevel(agency.getLevel());
+        dimAgencyEntity.setAgencyDimType(DimAgencyConstant.TYPE_ALL);
+        dimAgencyEntity.setPid(agency.getPid());
+        dimAgencyEntity.setPids(agency.getPids());
+        dimAgencyEntity.setCreatedBy(RobotConstant.DIMENSION_ROBOT);
+        dimAgencyEntity.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
+        dimAgencyEntity.setId(agency.getId());
+        baseDao.insert(dimAgencyEntity);
+    }
+
+    /**
+     * 初始化机关单位本身的维度(不包含本身)
+     * @param agency
+     */
+    public void initAgencySelfDim(CustomerAgencyEntity agency) {
+        DimAgencyEntity dimAgencyEntity = new DimAgencyEntity();
+        dimAgencyEntity.setAgencyName(agency.getOrganizationName());
+        dimAgencyEntity.setAllParentName(agency.getAllParentName());
+        dimAgencyEntity.setCustomerId(agency.getCustomerId());
+        dimAgencyEntity.setLevel(agency.getLevel());
+        dimAgencyEntity.setPid(agency.getId());
+        dimAgencyEntity.setAgencyDimType(DimAgencyConstant.TYPE_SELF);
+        dimAgencyEntity.setPids(agency.getPids().concat(":").concat(agency.getId()));
+        dimAgencyEntity.setCreatedBy(RobotConstant.DIMENSION_ROBOT);
+        dimAgencyEntity.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
+        dimAgencyEntity.setId(agency.getId().concat(DimAgencyConstant.TYPE_SELF_ID_SUFFIX));
+        baseDao.insert(dimAgencyEntity);
+    }
+
     /**
      * @Description 查询所有机关以及它下级机关的信息
      * @param

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.2__dim_ag_add_col_type.sql

@@ -0,0 +1 @@
+ALTER TABLE dim_agency ADD COLUMN AGENCY_DIM_TYPE VARCHAR(10) NOT NULL COMMENT '机关维度类型。self:机关本身自己,all:机关自己+下级+网格+部门等';