gfwleak/nms-nmssync
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
default
2018-11-13 14:57:05 +08:00
parent 64afec59e1
commit 2196c2b10d
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
nms_sync/src/com/nms/interceptor/SyncMissionResultStatisticalInterceptor.java
View File

@@ -271,11 +271,46 @@ public class SyncMissionResultStatisticalInterceptor implements Interceptor{
switch(missionState) {
case(3):
Record findFirst = Db.use().findFirst("select COUNT(*) count from loopmission_state_table where mission_id = ? and mission_state=0",loopmissionStateTableInfo.getLong("mission_id"));
if(findFirst.getInt("count").equals(0)&&missionTableInfoState!=3) {
if(findFirst.getInt("count").equals(0)&&missionTableInfoState!=3&&missionTableInfoState!=5&&missionTableInfoState!=6&&missionTableInfoState!=7) {
status=3;
autoDesc=format.format(System.currentTimeMillis())+"i18n_server.UpgradeService.sql.revoke_n81i";
}
break;
case(2):
if(missionTableInfoState!=6&&missionTableInfoState!=5&&missionTableInfoState!=7) {
status=2;
}
break;
case(6):
status=6;
if(missionTableInfoState!=6) {
autoDesc=format.format(System.currentTimeMillis())+"Task revocation start execute";
}
break;
case(7):
Record find = Db.use().findFirst("\r\n" +
"\r\n" +
"select count(*) count \r\n" +
" from (\r\n" +
" select lmst.mission_id, \r\n" +
" sum(case lmst.mission_state when 3 then 1 when 7 then 1 else 0 end) ok,-- //正常执行完成的周期，撤销完成的周期\r\n" +
" sum(case lmst.mission_state when 4 then 1 else 0 end) fail,-- //未能执行的周期\r\n" +
" count(lmst.cur_mission_id) total\r\n" +
" from loopmission_state_table lmst\r\n" +
" group by lmst.mission_id\r\n" +
" ) t\r\n" +
" left join mission_state_table mst on mst.mission_id = t.mission_id\r\n" +
" where t.ok + t.fail = t.total\r\n" +
" and ifnull(mst.mission_id, -1) <> -1\r\n" +
" and mst.is_loop = 1\r\n" +
" and mst.mission_state not in (3, 7, 4) and mst.mission_id=?",missionTableInfo.getLong("mission_id"));
if(null!=find&&find.getInt("count")!=0) {
status=7;
}
if(missionTableInfoState!=7) {
autoDesc=format.format(System.currentTimeMillis())+"i18n_server.UpgradeService.sql.revoke_n81i";
}
break;
}
}
@@ -284,7 +319,7 @@ public class SyncMissionResultStatisticalInterceptor implements Interceptor{
if(status!=null) {
missionStateTableResult.set("mission_state", status);
}
if(missionDesc.length()>0&&null!=missionState&&missionState!=6&&missionState!=7) {
if(missionDesc.length()>0&&null!=missionState) {
missionStateTableResult.set("mission_state_desc",missionDesc);
}
if(autoDesc.length()>0) {

2
nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java
View File

@@ -228,7 +228,7 @@ public class SyncSlaveToMasterThread implements Runnable{
SyncData.setThreadlocalLoopUpdateMissionIds(loopUpdateSet);
SyncData.setThreadlocalLoopInsertMissionIds(set);
if(insertDatas2.size()>0) {
Db.use("masterDataSource").batchSave(record.getStr("table_name"), insertDatas, record.getInt("batch_size"));
Db.use("masterDataSource").batchSave(record.getStr("table_name"), insertDatas2, record.getInt("batch_size"));
}
if(updateDatas.size()>0) {
Db.use("masterDataSource").batchUpdate(record.getStr("table_name"), record.getStr("id_name"),