Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.22__jmreport_category.sql

@@ -0,0 +1,5 @@
+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 ('1556509011061993473', 'jmreport_category', '报表应用类别', '居民信息、房屋信息', 32, 0, 0, '1', '2022-08-08 13:14:01', '1', '2022-08-08 13:14:01');
+
+
+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 ('1556509175185108994', 1556509011061993473, '房屋信息', 'house_info', '0', '', 2, 0, 0, '1', '2022-08-08 13:14:41', '1', '2022-08-08 13:14:41');
+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 ('1556509102015475714', 1556509011061993473, '居民信息', 'resi_info', '0', '', 1, 0, 0, '1', '2022-08-08 13:14:23', '1', '2022-08-08 13:14:23');

epmet-cloud-generator/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     #MySQL配置
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://118.190.150.119:43306/epmet_user?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://118.190.150.119:43306/epmet_gov_org?useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
     password: root
     #oracle配置

epmet-commons/epmet-commons-feignclient/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epmet-commons</artifactId>
+        <groupId>com.epmet</groupId>
+        <version>2.0.0</version>
+        <!--<relativePath>../../pom.xml</relativePath>-->
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+
+    <artifactId>epmet-commons-feignclient</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+    </dependencies>
+
+</project>

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/JiMuPage.java

@@ -0,0 +1,22 @@
+package com.epmet.commons.feignclient.dtos;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 积木报表的返回值Page对象
+ * @param <T>
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class JiMuPage<T> {
+    private int pageNo;
+    private int pageSize;
+    private int total;
+    private int pages;
+    private List<?> records;
+}

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/JiMuResult.java

@@ -0,0 +1,20 @@
+package com.epmet.commons.feignclient.dtos;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 积木报表的返回值Result对象
+ * @param <T>
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class JiMuResult<T> {
+    private boolean success = true;
+    private String message = "";
+    private Integer code = 0;
+    private T result;
+    private T data;
+}

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/form/JiMuReportFormDTO.java

@@ -0,0 +1,33 @@
+package com.epmet.commons.feignclient.dtos.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/8/8 15:08
+ * @DESC
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class JiMuReportFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3590609549416867701L;
+
+    /**
+     * 报表IDs
+     */
+    private List<String> reportIds;
+
+    /**
+     * 类别
+     */
+    private List<String> categoryKeys;
+
+    private String id;
+}

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/form/JimuReportExportRequestDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.commons.feignclient.dtos.form;
+
+import lombok.Data;
+
+/**
+ * 批量导出用的requst dto
+ */
+@Data
+public class JimuReportExportRequestDTO {
+    private String excelConfigId;
+    private ExportRequestQueryParam queryParam = new ExportRequestQueryParam();
+
+    /**
+     * 批量导出用的请求参数
+     */
+    @Data
+    public static class ExportRequestQueryParam {
+        private String id;
+        private String token;
+        private String paramKey;
+        private String pageNo;
+        private Integer pageSize;
+        private String currentPageNo;
+        private Integer currentPageSize;
+    }
+
+}

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/result/JiMuReportDetailResultDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.commons.feignclient.dtos.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.Map;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class JiMuReportDetailResultDTO {
+    private String id;
+    private String code;
+    private String name;
+    private String note;
+    private String status;
+    private String type;
+    private String jsonStr;
+    private String apiUrl;
+    private String apiMethod;
+    private String apiCode;
+    private String thumb;
+    private Integer template;
+    private String createBy;
+    private Date createTime;
+    private String updateBy;
+    private Date updateTime;
+    private Map<String, Object> dataList;
+}

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/result/JiMuReportResultDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.commons.feignclient.dtos.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/8/8 15:10
+ * @DESC
+ */
+@Data
+public class JiMuReportResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -4048477731892329569L;
+
+    private String code;
+
+    private String name;
+
+    private String id;
+    private String reportId;
+    private String reportName;
+
+    private Boolean isList = false;
+}

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/result/JimuReportDbDataResultDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.commons.feignclient.dtos.result;
+
+import lombok.Data;
+
+@Data
+public class JimuReportDbDataResultDTO {
+
+    private ReportDB reportDb;
+
+    @Data
+    public static class ReportDB {
+        private String apiUrl;
+        private String apiMethod;
+        private String isList;
+        private String dbChName;
+    }
+
+}

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/result/JimuReportFieldTreeResultDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.commons.feignclient.dtos.result;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 积木报表，报表字段列表
+ */
+@Data
+public class JimuReportFieldTreeResultDTO {
+
+    private Boolean expand;
+    private String code;
+    private List<Child> children;
+    private String dbId;
+    private String type;
+    private String isList;
+
+    @Data
+    public static class Child {
+        private Boolean expand;
+        private String title;
+        private String fieldText;
+    }
+}

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/feigns/JiMuReportOpenFeignClient.java

@@ -0,0 +1,47 @@
+package com.epmet.commons.feignclient.feigns;
+
+import com.epmet.commons.feignclient.dtos.JiMuPage;
+import com.epmet.commons.feignclient.dtos.JiMuResult;
+import com.epmet.commons.feignclient.dtos.form.JimuReportExportRequestDTO;
+import com.epmet.commons.feignclient.dtos.result.JiMuReportDetailResultDTO;
+import com.epmet.commons.feignclient.dtos.result.JimuReportDbDataResultDTO;
+import com.epmet.commons.feignclient.dtos.result.JimuReportFieldTreeResultDTO;
+import com.epmet.commons.feignclient.feigns.fallback.JiMuReportOpenFeignClientFallbackFactory;
+import com.epmet.commons.tools.constant.ServiceConstant;
+import feign.Response;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/8/8 13:52
+ * @DESC
+ */
+@FeignClient(name = ServiceConstant.EPMET_JM_REPORT, fallbackFactory = JiMuReportOpenFeignClientFallbackFactory.class)
+//@FeignClient(name = ServiceConstant.EPMET_JM_REPORT, fallbackFactory = JiMuReportOpenFeignClientFallbackFactory.class, url = "localhost:8118")
+public interface JiMuReportOpenFeignClient {
+
+    @GetMapping(value = "jmreport/excelQuery")
+    JiMuResult<JiMuPage<JiMuReportDetailResultDTO>> getList(@RequestParam("pageNo") Integer pageNo,
+                                                            @RequestParam("pageSize") Integer pageSize,
+                                                            @RequestParam("name") String name,
+                                                            @RequestParam("reportType") String reportType,
+                                                            @RequestParam("token") String token,
+                                                            @RequestHeader MultiValueMap<String, String> headers);
+
+    @GetMapping("jmreport/show")
+    JiMuResult<Map<String,Object>> getReport(@RequestParam("id") String id,@RequestParam("apiUrl") String apiUrl,@RequestParam("params") String params,@RequestHeader MultiValueMap<String, String> headers);
+
+    @GetMapping("/jmreport/field/tree/{report-id}")
+    JiMuResult<List<List<JimuReportFieldTreeResultDTO>>> fieldTree(@PathVariable("report-id") String reportId);
+
+    @GetMapping("jmreport/loadDbData/{report-id}")
+    JiMuResult<JimuReportDbDataResultDTO> loadDbData(@PathVariable("report-id") String reportId);
+
+    @PostMapping("jmreport/exportAllExcelStream")
+    Response exportAllExcelStream(JimuReportExportRequestDTO param);
+}

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/feigns/fallback/JiMuReportOpenFeignClientFallback.java

@@ -0,0 +1,51 @@
+package com.epmet.commons.feignclient.feigns.fallback;
+
+import com.epmet.commons.feignclient.dtos.JiMuPage;
+import com.epmet.commons.feignclient.dtos.JiMuResult;
+import com.epmet.commons.feignclient.dtos.form.JimuReportExportRequestDTO;
+import com.epmet.commons.feignclient.dtos.result.JiMuReportDetailResultDTO;
+import com.epmet.commons.feignclient.dtos.result.JimuReportDbDataResultDTO;
+import com.epmet.commons.feignclient.dtos.result.JimuReportFieldTreeResultDTO;
+import com.epmet.commons.feignclient.feigns.JiMuReportOpenFeignClient;
+import feign.Response;
+import org.springframework.util.MultiValueMap;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/8/8 13:53
+ * @DESC
+ */
+public class JiMuReportOpenFeignClientFallback implements JiMuReportOpenFeignClient {
+
+    @Override
+    public JiMuResult<JiMuPage<JiMuReportDetailResultDTO>> getList(Integer pageNo, Integer pageSize, String name, String reportType, String token, MultiValueMap<String, String> headers) {
+        JiMuResult<JiMuPage<JiMuReportDetailResultDTO>> rst = new JiMuResult<>(false, "请求失败", 200, null,null);
+        return rst;
+    }
+
+    @Override
+    public JiMuResult<Map<String,Object>> getReport(String id,String apiUrl,String params,MultiValueMap<String, String> headers) {
+        JiMuResult<Map<String,Object>> rst = new JiMuResult<>(false, "请求失败", 200, null,null);
+        return rst;
+    }
+
+    @Override
+    public JiMuResult<JimuReportDbDataResultDTO> loadDbData(String reportId) {
+        JiMuResult<JimuReportDbDataResultDTO> rst = new JiMuResult<>(false, "请求失败", 200, null,null);
+        return rst;
+    }
+
+    @Override
+    public Response exportAllExcelStream(JimuReportExportRequestDTO param) {
+        return null;
+    }
+
+    @Override
+    public JiMuResult<List<List<JimuReportFieldTreeResultDTO>>> fieldTree(String reportId) {
+        JiMuResult rst = new JiMuResult<>(false, "请求失败", 200, null,null);
+        return rst;
+    }
+}

epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/feigns/fallback/JiMuReportOpenFeignClientFallbackFactory.java

@@ -0,0 +1,24 @@
+package com.epmet.commons.feignclient.feigns.fallback;
+
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/8/9 13:27
+ * @DESC
+ */
+@Slf4j
+@Component
+public class JiMuReportOpenFeignClientFallbackFactory implements FallbackFactory<JiMuReportOpenFeignClientFallback> {
+
+    private JiMuReportOpenFeignClientFallback fallback = new JiMuReportOpenFeignClientFallback();
+
+    @Override
+    public JiMuReportOpenFeignClientFallback create(Throwable cause) {
+        log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause)));
+        return fallback;
+    }
+}

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/OrgOrStaffMQMsg.java

