Merge remote-tracking branch 'remotes/origin/dev_5big_coverage'

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.20__add_dict.sql

@@ -0,0 +1,12 @@
+
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000024', 'ic_danger_type', '危化品种类', '', '24', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17:23:27');
+
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4100000000000000000', '1000000000000000024', '爆炸品', '00', '0', '', '0', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4100000000000000001', '1000000000000000024', '压缩气体和液化气体', '01', '0', '', '1', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4100000000000000002', '1000000000000000024', '易燃液体', '02', '0', '', '2', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4100000000000000003', '1000000000000000024', '易燃固体、自燃物品和遇湿易燃物品', '03', '0', '', '3', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4100000000000000004', '1000000000000000024', '氧化剂和有机过氧化物', '04', '0', '', '4', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4100000000000000005', '1000000000000000024', '有毒品', '05', '0', '', '5', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4100000000000000006', '1000000000000000024', '放射性物品', '06', '0', '', '6', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17:23:27');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4100000000000000007', '1000000000000000024', '腐蚀品', '07', '0', '', '7', '0', '0', '', '2022-06-17 17:23:27', '', '2022-06-17 17:23:27');
+

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java

@@ -23,7 +23,7 @@ public class OptionResultDTO implements Serializable {
     private List<OptionResultDTO> children;
     private Boolean usableFlag;
     private String type;
-
+    private String pid;
 
     /**
      * desc:递归获取当前节点的 所有子节点

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java

@@ -0,0 +1,48 @@
+package com.epmet.commons.tools.enums;
+
+/**
+ * 五大图层字典表，placeType枚举
+ */
+public enum CoveragePlaceTypeEnum {
+
+    SUPERIOR_RESOURCE("superior_resource", "优势资源"),
+    DANGEROUS_CHEMICALS("dangerous_chemicals", "重点危化企业"),
+    ENTERPRISE_PATROL("enterprise_patrol", "企事业单位巡查"),
+    SPECIAL_RESI("special_resi", "特殊人群"),
+    CITY_MANAGEMENT("city_management", "城市管理"),
+    COMMUNITY_ORG("community_org", "社区自组织"),
+    PUBLIC_SERVICE("public_service", "公共服务"),
+    RESI("resi", "居民"),
+    PARTY_UNIT("party_unit", "联建单位"),
+    GROUP_RENT("group_rent", "群租房"),
+    EVENT("event", "事件(包括难点堵点)");
+
+    private final String code;
+    private final String name;
+
+
+    CoveragePlaceTypeEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static CoveragePlaceTypeEnum getEnum(String code) {
+        CoveragePlaceTypeEnum[] values = CoveragePlaceTypeEnum.values();
+        for (CoveragePlaceTypeEnum value : values) {
+            if (value.getCode().equals(code)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java

@@ -26,6 +26,7 @@ public enum DictTypeEnum {
     SELF_ORG_CATEGORY("self_org_category","社区自组织分类",15),
     IC_EVENT_SOURCE_TYPE("ic_event_source_type","事件管理",19),
     IC_SERVICE_TYPE("ic_service_type","服务类别",20),
+    IC_DANGER_TYPE("ic_danger_type","危化品种类",24),
     ;
 
     private final String code;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/SelfOrgCategoryEnum.java

@@ -19,6 +19,7 @@ public enum SelfOrgCategoryEnum {
     LYJLB("lyjlb", "老友俱乐部", "#8fc41e", 3),
     ZAXLD("zaxld", "治安巡逻队", "#00a1be", 4),
     OTHER("other", "其他", "#0067b6", 5),
+    YJDW("yjdw","应急队伍","#e5007f",6)
     ;
 
     private final String code;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -777,4 +777,18 @@ public class RedisKeys {
 		}
 		return rootPrefix.concat("lock:").concat(methodName);
 	}
+
+	/**
+	 * desc:获取更新 房屋内有居民数量的key
+	 * @param customerId
+	 * @return
+	 */
+	public static String getUpdateHouseResiNumer(String customerId) {
+		if (StringUtils.isBlank(customerId)){
+			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误");
+		}
+		return rootPrefix.concat("updateHouseResiNumber:").concat(customerId);
+	}
+
+
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/BuildingInfoCache.java

@@ -40,5 +40,15 @@ public class BuildingInfoCache implements Serializable {
     private String neighborHoodName;
     private String agencyId;
 
+    /**
+     * 维度
+     */
+    private String latitude;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
    // 后续用到啥再加吧........
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java

@@ -92,5 +92,13 @@ public class CustomerStaffInfoCache implements Serializable {
      * 所属部门
      */
     private List<IdAndNameDTO> deptList;
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
 
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java

@@ -1,6 +1,7 @@
 package com.epmet.commons.tools.utils;
 
 import com.alibaba.ttl.TransmittableThreadLocal;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
@@ -53,6 +54,38 @@ public class EpmetRequestHolder {
         return stringStringMap.get(headerName.toLowerCase());
     }
 
+    /**
+     * 当前登录人客户id
+     * @return
+     */
+    public static String getLoginUserCustomerId() {
+        return getHeader(AppClientConstant.CUSTOMER_ID);
+    }
+
+    /**
+     * 当前登录人user_id
+     * @return
+     */
+    public static String getLoginUserId() {
+        return getHeader(AppClientConstant.USER_ID);
+    }
+
+    /**
+     * 当前登录人app
+     * @return
+     */
+    public static String getLoginUserApp() {
+        return getHeader(AppClientConstant.APP);
+    }
+
+    /**
+     * 当前登录人client
+     * @return
+     */
+    public static String getLoginUserClient() {
+        return getHeader(AppClientConstant.CLIENT);
+    }
+
     /**
      * 获取所有
      * @return

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ObjectUtil.java

@@ -0,0 +1,66 @@
+package com.epmet.commons.tools.utils;
+
+import java.util.*;
+import java.lang.reflect.Field;
+
+public class ObjectUtil {
+    /**
+     * 对象字符串属性去空格
+     */
+    public static void objectToTrim(Object object) {
+        Map<String,String> map = new HashMap<>();
+        Field[] fields = getAllFields(object);
+        for (Field field : fields){
+            String type = field.getType().getCanonicalName();
+            if ("java.lang.String".equals(type)){
+                field.setAccessible(true);
+                Object getObject = null;
+
+                try {
+                    getObject = field.get(object);
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+
+                if (getObject != null) {
+                    String trim = getObject.toString().replace(" ","");
+                    map.put(field.getName(), trim);
+                }
+            }
+        }
+
+        for (Field field : fields) {
+            if (map.get(field.getName()) != null){
+                String s = map.get(field.getName());
+                field.setAccessible(true);
+                try {
+                    field.set(object, s);
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 获取子类和父类所有字段信息
+     */
+    private static Field[] getAllFields(Object object) {
+        Class clazz = object.getClass();
+
+        List<Field[]> fieldsList = new ArrayList<>();  // 保存属性对象数组到列表
+        while (clazz != null) {  // 遍历所有父类字节码对象
+            Field[] declaredFields = clazz.getDeclaredFields();  // 获取字节码对象的属性对象数组
+            fieldsList.add(declaredFields);
+
+            clazz = clazz.getSuperclass();  // 获得父类的字节码对象
+        }
+
+        List<Field> allFields = new ArrayList<>();
+        for (Field[] fields : fieldsList) {
+            allFields.addAll(Arrays.asList(fields));
+        }
+
+        return allFields.toArray(new Field[0]);
+    }
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java

@@ -37,4 +37,5 @@ public interface DataSourceConstant {
 
     String EPMET_T_DUCK = "epmettduck";
     String EPMETTDUCK="epmettduck";
+    String EPMET_HEART="heart";
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiInfoResultDTO.java

@@ -0,0 +1,13 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+
+/**
+ * 居民信息封装类
+ */
+@Data
+public class IcResiInfoResultDTO {
+    private String id;
+    private String name;
+    private String buildId;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffSelectResDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 工作人员下拉框
+ */
+@Data
+public class StaffSelectResDTO implements Serializable {
+
+    private String label;
+    private String value;
+    private String name;
+    private String mobile;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListFormDTO.java

@@ -0,0 +1,30 @@
+package com.epmet.dataaggre.dto.govorg.form;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 图层数据分析-数据列表
+ */
+@Data
+public class CoverageAnalisisDataListFormDTO {
+
+    /**
+     * 图层类型列表
+     */
+    private List<String> coverageTypes;
+
+    /**
+     * 分类key
+     */
+    private List<String> categoryKeys;
+
+    /**
+     * 搜索关键词
+     */
+    private String search;
+    private Integer pageNo = 1;
+    private Integer pageSize = 20;
+    private Boolean isPage = false;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTO.java

@@ -0,0 +1,43 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CoverageAnalisisDataListResultDTO {
+
+    private String id;
+    /**
+     * 分类key
+     */
+    private String categoryKey;
+
+    /**
+     * 类别名称
+     */
+    private String categoryName;
+
+    /**
+     * 场所类型
+     */
+    private String placeType;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     *维度
+     */
+    private String latitude;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/IcEnterisePatrolResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import lombok.Data;
+
+@Data
+public class IcEnterisePatrolResultDTO {
+    private String enterpriseId;
+    private String patrolId;
+    private String customerId;
+    private String gridId;
+    private String agencyId;
+    private String agencyPids;
+    private String placeType;
+    private String placeOrgName;
+    private String address;
+    private String longitude;
+    private String latitude;
+    private String mobile;
+    private String sourceType;
+}

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -242,6 +242,13 @@
                 <datasource.druid.epmettduck.username>epmet_tduck_user</datasource.druid.epmettduck.username>
                 <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
 
+                <!--heart-->
+                <datasource.druid.heart.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.heart.url>
+                <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
+                <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -367,6 +374,12 @@
                 <datasource.druid.epmettduck.username>epmet_tduck_user</datasource.druid.epmettduck.username>
                 <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
 
+                <datasource.druid.heart.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.heart.url>
+                <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
+                <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -492,6 +505,13 @@
                 <datasource.druid.epmettduck.username>epmet</datasource.druid.epmettduck.username>
                 <datasource.druid.epmettduck.password>elink@833066</datasource.druid.epmettduck.password>
 
+                <!--heart-->
+                <datasource.druid.heart.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.heart.url>
+                <datasource.druid.heart.username>epmet</datasource.druid.heart.username>
+                <datasource.druid.heart.password>elink@833066</datasource.druid.heart.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.10.150</spring.redis.host>
@@ -617,6 +637,13 @@
                 <datasource.druid.epmettduck.username>epmet_tduck</datasource.druid.epmettduck.username>
                 <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
 
+                <!--heart-->
+                <datasource.druid.heart.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.heart.url>
+                <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
+                <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java

@@ -0,0 +1,46 @@
+package com.epmet.dataaggre.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
+import com.epmet.dataaggre.service.CoverageService;
+import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 5大图层controller
+ */
+@RestController
+@RequestMapping("coverage")
+public class CoverageController {
+
+    @Autowired
+    private CoverageService coverageService;
+
+    /**
+     * 数据分析-数据列表
+     * @param input
+     * @return
+     */
+    @RequestMapping("dataList")
+    public Result<PageData<CoverageAnalisisDataListResultDTO>> dataList(@RequestBody CoverageAnalisisDataListFormDTO input) {
+        List<String> coverageTypes = input.getCoverageTypes();
+        List<String> categoryKeys = input.getCategoryKeys();
+        if (CollectionUtils.isEmpty(coverageTypes)) {
+            return new Result().ok(new PageData<>(new ArrayList<>(), 0));
+        }
+
+        PageData<CoverageAnalisisDataListResultDTO> page = coverageService.analysisDataList(coverageTypes, categoryKeys,
+                input.getSearch(), input.getPageNo(), input.getPageSize(), input.getIsPage());
+        return new Result<PageData<CoverageAnalisisDataListResultDTO>>().ok(page);
+    }
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -21,6 +21,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.beans.GridMemberDataAnalysisExcelExportBean;
+import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.form.*;
@@ -179,6 +180,18 @@ public class GovOrgController {
         return new Result<OrgStaffListResultDTO>().ok(govOrgService.staffList(formDTO));
     }
 
+    /**
+     * 组织下的工作人员 下拉框
+     *
+     * @param tokenDto
+     * @param agencyId
+     * @return
+     */
+    @PostMapping("staff-select-list/{agencyId}")
+    public Result<List<StaffSelectResDTO>> staffSelectList(@LoginUser TokenDto tokenDto, @PathVariable("agencyId") String agencyId) {
+        return new Result<List<StaffSelectResDTO>>().ok(govOrgService.staffSelectList(tokenDto.getCustomerId(), agencyId));
+    }
+
     /**
      * @Param formDTO
      * @Description 获取当前组织下的【组织添加的】工作人员 组织/部门/网格下人员列表

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java

@@ -20,6 +20,7 @@ package com.epmet.dataaggre.dao.epmetuser;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO;
 import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO;
 import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -71,4 +72,11 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
      * @author sun
      */
     CustomerStaffDTO selectByStaffId(@Param("staffId") String staffId);
+
+    /**
+     * 根据staffId查询姓名、手机号
+     * @param staffIds
+     * @return
+     */
+    List<StaffSelectResDTO> staffSelectList(@Param("staffIds") List<String> staffIds);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dataaggre.dao.epmetuser;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
 import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
 import com.epmet.dto.IcResiUserDTO;
@@ -46,4 +47,16 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @author sun
      */
     List<ProjectAnalysisResultDTO.Home> getHomeUserList(@Param("homeId") String homeId, @Param("icUserId") String icUserId);
+
+    List<IcResiInfoResultDTO> listSpecialResisBySpecialType(@Param("customerId") String customerId,
+                                                            @Param("agencyId") String agencyId,
+                                                            @Param("queryPids") String queryPids,
+                                                            @Param("categoryKey") String categoryKey,
+                                                            @Param("search") String search);
+
+    Integer countSpecialResisBySpecialType(@Param("customerId") String customerId,
+                                                            @Param("agencyId") String agencyId,
+                                                            @Param("queryPids") String queryPids,
+                                                            @Param("categoryKey") String categoryKey,
+                                                            @Param("search") String search);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java

@@ -0,0 +1,17 @@
+package com.epmet.dataaggre.dao.govorg;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.govorg.IcCityManagementEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 城市管理图层
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-16
+ */
+@Mapper
+public interface IcCityManagementDao extends BaseDao<IcCityManagementEntity> {
+
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryDictDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.govorg;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.govorg.IcCoverageCategoryDictEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 五大图层类别字典表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-16
+ */
+@Mapper
+public interface IcCoverageCategoryDictDao extends BaseDao<IcCoverageCategoryDictEntity> {
+	
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcDangerousChemicalsDao.java

@@ -0,0 +1,15 @@
+package com.epmet.dataaggre.dao.govorg;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.govorg.IcDangerousChemicalsEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 重点危化品企业
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-16
+ */
+@Mapper
+public interface IcDangerousChemicalsDao extends BaseDao<IcDangerousChemicalsEntity> {
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java

@@ -0,0 +1,42 @@
+package com.epmet.dataaggre.dao.govorg;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO;
+import com.epmet.dataaggre.entity.govorg.IcEnterprisePatrolRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 企事业单位巡查表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-17
+ */
+@Mapper
+public interface IcEnterprisePatrolRecordDao extends BaseDao<IcEnterprisePatrolRecordEntity> {
+    /**
+     * 企事业单位巡查计数
+     * @param customerId
+     * @param staffOrgIds
+     * @param search
+     * @param categoryKey
+     * @return
+     */
+    Integer countEnterprisePatrol(@Param("customerId") String customerId, @Param("agencyId") String agencyId,
+                                  @Param("staffOrgIds") String staffOrgIds, @Param("search") String search,
+                                  @Param("categoryKey") String categoryKey);
+
+    /**
+     * 企事业单位巡查列表
+     * @param customerId
+     * @param staffOrgIds
+     * @param search
+     * @param categoryKey
+     * @return
+     */
+    List<IcEnterisePatrolResultDTO> listEnterprisePatrol(@Param("customerId") String customerId, @Param("agencyId") String agencyId,
+                                                         @Param("staffOrgIds") String staffOrgIds, @Param("search") String search,
+                                                         @Param("categoryKey") String categoryKey);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java

@@ -0,0 +1,15 @@
+package com.epmet.dataaggre.dao.govorg;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.govorg.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> {
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcPublicServiceDao.java

@@ -0,0 +1,15 @@
+package com.epmet.dataaggre.dao.govorg;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.govorg.IcPublicServiceEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 公共服务图层
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-16
+ */
+@Mapper
+public interface IcPublicServiceDao extends BaseDao<IcPublicServiceEntity> {
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcSuperiorResourceDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dataaggre.dao.govorg;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.govorg.IcSuperiorResourceEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 优势资源管理
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-16
+ */
+@Mapper
+public interface IcSuperiorResourceDao extends BaseDao<IcSuperiorResourceEntity> {
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java

@@ -0,0 +1,15 @@
+package com.epmet.dataaggre.dao.govproject;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.govproject.IcEventEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 事件管理表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-17
+ */
+@Mapper
+public interface IcEventDao extends BaseDao<IcEventEntity> {
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java

@@ -0,0 +1,32 @@
+/**
+ * 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.dataaggre.dao.heart;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 社区自组织表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-18
+ */
+@Mapper
+public interface IcCommunitySelfOrganizationDao extends BaseDao<IcCommunitySelfOrganizationEntity> {
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcPartyUnitDao.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.dataaggre.dao.heart;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 联建单位
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-11-19
+ */
+@Mapper
+public interface IcPartyUnitDao extends BaseDao<IcPartyUnitEntity> {
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java

@@ -123,4 +123,14 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	 * 联系电话
 	 */
 	private String mobile;
+
+	/**
+	 * 中心位置经度
+	 */
+	private String longitude;
+
+	/**
+	 * 中心位置纬度
+	 */
+	private String latitude;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java

@@ -0,0 +1,76 @@
+package com.epmet.dataaggre.entity.govorg;
+
+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 2022-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_city_management")
+public class IcCityManagementEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 所属组织机构Id
+     */
+	private String agencyId;
+
+    /**
+     * agencyId的所有上级，包含自己
+     */
+	private String agencyIdPath;
+
+    /**
+     * 来源【新增:add 导入:import 】
+     */
+	private String sourceType;
+
+    /**
+     * 场所名称
+     */
+	private String name;
+
+    /**
+     * 场所分类【字典表ic_coverage_category_dict  key:city_management】
+     */
+	private String category;
+
+    /**
+     * 占地面积，单位平方公里
+     */
+	private String areaCovered;
+
+    /**
+     * 容纳人数
+     */
+	private Integer capacity;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java

@@ -0,0 +1,56 @@
+package com.epmet.dataaggre.entity.govorg;
+
+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 2022-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_coverage_category_dict")
+public class IcCoverageCategoryDictEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * default；或者customerId
+     */
+	private String customerId;
+
+    /**
+     * 类别key
+     */
+	private String categoryKey;
+
+    /**
+     * 名称
+     */
+	private String categoryName;
+
+    /**
+     * 所属场所类型；
+社区自组织：community_org;
+优势资源:superior_resource;
+城市管理：city_management；
+重点危化企业：dangerous_chemicals；
+公共服务：public_service
+     */
+	private String placeType;
+
+    /**
+     * 所属五大图层：zhzl：综合治理图层；yjcl：应急处置图层；aqsc：安全生产图层；csgl：城市管理图层；ggfw：公共服务图层
+     */
+	private String coverageType;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcDangerousChemicalsEntity.java

@@ -0,0 +1,91 @@
+package com.epmet.dataaggre.entity.govorg;
+
+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 2022-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_dangerous_chemicals")
+public class IcDangerousChemicalsEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 所属组织机构Id
+     */
+	private String agencyId;
+
+    /**
+     * agencyId的所有上级，包含自己
+     */
+	private String agencyIdPath;
+
+    /**
+     * 来源【新增:add 导入:import 】
+     */
+	private String sourceType;
+
+    /**
+     * 企业名称
+     */
+	private String name;
+
+    /**
+     * 企业类型【字典表ic_coverage_category_dict  key:dangerous_chemicals】
+     */
+	private String category;
+
+    /**
+     * 周边安全距离，单位公里
+     */
+	private String safeDistance;
+
+    /**
+     * 危化品种类【字典表 ic_danger_type】
+     */
+	private String dangerType;
+
+    /**
+     * 负责人姓名
+     */
+	private String principalName;
+
+    /**
+     * 负责人电话
+     */
+	private String principalMobile;
+
+    /**
+     * 经营地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcEnterprisePatrolRecordEntity.java

@@ -0,0 +1,68 @@
+package com.epmet.dataaggre.entity.govorg;
+
+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 2022-06-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_enterprise_patrol_record")
+public class IcEnterprisePatrolRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 企事业单位id
+     */
+	private String enterpriseId;
+
+    /**
+     * 巡查时间
+     */
+	private Date patrolTime;
+
+    /**
+     * 工作人员id
+     */
+	private String staffId;
+
+    /**
+     * 工作人员姓名
+     */
+	private String staffName;
+
+    /**
+     * 工作人员手机号
+     */
+	private String mobile;
+
+    /**
+     * 检查结果【0:合格 1:不合格】
+     */
+	private String result;
+
+    /**
+     * 隐患明细
+     */
+	private String detailed;
+
+    /**
+     * 拟复查时间
+     */
+	private Date reviewTime;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcHouseEntity.java

@@ -0,0 +1,134 @@
+/**
+ * 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.dataaggre.entity.govorg;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 房屋信息
+ *
+ * @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;
+
+	/**
+	 * 所属组织的PIDS，包括agency，grid
+	 */
+	private String orgIdPath;
+
+    /**
+     * 小区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 fullName;
+
+    /**
+     * 门牌号
+     */
+	private String doorName;
+
+    /**
+     * 房屋类型，这里存储字典value就可以
+     */
+	private String houseType;
+
+    /**
+     * 存储字典value
+     */
+	private String purpose;
+
+    /**
+     * 1：出租 0：自住  2：闲置 3：未出售
+     */
+	private Integer rentFlag;
+
+    /**
+     * 房主姓名
+     */
+	private String ownerName;
+
+    /**
+     * 房主电话
+     */
+	private String ownerPhone;
+
+    /**
+     * 房主身份证号
+     */
+	private String ownerIdCard;
+
+	/**
+	 * 排序
+	 */
+	private BigDecimal sort;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	/**
+	 * 房屋编码
+	 */
+	private String houseCode;
+	private String houseQrcodeUrl;
+	/**
+	 * 居住人数
+	 */
+	private Integer resiNumber;
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java

@@ -0,0 +1,76 @@
+package com.epmet.dataaggre.entity.govorg;
+
+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 2022-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_public_service")
+public class IcPublicServiceEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 所属组织机构Id
+     */
+	private String agencyId;
+
+    /**
+     * agencyId的所有上级，包含自己
+     */
+	private String agencyIdPath;
+
+    /**
+     * 来源【新增:add 导入:import 】
+     */
+	private String sourceType;
+
+    /**
+     * 场所名称
+     */
+	private String name;
+
+    /**
+     * 场所分类【字典表ic_coverage_category_dict  key:public_service】
+     */
+	private String category;
+
+    /**
+     * 占地面积，单位平方公里
+     */
+	private String areaCovered;
+
+    /**
+     * 容纳人数
+     */
+	private Integer capacity;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcSuperiorResourceEntity.java

@@ -0,0 +1,76 @@
+package com.epmet.dataaggre.entity.govorg;
+
+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 2022-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_superior_resource")
+public class IcSuperiorResourceEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 所属组织机构Id
+     */
+	private String agencyId;
+
+    /**
+     * agencyId的所有上级，包含自己
+     */
+	private String agencyIdPath;
+
+    /**
+     * 来源【新增:add 导入:import 】
+     */
+	private String sourceType;
+
+    /**
+     * 场所名称
+     */
+	private String name;
+
+    /**
+     * 场所分类【字典表ic_coverage_category_dict  key:superior_resource】
+     */
+	private String category;
+
+    /**
+     * 占地面积，单位平方公里
+     */
+	private String areaCovered;
+
+    /**
+     * 容纳人数
+     */
+	private Integer capacity;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/IcEventEntity.java

@@ -0,0 +1,178 @@
+package com.epmet.dataaggre.entity.govproject;
+
+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 2022-05-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_event")
+public class IcEventEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 事件所属的网格Id
+     */
+	private String gridId;
+
+    /**
+     * 网格的所属组织
+     */
+	private String agencyId;
+
+    /**
+     * 网格的所有组织Id
+     */
+	private String gridPids;
+
+    /**
+     * 报事的人【居民端/pc端居民Id】可为空
+     */
+	private String reportUserId;
+
+    /**
+     * 报事人姓名
+     */
+	private String name;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 反映渠道【字典表】
+     */
+	private String sourceType;
+
+	/**
+	 * 发生时间
+	 */
+	private Date happenTime;
+
+    /**
+     * 事件内容
+     */
+	private String eventContent;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 处理中：processing；已办结：closed_case
+     */
+	private String status;
+
+    /**
+     * 办结时间
+     */
+	private Date closeCaseTime;
+
+    /**
+     * 0:已回复 1:已转项目  2:已转需求
+     */
+	private String operationType;
+
+    /**
+     * 项目、需求ID
+     */
+	private String operationId;
+
+    /**
+     * 事件是否被阅读过;1已读；针对报事人待处理列表
+     */
+	private Integer readFlag;
+
+    /**
+     * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/转需求/办结更新为1; 
+     */
+	private Integer redDot;
+
+    /**
+     * 工作端的红点:展示1；不展示：0；【居民报事、回复更新为1】
+     */
+	private Integer govRedDot;
+
+    /**
+     * 最近一次操作时间（回复、立项、转需求、办结更新此列）
+     */
+	private Date latestOperatedTime;
+
+    /**
+     * 是否解决：已解决 resolved，未解决 un_solved
+     */
+	private String resolveStatus;
+
+    /**
+     * 结案说明
+     */
+	private String closeRemark;
+
+    /**
+     * 评论人
+     */
+	private String commentUserId;
+
+    /**
+     * 评论内容
+     */
+	private String satisfaction;
+
+    /**
+     * 评论时间
+     */
+	private Date commentTime;
+
+    /**
+     * 事件审核状态[涉及附件审核需要加的状态]（审核中：auditing； 
+		auto_passed: 自动通过；
+		review：结果不确定，需要人工审核；
+		block: 结果违规；
+		rejected：人工审核驳回;
+		approved：人工审核通过）
+     */
+	private String auditStatus;
+
+    /**
+     * 审核理由
+     */
+	private String auditReason;
+
+	/**
+	 * 是否标记难点堵点  0:否 1：是
+	 */
+	private String difficultPoint;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/heart/IcCommunitySelfOrganizationEntity.java

@@ -0,0 +1,115 @@
+/**
+ * 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.dataaggre.entity.heart;
+
+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-11-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_community_self_organization")
+public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String orgId;
+
+    /**
+     * 组织类型，agency：组织，grid：网格
+     */
+	private String orgType;
+
+    /**
+     * 组织ID的父级
+     */
+	private String pid;
+
+    /**
+     * org_id的所有上级
+     */
+	private String pids;
+
+    /**
+     * 组织名称
+     */
+	private String organizationName;
+
+    /**
+     * 分类，来源于字典表dictType=self_org_category;
+     */
+	private String categoryCode;
+
+    /**
+     * 组织人数
+     */
+	private Integer organizationPersonCount;
+
+    /**
+     * 负责人姓名
+     */
+	private String principalName;
+
+    /**
+     * 负责人电话
+     */
+	private String principalPhone;
+
+    /**
+     * 服务事项
+     */
+	private String serviceItem;
+
+    /**
+     * 社区自组织创建时间
+     */
+    private Date organizationCreatedTime;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/heart/IcPartyUnitEntity.java

@@ -0,0 +1,108 @@
+/**
+ * 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.dataaggre.entity.heart;
+
+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-11-19
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_party_unit")
+public class IcPartyUnitEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 组织ID
+     */
+	private String agencyId;
+
+    /**
+     *
+     */
+	private String pids;
+
+    /**
+     * 单位名称
+     */
+	private String unitName;
+
+    /**
+     * 分类 楼宇党建 两新组织 区域单位党建 机关直属部门 其他
+     */
+	private String type;
+
+    /**
+     * 服务事项 多选逗号隔开
+     */
+	private String serviceMatter;
+
+    /**
+     * 联系人
+     */
+	private String contact;
+
+    /**
+     * 联系电话
+     */
+	private String contactMobile;
+
+    /**
+     * 在职党员数
+     */
+	private Integer memberCount;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 中心位置经度
+     */
+	private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+	private String latitude;
+
+    /**
+     * 群众满意度
+     */
+	private String satisfaction;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java

@@ -0,0 +1,23 @@
+package com.epmet.dataaggre.service;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
+
+import java.util.List;
+
+/**
+ * 5大图层
+ */
+public interface CoverageService {
+    /**
+     * 图层，大屏数据分析，数据列表
+     * @param coverageTypes 图层列表
+     * @param categoryKeys 分类列表
+     * @param search 搜索关键词
+     * @param pageNo 页码
+     * @param pageSize 页面大小
+     * @return
+     */
+    PageData<CoverageAnalisisDataListResultDTO> analysisDataList(List<String> coverageTypes, List<String> categoryKeys,
+                                                                 String search, Integer pageNo, Integer pageSize, Boolean isPage);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java

@@ -192,4 +192,11 @@ public interface EpmetUserService {
      * @author sun
      */
     List<GridDateIdResultDTO> getGridDateRoutineWorkList(GridLivelyFormDTO formDTO);
+
+    /**
+     * 根据staffId查询姓名、手机号
+     * @param staffIds
+     * @return
+     */
+    List<StaffSelectResDTO> staffSelectList(List<String> staffIds);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java

@@ -0,0 +1,42 @@
+package com.epmet.dataaggre.service.epmetuser;
+
+import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
+import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
+
+import java.util.List;
+
+/**
+ * IC居民
+ */
+public interface IcResiService {
+
+    /**
+     * 5大图层，居民查询
+     * @param categoryKey 居民类别
+     * @param search 搜索关键词，姓名
+     * @param pageNo
+     * @param pageSize
+     * @param isPage
+     * @return
+     */
+    List<IcResiUserEntity> listResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search,
+                                                                 Integer pageNo, Integer pageSize, Boolean isPage);
+
+    Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search);
+
+    /**
+     * 使用特殊人群类别查询居民列表
+     * @param customerId
+     * @param queryPids
+     * @param categoryKey
+     * @param search
+     * @param pageNo
+     * @param pageSize
+     * @param isPage
+     * @return
+     */
+    List<IcResiInfoResultDTO> listSpecialResisBySpecialType(String customerId, String agencyId, String queryPids, String categoryKey, String search,
+                                                            Integer pageNo, Integer pageSize, Boolean isPage);
+
+    Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -827,5 +827,19 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         return staffPatrolRecordDao.gridDateRoutineWorkList(formDTO);
     }
 
+    /**
+     * 根据staffId查询姓名、手机号
+     *
+     * @param staffIds
+     * @return
+     */
+    @Override
+    public List<StaffSelectResDTO> staffSelectList(List<String> staffIds) {
+        if(CollectionUtils.isEmpty(staffIds)){
+            return new ArrayList<>();
+        }
+        return customerStaffDao.staffSelectList(staffIds);
+    }
+
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java

@@ -0,0 +1,100 @@
+package com.epmet.dataaggre.service.epmetuser.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.epmetuser.IcResiUserDao;
+import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
+import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
+import com.epmet.dataaggre.service.epmetuser.IcResiService;
+import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@DataSource(value = DataSourceConstant.EPMET_USER)
+@Service
+public class IcResiServiceImpl implements IcResiService {
+
+    @Autowired
+    private IcResiUserDao resiUserDao;
+
+    /**
+     * 5大图层，居民查询
+     * @param categoryKey 居民类别
+     * @param search 搜索关键词，姓名
+     * @param pageNo
+     * @param pageSize
+     * @param isPage
+     * @return
+     */
+    @Override
+    public List<IcResiUserEntity> listResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search,
+                                                     Integer pageNo, Integer pageSize, Boolean isPage) {
+        if (isPage) {
+            PageHelper.startPage(pageNo, pageSize);
+        }
+
+        LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search);
+        query.orderByAsc(IcResiUserEntity::getCreatedTime);
+        return resiUserDao.selectList(query);
+    }
+
+    /**
+     * 根据条件查询数量
+     * @param customerId
+     * @param agencyId
+     * @param queryPids
+     * @param categoryKey
+     * @param search
+     * @return
+     */
+    @Override
+    public Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) {
+        LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search);
+        return resiUserDao.selectCount(query);
+    }
+
+    /**
+     * 构造queryWrapper
+     * @param customerId
+     * @param agencyId
+     * @param queryPids
+     * @param categoryKey
+     * @param search
+     * @return
+     */
+    LambdaQueryWrapper<IcResiUserEntity> constructQueryWrapper4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) {
+        LambdaQueryWrapper<IcResiUserEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcResiUserEntity::getCustomerId, customerId);
+        query.and(q -> q.eq(IcResiUserEntity::getAgencyId, agencyId).or().likeRight(IcResiUserEntity::getPids, queryPids));
+        if ("resi_xfry".equals(categoryKey)) {
+            // 信访人员
+            query.eq(IcResiUserEntity::getIsXfry, true);
+        } else if ("resi_snry".equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsSn, true);
+        }
+
+        if (StringUtils.isNotBlank(search)) {
+            query.like(IcResiUserEntity::getName, search);
+        }
+
+        return query;
+    }
+
+    @Override
+    public List<IcResiInfoResultDTO> listSpecialResisBySpecialType(String customerId, String agencyId, String queryPids, String categoryKey, String search,
+                                                                   Integer pageNo, Integer pageSize, Boolean isPage) {
+        if (isPage) {
+            PageHelper.startPage(pageNo, pageSize);
+        }
+        return resiUserDao.listSpecialResisBySpecialType(customerId, agencyId, queryPids, categoryKey, search);
+    }
+
+    @Override
+    public Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search) {
+        return resiUserDao.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
+    }
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java

@@ -0,0 +1,140 @@
+package com.epmet.dataaggre.service.govorg;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO;
+import com.epmet.dataaggre.entity.govorg.*;
+import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * org库的图层service
+ */
+public interface GovOrgCoverageService {
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class CategoryCoverageMapping {
+        private String placeType;
+        private String coverageType;
+        private String categoryKey;
+    }
+
+    /**
+     * 根据categoryKeys分类key列表，查询他们和图层时间的关系，映射为一个map
+     * @param categoryKeys
+     * @return
+     */
+    Map<String, List<CategoryCoverageMapping>> getMappingRelationByCategoryKey(List<String> categoryKeys, String customerId);
+
+    /**
+     * 根据coverageTypes分类key列表，查询他们和图层时间的关系，映射为一个map
+     * @param coverageTypes
+     * @return
+     */
+    Map<String, List<CategoryCoverageMapping>> getMappingRelationByCoverageType(List<String> coverageTypes, String customerId);
+
+    Integer countCityResourceEntities(String customerId, String agencyIdPath, String search, String category);
+
+    /**
+     * 搜索城市资源
+     * @param customerId
+     * @param agencyIdPath 查询人所属的组织ID路径，包含他本身所在的组织
+     * @param search 关键词，名称
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    List<IcCityManagementEntity> searchCityResourceEntities(String customerId, String agencyIdPath, String search, String category, Boolean isPage,
+                                                            Integer pageNo, Integer pageSize);
+
+    /**
+     * 搜索危化企业列表数量查询
+     */
+    Integer countDangerousChemicalEntities(String customerId, String agencyIdPath, String search, String categoryKey);
+    /**
+     * 搜索危化企业列表
+     * @param customerId
+     * @param agencyIdPath 查询人所属的组织ID路径，包含他本身所在的组织
+     * @param search 关键词，名称
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    List<IcDangerousChemicalsEntity> searchDangerousChemicalEntities(String customerId, String agencyIdPath, String search,
+                                                                     String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize);
+
+    /**
+     * 搜索群租房列表
+     * @param customerId
+     * @param agencyIdPath 查询人所属的组织ID路径，包含他本身所在的组织
+     * @param search
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    List<IcHouseEntity> searchByResiNumber(String customerId, String agencyIdPath, String search, Integer resiNumberGreaterThan,
+                                           Boolean isPage, Integer pageNo, Integer pageSize);
+
+    /**
+     * 搜索公共服务
+     * @param customerId
+     * @param staffOrgIds 查询人所属的组织ID路径，包含他本身所在的组织
+     * @param search
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    List<IcPublicServiceEntity> searchPublicServiceEntities(String customerId, String staffOrgIds, String search,
+                                                            String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize);
+
+    /**
+     * 搜索优势资源
+     * @param customerId
+     * @param staffOrgIds 查询人所属的组织ID路径，包含他本身所在的组织
+     * @param search
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    List<IcSuperiorResourceEntity> searchSuporiorResourceEntities(String customerId, String staffOrgIds, String search,
+                                                                  String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize);
+
+    Integer countPublicServiceEntities(String customerId, String staffOrgIds, String search, String categoryKey);
+
+    Integer countSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey);
+
+    Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey);
+
+    List<IcEnterisePatrolResultDTO> listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds,
+                                                         String search, String categoryKey, Boolean isPage, Integer pageNo,
+                                                         Integer pageSize);
+
+    /**
+     * 通过居民数量等条件查询房屋数量
+     * @param customerId
+     * @param staffOrgIds
+     * @param search
+     * @param resiNumberBiggerThan 查询居住人数大于多少的房屋
+     * @return
+     */
+    Integer countByResiNumber(String customerId, String staffOrgIds, String search, Integer resiNumberBiggerThan);
+
+    /**
+     * 查询客户下，指定分类key对应的对象数据
+     * @param categoryKey
+     * @return
+     */
+    IcCoverageCategoryDictEntity selectByCategoryKey(String categoryKey);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -2,12 +2,14 @@ package com.epmet.dataaggre.service.govorg;
 
 import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerDepartmentDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.form.*;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
+import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -195,4 +197,19 @@ public interface GovOrgService {
      * @return
      */
     BuildingInfoCache queryBuildingInfo(String buildingId);
+
+    /**
+     * 组织下的工作人员下拉框
+     * @param customerId
+     * @param agencyId
+     * @return
+     */
+    List<StaffSelectResDTO> staffSelectList(String customerId, String agencyId);
+
+    /**
+     * 查询跟组织信息
+     * @param customerId
+     * @return
+     */
+    CustomerAgencyEntity getRootAgencyByCustomerId(String customerId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java

@@ -0,0 +1,325 @@
+package com.epmet.dataaggre.service.govorg.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.govorg.*;
+import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO;
+import com.epmet.dataaggre.entity.govorg.*;
+import com.epmet.dataaggre.service.govorg.GovOrgCoverageService;
+import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * org 图层service
+ */
+@Service
+@DataSource(value = DataSourceConstant.GOV_ORG)
+public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
+
+    @Autowired
+    private IcCoverageCategoryDictDao coverageCategoryDictDao;
+
+    @Autowired
+    private IcCityManagementDao cityManagementDao;
+
+    @Autowired
+    private IcDangerousChemicalsDao dangerousChemicalsDao;
+
+    @Autowired
+    private IcPublicServiceDao publicServiceDao;
+
+    @Autowired
+    private IcSuperiorResourceDao superiorResourceDao;
+
+    @Autowired
+    private IcEnterprisePatrolRecordDao enterprisePatrolRecordDao;
+
+    @Autowired
+    private IcHouseDao ichousedao;
+
+    /**
+     * 查询客户下，指定分类key对应的对象数据
+     * @param categoryKey
+     * @return
+     */
+    @Override
+    public IcCoverageCategoryDictEntity selectByCategoryKey(String categoryKey) {
+        String customerId = EpmetRequestHolder.getLoginUserCustomerId();
+        LambdaQueryWrapper<IcCoverageCategoryDictEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(IcCoverageCategoryDictEntity::getCategoryKey, categoryKey);
+        queryWrapper.eq(IcCoverageCategoryDictEntity::getCustomerId, customerId);
+        return coverageCategoryDictDao.selectOne(queryWrapper);
+    }
+
+    /**
+     * 根据categoryKeys分类key列表，查询他们和图层时间的关系，映射为一个map
+     * @param categoryKeys
+     * @return
+     */
+    public Map<String, List<CategoryCoverageMapping>> getMappingRelationByCategoryKey(List<String> categoryKeys, String customerId) {
+        LambdaQueryWrapper<IcCoverageCategoryDictEntity> query = new LambdaQueryWrapper<>();
+        query.in(IcCoverageCategoryDictEntity::getCategoryKey, categoryKeys);
+        query.in(IcCoverageCategoryDictEntity::getCustomerId, customerId);
+
+        List<IcCoverageCategoryDictEntity> dict = coverageCategoryDictDao.selectList(query);
+        return map(dict);
+    }
+
+    @Override
+    public Map<String, List<CategoryCoverageMapping>> getMappingRelationByCoverageType(List<String> coverageTypes, String customerId) {
+        LambdaQueryWrapper<IcCoverageCategoryDictEntity> query = new LambdaQueryWrapper<>();
+        query.in(IcCoverageCategoryDictEntity::getCoverageType, coverageTypes);
+        query.in(IcCoverageCategoryDictEntity::getCustomerId, customerId);
+
+        List<IcCoverageCategoryDictEntity> dict = coverageCategoryDictDao.selectList(query);
+        return map(dict);
+    }
+
+    /**
+     * 执行映射
+     * @param dict
+     * @return
+     */
+    public Map<String, List<CategoryCoverageMapping>> map(List<IcCoverageCategoryDictEntity> dict) {
+        HashMap<String, List<CategoryCoverageMapping>> mapping = new HashMap<>();
+        for (IcCoverageCategoryDictEntity item : dict) {
+            String coverageType = item.getCoverageType();
+            CategoryCoverageMapping m = new CategoryCoverageMapping(item.getPlaceType(), coverageType, item.getCategoryKey());
+            if (mapping.containsKey(coverageType)) {
+                mapping.get(coverageType).add(m);
+            } else {
+                List<CategoryCoverageMapping> ms = new ArrayList<>();
+                ms.add(m);
+                mapping.put(coverageType, ms);
+            }
+        }
+        return mapping;
+    }
+
+    /**
+     * 搜索城市资源
+     * @param customerId
+     * @param agencyIdPath 查询人所属的组织ID路径，包含他本身所在的组织
+     * @param search 关键词，名称
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public List<IcCityManagementEntity> searchCityResourceEntities(String customerId, String agencyIdPath, String search, String category, Boolean isPage, Integer pageNo, Integer pageSize) {
+        if (isPage) {
+            PageHelper.startPage(pageNo ,pageSize);
+        }
+
+        LambdaQueryWrapper<IcCityManagementEntity> query = constructQueryWrapper(customerId, agencyIdPath, search, category);
+        query.orderByAsc(IcCityManagementEntity::getCreatedTime);
+        return cityManagementDao.selectList(query);
+    }
+
+    @Override
+    public Integer countCityResourceEntities(String customerId, String agencyIdPath, String search, String category) {
+        LambdaQueryWrapper<IcCityManagementEntity> query = constructQueryWrapper(customerId, agencyIdPath, search, category);
+        query.orderByAsc(IcCityManagementEntity::getCreatedTime);
+        return cityManagementDao.selectCount(query);
+    }
+
+    /**
+     * 构造动态查询
+     * @param customerId
+     * @param agencyIdPath
+     * @param search
+     * @param category
+     * @return
+     */
+    private LambdaQueryWrapper<IcCityManagementEntity> constructQueryWrapper(String customerId, String agencyIdPath, String search, String category) {
+        LambdaQueryWrapper<IcCityManagementEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcCityManagementEntity::getCustomerId, customerId);
+        query.eq(IcCityManagementEntity::getCategory, category);
+        query.likeRight(IcCityManagementEntity::getAgencyIdPath, agencyIdPath);
+        if (StringUtils.isNotBlank(search)) {
+            query.like(IcCityManagementEntity::getName, search);
+        }
+        return query;
+    }
+
+    @Override
+    public Integer countDangerousChemicalEntities(String customerId, String agencyIdPath, String search, String categoryKey) {
+
+        LambdaQueryWrapper<IcDangerousChemicalsEntity> query = constructDangerousChemicalQueryWrapper(customerId, agencyIdPath, search, categoryKey);
+
+        return dangerousChemicalsDao.selectCount(query);
+    }
+
+    /**
+     * 搜索危化企业列表
+     * @param customerId
+     * @param agencyIdPath 查询人所属的组织ID路径，包含他本身所在的组织
+     * @param search 关键词，名称
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public List<IcDangerousChemicalsEntity> searchDangerousChemicalEntities(
+            String customerId, String agencyIdPath, String search, String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) {
+
+        LambdaQueryWrapper<IcDangerousChemicalsEntity> query = constructDangerousChemicalQueryWrapper(customerId, agencyIdPath, search, categoryKey);
+
+        if (isPage) {
+            PageHelper.startPage(pageNo ,pageSize);
+        }
+        query.orderByAsc(IcDangerousChemicalsEntity::getCreatedTime);
+        return dangerousChemicalsDao.selectList(query);
+    }
+
+    private LambdaQueryWrapper<IcDangerousChemicalsEntity> constructDangerousChemicalQueryWrapper(
+            String customerId, String agencyIdPath, String search, String categoryKey) {
+
+        LambdaQueryWrapper<IcDangerousChemicalsEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcDangerousChemicalsEntity::getCustomerId, customerId);
+        query.eq(IcDangerousChemicalsEntity::getCategory, categoryKey);
+        query.likeRight(IcDangerousChemicalsEntity::getAgencyIdPath, agencyIdPath);
+        if (StringUtils.isNotBlank(search)) {
+            query.like(IcDangerousChemicalsEntity::getName, search);
+        }
+        return query;
+    }
+
+    @Override
+    public List<IcHouseEntity> searchByResiNumber(String customerId, String agencyIdPath, String search, Integer resiNumberGreaterThan,
+                                                            Boolean isPage, Integer pageNo, Integer pageSize) {
+        LambdaQueryWrapper<IcHouseEntity> query = constructHouseByResiNumber(customerId, agencyIdPath, search, resiNumberGreaterThan);
+        if (isPage) {
+            PageHelper.startPage(pageNo, pageSize);
+        }
+        return ichousedao.selectList(query);
+    }
+
+    /**
+     * 查询公共服务个数
+     * @param customerId
+     * @param staffOrgIds 查询人所属的组织ID路径，包含他本身所在的组织
+     * @param search
+     * @return
+     */
+    @Override
+    public Integer countPublicServiceEntities(String customerId, String staffOrgIds, String search, String categoryKey) {
+        LambdaQueryWrapper<IcPublicServiceEntity> query = constructPublicServiceQueryWrapper(customerId, staffOrgIds, search, categoryKey);
+        return publicServiceDao.selectCount(query);
+    }
+
+    /**
+     * 搜索公共服务
+     * @param customerId
+     * @param staffOrgIds 查询人所属的组织ID路径，包含他本身所在的组织
+     * @param search
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public List<IcPublicServiceEntity> searchPublicServiceEntities(String customerId, String staffOrgIds, String search,
+                                                                   String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) {
+
+        LambdaQueryWrapper<IcPublicServiceEntity> query = constructPublicServiceQueryWrapper(customerId, staffOrgIds, search, categoryKey);
+        if (isPage) {
+            PageHelper.startPage(pageNo ,pageSize);
+        }
+        query.orderByAsc(IcPublicServiceEntity::getCreatedTime);
+        return publicServiceDao.selectList(query);
+    }
+
+    /**
+     * 构造LambdaQueryWrapper
+     * @param customerId
+     * @param staffOrgIds
+     * @param search
+     * @param categoryKey
+     * @return
+     */
+    LambdaQueryWrapper<IcPublicServiceEntity> constructPublicServiceQueryWrapper(
+            String customerId, String staffOrgIds, String search, String categoryKey) {
+        LambdaQueryWrapper<IcPublicServiceEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcPublicServiceEntity::getCustomerId, customerId);
+        query.likeRight(IcPublicServiceEntity::getAgencyIdPath, staffOrgIds);
+        query.eq(IcPublicServiceEntity::getCategory, categoryKey);
+        if (StringUtils.isNotBlank(search)) {
+            query.like(IcPublicServiceEntity::getName, search);
+        }
+        return query;
+    }
+
+    @Override
+    public List<IcSuperiorResourceEntity> searchSuporiorResourceEntities(String customerId, String staffOrgIds, String search,
+                                                                         String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) {
+        LambdaQueryWrapper<IcSuperiorResourceEntity> query = constructSuporiorResourceQueryWrapper(customerId, staffOrgIds, search, categoryKey);
+
+        if (isPage) {
+            PageHelper.startPage(pageNo ,pageSize);
+        }
+        query.orderByAsc(IcSuperiorResourceEntity::getCreatedTime);
+        return superiorResourceDao.selectList(query);
+    }
+
+    @Override
+    public Integer countSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey) {
+        LambdaQueryWrapper<IcSuperiorResourceEntity> query = constructSuporiorResourceQueryWrapper(customerId, staffOrgIds, search, categoryKey);
+        return superiorResourceDao.selectCount(query);
+    }
+
+    LambdaQueryWrapper<IcSuperiorResourceEntity> constructSuporiorResourceQueryWrapper(String customerId, String staffOrgIds, String search, String categoryKey) {
+        LambdaQueryWrapper<IcSuperiorResourceEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcSuperiorResourceEntity::getCustomerId, customerId);
+        query.eq(IcSuperiorResourceEntity::getCategory, categoryKey);
+        query.likeRight(IcSuperiorResourceEntity::getAgencyIdPath, staffOrgIds);
+        if (StringUtils.isNotBlank(search)) {
+            query.like(IcSuperiorResourceEntity::getName, search);
+        }
+
+        return query;
+    }
+
+    @Override
+    public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) {
+        return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey);
+    }
+
+    @Override
+    public List<IcEnterisePatrolResultDTO> listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds,
+                                                                String search, String categoryKey, Boolean isPage,
+                                                                Integer pageNo, Integer pageSize) {
+        if (isPage) {
+            PageHelper.startPage(pageNo, pageSize);
+        }
+        return enterprisePatrolRecordDao.listEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey);
+    }
+
+    @Override
+    public Integer countByResiNumber(String customerId, String staffOrgIds, String search, Integer resiNumberBiggerThan) {
+        return ichousedao.selectCount(constructHouseByResiNumber(customerId, staffOrgIds, search, resiNumberBiggerThan));
+    }
+
+    /**
+     * 为"根据居住人数查询房屋"构造条件
+     */
+    private LambdaQueryWrapper<IcHouseEntity> constructHouseByResiNumber(String customerId, String staffOrgIds, String search, Integer resiNumberBiggerThan) {
+        LambdaQueryWrapper<IcHouseEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcHouseEntity::getCustomerId, customerId);
+        query.likeRight(IcHouseEntity::getOrgIdPath, staffOrgIds);
+        if (StringUtils.isNotBlank(search)) {
+            query.like(IcHouseEntity::getFullName, search);
+        }
+        query.ge(IcHouseEntity::getResiNumber, resiNumberBiggerThan);
+        return query;
+    }
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.dingtalk.api.request.OapiRobotSendRequest;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.Constant;
@@ -31,6 +32,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.govorg.*;
 import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO;
 import com.epmet.dataaggre.dto.govorg.*;
 import com.epmet.dataaggre.dto.govorg.form.*;
 import com.epmet.dataaggre.dto.govorg.result.*;
@@ -1053,5 +1055,28 @@ public class GovOrgServiceImpl implements GovOrgService {
         return infoCache;
     }
 
+    /**
+     * 组织下的工作人员下拉框
+     *
+     * @param customerId
+     * @param agencyId
+     * @return
+     */
+    @Override
+    public List<StaffSelectResDTO> staffSelectList(String customerId, String agencyId) {
+        List<String> staffIds = customerStaffAgencyDao.selectStaffList(agencyId, "agency");
+        if (org.springframework.util.CollectionUtils.isEmpty(staffIds)) {
+            return new ArrayList<>();
+        }
+        List<StaffSelectResDTO> resultDTOList = epmetUserService.staffSelectList(staffIds);
+        return resultDTOList;
+    }
 
+    @Override
+    public CustomerAgencyEntity getRootAgencyByCustomerId(String customerId) {
+        LambdaQueryWrapper<CustomerAgencyEntity> query = new LambdaQueryWrapper<>();
+        query.eq(CustomerAgencyEntity::getCustomerId, customerId);
+        query.eq(CustomerAgencyEntity::getPid, "0"); // 跟组织的pid为"0"
+        return customerAgencyDao.selectOne(query);
+    }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java

@@ -4,6 +4,8 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.dto.govproject.form.*;
 import com.epmet.dataaggre.dto.govproject.result.*;
+import com.epmet.dataaggre.entity.govproject.IcEventEntity;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -100,4 +102,23 @@ public interface GovProjectService {
 	 * @return
 	 */
 	List<IssueProjectCategory> getIssueProjectFirstCategory(List<String> issueIds);
+
+	/**
+	 * 数量
+	 * @param staffOrgIds
+	 * @param isDifficultPoint 是否是难点堵点
+	 * @return
+	 */
+	Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint);
+
+	/**
+	 * 搜索事件
+	 * @param staffOrgIds
+	 * @param search
+	 * @param isDifficultPoint 是否是难点堵点
+	 * @return
+	 */
+	List<IcEventEntity> searchIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint,
+											  Boolean isPage, Integer pageNo, Integer pageSize);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.dataaggre.service.govproject.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.CustomerIdConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -18,6 +19,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.govproject.IcEventDao;
 import com.epmet.dataaggre.dao.govproject.ProjectDao;
 import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO;
 import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO;
@@ -31,6 +33,7 @@ import com.epmet.dataaggre.dto.govproject.ResiEventReportOrgDTO;
 import com.epmet.dataaggre.dto.govproject.form.*;
 import com.epmet.dataaggre.dto.govproject.result.*;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
+import com.epmet.dataaggre.entity.govproject.IcEventEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
@@ -82,6 +85,8 @@ public class GovProjectServiceImpl implements GovProjectService {
 	private EpmetUserService epmetUserService;
 	@Autowired
 	private LoginUserUtil loginUserUtil;
+	@Autowired
+	private IcEventDao icEventDao;
 
     /**
      * @Description  查询项目信息
@@ -644,4 +649,42 @@ public class GovProjectServiceImpl implements GovProjectService {
 		return projectDao.selectProjectIssueCategory(issueIds);
 	}
 
+	@Override
+	public Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint) {
+		LambdaQueryWrapper<IcEventEntity> query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint);
+		return icEventDao.selectCount(query);
+	}
+
+	@Override
+	public List<IcEventEntity> searchIcEventEntities(String customerId, String staffOrgIds, String search,
+													 Boolean isDifficultPoint, Boolean isPage, Integer pageNo, Integer pageSize) {
+		LambdaQueryWrapper<IcEventEntity> query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint);
+		if (isPage) {
+			PageHelper.startPage(pageNo, pageSize);
+		}
+		return icEventDao.selectList(query);
+	}
+
+	/**
+	 * 构造事件查询
+	 * @param customerId
+	 * @param staffOrgIds
+	 * @param search
+	 * @param difficultPoint 是否是难点堵点
+	 * @return
+	 */
+	private LambdaQueryWrapper<IcEventEntity> constructIcEventQueryWrapper(String customerId, String staffOrgIds,
+																		   String search, Boolean difficultPoint) {
+		LambdaQueryWrapper<IcEventEntity> query = new LambdaQueryWrapper<>();
+		query.eq(IcEventEntity::getCustomerId, customerId);
+		query.likeRight(IcEventEntity::getGridPids, staffOrgIds);
+		if (StringUtils.isNotBlank(search)) {
+			query.like(IcEventEntity::getName, search);
+		}
+		if (difficultPoint != null) {
+			query.eq(IcEventEntity::getDifficultPoint, difficultPoint);
+		}
+
+		return query;
+	}
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java

@@ -0,0 +1,43 @@
+package com.epmet.dataaggre.service.heart;
+
+import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
+import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity;
+
+import java.util.List;
+
+/**
+ * heart service
+ */
+public interface HeartService {
+    /**
+     * 搜索社区自组织列表
+     * @param customerId 客户ID
+     * @param agencyId 当前查询人员所属组织ID
+     * @param staffOrgIds 当前查询人员所属组织的所有上级id path
+     * @param search 搜索条件
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    List<IcCommunitySelfOrganizationEntity> searchCommunityOrgEntities(String customerId, String agencyId, String staffOrgIds,
+                                                                       String search, String categoryKey, Boolean isPage,
+                                                                       Integer pageNo, Integer pageSize);
+
+    /**
+     *
+     * @param customerId
+     * @param agencyId
+     * @param staffOrgIds
+     * @param search
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    List<IcPartyUnitEntity> searchPartyUnitEntities(String customerId, String agencyId, String staffOrgIds, String partyUnitType,
+                                                    String search, Boolean isPage, Integer pageNo, Integer pageSize);
+
+    Integer countPartyUnitEntities(String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search);
+    Integer countCommunityOrgEntities(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java

@@ -0,0 +1,124 @@
+package com.epmet.dataaggre.service.heart.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.heart.IcCommunitySelfOrganizationDao;
+import com.epmet.dataaggre.dao.heart.IcPartyUnitDao;
+import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
+import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity;
+import com.epmet.dataaggre.service.heart.HeartService;
+import com.epmet.dto.result.PartyMemberUserIdsResultDTO;
+import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@DataSource(value = DataSourceConstant.EPMET_HEART)
+@Service
+public class HeartServiceImpl implements HeartService {
+
+    @Autowired
+    private IcCommunitySelfOrganizationDao communitySelfOrganizationDao;
+
+    @Autowired
+    private IcPartyUnitDao partyUnitDao;
+
+    /**
+     * 搜索社区自组织列表
+     * @param customerId 客户ID
+     * @param agencyId 当前查询人员所属组织ID
+     * @param staffOrgIds 当前查询人员所属id path
+     * @param search 搜索条件
+     * @return 社区自组织列表
+     */
+    @Override
+    public List<IcCommunitySelfOrganizationEntity> searchCommunityOrgEntities(
+            String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,
+            Boolean isPage, Integer pageNo, Integer pageSize) {
+
+        LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> query = constructCommunityOrgQueryWrapper(
+                customerId, agencyId, staffOrgIds, search, categoryKey);
+
+        if (isPage) {
+            PageHelper.startPage(pageNo, pageSize);
+        }
+        query.orderByAsc(IcCommunitySelfOrganizationEntity::getCreatedTime);
+        return communitySelfOrganizationDao.selectList(query);
+    }
+
+    @Override
+    public Integer countCommunityOrgEntities(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) {
+        LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> query = constructCommunityOrgQueryWrapper(
+                customerId, agencyId, staffOrgIds, search, categoryKey);
+
+        return communitySelfOrganizationDao.selectCount(query);
+    }
+
+    private LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> constructCommunityOrgQueryWrapper(
+            String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) {
+        LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcCommunitySelfOrganizationEntity::getCustomerId, customerId);
+        query.eq(IcCommunitySelfOrganizationEntity::getCategoryCode, categoryKey);
+        query.and(q -> q.eq(IcCommunitySelfOrganizationEntity::getOrgId, agencyId).or().likeRight(IcCommunitySelfOrganizationEntity::getPids, staffOrgIds));
+        if (StringUtils.isNotBlank(search)) {
+            query.like(IcCommunitySelfOrganizationEntity::getOrganizationName, search);
+        }
+        return query;
+    }
+
+    /**
+     * 联建单位数量查询
+     * @param customerId
+     * @param agencyId
+     * @param staffOrgIds
+     * @param partyUnitType
+     * @param search
+     * @return
+     */
+    public Integer countPartyUnitEntities(String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search) {
+
+        LambdaQueryWrapper<IcPartyUnitEntity> query = constructPartyUnitQueryWrapper(customerId, agencyId, staffOrgIds, partyUnitType, search);
+
+        query.orderByAsc(IcPartyUnitEntity::getCreatedTime);
+        return partyUnitDao.selectCount(query);
+    }
+
+    /**
+     *
+     * @param customerId
+     * @param agencyId 当前查询人员所属组织ID
+     * @param staffOrgIds 当前查询人员所属id path
+     * @param search
+     * @param isPage
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public List<IcPartyUnitEntity> searchPartyUnitEntities(
+            String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search,
+            Boolean isPage, Integer pageNo, Integer pageSize) {
+
+        LambdaQueryWrapper<IcPartyUnitEntity> query = constructPartyUnitQueryWrapper(customerId, agencyId, staffOrgIds, partyUnitType, search);
+
+        if (isPage) {
+            PageHelper.startPage(pageNo, pageSize);
+        }
+        query.orderByAsc(IcPartyUnitEntity::getCreatedTime);
+        return partyUnitDao.selectList(query);
+    }
+
+    private LambdaQueryWrapper<IcPartyUnitEntity> constructPartyUnitQueryWrapper(String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search) {
+        LambdaQueryWrapper<IcPartyUnitEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcPartyUnitEntity::getCustomerId, customerId);
+        query.eq(IcPartyUnitEntity::getType, partyUnitType);
+        query.and(q -> q.eq(IcPartyUnitEntity::getAgencyId, agencyId).or().likeRight(IcPartyUnitEntity::getPids, staffOrgIds));
+        if (StringUtils.isNotBlank(search)) {
+            query.like(IcPartyUnitEntity::getUnitName, search);
+        }
+        return query;
+    }
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -0,0 +1,437 @@
+package com.epmet.dataaggre.service.impl;
+
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO;
+import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
+import com.epmet.dataaggre.entity.govorg.*;
+import com.epmet.dataaggre.entity.govproject.IcEventEntity;
+import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
+import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity;
+import com.epmet.dataaggre.service.CoverageService;
+import com.epmet.dataaggre.service.epmetuser.IcResiService;
+import com.epmet.dataaggre.service.govorg.GovOrgCoverageService;
+import com.epmet.dataaggre.service.govorg.GovOrgService;
+import com.epmet.dataaggre.service.govproject.GovProjectService;
+import com.epmet.dataaggre.service.heart.HeartService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class CoverageServiceImpl implements CoverageService {
+
+    @Autowired
+    private GovOrgCoverageService orgCoverageService;
+
+    @Autowired
+    private GovOrgService govOrgService;
+
+    @Autowired
+    private IcResiService icResiService;
+
+    @Autowired
+    private HeartService heartService;
+
+    @Autowired
+    private GovProjectService govProjectService;
+
+    /**
+     * 场所类型常量
+     */
+    public static final String PLACE_TYPE_RESI = "resi";
+    public static final String PLACE_TYPE_SPECIAL_RESI = "special_resi";
+    public static final String PLACE_TYPE_EVENT= "event";
+    public static final String PLACE_TYPE_CITY_MANAGEMENT= "city_management";
+    public static final String PLACE_TYPE_COMUNITY_ORG= "community_org";
+    public static final String PLACE_TYPE_DANGEROUS_CHEMICALS= "dangerous_chemicals";
+    public static final String PLACE_TYPE_ENTERPRISE_PARTROL= "enterprise_patrol";
+    public static final String PLACE_TYPE_GROUP_RENT= "group_rent";
+    public static final String PLACE_TYPE_PUBLIC_SERVICE= "public_service";
+    public static final String PLACE_TYPE_SUPERIOR_RESOURCE= "superior_resource";
+    public static final String PLACE_TYPE_PARTY_UNIT= "party_unit";
+
+    /**
+     * 图层，大屏数据分析，数据列表
+     * @param coverageTypes 图层列表
+     * @param categoryKeys 分类列表
+     * @param search 搜索关键词
+     * @param pageNo 页码
+     * @param pageSize 页面大小
+     * @return
+     */
+    @Override
+    public PageData<CoverageAnalisisDataListResultDTO> analysisDataList(List<String> coverageTypes, List<String> categoryKeys,
+                                     String search, Integer pageNo, Integer pageSize, Boolean isPage) {
+
+        // 获取跟组织的坐标
+        String customerId = EpmetRequestHolder.getLoginUserCustomerId();
+        String staffId = EpmetRequestHolder.getLoginUserId();
+        CustomerAgencyEntity rootAgency = govOrgService.getRootAgencyByCustomerId(customerId);
+
+        // 1.根据categoryKeys分类key列表，查询他们和图层时间的关系，映射为一个map
+        Map<String, List<GovOrgCoverageService.CategoryCoverageMapping>> mapping;
+        if (CollectionUtils.isNotEmpty(categoryKeys)) {
+            // 有分类keys，使用分类keys查询，使用coverageTypes分组
+            mapping = orgCoverageService.getMappingRelationByCategoryKey(categoryKeys, customerId);
+            if (mapping == null || mapping.size() == 0) {
+                mapping = orgCoverageService.getMappingRelationByCategoryKey(categoryKeys, "default");
+            }
+        } else {
+            // 没有分类keys，使用coverageTypes直接查询
+            mapping = orgCoverageService.getMappingRelationByCoverageType(coverageTypes, customerId);
+            if (mapping == null || mapping.size() == 0) {
+                mapping = orgCoverageService.getMappingRelationByCoverageType(categoryKeys, "default");
+            }
+        }
+
+        // 2.循环coverageTypes，使用key到map中查询(为了顺序)，得到categoryKeys列表之后，根据实际情况做相应的查询
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, staffId);
+
+        if (staffInfo == null) {
+            String msg = "未找到当前登录人信息。staffId:" + EpmetRequestHolder.getLoginUserId();
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), msg, msg);
+        }
+
+        String staffPids = getStaffPidsFromStaffInfo(staffInfo);
+        String agencyId = staffInfo.getAgencyId();
+
+        // 分页不太好分，先查出所有的数据，然后partation()吧
+        int start = (pageNo - 1) * pageSize;
+        int end = pageNo * pageSize; // 不包含
+
+        // 总共查询了多少个了
+        int lastTotalCount = 0;
+        int totalCount = 0;
+
+        // 是否出现要展示的数据
+        boolean dataAppear = false;
+
+        // 是否是第一次出现需要展示的数据
+        boolean firstTimeDataAppear = false;
+
+        // 数据是否够了，够了就不再查询数据
+        boolean isDataEnough = false;
+
+        // 结果集
+        List<CoverageAnalisisDataListResultDTO> rls = new ArrayList<>();
+        for (String coverageType : coverageTypes) {
+            List<GovOrgCoverageService.CategoryCoverageMapping> ccm = mapping.get(coverageType);
+            if (CollectionUtils.isEmpty(ccm)) {
+                continue;
+            }
+            for (GovOrgCoverageService.CategoryCoverageMapping e : ccm) {
+
+                Integer tempCount = doDataListCount(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(),
+                        e.getCategoryKey(), search);
+                lastTotalCount = totalCount;
+                totalCount += tempCount;
+
+                if (!isPage) {
+                    // 不分页，查询所有
+                    // 检索数据
+                    List<CoverageAnalisisDataListResultDTO> dataSegment = doDataListSearch(
+                            EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(),
+                            e.getCategoryKey(), search, null, null, isPage, rootAgency);
+                    rls.addAll(dataSegment);
+                    continue;
+                }
+
+                if (totalCount > start) {
+                    if (!dataAppear) {
+                        dataAppear = true;
+                        firstTimeDataAppear = true;
+                    }
+                } else {
+                    continue;
+                }
+
+                if (isDataEnough) {
+                    // 数据够了，则不再查询数据列表，只检索数量，用于分页条显示
+                    continue;
+                }
+
+                // 检索数据
+                List<CoverageAnalisisDataListResultDTO> dataSegment = doDataListSearch(
+                        EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(),
+                        e.getCategoryKey(), search, 1, end, isPage, rootAgency);
+
+                if (firstTimeDataAppear) {
+                    rls.addAll(dataSegment.subList(start - lastTotalCount, dataSegment.size()));
+                    firstTimeDataAppear = false;
+                } else {
+                    rls.addAll(dataSegment);
+                }
+
+                // 最后，将多余的数据裁剪掉
+                if (rls.size() >= pageSize) {
+                    isDataEnough = true;
+                }
+            }
+        }
+
+        if (isPage && rls.size() >= pageSize) {
+            return new PageData<>(rls.subList(0, pageSize), totalCount);
+        } else {
+            return new PageData<>(rls, totalCount);
+        }
+    }
+
+    /**
+     * 从staff信息中获取工作人员的PIDS
+     * @param staffInfo
+     * @return
+     */
+    private String getStaffPidsFromStaffInfo(CustomerStaffInfoCacheResult staffInfo) {
+        String agencyId = staffInfo.getAgencyId();
+        String agencyPIds = staffInfo.getAgencyPIds();
+        if (StringUtils.isNotBlank(agencyPIds) && !"0".equals(agencyPIds)) {
+            return agencyPIds.concat(":").concat(agencyId);
+        } else {
+            return agencyId;
+        }
+    }
+
+    /**
+     * 计算数据条数
+     * @param customerId
+     * @param agencyId
+     * @param staffOrgIds
+     * @param placeType
+     * @param categoryKey
+     * @param search
+     * @return
+     */
+    public Integer doDataListCount(String customerId, String agencyId, String staffOrgIds, String placeType,
+                                   String categoryKey, String search) {
+
+        if (PLACE_TYPE_RESI.equals(placeType)) {
+            // 使用分类查询居民信息
+            return icResiService.countResisByCategories4Coverage(customerId, agencyId,
+                    staffOrgIds, categoryKey, search);
+        } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) {
+            // 特殊人群
+            return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
+        } else if (PLACE_TYPE_EVENT.equals(placeType)) {
+            // 难点痛点
+            return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true);
+        } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) {
+            // 城市资源管理
+            return orgCoverageService.countCityResourceEntities(customerId, staffOrgIds, search, categoryKey);
+        } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) {
+            // 社区自组织
+            return heartService.countCommunityOrgEntities(customerId, agencyId, staffOrgIds, search, categoryKey);
+        } else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) {
+            // 机关直属部门(联建单位)  楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7
+            if (categoryKey.equals("pu_jgzsbm")) {
+                String partyUnitType = "3";
+                return heartService.countPartyUnitEntities(customerId, agencyId, staffOrgIds, partyUnitType, search);
+            }
+        } else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) {
+            // 危化企业
+            return orgCoverageService.countDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey);
+        } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) {
+            // 企事业单位巡查
+            return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey);
+        } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) {
+            // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定
+            return orgCoverageService.countByResiNumber(customerId, staffOrgIds, search, 5);
+        } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) {
+            // 公共服务
+            return orgCoverageService.countPublicServiceEntities(customerId, staffOrgIds, search, categoryKey);
+        } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) {
+            // 优势资源
+            return orgCoverageService.countSuporiorResourceEntities(customerId, staffOrgIds, search, categoryKey);
+        }
+
+        return 0;
+    }
+
+    /**
+     * 执行数据查询
+     * @param customerId
+     * @param agencyId 查询的工作人员所在组织id
+     * @param staffOrgIds 查询的工作人员所在组织的id path，包含agencyId
+     * @param placeType 场所类型
+     * @param categoryKey 类别key
+     * @param search 关键词
+     * @return
+     */
+    public List<CoverageAnalisisDataListResultDTO> doDataListSearch(String customerId, String agencyId, String staffOrgIds,
+                                                                    String placeType, String categoryKey, String search,
+                                                                    Integer pageNo, Integer pageSize,Boolean isPage,
+                                                                    CustomerAgencyEntity rootAgency) {
+
+        // 根据categoryKey查询类别名称
+        IcCoverageCategoryDictEntity categoryDict = orgCoverageService.selectByCategoryKey(categoryKey);
+
+        if (PLACE_TYPE_RESI.equals(placeType)) {
+            // 使用分类查询居民信息
+            List<IcResiUserEntity> resiEntities = icResiService.listResisByCategories4Coverage(
+                    customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage);
+
+            return resiEntities.parallelStream().map(re -> {
+                // 使用楼栋的坐标补充居民的坐标信息
+                String[] coordinates = getUserCoordinates(re.getId(), re.getBuildId(), rootAgency);
+
+                return new CoverageAnalisisDataListResultDTO(
+                        re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? re.getName() : null,
+                        coordinates[1], coordinates[0]);
+
+            }).collect(Collectors.toList());
+        } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) {
+            // 特殊人群
+            List<IcResiInfoResultDTO> resiInfos = icResiService.listSpecialResisBySpecialType(
+                    customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage);
+
+            return resiInfos.parallelStream().map(re -> {
+                String[] coordinates = getUserCoordinates(re.getId(), re.getBuildId(), rootAgency);
+
+                return new CoverageAnalisisDataListResultDTO(
+                        re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType,
+                        isPage ? re.getName() : null, coordinates[1], coordinates[0]);
+
+            }).collect(Collectors.toList());
+        } else if (PLACE_TYPE_EVENT.equals(placeType)) {
+            // 难点痛点
+            List<IcEventEntity> icEventEntities = govProjectService.searchIcEventEntities(
+                    customerId, staffOrgIds, search, true, isPage, pageNo, pageSize);
+
+            return icEventEntities.stream()
+                    .map(e -> new CoverageAnalisisDataListResultDTO(
+                            e.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? e.getName() : null,
+                            e.getLatitude(), e.getLongitude()))
+                    .collect(Collectors.toList());
+
+        } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) {
+            // 城市资源管理
+            List<IcCityManagementEntity> cityResources = orgCoverageService.searchCityResourceEntities(
+                    customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
+            return cityResources.stream()
+                    .map(resource -> new CoverageAnalisisDataListResultDTO(
+                            resource.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType,
+                            isPage ? resource.getName() : null, resource.getLatitude(), resource.getLongitude()))
+                    .collect(Collectors.toList());
+
+        } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) {
+            // 社区自组织
+            List<IcCommunitySelfOrganizationEntity> l = heartService.searchCommunityOrgEntities(
+                    customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
+
+            return l.stream()
+                    .map(org -> new CoverageAnalisisDataListResultDTO(
+                            org.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType,
+                            isPage ? org.getOrganizationName() : null, org.getLatitude(), org.getLongitude()))
+                    .collect(Collectors.toList());
+
+        } else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) {
+            // 机关直属部门(联建单位)  楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7
+            if (categoryKey.equals("pu_jgzsbm")) {
+                String partyUnitType = "3";
+                List<IcPartyUnitEntity> l = heartService.searchPartyUnitEntities(
+                        customerId, agencyId, staffOrgIds, partyUnitType, search, isPage, pageNo, pageSize);
+
+                return l.stream()
+                        .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey,
+                                isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getUnitName() : null, dc.getLatitude(), dc.getLongitude()))
+                        .collect(Collectors.toList());
+            }
+            return new ArrayList<>();
+        } else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) {
+            // 危化企业
+            List<IcDangerousChemicalsEntity> l = orgCoverageService.searchDangerousChemicalEntities(
+                    customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
+
+            return l.stream()
+                    .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey,
+                            isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude()))
+                    .collect(Collectors.toList());
+
+        } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) {
+            // 企事业单位巡查
+            List<IcEnterisePatrolResultDTO> list = orgCoverageService.listEnterprisePatrol(
+                    customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
+
+            return list.stream()
+                    .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getEnterpriseId(), categoryKey,
+                            isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getPlaceOrgName() : null, dc.getLatitude(), dc.getLongitude()))
+                    .collect(Collectors.toList());
+
+        } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) {
+            // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定
+            List<IcHouseEntity> houses = orgCoverageService.searchByResiNumber(customerId, staffOrgIds, search, 5, isPage, pageNo, pageSize);
+            return houses.parallelStream().map(h -> {
+                BuildingInfoCache buildingInfo = govOrgService.queryBuildingInfo(h.getBuildingId());
+                String latitude = null;
+                String longitude = null;
+                if (buildingInfo != null) {
+                    latitude = buildingInfo.getLatitude();
+                    longitude = buildingInfo.getLongitude();
+                }
+                String houseName = StringUtils.isNotBlank(h.getFullName()) ? h.getFullName() : h.getHouseName();
+                return new CoverageAnalisisDataListResultDTO(h.getId(), categoryKey,
+                        isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? houseName : null, latitude, longitude);
+            }).collect(Collectors.toList());
+
+        } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) {
+            // 公共服务
+            List<IcPublicServiceEntity> l = orgCoverageService.searchPublicServiceEntities(
+                    customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
+            return l.stream()
+                    .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey,
+                            isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude()))
+                    .collect(Collectors.toList());
+        } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) {
+            // 优势资源
+            List<IcSuperiorResourceEntity> l = orgCoverageService.searchSuporiorResourceEntities(
+                    customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
+            return l.stream()
+                    .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey,
+                            isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude()))
+                    .collect(Collectors.toList());
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * 获取用户的坐标信息
+     * @param resiId
+     * @param buildingId
+     * @param rootAgency 跟组织，用于备选，从其中获取坐标
+     * @return
+     */
+    private String[] getUserCoordinates(String resiId, String buildingId, CustomerAgencyEntity rootAgency) {
+        String longitude = null;
+        String latitude = null;
+
+        BuildingInfoCache resiBuilding = govOrgService.queryBuildingInfo(buildingId);
+        if (resiBuilding != null) {
+            longitude = resiBuilding.getLongitude();
+            latitude = resiBuilding.getLatitude();
+        } else {
+            log.error("居民信息所属楼栋信息未找到。居民id:{},楼栋id:{}", resiId, buildingId);
+        }
+
+        if (StringUtils.isAnyBlank(longitude, latitude)) {
+            // 楼栋没有坐标，那就取跟组织的
+            longitude = rootAgency.getLongitude();
+            latitude = rootAgency.getLatitude();
+        }
+        return new String[]{longitude, latitude};
+    }
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml

