|
@@ -113,14 +113,19 @@ public class ComputeUtil {
|
|
// 处理expression
|
|
// 处理expression
|
|
for (SceneProperty spInner : spList) {
|
|
for (SceneProperty spInner : spList) {
|
|
if (spInner.propertyValueType.equals("query")) {
|
|
if (spInner.propertyValueType.equals("query")) {
|
|
- JSONObject sql_json = JSON.parseObject(spInner.query_sql);
|
|
|
|
- if (sql_json.containsKey("QueryType")) {
|
|
|
|
- String QueryType = (String) sql_json.get("QueryType");
|
|
|
|
- if (QueryType.equals("expression")) {
|
|
|
|
- String expression = (String) sql_json.get("expression");
|
|
|
|
- JSONObject CriteriaObject = (JSONObject) sql_json.get("Criteria");
|
|
|
|
- ExpressionUtil.buildAndPut(Repository, spInner, expression, CriteriaObject);
|
|
|
|
|
|
+ try {
|
|
|
|
+ JSONObject sql_json = JSON.parseObject(spInner.query_sql);
|
|
|
|
+ if (sql_json.containsKey("QueryType")) {
|
|
|
|
+ String QueryType = (String) sql_json.get("QueryType");
|
|
|
|
+ if (QueryType.equals("expression")) {
|
|
|
|
+ String expression = (String) sql_json.get("expression");
|
|
|
|
+ JSONObject CriteriaObject = (JSONObject) sql_json.get("Criteria");
|
|
|
|
+ ExpressionUtil.buildAndPut(Repository, spInner, expression, CriteriaObject);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error(spInner.query_sql);
|
|
|
|
+ throw e;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|