@@ -3,6 +3,7 @@ package com.epmet.commons.rocketmq.messages;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 组织、网格、人员中间库数据上报MQ
@@ -18,7 +19,16 @@ public class OrgOrStaffMQMsg implements Serializable {
     //数据类型【组织:agency 网格:grid 人员:staff】
     private String orgType;
     //操作类型【组织新增:agency_create 组织变更:agency_change  网格新增:grid_create 网格变更:grid_change  人员新增:staff_create 人员变更:staff_change】
+    //删除网格：grid_delete；删除组织：agency_delete
     private String type;
 
+    /**
+     * org原有的Code
+     */
+    private String oldCode;
+
+    //工作人员Id集合
+    private List<String> staffIdList;
+
 
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/ReportRequest.java

@@ -0,0 +1,13 @@
+package com.epmet.commons.tools.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 标记一个接口，它会被报表服务所调用
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ReportRequest {
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ReportRequestAspect.java

@@ -0,0 +1,86 @@
+package com.epmet.commons.tools.aspect;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.redis.RedisUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import java.lang.reflect.Parameter;
+import java.util.Map;
+
+/**
+ * 需要被报表服务请求的api，需要加上这个注解
+ * 1.该注解会取url中固定的key，去redis获取参数，给入参dto复制
+ */
+@Aspect
+@Component
+@Order(20)
+@Slf4j
+public class ReportRequestAspect {
+
+    /**
+     * 从redis中取参数用
+     */
+    public static final String REPORT_REDIS_KEY = "paramKey";
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Before("@annotation(com.epmet.commons.tools.annotation.ReportRequest)")
+    public void before(JoinPoint point) {
+        RequestAttributes ra = RequestContextHolder.getRequestAttributes();
+        ServletRequestAttributes sra = (ServletRequestAttributes) ra;
+        String paramKey = sra.getRequest().getParameter(REPORT_REDIS_KEY);
+        if (StringUtils.isBlank(paramKey)) {
+            // 没有携带key参数，直接跳过
+            return;
+        }
+
+        Map<String, Object> cachedParams = redisUtils.hGetAll(paramKey);
+        if (cachedParams == null || cachedParams.size() == 0) {
+            log.warn("【报表服务】根据paramKey:{}未获取到有效的参数缓存。", paramKey);
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "参数失效", "参数失效");
+            // redis中没有此参数
+        }
+
+        // 使用方法签名获取出参数class列表
+        Object[] args = point.getArgs();
+        MethodSignature signature = (MethodSignature) point.getSignature();
+        Parameter[] parameters = signature.getMethod().getParameters();
+        fillArgsToRequestBody(args, cachedParams, parameters);
+    }
+
+    /**
+     * 将redis中取出的参数，赋值到指定的入参dto上
+     * @param args
+     * @param storedParams
+     */
+    private void fillArgsToRequestBody(Object[] args, Map<String, Object> storedParams, Parameter[] parameters) {
+        for (int i = 0; i < args.length; i++) {
+            Object arg = args[i];
+            RequestBody requestBodyAnno = parameters[i].getAnnotation(RequestBody.class);
+            if (arg != null && requestBodyAnno != null) {
+                Object argBean = BeanUtil.mapToBean(storedParams, arg.getClass(), true);
+
+                // "pageSize", "pageNo", "isPage"三个属性不从redis拷贝，而是取传递雇来的
+                // redis里面的字段如果是null，则不会赋值给arg
+                BeanUtil.copyProperties(argBean, arg, new CopyOptions(null, true, "pageSize", "pageNo", "isPage"));
+                return;
+            }
+        }
+    }
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java

@@ -50,6 +50,8 @@ public interface NumConstant {
     BigDecimal ZERO_DECIMAL = new BigDecimal(0);
     int ONE_THOUSAND = 1000;
     int TEN_THOUSAND = 10000;
+
+    int THREE_THOUSAND = 3000;
     int MAX = 99999999;
     int EIGHTY_EIGHT = 88;
     int EIGHTY = 80;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java

@@ -143,4 +143,14 @@ public interface ServiceConstant {
      * 聚合查询服务
      */
     String DATA_AGGREGATOR_SERVER = "data-aggregator-server";
+
+    /**
+     * 插件pli-power服务
+     */
+    String PLI_POWER_SERVER = "pli-power-base-server";
+
+    /**
+     *
+     */
+    String EPMET_JM_REPORT = "epmet-jmreport-server";
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@@ -110,4 +110,9 @@ public interface StrConstant {
 
     String YES = "是";
     String NO = "否";
+
+    String ELLIPSIS="......";
+
+    String BRACKET_LEFT="(";
+    String BRACKET_RIGNT=")";
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/DictListFormDTO.java

@@ -1,6 +1,8 @@
 package com.epmet.commons.tools.dto.form;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 
@@ -9,6 +11,8 @@ import javax.validation.constraints.NotBlank;
  * @Author sun
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class DictListFormDTO {
 
     /**

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

@@ -0,0 +1,23 @@
+package com.epmet.commons.tools.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/7/26 16:37
+ */
+@Data
+public class ZhzlCategorySelectDTO implements Serializable {
+    private String label;
+    private String value;
+
+    private String queryType;
+    private String tableName;
+    private String columnName;
+    private String columnValue;
+    private Integer sort;
+}
+

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

@@ -0,0 +1,34 @@
+package com.epmet.commons.tools.enums;
+
+public enum CollectUrlEnum {
+
+
+    URL_PRE("subpages/points/pages/fangyi/xinxi/create/index", "小程序码跳转地址"),
+    GET_CODE_URL("https://api.weixin.qq.com/wxa/getwxacode?access_token=", "获取二维码的url");
+
+
+    private String code;
+    private String name;
+
+
+    CollectUrlEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.epmet.commons.tools.enums;
+
+/**
+ * 图层枚举
+ */
+public enum CoverageEnums {
+
+    ZHZL("zhzl", "综合治理图层", 1),
+    YJCL("yjcl", "应急处置资源", 1),
+    AQSC("aqsc", "安全生产资源", 1),
+    CSGL("csgl", "城市管理资源", 1),
+    GGFW("ggfw", "公共服务资源", 1),
+
+    DATA_TYPE_GOVERNED_TARGET("governedTarget", "被管理对象", 2),
+    DATA_TYPE_RESOURCES("resources", "资源", 2);
+
+    private String key;
+    private String name;
+    /**
+     * 1:图层，2：数据类型
+     */
+    private Integer type;
+
+    CoverageEnums(String key, String name, Integer type) {
+        this.key = key;
+        this.name = name;
+        this.type = type;
+    }
+
+    public static CoverageEnums getEnum(String key) {
+        CoverageEnums[] values = CoverageEnums.values();
+        for (CoverageEnums value : values) {
+            if (value.getKey().equals(key)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getCoverageName() {
+        return name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+}

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

@@ -8,14 +8,17 @@ public enum CoveragePlaceTypeEnum {
     SUPERIOR_RESOURCE("superior_resource", "优势资源"),
     DANGEROUS_CHEMICALS("dangerous_chemicals", "重点危化企业"),
     ENTERPRISE_PATROL("enterprise_patrol", "企事业单位巡查"),
+    ENTERPRISE_PATROL_UNQUALIFIED("enterprise_patrol_unqualified", "安全生产隐患"),
     SPECIAL_RESI("special_resi", "特殊人群"),
     CITY_MANAGEMENT("city_management", "城市管理"),
     COMMUNITY_ORG("community_org", "社区自组织"),
     PUBLIC_SERVICE("public_service", "公共服务"),
-    RESI("resi", "居民"),
+    RESI("resi", "公共服务人群"),
     PARTY_UNIT("party_unit", "联建单位"),
+    VOLUNTEER("volunteer", "志愿者"),
     GROUP_RENT("group_rent", "群租房"),
-    EVENT("event", "事件(包括难点堵点)");
+    EVENT("event", "城市管理事件"),
+    ZHZL_RQ("zhzl_rq", "综合治理人群");
 
     private final String code;
     private final String name;

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

@@ -28,6 +28,7 @@ public enum DictTypeEnum {
     IC_SERVICE_TYPE("ic_service_type","服务类别",20),
     IC_DANGER_TYPE("ic_danger_type","危化品种类",24),
     POLICY_LEVEL("policy_level","政策级别",25),
+    LOG_TYPE("log_type", "日志类型", 33),
     ;
 
     private final String code;

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

@@ -0,0 +1,57 @@
+package com.epmet.commons.tools.enums;
+
+public enum ResiCategoryEnum {
+    IS_PARTY("IS_PARTY", "党员"),
+    IS_DBH("IS_DBH", "低保人员"),
+    IS_ENSURE_HOUSE("IS_ENSURE_HOUSE", "保障房人员"),
+    IS_UNEMPLOYED("IS_UNEMPLOYED", "失业人员"),
+    IS_YLFN("IS_YLFN", "育龄妇女"),
+    IS_VETERANS("IS_VETERANS", "退役军人"),
+    IS_UNITED_FRONT("IS_UNITED_FRONT", "统战人员"),
+    IS_XFRY("IS_XFRY", "信访人员"),
+    IS_VOLUNTEER("IS_VOLUNTEER", "志愿者"),
+    IS_OLD_PEOPLE("IS_OLD_PEOPLE", "老年人"),
+    IS_KC("IS_KC", "空巢"),
+    IS_SD("IS_SD", "失独人员"),
+    IS_SN("IS_SN", "失能"),
+    IS_SZ("IS_SZ", "失智"),
+    IS_CJ("IS_CJ", "残疾"),
+    IS_DB("IS_DB", "大病"),
+    IS_MB("IS_MB", "慢病"),
+    IS_SPECIAL("IS_SPECIAL", "特殊人群"),
+    IS_XJC("IS_XJC", "新阶层人士");
+    private String colName;
+    private String label;
+
+
+    ResiCategoryEnum(String colName, String label) {
+        this.colName = colName;
+        this.label = label;
+    }
+
+    /**
+     * 取枚举对象
+     * @param columnName
+     * @return
+     */
+    public static ResiCategoryEnum getEnum(String columnName) {
+        for (ResiCategoryEnum enumObject : ResiCategoryEnum.values()) {
+            if (enumObject.getColName().equals(columnName)) {
+                return enumObject;
+            }
+        }
+        return null;
+    }
+
+    public String getColName() {
+        return colName;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.epmet.commons.tools.enums;
+
+import com.epmet.commons.tools.dto.result.ZhzlCategorySelectDTO;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public enum ZhzlResiCategoryEnum {
+    // resi_xfry	信访人员
+    // anzhibangjiao	安置帮教
+    // xiejiaorenyuan	邪教人员
+    // buliangqingshaonian	不良青少年
+    // shequjiaozheng	社区矫正
+    // zhaoshizhaohuojingshenbing	肇事肇祸精神病
+    // xidurenyuan	吸毒人员
+
+    resi_xfry("resi_xfry", "信访人员", "equal", "ic_resi_user", "IS_XFRY", "1", 1),
+    anzhibangjiao("anzhibangjiao", "安置帮教", "list_equal", "ic_special", "SPECIAL_RQLB", "anzhibangjiao", 2),
+    xiejiaorenyuan("xiejiaorenyuan", "邪教人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xiejiaorenyuan", 3),
+    buliangqingshaonian("buliangqingshaonian", "不良青少年", "list_equal", "ic_special", "SPECIAL_RQLB", "buliangqingshaonian", 4),
+    shequjiaozheng("shequjiaozheng", "社区矫正", "list_equal", "ic_special", "SPECIAL_RQLB", "shequjiaozheng", 5),
+    zhaoshizhaohuojingshenbing("zhaoshizhaohuojingshenbing", "肇事肇祸精神病", "list_equal", "ic_special", "SPECIAL_RQLB", "zhaoshizhaohuojingshenbing", 6),
+    xidurenyuan("xidurenyuan", "吸毒人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xidurenyuan", 7);
+
+    private String code;
+    private String name;
+    private String queryType;
+    private String tableName;
+    private String columnName;
+    private String columnValue;
+    private Integer sort;
+
+
+    ZhzlResiCategoryEnum(String code, String name, String queryType, String tableName, String columnName, String columnValue, Integer sort) {
+        this.code = code;
+        this.name = name;
+        this.queryType = queryType;
+        this.tableName = tableName;
+        this.columnName = columnName;
+        this.columnValue = columnValue;
+        this.sort = sort;
+    }
+
+    public static ZhzlResiCategoryEnum getEnum(String code) {
+        ZhzlResiCategoryEnum[] values = ZhzlResiCategoryEnum.values();
+        for (ZhzlResiCategoryEnum value : values) {
+            if (value.getCode().equals(code)) {
+                return value;
+            }
+        }
+        return null;
+
+    }
+
+
+    /**
+     * 转为数据
+     *
+     * @return 枚举对象数组
+     */
+    public static List<ZhzlCategorySelectDTO> toSelectList() {
+        List<ZhzlCategorySelectDTO> list = new ArrayList<>();
+        for (ZhzlResiCategoryEnum item : ZhzlResiCategoryEnum.values()) {
+            ZhzlCategorySelectDTO selectDTO = new ZhzlCategorySelectDTO();
+            selectDTO.setLabel(item.getName());
+            selectDTO.setValue(item.getCode());
+            selectDTO.setQueryType(item.getQueryType());
+            selectDTO.setTableName(item.getTableName());
+            selectDTO.setColumnName(item.getColumnName());
+            selectDTO.setColumnValue(item.getColumnValue());
+            selectDTO.setSort(item.getSort());
+            list.add(selectDTO);
+        }
+        return list;
+    }
+
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+
+    public String getQueryType() {
+        return queryType;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public String getColumnName() {
+        return columnName;
+    }
+
+    public String getColumnValue() {
+        return columnValue;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -259,6 +259,7 @@ public enum EpmetErrorCode {
 	NOT_REGEIST_RESI(8927,"未注册居民"),
 	UNIT_EXIST_HOUSES_ERROR(8928,"单元下存在房屋，不可修改单元数"),
 	IC_VACCINE(8929,"已存在相同记录，请去修改原有记录"),
+	NOT_MATCH_IC_USER_ERROR(8930,"请联系社区工作人员"),
 
 	MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"),
 

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java

@@ -25,8 +25,6 @@ public class EpmetBaseRequestInterceptor implements RequestInterceptor {
 
 //        Map<String, String> requestHeaders = getHeadersFromRequest();
 
-        log.debug("EpmetBaseRequestInterceptor#apply#inheritableAdditionalHeaders:" + requestHeaders);
-
         if (requestHeaders != null && requestHeaders.size() > 0) {
             for (Map.Entry<String, String> kv : requestHeaders.entrySet()) {
                 template.header(kv.getKey(), kv.getValue());

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/page/PageData.java

@@ -29,6 +29,7 @@ public class PageData<T> implements Serializable {
 
     private List<T> list;
 
+    private int pages;
     /**
      * 分页
      * @param list   列表数据
@@ -38,4 +39,10 @@ public class PageData<T> implements Serializable {
         this.list = list;
         this.total = (int)total;
     }
+
+    public PageData(List<T> list, long total,int pageSize) {
+        this.list = list;
+        this.total = (int)total;
+        this.pages = (int) Math.ceil((double)total / pageSize);
+    }
 }

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

@@ -766,6 +766,16 @@ public class RedisKeys {
 		return rootPrefix.concat("gov:access:nav:");
 	}
 
+	/**
+	 * Desc: 新五大图层获取菜单缓存key
+	 * @param
+	 * @author zxc
+	 * @date 2022/7/27 13:42
+	 */
+	public static String getCustomerMenuListFiveCoverage() {
+		return rootPrefix.concat("customer:govMenu:");
+	}
+
 	/**
 	 * 如果是省列表：epmet:areacode:parentCode:0
 	 * 山东省的下一级：epmet:areacode:parentCode:37
@@ -839,4 +849,11 @@ public class RedisKeys {
 	public static String getServiceOrgNameKey(String customerId,String serviceOrgType,String serviceOrgId){
 		return rootPrefix.concat("serviceOrgName:").concat(serviceOrgType).concat(":").concat(customerId).concat(":").concat(serviceOrgId);
 	}
+
+	public static String getUserBaseInfoKey(String userId) {
+		if (StringUtils.isBlank(userId)){
+			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误");
+		}
+		return rootPrefix.concat("staffbaseinfo:")+userId;
+	}
 }

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

@@ -375,6 +375,15 @@ public class RedisUtils {
         return redisTemplate.opsForSet().add(key,value);
     }
 
+    public void listAdd(String key,Object value){
+        redisTemplate.opsForList().rightPush(key,value);
+    }
+
+    public Object listGetAll(String key,Integer start, Integer end){
+        List<Object> result = redisTemplate.opsForList().range(key, start, end);
+        return result;
+    }
+
     /**
      * @Description  获取 zset 中带score的集合
      * @param key

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

@@ -2,6 +2,7 @@ package com.epmet.commons.tools.utils;
 
 import com.alibaba.ttl.TransmittableThreadLocal;
 import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.constant.Constant;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
@@ -86,6 +87,14 @@ public class EpmetRequestHolder {
         return getHeader(AppClientConstant.CLIENT);
     }
 
+    /**
+     * 获取登陆用户的token
+     * @return
+     */
+    public static String getLoginUserAuthorizationToken() {
+        return getHeader(Constant.AUTHORIZATION_HEADER);
+    }
+
     /**
      * 获取所有
      * @return

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

@@ -443,6 +443,34 @@ public class HttpClientManager {
 		}
 	}
 
+	public Result<String> sendGet(String url, Map<String, Object> params, Map<String, Object> headerMap) {
+
+		try {
+			URIBuilder builder = new URIBuilder(url);
+			if (!CollectionUtils.isEmpty(params)) {
+				Set<String> set = params.keySet();
+				for (String key : set) {
+					builder.setParameter(key, params.get(key) == null ? "" : String.valueOf(params.get(key)));
+				}
+			}
+
+			System.out.println(builder.getPath());
+			HttpGet httpGet = new HttpGet(builder.build());
+			httpGet.setConfig(requestConfig);
+			if (null != headerMap){
+				headerMap.forEach((k,v) -> {
+					if (StringUtils.isNotBlank(k)) {
+						httpGet.addHeader(k, v == null ? null : v.toString());
+					}
+				});
+			}
+			return execute(httpGet,false);
+		} catch (Exception e) {
+			log.error("sendGet exception", e);
+			return new Result<String>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
+		}
+	}
+
 	private Result<String> execute(HttpRequestBase httpMethod, boolean isHttps) {
 		CloseableHttpResponse response = null;
 		try {

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

@@ -0,0 +1,37 @@
+package com.epmet.commons.tools.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * desc:utf8mb4转为utf8
+ *
+ * @author: LiuJanJun
+ * @date: 2022/7/22 9:45 下午
+ * @version: 1.0
+ */
+public class StrUtil {
+
+    private static final int LAST_BMP = 0xFFFF;
+
+    public static String filterEmoji(String source) {
+        if (StringUtils.isBlank(source)) {
+            return source;
+        }
+        StringBuilder sb = new StringBuilder(source.length());
+        for (int i = 0; i < source.length(); i++) {
+            int codePoint = source.codePointAt(i);
+            if (codePoint < LAST_BMP) {
+                sb.appendCodePoint(codePoint);
+            } else {
+                i++;
+            }
+        }
+        return sb.toString();
+    }
+
+
+    public static void main(String[] args) {
+        String x = StrUtil.filterEmoji("😀😁😆😅🥹🥹😇😗😀😂666");
+        System.out.println(x);
+    }
+}

epmet-gateway/pom.xml

@@ -278,6 +278,7 @@
 <!--                <gateway.routes.epmet-oss-server.uri>http://localhost:8083</gateway.routes.epmet-oss-server.uri>-->
                 <!--  5、消息服务  -->
                 <gateway.routes.epmet-message-server.uri>lb://epmet-message-server</gateway.routes.epmet-message-server.uri>
+<!--                <gateway.routes.epmet-message-server.uri>http://localhost:8085</gateway.routes.epmet-message-server.uri>-->
                 <!--  6、工作流服务 -->
                 <gateway.routes.epmet-activiti-server.uri>lb://epmet-activiti-server</gateway.routes.epmet-activiti-server.uri>
                 <!--  7、定时任务服务  -->
@@ -317,6 +318,7 @@
 
                 <!--19.政府端-权限-服务-->
                 <gateway.routes.gov-access-server.uri>lb://gov-access-server</gateway.routes.gov-access-server.uri>
+                <!--<gateway.routes.gov-access-server.uri>http://localhost:8099</gateway.routes.gov-access-server.uri>-->
 
                 <!--20.政府端-我的-服务-->
                 <!--                <gateway.routes.gov-mine-server.uri>http://localhost:8098</gateway.routes.gov-mine-server.uri>-->
@@ -356,7 +358,7 @@
 
                 <!-- 32、爱心互助            -->
                 <gateway.routes.epmet-heart-server.url>lb://epmet-heart-server</gateway.routes.epmet-heart-server.url>
-                <!--                <gateway.routes.epmet-heart-server.url>http://127.0.0.1:8111</gateway.routes.epmet-heart-server.url>-->
+<!--                                <gateway.routes.epmet-heart-server.url>http://127.0.0.1:8111</gateway.routes.epmet-heart-server.url>-->
                 <!-- 33、 积分银行 -->
                 <gateway.routes.epmet-point-server.url>lb://epmet-point-server</gateway.routes.epmet-point-server.url>
                 <!--                <gateway.routes.epmet-point-server.url>http://127.0.0.1:8112</gateway.routes.epmet-point-server.url>-->

epmet-gateway/src/main/resources/bootstrap.yml

@@ -502,6 +502,7 @@ epmet:
   # 内部认证url白名单(在白名单中的，就不会再校验登录了)
   internalAuthUrlsWhiteList:
     - /epmetuser/customerstaff/customerlist
+    - /epmetuser/icresiuser/icUserMatchGrid
     - /auth/wechat/**
     - /**/druid/**
     - /gov/project/project/platformcallback

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

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

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

@@ -15,4 +15,11 @@ public interface OrgConstant {
 	String GRID_ID="GRID_ID";
 	String GENDER="GENDER";
 	String HOUSE_TYPE_KEY="HOUSE_TYPE";
+
+	String AGENCY_ID="agencyId";
+	String AGENC_PATH="agencyPath";
+
+	String SEARCH_TYPE_USER = "user";
+	String SEARCH_TYPE_EVENT = "event";
+	String SEARCH_TYPE_RESOURCE = "resource";
 }

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

@@ -0,0 +1,22 @@
+package com.epmet.dataaggre.constant;
+
+/**
+ *
+ */
+public interface TableConstant {
+
+    String IC_DANGEROUS_CHEMICALS = "ic_dangerous_chemicals";
+
+    String IC_SUPERIOR_RESOURCE = "ic_superior_resource";
+
+    String IC_ENTERPRISE = "ic_enterprise";
+
+    String IC_COMMUNITY_SELF_ORGANIZATION = "ic_community_self_organization";
+
+    String IC_CITY_MANAGEMENT = "ic_city_management";
+
+    String IC_PUBLIC_SERVICE = "ic_public_service";
+
+    String IC_EVENT = "ic_event";
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisGovernedTargetsResult.java

@@ -0,0 +1,25 @@
+package com.epmet.dataaggre.dto.coverage;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 五大图层分析-被管理对象分类
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AnalysisGovernedTargetsResult {
+
+    private String categoryKey;
+    private String categoryName;
+    private String coverageType;
+    private String placeType;
+    private String placeTypeName;
+    private Integer quantity = 0;
+
+    private List<AnalysisGovernedTargetsResult> children;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java

@@ -0,0 +1,70 @@
+package com.epmet.dataaggre.dto.coverage;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * 五大图层-可视化-右侧分类树列表
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AnalysisResourceCategoriesResult {
+
+    /**
+     * 图层类型
+     */
+    private String coverageType;
+    /**
+     * 图层名称
+     */
+    private String coverageName;
+    /**
+     * 个数
+     */
+    private AtomicInteger quantity = new AtomicInteger(0);
+
+    /**
+     * 没有placeTypeInAnalysis，直接属于图层的
+     */
+    private List<Category> categories = new ArrayList<>();
+
+    /**
+     * 场所类型，有placeTypeInAnalysis，不直接属于图层的
+     */
+    private List<PlaceType> placeTypesInAnalysis = new ArrayList<>();
+
+    /**
+     * 分类
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Category {
+        private String categoryKey;
+        private String categoryName;
+        private String coverageType;
+        private String placeType;
+        private Integer quantity = 0;
+    }
+
+    /**
+     * 场所类型
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class PlaceType {
+        private String placeType;
+        private String placeTypeName;
+        private AtomicInteger quantity = new AtomicInteger(0);
+        private List<Category> categories;
+    }
+
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/NowStatsDataFormDTO.java

@@ -0,0 +1,59 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 数据统计页面查询-接口入参
+ */
+@Data
+public class NowStatsDataFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 6462094914874831738L;
+
+    public interface CustomerDataManageForm{}
+
+    /**
+     * 客户ID
+     */
+    @NotBlank(message = "客户ID不能为空",groups = CustomerDataManageForm.class)
+    private String customerId;
+
+    /**
+     * 组织ID
+     */
+    @NotBlank(message = "组织ID不能为空",groups = CustomerDataManageForm.class)
+    private String agencyId;
+
+    /**
+     * 区间:Interval  截止:end
+     */
+    @NotBlank(message = "type不能为空",groups = CustomerDataManageForm.class)
+    private String type;
+
+    /**
+     * 开始时间 精确到秒【yyyy-MM-dd HH:mm:ss】
+     */
+    private String startTime;
+
+    /**
+     * 结束时间 精确到秒【yyyy-MM-dd HH:mm:ss】
+     */
+    @NotBlank(message = "结束时间不能为空",groups = CustomerDataManageForm.class)
+    private String endTime;
+
+
+    //组织或网格Id集合
+    private List<String> idList;
+    //数据类型【组织agency 网格grid】
+    private String dataType;
+
+    /**
+     * desc:是否是导出
+     */
+    private boolean export = false;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/NowStatsDataResultDTO.java

@@ -0,0 +1,46 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description 数据统计页面查询-接口返参
+ */
+@Data
+public class NowStatsDataResultDTO {
+
+        //组织、网格Id
+        private String orgId;
+        //组织、网格名称
+        private String orgName;
+        //注册居民数
+        private Integer resiUserCount = 0;
+        //注册党员数
+        private Integer partyMemberCount = 0;
+        //事件总数
+        private Integer icEventCount = 0;
+        //居民上报事件数【小程序端随手拍随时讲】
+        private Integer resiEventCount = 0;
+        //平台录入事件数【数字平台录入的事件数】
+        private Integer pcEventCount = 0;
+        //项目总数
+        private Integer projectCount = 0;
+        //议题转项目数
+        private Integer issueProjectCount = 0;
+        //事件立项数
+        private Integer icEventProjectCount = 0;
+        //直接立项项目数
+        private Integer agencyProjectCount = 0;
+
+
+        //组织的pids
+        private String pids;
+        //事件来源，0代表居民点 其他代表数字平台
+        private String sourceType;
+        //项目来源 issue议题 agency立项 ic_event事件
+        private String origin;
+
+}

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

@@ -44,6 +44,16 @@ public class RegisterRelationDTO implements Serializable {
      */
 	private String customerId;
 
+    /**
+     * 所属组织机构Id
+     */
+    private String agencyId;
+
+    /**
+     * agencyId的所有上级，包含自己
+     */
+    private String agencyIdPath;
+
     /**
      * 网格Id (customer_grid.id)
      */

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

@@ -10,4 +10,5 @@ public class IcResiInfoResultDTO {
     private String id;
     private String name;
     private String buildId;
+    private String idNum;
 }

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

@@ -9,7 +9,16 @@ import java.util.List;
  */
 @Data
 public class CoverageAnalisisDataListFormDTO {
+    /**
+     * 目前都是组织id
+     */
+    private String orgId;
 
+    /**
+     * agency
+     * grid
+     */
+    private String orgType;
     /**
      * 图层类型列表
      */

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

@@ -0,0 +1,44 @@
+package com.epmet.dataaggre.dto.govorg.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/7/28 11:09
+ */
+@Data
+public class CoverageAnalisisDataListLeftFormDTO {
+    public interface ShowGroup extends CustomerClientShowGroup {
+    }
+    /**
+     * 目前都是组织id
+     */
+    @NotBlank(message = "组织不能为空", groups = ShowGroup.class)
+    private String orgId;
+
+    /**
+     * agency
+     * grid
+     */
+    @NotBlank(message = "组织类型不能为空", groups = ShowGroup.class)
+    private String orgType;
+    /**
+     * 图层类型列表
+     */
+    private List<String> coverageTypes;
+
+    /**
+     * 分类key
+     */
+    private List<String> categoryKeys;
+
+    private String customerId;
+    private String staffId;
+
+}
+

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

@@ -0,0 +1,44 @@
+package com.epmet.dataaggre.dto.govorg.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/7/26 16:25
+ * @DESC
+ */
+@Data
+public class CoverageHomeSearchFormDTO extends PageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3776954636762201010L;
+
+    private String name;
+
+    private String customerId;
+
+    private String userId;
+
+    private String orgId;
+
+    private String pids;
+
+    private String tableName;
+
+    /**
+     * 搜索类型，居民：user；事件：event；资源：resource
+     */
+    private String searchType;
+
+    /**
+     * 资源类型：社区自组织：community_org;优势资源:superior_resource;城市管理：city_management；重点危化企业：dangerous_chemicals；公共服务：public_service；企事业单位巡查：enterprise_patrol；
+     * searchType为resource时，此字段必填
+     */
+    private String resourceType;
+
+    private String resourceId;
+    private String icEventId;
+    private String icUserId;
+}

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

@@ -0,0 +1,33 @@
+package com.epmet.dataaggre.dto.govorg.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/7/29 10:38
+ */
+@Data
+public class DataListLeftSubTotalFormDTO {
+    public interface AddUserInterGroup{}
+    @NotBlank(message = "orgId不能为空",groups = AddUserInterGroup.class)
+    private String orgId;
+    @NotBlank(message = "orgType不能为空",groups = AddUserInterGroup.class)
+    private String orgType;
+
+
+    private String coverageType;
+
+    @NotBlank(message = "categoryKey不能为空",groups = AddUserInterGroup.class)
+    private String categoryKey;
+
+    @NotBlank(message = "placeType不能为空",groups = AddUserInterGroup.class)
+    private String placeType;
+
+
+    private String customerId;
+    private String staffId;
+}
+

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

@@ -0,0 +1,39 @@
+package com.epmet.dataaggre.dto.govorg.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/7/29 08:48
+ * @DESC
+ */
+@Data
+public class SearchDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3499320376768396157L;
+
+    public interface SearchUserDetailForm{}
+    public interface SearchEventDetailForm{}
+    public interface SearchResourceDetailForm{}
+
+    @NotBlank(message = "icUserId不能为空",groups = SearchUserDetailForm.class)
+    private String icUserId;
+
+    @NotBlank(message = "icEventId不能为空",groups = SearchEventDetailForm.class)
+    private String icEventId;
+
+    @NotBlank(message = "resourceId不能为空",groups = SearchResourceDetailForm.class)
+    private String resourceId;
+
+    /**
+     * 资源类型：社区自组织：community_org;优势资源:superior_resource;城市管理：city_management；重点危化企业：dangerous_chemicals；公共服务：public_service；企事业单位巡查：enterprise_patrol；
+     */
+    @NotBlank(message = "resourceType不能为空",groups = SearchResourceDetailForm.class)
+    private String resourceType;
+
+    private String customerId;
+
+}

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

@@ -1,8 +1,10 @@
 package com.epmet.dataaggre.dto.govorg.result;
 
+import com.epmet.commons.tools.constant.StrConstant;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 
 @Data
 @NoArgsConstructor
@@ -40,4 +42,21 @@ public class CoverageAnalisisDataListResultDTO {
      */
     private String longitude;
 
+    /**
+     * 经度,纬度：120.38862649282282,36.07138835989835
+     */
+    private String longLat;
+
+    public CoverageAnalisisDataListResultDTO(String id, String categoryKey, String categoryName, String placeType, String content, String latitude, String longitude) {
+        this.id=id;
+        this.categoryKey=categoryKey;
+        this.categoryName=categoryName;
+        this.placeType=placeType;
+        this.content=content;
+        this.latitude=latitude;
+        this.longitude=longitude;
+        if(StringUtils.isNotBlank(latitude)&&StringUtils.isNotBlank(longitude)){
+            this.longLat=longitude.concat(StrConstant.COMMA).concat(latitude);
+        }
+    }
 }

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

@@ -0,0 +1,26 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/7/28 11:13
+ */
+@Data
+public class CoverageAnalisisDataListResultDTOV2 {
+    /**
+     * 维度
+     */
+    private String latitude;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    private List<CoverageAnalisisDataListResultDTO> dataList;
+}
+

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

@@ -0,0 +1,46 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/7/26 16:25
+ * @DESC
+ */
+@Data
+public class CoverageHomeSearchResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 8922820109004386708L;
+
+    /**
+     * 居民信息
+     */
+    private List<UserInfoResultDTO> userInfos;
+    private Long userInfosTotal;
+
+    /**
+     * 事件信息
+     */
+    private List<EventInfoResultDTO> eventInfos;
+    private Long eventInfoTotal;
+
+    /**
+     * 资源信息
+     */
+    private List<ResourceInfoResultDTO> resourceInfos;
+    private Long resourceInfoTotal;
+
+    public CoverageHomeSearchResultDTO() {
+        this.userInfos = new ArrayList<>();
+        this.userInfosTotal = NumConstant.ZERO_L;
+        this.eventInfos = new ArrayList<>();
+        this.eventInfoTotal = NumConstant.ZERO_L;
+        this.resourceInfos = new ArrayList<>();
+        this.resourceInfoTotal = NumConstant.ZERO_L;
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/7/29 10:45
+ */
+@Data
+public class DataListLeftSubTotalResDTO {
+    private String orgId;
+    private String orgType;
+    private String orgName;
+    private String longitude;
+    private String latitude;
+    private Integer total=0;
+}
+

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

@@ -0,0 +1,59 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/7/26 16:52
+ * @DESC 事件本组织及下级难点堵点： 社区治理-事件管理中标记的痛点堵点
+ */
+@Data
+public class EventInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1645410018462094960L;
+
+    /**
+     * 事件ID
+     */
+    private String eventId;
+
+    /**
+     * 所属网格
+     */
+    private String gridName;
+
+    @JsonIgnore
+    private String gridId;
+
+    /**
+     * 发生时间 yyyy-dd-mm hh:ii:ss
+     */
+    private String happenTime;
+
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    public EventInfoResultDTO() {
+        this.eventId = "";
+        this.gridName = "";
+        this.happenTime = "";
+        this.eventContent = "";
+        this.longitude = "";
+        this.latitude = "";
+    }
+}

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

@@ -38,5 +38,13 @@ public class GridInfoResultDTO implements Serializable {
     private String gridId = "";
     private String gridName = "";
     private String pids = "";
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
 
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
 }

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

@@ -0,0 +1,76 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/7/26 16:52
+ * @DESC
+ */
+@Data
+public class ResourceInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1645410018462094960L;
+
+    private String resourceId;
+    private String resourceType;
+
+    private String name;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+    private String category;
+
+    /**
+     * 占地面积
+     */
+    private String areaCovered;
+
+    /**
+     * 容纳人数
+     */
+    private String capacity;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
+    /**
+     * 联系人
+     */
+    private String principal;
+
+    public ResourceInfoResultDTO() {
+        this.resourceId = "";
+        this.resourceType = "";
+        this.name = "";
+        this.longitude = "";
+        this.latitude = "";
+        this.categoryName = "";
+        this.areaCovered = "";
+        this.capacity = "";
+        this.address = "";
+        this.mobile = "";
+        this.principal = "";
+    }
+}

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

@@ -0,0 +1,92 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/7/26 16:52
+ * @DESC
+ */
+@Data
+public class UserInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1645410018462094960L;
+
+    private String icUserId;
+
+    /**
+     * 名字
+     */
+    private String name;
+
+    /**
+     * 所属网格
+     */
+    private String gridName;
+
+    @JsonIgnore
+    private String gridId;
+
+    /**
+     * 所属房屋
+     */
+    private String houseName;
+
+    @JsonIgnore
+    private String homeId;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 工作单位
+     */
+    private String gzdw;
+
+    /**
+     * 人户情况
+     */
+    private String rhqk;
+
+    /**
+     * 人员分类
+     */
+    private List<String> type;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    public UserInfoResultDTO() {
+        this.icUserId = "";
+        this.name = "";
+        this.gridName = "";
+        this.houseName = "";
+        this.homeId = "";
+        this.mobile = "";
+        this.idCard = "";
+        this.gzdw = "";
+        this.rhqk = "";
+        this.type = new ArrayList<>();
+        this.longitude = "";
+        this.latitude = "";
+    }
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/OrgInfoCommonDTO.java

@@ -17,4 +17,13 @@ public class OrgInfoCommonDTO implements Serializable {
     private String orgId;
     private String orgName;
     private String orgType;
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/MenusEnums.java

@@ -0,0 +1,75 @@
+package com.epmet.dataaggre.enums;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum MenusEnums {
+
+    IC_DANGEROUS_CHEMICALS("shequzhili/tuceng/anquan/weihua/index","ic_dangerous_chemicals","重点危化品企业","govorg"),
+    IC_SUPERIOR_RESOURCE("shequzhili/tuceng/yingji/ziyuan/index","ic_superior_resource","优势资源管理","govorg"),
+    IC_ENTERPRISE("shequzhili/tuceng/anquan/xuncha/index","ic_enterprise","企事业单位巡查","govorg"),
+    IC_COMMUNITY_SELF_ORGANIZATION("communityService/sqzzz/index","ic_community_self_organization","社区自组织","heart"),
+    IC_CITY_MANAGEMENT("shequzhili/csgltc/csgl","ic_city_management","城市管理图层","govorg"),
+    IC_PUBLIC_SERVICE("shequzhili/ggfwtc/ggfw","ic_public_service","公共服务图层","govorg"),
+    IC_EVENT("shequzhili/event/eventList","ic_event","事件管理","govproject");
+
+    private String url;
+    private String value;
+    private String name;
+    private String db;
+
+    MenusEnums(String url, String value, String name, String db) {
+        this.url = url;
+        this.value = value;
+        this.name = name;
+        this.db = db;
+    }
+
+    public static MenusEnums get(String url) {
+        for (MenusEnums gm : MenusEnums.values()) {
+            if (gm.url.equals(url)) {
+                return gm;
+            }
+        }
+        return null;
+    }
+
+    public static String getValueByUrl(String url){
+        if (StringUtils.isBlank(url)){
+            return "";
+        }
+        for (MenusEnums me : MenusEnums.values()) {
+            if (me.url.equals(url)) {
+                return me.getValue();
+            }
+        }
+        return "";
+    }
+
+    public static String getDbByValue(String table){
+        if (StringUtils.isBlank(table)){
+            return "";
+        }
+        for (MenusEnums me : MenusEnums.values()) {
+            if (me.value.equals(table)) {
+                return me.getDb();
+            }
+        }
+        return "";
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDb() {
+        return db;
+    }
+}

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

@@ -13,6 +13,11 @@
     <artifactId>data-aggregator-server</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-access-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-heart-client</artifactId>
@@ -254,6 +259,13 @@
                 <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
                 <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
 
+                <!--epmet_resi_partymember-->
+                <datasource.druid.partymember.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.partymember.url>
+                <datasource.druid.partymember.username>epmet_resi_partymember_user</datasource.druid.partymember.username>
+                <datasource.druid.partymember.password>EpmEt-db-UsEr</datasource.druid.partymember.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -385,6 +397,13 @@
                 <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
                 <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
 
+                <!--epmet_resi_partymember-->
+                <datasource.druid.partymember.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.partymember.url>
+                <datasource.druid.partymember.username>epmet_resi_partymember_user</datasource.druid.partymember.username>
+                <datasource.druid.partymember.password>EpmEt-db-UsEr</datasource.druid.partymember.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -517,6 +536,13 @@
                 <datasource.druid.heart.username>epmet</datasource.druid.heart.username>
                 <datasource.druid.heart.password>elink@833066</datasource.druid.heart.password>
 
+                <!--epmet_resi_partymember-->
+                <datasource.druid.partymember.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.partymember.url>
+                <datasource.druid.partymember.username>epmet</datasource.druid.partymember.username>
+                <datasource.druid.partymember.password>elink@833066</datasource.druid.partymember.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.10.150</spring.redis.host>
@@ -649,6 +675,13 @@
                 <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
                 <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
 
+                <!--epmet_resi_partymember-->
+                <datasource.druid.partymember.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.partymember.url>
+                <datasource.druid.partymember.username>epmet_resi_partymember_user</datasource.druid.partymember.username>
+                <datasource.druid.partymember.password>EpmEt-db-UsEr</datasource.druid.partymember.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

@@ -1,19 +1,31 @@
 package com.epmet.dataaggre.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.dto.result.ZhzlCategorySelectDTO;
+import com.epmet.commons.tools.enums.ZhzlResiCategoryEnum;
+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.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
 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.commons.tools.validator.ValidatorUtils;
+import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult;
+import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult;
+import com.epmet.dataaggre.dto.govorg.form.*;
+import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.service.CoverageService;
-import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 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;
+import java.util.Map;
 
 /**
  * 5大图层controller
@@ -32,15 +44,122 @@ public class CoverageController {
      */
     @RequestMapping("dataList")
     public Result<PageData<CoverageAnalisisDataListResultDTO>> dataList(@RequestBody CoverageAnalisisDataListFormDTO input) {
+        // 获取跟组织的坐标
+        String customerId = EpmetRequestHolder.getLoginUserCustomerId();
+        String staffId = EpmetRequestHolder.getLoginUserId();
         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,
+        PageData<CoverageAnalisisDataListResultDTO> page = coverageService.analysisDataList(customerId,staffId,input.getOrgId(),input.getOrgType(),coverageTypes, categoryKeys,
                 input.getSearch(), input.getPageNo(), input.getPageSize(), input.getIsPage());
         return new Result<PageData<CoverageAnalisisDataListResultDTO>>().ok(page);
     }
 
+    /**
+     * 综合治理图层页面，居民类别下拉框
+     * @return
+     */
+    @PostMapping("zhzl-category-option")
+    public Result<List<ZhzlCategorySelectDTO>> queryZhzlCategorySelectOptions() {
+        List<ZhzlCategorySelectDTO> list = ZhzlResiCategoryEnum.toSelectList();
+        return new Result<List<ZhzlCategorySelectDTO>>().ok(list);
+    }
+    /**
+     * Desc: 五大图层首页搜索
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/7/26 16:29
+     */
+    @PostMapping("search")
+    public Result<CoverageHomeSearchResultDTO> coverageHomeSearch(@RequestBody CoverageHomeSearchFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<CoverageHomeSearchResultDTO>().ok(coverageService.coverageHomeSearch(formDTO));
+    }
+
+    /**
+     * 五大图层-可视化-右侧分类树列表
+     * @return
+     */
+    @PostMapping("analysis/resourceCategories")
+    public Result<List<AnalysisResourceCategoriesResult>> listAnalysisResourceCategories(@RequestBody Map<String, String> input) {
+        String agencyId = input.get("agencyId");
+        List<AnalysisResourceCategoriesResult> r = coverageService.listAnalysisResourceCategories(agencyId);
+        return new Result<List<AnalysisResourceCategoriesResult>>().ok(r);
+    }
+
+    /**
+     * 被管理对象分类列表
+     * @param input:只有一个字段:agencyId
+     * @return
+     */
+    @PostMapping("analysis/governedTargetCategories")
+    public Result<List<AnalysisGovernedTargetsResult>> listGovernedTargetCategories(@RequestBody Map<String, String> input) {
+        String agencyId = input.get("agencyId");
+        if (StringUtils.isBlank(agencyId)) {
+            throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "请输入组织ID");
+        }
+        List<AnalysisGovernedTargetsResult> r = coverageService.listGovernedTargetCategories(agencyId);
+        return new Result<List<AnalysisGovernedTargetsResult>>().ok(r);
+    }
+
+    /**
+     * 五大图层，左侧菜单，点击事件，查询人.事的分布
+     *
+     * @param formDTO
+     * @return
+     */
+    @RequestMapping("dataList-left")
+    public Result<PageData<CoverageAnalisisDataListResultDTOV2>> dataListLeft(@LoginUser TokenDto tokenDto, @RequestBody CoverageAnalisisDataListLeftFormDTO formDTO) {
+        List<String> coverageTypes = formDTO.getCoverageTypes();
+        List<String> categoryKeys = formDTO.getCategoryKeys();
+        if (CollectionUtils.isEmpty(coverageTypes)||CollectionUtils.isEmpty(categoryKeys)) {
+            return new Result().ok(new PageData<>(new ArrayList<>(), 0));
+        }
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        PageData<CoverageAnalisisDataListResultDTOV2> page = coverageService.dataListLeft(formDTO);
+        return new Result<PageData<CoverageAnalisisDataListResultDTOV2>>().ok(page);
+    }
+
+    @PostMapping("search-user-detail")
+    public Result<UserInfoResultDTO> searchUserDetail(@RequestBody SearchDetailFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, SearchDetailFormDTO.SearchUserDetailForm.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<UserInfoResultDTO>().ok(coverageService.searchUserDetail(formDTO));
+    }
+
+    @PostMapping("search-event-detail")
+    public Result<EventInfoResultDTO> searchEventDetail(@RequestBody SearchDetailFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, SearchDetailFormDTO.SearchEventDetailForm.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<EventInfoResultDTO>().ok(coverageService.searchEventDetail(formDTO));
+    }
+
+    @PostMapping("search-resource-detail")
+    public Result<ResourceInfoResultDTO> searchResourceDetail(@RequestBody SearchDetailFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, SearchDetailFormDTO.SearchResourceDetailForm.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<ResourceInfoResultDTO>().ok(coverageService.searchResourceDetail(formDTO));
+    }
+
+    /**
+     * 左侧菜单，点击后查询当前组织下级组织，各分类数量
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("dataList-left-subtotal")
+    public Result<List<DataListLeftSubTotalResDTO>> dataListLeftSubTotal(@LoginUser TokenDto tokenDto, @RequestBody DataListLeftSubTotalFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO, DataListLeftSubTotalFormDTO.AddUserInterGroup.class);
+        List<DataListLeftSubTotalResDTO> resultList = coverageService.dataListLeftSubTotal(formDTO);
+        return new Result<List<DataListLeftSubTotalResDTO>>().ok(resultList);
+    }
 }

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

@@ -1,11 +1,25 @@
 package com.epmet.dataaggre.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.*;
 import com.epmet.dataaggre.dto.datastats.result.*;
+import com.epmet.dataaggre.excel.NowStatsDataExcel;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,13 +27,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.text.ParseException;
+import java.util.Date;
 import java.util.List;
 
 /**
  * @Author sun
  * @Description 数据统计服务
  */
+@Slf4j
 @RestController
 @RequestMapping("datastats")
 public class DataStatsController {
@@ -243,4 +261,48 @@ public class DataStatsController {
         return new Result<CustomerDataManageResultDTO>().ok(dataStatsService.operateExport(formDTO));
     }
 
+    /**
+     * @Description 数据统计页面查询【用户、项目、事件一些数据的实时统计查询】
+     * 需求：数据统计页面查询：注册居民数、注册党员数、事件总数、居民上报事件数、平台录入事件数、项目总数、议题转项目数、事件立项数、立项数；
+     * 可根据组织（只选组织，查询直属下级数据）、选择统计类型（截止累计值/区间新增值，截止累计选择一天，区间选择时间段，精确到时分秒）筛选；
+     * 可点击查看总计，可导出，打开页面默认选中当前工作人员所在组织（页面参考灵山卫-人房信息统计页面）
+     * @author sun
+     */
+    @PostMapping("nowstatsdata")
+    public Result<List<NowStatsDataResultDTO>> nowStatsData(@RequestBody NowStatsDataFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, NowStatsDataFormDTO.CustomerDataManageForm.class);
+        formDTO.setExport(false);
+        return new Result<List<NowStatsDataResultDTO>>().ok(dataStatsService.nowStatsData(formDTO));
+    }
+
+    @PostMapping("nowstatsdataexport")
+    public void nowStatsDataExport(@RequestBody NowStatsDataFormDTO formDTO, HttpServletResponse response) throws IOException {
+        formDTO.setExport(true);
+        ExcelWriter excelWriter = null;
+        try {
+            String fileName = "数据统计" + DateUtils.format(new Date()) + ".xlsx";
+            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), NowStatsDataExcel.class).build();
+            WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
+            List<NowStatsDataResultDTO> data = null;
+            List<NowStatsDataExcel> list = null;
+            data = dataStatsService.nowStatsData(formDTO);
+            list = ConvertUtils.sourceToTarget(data, NowStatsDataExcel.class);
+            excelWriter.write(list, writeSheet);
+        } catch (EpmetException e) {
+            response.reset();
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("content-type", "application/json; charset=UTF-8");
+            PrintWriter printWriter = response.getWriter();
+            Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg());
+            printWriter.write(JSON.toJSONString(result));
+            printWriter.close();
+        } catch (Exception e) {
+            log.error("export exception", e);
+        } finally {
+            if (excelWriter != null) {
+                excelWriter.finish();
+            }
+        }
+    }
+
 }

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

@@ -21,6 +21,8 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO;
+import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.UserInfoResultDTO;
 import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
 import com.epmet.dto.IcResiUserDTO;
@@ -28,7 +30,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * 用户基础信息
@@ -61,7 +62,8 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                             @Param("agencyId") String agencyId,
                                                             @Param("queryPids") String queryPids,
                                                             @Param("categoryKey") String categoryKey,
-                                                            @Param("search") String search);
+                                                            @Param("search") String search,
+                                                            @Param("gridId")String gridId);
 
     /**
      * 政策查找居民
@@ -98,4 +100,42 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                       @Param("name") String name,
                                                       @Param("resiRules") List<ResisByPolicyRulesFormDTO.ResiRule> resiRule,
                                                       @Param("houseIds") List<String> houseIds);
+
+    /**
+     * Desc: 获取icUser
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/27 17:09
+     */
+    List<UserInfoResultDTO> getAllIcUser(CoverageHomeSearchFormDTO formDTO);
+
+    Integer countVolunteersByCategory(@Param("customerId")String customerId,
+                            @Param("agencyId")String agencyId,
+                            @Param("staffOrgIds")String staffOrgIds,
+                            @Param("search")String search,
+                            @Param("resiCategory")String resiCategory);
+
+    Integer countVolunteersWithoutVolCategory(@Param("customerId")String customerId,
+                                      @Param("agencyId")String agencyId,
+                                      @Param("staffOrgIds")String staffOrgIds,
+                                      @Param("search")String search);
+
+    List<IcResiUserEntity> listVolunteersByCategory(@Param("customerId")String customerId,
+                                      @Param("agencyId")String agencyId,
+                                      @Param("staffOrgIds")String staffOrgIds,
+                                      @Param("search")String search,
+                                      @Param("resiCategory")String resiCategory);
+
+    /**
+     * 列出没有志愿者类别的志愿者
+     * @param customerId
+     * @param agencyId
+     * @param staffOrgIds
+     * @param search
+     * @return
+     */
+    List<IcResiUserEntity> listVolunteersWithoutVolCategory(@Param("customerId")String customerId,
+                                                    @Param("agencyId")String agencyId,
+                                                    @Param("staffOrgIds")String staffOrgIds,
+                                                    @Param("search")String search);
 }

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

@@ -18,9 +18,13 @@
 package com.epmet.dataaggre.dao.epmetuser;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.RegisterRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 注册关系表 用于统计客户网格的注册居民数
  *
@@ -29,5 +33,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface RegisterRelationDao extends BaseDao<RegisterRelationEntity> {
-	
+
+    List<NowStatsDataResultDTO> selectNowResiUser(NowStatsDataFormDTO formDTO);
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.dataaggre.dao.govorg;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -108,4 +109,5 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
 
     List<String> getSubAgencyList(@Param("agencyId") String agencyId);
 
+    List<ScreenCustomerAgencyDTO> getSubAgencyListByAgency(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.dataaggre.dao.govorg;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO;
@@ -84,4 +85,5 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      */
     CustomerGridDTO getGridInfo(@Param("gridId") String gridId);
 
+    List<ScreenCustomerGridDTO> getSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
 }

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

@@ -1,9 +1,13 @@
 package com.epmet.dataaggre.dao.govorg;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO;
 import com.epmet.dataaggre.entity.govorg.IcCityManagementEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 城市管理图层
  *
@@ -13,5 +17,49 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IcCityManagementDao extends BaseDao<IcCityManagementEntity> {
 
+    /**
+     * Desc: 【资源】获取城市管理信息
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/28 10:22
+     */
+    List<ResourceInfoResultDTO> getCityManageInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO);
+
+    /**
+     * Desc: 【资源】获取公共服务信息
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/28 10:22
+     */
+    List<ResourceInfoResultDTO> getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO);
+
+    /**
+     * Desc: 【资源】获取重点危化品企业信息
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/28 10:22
+     */
+    List<ResourceInfoResultDTO> getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO);
+
+    /**
+     * Desc: 【资源】获取优势资源信息
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/28 10:22
+     */
+    List<ResourceInfoResultDTO> getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO);
+
+    /**
+     * Desc: 【资源】获取企事业单位巡查信息
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/28 10:22
+     */
+    List<ResourceInfoResultDTO> getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO);
 
 }

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

@@ -3,6 +3,9 @@ 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;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 五大图层类别字典表
@@ -12,5 +15,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcCoverageCategoryDictDao extends BaseDao<IcCoverageCategoryDictEntity> {
-	
+
+    /**
+     * Desc: 根据客户ID和数据类型获取字典对应的url
+     * @param customerId
+     * @param dataType
+     * @author zxc
+     * @date 2022/7/27 16:52
+     */
+    List<String> getAllTypeCoverageByCustomerAndType(@Param("customerId") String customerId, @Param("dataType") String dataType);
+
 }

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

@@ -26,7 +26,8 @@ public interface IcEnterprisePatrolRecordDao extends BaseDao<IcEnterprisePatrolR
      */
     Integer countEnterprisePatrol(@Param("customerId") String customerId, @Param("agencyId") String agencyId,
                                   @Param("staffOrgIds") String staffOrgIds, @Param("search") String search,
-                                  @Param("categoryKey") String categoryKey);
+                                  @Param("categoryKey") String categoryKey,@Param("latestResult")String latestResult,
+                                  @Param("gridId")String gridId);
 
     /**
      * 企事业单位巡查列表
@@ -38,5 +39,5 @@ public interface IcEnterprisePatrolRecordDao extends BaseDao<IcEnterprisePatrolR
      */
     List<IcEnterisePatrolResultDTO> listEnterprisePatrol(@Param("customerId") String customerId, @Param("agencyId") String agencyId,
                                                          @Param("staffOrgIds") String staffOrgIds, @Param("search") String search,
-                                                         @Param("categoryKey") String categoryKey);
+                                                         @Param("categoryKey") String categoryKey, @Param("latestResult") String latestResult);
 }

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

@@ -1,9 +1,15 @@
 package com.epmet.dataaggre.dao.govproject;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO;
+import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO;
 import com.epmet.dataaggre.entity.govproject.IcEventEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 事件管理表
  *
@@ -12,4 +18,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcEventDao extends BaseDao<IcEventEntity> {
+
+    /**
+     * Desc: 【资源】获取事件信息
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/28 10:48
+     */
+    List<EventInfoResultDTO> getEventInfos(CoverageHomeSearchFormDTO formDTO);
+
+    List<NowStatsDataResultDTO> getIcEvent(NowStatsDataFormDTO formDTO);
 }

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

@@ -18,6 +18,8 @@
 package com.epmet.dataaggre.dao.govproject;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO;
 import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.OrgCountDTO;
@@ -132,4 +134,6 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
     List<OrgCountDTO> getMemberClosedProjectCount(OrgStatisticsFormDTO formDTO);
     List<OrgCountDTO> getAgencyProjectCount(OrgStatisticsFormDTO formDTO);
     List<OrgCountDTO> getAgencyClosedProjectCount(OrgStatisticsFormDTO formDTO);
+
+    List<NowStatsDataResultDTO> getNowProject(NowStatsDataFormDTO formDTO);
 }

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

@@ -18,9 +18,13 @@
 package com.epmet.dataaggre.dao.heart;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO;
 import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 社区自组织表
  *
@@ -29,4 +33,8 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcCommunitySelfOrganizationDao extends BaseDao<IcCommunitySelfOrganizationEntity> {
+
+    List<ResourceInfoResultDTO> getCommunitySelOrgInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getCommunitySelOrgInfosCount(CoverageHomeSearchFormDTO formDTO);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/IcResiCategoryWarnConfigDao.java

@@ -0,0 +1,9 @@
+package com.epmet.dataaggre.dao.opercustomize;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface IcResiCategoryWarnConfigDao extends BaseDao<IcResiCategoryWarnConfigEntity> {
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resipartymember/ResiPartymemberDao.java

@@ -0,0 +1,31 @@
+/**
+ * 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.resipartymember;
+
+import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ResiPartymemberDao {
+
+    List<NowStatsDataResultDTO> getNowPart(NowStatsDataFormDTO formDTO);
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcResiUserEntity.java

@@ -215,6 +215,21 @@ public class IcResiUserEntity extends BaseEpmetEntity {
      */
 	private String isSpecial;
 
+	/**
+	 * 是否租户【是:1 否:0】
+	 */
+	private String isTenant;
+
+	/**
+	 * 是否流动人口【是:1 否:0】
+	 */
+	private String isFloating;
+
+	/**
+	 * 是否新阶层人士【是:1 否:0】
+	 */
+	private String isXjc;
+
     /**
      * 文化程度【字典表】
      */

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RegisterRelationEntity.java

@@ -40,6 +40,16 @@ public class RegisterRelationEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
+	/**
+	 * 所属组织机构Id
+	 */
+	private String agencyId;
+
+	/**
+	 * agencyId的所有上级，包含自己
+	 */
+	private String agencyIdPath;
+
     /**
      * 网格Id (customer_grid.id)
      */

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

@@ -73,4 +73,14 @@ public class IcCityManagementEntity extends BaseEpmetEntity {
      */
 	private String latitude;
 
+	/**
+	 * 联系人
+	 */
+	private String principal;
+
+	/**
+	 * 联系电话
+	 */
+	private String mobile;
+
 }

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

@@ -43,11 +43,23 @@ public class IcCoverageCategoryDictEntity extends BaseEpmetEntity {
      */
 	private String placeType;
 
+	/**
+	 * 在可视化系统中所属的plact_type，跟COVERAGE_TYPE可能不同，COVERAGE_TYPE是给管理平台用的
+	 */
+	private String placeTypeInAnalysis;
+
+	/**
+	 * 要跟菜单绑定(客户配置了这个菜单，这里才显示)
+	 */
+	private String menuUrl;
+
     /**
      * 所属五大图层：zhzl：综合治理图层；yjcl：应急处置图层；aqsc：安全生产图层；csgl：城市管理图层；ggfw：公共服务图层
      */
 	private String coverageType;
 
+	private String dataType;
+
     /**
      * 排序
      */

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

@@ -73,4 +73,14 @@ public class IcPublicServiceEntity extends BaseEpmetEntity {
      */
 	private String latitude;
 
+	/**
+	 * 联系人
+	 */
+	private String principal;
+
+	/**
+	 * 联系电话
+	 */
+	private String mobile;
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/opercustomize/IcResiCategoryWarnConfigEntity.java

@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.entity.opercustomize;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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-04
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_resi_category_warn_config")
+public class IcResiCategoryWarnConfigEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 项标签
+     */
+	private String label;
+
+    /**
+     * 表名
+     */
+	private String tableName;
+
+    /**
+     * 列名
+     */
+	private String columnName;
+	/**
+	 * 是否预警 1 是 0 否
+	 */
+	private String warn;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 等级1阈值
+     */
+	@TableField(value = "LEVEL_1")
+	private Integer level1;
+
+    /**
+     * 等级2阈值
+     */
+	@TableField(value = "LEVEL_2")
+	private Integer level2;
+
+    /**
+     * 等级3阈值
+     */
+	@TableField(value = "LEVEL_3")
+	private Integer level3;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/NowStatsDataExcel.java

@@ -0,0 +1,68 @@
+/**
+ * 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.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class NowStatsDataExcel {
+
+    //组织、网格名称
+    @ExcelProperty(value = "组织名称")
+    @ColumnWidth(25)
+    private String orgName;
+    //注册居民数
+    @ExcelProperty(value = "注册居民数")
+    @ColumnWidth(20)
+    private Integer resiUserCount;
+    //注册党员数
+    @ExcelProperty(value = "注册党员数")
+    @ColumnWidth(20)
+    private Integer partyMemberCount;
+    //事件总数
+    @ExcelProperty(value = "事件总数")
+    @ColumnWidth(20)
+    private Integer icEventCount;
+    //居民上报事件数【小程序端随手拍随时讲】
+    @ExcelProperty(value = "居民上报事件数")
+    @ColumnWidth(20)
+    private Integer resiEventCount;
+    //平台录入事件数【数字平台录入的事件数】
+    @ExcelProperty(value = "平台录入事件数")
+    @ColumnWidth(20)
+    private Integer pcEventCount;
+    //项目总数
+    @ExcelProperty(value = "项目总数")
+    @ColumnWidth(20)
+    private Integer projectCount;
+    //议题转项目数
+    @ExcelProperty(value = "议题转项目数")
+    @ColumnWidth(20)
+    private Integer issueProjectCount;
+    //事件立项数
+    @ExcelProperty(value = "事件立项数")
+    @ColumnWidth(20)
+    private Integer icEventProjectCount;
+    //直接立项项目数
+    @ExcelProperty(value = "立项数")
+    @ColumnWidth(20)
+    private Integer agencyProjectCount;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/GovCustomerMenuRedis.java

@@ -0,0 +1,109 @@
+package com.epmet.dataaggre.redis;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.GovMenuDTO;
+import com.epmet.dto.form.GetCustomerMenuListFormDTO;
+import com.epmet.feign.GovAccessFeignClient;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 客户菜单配置表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-03-16
+ */
+@Slf4j
+@Component
+public class GovCustomerMenuRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Autowired
+    private GovAccessFeignClient govAccessFeignClient;
+
+    /**
+     * Desc: 保存客户菜单缓存
+     * @param customerId
+     * @param type
+     * @param govMenuDTOS
+     * @author zxc
+     * @date 2022/7/27 13:45
+     */
+    public void setCustomerMenuList(String customerId, Integer type, List<GovMenuDTO> govMenuDTOS) {
+        if (checkParam(customerId, type) && !CollectionUtils.isEmpty(govMenuDTOS) && StringUtils.isNotBlank(govMenuDTOS.get(NumConstant.ZERO).getName())) {
+            String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId);
+            govMenuDTOS.forEach(g -> {
+                Map<String, Object> map = BeanUtil.beanToMap(g, false, true);
+                redisUtils.listAdd(key,map);
+            });
+        }
+    }
+
+    /**
+     * Desc: 获取客户菜单缓存
+     * @param customerId
+     * @param type
+     * @param tableName
+     * @author zxc
+     * @date 2022/7/27 13:45
+     */
+    public List<GovMenuDTO> getCustomerMenuList(String customerId, Integer type, String tableName) {
+        if (checkParam(customerId, type)) {
+            String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId);
+            List<GovMenuDTO> result = new ArrayList<>();
+            List<Map<String, Object>> maps = (List<Map<String, Object>>) redisUtils.listGetAll(key, NumConstant.ZERO, NumConstant.ONE_NEG);
+            for (Map<String, Object> map : maps) {
+                result.add(ConvertUtils.mapToEntity(map,GovMenuDTO.class));
+            }
+//            result = (List<GovMenuDTO>) redisUtils.listGetAll(key, NumConstant.ZERO,NumConstant.ONE_NEG);
+            if (CollectionUtils.isEmpty(result)){
+                GetCustomerMenuListFormDTO formDTO = new GetCustomerMenuListFormDTO();
+                formDTO.setCustomerId(customerId);
+                formDTO.setType(type);
+                formDTO.setTableName(tableName);
+                Result<List<GovMenuDTO>> customerMenuList = govAccessFeignClient.getCustomerMenuList(formDTO);
+                if (!customerMenuList.success()){
+                    throw new EpmetException("查询客户菜单失败"+ JSON.toJSONString(formDTO));
+                }
+                result = customerMenuList.getData();
+                setCustomerMenuList(customerId,type,customerMenuList.getData());
+            }
+            return result;
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * Desc: 删除客户菜单缓存
+     * @param
+     * @author zxc
+     * @date 2022/7/27 13:47
+     */
+    public void delAllCustomerMenu(String customerId) {
+        String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId);
+        redisUtils.deleteByPattern(key);
+    }
+
+    private boolean checkParam(String customerId, Integer type) {
+        if (StringUtils.isBlank(customerId) || type == null){
+            log.warn("checkParam fail, param is null");
+            return false;
+        }
+        return true;
+    }
+}

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

@@ -1,7 +1,13 @@
 package com.epmet.dataaggre.service;
 
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
+import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult;
+import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult;
+import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO;
+import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
+import com.epmet.dataaggre.dto.govorg.form.DataListLeftSubTotalFormDTO;
+import com.epmet.dataaggre.dto.govorg.form.SearchDetailFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.*;
 
 import java.util.List;
 
@@ -18,6 +24,43 @@ public interface CoverageService {
      * @param pageSize 页面大小
      * @return
      */
-    PageData<CoverageAnalisisDataListResultDTO> analysisDataList(List<String> coverageTypes, List<String> categoryKeys,
+    PageData<CoverageAnalisisDataListResultDTO> analysisDataList(String customerId,String staffId,String orgId,String orgType,
+                                                                 List<String> coverageTypes, List<String> categoryKeys,
                                                                  String search, Integer pageNo, Integer pageSize, Boolean isPage);
+
+    /**
+     * Desc: 五大图层首页搜索
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/26 16:29
+     */
+    CoverageHomeSearchResultDTO coverageHomeSearch(CoverageHomeSearchFormDTO formDTO);
+
+    /**
+     * 五大图层-可视化-右侧分类树列表
+     * @return
+     */
+    List<AnalysisResourceCategoriesResult> listAnalysisResourceCategories(String agencyId);
+
+    List<AnalysisGovernedTargetsResult> listGovernedTargetCategories(String agencyId);
+
+    /**
+     * 五大图层，左侧菜单，点击事件，查询人.事的分布
+     * @param formDTO
+     * @return
+     */
+    PageData<CoverageAnalisisDataListResultDTOV2> dataListLeft(CoverageAnalisisDataListLeftFormDTO formDTO);
+
+    UserInfoResultDTO searchUserDetail(SearchDetailFormDTO formDTO);
+
+    EventInfoResultDTO searchEventDetail(SearchDetailFormDTO formDTO);
+
+    ResourceInfoResultDTO searchResourceDetail(SearchDetailFormDTO formDTO);
+
+    /**
+     * 左侧菜单，点击后查询当前组织下级组织，各分类数量
+     * @param formDTO
+     * @return
+     */
+    List<DataListLeftSubTotalResDTO> dataListLeftSubTotal(DataListLeftSubTotalFormDTO formDTO);
 }

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

@@ -0,0 +1,12 @@
+package com.epmet.dataaggre.service;
+
+import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO;
+
+import java.util.List;
+
+public interface PartymemberService {
+
+    List<NowStatsDataResultDTO> getNowPart(NowStatsDataFormDTO formDTO);
+
+}

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

@@ -306,4 +306,6 @@ public interface DataStatsService {
     Map<String, Integer> getMemberMap(String agencyId);
 
     PageData<MemberProjectInfoResultDTO> getMemberList(OrgStatisticsFormDTO formDTO);
+
+    List<NowStatsDataResultDTO> nowStatsData(NowStatsDataFormDTO formDTO);
 }

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

@@ -40,10 +40,13 @@
  import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
  import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity;
  import com.epmet.dataaggre.excel.CustomerDataManageExcel;
+ import com.epmet.dataaggre.service.PartymemberService;
  import com.epmet.dataaggre.service.datastats.DataStatsService;
+ import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
  import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
  import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
  import com.epmet.dataaggre.service.govorg.GovOrgService;
+ import com.epmet.dataaggre.service.govproject.GovProjectService;
  import com.epmet.dataaggre.service.opercrm.CustomerRelation;
  import com.github.pagehelper.PageHelper;
  import com.github.pagehelper.PageInfo;
@@ -86,6 +89,12 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
     private StatsStaffPatrolRecordDailyService statsStaffPatrolRecordDailyService;
     @Autowired
     private GovOrgService govOrgService;
+    @Autowired
+    private EpmetUserService epmetUserService;
+    @Autowired
+    private GovProjectService govProjectService;
+    @Autowired
+    private PartymemberService partymemberService;
 
     /**
      * @Param formDTO
@@ -2310,4 +2319,112 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
         PageInfo<MemberProjectInfoResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }
+
+    @Override
+    public List<NowStatsDataResultDTO> nowStatsData(NowStatsDataFormDTO formDTO) {
+        //1.必要参数校验及处理
+        String startTimeForm = formDTO.getStartTime();
+        if ("Interval".equals(formDTO.getType()) && StringUtils.isEmpty(startTimeForm)) {
+            throw new RenException("请选择开始时间或查询累计值");
+        }
+
+        //2.查询组织信息，判断要查询下级是组织还是网格数据
+        ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId());
+        if (null == agencyGrid) {
+            return new ArrayList<>();
+        }
+        //组织或网格Id集合
+        List<String> idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getOrgId).collect(Collectors.toList());
+        formDTO.setDataType(!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) ? OrgTypeEnum.AGENCY.getCode() : OrgTypeEnum.GRID.getCode());
+        formDTO.setIdList(idList);
+
+        //3.按条件分别查询统计各业务实时数据
+        //3-1.注册居民、注册党员数
+        List<NowStatsDataResultDTO> user = epmetUserService.getNowResiUser(formDTO);
+        List<NowStatsDataResultDTO> party = partymemberService.getNowPart(formDTO);
+        //3-2.事件总数、居民上报事件数、平台录入事件数
+        List<NowStatsDataResultDTO> event = govProjectService.getNowIcEvent(formDTO);
+        //3-3.项目总数、议题转项目数、事件立项数、组织立项数
+        List<NowStatsDataResultDTO> project = govProjectService.getNowProject(formDTO);
+        Map<String, NowStatsDataResultDTO> userMap = new HashMap<>();
+        Map<String, NowStatsDataResultDTO> partyMap = new HashMap<>();
+        Map<String, NowStatsDataResultDTO> eventMap = new HashMap<>();
+        Map<String, NowStatsDataResultDTO> projectMap = new HashMap<>();
+        if ("grid".equals(formDTO.getDataType())) {
+            userMap = CollectionUtils.isEmpty(user) ? new HashMap<>() : user.stream().collect(Collectors.toMap(NowStatsDataResultDTO::getOrgId, m -> m, (k1, k2) -> k1));
+            partyMap = CollectionUtils.isEmpty(party) ? new HashMap<>() : party.stream().collect(Collectors.toMap(NowStatsDataResultDTO::getOrgId, m -> m, (k1, k2) -> k1));
+            eventMap = CollectionUtils.isEmpty(event) ? new HashMap<>() : event.stream().collect(Collectors.toMap(NowStatsDataResultDTO::getOrgId, m -> m, (k1, k2) -> k1));
+            projectMap = CollectionUtils.isEmpty(project) ? new HashMap<>() : project.stream().collect(Collectors.toMap(NowStatsDataResultDTO::getOrgId, m -> m, (k1, k2) -> k1));
+        }
+
+        //4.封装数据
+        List<NowStatsDataResultDTO> resultDTOList = new ArrayList<>();
+        NowStatsDataResultDTO export = new NowStatsDataResultDTO();
+        export.setOrgName("合计");
+        for (ScreenAgencyOrGridListDTO.AgencyGrid org : agencyGrid.getAgencyGridList()) {
+            NowStatsDataResultDTO dto = new NowStatsDataResultDTO();
+            dto.setOrgId(org.getOrgId());
+            dto.setOrgName(org.getOrgName());
+            //网格数据sql已统计好
+            if ("grid".equals(formDTO.getDataType())) {
+                if (userMap.containsKey(org.getOrgId())) {
+                    dto.setResiUserCount(userMap.get(org.getOrgId()).getResiUserCount());
+                }
+                if (partyMap.containsKey(org.getOrgId())) {
+                    dto.setPartyMemberCount(partyMap.get(org.getOrgId()).getPartyMemberCount());
+                }
+                if (eventMap.containsKey(org.getOrgId())) {
+                    dto.setIcEventCount(eventMap.get(org.getOrgId()).getIcEventCount());
+                    dto.setResiEventCount(eventMap.get(org.getOrgId()).getResiEventCount());
+                    dto.setPcEventCount(eventMap.get(org.getOrgId()).getPcEventCount());
+                }
+                if (projectMap.containsKey(org.getOrgId())) {
+                    dto.setProjectCount(projectMap.get(org.getOrgId()).getProjectCount());
+                    dto.setIssueProjectCount(projectMap.get(org.getOrgId()).getIssueProjectCount());
+                    dto.setIcEventProjectCount(projectMap.get(org.getOrgId()).getIcEventProjectCount());
+                    dto.setAgencyProjectCount(projectMap.get(org.getOrgId()).getAgencyProjectCount());
+                }
+            } else {
+                //组织数据 需要java计算结果
+                int resiUserCount = (int) user.stream().filter(u -> u.getPids().contains(org.getOrgId())).count();
+                dto.setResiUserCount(resiUserCount);
+
+                int partyMemberCount = (int) party.stream().filter(p -> p.getPids().contains(org.getOrgId())).count();
+                dto.setPartyMemberCount(partyMemberCount);
+
+                int resiEventCount = (int) event.stream().filter(e -> e.getPids().contains(org.getOrgId()) && "0".equals(e.getSourceType())).count();
+                int pcEventCount = (int) event.stream().filter(e -> e.getPids().contains(org.getOrgId()) && !"0".equals(e.getSourceType())).count();
+                int icEventCount = resiEventCount + pcEventCount;
+                dto.setIcEventCount(icEventCount);
+                dto.setResiEventCount(resiEventCount);
+                dto.setPcEventCount(pcEventCount);
+
+                int issueProjectCount = (int) project.stream().filter(p -> p.getPids().contains(org.getOrgId()) && "issue".equals(p.getOrigin())).count();
+                int icEventProjectCount = (int) project.stream().filter(p -> p.getPids().contains(org.getOrgId()) && "ic_event".equals(p.getOrigin())).count();
+                int agencyProjectCount = (int) project.stream().filter(p -> p.getPids().contains(org.getOrgId()) && "agency".equals(p.getOrigin())).count();
+                int projectCount = issueProjectCount + icEventProjectCount + agencyProjectCount;
+                dto.setProjectCount(projectCount);
+                dto.setIssueProjectCount(issueProjectCount);
+                dto.setIcEventProjectCount(icEventProjectCount);
+                dto.setAgencyProjectCount(agencyProjectCount);
+            }
+            resultDTOList.add(dto);
+            if (formDTO.isExport()) {
+                export.setResiUserCount(export.getResiUserCount() + dto.getResiUserCount());
+                export.setPartyMemberCount(export.getPartyMemberCount() + dto.getPartyMemberCount());
+                export.setIcEventCount(export.getIcEventCount() + dto.getIcEventCount());
+                export.setResiEventCount(export.getResiEventCount() + dto.getResiEventCount());
+                export.setPcEventCount(export.getPcEventCount() + dto.getPcEventCount());
+                export.setProjectCount(export.getProjectCount() + dto.getProjectCount());
+                export.setIssueProjectCount(export.getIssueProjectCount() + dto.getIssueProjectCount());
+                export.setIcEventProjectCount(export.getIcEventProjectCount() + dto.getIcEventProjectCount());
+                export.setAgencyProjectCount(export.getAgencyProjectCount() + dto.getAgencyProjectCount());
+            }
+        }
+        if (formDTO.isExport()) {
+            resultDTOList.add(export);
+        }
+        return resultDTOList;
+    }
+
 }

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

@@ -1,17 +1,21 @@
 package com.epmet.dataaggre.service.epmetuser;
 
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.*;
 import com.epmet.dataaggre.dto.epmetuser.result.*;
 import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
 import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO;
 import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO;
 import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO;
+import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.MemberProjectInfoResultDTO;
 import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
+import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.UserBaseInfoDTO;
 
@@ -230,4 +234,10 @@ public interface EpmetUserService {
      * @Date 2022/7/27 17:32
      */
     PageData<MemberProjectInfoResultDTO> getMemberList(OrgStatisticsFormDTO formDTO);
+
+    Integer countVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory);
+
+    List<IcResiUserEntity> listVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory);
+
+    List<NowStatsDataResultDTO> getNowResiUser(NowStatsDataFormDTO formDTO);
 }

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

@@ -1,6 +1,8 @@
 package com.epmet.dataaggre.service.epmetuser;
 
 import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
+import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.UserInfoResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
 
 import java.util.List;
@@ -22,7 +24,7 @@ public interface IcResiService {
     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);
+    Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search,String gridId);
 
     /**
      * 使用特殊人群类别查询居民列表
@@ -38,5 +40,13 @@ public interface IcResiService {
     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);
+    Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search,String gridId);
+
+    /**
+     * Desc: 获取icUser
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/27 17:09
+     */
+    List<UserInfoResultDTO> getAllIcUser(CoverageHomeSearchFormDTO formDTO);
 }

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

@@ -15,6 +15,8 @@ import com.epmet.constant.BadgeConstant;
 import com.epmet.constant.OrgInfoConstant;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmetuser.*;
+import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO;
 import com.epmet.dataaggre.dto.epmetuser.FactIcuserCategoryAnalysisDailyDTO;
 import com.epmet.dataaggre.dto.epmetuser.StaffPatrolDetailDTO;
@@ -30,10 +32,7 @@ import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO;
 import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO;
-import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
-import com.epmet.dataaggre.entity.epmetuser.GovStaffRoleEntity;
-import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity;
-import com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity;
+import com.epmet.dataaggre.entity.epmetuser.*;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService;
@@ -93,6 +92,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     private IcResiUserDao icResiUserDao;
     @Resource
     private CustomerFootBarService customerFootBarService;
+    @Resource
+    private RegisterRelationDao registerRelationDao;
 
     /**
      * @Description  根据UserIds查询
@@ -895,4 +896,31 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         PageInfo<MemberProjectInfoResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }
+
+    @Override
+    public Integer countVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory) {
+        if ("others".equals(resiCategory)) {
+            //others需要特殊处理，它是指那些勾选了是志愿者，但是没有选择具体志愿者类型的居民，实际上志愿者类型里面没有others这个类别的
+            return icResiUserDao.countVolunteersWithoutVolCategory(customerId, agencyId, staffOrgIds, search);
+        } else {
+            return icResiUserDao.countVolunteersByCategory(customerId, agencyId, staffOrgIds, search, resiCategory);
+        }
+    }
+
+    @Override
+    public List<IcResiUserEntity> listVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory) {
+        if ("others".equals(resiCategory)) {
+            //others需要特殊处理，它是指那些勾选了是志愿者，但是没有选择具体志愿者类型的居民，实际上志愿者类型里面没有others这个类别的
+            return icResiUserDao.listVolunteersWithoutVolCategory(customerId, agencyId, staffOrgIds, search);
+        } else {
+            return icResiUserDao.listVolunteersByCategory(customerId, agencyId, staffOrgIds, search, resiCategory);
+        }
+    }
+
+    @Override
+    public List<NowStatsDataResultDTO> getNowResiUser(NowStatsDataFormDTO formDTO) {
+        //实时统计组织/网格下小程序端注册居民数
+        List<NowStatsDataResultDTO> list = registerRelationDao.selectNowResiUser(formDTO);
+        return list;
+    }
 }

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

@@ -2,9 +2,12 @@ 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.commons.tools.enums.ResiCategoryEnum;
 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.dto.govorg.form.CoverageHomeSearchFormDTO;
+import com.epmet.dataaggre.dto.govorg.result.UserInfoResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
 import com.epmet.dataaggre.service.epmetuser.IcResiService;
 import com.github.pagehelper.PageHelper;
@@ -37,7 +40,7 @@ public class IcResiServiceImpl implements IcResiService {
             PageHelper.startPage(pageNo, pageSize);
         }
 
-        LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search);
+        LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search, null);
         query.orderByAsc(IcResiUserEntity::getCreatedTime);
         return resiUserDao.selectList(query);
     }
@@ -52,8 +55,8 @@ public class IcResiServiceImpl implements IcResiService {
      * @return
      */
     @Override
-    public Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) {
-        LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search);
+    public Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search, String gridId) {
+        LambdaQueryWrapper<IcResiUserEntity> query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search,gridId);
         return resiUserDao.selectCount(query);
     }
 
@@ -66,11 +69,12 @@ public class IcResiServiceImpl implements IcResiService {
      * @param search
      * @return
      */
-    LambdaQueryWrapper<IcResiUserEntity> constructQueryWrapper4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) {
+    LambdaQueryWrapper<IcResiUserEntity> constructQueryWrapper4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search,String gridId) {
         LambdaQueryWrapper<IcResiUserEntity> query = new LambdaQueryWrapper<>();
         query.eq(IcResiUserEntity::getCustomerId, customerId);
         query.eq(IcResiUserEntity::getStatus, "0"); // 只查询0 正常的居民。
         query.and(q -> q.eq(IcResiUserEntity::getAgencyId, agencyId).or().likeRight(IcResiUserEntity::getPids, queryPids));
+        query.eq(StringUtils.isNotBlank(gridId), IcResiUserEntity::getGridId, gridId);
         if ("resi_xfry".equals(categoryKey)) {
             // 信访人员
             query.eq(IcResiUserEntity::getIsXfry, true);
@@ -78,6 +82,44 @@ public class IcResiServiceImpl implements IcResiService {
             query.eq(IcResiUserEntity::getIsSn, true);
         } else if ("resi_szry".equals(categoryKey)) {
             query.eq(IcResiUserEntity::getIsSz, true);
+        } else if (ResiCategoryEnum.IS_PARTY.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsParty, true);
+        } else if (ResiCategoryEnum.IS_DBH.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsDbh, true);
+        } else if (ResiCategoryEnum.IS_ENSURE_HOUSE.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsEnsureHouse, true);
+        } else if (ResiCategoryEnum.IS_UNEMPLOYED.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsUnemployed, true);
+        } else if (ResiCategoryEnum.IS_YLFN.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsYlfn, true);
+        } else if (ResiCategoryEnum.IS_VETERANS.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsVeterans, true);
+        } else if (ResiCategoryEnum.IS_UNITED_FRONT.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsUnitedFront, true);
+        } else if (ResiCategoryEnum.IS_XFRY.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsXfry, true);
+        } else if (ResiCategoryEnum.IS_VOLUNTEER.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsVolunteer, true);
+        } else if (ResiCategoryEnum.IS_OLD_PEOPLE.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsOldPeople, true);
+        } else if (ResiCategoryEnum.IS_KC.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsKc, true);
+        } else if (ResiCategoryEnum.IS_SD.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsSd, true);
+        } else if (ResiCategoryEnum.IS_SN.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsSn, true);
+        } else if (ResiCategoryEnum.IS_SZ.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsSz, true);
+        } else if (ResiCategoryEnum.IS_CJ.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsCj, true);
+        } else if (ResiCategoryEnum.IS_DB.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsDb, true);
+        } else if (ResiCategoryEnum.IS_MB.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsMb, true);
+        } else if (ResiCategoryEnum.IS_SPECIAL.getColName().equals(categoryKey)) {
+            query.eq(IcResiUserEntity::getIsSpecial, true);
+        } else if(ResiCategoryEnum.IS_XJC.getColName().equals(categoryKey)){
+            query.eq(IcResiUserEntity::getIsXjc, true);
         }
 
         if (StringUtils.isNotBlank(search)) {
@@ -97,7 +139,18 @@ public class IcResiServiceImpl implements IcResiService {
     }
 
     @Override
-    public Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search) {
-        return resiUserDao.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
+    public Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search, String gridId) {
+        return resiUserDao.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search,gridId);
+    }
+
+    /**
+     * Desc: 获取icUser
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/27 17:09
+     */
+    @Override
+    public List<UserInfoResultDTO> getAllIcUser(CoverageHomeSearchFormDTO formDTO) {
+        return resiUserDao.getAllIcUser(formDTO);
     }
 }

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

