From 553487baf14a4ac434552ae0561278a5b259df5c Mon Sep 17 00:00:00 2001
From: default <default@DESKTOP-7FEGRP2>
Date: Thu, 1 Nov 2018 15:16:32 +0800
Subject: [PATCH] update

---
 .../nms/interceptor/SyncDataInterceptor.java   |  1 +
 .../nms/interceptor/SyncStoredProcedure.java   |  1 +
 .../nms/thread/SyncSlaveToMasterThread.java    | 18 ++++++++++++++++--
 nms_sync/src/com/nms/thread/SyncThread.java    |  1 +
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/nms_sync/src/com/nms/interceptor/SyncDataInterceptor.java b/nms_sync/src/com/nms/interceptor/SyncDataInterceptor.java
index 1257e9e..262a379 100644
--- a/nms_sync/src/com/nms/interceptor/SyncDataInterceptor.java
+++ b/nms_sync/src/com/nms/interceptor/SyncDataInterceptor.java
@@ -110,6 +110,7 @@ public class SyncDataInterceptor implements Interceptor{
 		}catch(Exception e){
 			e.printStackTrace();
 			logger.error("syncDataInterceptor拦截器内部程序出现异常信息"+e.getMessage());
+			logger.error("syncDataInterceptor拦截器内部程序出现异常信息",e);
 		}
 	}
 	
diff --git a/nms_sync/src/com/nms/interceptor/SyncStoredProcedure.java b/nms_sync/src/com/nms/interceptor/SyncStoredProcedure.java
index 9ad6cd0..940f0e9 100644
--- a/nms_sync/src/com/nms/interceptor/SyncStoredProcedure.java
+++ b/nms_sync/src/com/nms/interceptor/SyncStoredProcedure.java
@@ -36,6 +36,7 @@ public class SyncStoredProcedure implements ICallback{
 			logger.info("调用存储过程任务结束");
 		} catch (Exception e){
 			logger.error("调用存储过程任务出现错误 存储过程名称"+proName+" 表名"+tableName+"参数 "+filedAndType+"------"+fileds);
+			logger.error("调用存储过程任务出现错误 ",e);
 			e.printStackTrace();
 		} finally{
 			if(conn!=null){
diff --git a/nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java b/nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java
index ea9d07e..de50297 100644
--- a/nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java
+++ b/nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java
@@ -6,7 +6,7 @@ import java.util.Date;
 import java.util.List;
 
 import org.apache.log4j.Logger;
-
+import com.nms.interceptor.SyncMissionResultStatisticalInterceptor;
 import com.alibaba.fastjson.JSON;
 import com.jfinal.aop.Before;
 import com.jfinal.plugin.activerecord.Db;
@@ -15,7 +15,7 @@ import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.tx.Tx;
 import com.nms.model.SyncDbInfo;
 
-@Before({Tx.class})
+@Before({SyncMissionResultStatisticalInterceptor.class,Tx.class})
 public class SyncSlaveToMasterThread implements Runnable{
 	private Logger logger = Logger.getLogger(this.getClass());
 	private SyncDbInfo syncDbInfo;
@@ -244,6 +244,11 @@ public class SyncSlaveToMasterThread implements Runnable{
 																updateData.remove(record.getStr("id_name"));
 															}
 															Db.use("masterDataSource").batchUpdate(record.getStr("table_name"), "DETECTION_SET_INFO_ID,SEQ_ID",updateDatas, record.getInt("batch_size"));
+														}else if(record.getStr("table_name").contains("mission_result_table")){
+															for(Record updateData:updateDatas) {
+																updateData.remove(record.getStr("id_name"));
+															}
+															Db.use("masterDataSource").batchUpdate(record.getStr("table_name"), "mission_id,seq_id",updateDatas, record.getInt("batch_size"));
 														}else {
 															if(record.getStr("table_name").equals("detection_info_new")) {
 																for(Record updateData:updateDatas) {
@@ -295,8 +300,17 @@ public class SyncSlaveToMasterThread implements Runnable{
 		} catch (Exception e) {
 			logger.error("分库同步主库数据当前操作的异常表名为:"+errorTableName);
 			logger.error("分库数据同步主库发生错误   异常信息为:"+e.getMessage());
+			logger.error("分库数据同步主库发生错误   异常信息",e);
 			e.printStackTrace();
 		}
 	}
 
+	public SyncDbInfo getSyncDbInfo() {
+		return syncDbInfo;
+	}
+
+	public void setSyncDbInfo(SyncDbInfo syncDbInfo) {
+		this.syncDbInfo = syncDbInfo;
+	}
+	
 }
diff --git a/nms_sync/src/com/nms/thread/SyncThread.java b/nms_sync/src/com/nms/thread/SyncThread.java
index 209449e..a08717e 100644
--- a/nms_sync/src/com/nms/thread/SyncThread.java
+++ b/nms_sync/src/com/nms/thread/SyncThread.java
@@ -250,6 +250,7 @@ public class SyncThread implements Runnable {
 		} catch (Exception e) {
 			logger.error("主库同步分库数据当前操作的异常表名为:"+errorTableName);
 			logger.error("主库数据同步分库发生错误   异常信息为:"+e.getMessage());
+			logger.error("主库数据同步分库发生错误   异常信息",e);
 			e.printStackTrace();
 		}
 	}