From 2826bda9fa6bd06da1848947d379b6dec5df8de4 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 17 Apr 2018 01:44:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/biz/service/SyncDataService.java    | 4 +++-
 .../com/lyms/platform/operate/web/service/SyncDataTaskService.java  | 6 +++---
 .../com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java
index 60af77e..5304d70 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java
@@ -5,6 +5,7 @@ import com.lyms.platform.common.dao.operator.MongoQuery;
 import com.lyms.platform.common.pojo.SyncDataModel;
 import com.lyms.platform.common.pojo.SyncMysqlDataModel;
 import com.lyms.platform.common.utils.JsonUtil;
+import com.lyms.platform.common.utils.SerializUtils;
 import com.lyms.platform.query.SyncDataQuery;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
@@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
@@ -68,7 +70,7 @@ public class SyncDataService {
 
         SyncDataModel model = new SyncDataModel();
         model.setStatus(1);
-        model.setJsonData(JsonUtil.obj2JsonString(syncMysqlDataModel));
+        model.setJsonData(Base64.encodeBase64String(SerializUtils.objToByte((Serializable) syncMysqlDataModel)));
         model.setAction("POSTMYSQL");
         model.setCreated(new Date());
         model.setClassName("syncmysql");
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 582c4e4..0ef2198 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
@@ -193,11 +193,11 @@ public class SyncDataTaskService {
     private boolean exceSql(String json)
     {
         try {
-            SyncMysqlDataModel mysqlDataModel = JsonUtil.str2Obj(LymsEncodeUtil.aesDecrypt(json,"Lymsh@2016"), SyncMysqlDataModel.class);
+            String data = LymsEncodeUtil.aesDecrypt(json,"Lymsh@2016");
+            SyncMysqlDataModel mysqlDataModel = (SyncMysqlDataModel)SerializUtils.byteToObj(org.apache.commons.codec.binary.Base64.decodeBase64(data));
             if (mysqlDataModel != null && org.apache.commons.lang.StringUtils.isNotEmpty(mysqlDataModel.getSql()))
             {
-                String sql  = new String(org.apache.commons.codec.binary.Base64.decodeBase64(mysqlDataModel.getSql()),"utf-8");
-                organizationService.execSql(sql);
+                organizationService.execSql(mysqlDataModel.getSql());
             }
         } catch (Exception e) {
             ExceptionUtils.catchException(e,"exce sql error. JSONDATA="+json);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java
index 01f7a4e..58732a8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java
@@ -55,7 +55,7 @@ public class SendMysqlSyncDatUtil implements InitializingBean {
     public static void addSqlToQueue(String sql ,String sqlId)
     {
         SqlRequest request = new SqlRequest();
-        request.setSql(Base64.encodeBase64String(sql.getBytes()));
+        request.setSql(sql);
         request.setSqlId(sqlId);
         syncSqlQueue.add(request);
         System.out.println("syncSqlQueue size = " + syncSqlQueue.size());
-- 
1.8.3.1