@@ -1,16 +1,13 @@
 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
@@ -115,11 +112,11 @@ public interface GovOrgCoverageService {
 
     Integer countSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey);
 
-    Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey);
+    Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult,String gridId);
 
     List<IcEnterisePatrolResultDTO> listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds,
                                                          String search, String categoryKey, Boolean isPage, Integer pageNo,
-                                                         Integer pageSize);
+                                                         Integer pageSize, String latestResult);
 
     /**
      * 通过居民数量等条件查询房屋数量
@@ -137,4 +134,16 @@ public interface GovOrgCoverageService {
      * @return
      */
     IcCoverageCategoryDictEntity selectByCategoryKey(String categoryKey);
+
+    /**
+     * Desc: 根据客户ID和数据类型获取字典对应的url
+     * @param customerId
+     * @param dataType
+     * @author zxc
+     * @date 2022/7/27 16:52
+     */
+    List<String> getAllTypeCoverageByCustomerAndType(String customerId,String dataType);
+    List<IcCoverageCategoryDictEntity> listResourceCategoryEntities(String coverageType);
+
+    List<IcCoverageCategoryDictEntity> listGovernedTargetCategoryEntities();
 }

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

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerDepartmentDTO;
 import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
@@ -243,4 +244,52 @@ public interface GovOrgService {
      * @Date 2022/7/27 9:44
      */
     PageData<MemberProjectInfoResultDTO> memberProjectInfoList(TokenDto tokenDto, OrgStatisticsFormDTO formDTO);
+
+    /**
+     * Desc: 【资源】获取城市管理信息
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/28 10:22
+     */
+    List<ResourceInfoResultDTO> getCityManageInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO);
+
+    /**
+     * Desc: 【资源】获取公共服务信息
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/28 10:22
+     */
+    List<ResourceInfoResultDTO> getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO);
+
+    /**
+     * Desc: 【资源】获取重点危化品企业信息
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/28 10:22
+     */
+    List<ResourceInfoResultDTO> getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO);
+
+    /**
+     * Desc: 【资源】获取优势资源信息
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/28 10:22
+     */
+    List<ResourceInfoResultDTO> getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO);
+
+    /**
+     * Desc: 【资源】获取企事业单位巡查信息
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/28 10:22
+     */
+    List<ResourceInfoResultDTO> getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO);
+    Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO);
+
+    ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId);
+
 }

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

