From b0502881190b2864428d47060d8533c34117d922 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 18 九月 2020 11:14:59 +0800
Subject: [PATCH] 优化bug
---
java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java | 168 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 100 insertions(+), 68 deletions(-)
diff --git a/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java b/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java
index cdd5fd1..bd05f56 100644
--- a/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java
+++ b/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java
@@ -51,18 +51,19 @@
BoundSql boundSql = mappedStatement.getBoundSql(parameter);
Configuration configuration = mappedStatement.getConfiguration();
+ Map<String, Object> sqlValue = new HashMap<>();
//鑾峰彇sql璇彞
- String sql = showSql(configuration, boundSql);
+ String sql = showSql(configuration, boundSql, sqlValue, sqlCommandType);
restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
switch (sqlCommandType) {
case INSERT:
- dealInsertSql(mappedStatement, parameter, sql);
+ dealInsertSql(mappedStatement, parameter, sql, sqlValue);
break;
case UPDATE:
- dealUpdateSql(mappedStatement, parameter, sql);
+ dealUpdateSql(mappedStatement, parameter, sql, sqlValue);
break;
case DELETE:
- dealDeleteSql(mappedStatement, parameter, sql);
+ dealDeleteSql(mappedStatement, parameter, sql, sqlValue);
break;
}
return invocation.proceed();
@@ -74,7 +75,7 @@
* @param mappedStatement
* @param parameter
*/
- private void dealDeleteSql(MappedStatement mappedStatement, Object parameter, String sql) {
+ private void dealDeleteSql(MappedStatement mappedStatement, Object parameter, String sql, Map<String, Object> sqlValue) {
String tmpTable = sql.substring(sql.indexOf("into") + 4, sql.indexOf("("));
String tmpWhere = sql.substring(sql.indexOf("where"));
@@ -123,38 +124,17 @@
* @param mappedStatement
* @param parameter
*/
- private void dealUpdateSql(MappedStatement mappedStatement, Object parameter, String sql) {
+ private void dealUpdateSql(MappedStatement mappedStatement, Object parameter, String sql, Map<String, Object> sqlValue) {
//RestTemplate restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
String tmpTable = sql.substring(sql.indexOf("update") + 6, sql.indexOf("set"));
String tmpWhere = sql.substring(sql.indexOf("where"));
- String tmpKey = sql.substring(sql.indexOf("set") + 3, sql.indexOf("where"));
- String[] tmpString = tmpKey.split(",");
- Map tmpAfterMap = new HashMap();
- for (String tmp : tmpString) {
- String[] keyValues = tmp.split("=");
- String key = "";
- if (keyValues.length != 2) {
- throw new IllegalArgumentException("update 璇彞鍙兘鏈夐棶棰橈紝娌℃湁 set 涓嚭閿� " + sql);
- }
- if (keyValues[0].contains(".")) {
- key = keyValues[0].substring(keyValues[0].indexOf(".") + 1);
- } else {
- key = keyValues[0];
- }
- tmpAfterMap.put(key.trim(), keyValues[1].trim());
- }
-
- if (tmpString == null || tmpString.length < 1) {
- throw new IllegalArgumentException("update 璇彞鍙兘鏈夐棶棰橈紝娌℃湁 set 鍐呭 " + sql);
- }
//鎻掑叆鎿嶄綔鏃朵箣鍓嶇殑 娌℃湁鏁版嵁 鎵�浠� preValue 涓虹┖瀵硅薄
JSONArray preValues = new JSONArray();
JSONArray afterValues = new JSONArray();
JSONObject afterVaule = null;
String execSql = "select * from " + tmpTable + " " + tmpWhere;
-
queryServiceDAOImpl = ApplicationContextFactory.getBean("queryServiceDAOImpl", IQueryServiceDAO.class);
List<Map<String, Object>> deleteDatas = queryServiceDAOImpl.executeSql(execSql, null);
@@ -164,7 +144,7 @@
preValues.add(map);
afterVaule = new JSONObject();
afterVaule.putAll(map);
- afterVaule.putAll(tmpAfterMap);
+ afterVaule.putAll(sqlValue);
afterValues.add(afterVaule);
}
}
@@ -221,7 +201,7 @@
* @param mappedStatement
* @param parameter
*/
- private void dealInsertSql(MappedStatement mappedStatement, Object parameter, String sql) {
+ private void dealInsertSql(MappedStatement mappedStatement, Object parameter, String sql, Map<String, Object> sqlValue) {
// RestTemplate restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
@@ -231,44 +211,43 @@
JSONArray afterValues = new JSONArray();
String tmpTable = sql.substring(sql.toLowerCase().indexOf("into") + 4, sql.indexOf("("));
- String tmpKey = sql.substring(sql.indexOf("(") + 1, sql.indexOf(")"));
- String[] tmpKeys = tmpKey.split(",");
- int valuePos = 0;
- if (sql.contains("VALUES")) {
- valuePos = sql.indexOf("VALUES") + 6;
- } else {
- valuePos = sql.indexOf("values") + 6;
- }
- String sqlValues = sql.substring(valuePos);
- //璇存槑鎵规搷浣�
-
- String[] sqlVauleses = sqlValues.split("\\)");
- JSONObject afterValue = null;
- for (String sqlV : sqlVauleses) {
- String tmpValue = sqlV.substring(sqlV.lastIndexOf("(") + 1);
- String[] tmpValues = tmpValue.split(",");
- afterValue = new JSONObject();
-
- if (tmpKeys.length != tmpValues.length) {
- throw new IllegalArgumentException("sql 閿欒 key 鍜寁alue 涓暟涓嶇瓑" + sql);
- }
-
- if (tmpKeys.length < 1) {
- throw new IllegalArgumentException("sql 閿欒 鏈壘鍒発ey" + sql);
- }
- for (int keyIndex = 0; keyIndex < tmpKeys.length; keyIndex++) {
- if ("''".equals(tmpValues[keyIndex])) {
- continue;
- }
- afterValue.put(tmpKeys[keyIndex], tmpValues[keyIndex]);
- }
- afterValues.add(afterValue);
- }
-
+// String tmpKey = sql.substring(sql.indexOf("(") + 1, sql.indexOf(")"));
+// String[] tmpKeys = tmpKey.split(",");
+// int valuePos = 0;
+// if (sql.contains("VALUES")) {
+// valuePos = sql.indexOf("VALUES") + 6;
+// } else {
+// valuePos = sql.indexOf("values") + 6;
+// }
+// String sqlValues = sql.substring(valuePos);
+// //璇存槑鎵规搷浣�
+//
+// String[] sqlVauleses = sqlValues.split("\\)");
+// JSONObject afterValue = null;
+// for (String sqlV : sqlVauleses) {
+// String tmpValue = sqlV.substring(sqlV.lastIndexOf("(") + 1);
+// String[] tmpValues = tmpValue.split(",");
+// afterValue = new JSONObject();
+//
+// if (tmpKeys.length != tmpValues.length) {
+// throw new IllegalArgumentException("sql 閿欒 key 鍜寁alue 涓暟涓嶇瓑" + sql);
+// }
+//
+// if (tmpKeys.length < 1) {
+// throw new IllegalArgumentException("sql 閿欒 鏈壘鍒発ey" + sql);
+// }
+// for (int keyIndex = 0; keyIndex < tmpKeys.length; keyIndex++) {
+// if ("''".equals(tmpValues[keyIndex])) {
+// continue;
+// }
+// afterValue.put(tmpKeys[keyIndex], tmpValues[keyIndex]);
+// }
+// afterValues.add(afterValue);
+// }
JSONObject logText = new JSONObject();
logText.put("preValue", preValues);
- logText.put("afterValue", afterValues);
+ logText.put("afterValue", sqlValue);
OrderItemDto orderItemDto = new OrderItemDto();
orderItemDto.setbId("-1");
@@ -301,15 +280,18 @@
}
- public String showSql(Configuration configuration, BoundSql boundSql) {
+ public String showSql(Configuration configuration, BoundSql boundSql, Map<String, Object> sqlValue, SqlCommandType sqlCommandType) {
Object parameterObject = boundSql.getParameterObject();
List<ParameterMapping> parameterMappings = boundSql.getParameterMappings();
- String sql = boundSql.getSql().replaceAll("[\\s]+", " ");
+ String sql = boundSql.getSql().replaceAll("[\\s]+", " ").toLowerCase();
+ String orgSql = sql;// 鍘熷sql
+
+ List<String> values = new ArrayList<>();
if (parameterMappings.size() > 0 && parameterObject != null) {
TypeHandlerRegistry typeHandlerRegistry = configuration.getTypeHandlerRegistry();
if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) {
sql = sql.replaceFirst("\\?", getParameterValue(parameterObject));
-
+ values.add(getParameterValue(parameterObject));
} else {
MetaObject metaObject = configuration.newMetaObject(parameterObject);
for (ParameterMapping parameterMapping : parameterMappings) {
@@ -317,14 +299,64 @@
if (metaObject.hasGetter(propertyName)) {
Object obj = metaObject.getValue(propertyName);
sql = sql.replaceFirst("\\?", getParameterValue(obj));
+ values.add(getParameterValue(obj));
} else if (boundSql.hasAdditionalParameter(propertyName)) {
Object obj = boundSql.getAdditionalParameter(propertyName);
sql = sql.replaceFirst("\\?", getParameterValue(obj));
+ values.add(getParameterValue(obj));
}
}
}
}
- return sql.toLowerCase();
+
+ if (sqlCommandType == SqlCommandType.INSERT) {
+ String tmpKey = orgSql.substring(orgSql.indexOf("(") + 1, orgSql.indexOf(")"));
+ String[] tmpKeys = tmpKey.split(",");
+
+ if (values.size() < tmpKeys.length) {
+ throw new IllegalArgumentException("sql 閿欒 key 鍜寁alue 涓暟涓嶇瓑" + sql);
+ }
+ for (int keyIndex = 0; keyIndex < tmpKeys.length; keyIndex++) {
+ String key = tmpKeys[keyIndex].trim();
+ String value = "";
+ value = values.get(keyIndex);
+ if ("''".equals(value)) {
+ continue;
+ }
+ sqlValue.put(key, value);
+ }
+ } else if (sqlCommandType == SqlCommandType.UPDATE) {
+ String tmpKey = orgSql.substring(sql.indexOf("set") + 3, orgSql.indexOf("where"));
+ String[] tmpKeys = tmpKey.split(",");
+ if (values.size() < tmpKeys.length) {
+ throw new IllegalArgumentException("sql 閿欒 key 鍜寁alue 涓暟涓嶇瓑" + sql);
+ }
+ for (int keyIndex = 0; keyIndex < tmpKeys.length; keyIndex++) {
+ String tmpSetKey = tmpKeys[keyIndex];
+ String[] keyValues = tmpSetKey.split("=");
+ String key = "";
+ if (keyValues.length != 2) {
+ throw new IllegalArgumentException("update 璇彞鍙兘鏈夐棶棰橈紝娌℃湁 set 涓嚭閿� " + sql);
+ }
+ if (keyValues[0].contains(".")) {
+ key = keyValues[0].substring(keyValues[0].indexOf(".") + 1).trim();
+ } else {
+ key = keyValues[0].trim();
+ }
+ String value = "";
+ value = values.get(keyIndex);
+ if ("''".equals(value)) {
+ continue;
+ }
+ sqlValue.put(key, value);
+ }
+
+ } else if (sqlCommandType == SqlCommandType.DELETE) {
+
+ }
+
+
+ return sql;
}
private String getParameterValue(Object obj) {
--
Gitblit v1.8.0