占个位置

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

@@ -0,0 +1,45 @@
+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 {
+    }
+
+    /**
+     *
+     */
+    @NotBlank(message = "组织不能为空", groups = ShowGroup.class)
+    private String orgId;
+    @NotBlank(message = "组织类型不能为空", groups = ShowGroup.class)
+    private String orgType;
+
+    /**
+     * 图层类型列表
+     */
+    private List<String> coverageTypes;
+
+    /**
+     * 分类key
+     */
+    private List<String> categoryKeys;
+
+    // 以下3个参数固定
+    private Integer pageNo = 1;
+    private Integer pageSize = 20;
+    private Boolean isPage = false;
+
+    private String customerId;
+    private String staffId;
+}
+

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-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java

@@ -9,8 +9,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult;
 import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult;
 import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListFormDTO;
+import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO;
 import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2;
 import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO;
 import com.epmet.dataaggre.service.CoverageService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -94,4 +96,22 @@ public class CoverageController {
         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)) {
+            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);
+    }
 }

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

@@ -3,8 +3,10 @@ package com.epmet.dataaggre.service;
 import com.epmet.commons.tools.page.PageData;
 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.result.CoverageAnalisisDataListResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2;
 import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO;
 
 import java.util.List;
@@ -40,4 +42,11 @@ public interface CoverageService {
     List<AnalysisResourceCategoriesResult> listAnalysisResourceCategories();
 
     List<AnalysisGovernedTargetsResult> listGovernedTargetCategories();
+
+    /**
+     * 五大图层，左侧菜单，点击事件，查询人.事的分布
+     * @param formDTO
+     * @return
+     */
+    PageData<CoverageAnalisisDataListResultDTOV2> dataListLeft(CoverageAnalisisDataListLeftFormDTO formDTO);
 }

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

@@ -12,8 +12,10 @@ import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult;
 import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult;
 import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
+import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO;
 import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2;
 import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
@@ -29,7 +31,6 @@ import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
 import com.epmet.dataaggre.service.heart.HeartService;
 import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService;
-import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -591,4 +592,18 @@ public class CoverageServiceImpl implements CoverageService {
         results.add(ggfwRq);
         return results;
     }
+
+    /**
+     * 五大图层，左侧菜单，点击事件，查询人.事的分布
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public PageData<CoverageAnalisisDataListResultDTOV2> dataListLeft(CoverageAnalisisDataListLeftFormDTO formDTO) {
+        //todo
+
+
+        return null;
+    }
 }