@@ -1,8 +1,8 @@
 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.enums.CoverageEnums;
 import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.govorg.*;
@@ -14,7 +14,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * org 图层service
@@ -290,18 +293,20 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
     }
 
     @Override
-    public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) {
-        return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey);
+    public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult,String gridId) {
+        // ic_enterprise.AGENCY_PIDS:agency_id的所有上级
+        // 网格不为空时按网格查询， 网格为空时，根据agency_id或者AGENCY_PIDS查看
+        return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,latestResult,gridId);
     }
 
     @Override
     public List<IcEnterisePatrolResultDTO> listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds,
                                                                 String search, String categoryKey, Boolean isPage,
-                                                                Integer pageNo, Integer pageSize) {
+                                                                Integer pageNo, Integer pageSize, String latestResult) {
         if (isPage) {
             PageHelper.startPage(pageNo, pageSize);
         }
-        return enterprisePatrolRecordDao.listEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey);
+        return enterprisePatrolRecordDao.listEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey, latestResult);
     }
 
     @Override
@@ -324,4 +329,35 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
         query.ge(IcHouseEntity::getResiNumber, resiNumberBiggerThan);
         return query;
     }
+
+    @Override
+    public List<IcCoverageCategoryDictEntity> listResourceCategoryEntities(String coverageType) {
+        LambdaQueryWrapper<IcCoverageCategoryDictEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcCoverageCategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId());
+        query.eq(IcCoverageCategoryDictEntity::getCoverageType, coverageType);
+        query.orderByAsc(IcCoverageCategoryDictEntity::getSort);
+        query.eq(IcCoverageCategoryDictEntity::getDataType, CoverageEnums.DATA_TYPE_RESOURCES.getKey());
+        return coverageCategoryDictDao.selectList(query);
+    }
+
+    @Override
+    public List<IcCoverageCategoryDictEntity> listGovernedTargetCategoryEntities() {
+        LambdaQueryWrapper<IcCoverageCategoryDictEntity> query = new LambdaQueryWrapper<>();
+        query.eq(IcCoverageCategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId());
+        query.orderByAsc(IcCoverageCategoryDictEntity::getSort);
+        query.eq(IcCoverageCategoryDictEntity::getDataType, CoverageEnums.DATA_TYPE_GOVERNED_TARGET.getKey());
+        return coverageCategoryDictDao.selectList(query);
+    }
+
+    /**
+     * Desc: 根据客户ID和数据类型获取字典对应的url
+     * @param customerId
+     * @param dataType
+     * @author zxc
+     * @date 2022/7/27 16:52
+     */
+    @Override
+    public List<String> getAllTypeCoverageByCustomerAndType(String customerId, String dataType) {
+        return coverageCategoryDictDao.getAllTypeCoverageByCustomerAndType(customerId, dataType);
+    }
 }

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

