diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/result/EventInfoResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/result/EventInfoResultDTO.java
index faff5af737..cce7f1bb65 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/result/EventInfoResultDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/result/EventInfoResultDTO.java
@@ -14,11 +14,20 @@ import java.util.Date;
 @Data
 public class EventInfoResultDTO implements Serializable {
     private static final long serialVersionUID = -6483163020737762044L;
+    /**
+     * 主键
+     */
+    private String id;
+
     /**
      * 客户Id
      */
     private String customerId;
 
+    private Integer detpId;
+
+    private String reporterId;
+
     /**
      * 网格编码
      */
@@ -70,7 +79,15 @@ public class EventInfoResultDTO implements Serializable {
     private String successfulOrNo;
 
     /**
-     * 办结层级01省、自治区、直辖市02地、市、州、盟03县、市、区、旗04乡镇、街道05片区06村、社区07网格
+     * 办结层级
+     01省、自治区、直辖市
+     02地、市、州、盟
+     03县、市、区、旗
+     04乡镇、街道
+     05片区
+     06村、社区
+     07网格
+
      */
     private String completeLevel;
 
@@ -140,4 +157,34 @@ public class EventInfoResultDTO implements Serializable {
      * 重点人员现状
      */
     private String keypeopleStatus;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+    private Long delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 }
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/form/GridBaseInfoFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/form/GridBaseInfoFormDTO.java
new file mode 100644
index 0000000000..9d39ef6b81
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/form/GridBaseInfoFormDTO.java
@@ -0,0 +1,34 @@
+package com.epmet.dto.org.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @dscription 插叙客户网格基础信息--接口入参
+ * @author sun
+ */
+@Data
+public class GridBaseInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3634745091993094743L;
+    /**
+     * 客户Id
+     */
+    @NotBlank(message = "事件标识不能为空", groups = {Grid.class})
+    private String customerId = "";
+    /**
+     * 网格Id
+     */
+    private List<String> orgIdList;
+    /**
+     * 操作类型【新增:add 修改删除:edit  初始化所有数据:all】
+     */
+    private String type;
+
+    public interface Grid extends CustomerClientShowGroup {}
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/form/StaffBaseInfoFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/form/StaffBaseInfoFormDTO.java
new file mode 100644
index 0000000000..b82ca423fe
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/form/StaffBaseInfoFormDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dto.user.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @dscription 插叙客户网格人员基础信息--接口入参
+ * @author sun
+ */
+@Data
+public class StaffBaseInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3634745091993094743L;
+    /**
+     * 客户Id
+     */
+    @NotBlank(message = "事件标识不能为空", groups = {Staff.class})
+    private String customerId = "";
+    /**
+     * 人员Id
+     */
+    private List<String> staffIdList;
+    /**
+     * 操作类型【新增:add 修改删除:edit】
+     */
+    private String type;
+    public interface Staff extends CustomerClientShowGroup {}
+
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
index 50b339b697..73b56ef7a0 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
@@ -4,24 +4,24 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
+import com.epmet.dto.basereport.result.EventInfoResultDTO;
 import com.epmet.dto.extract.form.BizDataFormDTO;
 import com.epmet.dto.extract.form.ExtractIndexFormDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
+import com.epmet.dto.org.form.GridBaseInfoFormDTO;
 import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
 import com.epmet.dto.screen.form.InitCustomerIndexForm;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
+import com.epmet.dto.user.form.StaffBaseInfoFormDTO;
 import com.epmet.dto.user.param.MidPatrolFormDTO;
 import com.epmet.dto.user.result.GridUserInfoDTO;
 import com.epmet.dto.user.result.MidPatrolDetailResult;
 import com.epmet.dto.user.result.MidPatrolRecordResult;
 import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBackFactory;
-import com.epmet.opendata.dto.BaseDisputeProcessDTO;
-import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
-import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -340,5 +340,5 @@ public interface DataStatisticalOpenFeignClient {
      * @Date 2021/10/15 16:50
      */
     @PostMapping("/data/stats/datareporting/eventinfo")
-    Result<List<BaseDisputeProcessDTO>> getEventInfo(@RequestBody EventInfoFormDTO formDTO);
+    Result<List<EventInfoResultDTO>> getEventInfo(@RequestBody EventInfoFormDTO formDTO);
 }
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
index b36b9e9434..43638c894e 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
@@ -5,24 +5,24 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
+import com.epmet.dto.basereport.result.EventInfoResultDTO;
 import com.epmet.dto.extract.form.BizDataFormDTO;
 import com.epmet.dto.extract.form.ExtractIndexFormDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
+import com.epmet.dto.org.form.GridBaseInfoFormDTO;
 import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
 import com.epmet.dto.screen.form.InitCustomerIndexForm;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
+import com.epmet.dto.user.form.StaffBaseInfoFormDTO;
 import com.epmet.dto.user.param.MidPatrolFormDTO;
 import com.epmet.dto.user.result.GridUserInfoDTO;
 import com.epmet.dto.user.result.MidPatrolDetailResult;
 import com.epmet.dto.user.result.MidPatrolRecordResult;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
-import com.epmet.opendata.dto.BaseDisputeProcessDTO;
-import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
-import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 
 import java.util.List;
 
@@ -326,12 +326,12 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      *
      * @param formDTO
      * @Param formDTO
-     * @Return {@link Result<List< BaseDisputeProcessDTO >>}
+     * @Return {@link Result<List< EventInfoResultDTO >>}
      * @Author zhaoqifeng
      * @Date 2021/10/15 16:50
      */
     @Override
-    public Result<List<BaseDisputeProcessDTO>> getEventInfo(EventInfoFormDTO formDTO) {
+    public Result<List<EventInfoResultDTO>> getEventInfo(EventInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getEventInfo", formDTO);
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DataReportingController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DataReportingController.java
index d9de9bc1e1..85706430c4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DataReportingController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DataReportingController.java
@@ -3,15 +3,16 @@ package com.epmet.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
+import com.epmet.dto.basereport.result.EventInfoResultDTO;
+import com.epmet.dto.org.form.GridBaseInfoFormDTO;
 import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
+import com.epmet.dto.user.form.StaffBaseInfoFormDTO;
 import com.epmet.dto.user.param.MidPatrolFormDTO;
 import com.epmet.dto.user.result.GridUserInfoDTO;
 import com.epmet.dto.user.result.MidPatrolDetailResult;
 import com.epmet.dto.user.result.MidPatrolRecordResult;
 import com.epmet.opendata.dto.BaseDisputeProcessDTO;
-import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
-import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 import com.epmet.service.DataReportingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -98,8 +99,8 @@ public class DataReportingController {
 	 * @Date 2021/10/15 14:09
 	 */
 	@PostMapping("eventinfo")
-	public Result<List<BaseDisputeProcessDTO>> getEventInfo(@RequestBody(required = false) EventInfoFormDTO formDTO) {
-		return new Result<List<BaseDisputeProcessDTO>>().ok(dataReportingService.getEventInfo(formDTO));
+	public Result<List<EventInfoResultDTO>> getEventInfo(@RequestBody(required = false) EventInfoFormDTO formDTO) {
+		return new Result<List<EventInfoResultDTO>>().ok(dataReportingService.getEventInfo(formDTO));
 	}
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
index d5336c4a34..70ef71817f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java
@@ -55,16 +55,28 @@ public interface ScreenProjectCategoryOrgDailyDao extends BaseDao<ScreenProjectC
 	List<CategoryProjectResultDTO> selectOrgCategoryInfo(@Param("customerId") String customerId, @Param("dateId") String dateId,@Param("level")String level);
 
 	/**
-	 * @Description  查询组织分类信息【多客户】
+	 * @Description  查询组织分类信息【多客户】父客户存在的分类
 	 * @Param customerId
 	 * @Param dateId
 	 * @Param level
-	 * @Param existsStatus 父客户是否存在
 	 * @author zxc
 	 * @date 2021/3/24 下午2:48
 	 */
 	List<CategoryProjectResultDTO> selectOrgCategoryMoreCustomerInfo(@Param("customerIds")List<String> customerIds, @Param("dateId") String dateId,
-																	 @Param("level")String level, @Param("customerId")String customerId, @Param("existsStatus")Boolean existsStatus);
+																	 @Param("level")String level, @Param("customerId")String customerId);
+
+	/**
+	 * @Description  查询组织分类信息【多客户】父客户存在的分类
+	 * @param customerIds
+	 * @param dateId
+	 * @param level
+	 * @param customerId
+	 * @author zxc
+	 * @date 2021/10/21 4:03 下午
+	 */
+	List<CategoryProjectResultDTO> selectOrgCategoryMoreCustomerInfoNotExists(@Param("customerIds")List<String> customerIds, @Param("dateId") String dateId,
+																	 @Param("level")String level, @Param("customerId")String customerId);
+
 	/**
 	 * @Description  查询组织分类信息【多客户】升级版
 	 * @Param customerIds
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java
index 84743c5a76..688807259e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java
@@ -23,11 +23,11 @@ import com.epmet.dto.group.result.AgencyGridTotalCountResultDTO;
 import com.epmet.dto.group.result.GridIdListByCustomerResultDTO;
 import com.epmet.dto.org.CustomerStaffGridDTO;
 import com.epmet.dto.org.GridInfoDTO;
+import com.epmet.dto.org.form.GridBaseInfoFormDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
+import com.epmet.dto.user.form.StaffBaseInfoFormDTO;
 import com.epmet.dto.user.result.GridUserInfoDTO;
 import com.epmet.entity.org.CustomerGridEntity;
-import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
-import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
index d091e81711..a16f40e204 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
@@ -2,11 +2,11 @@ package com.epmet.dao.org;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.AgencySubTreeDto;
+import com.epmet.dto.org.form.GridBaseInfoFormDTO;
 import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerAreaCodeResultDTO;
 import com.epmet.dto.org.result.OrgStaffDTO;
 import com.epmet.entity.org.CustomerAgencyEntity;
-import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
index fabf82d123..2c8f46ea9b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
@@ -5,10 +5,10 @@ import com.epmet.dto.extract.form.StaffPatrolStatsFormDTO;
 import com.epmet.dto.extract.result.UserPartyResultDTO;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.stats.form.GmUploadEventFormDTO;
+import com.epmet.dto.user.form.StaffBaseInfoFormDTO;
 import com.epmet.dto.user.param.MidPatrolFormDTO;
 import com.epmet.dto.user.result.*;
 import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
-import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java
index cbe1c62956..4a0d8e53c8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java
@@ -92,6 +92,4 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity {
 	 * desc: 是否参与上级计算yes:参与;no:不参与 add 01.14
 	 */
 	private String upToCal;
-
-	private String code;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
index 72e12ff5dc..8681c525da 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
@@ -14,7 +14,6 @@ import com.epmet.constant.SystemMessageType;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginExtractService;
 import com.epmet.service.evaluationindex.extract.toscreen.ScreenExtractService;
-import com.epmet.service.evaluationindex.screen.ScreenProjectDataService;
 import com.epmet.util.DimIdGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -161,7 +160,7 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
                 type = SystemMessageType.PROJECT_EDIT;
             }
             DisputeProcessMQMsg msg = new DisputeProcessMQMsg(customerId, msgObj.getProjectId(), type);
-            SpringContextUtils.getBean(ScreenProjectDataService.class).sendProjectChangeMq(msg);
+            //SpringContextUtils.getBean(ScreenProjectDataService.class).sendProjectChangeMq(msg);
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
             logger.error("【RocketMQ】消费项目变动消息失败:",e);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DataReportingService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DataReportingService.java
index bbaf18aa3c..921a2b3dde 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DataReportingService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DataReportingService.java
@@ -2,15 +2,14 @@ package com.epmet.service;
 
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
 import com.epmet.dto.basereport.result.EventInfoResultDTO;
+import com.epmet.dto.org.form.GridBaseInfoFormDTO;
 import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
+import com.epmet.dto.user.form.StaffBaseInfoFormDTO;
 import com.epmet.dto.user.param.MidPatrolFormDTO;
 import com.epmet.dto.user.result.GridUserInfoDTO;
 import com.epmet.dto.user.result.MidPatrolDetailResult;
 import com.epmet.dto.user.result.MidPatrolRecordResult;
-import com.epmet.opendata.dto.BaseDisputeProcessDTO;
-import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
-import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 
 import java.util.List;
 
@@ -68,6 +67,6 @@ public interface DataReportingService {
 	  * @Author zhaoqifeng
 	  * @Date 2021/10/15 14:10
 	  */
-	List<BaseDisputeProcessDTO> getEventInfo(EventInfoFormDTO formDTO);
+	List<EventInfoResultDTO> getEventInfo(EventInfoFormDTO formDTO);
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
index edd13b8e7d..d7edb6dd9a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
@@ -415,10 +415,10 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                 // 子客户单独存一份【三个街道的】
                 List<CategoryProjectResultDTO> sonCustomerList = new ArrayList<>();
                 // 父客户存在的分类
-                List<CategoryProjectResultDTO> categoryProjectExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId, true);
+                List<CategoryProjectResultDTO> categoryProjectExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId);
                 log.info("父客户存在的分类{}"+ JSON.toJSONString(categoryProjectExists));
                 // 父客户不存在的分类
-                List<CategoryProjectResultDTO> categoryProjectNotExists = baseDao.selectOrgCategoryMoreCustomerInfo(customerIds, dateId, level, customerId, false);
+                List<CategoryProjectResultDTO> categoryProjectNotExists = baseDao.selectOrgCategoryMoreCustomerInfoNotExists(customerIds, dateId, level, customerId);
                 log.info("父客户不存在的分类{}"+ JSON.toJSONString(categoryProjectNotExists));
                 if (!CollectionUtils.isEmpty(categoryProjectExists)){
                     sonCustomerList.addAll(categoryProjectExists);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
index a0b1931b29..5c386342e9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
@@ -5,10 +5,13 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.OrgTypeConstant;
 import com.epmet.constant.ProjectConstant;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
+import com.epmet.dto.basereport.result.EventInfoResultDTO;
+import com.epmet.dto.org.form.GridBaseInfoFormDTO;
 import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
 import com.epmet.dto.screen.ScreenCustomerGridDTO;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
+import com.epmet.dto.user.form.StaffBaseInfoFormDTO;
 import com.epmet.dto.user.param.MidPatrolFormDTO;
 import com.epmet.dto.user.result.CustomerStaffDTO;
 import com.epmet.dto.user.result.GridUserInfoDTO;
@@ -16,9 +19,6 @@ import com.epmet.dto.user.result.MidPatrolDetailResult;
 import com.epmet.dto.user.result.MidPatrolRecordResult;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity;
 import com.epmet.entity.stats.CustomerProjectCategoryDictEntity;
-import com.epmet.opendata.dto.BaseDisputeProcessDTO;
-import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
-import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 import com.epmet.service.DataReportingService;
 import com.epmet.service.evaluationindex.screen.ScreenCustomerAgencyService;
 import com.epmet.service.evaluationindex.screen.ScreenCustomerGridService;
@@ -140,13 +140,13 @@ public class DataReportingServiceImpl implements DataReportingService {
 	 *
 	 * @param formDTO
 	 * @Param formDTO
-	 * @Return {@link List<BaseDisputeProcessDTO>}
+	 * @Return {@link List<EventInfoResultDTO>}
 	 * @Author zhaoqifeng
 	 * @Date 2021/10/15 14:10
 	 */
 	@Override
-	public List<BaseDisputeProcessDTO> getEventInfo(EventInfoFormDTO formDTO) {
-		List<BaseDisputeProcessDTO> list;
+	public List<EventInfoResultDTO> getEventInfo(EventInfoFormDTO formDTO) {
+		List<EventInfoResultDTO> list;
 		//根据入参，获取项目
 		List<ScreenProjectDataDTO> projectList = screenProjectDataService.getProjectList(formDTO.getCustomerId(), formDTO.getProjectId(), formDTO.getPageNo(), formDTO.getPageSize());
 		//项目列表为空，返回空数组
@@ -156,7 +156,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 		//项目ID不为空时，因为只有一条，可以直接处理
 		if (StringUtils.isNotEmpty(formDTO.getProjectId())) {
 			list = projectList.stream().map(project -> {
-				BaseDisputeProcessDTO dto = getBaseDisputeProcessDTO(project);
+				EventInfoResultDTO dto = getEventInfoResultDTO(project);
 				if (OrgTypeConstant.AGENCY.equals(project.getOrgType())) {
 					ScreenCustomerAgencyEntity agency = screenCustomerAgencyService.getAgencyById(project.getOrgId());
 					dto.setOrgCode(agency.getCode());
@@ -173,7 +173,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 			Map<String, ScreenCustomerAgencyEntity> agencyMap = screenCustomerAgencyService.getAgencyList(formDTO.getCustomerId());
 			Map<String, ScreenCustomerGridDTO> gridMap = screenCustomerGridService.getGridList(formDTO.getCustomerId());
 			list = projectList.stream().map(project -> {
-				BaseDisputeProcessDTO dto = getBaseDisputeProcessDTO(project);
+				EventInfoResultDTO dto = getEventInfoResultDTO(project);
 				if (OrgTypeConstant.AGENCY.equals(project.getOrgType())) {
 					ScreenCustomerAgencyEntity agency = agencyMap.get(project.getOrgId());
 					dto.setOrgCode(agency.getCode());
@@ -189,8 +189,8 @@ public class DataReportingServiceImpl implements DataReportingService {
 		return list.stream().filter(item -> StringUtils.isNotBlank(item.getEventCategory())).collect(Collectors.toList());
 	}
 
-	private BaseDisputeProcessDTO getBaseDisputeProcessDTO(ScreenProjectDataDTO project) {
-		BaseDisputeProcessDTO dto = new BaseDisputeProcessDTO();
+	private EventInfoResultDTO getEventInfoResultDTO(ScreenProjectDataDTO project) {
+		EventInfoResultDTO dto = new EventInfoResultDTO();
 		dto.setId(project.getProjectId());
 		dto.setCustomerId(project.getCustomerId());
 		dto.setEventName(project.getProjectTitle());
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
index 00e573797a..156b7294a9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
@@ -1,10 +1,10 @@
 package com.epmet.service.org;
 
+import com.epmet.dto.org.form.GridBaseInfoFormDTO;
 import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerAreaCodeResultDTO;
 import com.epmet.dto.org.result.OrgStaffDTO;
 import com.epmet.entity.org.CustomerAgencyEntity;
-import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
 
 import java.util.Date;
 import java.util.List;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java
index a0d6fb449d..f6131f2906 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java
@@ -6,11 +6,11 @@ import com.epmet.dto.group.result.AgencyGridTotalCountResultDTO;
 import com.epmet.dto.group.result.GridIdListByCustomerResultDTO;
 import com.epmet.dto.org.CustomerStaffGridDTO;
 import com.epmet.dto.org.GridInfoDTO;
+import com.epmet.dto.org.form.GridBaseInfoFormDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
+import com.epmet.dto.user.form.StaffBaseInfoFormDTO;
 import com.epmet.dto.user.result.GridUserInfoDTO;
 import com.epmet.entity.org.CustomerGridEntity;
-import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
-import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 
 import java.util.Date;
 import java.util.List;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
index 1e2ac5cdb7..3e06682b15 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
@@ -5,6 +5,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.org.StatsCustomerAgencyDao;
+import com.epmet.dto.org.form.GridBaseInfoFormDTO;
 import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerAreaCodeResultDTO;
 import com.epmet.dto.org.result.OrgStaffDTO;
@@ -12,7 +13,6 @@ import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerGridEntity;
 import com.epmet.entity.org.CustomerAgencyEntity;
 import com.epmet.entity.org.CustomerGridEntity;
-import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
 import com.epmet.service.evaluationindex.screen.ScreenCustomerAgencyService;
 import com.epmet.service.evaluationindex.screen.ScreenCustomerGridService;
 import com.epmet.service.org.CustomerAgencyService;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java
index 5c3b0cedc0..76376efd82 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java
@@ -10,11 +10,11 @@ import com.epmet.dto.group.result.AgencyGridTotalCountResultDTO;
 import com.epmet.dto.group.result.GridIdListByCustomerResultDTO;
 import com.epmet.dto.org.CustomerStaffGridDTO;
 import com.epmet.dto.org.GridInfoDTO;
+import com.epmet.dto.org.form.GridBaseInfoFormDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
+import com.epmet.dto.user.form.StaffBaseInfoFormDTO;
 import com.epmet.dto.user.result.GridUserInfoDTO;
 import com.epmet.entity.org.CustomerGridEntity;
-import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
-import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 import com.epmet.service.Issue.IssueService;
 import com.epmet.service.org.CustomerGridService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
index cf98bb6c18..ffa464d4fa 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
@@ -7,10 +7,10 @@ import com.epmet.dto.org.result.OrgStaffDTO;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.stats.form.GmUploadEventFormDTO;
 import com.epmet.dto.stats.user.result.UserStatisticalData;
+import com.epmet.dto.user.form.StaffBaseInfoFormDTO;
 import com.epmet.dto.user.param.MidPatrolFormDTO;
 import com.epmet.dto.user.result.*;
 import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
-import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 import com.epmet.util.DimIdGenerator;
 
 import java.util.Date;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
index f6dc980302..a8bf95d7f0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
@@ -17,10 +17,10 @@ import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.stats.form.GmUploadEventFormDTO;
 import com.epmet.dto.stats.user.*;
 import com.epmet.dto.stats.user.result.UserStatisticalData;
+import com.epmet.dto.user.form.StaffBaseInfoFormDTO;
 import com.epmet.dto.user.param.MidPatrolFormDTO;
 import com.epmet.dto.user.result.*;
 import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
-import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
 import com.epmet.service.user.UserService;
 import com.epmet.util.DimIdGenerator;
 import com.epmet.util.ModuleConstant;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.24__add_categoryOriginCustomerId.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.24__add_categoryOriginCustomerId.sql
index 0997b46828..b4ca6c2318 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.24__add_categoryOriginCustomerId.sql
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.24__add_categoryOriginCustomerId.sql
@@ -1 +1,3 @@
 alter table `epmet_evaluation_index`.screen_project_category_org_daily add COLUMN  `CATEGORY_ORIGIN_CUSTOMER_ID` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '分类来源客户ID' AFTER CUSTOMER_ID;
+ALTER TABLE `epmet_evaluation_index`.`screen_project_data`
+    ADD COLUMN `PROJECT_CREATOR` varchar(64) NULL COMMENT '项目创建人' AFTER `SATISFACTION_SCORE`;
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
index cdce01974a..38aa359065 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
@@ -44,7 +44,7 @@
         GROUP BY sa.CATEGORY_CODE,sca.AGENCY_ID
     </select>
 
-    <!-- 查询组织分类信息【多客户】 -->
+    <!-- 查询组织分类信息【多客户】 父客户存在的分类-->
     <select id="selectOrgCategoryMoreCustomerInfo" resultType="com.epmet.dto.screen.result.CategoryProjectResultDTO">
         SELECT
             od.ORG_ID AS orgId,
@@ -52,18 +52,13 @@
             IFNULL(sca.PIDS,'0') AS pids,
             #{customerId} as customerId,
             od.CUSTOMER_ID AS categoryOriginCustomerId,
-            od.level,
-            <if test="existsStatus == true">
-                cd.EPMET_CATEGORY_CODE AS categoryCode,
-            </if>
-            <if test="existsStatus == false">
-                od.CATEGORY_CODE AS categoryCode,
-            </if>
+            cd.level,
+            cd.EPMET_CATEGORY_CODE AS categoryCode,
             SUM(od.PROJECT_TOTAL) AS projectTotal,
             #{level} as orgType,
             od.DATE_ID
         FROM screen_project_category_org_daily od
-        LEFT JOIN customer_project_category_dict cd ON (cd.CATEGORY_CODE = od.CATEGORY_CODE AND cd.CUSTOMER_ID = od.CUSTOMER_ID)
+        LEFT JOIN customer_project_category_dict cd ON (cd.CATEGORY_CODE = od.CATEGORY_CODE AND cd.CUSTOMER_ID = #{customerId})
         LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = od.ORG_ID
         WHERE 1=1
           AND od.DEL_FLAG = '0'
@@ -72,13 +67,8 @@
               od.CUSTOMER_ID = #{id}
           </foreach>
                   )
-          <if test="existsStatus == true">
-              AND cd.EPMET_CATEGORY_CODE IS NOT NULL
-              AND cd.EPMET_CATEGORY_CODE != ''
-          </if>
-          <if test="existsStatus == false">
-              AND (cd.EPMET_CATEGORY_CODE IS NULL OR cd.EPMET_CATEGORY_CODE = '')
-          </if>
+          AND cd.EPMET_CATEGORY_CODE IS NOT NULL
+          AND cd.EPMET_CATEGORY_CODE != ''
           AND od.pid = '0'
           AND od.date_id = #{dateId}
         GROUP BY categoryCode,od.ORG_ID
@@ -163,4 +153,33 @@
         GROUP BY od.CATEGORY_CODE,od.pid
     </select>
 
+    <!-- 查询组织分类信息【多客户】 父客户不存在的分类-->
+    <select id="selectOrgCategoryMoreCustomerInfoNotExists" resultType="com.epmet.dto.screen.result.CategoryProjectResultDTO">
+        SELECT
+        od.ORG_ID AS orgId,
+        IFNULL(sca.PID,'0') AS pid,
+        IFNULL(sca.PIDS,'0') AS pids,
+        #{customerId} as customerId,
+        od.CUSTOMER_ID AS categoryOriginCustomerId,
+        od.level,
+        od.CATEGORY_CODE AS categoryCode,
+        SUM(od.PROJECT_TOTAL) AS projectTotal,
+        #{level} as orgType,
+        od.DATE_ID
+        FROM screen_project_category_org_daily od
+        LEFT JOIN customer_project_category_dict cd ON (cd.CATEGORY_CODE = od.CATEGORY_CODE AND cd.CUSTOMER_ID = od.CUSTOMER_ID)
+        LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = od.ORG_ID
+        WHERE 1=1
+        AND od.DEL_FLAG = '0'
+        AND (
+        <foreach collection="customerIds" item="id" separator=" OR ">
+            od.CUSTOMER_ID = #{id}
+        </foreach>
+        )
+        AND (cd.EPMET_CATEGORY_CODE IS NULL OR cd.EPMET_CATEGORY_CODE = '')
+        AND od.pid = '0'
+        AND od.date_id = #{dateId}
+        GROUP BY categoryCode,od.ORG_ID
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/OrgInfoConstant.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/OrgInfoConstant.java
index c20cb98c6d..d8c8567800 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/OrgInfoConstant.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/constant/OrgInfoConstant.java
@@ -12,4 +12,8 @@ public interface OrgInfoConstant {
 
     String DEPT = "dept";
 
+    String NEIGHBOR_HOOD = "neighborHood";
+
+    String COMMUNITY = "community";
+
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java
new file mode 100644
index 0000000000..61eba8fd2e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java
@@ -0,0 +1,132 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 楼栋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+public class IcBuildingDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 楼栋主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小区id
+     */
+	private String neighborHoodId;
+
+    /**
+     * 片区id，neighbor_hood_part.id,可为空。
+     */
+	private String partId;
+
+    /**
+     * 楼栋名称
+     */
+	private String buildingName;
+
+    /**
+     * 楼栋类型，这里存储字典编码就可以
+     */
+	private String type;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 总单元数
+     */
+	private Integer totalUnitNum;
+
+    /**
+     * 总楼层总数
+     */
+	private Integer totalFloorNum;
+
+    /**
+     * 总户数
+     */
+	private Integer totalHouseNum;
+
+    /**
+     * 中心点位：经度
+     */
+	private String longitude;
+
+    /**
+     * 中心点位：纬度
+     */
+	private String latitude;
+
+    /**
+     * 坐标位置
+     */
+	private String coordinatePosition;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingUnitDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingUnitDTO.java
new file mode 100644
index 0000000000..3ec964009d
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingUnitDTO.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 楼栋单元信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+public class IcBuildingUnitDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单元主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 楼宇id
+     */
+	private String buildingId;
+
+    /**
+     * 单元号：1，2，3??
+     */
+	private String unitNum;
+
+    /**
+     * 单元名
+     */
+	private String unitName;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java
new file mode 100644
index 0000000000..2bec463b9b
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java
@@ -0,0 +1,136 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+public class IcHouseDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 房屋主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小区id
+     */
+	private String neighborHoodId;
+
+    /**
+     * 片区id，neighbor_hood_part.id,可为空。
+     */
+	private String partId;
+
+    /**
+     * 所属楼栋id
+     */
+	private String buildingId;
+
+    /**
+     * 所属单元id
+     */
+	private String buildingUnitId;
+
+    /**
+     * 房屋名字后台插入时生成
+     */
+	private String houseName;
+
+    /**
+     * 门牌号
+     */
+	private String doorName;
+
+    /**
+     * 房屋类型，这里存储字典value就可以
+     */
+	private String houseType;
+
+    /**
+     * 存储字典value
+     */
+	private String purpose;
+
+    /**
+     * 1出租；0未出租
+     */
+	private Integer rentFlag;
+
+    /**
+     * 房主姓名
+     */
+	private String ownerName;
+
+    /**
+     * 房主电话
+     */
+	private String ownerPhone;
+
+    /**
+     * 房主身份证号
+     */
+	private String ownerIdCard;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
new file mode 100644
index 0000000000..004c2312b4
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
@@ -0,0 +1,131 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 小区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+public class IcNeighborHoodDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小区名称
+     */
+	private String neighborHoodName;
+
+    /**
+     * 组织id
+     */
+	private String agencyId;
+
+    /**
+     * 上级组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 组织的所有上级组织id
+     */
+	private String agencyPids;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 详细地址
+     */
+	private String address;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+    /**
+     * 中心点位：经度
+     */
+	private String longitude;
+
+    /**
+     * 中心点位：纬度
+     */
+	private String latitude;
+
+    /**
+     * 坐标区域
+     */
+	private String coordinates;
+
+    /**
+     * 坐标位置
+     */
+	private String location;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPartDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPartDTO.java
new file mode 100644
index 0000000000..6d5ca4a3bc
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPartDTO.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 小区-分区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+public class IcNeighborHoodPartDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键,片区id
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小区id
+     */
+	private String neighborHoodId;
+
+    /**
+     * 名称，比如北区，南区
+     */
+	private String name;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPropertyDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPropertyDTO.java
new file mode 100644
index 0000000000..e889a21468
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodPropertyDTO.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 小区物业关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+public class IcNeighborHoodPropertyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区物业关系表
+     */
+	private String id;
+
+    /**
+     * 物业id
+     */
+	private String propertyId;
+
+    /**
+     * 小区id
+     */
+	private String neighborHoodId;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java
new file mode 100644
index 0000000000..732ff0d5ce
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 物业表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+public class IcPropertyManagementDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 物业id
+     */
+	private String id;
+
+    /**
+     * 物业名称
+     */
+	private String name;
+
+    /**
+     * 删除标识 0未删除、1已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java
new file mode 100644
index 0000000000..8fcf455279
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapAddAreaFormDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/10/25 9:54 上午
+ * @DESC
+ */
+@Data
+public class MapAddAreaFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2334704900459757549L;
+
+    public interface MapAddAreaForm{}
+
+    /**
+     * 类型，组织：agency，网格：grid,小区：neighborHood
+     */
+    @NotBlank(message = "level不能为空",groups = MapAddAreaForm.class)
+    private String level;
+
+    @NotBlank(message = "orgId不能为空",groups = MapAddAreaForm.class)
+    private String orgId;
+
+    @NotBlank(message = "coordinates不能为空",groups = MapAddAreaForm.class)
+    private String coordinates;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapDelAreaFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapDelAreaFormDTO.java
new file mode 100644
index 0000000000..efeaf5b0e2
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapDelAreaFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/10/25 9:23 上午
+ * @DESC
+ */
+@Data
+public class MapDelAreaFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -539570523818788293L;
+
+    public interface MapDelAreaForm{}
+
+    /**
+     * 类型，组织：agency，网格：grid,小区：neighborHood
+     */
+    @NotBlank(message = "level不能为空", groups = MapDelAreaForm.class)
+    private String level;
+
+    @NotBlank(message = "orgId不能为空", groups = MapDelAreaForm.class)
+    private String orgId;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapOrgFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapOrgFormDTO.java
new file mode 100644
index 0000000000..04ac916daa
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/MapOrgFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/10/25 10:40 上午
+ * @DESC
+ */
+@Data
+public class MapOrgFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2021388285115834510L;
+
+    /**
+     * 类型，组织：agency，网格：grid，小区：neighborHood
+     */
+    private String level;
+
+    /**
+     * 组织ID，默认不填写
+     */
+    private String orgId;
+
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapOrgResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapOrgResultDTO.java
new file mode 100644
index 0000000000..7f92e3bdc1
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapOrgResultDTO.java
@@ -0,0 +1,71 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/10/25 10:40 上午
+ * @DESC
+ */
+@Data
+public class MapOrgResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 7296300942981202725L;
+
+    /**
+     * 经度
+     */
+    @JsonIgnore
+    private String longitudeOrigin;
+
+    private BigDecimal longitude;
+
+    /**
+     * 纬度
+     */
+    @JsonIgnore
+    private String latitudeOrigin;
+
+    private BigDecimal latitude;
+
+    /**
+     * 组织或网格ID
+     */
+    private String id;
+
+    /**
+     * 组织或网格名字
+     */
+    private String name;
+
+    /**
+     * 类型，组织：agency，网格：grid，小区：neighborHood
+     */
+    private String level;
+
+    /**
+     * 坐标
+     */
+    private String coordinates;
+
+    /**
+     * 下级结果集
+     */
+    private List<MapSonOrgResultDTO> children;
+
+    public MapOrgResultDTO() {
+        this.longitudeOrigin = "";
+        this.latitudeOrigin = "";
+        this.id = "";
+        this.name = "";
+        this.level = "";
+        this.coordinates = "";
+        this.children = new ArrayList<>();
+    }
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java
new file mode 100644
index 0000000000..77cb78266c
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java
@@ -0,0 +1,64 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/10/25 10:40 上午
+ * @DESC
+ */
+@Data
+public class MapSonOrgResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 7296300942981202725L;
+
+    /**
+     * 经度
+     */
+    @JsonIgnore
+    private String longitudeOrigin;
+
+    private BigDecimal longitude;
+
+    /**
+     * 纬度
+     */
+    @JsonIgnore
+    private String latitudeOrigin;
+
+    private BigDecimal latitude;
+
+    /**
+     * 组织或网格ID
+     */
+    private String id;
+
+    /**
+     * 组织或网格名字
+     */
+    private String name;
+
+    /**
+     * 类型，组织：agency，网格：grid，小区：neighborHood
+     */
+    private String level;
+
+    /**
+     * 坐标
+     */
+    private String coordinates;
+
+    public MapSonOrgResultDTO() {
+        this.longitudeOrigin = "";
+        this.latitudeOrigin = "";
+        this.id = "";
+        this.name = "";
+        this.level = "";
+        this.coordinates = "";
+    }
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
index 112d6b8e35..5d3ecedfbe 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
@@ -27,10 +27,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constant.CustomerAgencyConstant;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.AddAgencyResultDTO;
-import com.epmet.dto.result.AgencyListResultDTO;
-import com.epmet.dto.result.AgencysResultDTO;
-import com.epmet.dto.result.SubAgencyResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.service.AgencyService;
 import com.epmet.service.CustomerAgencyService;
@@ -255,4 +252,42 @@ public class AgencyController {
         return new Result();
     }
 
+    /**
+     * @Description 【地图配置】删除
+     * @param formDTO
+     * @author zxc
+     * @date 2021/10/25 9:30 上午
+     */
+    @PostMapping("mapdelarea")
+    public Result mapDelArea(@RequestBody MapDelAreaFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, MapDelAreaFormDTO.MapDelAreaForm.class);
+        agencyService.mapDelArea(formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Description 【地图配置】新增
+     * @param formDTO
+     * @author zxc
+     * @date 2021/10/25 9:58 上午
+     */
+    @PostMapping("mapaddarea")
+    public Result mapAddArea(@RequestBody MapAddAreaFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, MapAddAreaFormDTO.MapAddAreaForm.class);
+        agencyService.mapAddArea(formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Description 【地图配置】组织查询
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/10/25 10:50 上午
+     */
+    @PostMapping("maporg")
+    public Result<MapOrgResultDTO> mapOrg(@RequestBody MapOrgFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        return new Result<MapOrgResultDTO>().ok(agencyService.mapOrg(formDTO,tokenDto));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingController.java
new file mode 100644
index 0000000000..aae2c36569
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingController.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.IcBuildingDTO;
+import com.epmet.service.IcBuildingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+/**
+ * 楼栋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@RestController
+@RequestMapping("icbuilding")
+public class IcBuildingController {
+    
+    @Autowired
+    private IcBuildingService icBuildingService;
+
+    @GetMapping("page")
+    public Result<PageData<IcBuildingDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcBuildingDTO> page = icBuildingService.page(params);
+        return new Result<PageData<IcBuildingDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcBuildingDTO> get(@PathVariable("id") String id){
+        IcBuildingDTO data = icBuildingService.get(id);
+        return new Result<IcBuildingDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcBuildingDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icBuildingService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcBuildingDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icBuildingService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icBuildingService.delete(ids);
+        return new Result();
+    }
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingUnitController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingUnitController.java
new file mode 100644
index 0000000000..93e3f11314
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingUnitController.java
@@ -0,0 +1,87 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcBuildingUnitDTO;
+import com.epmet.service.IcBuildingUnitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 楼栋单元信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@RestController
+@RequestMapping("icbuildingunit")
+public class IcBuildingUnitController {
+    
+    @Autowired
+    private IcBuildingUnitService icBuildingUnitService;
+
+    @GetMapping("page")
+    public Result<PageData<IcBuildingUnitDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcBuildingUnitDTO> page = icBuildingUnitService.page(params);
+        return new Result<PageData<IcBuildingUnitDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcBuildingUnitDTO> get(@PathVariable("id") String id){
+        IcBuildingUnitDTO data = icBuildingUnitService.get(id);
+        return new Result<IcBuildingUnitDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcBuildingUnitDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icBuildingUnitService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcBuildingUnitDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icBuildingUnitService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icBuildingUnitService.delete(ids);
+        return new Result();
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
new file mode 100644
index 0000000000..5d649ce45b
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.IcHouseDTO;
+import com.epmet.service.IcHouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@RestController
+@RequestMapping("ichouse")
+public class IcHouseController {
+    
+    @Autowired
+    private IcHouseService icHouseService;
+
+    @GetMapping("page")
+    public Result<PageData<IcHouseDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcHouseDTO> page = icHouseService.page(params);
+        return new Result<PageData<IcHouseDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcHouseDTO> get(@PathVariable("id") String id){
+        IcHouseDTO data = icHouseService.get(id);
+        return new Result<IcHouseDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcHouseDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icHouseService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcHouseDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icHouseService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icHouseService.delete(ids);
+        return new Result();
+    }
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
new file mode 100644
index 0000000000..0cf22c6da7
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
@@ -0,0 +1,87 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcNeighborHoodDTO;
+import com.epmet.service.IcNeighborHoodService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 小区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@RestController
+@RequestMapping("icneighborhood")
+public class IcNeighborHoodController {
+    
+    @Autowired
+    private IcNeighborHoodService icNeighborHoodService;
+
+    @GetMapping("page")
+    public Result<PageData<IcNeighborHoodDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcNeighborHoodDTO> page = icNeighborHoodService.page(params);
+        return new Result<PageData<IcNeighborHoodDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcNeighborHoodDTO> get(@PathVariable("id") String id){
+        IcNeighborHoodDTO data = icNeighborHoodService.get(id);
+        return new Result<IcNeighborHoodDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcNeighborHoodDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icNeighborHoodService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcNeighborHoodDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icNeighborHoodService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icNeighborHoodService.delete(ids);
+        return new Result();
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodPartController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodPartController.java
new file mode 100644
index 0000000000..1059863233
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodPartController.java
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.IcNeighborHoodPartDTO;
+import com.epmet.service.IcNeighborHoodPartService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+/**
+ * 小区-分区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@RestController
+@RequestMapping("icneighborhoodpart")
+public class IcNeighborHoodPartController {
+    
+    @Autowired
+    private IcNeighborHoodPartService icNeighborHoodPartService;
+
+    @GetMapping("page")
+    public Result<PageData<IcNeighborHoodPartDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcNeighborHoodPartDTO> page = icNeighborHoodPartService.page(params);
+        return new Result<PageData<IcNeighborHoodPartDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcNeighborHoodPartDTO> get(@PathVariable("id") String id){
+        IcNeighborHoodPartDTO data = icNeighborHoodPartService.get(id);
+        return new Result<IcNeighborHoodPartDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcNeighborHoodPartDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icNeighborHoodPartService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcNeighborHoodPartDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icNeighborHoodPartService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icNeighborHoodPartService.delete(ids);
+        return new Result();
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodPropertyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodPropertyController.java
new file mode 100644
index 0000000000..e5d0e61093
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodPropertyController.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.IcNeighborHoodPropertyDTO;
+import com.epmet.service.IcNeighborHoodPropertyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+/**
+ * 小区物业关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@RestController
+@RequestMapping("icneighborhoodproperty")
+public class IcNeighborHoodPropertyController {
+    
+    @Autowired
+    private IcNeighborHoodPropertyService icNeighborHoodPropertyService;
+
+    @GetMapping("page")
+    public Result<PageData<IcNeighborHoodPropertyDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcNeighborHoodPropertyDTO> page = icNeighborHoodPropertyService.page(params);
+        return new Result<PageData<IcNeighborHoodPropertyDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcNeighborHoodPropertyDTO> get(@PathVariable("id") String id){
+        IcNeighborHoodPropertyDTO data = icNeighborHoodPropertyService.get(id);
+        return new Result<IcNeighborHoodPropertyDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcNeighborHoodPropertyDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icNeighborHoodPropertyService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcNeighborHoodPropertyDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icNeighborHoodPropertyService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icNeighborHoodPropertyService.delete(ids);
+        return new Result();
+    }
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPropertyManagementController.java
new file mode 100644
index 0000000000..baa7c40fc4
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPropertyManagementController.java
@@ -0,0 +1,87 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcPropertyManagementDTO;
+import com.epmet.service.IcPropertyManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 物业表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@RestController
+@RequestMapping("icpropertymanagement")
+public class IcPropertyManagementController {
+    
+    @Autowired
+    private IcPropertyManagementService icPropertyManagementService;
+
+    @GetMapping("page")
+    public Result<PageData<IcPropertyManagementDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcPropertyManagementDTO> page = icPropertyManagementService.page(params);
+        return new Result<PageData<IcPropertyManagementDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcPropertyManagementDTO> get(@PathVariable("id") String id){
+        IcPropertyManagementDTO data = icPropertyManagementService.get(id);
+        return new Result<IcPropertyManagementDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcPropertyManagementDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icPropertyManagementService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcPropertyManagementDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icPropertyManagementService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icPropertyManagementService.delete(ids);
+        return new Result();
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 145178f50f..3f98a2f847 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -243,4 +243,32 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
     AgencyTreeResultDTO getAllAgency(@Param("customerId") String customerId);
 
     List<AgencyTreeResultDTO> getSubAgencyList(@Param("pid") String pid);
+
+    /**
+     * @Description  【地图配置】删除
+     * @param orgId
+     * @param level
+     * @author zxc
+     * @date 2021/10/25 9:39 上午
+     */
+    void delMapArea(@Param("orgId") String orgId, @Param("level") String level);
+
+    /**
+     * @Description 【地图配置】新增
+     * @param orgId
+     * @param level
+     * @param coordinates
+     * @author zxc
+     * @date 2021/10/25 9:59 上午
+     */
+    void addMapArea(@Param("orgId") String orgId, @Param("level") String level,@Param("coordinates")String coordinates);
+
+    /**
+     * @Description  地图查询下级组织
+     * @param pid
+     * @param type
+     * @author zxc
+     * @date 2021/10/25 2:30 下午
+     */
+    List<MapSonOrgResultDTO> selectSonOrg(@Param("pid")String pid,@Param("type")String type);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
new file mode 100644
index 0000000000..d800bb6761
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcBuildingEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 楼栋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Mapper
+public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java
new file mode 100644
index 0000000000..69465df911
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcBuildingUnitEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 楼栋单元信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Mapper
+public interface IcBuildingUnitDao extends BaseDao<IcBuildingUnitEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
new file mode 100644
index 0000000000..e8c196935d
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcHouseEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Mapper
+public interface IcHouseDao extends BaseDao<IcHouseEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
new file mode 100644
index 0000000000..1635ddcce2
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcNeighborHoodEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 小区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Mapper
+public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPartDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPartDao.java
new file mode 100644
index 0000000000..6b0154f538
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPartDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcNeighborHoodPartEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 小区-分区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Mapper
+public interface IcNeighborHoodPartDao extends BaseDao<IcNeighborHoodPartEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java
new file mode 100644
index 0000000000..79a71a11b8
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcNeighborHoodPropertyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 小区物业关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Mapper
+public interface IcNeighborHoodPropertyDao extends BaseDao<IcNeighborHoodPropertyEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java
new file mode 100644
index 0000000000..545bb0c601
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcPropertyManagementEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 物业表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Mapper
+public interface IcPropertyManagementDao extends BaseDao<IcPropertyManagementEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
index ee327e421e..ff51b54c01 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
@@ -108,4 +108,19 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	 * 【社区】名称0409
 	 */
 	private String community;
+
+	/**
+	 * 坐标
+	 */
+	private String coordinates;
+
+	/**
+	 * 中心位置经度
+	 */
+	private String longitude;
+
+	/**
+	 * 中心位置纬度
+	 */
+	private String latitude;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java
index 26d0cd84af..75674491f7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java
@@ -79,4 +79,9 @@ public class CustomerGridEntity extends BaseEpmetEntity {
 	 * 所有上级组织ID
 	 */
 	private String pids;
+
+	/**
+	 * 坐标
+	 */
+	private String coordinates;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java
new file mode 100644
index 0000000000..b4d4811caa
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java
@@ -0,0 +1,98 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 楼栋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_building")
+public class IcBuildingEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小区id
+     */
+	private String neighborHoodId;
+
+    /**
+     * 片区id，neighbor_hood_part.id,可为空。
+     */
+	private String partId;
+
+    /**
+     * 楼栋名称
+     */
+	private String buildingName;
+
+    /**
+     * 楼栋类型，这里存储字典编码就可以
+     */
+	private String type;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 总单元数
+     */
+	private Integer totalUnitNum;
+
+    /**
+     * 总楼层总数
+     */
+	private Integer totalFloorNum;
+
+    /**
+     * 总户数
+     */
+	private Integer totalHouseNum;
+
+    /**
+     * 中心点位：经度
+     */
+	private String longitude;
+
+    /**
+     * 中心点位：纬度
+     */
+	private String latitude;
+
+    /**
+     * 坐标位置
+     */
+	private String coordinatePosition;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingUnitEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingUnitEntity.java
new file mode 100644
index 0000000000..d7212ff143
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingUnitEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 楼栋单元信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_building_unit")
+public class IcBuildingUnitEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 楼宇id
+     */
+	private String buildingId;
+
+    /**
+     * 单元号：1，2，3??
+     */
+	private String unitNum;
+
+    /**
+     * 单元名
+     */
+	private String unitName;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
new file mode 100644
index 0000000000..4861c69271
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_house")
+public class IcHouseEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小区id
+     */
+	private String neighborHoodId;
+
+    /**
+     * 片区id，neighbor_hood_part.id,可为空。
+     */
+	private String partId;
+
+    /**
+     * 所属楼栋id
+     */
+	private String buildingId;
+
+    /**
+     * 所属单元id
+     */
+	private String buildingUnitId;
+
+    /**
+     * 房屋名字后台插入时生成
+     */
+	private String houseName;
+
+    /**
+     * 门牌号
+     */
+	private String doorName;
+
+    /**
+     * 房屋类型，这里存储字典value就可以
+     */
+	private String houseType;
+
+    /**
+     * 存储字典value
+     */
+	private String purpose;
+
+    /**
+     * 1出租；0未出租
+     */
+	private Integer rentFlag;
+
+    /**
+     * 房主姓名
+     */
+	private String ownerName;
+
+    /**
+     * 房主电话
+     */
+	private String ownerPhone;
+
+    /**
+     * 房主身份证号
+     */
+	private String ownerIdCard;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java
new file mode 100644
index 0000000000..62489898d2
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 小区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_neighbor_hood")
+public class IcNeighborHoodEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小区名称
+     */
+	private String neighborHoodName;
+
+    /**
+     * 组织id
+     */
+	private String agencyId;
+
+    /**
+     * 上级组织id
+     */
+	private String parentAgencyId;
+
+    /**
+     * 组织的所有上级组织id
+     */
+	private String agencyPids;
+
+    /**
+     * 网格id
+     */
+	private String gridId;
+
+    /**
+     * 详细地址
+     */
+	private String address;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+    /**
+     * 中心点位：经度
+     */
+	private String longitude;
+
+    /**
+     * 中心点位：纬度
+     */
+	private String latitude;
+
+    /**
+     * 坐标区域
+     */
+	private String coordinates;
+
+    /**
+     * 坐标位置
+     */
+	private String location;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPartEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPartEntity.java
new file mode 100644
index 0000000000..5f9929c5f4
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPartEntity.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 小区-分区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_neighbor_hood_part")
+public class IcNeighborHoodPartEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小区id
+     */
+	private String neighborHoodId;
+
+    /**
+     * 名称，比如北区，南区
+     */
+	private String name;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPropertyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPropertyEntity.java
new file mode 100644
index 0000000000..19827d15bf
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodPropertyEntity.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 小区物业关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_neighbor_hood_property")
+public class IcNeighborHoodPropertyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 物业id
+     */
+	private String propertyId;
+
+    /**
+     * 小区id
+     */
+	private String neighborHoodId;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java
new file mode 100644
index 0000000000..68dd3a349e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 物业表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_property_management")
+public class IcPropertyManagementEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 物业名称
+     */
+	private String name;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
index 381fb7256a..b0153239fd 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
@@ -17,13 +17,11 @@
 
 package com.epmet.service;
 
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.AddAgencyResultDTO;
-import com.epmet.dto.result.AgencyListResultDTO;
-import com.epmet.dto.result.AgencysResultDTO;
-import com.epmet.dto.result.SubAgencyResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 
 import java.util.List;
@@ -117,4 +115,28 @@ public interface AgencyService {
      */
     AddAgencyResultDTO addAgencyV2(AddAgencyV2FormDTO formDTO);
 
+    /**
+     * @Description 【地图配置】删除
+     * @param formDTO
+     * @author zxc
+     * @date 2021/10/25 9:30 上午
+     */
+    void mapDelArea(MapDelAreaFormDTO formDTO);
+
+    /**
+     * @Description 【地图配置】新增
+     * @param formDTO
+     * @author zxc
+     * @date 2021/10/25 9:58 上午
+     */
+    void mapAddArea(MapAddAreaFormDTO formDTO);
+
+    /**
+     * @Description 【地图配置】组织查询
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/10/25 10:50 上午
+     */
+    MapOrgResultDTO mapOrg(MapOrgFormDTO formDTO, TokenDto tokenDto);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
new file mode 100644
index 0000000000..afe8f11567
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcBuildingDTO;
+import com.epmet.entity.IcBuildingEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 楼栋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+public interface IcBuildingService extends BaseService<IcBuildingEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcBuildingDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    PageData<IcBuildingDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcBuildingDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    List<IcBuildingDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcBuildingDTO
+     * @author generator
+     * @date 2021-10-25
+     */
+    IcBuildingDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void save(IcBuildingDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void update(IcBuildingDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingUnitService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingUnitService.java
new file mode 100644
index 0000000000..59b1546ed3
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingUnitService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcBuildingUnitDTO;
+import com.epmet.entity.IcBuildingUnitEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 楼栋单元信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+public interface IcBuildingUnitService extends BaseService<IcBuildingUnitEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcBuildingUnitDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    PageData<IcBuildingUnitDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcBuildingUnitDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    List<IcBuildingUnitDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcBuildingUnitDTO
+     * @author generator
+     * @date 2021-10-25
+     */
+    IcBuildingUnitDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void save(IcBuildingUnitDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void update(IcBuildingUnitDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
new file mode 100644
index 0000000000..e59122f103
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcHouseDTO;
+import com.epmet.entity.IcHouseEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+public interface IcHouseService extends BaseService<IcHouseEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcHouseDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    PageData<IcHouseDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcHouseDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    List<IcHouseDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcHouseDTO
+     * @author generator
+     * @date 2021-10-25
+     */
+    IcHouseDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void save(IcHouseDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void update(IcHouseDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodPartService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodPartService.java
new file mode 100644
index 0000000000..787f8a534a
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodPartService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcNeighborHoodPartDTO;
+import com.epmet.entity.IcNeighborHoodPartEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小区-分区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+public interface IcNeighborHoodPartService extends BaseService<IcNeighborHoodPartEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcNeighborHoodPartDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    PageData<IcNeighborHoodPartDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcNeighborHoodPartDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    List<IcNeighborHoodPartDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcNeighborHoodPartDTO
+     * @author generator
+     * @date 2021-10-25
+     */
+    IcNeighborHoodPartDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void save(IcNeighborHoodPartDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void update(IcNeighborHoodPartDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodPropertyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodPropertyService.java
new file mode 100644
index 0000000000..e9df133f87
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodPropertyService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcNeighborHoodPropertyDTO;
+import com.epmet.entity.IcNeighborHoodPropertyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小区物业关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+public interface IcNeighborHoodPropertyService extends BaseService<IcNeighborHoodPropertyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcNeighborHoodPropertyDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    PageData<IcNeighborHoodPropertyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcNeighborHoodPropertyDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    List<IcNeighborHoodPropertyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcNeighborHoodPropertyDTO
+     * @author generator
+     * @date 2021-10-25
+     */
+    IcNeighborHoodPropertyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void save(IcNeighborHoodPropertyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void update(IcNeighborHoodPropertyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
new file mode 100644
index 0000000000..15f4624cba
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcNeighborHoodDTO;
+import com.epmet.entity.IcNeighborHoodEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcNeighborHoodDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    PageData<IcNeighborHoodDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcNeighborHoodDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    List<IcNeighborHoodDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcNeighborHoodDTO
+     * @author generator
+     * @date 2021-10-25
+     */
+    IcNeighborHoodDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void save(IcNeighborHoodDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void update(IcNeighborHoodDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPropertyManagementService.java
new file mode 100644
index 0000000000..bc808af034
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPropertyManagementService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcPropertyManagementDTO;
+import com.epmet.entity.IcPropertyManagementEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 物业表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+public interface IcPropertyManagementService extends BaseService<IcPropertyManagementEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcPropertyManagementDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    PageData<IcPropertyManagementDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcPropertyManagementDTO>
+     * @author generator
+     * @date 2021-10-25
+     */
+    List<IcPropertyManagementDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcPropertyManagementDTO
+     * @author generator
+     * @date 2021-10-25
+     */
+    IcPropertyManagementDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void save(IcPropertyManagementDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void update(IcPropertyManagementDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-25
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index aa070f2d90..9da41f2e2c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -21,12 +21,16 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+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.Result;
 import com.epmet.constant.CustomerAgencyConstant;
+import com.epmet.constant.OrgInfoConstant;
 import com.epmet.constant.RoleKeyConstants;
 import com.epmet.dao.CustomerAgencyDao;
 import com.epmet.dao.CustomerGridDao;
@@ -35,6 +39,7 @@ import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
+import com.epmet.entity.CustomerGridEntity;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -52,6 +57,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -530,6 +536,97 @@ public class AgencyServiceImpl implements AgencyService {
         return resultDTO;
     }
 
+    /**
+     * @Description 【地图配置】删除
+     * @param formDTO
+     * @author zxc
+     * @date 2021/10/25 9:30 上午
+     */
+    @Override
+    public void mapDelArea(MapDelAreaFormDTO formDTO) {
+        customerAgencyDao.delMapArea(formDTO.getOrgId(),formDTO.getLevel());
+    }
+
+    /**
+     * @Description 【地图配置】新增
+     * @param formDTO
+     * @author zxc
+     * @date 2021/10/25 9:58 上午
+     */
+    @Override
+    public void mapAddArea(MapAddAreaFormDTO formDTO) {
+        customerAgencyDao.addMapArea(formDTO.getOrgId(), formDTO.getLevel(), formDTO.getCoordinates());
+    }
+
+    /**
+     * @Description 【地图配置】组织查询
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/10/25 10:50 上午
+     */
+    @Override
+    public MapOrgResultDTO mapOrg(MapOrgFormDTO formDTO, TokenDto tokenDto) {
+        MapOrgResultDTO result = new MapOrgResultDTO();
+        if (StringUtils.isBlank(formDTO.getOrgId())){
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+            formDTO.setOrgId(staffInfo.getFromOrgId());
+            formDTO.setLevel(staffInfo.getFromOrgType());
+        }
+        if (formDTO.getLevel().equals(OrgInfoConstant.AGENCY)){
+            CustomerAgencyEntity entity = customerAgencyDao.selectById(formDTO.getOrgId());
+            result = ConvertUtils.sourceToTarget(entity,MapOrgResultDTO.class);
+            result.setName(entity.getOrganizationName());
+            result.setLevel(formDTO.getLevel());
+            result.setLatitude(StringUtils.isBlank(entity.getLatitude()) ? null : new BigDecimal(entity.getLatitude()));
+            result.setLongitude(StringUtils.isBlank(entity.getLongitude()) ? null : new BigDecimal(entity.getLongitude()));
+            if (entity.getLevel().equals(OrgInfoConstant.COMMUNITY)){
+                List<MapSonOrgResultDTO> son = customerAgencyDao.selectSonOrg(formDTO.getOrgId(), OrgInfoConstant.GRID);
+                if (CollectionUtils.isNotEmpty(son)){
+                    son.forEach(s -> {
+                        s.setLatitude(StringUtils.isBlank(s.getLatitudeOrigin()) ? null : new BigDecimal(s.getLatitudeOrigin()));
+                        s.setLongitude(StringUtils.isBlank(s.getLongitudeOrigin()) ? null : new BigDecimal(s.getLongitudeOrigin()));
+                    });
+                }
+                result.setChildren(CollectionUtils.isEmpty(son) ? new ArrayList<>() : son);
+            }else {
+                List<MapSonOrgResultDTO> dtoList = new ArrayList<>();
+                List<MapSonOrgResultDTO> son = customerAgencyDao.selectSonOrg(formDTO.getOrgId(), OrgInfoConstant.AGENCY);
+                if (CollectionUtils.isNotEmpty(son)){
+                    dtoList.addAll(son);
+                }
+                // 直属网格
+                List<MapSonOrgResultDTO> directlySub = customerAgencyDao.selectSonOrg(formDTO.getOrgId(), OrgInfoConstant.GRID);
+                if (CollectionUtils.isNotEmpty(directlySub)){
+                    dtoList.addAll(directlySub);
+                }
+                if (CollectionUtils.isNotEmpty(dtoList)){
+                    dtoList.forEach(d -> {
+                        d.setLatitude(StringUtils.isBlank(d.getLatitudeOrigin()) ? null : new BigDecimal(d.getLatitudeOrigin()));
+                        d.setLongitude(StringUtils.isBlank(d.getLongitudeOrigin()) ? null : new BigDecimal(d.getLongitudeOrigin()));
+                    });
+                }
+                result.setChildren(dtoList);
+            }
+        }else if (formDTO.getLevel().equals(OrgInfoConstant.GRID)){
+            CustomerGridEntity entity = customerGridDao.selectById(formDTO.getOrgId());
+            result = ConvertUtils.sourceToTarget(entity,MapOrgResultDTO.class);
+            result.setName(entity.getGridName());
+            result.setLevel(formDTO.getLevel());
+            result.setLatitude(StringUtils.isBlank(entity.getLatitude()) ? null : new BigDecimal(entity.getLatitude()));
+            result.setLongitude(StringUtils.isBlank(entity.getLongitude()) ? null : new BigDecimal(entity.getLongitude()));
+            List<MapSonOrgResultDTO> son = customerAgencyDao.selectSonOrg(formDTO.getOrgId(), OrgInfoConstant.NEIGHBOR_HOOD);
+            if (CollectionUtils.isNotEmpty(son)){
+                son.forEach(s -> {
+                    s.setLatitude(StringUtils.isBlank(s.getLatitudeOrigin()) ? null : new BigDecimal(s.getLatitudeOrigin()));
+                    s.setLongitude(StringUtils.isBlank(s.getLongitudeOrigin()) ? null : new BigDecimal(s.getLongitudeOrigin()));
+                });
+            }
+            result.setChildren(CollectionUtils.isEmpty(son) ? new ArrayList<>() : son);
+        }
+        return result;
+    }
+
     private CustomerAgencyEntity constructInsertEntity(AddAgencyV2FormDTO formDTO, CustomerAgencyDTO parent) {
         CustomerAgencyEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class);
         insertEntity.setOrganizationName(formDTO.getAgencyName());
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
new file mode 100644
index 0000000000..5a4c3ae38c
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IcBuildingDao;
+import com.epmet.dto.IcBuildingDTO;
+import com.epmet.entity.IcBuildingEntity;
+import com.epmet.service.IcBuildingService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 楼栋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Service
+public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuildingEntity> implements IcBuildingService {
+
+
+    @Override
+    public PageData<IcBuildingDTO> page(Map<String, Object> params) {
+        IPage<IcBuildingEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcBuildingDTO.class);
+    }
+
+    @Override
+    public List<IcBuildingDTO> list(Map<String, Object> params) {
+        List<IcBuildingEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcBuildingDTO.class);
+    }
+
+    private QueryWrapper<IcBuildingEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcBuildingEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcBuildingDTO get(String id) {
+        IcBuildingEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcBuildingDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcBuildingDTO dto) {
+        IcBuildingEntity entity = ConvertUtils.sourceToTarget(dto, IcBuildingEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcBuildingDTO dto) {
+        IcBuildingEntity entity = ConvertUtils.sourceToTarget(dto, IcBuildingEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java
new file mode 100644
index 0000000000..c5cc404638
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IcBuildingUnitDao;
+import com.epmet.dto.IcBuildingUnitDTO;
+import com.epmet.entity.IcBuildingUnitEntity;
+import com.epmet.service.IcBuildingUnitService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 楼栋单元信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Service
+public class IcBuildingUnitServiceImpl extends BaseServiceImpl<IcBuildingUnitDao, IcBuildingUnitEntity> implements IcBuildingUnitService {
+
+
+    @Override
+    public PageData<IcBuildingUnitDTO> page(Map<String, Object> params) {
+        IPage<IcBuildingUnitEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcBuildingUnitDTO.class);
+    }
+
+    @Override
+    public List<IcBuildingUnitDTO> list(Map<String, Object> params) {
+        List<IcBuildingUnitEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcBuildingUnitDTO.class);
+    }
+
+    private QueryWrapper<IcBuildingUnitEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcBuildingUnitEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcBuildingUnitDTO get(String id) {
+        IcBuildingUnitEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcBuildingUnitDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcBuildingUnitDTO dto) {
+        IcBuildingUnitEntity entity = ConvertUtils.sourceToTarget(dto, IcBuildingUnitEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcBuildingUnitDTO dto) {
+        IcBuildingUnitEntity entity = ConvertUtils.sourceToTarget(dto, IcBuildingUnitEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
new file mode 100644
index 0000000000..db80c7ee31
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IcHouseDao;
+import com.epmet.dto.IcHouseDTO;
+import com.epmet.entity.IcHouseEntity;
+import com.epmet.service.IcHouseService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 房屋信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Service
+public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntity> implements IcHouseService {
+
+
+    @Override
+    public PageData<IcHouseDTO> page(Map<String, Object> params) {
+        IPage<IcHouseEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcHouseDTO.class);
+    }
+
+    @Override
+    public List<IcHouseDTO> list(Map<String, Object> params) {
+        List<IcHouseEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcHouseDTO.class);
+    }
+
+    private QueryWrapper<IcHouseEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcHouseEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcHouseDTO get(String id) {
+        IcHouseEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcHouseDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcHouseDTO dto) {
+        IcHouseEntity entity = ConvertUtils.sourceToTarget(dto, IcHouseEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcHouseDTO dto) {
+        IcHouseEntity entity = ConvertUtils.sourceToTarget(dto, IcHouseEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPartServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPartServiceImpl.java
new file mode 100644
index 0000000000..b9b3fc4a24
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPartServiceImpl.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IcNeighborHoodPartDao;
+import com.epmet.dto.IcNeighborHoodPartDTO;
+import com.epmet.entity.IcNeighborHoodPartEntity;
+import com.epmet.service.IcNeighborHoodPartService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小区-分区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Service
+public class IcNeighborHoodPartServiceImpl extends BaseServiceImpl<IcNeighborHoodPartDao, IcNeighborHoodPartEntity> implements IcNeighborHoodPartService {
+
+
+    @Override
+    public PageData<IcNeighborHoodPartDTO> page(Map<String, Object> params) {
+        IPage<IcNeighborHoodPartEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcNeighborHoodPartDTO.class);
+    }
+
+    @Override
+    public List<IcNeighborHoodPartDTO> list(Map<String, Object> params) {
+        List<IcNeighborHoodPartEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcNeighborHoodPartDTO.class);
+    }
+
+    private QueryWrapper<IcNeighborHoodPartEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcNeighborHoodPartEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcNeighborHoodPartDTO get(String id) {
+        IcNeighborHoodPartEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcNeighborHoodPartDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcNeighborHoodPartDTO dto) {
+        IcNeighborHoodPartEntity entity = ConvertUtils.sourceToTarget(dto, IcNeighborHoodPartEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcNeighborHoodPartDTO dto) {
+        IcNeighborHoodPartEntity entity = ConvertUtils.sourceToTarget(dto, IcNeighborHoodPartEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPropertyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPropertyServiceImpl.java
new file mode 100644
index 0000000000..d4f877114a
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodPropertyServiceImpl.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IcNeighborHoodPropertyDao;
+import com.epmet.dto.IcNeighborHoodPropertyDTO;
+import com.epmet.entity.IcNeighborHoodPropertyEntity;
+import com.epmet.service.IcNeighborHoodPropertyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小区物业关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Service
+public class IcNeighborHoodPropertyServiceImpl extends BaseServiceImpl<IcNeighborHoodPropertyDao, IcNeighborHoodPropertyEntity> implements IcNeighborHoodPropertyService {
+
+
+    @Override
+    public PageData<IcNeighborHoodPropertyDTO> page(Map<String, Object> params) {
+        IPage<IcNeighborHoodPropertyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcNeighborHoodPropertyDTO.class);
+    }
+
+    @Override
+    public List<IcNeighborHoodPropertyDTO> list(Map<String, Object> params) {
+        List<IcNeighborHoodPropertyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcNeighborHoodPropertyDTO.class);
+    }
+
+    private QueryWrapper<IcNeighborHoodPropertyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcNeighborHoodPropertyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcNeighborHoodPropertyDTO get(String id) {
+        IcNeighborHoodPropertyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcNeighborHoodPropertyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcNeighborHoodPropertyDTO dto) {
+        IcNeighborHoodPropertyEntity entity = ConvertUtils.sourceToTarget(dto, IcNeighborHoodPropertyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcNeighborHoodPropertyDTO dto) {
+        IcNeighborHoodPropertyEntity entity = ConvertUtils.sourceToTarget(dto, IcNeighborHoodPropertyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
new file mode 100644
index 0000000000..1585fe99e4
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IcNeighborHoodDao;
+import com.epmet.dto.IcNeighborHoodDTO;
+import com.epmet.entity.IcNeighborHoodEntity;
+import com.epmet.service.IcNeighborHoodService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小区表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Service
+public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao, IcNeighborHoodEntity> implements IcNeighborHoodService {
+
+
+    @Override
+    public PageData<IcNeighborHoodDTO> page(Map<String, Object> params) {
+        IPage<IcNeighborHoodEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcNeighborHoodDTO.class);
+    }
+
+    @Override
+    public List<IcNeighborHoodDTO> list(Map<String, Object> params) {
+        List<IcNeighborHoodEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcNeighborHoodDTO.class);
+    }
+
+    private QueryWrapper<IcNeighborHoodEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcNeighborHoodEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcNeighborHoodDTO get(String id) {
+        IcNeighborHoodEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcNeighborHoodDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcNeighborHoodDTO dto) {
+        IcNeighborHoodEntity entity = ConvertUtils.sourceToTarget(dto, IcNeighborHoodEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcNeighborHoodDTO dto) {
+        IcNeighborHoodEntity entity = ConvertUtils.sourceToTarget(dto, IcNeighborHoodEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPropertyManagementServiceImpl.java
new file mode 100644
index 0000000000..4296911e8d
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPropertyManagementServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IcPropertyManagementDao;
+import com.epmet.dto.IcPropertyManagementDTO;
+import com.epmet.entity.IcPropertyManagementEntity;
+import com.epmet.service.IcPropertyManagementService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 物业表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-25
+ */
+@Service
+public class IcPropertyManagementServiceImpl extends BaseServiceImpl<IcPropertyManagementDao, IcPropertyManagementEntity> implements IcPropertyManagementService {
+
+
+    @Override
+    public PageData<IcPropertyManagementDTO> page(Map<String, Object> params) {
+        IPage<IcPropertyManagementEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcPropertyManagementDTO.class);
+    }
+
+    @Override
+    public List<IcPropertyManagementDTO> list(Map<String, Object> params) {
+        List<IcPropertyManagementEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcPropertyManagementDTO.class);
+    }
+
+    private QueryWrapper<IcPropertyManagementEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcPropertyManagementEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcPropertyManagementDTO get(String id) {
+        IcPropertyManagementEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcPropertyManagementDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcPropertyManagementDTO dto) {
+        IcPropertyManagementEntity entity = ConvertUtils.sourceToTarget(dto, IcPropertyManagementEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcPropertyManagementDTO dto) {
+        IcPropertyManagementEntity entity = ConvertUtils.sourceToTarget(dto, IcPropertyManagementEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.8__add_coordinates.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.8__add_coordinates.sql
new file mode 100644
index 0000000000..51e687031c
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.8__add_coordinates.sql
@@ -0,0 +1,4 @@
+alter table customer_agency add COLUMN LONGITUDE varchar(255) comment '经度' AFTER SYNC_FLAG;
+alter table customer_agency add COLUMN LATITUDE varchar(255) comment '纬度' AFTER LONGITUDE;
+alter table customer_agency add COLUMN COORDINATES text(0) comment '坐标区域' AFTER LATITUDE;
+alter table customer_grid add COLUMN COORDINATES text(0) comment '坐标区域' AFTER LATITUDE;
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 89a5df87f4..3dcb3a472e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -24,6 +24,44 @@
         ca.updated_time AS "updatedtime"
     </sql>
 
+    <!-- 【地图配置】新增 -->
+    <update id="addMapArea">
+        UPDATE
+        <if test='level == "agency" '>
+            customer_agency
+        </if>
+        <if test='level == "grid" '>
+            customer_grid
+        </if>
+        <if test='level == "neighborHood" '>
+            ic_neighbor_hood
+        </if>
+        SET
+        COORDINATES = #{coordinates},
+        UPDATED_TIME = NOW()
+        WHERE ID = #{orgId}
+        AND DEL_FLAG = '0'
+    </update>
+
+    <!-- 【地图配置】删除 -->
+    <update id="delMapArea">
+        UPDATE
+        <if test='level == "agency" '>
+            customer_agency
+        </if>
+        <if test='level == "grid" '>
+            customer_grid
+        </if>
+        <if test='level == "neighborHood" '>
+            ic_neighbor_hood
+        </if>
+        SET
+        COORDINATES = NULL,
+        UPDATED_TIME = NOW()
+        WHERE ID = #{orgId}
+        AND DEL_FLAG = '0'
+    </update>
+
     <!-- 查询客户对应的根级组织 -->
     <select id="selectStaffOrgList" parameterType="map" resultType="com.epmet.dto.result.StaffOrgsResultDTO">
         SELECT
@@ -539,4 +577,46 @@
             AND CUSTOMER_ID = #{customerId}
     </select>
 
+    <!-- 地图查询下级组织 -->
+    <select id="selectSonOrg" resultType="com.epmet.dto.result.MapSonOrgResultDTO">
+        SELECT
+            id,
+            <if test='type == "agency" '>
+                organization_name AS name,
+               'agency' AS level,
+            </if>
+            <if test='type == "grid" '>
+                grid_name AS name,
+               'grid' AS level,
+            </if>
+            <if test='type == "neighborHood" '>
+                neighbor_hood_name AS name,
+               'neighborHood' AS level,
+            </if>
+            IFNULL(longitude,'') AS longitudeOrigin,
+            IFNULL(latitude,'') AS latitudeOrigin,
+            IFNULL(coordinates,'') AS coordinates
+        FROM
+            <if test='type == "agency" '>
+                customer_agency
+            </if>
+            <if test='type == "grid" '>
+                customer_grid
+            </if>
+            <if test='type == "neighborHood" '>
+                ic_neighbor_hood
+            </if>
+        WHERE del_flag = 0
+            <if test='type == "agency" '>
+                AND pid = #{pid}
+            </if>
+            <if test='type == "grid" '>
+                AND pid = #{pid}
+            </if>
+            <if test='type == "neighborHood" '>
+                AND grid_id = #{pid}
+            </if>
+            order by created_time desc
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
new file mode 100644
index 0000000000..8d9249b655
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcBuildingDao">
+
+    <resultMap type="com.epmet.entity.IcBuildingEntity" id="icBuildingMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="neighborHoodId" column="NEIGHBOR_HOOD_ID"/>
+        <result property="partId" column="PART_ID"/>
+        <result property="buildingName" column="BUILDING_NAME"/>
+        <result property="type" column="TYPE"/>
+        <result property="sort" column="SORT"/>
+        <result property="totalUnitNum" column="TOTAL_UNIT_NUM"/>
+        <result property="totalFloorNum" column="TOTAL_FLOOR_NUM"/>
+        <result property="totalHouseNum" column="TOTAL_HOUSE_NUM"/>
+        <result property="longitude" column="LONGITUDE"/>
+        <result property="latitude" column="LATITUDE"/>
+        <result property="coordinatePosition" column="COORDINATE_POSITION"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml
new file mode 100644
index 0000000000..0ee38da368
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcBuildingUnitDao">
+
+    <resultMap type="com.epmet.entity.IcBuildingUnitEntity" id="icBuildingUnitMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="buildingId" column="BUILDING_ID"/>
+        <result property="unitNum" column="UNIT_NUM"/>
+        <result property="unitName" column="UNIT_NAME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
new file mode 100644
index 0000000000..25df6ce4a6
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcHouseDao">
+
+    <resultMap type="com.epmet.entity.IcHouseEntity" id="icHouseMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="neighborHoodId" column="NEIGHBOR_HOOD_ID"/>
+        <result property="partId" column="PART_ID"/>
+        <result property="buildingId" column="BUILDING_ID"/>
+        <result property="buildingUnitId" column="BUILDING_UNIT_ID"/>
+        <result property="houseName" column="HOUSE_NAME"/>
+        <result property="doorName" column="DOOR_NAME"/>
+        <result property="houseType" column="HOUSE_TYPE"/>
+        <result property="purpose" column="PURPOSE"/>
+        <result property="rentFlag" column="RENT_FLAG"/>
+        <result property="ownerName" column="OWNER_NAME"/>
+        <result property="ownerPhone" column="OWNER_PHONE"/>
+        <result property="ownerIdCard" column="OWNER_ID_CARD"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
new file mode 100644
index 0000000000..b76ab56c4b
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcNeighborHoodDao">
+
+    <resultMap type="com.epmet.entity.IcNeighborHoodEntity" id="icNeighborHoodMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="neighborHoodName" column="NEIGHBOR_HOOD_NAME"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="parentAgencyId" column="PARENT_AGENCY_ID"/>
+        <result property="agencyPids" column="AGENCY_PIDS"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="address" column="ADDRESS"/>
+        <result property="remark" column="REMARK"/>
+        <result property="longitude" column="LONGITUDE"/>
+        <result property="latitude" column="LATITUDE"/>
+        <result property="coordinates" column="COORDINATES"/>
+        <result property="location" column="LOCATION"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPartDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPartDao.xml
new file mode 100644
index 0000000000..8dd1ab5097
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPartDao.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcNeighborHoodPartDao">
+
+    <resultMap type="com.epmet.entity.IcNeighborHoodPartEntity" id="icNeighborHoodPartMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="neighborHoodId" column="NEIGHBOR_HOOD_ID"/>
+        <result property="name" column="NAME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml
new file mode 100644
index 0000000000..749861cc9a
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcNeighborHoodPropertyDao">
+
+    <resultMap type="com.epmet.entity.IcNeighborHoodPropertyEntity" id="icNeighborHoodPropertyMap">
+        <result property="id" column="ID"/>
+        <result property="propertyId" column="PROPERTY_ID"/>
+        <result property="neighborHoodId" column="NEIGHBOR_HOOD_ID"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml
new file mode 100644
index 0000000000..b1b707f456
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcPropertyManagementDao">
+
+    <resultMap type="com.epmet.entity.IcPropertyManagementEntity" id="icPropertyManagementMap">
+        <result property="id" column="ID"/>
+        <result property="name" column="NAME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
index 8068eda5cc..2a9e99acbf 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
@@ -24,9 +24,9 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
+import com.epmet.dto.basereport.result.EventInfoResultDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import com.epmet.opendata.dao.BaseDisputeProcessDao;
-import com.epmet.opendata.dto.BaseDisputeProcessDTO;
 import com.epmet.opendata.entity.BaseDisputeProcessEntity;
 import com.epmet.opendata.service.BaseDisputeProcessService;
 import com.epmet.opendata.service.ExDeptService;
@@ -61,12 +61,12 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
      */
     @Override
     public void getEventinfo(EventInfoFormDTO formDTO) {
-        Result<List<BaseDisputeProcessDTO>> result = dataStatisticalOpenFeignClient.getEventInfo(formDTO);
+        Result<List<EventInfoResultDTO>> result = dataStatisticalOpenFeignClient.getEventInfo(formDTO);
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
         Map<String, Integer> deptMap = exDeptService.getDeptMap();
-        List<BaseDisputeProcessDTO> list = result.getData();
+        List<EventInfoResultDTO> list = result.getData();
         if (CollectionUtils.isNotEmpty(list)) {
             List<BaseDisputeProcessEntity> entityList = ConvertUtils.sourceToTarget(list, BaseDisputeProcessEntity.class);
             entityList.forEach(item -> {
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
index 16dc58a61a..ba20d99170 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
@@ -46,13 +46,15 @@
         INSERT INTO ex_dept
         (
             dept_id_qx,
-            dept_name_qx
+            dept_name_qx,
+            grid_code
         )
         VALUES
         <foreach collection="list" item="i" separator=",">
             (
             #{i.deptIdQx},
-            #{i.deptNameQx}
+            #{i.deptNameQx},
+            #{i.gridCode}
             )
         </foreach>
         ON DUPLICATE KEY