jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit add9f1b50f5fa6810d43f8537c9c33876ebd6d87

Authored by liquanyu
1 parent 77df6afee8
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 31 additions and 23 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java View file @ add9f1b
... ... @@ -89,13 +89,13 @@
89 89 }
90 90  
91 91  
92   -// @RequestMapping(method = RequestMethod.POST, value = "/saveLisDataTemp")
93   -// @ResponseBody
94   -// public Integer saveLisDataTemp(@RequestBody LisReportModel models,
95   -// HttpServletRequest httpServletRequest) {
96   -//
97   -// return lisService.saveLisDataTemp(models);
98   -// }
  92 + @RequestMapping(method = RequestMethod.POST, value = "/saveLisDataTemp")
  93 + @ResponseBody
  94 + public Integer saveLisDataTemp(@RequestBody LisReportModel models,
  95 + HttpServletRequest httpServletRequest) {
  96 +
  97 + return lisService.saveLisDataTemp(models);
  98 + }
99 99  
100 100  
101 101 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java View file @ add9f1b
... ... @@ -92,20 +92,23 @@
92 92 writeString(response, "Token is error");
93 93 return;
94 94 }
95   -
96   - if (sqlRequest != null) {
97   - String base64Sql = sqlRequest.getSql();
98   - if (StringUtils.isNotEmpty(base64Sql))
99   - {
100   - String sqlId = sqlRequest.getSqlId();
101   - String sql = new String(Base64.decodeBase64(base64Sql));
102   - System.out.println("sqlId = " + sqlId+" : "+sql);
103   - organizationService.execSql(sql);
  95 + try {
  96 + if (sqlRequest != null) {
  97 + String base64Sql = sqlRequest.getSql();
  98 + if (StringUtils.isNotEmpty(base64Sql))
  99 + {
  100 + String sqlId = sqlRequest.getSqlId();
  101 + String sql = new String(Base64.decodeBase64(base64Sql));
  102 + System.out.println("sqlId = " + sqlId+" : "+sql);
  103 + organizationService.execSql(sql);
  104 + }
104 105 }
105   - writeString(response,"execSyncMysqlData success");
106   - } else {
  106 + } catch (Exception e)
  107 + {
107 108 writeString(response, "execSyncMysqlData fail");
  109 + ExceptionUtils.catchException(e,"execSyncMysqlData fail");
108 110 }
  111 + writeString(response,"execSyncMysqlData success");
109 112 }
110 113  
111 114 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java View file @ add9f1b
... ... @@ -6,6 +6,7 @@
6 6 import java.text.DateFormat;
7 7 import java.util.*;
8 8  
  9 +import com.lyms.platform.common.utils.DateUtil;
9 10 import com.lyms.platform.operate.web.utils.SendMysqlSyncDatUtil;
10 11 import org.apache.commons.collections.CollectionUtils;
11 12 import org.apache.commons.lang.StringUtils;
... ... @@ -97,7 +98,7 @@
97 98 return sql;
98 99 }
99 100  
100   - private static String getParameterValue(Object obj) {
  101 + private static String getParameterValue(Object obj,String javaType) {
101 102 String value = null;
102 103 if (obj instanceof String) {
103 104 value = "'" + obj.toString() + "'";
... ... @@ -107,7 +108,11 @@
107 108 } else {
108 109 if (obj != null) {
109 110 value = obj.toString();
110   - } else {
  111 + } else if ("java.util.Date".equals(javaType)){
  112 + value = "'" +DateUtil.getyyyy_MM_dd_hms(new Date())+ "'";
  113 + }
  114 + else
  115 + {
111 116 value = "''";
112 117 }
113 118 }
... ... @@ -121,7 +126,7 @@
121 126 if (parameterMappings.size() > 0 && parameterObject != null) {
122 127 TypeHandlerRegistry typeHandlerRegistry = configuration.getTypeHandlerRegistry();
123 128 if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) {
124   - sql = sql.replaceFirst("\\?", getParameterValue(parameterObject));
  129 + sql = sql.replaceFirst("\\?", getParameterValue(parameterObject,parameterObject.getClass().getName()));
125 130  
126 131 } else {
127 132 MetaObject metaObject = configuration.newMetaObject(parameterObject);
128 133  
... ... @@ -129,10 +134,10 @@
129 134 String propertyName = parameterMapping.getProperty();
130 135 if (metaObject.hasGetter(propertyName)) {
131 136 Object obj = metaObject.getValue(propertyName);
132   - sql = sql.replaceFirst("\\?", getParameterValue(obj));
  137 + sql = sql.replaceFirst("\\?", getParameterValue(obj,parameterMapping.getJavaType().getName()));
133 138 } else if (boundSql.hasAdditionalParameter(propertyName)) {
134 139 Object obj = boundSql.getAdditionalParameter(propertyName);
135   - sql = sql.replaceFirst("\\?", getParameterValue(obj));
  140 + sql = sql.replaceFirst("\\?", getParameterValue(obj,parameterMapping.getJavaType().getName()));
136 141 }
137 142 }
138 143 }