fix(core): 调整技术参数请求接口

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

@@ -18,7 +18,7 @@ public enum EquipAdvanceSearchEnum {
     EQU_CATEGORY("设备类别", "EQU_CATEGORY_CODE",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquCategory?type={type}",null,"EQU_LIST_CODE"),
     EQU_DEFINE("设备品种", "EQU_DEFINE_CODE",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquDefine?type={type}",null,"EQU_CATEGORY_CODE"),
     PRODUCT_NAME("设备名称", "PRODUCT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
-    TECH_PARAM("技术参数", "techParam", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryTechParam?type={type}",null,"EQU_LIST,EQU_CATEGORY,EQU_DEFINE"),
+    TECH_PARAM("技术参数", "techParam", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryTechParam",null,"EQU_LIST,EQU_CATEGORY,EQU_DEFINE,WHETHER_VEHICLE_CYLINDER,QZ_OR_TANK"),
     PARAM_RANGE("参数范围", "paramRange", TechnicalParameter.ParamType.STRING,"",null,null),
     NEXT_INSPECT_DATE("检验有效期", "NEXT_INSPECT_DATE", TechnicalParameter.ParamType.DATE,"",null,null),
     EQU_STATE("设备状态", "EQU_STATE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquState",null,null),

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

@@ -351,10 +351,10 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/select/queryTechParam")
-    @ApiOperation(httpMethod = "GET", value = "高级搜索技术参数", notes = "高级搜索技术参数")
-    public ResponseModel<JSONArray> queryTechParam(@RequestParam() String type) {
-        return ResponseHelper.buildResponse(statisticalAnalysisService.queryTechParam(type));
+    @PostMapping(value = "/select/queryTechParam")
+    @ApiOperation(httpMethod = "POST", value = "高级搜索技术参数", notes = "高级搜索技术参数")
+    public ResponseModel<JSONArray> queryTechParam(@RequestBody JSONObject jsonObject) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryTechParam(jsonObject));
     }
 
 

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

@@ -142,7 +142,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         String equList = jsonObject.getString("EQU_LIST");
         String equCategory = jsonObject.getString("EQU_CATEGORY");
         String equDefine = jsonObject.getString("EQU_DEFINE");
-        List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(equList, equCategory, equDefine);
+        Boolean whetherVehicleCylinder = "1".equals(jsonObject.getString("WHETHER_VEHICLE_CYLINDER")) ? Boolean.TRUE : Boolean.FALSE;
+        List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(equList, equCategory, equDefine, whetherVehicleCylinder);
         JSONArray list = new JSONArray();
         for (int i = 0; i < paramMetaList.size(); i++) {
             JSONObject object = new JSONObject();
@@ -2425,16 +2426,17 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         return UscDateEnum.getAll();
     }
 
-    public JSONArray queryTechParam(String type) {
+    public JSONArray queryTechParam(JSONObject jsonObject) {
+
+        String equList = jsonObject.getString("EQU_LIST");
+        String equCategory = jsonObject.getString("EQU_CATEGORY");
+        String equDefine = jsonObject.getString("EQU_DEFINE");
+        Boolean whetherVehicleCylinder = "1".equals(jsonObject.getString("WHETHER_VEHICLE_CYLINDER")) ? Boolean.TRUE : Boolean.FALSE;
 
-        String[] split = type.split(",");
-        String equList = split[0];
-        String equCategory = "".equals(split[1]) ? null : split[1];
-        String equDefine = "".equals(split[2]) ? null : split[2];
         if ("".equals(equList) || null == equList) {
             throw new BaseException("需要先选择设备种类，才能选择技术参数", "200", "需要先选择设备种类，才能选择技术参数");
         }
-        List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(equList, equCategory, equDefine);
+        List<TechParamItem> paramMetaList = TechParamUtil.getParamMetaList(equList, equCategory, equDefine, whetherVehicleCylinder);
         JSONArray list = new JSONArray();
         for (int i = 0; i < paramMetaList.size(); i++) {
             JSONObject object = new JSONObject();