@@ -156,6 +156,11 @@ dynamic:
       url: @datasource.druid.epmettduck.url@
       username: @datasource.druid.epmettduck.username@
       password: @datasource.druid.epmettduck.password@
+    heart:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @datasource.druid.heart.url@
+      username: @datasource.druid.heart.username@
+      password: @datasource.druid.heart.password@
 feign:
   hystrix:
     enabled: true

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml

@@ -138,4 +138,18 @@
         AND USER_ID = #{staffId}
     </select>
 
+    <select id="staffSelectList" parameterType="map" resultType="com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO">
+        SELECT
+            cs.USER_ID as `value`,
+            cs.REAL_NAME as label,
+            cs.MOBILE as mobile,
+            cs.REAL_NAME as name
+        FROM
+            customer_staff cs
+        WHERE
+            cs.del_flag = '0'
+        <foreach item="staffId" collection="staffIds" open="and (" separator="or" close=")">
+            cs.user_id = #{staffId}
+        </foreach>
+    </select>
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -36,4 +36,35 @@
         ORDER BY id = #{icUserId} desc <!-- 指定某个人排在第一位 -->
     </select>
 
+    <!--根据特殊人群类别查询居民列表-->
+    <select id="listSpecialResisBySpecialType" resultType="com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO">
+        select resi.id, resi.BUILD_ID, resi.NAME
+        from ic_resi_user resi
+                 inner join ic_special s on (resi.ID = s.IC_RESI_USER)
+        where resi.CUSTOMER_ID = #{customerId}
+          and (resi.AGENCY_ID = #{agencyId} or resi.PIDS like CONCAT(#{queryPids},'%'))
+          <if test="search != null and search != ''">
+            and resi.NAME like CONCAT('%', #{search},'%')
+          </if>
+          and s.SPECIAL_RQLB like CONCAT('%', #{categoryKey},'%')
+          and resi.DEL_FLAG = '0'
+          and s.DEL_FLAG = '0'
+          order by s.CREATED_TIME asc
+    </select>
+
+    <!--根据特殊人群类别查询居民列表-->
+    <select id="countSpecialResisBySpecialType" resultType="int">
+        select count(1)
+        from ic_resi_user resi
+                 inner join ic_special s on (resi.ID = s.IC_RESI_USER)
+        where resi.CUSTOMER_ID = #{customerId}
+          and (resi.AGENCY_ID = #{agencyId} or resi.PIDS like CONCAT(#{queryPids},'%'))
+          <if test="search != null and search != ''">
+            and resi.NAME like CONCAT('%', #{search},'%')
+          </if>
+          and s.SPECIAL_RQLB like CONCAT('%', #{categoryKey},'%')
+          and resi.DEL_FLAG = '0'
+          and s.DEL_FLAG = '0'
+    </select>
+
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcBuildingDao.xml

@@ -10,7 +10,9 @@
             ib.NEIGHBOR_HOOD_ID as neighborHoodId,
             ih.NEIGHBOR_HOOD_NAME as neighborHoodName,
             ih.GRID_ID as gridId,
-            ih.AGENCY_ID  as agencyId
+            ih.AGENCY_ID  as agencyId,
+            ib.LATITUDE           as latitude,
+            ib.LONGITUDE          as longitude
         FROM
             ic_building ib
             INNER JOIN ic_neighbor_hood ih ON ( ib.NEIGHBOR_HOOD_ID = ih.id )

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml

@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.govorg.IcCityManagementDao">
+
+</mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml

@@ -0,0 +1,23 @@
+<?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.dataaggre.dao.govorg.IcCoverageCategoryDictDao">
+
+    <resultMap type="com.epmet.dataaggre.entity.govorg.IcCoverageCategoryDictEntity" id="icCoverageCategoryDictMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="categoryKey" column="CATEGORY_KEY"/>
+        <result property="categoryName" column="CATEGORY_NAME"/>
+        <result property="placeType" column="PLACE_TYPE"/>
+        <result property="coverageType" column="COVERAGE_TYPE"/>
+        <result property="sort" column="SORT"/>
+        <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>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcDangerousChemicalsDao.xml

@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.govorg.IcDangerousChemicalsDao">
+
+</mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml

@@ -0,0 +1,38 @@
+<?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.dataaggre.dao.govorg.IcEnterprisePatrolRecordDao">
+
+    <!--企事业单位巡查计数-->
+    <select id="countEnterprisePatrol" resultType="java.lang.Integer">
+        select count(1)
+        from ic_enterprise e
+        where e.CUSTOMER_ID = #{customerId}
+          and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%')
+          and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%'))
+          and e.PLACE_TYPE = #{categoryKey}
+          and e.DEL_FLAG = '0'
+    </select>
+
+    <!--企事业单位巡查列表-->
+    <select id="listEnterprisePatrol" resultType="com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO">
+        select e.id enterpriseId,
+               e.customer_id,
+               e.grid_id,
+               e.agency_id,
+               e.agency_pids,
+               e.place_type,
+               e.place_org_name,
+               e.address,
+               e.longitude,
+               e.latitude,
+               e.mobile,
+               e.source_type
+        from ic_enterprise e
+        where e.CUSTOMER_ID = #{customerId}
+          and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%')
+          and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%'))
+          and e.PLACE_TYPE = #{categoryKey}
+          and e.DEL_FLAG = '0'
+    </select>
+</mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml

@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.govorg.IcHouseDao">
+
+</mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcPublicServiceDao.xml

@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.govorg.IcPublicServiceDao">
+
+</mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcSuperiorResourceDao.xml

@@ -0,0 +1,7 @@
+<?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.dataaggre.dao.govorg.IcSuperiorResourceDao">
+
+
+</mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml

@@ -0,0 +1,6 @@
+<?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.IcEventDao">
+
+</mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml

@@ -0,0 +1,5 @@
+<?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.dataaggre.dao.heart.IcCommunitySelfOrganizationDao">
+</mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcPartyUnitDao.xml

@@ -0,0 +1,6 @@
+<?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.dataaggre.dao.heart.IcPartyUnitDao">
+
+</mapper>

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java

@@ -19,6 +19,8 @@ public interface ImportTaskConstants {
     String BIZ_TYPE_ATTENTION_VACCINATION = "attention_vaccination";
     String BIZ_TYPE_ATTENTION_TRIP_REPORT = "attention_vaccination";
     String BIZ_TYPE_IC_PARTY_MEMBER = "ic_party_member";
+    String BIZ_TYPE_IC_DANGEROUS_CHEMICALS = "ic_dangerous_chemicals";
+    String BIZ_TYPE_IC_ENTERPRISE="ic_enterprise";
     /**
      * 核酸检测
      */
@@ -46,4 +48,16 @@ public interface ImportTaskConstants {
      * 处理状态：完成，但未完全成功
      */
     String PROCESS_STATUS_FINISHED_FAIL = "finished_fail";
+    /**
+     * 优势资源
+     */
+    String IC_SUPERIOR_RESOURCE = "ic_superior_resource";
+    /**
+     * 公共服务
+     */
+    String IC_PUBLIC_SERVICE = "ic_public_service";
+    /**
+     * 城市管理
+     */
+    String IC_CITY_MANAGEMENT = "ic_city_management";
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationPersonnelDTO.java

@@ -51,6 +51,11 @@ public class IcCommunitySelfOrganizationPersonnelDTO implements Serializable {
      */
 	private String orgId;
 
+    /**
+     * 居民信息当中的志愿者ic_resi_user.id
+     */
+    private String icResiUserId;
+
     /**
      * 人员姓名
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java

@@ -69,12 +69,21 @@ public class IcPartyUnitDTO implements Serializable {
     @NotBlank(message = "分类不能为空",groups = AddGroup.class)
 	private String type;
 
+    /**
+     * 分类名称
+     */
+    private String typeName;
+
     /**
      * 服务事项 多选逗号隔开
      */
 	private String serviceMatter;
 
     private List<String> serviceMatterList;
+    /**
+     * 服务事项名称
+     */
+    private List<String> serviceMatterNameList;
 
     /**
      * 联系人

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java

@@ -50,4 +50,6 @@ public class CommunitySelfOrganizationListFormDTO implements Serializable {
     private String remark;
 
     private String categoryCode;
+    //查详情时候用
+    private String orgId;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java

@@ -18,6 +18,11 @@ public class CommunitySelfOrganizationListDTO implements Serializable {
 
     private static final long serialVersionUID = 3208034033470533749L;
 
+    /**
+     * 本条记录所属组织id
+     */
+    private String agencyId;
+
     /**
      * 排序
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@@ -157,4 +157,5 @@ public interface EpmetHeartOpenFeignClient {
      */
     @PostMapping("/heart/resi/volunteer/addVolunteer")
     Result addVolunteer(@RequestBody ResiVolunteerAuthenticateFormDTO formDTO);
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java

@@ -13,11 +13,13 @@ import com.epmet.dto.form.IcDemandFormDTO;
 import com.epmet.dto.form.PartyUnitListFormDTO;
 import com.epmet.dto.form.demand.DemandRecId;
 import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO;
+import com.epmet.dto.form.demand.ServiceItemSelectFormDTO;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
 import com.epmet.dto.form.resi.VolunteerCommonFormDTO;
 import com.epmet.dto.result.PartyUnitListResultDTO;
 import com.epmet.dto.result.demand.IcResiDemandDictDTO;
+import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
 import com.epmet.feign.EpmetHeartOpenFeignClient;
 
@@ -158,4 +160,5 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
     public Result addVolunteer(ResiVolunteerAuthenticateFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "addVolunteer", formDTO);
     }
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java

@@ -255,6 +255,17 @@ public class IcCommunitySelfOrganizationController {
         return new Result<CommunitySelfOrganizationListResultDTO>().ok(icCommunitySelfOrganizationService.communitySelfOrganizationList(tokenDto, formDTO));
     }
 
+    /**
+     * 社区自组织详情
+     * @param orgId 社区自组织id
+     * @return
+     */
+    @PostMapping("community-self-org-detail/{orgId}")
+    public Result<CommunitySelfOrganizationListDTO> communitySelfOrganizationDetail(@LoginUser TokenDto tokenDto,@PathVariable("orgId") String orgId){
+        return new Result<CommunitySelfOrganizationListDTO>().ok(icCommunitySelfOrganizationService.communitySelfOrganizationDetail(orgId,tokenDto.getCustomerId()));
+    }
+
+
     /**
      * @Description  社区自组织删除
      * @param formDTO

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationPersonnelEntity.java

@@ -45,6 +45,11 @@ public class IcCommunitySelfOrganizationPersonnelEntity extends BaseEpmetEntity
      */
 	private String orgId;
 
+	/**
+	 * 居民信息当中的志愿者ic_resi_user.id
+	 */
+	private String icResiUserId;
+
     /**
      * 人员姓名
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java

@@ -181,4 +181,11 @@ public interface IcCommunitySelfOrganizationService extends BaseService<IcCommun
      * @return
      */
     PageData<CommunitySelfOrganizationListDTO> queryCoordinateList(CategorySelfOrgFormDTO formDTO);
+
+    /**
+     * 社区自组织详情
+     * @param orgId
+     * @return
+     */
+    CommunitySelfOrganizationListDTO communitySelfOrganizationDetail(String orgId,String customerId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

@@ -320,6 +320,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         if (CollectionUtils.isNotEmpty(servicePointList)){
             pointMap = servicePointList.stream().collect(Collectors.toMap(ServicePointDTO::getServerId, ServicePointDTO::getPoint));
         }
+        //当前工作人员所属的组织id
         formDTO.setAgencyId(staffInfo.getAgencyId());
         formDTO.setCustomerId(tokenDto.getCustomerId());
         final int[] i = {(formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize() + NumConstant.ONE};
@@ -800,4 +801,30 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         return new PageData<>(list, NumConstant.ONE_NEG);
     }
 
+    /**
+     * 社区自组织详情
+     *
+     * @param orgId
+     * @return
+     */
+    @Override
+    public CommunitySelfOrganizationListDTO communitySelfOrganizationDetail(String orgId,String customerId) {
+        //获取分类名称字典
+        Result<Map<String, String>> dictMapRes=adminOpenFeignClient.dictMap(DictTypeEnum.SELF_ORG_CATEGORY.getCode());
+        Map<String, String> dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>();
+        CommunitySelfOrganizationListFormDTO formDTO=new CommunitySelfOrganizationListFormDTO();
+        formDTO.setCustomerId(customerId);
+        formDTO.setOrgId(orgId);
+        List<CommunitySelfOrganizationListDTO> list=baseDao.selectCommunitySelfOrganizationList(formDTO);
+        if(CollectionUtils.isEmpty(list)){
+            return null;
+        }
+        for (CommunitySelfOrganizationListDTO l : list) {
+            //赋值分类名称
+            l.setCategoryName(dictMap.get(l.getCategoryCode()));
+        }
+        return list.get(NumConstant.ZERO);
+    }
+
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@@ -60,15 +60,16 @@ import com.epmet.excel.IcPartyUnitImportExcel;
 import com.epmet.excel.IcPartyUnitImportFailedExcel;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.EpmetHeartOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
 import com.epmet.service.IcPartyUnitService;
-import com.epmet.service.IcResiDemandDictService;
 import com.epmet.service.IcServiceItemDictService;
 import com.epmet.service.IcUserDemandRecService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
@@ -103,13 +104,13 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
     @Resource
     private IcUserDemandRecService icUserDemandRecService;
     @Resource
-    private IcResiDemandDictService icResiDemandDictService;
-    @Resource
     private IcServiceItemDictService icServiceItemDictService;
     @Resource
     private OssFeignClient ossFeignClient;
     @Resource
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
+    @Resource
+    private EpmetHeartOpenFeignClient heartOpenFeignClient;
 
     @Override
     public PageData<IcPartyUnitDTO> search(PartyUnitFormDTO formDTO) {
@@ -198,6 +199,25 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
             Map<String, Integer> pointMap = icUserDemandRecService.getServicePoint(entity.getCustomerId(), UserDemandConstant.PARTY_UNIT);
             dto.setServiceMatterList(Arrays.asList(dto.getServiceMatter().split(StrConstant.COMMA)));
             dto.setScore(null == pointMap.get(id) ? NumConstant.ZERO : pointMap.get(id));
+            // 分类名称
+            //获取分类名称字典
+            Result<Map<String, String>> typeDictMapRes=epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
+            Map<String, String> typeDictMap = typeDictMapRes.success() && MapUtils.isNotEmpty(typeDictMapRes.getData()) ? typeDictMapRes.getData() : new HashMap<>();
+            dto.setType(MapUtils.isNotEmpty(typeDictMap) && typeDictMap.containsKey(dto.getType()) ? typeDictMap.get(dto.getType()) : StrConstant.EPMETY_STR);
+            // 服务事项
+            if(CollectionUtils.isNotEmpty(dto.getServiceMatterList())){
+                List<OptionDTO> serviceMateerRes=icServiceItemDictService.queryDictList(entity.getCustomerId());
+                if(CollectionUtils.isNotEmpty(serviceMateerRes)){
+                    Map<String,String> serviceMap=serviceMateerRes.stream().collect(Collectors.toMap(OptionDTO::getValue,OptionDTO::getLabel));
+                    List<String> serviceMatterNameList=new ArrayList<>();
+                    for(String serviceMatterCode:dto.getServiceMatterList()){
+                        if(MapUtils.isNotEmpty(serviceMap)&&serviceMap.containsKey(serviceMatterCode)){
+                            serviceMatterNameList.add(serviceMap.get(serviceMatterCode));
+                        }
+                    }
+                    dto.setServiceMatterNameList(serviceMatterNameList);
+                }
+            }
         }
         return dto;
     }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.20__selforg_icresiuserid.sql

@@ -0,0 +1 @@
+alter table ic_community_self_organization_personnel add COLUMN IC_RESI_USER_ID VARCHAR(64) DEFAULT '' COMMENT '居民信息当中的志愿者ic_resi_user.id'AFTER ORG_ID;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml

@@ -42,13 +42,15 @@
                person_phone as personPhone,
                ID,
                CUSTOMER_ID,
-               ORG_ID
+               ORG_ID,
+               IC_RESI_USER_ID
         from ic_community_self_organization_personnel
         where org_id = #{orgId}
             and del_flag = 0
     </select>
     <select id="selectCommunitySelfOrganizationList" resultMap="selectCommunitySelfOrganizationListMap" parameterType="com.epmet.dto.form.CommunitySelfOrganizationListFormDTO">
         SELECT
+            so.ORG_ID as agencyId,
             so.ORGANIZATION_NAME AS organizationName,
             so.CATEGORY_CODE AS categoryCode,
             so.ORGANIZATION_PERSON_COUNT AS organizationPersonCount,
@@ -62,7 +64,9 @@
             so.remark
         FROM ic_community_self_organization so
         WHERE so.DEL_FLAG = 0
-            AND so.ORG_ID = #{agencyId}
+            <if test="null != agencyId and agencyId != '' ">
+                AND (so.ORG_ID = #{agencyId} or so.PIDS like concat('%',#{agencyId},'%') )
+            </if>
             AND so.CUSTOMER_ID = #{customerId}
             <if test="null != organizationName and organizationName != '' ">
                 AND so.ORGANIZATION_NAME LIKE CONCAT('%',#{organizationName},'%')
@@ -76,6 +80,9 @@
             <if test="null != endTime and endTime != '' ">
                 AND so.ORGANIZATION_CREATED_TIME <![CDATA[ <= ]]> #{endTime}
             </if>
+            <if test="null != orgId and orgId != '' ">
+                AND so.ID = #{orgId}
+            </if>
             ORDER BY so.ORGANIZATION_CREATED_TIME DESC
     </select>
 

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java

@@ -0,0 +1,109 @@
+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 2022-06-16
+ */
+@Data
+public class IcCityManagementDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 所属组织机构Id
+     */
+	private String agencyId;
+
+    /**
+     * agencyId的所有上级，包含自己
+     */
+	private String agencyIdPath;
+
+    /**
+     * 来源【新增:add 导入:import 】
+     */
+	private String sourceType;
+
+    /**
+     * 场所名称
+     */
+	private String name;
+
+    /**
+     * 场所分类【字典表ic_coverage_category_dict  key:city_management】
+     */
+	private String category;
+
+    /**
+     * 占地面积，单位平方公里
+     */
+	private String areaCovered;
+
+    /**
+     * 容纳人数
+     */
+	private Integer capacity;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcDangerousChemicalsDTO.java

@@ -0,0 +1,124 @@
+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 2022-06-16
+ */
+@Data
+public class IcDangerousChemicalsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 所属组织机构Id
+     */
+	private String agencyId;
+
+    /**
+     * agencyId的所有上级，包含自己
+     */
+	private String agencyIdPath;
+
+    /**
+     * 来源【新增:add 导入:import 】
+     */
+	private String sourceType;
+
+    /**
+     * 企业名称
+     */
+	private String name;
+
+    /**
+     * 企业类型【字典表ic_coverage_category_dict  key:dangerous_chemicals】
+     */
+	private String category;
+
+    /**
+     * 周边安全距离，单位公里
+     */
+	private String safeDistance;
+
+    /**
+     * 危化品种类【字典表 ic_danger_type】
+     */
+	private String dangerType;
+
+    /**
+     * 负责人姓名
+     */
+	private String principalName;
+
+    /**
+     * 负责人电话
+     */
+	private String principalMobile;
+
+    /**
+     * 经营地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java

@@ -71,6 +71,11 @@ public class IcHouseDTO implements Serializable {
      */
 	private String houseName;
 
+    /**
+     * 全名:小区，楼栋，单元，房屋
+     */
+	private String fullName;
+
     /**
      * 门牌号
      */

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java

@@ -0,0 +1,109 @@
+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 2022-06-16
+ */
+@Data
+public class IcPublicServiceDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 所属组织机构Id
+     */
+	private String agencyId;
+
+    /**
+     * agencyId的所有上级，包含自己
+     */
+	private String agencyIdPath;
+
+    /**
+     * 来源【新增:add 导入:import 】
+     */
+	private String sourceType;
+
+    /**
+     * 场所名称
+     */
+	private String name;
+
+    /**
+     * 场所分类【字典表ic_coverage_category_dict  key:public_service】
+     */
+	private String category;
+
+    /**
+     * 占地面积，单位平方公里
+     */
+	private String areaCovered;
+
+    /**
+     * 容纳人数
+     */
+	private Integer capacity;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcSuperiorResourceDTO.java

@@ -0,0 +1,109 @@
+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 2022-06-16
+ */
+@Data
+public class IcSuperiorResourceDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 所属组织机构Id
+     */
+	private String agencyId;
+
+    /**
+     * agencyId的所有上级，包含自己
+     */
+	private String agencyIdPath;
+
+    /**
+     * 来源【新增:add 导入:import 】
+     */
+	private String sourceType;
+
+    /**
+     * 场所名称
+     */
+	private String name;
+
+    /**
+     * 场所分类【字典表ic_coverage_category_dict  key:superior_resource】
+     */
+	private String category;
+
+    /**
+     * 占地面积，单位平方公里
+     */
+	private String areaCovered;
+
+    /**
+     * 容纳人数
+     */
+	private Integer capacity;
+
+    /**
+     * 地址
+     */
+	private String address;
+
+    /**
+     * 经度
+     */
+	private String longitude;
+
+    /**
+     * 纬度
+     */
+	private String latitude;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java

@@ -28,6 +28,8 @@ public class ImportGeneralDTO implements Serializable {
     private String pid;
     private String pids;
 
+    private String orgIdPath;
+
     /**
      * 网格名、ID
      */
@@ -145,6 +147,8 @@ public class ImportGeneralDTO implements Serializable {
 
     private String houseName;
 
+    private String fullName;
+
     private String customerId;
 
     private Boolean existStatus = false;

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CoverageCategoryQueryFormDTO.java

@@ -0,0 +1,13 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 图层-类别查询form
+ */
+@Data
+public class CoverageCategoryQueryFormDTO {
+    private List<String> coverageTypes;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditPlaceOrgFormDTO.java

@@ -79,6 +79,7 @@ public class EditPlaceOrgFormDTO implements Serializable {
     public interface Del { }
 
     public interface Detail { }
-
+    private String currentStaffId;
+    private String customerId;
 
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterpriseFormDTO.java

@@ -0,0 +1,113 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+@Data
+public class EnterpriseFormDTO implements Serializable {
+    public interface AddShow extends CustomerClientShowGroup {}
+    // public interface UpdateShow extends CustomerClientShowGroup {}
+    /**
+     * 客户Id
+     * token赋值
+     */
+    private String customerId;
+    private String currentStaffId;
+
+
+    /**
+     * 网格Id【场所区域】
+     */
+    @NotBlank(message = "场所区域不能为空", groups = {AddShow.class})
+    private String gridId;
+
+    /**
+     * 网格所属的组织Id
+     */
+    @NotBlank(message = "所属组织不能为空", groups = {AddShow.class})
+    private String agencyId;
+
+    /**
+     * agency_id的所有上级
+     * 接口内查询
+     */
+    private String agencyPids;
+
+    /**
+     * 场所类型：来源于ic_coverage_category_dict
+     */
+    @NotBlank(message = "场所类型不能为空", groups = {AddShow.class})
+    private String placeType;
+
+    /**
+     * 场所名称
+     */
+    @NotBlank(message = "场所名称不能为空", groups = {AddShow.class})
+    @Length(max = 100, message = "场所名称最多输入50字", groups = {AddShow.class})
+    private String placeOrgName;
+
+    /**
+     * 场所地址
+     */
+    @NotBlank(message = "场所地址不能为空", groups = {AddShow.class})
+    private String address;
+
+    /**
+     * 经度
+     */
+    @NotBlank(message = "位置坐标不能为空", groups = {AddShow.class})
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @NotBlank(message = "位置坐标不能为空", groups = {AddShow.class})
+    private String latitude;
+
+    /**
+     * 字典value,场所规模【
+     0:10人以下
+     1:10-20人
+     2:21-40人
+     3:41-100人
+     4:100人以上】
+     */
+    @NotBlank(message = "规模不能为空", groups = {AddShow.class})
+    private String scale;
+
+    /**
+     * 场所负责人
+     */
+    @NotBlank(message = "负责人不能为空", groups = {AddShow.class})
+    private String personInCharge;
+
+    /**
+     * 负责人电话
+     */
+    @NotBlank(message = "联系电话不能为空", groups = {AddShow.class})
+    @Length(max = 50, message = "联系电话最多输入50位", groups = {AddShow.class})
+    private String mobile;
+
+    /**
+     * 企事业单位id
+     */
+    private String enterpriseId;
+
+    /**
+     * 来源【新增:add 导入:import 】
+     * 接口内复制
+     */
+    private String sourceType;
+
+    /**
+     * 最新巡查结果【0:合格 1:不合格】
+     * 默认为空
+     */
+    private String latestResult;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePageFormDTO.java

@@ -0,0 +1,64 @@
+package com.epmet.dto.form;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 企事业单位
+ */
+@Data
+public class EnterprisePageFormDTO implements Serializable {
+    /**
+     * 场所区域
+     */
+    private String gridId;
+    /**
+     * 场所类型
+     */
+    private String placeType;
+
+    /**
+     * 场所名称
+     */
+    private String placeOrgName;
+
+    /**
+     * 规模
+     */
+    private String scale;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
+    /**
+     * 巡查结果：0:合格 1:不合格
+     */
+    private String result;
+
+    /**
+     * 隐患明细
+     */
+    private String detailed;
+
+
+    private Integer pageNo = 1;
+    private Integer pageSize = 20;
+
+    /**
+     * 列表查询默认分页
+     * 导出不分页
+     */
+    private Boolean pageFlag;
+    //tokenDto.customerId
+    private String customerId;
+    //tokenDto.userId
+    private String currentStaffId;
+    /**
+     * 当前登录用户的所属组织id
+     */
+    private String staffAgencyId;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EnterprisePatrolFormDTO.java

@@ -0,0 +1,83 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class EnterprisePatrolFormDTO implements Serializable {
+    public interface AddShow extends CustomerClientShowGroup {}
+    // public interface UpdateShow extends CustomerClientShowGroup {}
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+    //修改时必填
+    private String patrolId;
+
+    /**
+     * 企事业单位id
+     */
+    @NotBlank(message = "企事业单位id不能为空", groups = {AddShow.class})
+    private String enterpriseId;
+
+    /**
+     * 巡查时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date patrolTime;
+
+    /**
+     * 工作人员id
+     */
+    @NotBlank(message = "巡查人员id不能为空", groups = {AddShow.class})
+    private String staffId;
+
+    /**
+     * 工作人员姓名
+     */
+    @NotBlank(message = "巡查人员姓名不能为空", groups = {AddShow.class})
+    private String staffName;
+
+    /**
+     * 工作人员手机号
+     */
+    @NotBlank(message = "联系电话不能为空", groups = {AddShow.class})
+    private String mobile;
+
+    /**
+     * 检查结果【0:合格 1:不合格】
+     */
+    @NotBlank(message = "检查结果不能为空", groups = {AddShow.class})
+    private String result;
+
+    /**
+     * 隐患明细
+     */
+    @Length(max = 500, message = "隐患明细500字以内", groups = {AddShow.class})
+    private String detailed;
+
+    /**
+     * 拟复查时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date reviewTime;
+    
+    /**
+     * 图片列表
+     */
+    private List<String> imgList;
+
+    //tokenDto.getUserId
+    private String userId;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetListPlaceOrgFormDTO.java

@@ -54,7 +54,7 @@ public class GetListPlaceOrgFormDTO implements Serializable {
     private String placeOrgId;
     //token中userId
     private String staffId;
-    //token中userId所属组织的pid
-    private String pids;
+    //token中userId所属组织
+    private String agencyId;
 
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java

@@ -0,0 +1,69 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 优势资源新增/修改
+ * @Author sun
+ */
+@Data
+public class IcCityManagementAddEditFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public interface Del extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 场所Id
+     */
+    @NotBlank(message = "场所Id不能为空", groups = {UpdateGroup.class, Del.class})
+    private String icCityManagementId;
+    /**
+     * 场所名称
+     */
+    @NotBlank(message = "场所名称不能为空", groups = {AddGroup.class})
+    @Length(max = 50, message = "场所名称不能超过50位", groups = AddGroup.class)
+    private String name;
+    /**
+     * 场所类别
+     */
+    @NotBlank(message = "场所类别不能为空", groups = {AddGroup.class})
+    private String category;
+    /**
+     * 占地面积
+     */
+    private String areaCovered;
+    /**
+     * 容纳人数
+     */
+    private Integer capacity;
+    /**
+     * 经度
+     */
+    @NotBlank(message = "经度不能为空", groups = {AddGroup.class})
+    private String longitude;
+    /**
+     * 维度
+     */
+    @NotBlank(message = "维度不能为空", groups = {AddGroup.class})
+    private String latitude;
+    /**
+     * 地址
+     */
+    @NotBlank(message = "地址不能为空", groups = {AddGroup.class})
+    @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class)
+    private String address;
+
+
+    private String customerId;
+    private String userId;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementListFormDTO.java

@@ -0,0 +1,38 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 【优势资源】列表--接口入参
+ * @Author sun
+ */
+@Data
+public class IcCityManagementListFormDTO implements Serializable {
+    private static final long serialVersionUID = 9156247659994638103L;
+
+    /**
+     * 场所名称
+     */
+    private String name;
+    /**
+     * 场所分类，字典表值
+     */
+    private String category;
+    /**
+     * 页码
+     */
+    private Integer pageNo = 1;
+    /**
+     * 每页显示数量
+     */
+    private Integer pageSize = 20;
+
+    private Boolean isPage = true;
+    private String icCityManagementId;
+    private String customerId;
+    private String staffId;
+    private String agencyId;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsAddEditFormDTO.java

@@ -0,0 +1,81 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 优势资源新增/修改
+ * @Author sun
+ */
+@Data
+public class IcDangerousChemicalsAddEditFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public interface Del extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 场所Id
+     */
+    @NotBlank(message = "场所Id不能为空", groups = {UpdateGroup.class, Del.class})
+    private String icDangerousChemicalsId;
+    /**
+     * 企业名称
+     */
+    @NotBlank(message = "企业名称不能为空", groups = {AddGroup.class})
+    @Length(max = 50, message = "场所名称不能超过50位", groups = AddGroup.class)
+    private String name;
+    /**
+     * 企业类型值
+     */
+    @NotBlank(message = "企业类型不能为空", groups = {AddGroup.class})
+    private String category;
+    /**
+     * 周边安全距离
+     */
+    private String safeDistance;
+    /**
+     * 危化品种类字典值, key值:ic_danger_type
+     */
+    private String dangerType;
+    /**
+     * 负责人
+     */
+    private String principalName;
+    /**
+     * 联系电话
+     */
+    private String principalMobile;
+    /**
+     * 经度
+     */
+    @NotBlank(message = "经度不能为空", groups = {AddGroup.class})
+    private String longitude;
+    /**
+     * 维度
+     */
+    @NotBlank(message = "维度不能为空", groups = {AddGroup.class})
+    private String latitude;
+    /**
+     * 地址
+     */
+    @NotBlank(message = "地址不能为空", groups = {AddGroup.class})
+    @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class)
+    private String address;
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    private String customerId;
+    private String userId;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsListFormDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 【优势资源】列表--接口入参
+ * @Author sun
+ */
+@Data
+public class IcDangerousChemicalsListFormDTO implements Serializable {
+    private static final long serialVersionUID = 9156247659994638103L;
+
+    /**
+     * 场所名称
+     */
+    private String name;
+    /**
+     * 场所分类，字典表值
+     */
+    private String category;
+    /**
+     * 危化品种类字典值
+     */
+    private String dangerType;
+    /**
+     * 页码
+     */
+    private Integer pageNo = 1;
+    /**
+     * 每页显示数量
+     */
+    private Integer pageSize = 20;
+
+    private Boolean isPage = true;
+    private String icDangerousChemicalsId;
+    private String customerId;
+    private String staffId;
+    private String agencyId;
+
+}