diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java index 8657799..e9129d5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java @@ -91,34 +91,19 @@ public class MybatisSqlInterceptor implements Interceptor { if (invocation.getArgs().length > 1) { parameter = invocation.getArgs()[1]; } - sqlId = mappedStatement.getId(); - BoundSql boundSql = mappedStatement.getBoundSql(parameter); - Configuration configuration = mappedStatement.getConfiguration(); - sqlCommandType = mappedStatement.getSqlCommandType().name(); -// if ("update".equals(sqlCommandType.toLowerCase()) || "delete".equals(sqlCommandType.toLowerCase())) -// { -// sql = getSql(configuration, boundSql, sqlId); -// System.out.println("sql = "+sql); -// if (isSyncTable(sql)) -// { -// -// System.out.println("delete or update sync sql = " + sql); -// //发送要同步的sql -// SendMysqlSyncDatUtil.addSqlToQueue(sql, sqlId); -// sql = null; -// System.out.println("time4=========" + (System.currentTimeMillis()-start)); -// } -// } -// else - if ("insert".equals(sqlCommandType.toLowerCase()) ) + sqlId = mappedStatement.getId(); + BoundSql boundSql = mappedStatement.getBoundSql(parameter); + Configuration configuration = mappedStatement.getConfiguration(); + sqlCommandType = mappedStatement.getSqlCommandType().name(); + if ("insert".equals(sqlCommandType.toLowerCase()) ) + { + String tempSql = getSql(configuration, boundSql, sqlId); + if (isSyncTable(tempSql)) { - String tempSql = getSql(configuration, boundSql, sqlId); - if (isSyncTable(tempSql)) - { - sql = tempSql; - } + sql = tempSql; } - returnValue = invocation.proceed(); + } + returnValue = invocation.proceed(); } else { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MysqlDataInterceptor.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MysqlDataInterceptor.java index b555b79..f8dea19 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MysqlDataInterceptor.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MysqlDataInterceptor.java @@ -1,10 +1,8 @@ package com.lyms.platform.operate.web.inteceptor; -import com.lyms.platform.biz.service.SyncDataService; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.operate.web.utils.SendMysqlSyncDatUtil; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.ibatis.executor.Executor; import org.apache.ibatis.executor.resultset.ResultSetHandler; @@ -15,7 +13,6 @@ import org.apache.ibatis.plugin.*; import org.apache.ibatis.reflection.MetaObject; import org.apache.ibatis.session.Configuration; import org.apache.ibatis.type.TypeHandlerRegistry; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import java.sql.Statement; @@ -39,6 +36,7 @@ public class MysqlDataInterceptor implements Interceptor { uses.add("baby_eye_check"); uses.add("baby_patient_extend_ear"); uses.add("baby_patient_extend_ear_birth"); + uses.add("baby_patient_extend_ear_baby"); uses.add("baby_patient_extend_ear_family"); uses.add("baby_patient_extend_ear_follow_up"); uses.add("baby_patient_extend_ear_hearing_diagnose"); @@ -46,14 +44,6 @@ public class MysqlDataInterceptor implements Interceptor { uses.add("baby_patient_extend_ear_screen"); } - private String sql; - - private Properties properties; - - private String sqlCommandType; - - private String sqlId; - public Object intercept(Invocation invocation) throws Throwable { Object[] args = invocation.getArgs(); Object returnValue = null; @@ -66,10 +56,11 @@ public class MysqlDataInterceptor implements Interceptor { if (invocation.getArgs().length > 1) { parameter = invocation.getArgs()[1]; } - sqlId = mappedStatement.getId(); + String sqlId = mappedStatement.getId(); BoundSql boundSql = mappedStatement.getBoundSql(parameter); Configuration configuration = mappedStatement.getConfiguration(); - sqlCommandType = mappedStatement.getSqlCommandType().name(); + String sqlCommandType = mappedStatement.getSqlCommandType().name(); + String sql = ""; if ("update".equals(sqlCommandType.toLowerCase()) || "delete".equals(sqlCommandType.toLowerCase())) { sql = getSql(configuration, boundSql, sqlId); @@ -77,37 +68,21 @@ public class MysqlDataInterceptor implements Interceptor { { System.out.println("delete or update sync sql = " + sql); SendMysqlSyncDatUtil.addSqlToQueue1(sql,sqlId); - sql = null; - } } else if ("insert".equals(sqlCommandType.toLowerCase()) ) { - String tempSql = getSql(configuration, boundSql, sqlId); - if (isSyncTable(tempSql)) - { - sql = tempSql; - } - } - returnValue = invocation.proceed(); - } - else - { - returnValue = invocation.proceed(); - if (StringUtils.isNotEmpty(sql) && sqlCommandType != null && "insert".equals(sqlCommandType.toLowerCase())) - { - if (returnValue != null && returnValue instanceof ArrayList) + sql = getSql(configuration, boundSql, sqlId); + if (isSyncTable(sql)) { - List list = (ArrayList)returnValue; - if (CollectionUtils.isNotEmpty(list) && isSyncTable(sql)) { - System.out.println("add sync sql = " + sql); - SendMysqlSyncDatUtil.addSqlToQueue1(sql,sqlId); - sql = null; - } + System.out.println("add sync sql = " + sql); + SendMysqlSyncDatUtil.addSqlToQueue1(sql,sqlId); } } } - }catch (Exception e) + returnValue = invocation.proceed(); + } + catch (Exception e) { ExceptionUtils.catchException(e," Mybatis Sql Interceptor exception"); } @@ -191,7 +166,8 @@ public class MysqlDataInterceptor implements Interceptor { return Plugin.wrap(target, this); } - public void setProperties(Properties properties0) { - this.properties = properties0; + @Override + public void setProperties(Properties properties) { + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index 11fbc82..56c2b02 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -209,7 +209,7 @@ public class SyncDataTaskService { public static void main(String[] args) { try { - String json = "aW5zZXJ0IGludG8gYmFieV9wYXRpZW50X2V4dGVuZF9lYXJfc2NyZWVuIChpZCxiYWJ5X2lkLHNjcmVlbl90eXBlLGNoZWNrX2hvc3BpdGFsX2lkLHNjcmVlbl9kYXRlLGhpZ2hfcmlza19jYXVzZSxvYWVfbGVmdCxvYWVfcmlnaHQsYWFicl9sZWZ0LGFhYnJfcmlnaHQsYWJyX2xlZnQsYWJyX3JpZ2h0LGdqYjJfZGVsXzM1LGdqYjJfZGVsXzE3NixnamIyX2RlbF8yMzUsZ2piMl9kZWxfMjk5LGdqYjNfc2xjMjZhNF81MzgsZ2piM19zbGMyNmE0XzIxNjgsZ2piM19zbGMyNmE0X2l2czcscnJuYV8xNDk0LHJybmFfMTU1NSxwcm9jZXNzX29wdGlvbl90eXBlLHByb2Nlc3Nfb3B0aW9uX2Rlc2MsZ3VpZF9vcGluaW9uLGNoZWNrX2RvY3Rvcl9pZCxyZWZlcnJhbF9kYXRlLGNyZWF0ZV9kYXRlLGNyZWF0ZV91c2VyX2lkLGNyZWF0ZV9ob3NwaXRhbF9pZCxuZXh0X2NoZWNrX3RpbWUsbGFzdF91cGRhdGVfZGF0ZSxsYXN0X3VwZGF0ZV91c2VyX2lkLGxhc3RfdXBkYXRlX2hvc3BpdGFsX2lkLHN0YXR1cyxzY3JfaXNwYXNzLHBpZCkgdmFsdWVzICgnZmRlMzc5OWY5NTZjNDg1Y2E4OTE0ZjczZjQ4YWVkZjMnLCc1YWE2ODNjMWE4NTI0MjhjOTI3ZTE3NjQnLDIsJzIxMDAwMDE3MDUnLCcyMDE4LTQtMTcgMjoyMjoyNycsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsMixudWxsLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCwyLCfH69PaM7j21MLE2r340NC9+NK7sr287LLp1e+2zycsJ7e0t7S4tLi0t7S3tLi0uLS3tLe0uLS4tLe0t7S4tLi0t7S3tLi0uLS3tLe0uLS4tLfvt8m3yScsJzIxMDAwMDI5OTAnLG51bGwsJzIwMTgtNC0xNyAyOjIyOjI3JywnMjEwMDAwMjk5MCcsJzIxMDAwMDE3MDUnLG51bGwsJzIwMTgtNC0xNyAyOjIyOjI3JywnMjEwMDAwMjk5MCcsJzIxMDAwMDE3MDUnLDAsMiwnNWFhNjgzYzFhODUyNDI4YzkyN2UxNzYyJyk="; + String json = "aW5zZXJ0IGludG8gYmFieV9wYXRpZW50X2V4dGVuZF9lYXJfYmFieSAoaWQsbmFtZSxzZXgsY2FyZE5vLGJpcnRoLG1uYW1lLG1jZXJ0X3R5cGVfaWQsbWNlcnRfbm8sbXBob25lLHZjX2NhcmRfbm8sYnVpbGRfZG9jdG9yLGhvc3BpdGFsX2lkLGJ1aWxkX3R5cGUsZW5hYmxlLHluLGJ1aWxkX2RhdGUsYmFieV9wYXRpZW50X2lkLGJhYnlfZWFyX2lkLHBlcnNvbl9pZCkgdmFsdWVzICgnOTM2OTMwMTU0MjJlNDliNDg4Y2Y0ZTViMTcyNWI4NzQnLCfI+Mu5tcQnLDAsbnVsbCwnMjAxOC00LTE3IDM6NDY6MTInLCfL1bTyJywnNTdlMWRjZDNmMGYwMmU3Y2E1MTlkNmM2JywnMTY1NDg4Nzc3NzcnLCcxNjU0ODg3Nzc3NycsJzI0MzUyMzQ1MjM0NScsJzIxMDAwMDI5OTAnLCcyMTAwMDAxNzA1JywxLG51bGwsMSwnMjAxOC00LTE3IDM6NDY6MTInLCc1YWQ0ZmQzNGE4NTI5OGQyOTFhMDhjMGYnLCc0YTk3YWVhOGVkYjQ0MDg3OThhOTc0YWY0OThkMWM2ZicsJzVhZDRmZDMzYTg1Mjk4ZDI5MWEwOGMwNScp"; // json = org.apache.commons.codec.binary.Base64.encodeBase64String(json.getBytes()); // json = LymsEncodeUtil.aesEncrypt(json, "Lymsh@2016");