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

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

@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.dto.govorg.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/7/26 16:25
+ * @DESC
+ */
+@Data
+public class CoverageHomeSearchFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3776954636762201010L;
+
+    private String name;
+    private String customerId;
+    private String userId;
+}

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

@@ -0,0 +1,32 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+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 List<EventInfoResultDTO> eventInfos;
+
+    /**
+     * 资源信息
+     */
+    private List<ResourceInfoResultDTO> resourceInfos;
+}

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

@@ -0,0 +1,46 @@
+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 EventInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1645410018462094960L;
+
+    /**
+     * 事件ID
+     */
+    private String eventId;
+
+    /**
+     * 所属网格
+     */
+    private String gridName;
+
+    /**
+     * 发生时间 yyyy-dd-mm hh:ii:ss
+     */
+    private String happenTime;
+
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+
+    /**
+     * 经度
+     */
+    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,31 @@
+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;
+}

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

@@ -0,0 +1,69 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+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;
+
+    /**
+     * 所属房屋
+     */
+    private String houseName;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 工作单位
+     */
+    private String gzdw;
+
+    /**
+     * 人户情况
+     */
+    private String rhqk;
+
+    /**
+     * 人员分类
+     */
+    private List<String> type;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+}

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

@@ -1,11 +1,15 @@
 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.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListFormDTO;
+import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO;
 import com.epmet.dataaggre.service.CoverageService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,4 +58,18 @@ public class CoverageController {
         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));
+    }
+
 }

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

@@ -1,7 +1,9 @@
 package com.epmet.dataaggre.service;
 
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO;
 
 import java.util.List;
 
@@ -20,4 +22,13 @@ public interface CoverageService {
      */
     PageData<CoverageAnalisisDataListResultDTO> analysisDataList(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);
+
 }

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

@@ -8,7 +8,9 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
 import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
+import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
 import com.epmet.dataaggre.entity.govorg.*;
@@ -195,6 +197,17 @@ public class CoverageServiceImpl implements CoverageService {
         }
     }
 
+    /**
+     * Desc: 五大图层首页搜索
+     * @param formDTO
+     * @author zxc
+     * @date 2022/7/26 16:29
+     */
+    @Override
+    public CoverageHomeSearchResultDTO coverageHomeSearch(CoverageHomeSearchFormDTO formDTO) {
+        return null;
+    }
+
     /**
      * 从staff信息中获取工作人员的PIDS
      * @param staffInfo