From ce64e667815b39efdc2f8bd52be0d43d49db8d84 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 17 七月 2022 00:06:29 +0800
Subject: [PATCH] 优化小区位置
---
java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java b/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
index fbba361..c7f7d91 100755
--- a/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
+++ b/java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONPath;
+import com.alibaba.fastjson.parser.Feature;
import com.java110.core.factory.DataTransactionFactory;
import com.java110.db.dao.IQueryServiceDAO;
import com.java110.entity.service.ServiceSql;
@@ -18,6 +19,7 @@
import com.java110.utils.util.StringUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.ognl.Ognl;
+import org.apache.ibatis.ognl.OgnlContext;
import org.apache.ibatis.ognl.OgnlException;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
@@ -350,10 +352,32 @@
public JSONObject execJava(JSONObject params, String javaCode) throws BusinessException {
try {
//JSONObject params = dataQuery.getRequestParams();
+ List<String> columns = new ArrayList<>();
Interpreter interpreter = new Interpreter();
interpreter.eval(javaCode);
interpreter.set("params", params);
- return JSONObject.parseObject(interpreter.eval("execute(dataQuery)").toString());
+ interpreter.set("queryServiceDAOImpl",queryServiceDAOImpl);
+ JSONObject results = JSONObject.parseObject(interpreter.eval("execute(params,queryServiceDAOImpl)").toString(), Feature.OrderedField);
+
+ JSONArray data = null;
+ if (results == null || results.size() < 1) {
+ data = new JSONArray();
+ } else {
+ data = results.getJSONArray("data");
+ }
+
+ JSONArray th = new JSONArray();
+ if(data.size()>0) {
+ for (String key : data.getJSONObject(0).keySet()) {
+ th.add(key);
+ }
+ }
+ JSONObject paramOut = new JSONObject();
+ paramOut.put("th", th);
+ paramOut.put("td", data);
+ paramOut.put("total",results.getString("total"));
+
+ return paramOut;
} catch (Exception e) {
logger.error("鏁版嵁浜や簰寮傚父锛�", e);
throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "鏁版嵁浜や簰寮傚父," + e.getMessage());
@@ -449,7 +473,9 @@
Object condObj = Ognl.parseExpression(condition);
- Object value = Ognl.getValue(condObj, requestParams);
+ OgnlContext context = new OgnlContext(null,null,new DefaultMemberAccess(true));
+
+ Object value = Ognl.getValue(condObj,context, requestParams);
if (value instanceof Boolean) {
conditionResult = (Boolean) value;
--
Gitblit v1.8.0