From 6e8c95d31d85b53857e4e3ce12ea303eb0ea42eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 00:47:48 +0800
Subject: [PATCH] 优化代码
---
java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java | 121 +++++++++++++++++++++++++++++++++-------
1 files changed, 99 insertions(+), 22 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
old mode 100644
new mode 100755
index 773b4dc..bb7df68
--- 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,19 +4,24 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONPath;
-import com.java110.common.cache.ServiceSqlCache;
-import com.java110.common.constant.CommonConstant;
-import com.java110.common.constant.ResponseConstant;
-import com.java110.common.exception.BusinessException;
import com.java110.core.factory.DataTransactionFactory;
-import com.java110.common.log.LoggerEngine;
-import com.java110.common.util.Assert;
-import com.java110.common.util.StringUtil;
-import com.java110.entity.service.DataQuery;
+import com.java110.db.dao.IQueryServiceDAO;
import com.java110.entity.service.ServiceSql;
-import com.java110.service.dao.IQueryServiceDAO;
+import com.java110.service.context.DataQuery;
import com.java110.service.smo.IQueryServiceSMO;
+import com.java110.utils.cache.ServiceSqlCache;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.BusinessException;
+import com.java110.utils.log.LoggerEngine;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.ognl.Ognl;
+import org.apache.ibatis.ognl.OgnlException;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -114,6 +119,23 @@
}
+ @Override
+ public ResponseEntity<String> fallBack(String fallBackInfo) throws BusinessException {
+
+ JSONArray params = JSONArray.parseArray(fallBackInfo);
+ for (int paramIndex = 0; paramIndex < params.size(); paramIndex++) {
+ JSONObject param = params.getJSONObject(paramIndex);
+ String sql = param.getString("fallBackSql");
+ if (StringUtil.isEmpty(sql)) {
+ return new ResponseEntity<String>("鏈寘鍚玸ql淇℃伅", HttpStatus.BAD_REQUEST);
+ }
+ int flag = queryServiceDAOImpl.updateSql(sql, null);
+
+ }
+ return new ResponseEntity<String>("鍥為��鎴愬姛", HttpStatus.OK);
+
+ }
+
/**
* {"PARAM:"{
* "param1": "$.a.#A#Object",
@@ -172,25 +194,17 @@
*/
private void doExecuteJava(DataQuery dataQuery) throws BusinessException {
try {
- JSONObject params = dataQuery.getRequestParams();
+ //JSONObject params = dataQuery.getRequestParams();
String javaCode = dataQuery.getServiceSql().getJavaScript();
Interpreter interpreter = new Interpreter();
interpreter.eval(javaCode);
- String param = "";
- for (String key : params.keySet()) {
- param += (params.getString(key) + ",");
- }
-
- if (param.endsWith(",")) {
- param = param.substring(0, param.length() - 1);
- }
-
+ interpreter.set("dataQuery", dataQuery);
dataQuery.setResponseInfo(DataTransactionFactory.createBusinessResponseJson(ResponseConstant.RESULT_CODE_SUCCESS,
- "鎴愬姛", JSONObject.parseObject(interpreter.eval("execute(" + param + ")").toString())));
+ "鎴愬姛", JSONObject.parseObject(interpreter.eval("execute(dataQuery)").toString())));
} catch (Exception e) {
logger.error("鏁版嵁浜や簰寮傚父锛�", e);
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "鏁版嵁浜や簰寮傚父銆傘�傘��");
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "鏁版嵁浜や簰寮傚父," + e.getMessage());
}
}
@@ -251,6 +265,12 @@
List<Object> currentParams = new ArrayList<Object>();
String currentSql = sqlObj.getString(dataQuery.getTemplateKey());
+ //澶勭悊 if 鍒ゆ柇
+ logger.debug("dealSqlIf寮�濮嬪鐞唖ql涓殑<if>鑺傜偣 " + currentSql + " 鍏ュ弬:" + params.toJSONString());
+ currentSql = dealSqlIf(currentSql, params);
+ logger.debug("dealSqlIf澶勭悊瀹屾垚sql涓殑<if>鑺傜偣 " + currentSql + " 鍏ュ弬:" + params.toJSONString());
+
+
String[] sqls = currentSql.split("#");
String currentSqlNew = "";
for (int sqlIndex = 0; sqlIndex < sqls.length; sqlIndex++) {
@@ -281,7 +301,7 @@
param = params.getInteger(sqls[sqlIndex]);
}
//杩欓噷瀵� page 鍜� rows 鐗规畩澶勭悊 锛岀洰鍓嶆病鏈夋兂鍒板叾浠栫殑鍔炴硶
- if (StringUtils.isNumeric(param.toString()) && "page,rows".contains(sqls[sqlIndex])) {
+ if (StringUtils.isNumeric(param.toString()) && "page,rows,row".contains(sqls[sqlIndex])) {
param = Integer.parseInt(param.toString());
}
currentParams.add(param);
@@ -321,6 +341,63 @@
}
/**
+ * 澶勭悊SQL璇彞
+ *
+ * @param oldSql select * from s_a a
+ * where <if test="name != null && name != ''">
+ * a.name = #name#
+ * </if>
+ * @return
+ */
+ public String dealSqlIf(String oldSql, JSONObject requestParams) throws DocumentException, OgnlException {
+ StringBuffer newSql = new StringBuffer();
+ String tmpSql = "";
+ Boolean conditionResult = false;
+ // 鏈寘鍚� 鏉′欢璇彞
+ if (!oldSql.contains("<if")) {
+ return oldSql;
+ }
+
+ String[] oSqls = oldSql.split("</if>");
+ for (String oSql : oSqls) {
+ logger.debug("澶勭悊if 鑺傜偣锛屽綋鍓嶅鐞嗙殑oSql=" + oSql + "鎬荤殑oSqls = " + oSqls);
+ if (StringUtil.isNullOrNone(oSql) || !oSql.contains("<if")) {
+ newSql.append(oSql);
+ continue;
+ }
+ if (!oSql.startsWith("<if")) {
+ newSql.append(oSql.substring(0, oSql.indexOf("<if")));
+ }
+
+ tmpSql = oSql.substring(oSql.indexOf("<if")) + "</if>";
+
+ Element root = DocumentHelper.parseText(tmpSql).getRootElement();
+
+ String condition = root.attribute("test").getValue();
+
+ Object condObj = Ognl.parseExpression(condition);
+
+ Object value = Ognl.getValue(condObj, requestParams);
+
+ if (value instanceof Boolean) {
+ conditionResult = (Boolean) value;
+ } else {
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "閰嶇疆閿欒锛宨f璇彞閰嶇疆閿欒 " + condition);
+ }
+
+ if (conditionResult) {
+ newSql.append(root.getText());
+ }
+
+
+ }
+
+
+ return newSql.toString().replace(">", ">").replace("<", "<");
+
+ }
+
+ /**
* 澶勭悊JSONArray
*
* @param objs
--
Gitblit v1.8.0