@@ -14,6 +14,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.DingTextBriefNessFormDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.OrgLevelEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -39,6 +40,9 @@ import com.epmet.dataaggre.dto.epmetuser.result.CustomerStaffResultDTO;
 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.evaluationindex.ScreenAgencyOrGridListDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.govorg.*;
 import com.epmet.dataaggre.dto.govorg.form.*;
 import com.epmet.dataaggre.dto.govorg.result.*;
@@ -127,6 +131,8 @@ public class GovOrgServiceImpl implements GovOrgService {
     private IcNeighborhoodDao neighborhoodDao;
     @Resource
     private GovProjectService govProjectService;
+    @Autowired
+    private IcCityManagementDao cityManagementDao;
 
     /**
      * @param staffId
@@ -257,6 +263,8 @@ public class GovOrgServiceImpl implements GovOrgService {
                 agecnyInfo.setOrgId(agencyEntity.getId());
                 agecnyInfo.setOrgName(agencyEntity.getOrganizationName());
                 agecnyInfo.setOrgType("agency");
+                agecnyInfo.setLatitude(agencyEntity.getLatitude());
+                agecnyInfo.setLongitude(agencyEntity.getLongitude());
                 result.add(agecnyInfo);
             });
             return result;
@@ -268,6 +276,8 @@ public class GovOrgServiceImpl implements GovOrgService {
                 gridInfo.setOrgId(grid.getGridId());
                 gridInfo.setOrgName(grid.getGridName());
                 gridInfo.setOrgType("grid");
+                gridInfo.setLongitude(grid.getLongitude());
+                gridInfo.setLatitude(grid.getLatitude());
                 result.add(gridInfo);
             });
         }
@@ -1188,12 +1198,8 @@ public class GovOrgServiceImpl implements GovOrgService {
                     dto.setOrgId(grid.getId());
                     dto.setOrgType(OrgConstant.GRID);
                     dto.setOrgName(grid.getGridName());
-                    if (projectMap.containsKey(grid.getId())) {
-                        dto.setProjectCount(projectMap.get(grid.getId()));
-                    }
-                    if (closedMap.containsKey(grid.getId())) {
-                        dto.setClosedCount(closedMap.get(grid.getId()));
-                    }
+                    dto.setProjectCount(projectMap.getOrDefault(grid.getId(), NumConstant.ZERO));
+                    dto.setClosedCount(closedMap.getOrDefault(grid.getId(), NumConstant.ZERO));
                     if (memberMap.containsKey(grid.getId())) {
                         dto.setMemberCount(Math.toIntExact(memberMap.get(grid.getId())));
                         if (NumConstant.ZERO != dto.getMemberCount()) {
@@ -1296,12 +1302,9 @@ public class GovOrgServiceImpl implements GovOrgService {
             //统计关闭项目数
             Map<String, Integer> closedMap = govProjectService.getMemberClosedProjectMap(formDTO);
             result.getList().forEach(item -> {
-                if (projectMap.containsKey(item.getStaffId())) {
-                    item.setProjectCount(projectMap.get(item.getStaffId()));
-                }
-                if (projectMap.containsKey(item.getStaffId())) {
-                    item.setClosedCount(closedMap.get(item.getStaffId()));
-                }
+                item.setProjectCount(projectMap.getOrDefault(item.getStaffId(), NumConstant.ZERO));
+                item.setClosedCount(closedMap.getOrDefault(item.getStaffId(), NumConstant.ZERO));
+
                 if (OrgConstant.AGENCY.contains(formDTO.getOrgType())) {
                     AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(item.getOrgId());
                     if (null != agencyInfo) {
@@ -1418,4 +1421,93 @@ public class GovOrgServiceImpl implements GovOrgService {
         return resultData;
     }
 
+
+    @Override
+    public List<ResourceInfoResultDTO> getCityManageInfos(CoverageHomeSearchFormDTO formDTO) {
+        return cityManagementDao.getCityManageInfos(formDTO);
+    }
+
+    @Override
+    public Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO) {
+        return cityManagementDao.getCityManageInfosCount(formDTO);
+    }
+
+    @Override
+    public List<ResourceInfoResultDTO> getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO) {
+        return cityManagementDao.getPublicServiceInfos(formDTO);
+    }
+
+    @Override
+    public Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO) {
+        return cityManagementDao.getPublicServiceInfosCount(formDTO);
+    }
+
+    @Override
+    public List<ResourceInfoResultDTO> getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO) {
+        return cityManagementDao.getDangerousChemicalsInfos(formDTO);
+    }
+
+    @Override
+    public Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO) {
+        return cityManagementDao.getDangerousChemicalsInfosCount(formDTO);
+    }
+
+    @Override
+    public List<ResourceInfoResultDTO> getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO) {
+        return cityManagementDao.getSuperiorResourceInfos(formDTO);
+    }
+
+    @Override
+    public Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO) {
+        return cityManagementDao.getSuperiorResourceInfosCount(formDTO);
+    }
+
+    @Override
+    public List<ResourceInfoResultDTO> getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO) {
+        return cityManagementDao.getEnterpriseInfos(formDTO);
+    }
+
+    @Override
+    public Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO) {
+        return cityManagementDao.getEnterpriseInfosCount(formDTO);
+    }
+
+    @Override
+    public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId) {
+        ScreenAgencyOrGridListDTO resultDTO = new ScreenAgencyOrGridListDTO();
+        List<ScreenAgencyOrGridListDTO.AgencyGrid> agencyGridList = new ArrayList<>();
+        //1.查询组织信息
+        CustomerAgencyEntity dto = customerAgencyDao.selectById(agencyId);
+        if (dto == null) {
+            log.error(String.format("组织信息不存在,组织Id->%s", agencyId));
+            return new ScreenAgencyOrGridListDTO();
+        }
+        //2.根据组织级别判断查询直属组织或网格列表
+        List<ScreenCustomerAgencyDTO> agencyList = new ArrayList<>();
+        List<ScreenCustomerGridDTO> gridList = new ArrayList<>();
+        if (!"community".equals(dto.getLevel())) {
+            //2-1.直属下级组织列表
+            agencyList = customerAgencyDao.getSubAgencyListByAgency(customerId, agencyId);
+            agencyList.forEach(gr->{
+                ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid();
+                org.setOrgId(gr.getAgencyId());
+                org.setOrgName(gr.getAgencyName());
+                agencyGridList.add(org);
+            });
+        } else {
+            //2-2.直属下级网格列表
+            gridList = customerGridDao.getSubGridList(customerId, agencyId);
+            gridList.forEach(gr->{
+                ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid();
+                org.setOrgId(gr.getGridId());
+                org.setOrgName(gr.getGridName());
+                agencyGridList.add(org);
+            });
+        }
+
+        resultDTO.setLevel(dto.getLevel());
+        resultDTO.setAgencyGridList(agencyGridList);
+        return resultDTO;
+    }
+
 }