jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2826bda9fa6bd06da1848947d379b6dec5df8de4

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

同步

Showing 3 changed files with 7 additions and 5 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java View file @ 2826bda
... ... @@ -5,6 +5,7 @@
5 5 import com.lyms.platform.common.pojo.SyncDataModel;
6 6 import com.lyms.platform.common.pojo.SyncMysqlDataModel;
7 7 import com.lyms.platform.common.utils.JsonUtil;
  8 +import com.lyms.platform.common.utils.SerializUtils;
8 9 import com.lyms.platform.query.SyncDataQuery;
9 10 import org.apache.commons.codec.binary.Base64;
10 11 import org.apache.commons.lang.StringUtils;
... ... @@ -12,6 +13,7 @@
12 13 import org.springframework.data.domain.Sort;
13 14 import org.springframework.stereotype.Service;
14 15  
  16 +import java.io.Serializable;
15 17 import java.util.Date;
16 18 import java.util.List;
17 19  
... ... @@ -68,7 +70,7 @@
68 70  
69 71 SyncDataModel model = new SyncDataModel();
70 72 model.setStatus(1);
71   - model.setJsonData(JsonUtil.obj2JsonString(syncMysqlDataModel));
  73 + model.setJsonData(Base64.encodeBase64String(SerializUtils.objToByte((Serializable) syncMysqlDataModel)));
72 74 model.setAction("POSTMYSQL");
73 75 model.setCreated(new Date());
74 76 model.setClassName("syncmysql");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java View file @ 2826bda
... ... @@ -193,11 +193,11 @@
193 193 private boolean exceSql(String json)
194 194 {
195 195 try {
196   - SyncMysqlDataModel mysqlDataModel = JsonUtil.str2Obj(LymsEncodeUtil.aesDecrypt(json,"Lymsh@2016"), SyncMysqlDataModel.class);
  196 + String data = LymsEncodeUtil.aesDecrypt(json,"Lymsh@2016");
  197 + SyncMysqlDataModel mysqlDataModel = (SyncMysqlDataModel)SerializUtils.byteToObj(org.apache.commons.codec.binary.Base64.decodeBase64(data));
197 198 if (mysqlDataModel != null && org.apache.commons.lang.StringUtils.isNotEmpty(mysqlDataModel.getSql()))
198 199 {
199   - String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(mysqlDataModel.getSql()),"utf-8");
200   - organizationService.execSql(sql);
  200 + organizationService.execSql(mysqlDataModel.getSql());
201 201 }
202 202 } catch (Exception e) {
203 203 ExceptionUtils.catchException(e,"exce sql error. JSONDATA="+json);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java View file @ 2826bda
... ... @@ -55,7 +55,7 @@
55 55 public static void addSqlToQueue(String sql ,String sqlId)
56 56 {
57 57 SqlRequest request = new SqlRequest();
58   - request.setSql(Base64.encodeBase64String(sql.getBytes()));
  58 + request.setSql(sql);
59 59 request.setSqlId(sqlId);
60 60 syncSqlQueue.add(request);
61 61 System.out.println("syncSqlQueue size = " + syncSqlQueue.size());