From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java | 98 +++++++++++++++++++++----------------------------
1 files changed, 42 insertions(+), 56 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
old mode 100644
new mode 100755
index bd05f56..391c7f4
--- a/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java
+++ b/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java
@@ -20,7 +20,7 @@
import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.type.TypeHandlerRegistry;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.http.*;
import java.sql.Timestamp;
@@ -77,12 +77,16 @@
*/
private void dealDeleteSql(MappedStatement mappedStatement, Object parameter, String sql, Map<String, Object> sqlValue) {
- String tmpTable = sql.substring(sql.indexOf("into") + 4, sql.indexOf("("));
+ String tmpTable = sql.substring(sql.indexOf("from") + 4, sql.indexOf("where")).trim();
+ String tmpTableHasT = tmpTable;
+ if(tmpTable.indexOf(" ") > 0){
+ tmpTable = tmpTable.substring(0,tmpTable.indexOf(" "));
+ }
String tmpWhere = sql.substring(sql.indexOf("where"));
//鎻掑叆鎿嶄綔鏃朵箣鍓嶇殑 娌℃湁鏁版嵁 鎵�浠� preValue 涓虹┖瀵硅薄
JSONArray preValues = new JSONArray();
- String execSql = "select * from " + tmpTable + " " + tmpWhere;
+ String execSql = "select * from " + tmpTableHasT + " " + tmpWhere;
queryServiceDAOImpl = ApplicationContextFactory.getBean("queryServiceDAOImpl", IQueryServiceDAO.class);
List<Map<String, Object>> deleteDatas = queryServiceDAOImpl.executeSql(execSql, null);
@@ -127,14 +131,20 @@
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 tmpTable = sql.substring(sql.indexOf("update") + 6, sql.indexOf("set")).trim();
+
+ String tmpTableHasT = tmpTable;
+
+ if(tmpTable.indexOf(" ") > 0){
+ tmpTable = tmpTable.substring(0,tmpTable.indexOf(" "));
+ }
String tmpWhere = sql.substring(sql.indexOf("where"));
//鎻掑叆鎿嶄綔鏃朵箣鍓嶇殑 娌℃湁鏁版嵁 鎵�浠� preValue 涓虹┖瀵硅薄
JSONArray preValues = new JSONArray();
JSONArray afterValues = new JSONArray();
JSONObject afterVaule = null;
- String execSql = "select * from " + tmpTable + " " + tmpWhere;
+ String execSql = "select * from " + tmpTableHasT + " " + tmpWhere;
queryServiceDAOImpl = ApplicationContextFactory.getBean("queryServiceDAOImpl", IQueryServiceDAO.class);
List<Map<String, Object>> deleteDatas = queryServiceDAOImpl.executeSql(execSql, null);
@@ -210,44 +220,17 @@
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 tmpTable = sql.substring(sql.toLowerCase().indexOf("into") + 4, sql.indexOf("(")).trim();
+
+ if(tmpTable.indexOf(" ") > 0){
+ tmpTable = tmpTable.substring(0,tmpTable.indexOf(" "));
+ }
+
+ afterValues.add(sqlValue);
JSONObject logText = new JSONObject();
logText.put("preValue", preValues);
- logText.put("afterValue", sqlValue);
+ logText.put("afterValue", afterValues);
OrderItemDto orderItemDto = new OrderItemDto();
orderItemDto.setbId("-1");
@@ -267,6 +250,7 @@
}
}
+
@Override
public Object plugin(Object target) {
@@ -298,7 +282,11 @@
String propertyName = parameterMapping.getProperty();
if (metaObject.hasGetter(propertyName)) {
Object obj = metaObject.getValue(propertyName);
- sql = sql.replaceFirst("\\?", getParameterValue(obj));
+ String value = getParameterValue(obj);
+ if(value.contains("${")){
+ value = value.replace("${","\\${");
+ }
+ sql = sql.replaceFirst("\\?", value);
values.add(getParameterValue(obj));
} else if (boundSql.hasAdditionalParameter(propertyName)) {
Object obj = boundSql.getAdditionalParameter(propertyName);
@@ -313,12 +301,15 @@
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);
- }
+// 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 = "";
+ if (values.size() - 1 < keyIndex) {
+ continue;
+ }
value = values.get(keyIndex);
if ("''".equals(value)) {
continue;
@@ -328,9 +319,9 @@
} 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);
- }
+// 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("=");
@@ -344,6 +335,9 @@
key = keyValues[0].trim();
}
String value = "";
+ if (values.size() - 1 < keyIndex) {
+ continue;
+ }
value = values.get(keyIndex);
if ("''".equals(value)) {
continue;
@@ -358,6 +352,7 @@
return sql;
}
+
private String getParameterValue(Object obj) {
String value = null;
@@ -379,14 +374,5 @@
}
- public static void main(String[] args) {
- String tmpKey = " prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state";
- String tmpValue = "'1.00','912020080411040001','1500.0','1.0',,'0','1500.0','7020181217000001','-1',,";
- String[] tmpKeys = tmpKey.split(",");
- String[] tmpValues = tmpValue.split(",");
- if (tmpKeys.length != tmpValues.length) {
- throw new IllegalArgumentException("sql 閿欒 key 鍜寁alue 涓暟涓嶇瓑");
- }
- }
}
--
Gitblit v1.8.0