summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordefault <default@DESKTOP-7FEGRP2>2018-10-17 14:32:34 +0800
committerdefault <default@DESKTOP-7FEGRP2>2018-10-17 14:32:34 +0800
commit589f49d6205ba6c3a1854f10b05cf8c9b7930a2f (patch)
tree0afe9b125a3ebcf35882d47f63a43fdbdf8b1455
parentad5fcec36588f1b88f3ebbe261974ea1c4863998 (diff)
update
-rw-r--r--nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java4
-rw-r--r--nms_sync/src/com/nms/thread/SyncThread.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java b/nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java
index 97e2206..3532e32 100644
--- a/nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java
+++ b/nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java
@@ -40,7 +40,7 @@ public class SyncSlaveToMasterThread implements Runnable{
+ syncDbInfo.get("database_name")+"?useUnicode=true&characterEncoding=utf-8&useOldAliasMetadataBehavior=true&rewriteBatchedStatements=true");
logger.info("当前分库数据库连接为"+url);
List<Record> find = Db.use(url.toString()).find("select * from table_sync_info");
- logger.info("查询分库需要同步到主库的数据信息"+JSON.toJSONString(find));
+ //logger.info("查询分库需要同步到主库的数据信息"+JSON.toJSONString(find));
if (find != null && find.size() > 0) {
for (final Record record : find) {
// 循环同步数据标识
@@ -190,7 +190,7 @@ public class SyncSlaveToMasterThread implements Runnable{
if (updateDatas != null && updateDatas.size() > 0) {
if(record.getStr("table_name").equals("event_record_library")||record.getStr("table_name").equals("detection_info_new")) {
for(Record updateData:updateDatas) {
- updateData.set("old_id",updateData.getLong("id"));
+ updateData.set("old_id",updateData.getLong(record.getStr("id_name")));
updateData.set("db_id", syncDbInfo.get("id"));
updateData.remove("id");
updateData.remove("sync_status");
diff --git a/nms_sync/src/com/nms/thread/SyncThread.java b/nms_sync/src/com/nms/thread/SyncThread.java
index 6fb2985..ac496e0 100644
--- a/nms_sync/src/com/nms/thread/SyncThread.java
+++ b/nms_sync/src/com/nms/thread/SyncThread.java
@@ -44,7 +44,7 @@ public class SyncThread implements Runnable {
logger.info("获取分库数据库连接信息"+url);
List<Record> find = Db.use("masterDataSource").find("select * from table_sync_info where db_id=? ",
syncDbInfo.get("id"));
- logger.info("查询主库须向分库同步数据信息"+JSON.toJSONString(find));
+ //logger.info("查询主库须向分库同步数据信息"+JSON.toJSONString(find));
if (find != null && find.size() > 0) {
for (final Record record : find) {
// 循环同步数据标识
@@ -187,7 +187,7 @@ public class SyncThread implements Runnable {
if (updateDatas != null && updateDatas.size() > 0) {
if(record.getStr("table_name").equals("event_record_library")) {
for(Record updateData:updateDatas) {
- updateData.set("old_id",updateData.getLong("id"));
+ updateData.set("old_id",updateData.getLong(record.getStr("id_name")));
updateData.set("db_id", -1);
updateData.remove("id");
updateData.remove("sync_status");