删除无用代码

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

@@ -909,82 +909,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                 resultGroup.add(itemObj);
             }
         });
-
-
-//        if (group.contains("techParam") && !group.contains("paramRange") || !group.contains("techParam") && group.contains("paramRange")) {
-//            for (Object object : group) {
-//                JSONObject itemObj = JSONObject.parseObject(JSONObject.toJSONString(object));
-//                if (!itemObj.getString("field").equals("techParam")) {
-//                    resultGroup.add(itemObj);
-//                }
-//            }
-//        } else if (group.contains("techParam") && group.contains("paramRange")) {
-//            // 如果同时包含技术参数和参数范围，则将技术参数和参数范围剥离到技术参数数组中，其他的放在分组数组中
-//            for (Object object : group) {
-//                JSONObject itemObj = JSONObject.parseObject(JSONObject.toJSONString(object));
-//                if (itemObj.getString("field").equals("techParam")) {
-//                    techParam = itemObj;
-//                } else if (itemObj.getString("field").equals("paramRange")) {
-//                    paramRange = itemObj;
-//                } else {
-//                    resultGroup.add(itemObj);
-//                }
-//            }
-//        } else {
-//            // 既不包含技术参数也不包含参数范围，则直接返回分组数组
-//            resultGroup.addAll(group);
-//        }
     }
 
-    private void getItemQuery(String field, String itemCondition, Object value, String isOr, DynamicQueryBuilder groupBuilder, DynamicQueryBuilder groupMainBuilder) {
-
-        switch (itemCondition) {
-            case "eq":
-                groupBuilder.and(QueryBuilders.termQuery(field, value));
-                break;
-            case "neq":
-                groupBuilder.not(QueryBuilders.termQuery(field, value));
-                break;
-            case "like":
-                groupBuilder.and(QueryBuilders.wildcardQuery(field, "*" + value + "*"));
-                break;
-            case "notLike":
-                groupBuilder.not(QueryBuilders.wildcardQuery(field, "*" + value + "*"));
-                break;
-            case "gt":
-                groupBuilder.and(QueryBuilders.rangeQuery(field).gt(value.toString()));
-                break;
-            case "gte":
-                groupBuilder.and(QueryBuilders.rangeQuery(field).gte(value.toString()));
-                break;
-            case "lt":
-                groupBuilder.and(QueryBuilders.rangeQuery(field).lt(value.toString()));
-                break;
-            case "lte":
-                groupBuilder.and(QueryBuilders.rangeQuery(field).lte(value.toString()));
-                break;
-            case "between":
-                JSONArray btValues = (JSONArray) value;
-                groupBuilder.and(QueryBuilders.rangeQuery(field).gte(Double.parseDouble(btValues.get(0).toString())).lte(Double.parseDouble(btValues.get(1).toString())));
-                break;
-            case "in":
-                JSONArray inValues = (JSONArray) value;
-                groupBuilder.and(QueryBuilders.termsQuery(field, inValues));
-                break;
-            case "notIn":
-                JSONArray notInValues = (JSONArray) value;
-                groupBuilder.not(QueryBuilders.termsQuery(field, notInValues));
-                break;
-        }
-
-        if (isOr.equals(or)) {
-            groupMainBuilder.or(groupBuilder.build());
-        } else {
-            groupMainBuilder.and(groupBuilder.build());
-        }
-    }
-
-
     private void getItemQueryNew(String field, String itemCondition, Object value, String isOr, EnhancedDynamicQueryBuilder builder) {
         // 如果包含需要特殊处理的字段，则调用对应的处理方法，否则调用通用处理方法
         if (equipHandleOtherFields.contains(field) || companyHandleOtherFields.contains(field) || personHandleOtherFields.contains(field)) {