【小组】创建小组-增加orgIdpath,agencyId

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java

@@ -98,4 +98,7 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
 	 * 小组等级
 	 */
 	private Integer level;
+	private String agencyId;
+
+	private String orgIdPath;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -30,6 +30,8 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
 import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
@@ -37,10 +39,7 @@ import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
-import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.*;
-import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dto.form.*;
@@ -609,6 +608,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		resiGroupEntity.setGroupType(applyCreateGroupFormDTO.getGroupType());
 		resiGroupEntity.setPartyOrgId(applyCreateGroupFormDTO.getPartyOrgId());
 		resiGroupEntity.setPartyOrgPids(applyCreateGroupFormDTO.getPartyOrgPids());
+
+		GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(applyCreateGroupFormDTO.getGridId());
+		resiGroupEntity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(gridInfo.getId(), gridInfo.getPids()));
+		resiGroupEntity.setAgencyId(gridInfo.getPid());
 		return resiGroupEntity;
 	}
 

epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__group_add_orgidpath_agencyid.sql

@@ -0,0 +1,2 @@
+alter table resi_group add column AGENCY_ID varchar(64) comment '所属组织id' after GRID_ID;
+alter table resi_group add column ORG_ID_PATH varchar(512) comment '组织idpath' after AGENCY_ID;