zhan

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

@@ -0,0 +1,31 @@
+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;
+
+    @NotBlank(message = "coverageType不能为空",groups = AddUserInterGroup.class)
+    private String coverageType;
+    @NotBlank(message = "categoryKey不能为空",groups = AddUserInterGroup.class)
+    private String categoryKey;
+
+    private String placeType;
+
+
+    private String customerId;
+    private String staffId;
+}
+

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

@@ -0,0 +1,10 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/7/29 10:45
+ */
+public class DataListLeftSubTotalResDTO {
+}
+

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

@@ -10,10 +10,7 @@ import com.epmet.commons.tools.utils.Result;
 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.CoverageAnalisisDataListFormDTO;
+import com.epmet.dataaggre.dto.govorg.form.*;
-import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO;
-import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
-import com.epmet.dataaggre.dto.govorg.form.SearchDetailFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.service.CoverageService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -140,4 +137,19 @@ public class CoverageController {
         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/service/CoverageService.java

@@ -5,6 +5,7 @@ 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.*;
 
@@ -56,4 +57,10 @@ public interface CoverageService {
 
     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/impl/CoverageServiceImpl.java

@@ -24,6 +24,7 @@ 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.form.DataListLeftSubTotalFormDTO;
 import com.epmet.dataaggre.dto.govorg.form.SearchDetailFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
@@ -1036,4 +1037,16 @@ public class CoverageServiceImpl implements CoverageService {
         }
         return result;
     }
+
+    /**
+     * 左侧菜单，点击后查询当前组织下级组织，各分类数量
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public List<DataListLeftSubTotalResDTO> dataListLeftSubTotal(DataListLeftSubTotalFormDTO formDTO) {
+        // todo
+        return null;
+    }
 }