From 2bf68ba42eac2781eaa9e03d2b84d06682e7cfaf Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 17 十月 2019 19:39:42 +0800
Subject: [PATCH] 打印 sql 中if 节点处理 打印日志方便调试
---
java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java | 278 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 172 insertions(+), 106 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 3f43c05..7cadaaf 100644
--- 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.utils.cache.ServiceSqlCache;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.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.utils.log.LoggerEngine;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
+import com.java110.service.context.DataQuery;
import com.java110.entity.service.ServiceSql;
import com.java110.service.dao.IQueryServiceDAO;
import com.java110.service.smo.IQueryServiceSMO;
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;
@@ -38,7 +43,7 @@
public class QueryServiceSMOImpl extends LoggerEngine implements IQueryServiceSMO {
- private final static Logger logger = LoggerFactory.getLogger(QueryServiceSMOImpl.class);
+ private static Logger logger = LoggerFactory.getLogger(QueryServiceSMOImpl.class);
@Autowired
@@ -51,62 +56,63 @@
try {
ServiceSql currentServiceSql = ServiceSqlCache.getServiceSql(dataQuery.getServiceCode());
if (currentServiceSql == null) {
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"鏈彁渚涜鏈嶅姟 serviceCode = " + dataQuery.getServiceCode());
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "鏈彁渚涜鏈嶅姟 serviceCode = " + dataQuery.getServiceCode());
}
if ("".equals(currentServiceSql.getQueryModel())) {
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"閰嶇疆鏈嶅姟 serviceCode = " + dataQuery.getServiceCode() + " 閿欒锛屾湭閰嶇疆QueryModel,璇疯仈绯荤鐞嗗憳");
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "閰嶇疆鏈嶅姟 serviceCode = " + dataQuery.getServiceCode() + " 閿欒锛屾湭閰嶇疆QueryModel,璇疯仈绯荤鐞嗗憳");
}
//璇锋眰鍙傛暟鏍￠獙
List<String> sysParams = currentServiceSql.getParamList();
- for(String param : sysParams) {
- if(!dataQuery.getRequestParams().containsKey(param)){
+ for (String param : sysParams) {
+ if (!dataQuery.getRequestParams().containsKey(param)) {
//2019-04-10 杩欓噷淇敼涓轰笉鎶涘嚭寮傚父鑰屾槸鍐欎负绌哄瓧绗︿覆
//throw new BusinessException(ResponseConstant.RESULT_PARAM_ERROR,"璇锋眰鍙傛暟閿欒锛岃姹傛姤鏂囦腑鏈寘鍚弬鏁� " + param + " 淇℃伅");
- dataQuery.getRequestParams().put(param,"");
+ dataQuery.getRequestParams().put(param, "");
}
}
dataQuery.setServiceSql(currentServiceSql);
if (CommonConstant.QUERY_MODEL_SQL.equals(currentServiceSql.getQueryModel())) {
doExecuteSql(dataQuery);
- }else if(CommonConstant.QUERY_MODE_JAVA.equals(currentServiceSql.getQueryModel())){
+ } else if (CommonConstant.QUERY_MODE_JAVA.equals(currentServiceSql.getQueryModel())) {
doExecuteJava(dataQuery);
- }else {
+ } else {
doExecuteProc(dataQuery);
}
responseEntity = new ResponseEntity<String>(dataQuery.getResponseInfo().toJSONString(), HttpStatus.OK);
- }catch (BusinessException e){
- logger.error("鍏敤鏌ヨ寮傚父锛�",e);
+ } catch (BusinessException e) {
+ logger.error("鍏敤鏌ヨ寮傚父锛�", e);
/*dataQuery.setResponseInfo(DataTransactionFactory.createBusinessResponseJson(ResponseConstant.RESULT_PARAM_ERROR,
e.getMessage()));*/
- responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�"+e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
- }finally {
+ responseEntity = new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�" + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ } finally {
dataQuery.setResponseEntity(responseEntity);
}
}
+
@Override
public void commonDoService(DataQuery dataQuery) throws BusinessException {
//鏌ヨ缂撳瓨鏌ヨ 瀵瑰簲澶勭悊鐨凷erviceSql
try {
ServiceSql currentServiceSql = ServiceSqlCache.getServiceSql(dataQuery.getServiceCode());
if (currentServiceSql == null) {
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"鏈彁渚涜鏈嶅姟 serviceCode = " + dataQuery.getServiceCode());
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "鏈彁渚涜鏈嶅姟 serviceCode = " + dataQuery.getServiceCode());
}
if ("".equals(currentServiceSql.getQueryModel())) {
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"閰嶇疆鏈嶅姟 serviceCode = " + dataQuery.getServiceCode() + " 閿欒锛屾湭閰嶇疆QueryModel,璇疯仈绯荤鐞嗗憳");
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "閰嶇疆鏈嶅姟 serviceCode = " + dataQuery.getServiceCode() + " 閿欒锛屾湭閰嶇疆QueryModel,璇疯仈绯荤鐞嗗憳");
}
dataQuery.setServiceSql(currentServiceSql);
if (CommonConstant.QUERY_MODEL_SQL.equals(currentServiceSql.getQueryModel())) {
doExecuteUpdateSql(dataQuery);
return;
- }else if(CommonConstant.QUERY_MODE_JAVA.equals(currentServiceSql.getQueryModel())){
+ } else if (CommonConstant.QUERY_MODE_JAVA.equals(currentServiceSql.getQueryModel())) {
doExecuteJava(dataQuery);
- return ;
+ return;
}
doExecuteUpdateProc(dataQuery);
- }catch (BusinessException e){
- logger.error("鍏敤鏌ヨ寮傚父锛�",e);
+ } catch (BusinessException e) {
+ logger.error("鍏敤鏌ヨ寮傚父锛�", e);
dataQuery.setResponseInfo(DataTransactionFactory.createBusinessResponseJson(ResponseConstant.RESULT_PARAM_ERROR,
e.getMessage()));
}
@@ -115,15 +121,16 @@
/**
* {"PARAM:"{
- "param1": "$.a.#A#Object",
- "param2": "$.a.b.A#B#Array",
- "param3": "$.a.b.c.A.B#C#Array"
- },"TEMPLATE":"{}"
- }
+ * "param1": "$.a.#A#Object",
+ * "param2": "$.a.b.A#B#Array",
+ * "param3": "$.a.b.c.A.B#C#Array"
+ * },"TEMPLATE":"{}"
+ * }
* 鎵цsql
+ *
* @param dataQuery
*/
- private void doExecuteUpdateSql(DataQuery dataQuery) throws BusinessException{
+ private void doExecuteUpdateSql(DataQuery dataQuery) throws BusinessException {
JSONObject business = null;
try {
JSONObject params = dataQuery.getRequestParams();
@@ -132,7 +139,7 @@
business = JSONObject.parseObject(templateObj.getString("TEMPLATE"));
List<Object> currentParams = new ArrayList<Object>();
String currentSql = "";
- for(String key : sqlObj.keySet()) {
+ for (String key : sqlObj.keySet()) {
currentSql = sqlObj.getString(key);
String[] sqls = currentSql.split("#");
String currentSqlNew = "";
@@ -146,61 +153,56 @@
//currentSqlNew += params.get(sqls[sqlIndex]) instanceof Integer ? params.getInteger(sqls[sqlIndex]) : "'" + params.getString(sqls[sqlIndex]) + "'";
}
- int flag = queryServiceDAOImpl.updateSql(currentSqlNew,currentParams.toArray());
+ int flag = queryServiceDAOImpl.updateSql(currentSqlNew, currentParams.toArray());
if (flag < 1) {
throw new BusinessException(ResponseConstant.RESULT_PARAM_ERROR, "鏁版嵁浜や簰澶辫触");
}
}
- }catch (Exception e){
- logger.error("鏁版嵁浜や簰寮傚父锛�",e);
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"鏁版嵁浜や簰寮傚父銆傘�傘��");
+ } catch (Exception e) {
+ logger.error("鏁版嵁浜や簰寮傚父锛�", e);
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "鏁版嵁浜や簰寮傚父銆傘�傘��");
}
dataQuery.setResponseInfo(DataTransactionFactory.createBusinessResponseJson(ResponseConstant.RESULT_CODE_SUCCESS,
- "鎴愬姛",business));
+ "鎴愬姛", business));
}
/**
* 鎵цjava鑴氭湰
+ *
* @param dataQuery
* @throws BusinessException
*/
- private void doExecuteJava(DataQuery dataQuery) throws BusinessException{
+ 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())));
- }catch (Exception e){
- logger.error("鏁版嵁浜や簰寮傚父锛�",e);
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"鏁版嵁浜や簰寮傚父銆傘�傘��");
+ "鎴愬姛", JSONObject.parseObject(interpreter.eval("execute(dataQuery)").toString())));
+ } catch (Exception e) {
+ logger.error("鏁版嵁浜や簰寮傚父锛�", e);
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "鏁版嵁浜や簰寮傚父," + e.getMessage());
}
}
+
/**
* {"PARAM:"{
- "param1": "$.a.#A#Object",
- "param2": "$.a.b.A#B#Array",
- "param3": "$.a.b.c.A.B#C#Array"
- },"TEMPLATE":"{}"
- }
+ * "param1": "$.a.#A#Object",
+ * "param2": "$.a.b.A#B#Array",
+ * "param3": "$.a.b.c.A.B#C#Array"
+ * },"TEMPLATE":"{}"
+ * }
* 鎵цsql
+ *
* @param dataQuery
*/
- private void doExecuteSql(DataQuery dataQuery) throws BusinessException{
+ private void doExecuteSql(DataQuery dataQuery) throws BusinessException {
JSONObject templateObj = JSONObject.parseObject(dataQuery.getServiceSql().getTemplate());
JSONObject templateParams = templateObj.getJSONObject("PARAM");
@@ -209,7 +211,7 @@
String[] values = null;
JSONObject currentJsonObj = null;
JSONArray currentJsonArr = null;
- for(String key:templateParams.keySet()){
+ for (String key : templateParams.keySet()) {
template = templateParams.getString(key);
values = judgeResponseTemplate(template);
@@ -217,34 +219,41 @@
Object o = JSONPath.eval(business, values[0]);
dataQuery.setTemplateKey(key);
- if(o instanceof JSONObject){
- currentJsonObj = (JSONObject)o;
- doJsonObject(currentJsonObj,dataQuery,values);
- }else if(o instanceof JSONArray){
+ if (o instanceof JSONObject) {
+ currentJsonObj = (JSONObject) o;
+ doJsonObject(currentJsonObj, dataQuery, values);
+ } else if (o instanceof JSONArray) {
currentJsonArr = (JSONArray) o;
- doJsonArray(currentJsonArr,dataQuery,values);
- }else{
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"template 閰嶇疆 涓嶆纭紝value 鍊� 鍜� TEMPLATE 閰嶇疆涓嶄竴鑷�");
+ doJsonArray(currentJsonArr, dataQuery, values);
+ } else {
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "template 閰嶇疆 涓嶆纭紝value 鍊� 鍜� TEMPLATE 閰嶇疆涓嶄竴鑷�");
}
}
dataQuery.setResponseInfo(DataTransactionFactory.createBusinessResponseJson(ResponseConstant.RESULT_CODE_SUCCESS,
- "鎴愬姛",business));
+ "鎴愬姛", business));
}
/**
* 澶勭悊 jsonObject
+ *
* @param obj
* @param dataQuery
* @param values
*/
- private void doJsonObject(JSONObject obj,DataQuery dataQuery,String[] values){
+ private void doJsonObject(JSONObject obj, DataQuery dataQuery, String[] values) {
try {
JSONObject params = dataQuery.getRequestParams();
JSONObject sqlObj = JSONObject.parseObject(dataQuery.getServiceSql().getSql());
List<Object> currentParams = new ArrayList<Object>();
String currentSql = sqlObj.getString(dataQuery.getTemplateKey());
+ //澶勭悊 if 鍒ゆ柇
+ logger.debug("dealSqlIf寮�濮嬪鐞唖ql涓殑<if>鑺傜偣", currentSql);
+ currentSql = dealSqlIf(currentSql, params);
+ logger.debug("dealSqlIf澶勭悊瀹屾垚sql涓殑<if>鑺傜偣", currentSql);
+
+
String[] sqls = currentSql.split("#");
String currentSqlNew = "";
for (int sqlIndex = 0; sqlIndex < sqls.length; sqlIndex++) {
@@ -253,7 +262,7 @@
continue;
}
if (sqls[sqlIndex].startsWith("PARENT_")) {
- if(obj.isEmpty()){
+ if (obj.isEmpty()) {
currentSqlNew += "?";
currentParams.add("''");
continue;
@@ -270,12 +279,12 @@
}
} else {
currentSqlNew += "?";
- Object param = params.getString(sqls[sqlIndex]);
- if(params.get(sqls[sqlIndex]) instanceof Integer){
+ Object param = params.getString(sqls[sqlIndex]);
+ if (params.get(sqls[sqlIndex]) instanceof Integer) {
param = params.getInteger(sqls[sqlIndex]);
}
- //杩欓噷瀵� page 鍜� rows 鐗规畩澶勭悊 锛岀洰鍓嶆病鏈夋兂鍒板叾浠栫殑鍔炴硶
- if(StringUtils.isNumeric(param.toString()) && "page,rows".contains(sqls[sqlIndex])){
+ //杩欓噷瀵� page 鍜� rows 鐗规畩澶勭悊 锛岀洰鍓嶆病鏈夋兂鍒板叾浠栫殑鍔炴硶
+ if (StringUtils.isNumeric(param.toString()) && "page,rows".contains(sqls[sqlIndex])) {
param = Integer.parseInt(param.toString());
}
currentParams.add(param);
@@ -283,93 +292,149 @@
}
}
- List<Map<String,Object>> results = queryServiceDAOImpl.executeSql(currentSqlNew, currentParams.toArray());
+ List<Map<String, Object>> results = queryServiceDAOImpl.executeSql(currentSqlNew, currentParams.toArray());
if (results == null || results.size() == 0) {
- if(StringUtil.isNullOrNone(values[1])){
- return ;
+ if (StringUtil.isNullOrNone(values[1])) {
+ return;
}
- obj.put(values[1], values[2].equals("Object")?new JSONObject():new JSONArray());
+ obj.put(values[1], values[2].equals("Object") ? new JSONObject() : new JSONArray());
return;
}
if (values[2].equals("Object")) {
- if(StringUtil.isNullOrNone(values[1])){
+ if (StringUtil.isNullOrNone(values[1])) {
obj.putAll(JSONObject.parseObject(JSONObject.toJSONString(results.get(0))));
- return ;
+ return;
}
obj.put(values[1], JSONObject.parseObject(JSONObject.toJSONString(results.get(0))));
} else if (values[2].equals("Array")) {
- if(StringUtil.isNullOrNone(values[1])){
+ if (StringUtil.isNullOrNone(values[1])) {
JSONArray datas = JSONArray.parseArray(JSONArray.toJSONString(results));
- for(int dataIndex = 0;dataIndex < datas.size();dataIndex ++){
+ for (int dataIndex = 0; dataIndex < datas.size(); dataIndex++) {
obj.putAll(datas.getJSONObject(dataIndex));
}
- return ;
+ return;
}
obj.put(values[1], JSONArray.parseArray(JSONArray.toJSONString(results)));
}
- }catch (Exception e){
- logger.error("鏁版嵁浜や簰寮傚父锛�",e);
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"鏁版嵁浜や簰寮傚父銆傘�傘��");
+ } catch (Exception e) {
+ logger.error("鏁版嵁浜や簰寮傚父锛�", e);
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "鏁版嵁浜や簰寮傚父銆傘�傘��");
}
}
/**
+ * 澶勭悊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) {
+ 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();
+
+ }
+
+ /**
* 澶勭悊JSONArray
+ *
* @param objs
* @param dataQuery
* @param values
*/
- private void doJsonArray(JSONArray objs,DataQuery dataQuery,String[] values){
+ private void doJsonArray(JSONArray objs, DataQuery dataQuery, String[] values) {
- for (int objIndex = 0 ; objIndex < objs.size();objIndex ++){
- doJsonObject(objs.getJSONObject(objIndex),dataQuery,values);
+ for (int objIndex = 0; objIndex < objs.size(); objIndex++) {
+ doJsonObject(objs.getJSONObject(objIndex), dataQuery, values);
}
}
/**
* 鎵ц瀛樺偍
+ *
* @param dataQuery
*/
- private void doExecuteUpdateProc(DataQuery dataQuery){
+ private void doExecuteUpdateProc(DataQuery dataQuery) {
Map info = new TreeMap();
- info.put("procName",dataQuery.getServiceSql().getProc());
+ info.put("procName", dataQuery.getServiceSql().getProc());
JSONObject params = dataQuery.getRequestParams();
info.putAll(params);
String jsonStr = queryServiceDAOImpl.updateProc(info);
- if(!Assert.isJsonObject(jsonStr)){
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"瀛樺偍杩囩▼ procName = " + dataQuery.getServiceSql().getProc() + " 杩斿洖缁撴灉涓嶆槸Json鏍煎紡");
+ if (!Assert.isJsonObject(jsonStr)) {
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "瀛樺偍杩囩▼ procName = " + dataQuery.getServiceSql().getProc() + " 杩斿洖缁撴灉涓嶆槸Json鏍煎紡");
}
dataQuery.setResponseInfo(DataTransactionFactory.createBusinessResponseJson(ResponseConstant.RESULT_CODE_SUCCESS,
- "鎴愬姛",JSONObject.parseObject(jsonStr)));
+ "鎴愬姛", JSONObject.parseObject(jsonStr)));
}
/**
* 鏍￠獙 杩斿洖妯℃澘
+ *
* @param template
* @return
* @throws BusinessException
*/
- private String[] judgeResponseTemplate(String template) throws BusinessException{
+ private String[] judgeResponseTemplate(String template) throws BusinessException {
- if(!template.startsWith("$.")){
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"template 閰嶇疆 涓嶆纭紝value 蹇呴』浠�$.寮�澶�");
+ if (!template.startsWith("$.")) {
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "template 閰嶇疆 涓嶆纭紝value 蹇呴』浠�$.寮�澶�");
}
String[] values = template.split("#");
- if(values == null || values.length != 3){
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"template 閰嶇疆 涓嶆纭紝value 蹇呴』鏈変袱涓�#鍙�");
+ if (values == null || values.length != 3) {
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "template 閰嶇疆 涓嶆纭紝value 蹇呴』鏈変袱涓�#鍙�");
}
- if(StringUtil.isNullOrNone(values[1]) && !"$.##Object".equals(template) && !"$.##Array".equals(template)){
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"template 閰嶇疆 涓嶆纭紝鐩墠鍙敮鎸� $.##Object 鍜� $.##Array ");
+ if (StringUtil.isNullOrNone(values[1]) && !"$.##Object".equals(template) && !"$.##Array".equals(template)) {
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "template 閰嶇疆 涓嶆纭紝鐩墠鍙敮鎸� $.##Object 鍜� $.##Array ");
}
return values;
@@ -378,22 +443,23 @@
/**
* 鎵ц瀛樺偍
+ *
* @param dataQuery
*/
- private void doExecuteProc(DataQuery dataQuery){
+ private void doExecuteProc(DataQuery dataQuery) {
Map info = new TreeMap();
- info.put("procName",dataQuery.getServiceSql().getProc());
+ info.put("procName", dataQuery.getServiceSql().getProc());
JSONObject params = dataQuery.getRequestParams();
info.putAll(params);
String jsonStr = queryServiceDAOImpl.executeProc(info);
- if(!Assert.isJsonObject(jsonStr)){
- throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR,"瀛樺偍杩囩▼ procName = " + dataQuery.getServiceSql().getProc() + " 杩斿洖缁撴灉涓嶆槸Json鏍煎紡");
+ if (!Assert.isJsonObject(jsonStr)) {
+ throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "瀛樺偍杩囩▼ procName = " + dataQuery.getServiceSql().getProc() + " 杩斿洖缁撴灉涓嶆槸Json鏍煎紡");
}
dataQuery.setResponseInfo(DataTransactionFactory.createBusinessResponseJson(ResponseConstant.RESULT_CODE_SUCCESS,
- "鎴愬姛",JSONObject.parseObject(jsonStr)));
+ "鎴愬姛", JSONObject.parseObject(jsonStr)));
}
--
Gitblit v1.8.0