From add9f1b50f5fa6810d43f8537c9c33876ebd6d87 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 27 Apr 2017 12:52:38 +0800 Subject: [PATCH] update --- .../operate/web/controller/LisController.java | 14 ++++++------ .../operate/web/controller/SyncDataController.java | 25 ++++++++++++---------- .../web/inteceptor/MybatisSqlInterceptor.java | 15 ++++++++----- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java index e560f96..00381e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java @@ -89,13 +89,13 @@ public class LisController extends BaseController { } -// @RequestMapping(method = RequestMethod.POST, value = "/saveLisDataTemp") -// @ResponseBody -// public Integer saveLisDataTemp(@RequestBody LisReportModel models, -// HttpServletRequest httpServletRequest) { -// -// return lisService.saveLisDataTemp(models); -// } + @RequestMapping(method = RequestMethod.POST, value = "/saveLisDataTemp") + @ResponseBody + public Integer saveLisDataTemp(@RequestBody LisReportModel models, + HttpServletRequest httpServletRequest) { + + return lisService.saveLisDataTemp(models); + } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java index 2cf1d23..2c1d913 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java @@ -92,20 +92,23 @@ public class SyncDataController extends BaseController { writeString(response, "Token is error"); return; } - - if (sqlRequest != null) { - String base64Sql = sqlRequest.getSql(); - if (StringUtils.isNotEmpty(base64Sql)) - { - String sqlId = sqlRequest.getSqlId(); - String sql = new String(Base64.decodeBase64(base64Sql)); - System.out.println("sqlId = " + sqlId+" : "+sql); - organizationService.execSql(sql); + try { + if (sqlRequest != null) { + String base64Sql = sqlRequest.getSql(); + if (StringUtils.isNotEmpty(base64Sql)) + { + String sqlId = sqlRequest.getSqlId(); + String sql = new String(Base64.decodeBase64(base64Sql)); + System.out.println("sqlId = " + sqlId+" : "+sql); + organizationService.execSql(sql); + } } - writeString(response,"execSyncMysqlData success"); - } else { + } catch (Exception e) + { writeString(response, "execSyncMysqlData fail"); + ExceptionUtils.catchException(e,"execSyncMysqlData fail"); } + writeString(response,"execSyncMysqlData success"); } } 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 615e05a..0498267 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 @@ -6,6 +6,7 @@ import java.sql.Statement; import java.text.DateFormat; import java.util.*; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.utils.SendMysqlSyncDatUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; @@ -97,7 +98,7 @@ public class MybatisSqlInterceptor implements Interceptor { return sql; } - private static String getParameterValue(Object obj) { + private static String getParameterValue(Object obj,String javaType) { String value = null; if (obj instanceof String) { value = "'" + obj.toString() + "'"; @@ -107,7 +108,11 @@ public class MybatisSqlInterceptor implements Interceptor { } else { if (obj != null) { value = obj.toString(); - } else { + } else if ("java.util.Date".equals(javaType)){ + value = "'" +DateUtil.getyyyy_MM_dd_hms(new Date())+ "'"; + } + else + { value = "''"; } } @@ -121,7 +126,7 @@ public class MybatisSqlInterceptor implements Interceptor { if (parameterMappings.size() > 0 && parameterObject != null) { TypeHandlerRegistry typeHandlerRegistry = configuration.getTypeHandlerRegistry(); if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) { - sql = sql.replaceFirst("\\?", getParameterValue(parameterObject)); + sql = sql.replaceFirst("\\?", getParameterValue(parameterObject,parameterObject.getClass().getName())); } else { MetaObject metaObject = configuration.newMetaObject(parameterObject); @@ -129,10 +134,10 @@ public class MybatisSqlInterceptor implements Interceptor { String propertyName = parameterMapping.getProperty(); if (metaObject.hasGetter(propertyName)) { Object obj = metaObject.getValue(propertyName); - sql = sql.replaceFirst("\\?", getParameterValue(obj)); + sql = sql.replaceFirst("\\?", getParameterValue(obj,parameterMapping.getJavaType().getName())); } else if (boundSql.hasAdditionalParameter(propertyName)) { Object obj = boundSql.getAdditionalParameter(propertyName); - sql = sql.replaceFirst("\\?", getParameterValue(obj)); + sql = sql.replaceFirst("\\?", getParameterValue(obj,parameterMapping.getJavaType().getName())); } } } -- 1.8.3.1