feat(statistics): 增加高级筛选功能并优化设备查询条件接口

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

 package com.yeejoin.amos.boot.module.statistcs.biz.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.ComprehensiveStatisticalAnalysisServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 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 org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -51,9 +49,19 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/select/queryEquipmentSearchData")
-    @ApiOperation(httpMethod = "GET", value = "查询设备查询条件", notes = "查询设备查询条件")
+    @ApiOperation(httpMethod = "POST", value = "查询设备查询条件", notes = "查询设备查询条件")
     public ResponseModel<JSONObject> queryEquipmentSearchData(@RequestBody JSONObject jsonObject){
         return ResponseHelper.buildResponse(comprehensiveStatisticalAnalysisServiceImpl.queryEquipmentSearchData(jsonObject.getString("value")));
 
     }
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryAdvancedSearch")
+    @ApiOperation(httpMethod = "GET", value = "查询高级筛选", notes = "查询高级筛选")
+    public ResponseModel<JSONArray> query(){
+        return ResponseHelper.buildResponse(comprehensiveStatisticalAnalysisServiceImpl.queryAdvancedSearch());
+    }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.common.api.dto.TechParamItem;
 import com.yeejoin.amos.boot.module.common.biz.utils.TechParamUtil;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
+import com.yeejoin.amos.boot.module.statistics.api.enums.AdvanceSearchEnum;
 import com.yeejoin.amos.boot.module.statistics.api.enums.ConditionEnum;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterMapper;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
@@ -75,12 +76,12 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             }else if(TechnicalParameter.ParamType.DATE.equals(paramMetaList.get(i).getParamType())){
                 skillConfig.put("type","date");
             }
-            skillConfig.put("isMulti","false");
+            skillConfig.put("isMulti",false);
             object.put("skillConfig",skillConfig);
             list.add(object);
         }
         JSONObject result = new JSONObject();
-        result.put("result",list);
+        result.put("techParam",list);
         return result;
     }
 
@@ -100,4 +101,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
     private JSONArray getConditionList(TechnicalParameter.ParamType value,String dictCode) {
         return ConditionEnum.getByCode(ValidationUtil.isEmpty(dictCode) ? value : null);
     }
+    public JSONArray queryAdvancedSearch() {
+        JSONArray all = AdvanceSearchEnum.getAll();
+        return all;
+    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/application.properties

-spring.application.name=TZS-STATISTICS
+spring.application.name=TZS-STATISTICS-MAXY
 server.servlet.context-path=/statistics
 server.port=12001
 spring.profiles.active=dev