diff --git a/src/main/java/com/wezone/drools/utils/ConditionParser.java b/src/main/java/com/wezone/drools/utils/ConditionParser.java index aad9278..97eb6ad 100644 --- a/src/main/java/com/wezone/drools/utils/ConditionParser.java +++ b/src/main/java/com/wezone/drools/utils/ConditionParser.java @@ -22,8 +22,7 @@ public class ConditionParser { Console.log("object = ", JSONUtil.toJsonStr(jsonArray.get(i))); JSONObject o = jsonArray.getJSONObject(i); - int finalI = i; - for(Map.Entry kv: o.entrySet()) { + for (Map.Entry kv : o.entrySet()) { String key = kv.getKey(); JSONArray values = (JSONArray) kv.getValue(); @@ -31,12 +30,12 @@ public class ConditionParser { if (notEmpty) { MathOperatorEnum operatorEnum = MathOperatorEnum.fromOperator(key); - if (finalI != 0) { + if (i != 0) { Console.log("math Operator = {}", operatorEnum.toString()); stringBuffer.append(" ").append(operatorEnum.getActual()).append(" "); } - stringBuffer.append(parseArithmetic(operatorEnum, values)); + stringBuffer.append(parseArithmetic(operatorEnum, values)); } } } @@ -45,7 +44,6 @@ public class ConditionParser { private static String parseArithmetic(MathOperatorEnum parentOperatorEnum, JSONArray jsonArray) { StringJoiner stringJoiner = new StringJoiner(" "); -// stringJoiner.add("("); int ki = 0; for (Object value : jsonArray) { JSONObject vJson = (JSONObject) value; @@ -53,11 +51,9 @@ public class ConditionParser { Set keySet = vJson.keySet(); for (String skey : keySet) { JSONArray sValues = vJson.getJSONArray(skey); -// if(ki != 0) { MathOperatorEnum operatorEnum = MathOperatorEnum.fromOperator(skey); Console.log("math Operator = {}, isLogical = {}", operatorEnum.toString(), operatorEnum.isLogical()); -// } - if(ki != 0) { + if (ki != 0) { stringJoiner.add(parentOperatorEnum.getActual()); } @@ -72,77 +68,7 @@ public class ConditionParser { } ki++; } -// stringJoiner.add(") "); return stringJoiner.toString(); } -// private static String parseArithmetic(JSONArray jsonArray) { -// Console.log("parseArithmetic ---- {}", JSONUtil.toJsonStr(jsonArray)); -// StringJoiner stringJoiner = new StringJoiner(" "); -// stringJoiner.add("("); -// int ki = 0; -// for (Object value : jsonArray) { -// JSONObject vJson = (JSONObject) value; -// -// Set keySet = vJson.keySet(); -// for (String skey : keySet) { -// JSONArray sValues = vJson.getJSONArray(skey); -//// if(ki != 0) { -// MathOperatorEnum operatorEnum = MathOperatorEnum.fromOperator(skey); -// Console.log("math Operator = {}, isLogical = {}", operatorEnum.toString(), operatorEnum.isLogical()); -//// } -// String leftValue = sValues.getStr(0); -// String rightValue = sValues.getStr(1); -// stringJoiner.add(leftValue).add(operatorEnum.getActual()).add(rightValue); -// } -// ki++; -// } -// stringJoiner.add(") "); -// -//// JSONObject o = jsonArray.getJSONObject(i); -//// -//// int finalI = i; -//// for(Map.Entry kv: o.entrySet()) { -//// String key = kv.getKey(); -//// JSONArray values = (JSONArray) kv.getValue(); -//// boolean notEmpty = CollUtil.isNotEmpty(values); -//// -//// if (notEmpty) { -//// if (finalI != 0) { -//// MathOperatorEnum operatorEnum = MathOperatorEnum.fromOperator(key); -//// Console.log("math Operator = {}", operatorEnum.toString()); -//// stringJoiner.add(operatorEnum.getActual()); -//// } -//// -//// -//// stringJoiner.add("("); -//// int ki = 0; -//// for (Object value : values) { -//// JSONObject vJson = (JSONObject) value; -//// -//// Set keySet = vJson.keySet(); -//// for (String skey : keySet) { -//// JSONArray sValues = vJson.getJSONArray(skey); -////// if(ki != 0) { -//// MathOperatorEnum operatorEnum = MathOperatorEnum.fromOperator(skey); -//// Console.log("math Operator = {}, isLogical = {}", operatorEnum.toString(), operatorEnum.isLogical()); -////// } -//// -//// if(operatorEnum.isLogical()) { -//// stringJoiner.add(parseCondition(sValues)); -//// } else { -//// String leftValue = sValues.getStr(0); -//// String rightValue = sValues.getStr(1); -//// stringJoiner.add(leftValue).add(operatorEnum.getActual()).add(rightValue); -//// } -//// } -//// ki++; -//// } -//// stringJoiner.add(") "); -//// } -//// stringBuffer.append(stringJoiner.toString()); -//// } -// return stringJoiner.toString(); -// } - }