综合统计分析列表查询接口部分功能实现

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/ConditionEnum.java

@@ -6,9 +6,6 @@ import com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @AllArgsConstructor
 @Getter
 public enum ConditionEnum {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/StatisticalAnalysisEnum.java

+package com.yeejoin.amos.boot.module.statistics.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum StatisticalAnalysisEnum {
+
+    /**
+     * 综合统计分析列表查询设备、企业、人员ES索引
+     */
+
+    company("企业", "company", "idx_biz_enterprise_info"),
+
+    person("人员", "person", "idx_biz_user_info"),
+
+    equip("设备", "equip", "idx_biz_equipment_info");
+
+    private String name;
+
+    private String code;
+
+    private String key;
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ComprehensiveStatisticalAnalysisController.java

@@ -28,7 +28,7 @@ import java.util.Map;
 public class ComprehensiveStatisticalAnalysisController extends BaseController {
 
     @Autowired
-    private ComprehensiveStatisticalAnalysisServiceImpl comprehensiveStatisticalAnalysisServiceImpl;
+    private ComprehensiveStatisticalAnalysisServiceImpl statisticalAnalysisService;
 
     /**
      * 查询设备分类
@@ -41,8 +41,9 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "查询设备分类", notes = "查询设备分类")
     public ResponseModel<List<Map<String, Object>>> queryEquipmentCategory(@RequestBody JSONObject category) {
         String key = category.getString("key") == null ? null : category.getString("key");
-        return ResponseHelper.buildResponse(comprehensiveStatisticalAnalysisServiceImpl.queryEquipmentCategory(key));
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryEquipmentCategory(key));
     }
+
     /**
      * @param jsonObject
      * @return
@@ -50,10 +51,10 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/select/queryEquipmentSearchData")
     @ApiOperation(httpMethod = "POST", value = "查询设备查询条件", notes = "查询设备查询条件")
-    public ResponseModel<JSONObject> queryEquipmentSearchData(@RequestBody JSONObject jsonObject){
-        return ResponseHelper.buildResponse(comprehensiveStatisticalAnalysisServiceImpl.queryEquipmentSearchData(jsonObject.getString("value")));
-
+    public ResponseModel<JSONObject> queryEquipmentSearchData(@RequestBody JSONObject jsonObject) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryEquipmentSearchData(jsonObject.getString("value")));
     }
+
     /**
      * @param
      * @return
@@ -61,7 +62,23 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/select/queryAdvancedSearch")
     @ApiOperation(httpMethod = "GET", value = "查询高级筛选", notes = "查询高级筛选")
-    public ResponseModel<JSONArray> query(){
-        return ResponseHelper.buildResponse(comprehensiveStatisticalAnalysisServiceImpl.queryAdvancedSearch());
+    public ResponseModel<JSONArray> query() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryAdvancedSearch());
+    }
+
+    /**
+     * 综合统计分析接口分页查询
+     *
+     * @param map
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/page")
+    @ApiOperation(httpMethod = "POST", value = "综合统计分析接口分页查询", notes = "综合统计分析接口分页查询")
+    public ResponseModel<JSONObject> queryForPage(@RequestBody Map<String, Object> map) {
+        JSONObject jsonObject = new JSONObject(map);
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryForPage(jsonObject));
     }
+
+
 }