From 77c27232bc32ddbf39a4e2b2da1ad579ddbd8e3e Mon Sep 17 00:00:00 2001 From: default Date: Fri, 28 Sep 2018 09:44:38 +0800 Subject: [PATCH] update --- nms_sync/.gitignore | 1 + .../thread/SyncSlaveToMasterThread$2$1.class | Bin 4197 -> 4363 bytes .../thread/SyncSlaveToMasterThread$3$1.class | Bin 4256 -> 4256 bytes .../thread/SyncSlaveToMasterThread$3.class | Bin 1545 -> 1545 bytes .../nms/thread/SyncSlaveToMasterThread.class | Bin 5354 -> 5354 bytes .../bin/com/nms/thread/SyncThread$2$1.class | Bin 4067 -> 4233 bytes .../bin/com/nms/thread/SyncThread$3$1.class | Bin 4152 -> 4152 bytes .../bin/com/nms/thread/SyncThread$3.class | Bin 1437 -> 1437 bytes nms_sync/bin/com/nms/thread/SyncThread.class | Bin 5175 -> 5175 bytes .../nms/thread/SyncSlaveToMasterThread.java | 3 +++ nms_sync/src/com/nms/thread/SyncThread.java | 3 +++ 11 files changed, 7 insertions(+) create mode 100644 nms_sync/.gitignore diff --git a/nms_sync/.gitignore b/nms_sync/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/nms_sync/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/nms_sync/bin/com/nms/thread/SyncSlaveToMasterThread$2$1.class b/nms_sync/bin/com/nms/thread/SyncSlaveToMasterThread$2$1.class index 9ac1c4b7d4e3a306e8f09f4e1ae0a734d8aabbf3..2a27db2bcba14fe34b370456938849e55eda2ba1 100644 GIT binary patch delta 891 zcmZXT*>6;J6vscO9eVHFUZ-^=)rnRriGalB61Nx(4~@oHLa0(>Q-hiOI&(X{^*V!d z?~IfO@xeD=BtH`baYIm1L|MEYC<5+^3ofAIzTqzN54ikhF!90j@H^}GdvZ?B??m4{ zbDhI~?K=Qm%Bh`BpS{-Reqpv>_sem<>K7{2Vm=JUs;WBWu#rs`4+!0ps;<0Hl}p}m zTn)-4mj_uQbojT|R2bPjEObUw0WtRXPklgukyOZYeKG2xy@5%U205u<0^_Lqe|IZ zIy|)81!E}QcX1IPd`_eQw<_!Logj*7BO*q`@@Ln#} zBy8Cq%y4vcnvebs^fXwS{kWM)I6jivZcZ{quX*eA>V;iHYbye)#3hs-BDtKJ3{#hw zJLE1_%Q~iHGix~CAXZ>E$72qC#3^8#*G)4?@AVz|TX&$APV$&jh;IP0L zV_dj!aTg9aD^4gf`6!?`&+~-y9CxnV7&q!|^)BxD&pH2p&i!+DO#4=xd-wOq7%+>k z8V*63+@hEERsPUcWzoTI4||v<(3;G|lF$arO{c(UFs)!yAQ9OVGT6^SjRS%S&1Spl zkD9TtzdB}x!l70Vho}~~BQa~G8EsQsiz6P6a!h9El@pH(9FazYnVj@c!6`wBta28~ zxUOe*b5`Sw?9j`dJ)Dz0dZXUQfJT3cv_&s*d+1?MFke=PQn}736t>)HRAnX^(HNHF z#uVo$7vxW4?({J(Yg`gcj<<&WW{VkY3i+e)@a$%PO+1`_~_4IxG>SO<1&xZLDXCV%FkL8KH<` zmAS=c9%CTL73+DzQyh4y;u+6z(#dyTsIHTK<}psT+V+|}UMiHSHZ13r%3Zuslk$|( uJt;lzts3`F`c6sT%l_OM<%<;hplA+0@<~M(-F)VYLS9wtRxx$Nzwj4D7sBWO diff --git a/nms_sync/bin/com/nms/thread/SyncSlaveToMasterThread$3$1.class b/nms_sync/bin/com/nms/thread/SyncSlaveToMasterThread$3$1.class index a5d2e01b65e51ed7e735f2657b8aadd2913cb7e2..fed7e3ba67d9fe86c71752b2ed26503a2bef4c4f 100644 GIT binary patch delta 157 zcmWN_y9z-87{KxWXOcRxn4H0R0m`NWrB&;jCVma#e5o vcilI0zAPlnQcN|@N|LN4$3}{5rK;B0iOpVoTzPPiXNaSG@Z^Wze1%Vc;N>ma delta 157 zcmWN_y$V5L9Khk<-z0T97LzkLH$d5x1()DXxBvr#42pxJe7!jN%Eu9tL75bj-E5KF zB=7XpqikjSQA6qn%g6*u4T3ZY;}D@moHj{1q;N^oC8s}6k0O1_45%^0W5ii|L2=dI x^xqltX2O@Ln0R7oW6UJMT(T^rz)~vODl2hW%aM&d*vd1+PCoeZWAD7o(;vXqEp7k+ diff --git a/nms_sync/bin/com/nms/thread/SyncSlaveToMasterThread$3.class b/nms_sync/bin/com/nms/thread/SyncSlaveToMasterThread$3.class index 98d4465bfb9a97d42a82bd73ec7e94c87b4ae2d1..6a77e702ed54f82f5b918731a5d294461f8fe35e 100644 GIT binary patch delta 25 fcmeC=>Ezj9#md+>*_t(mapL3|tTsUQRaO%KWnBmc delta 25 fcmeC=>Ezj9#md+{*_t(mv2XGWRvRGuDys&IB=@P@y&B?;; Fi~#bs9;N^Q delta 102 zcmaE*`ATyGmvCea<2Qy{#-9vzjDHyXnHU+GnB*8*m=qb>n2Z_PncNsUm|}tK1cp|o zREAEb28J%Ceui$Q#SGh+)-Y^mTF&H;=@P@C&B?;; Fi~#0z9%ldm diff --git a/nms_sync/bin/com/nms/thread/SyncThread$2$1.class b/nms_sync/bin/com/nms/thread/SyncThread$2$1.class index 159b1034fc90b488834b9db3bad8b22830925084..1f63c5f80536f5bfa280e9c06465af3acfc1b318 100644 GIT binary patch delta 826 zcmYL{*>4m_5XOJyU3+GS@!CvarIi6g9!P{pjDi#hhzCo&7!XE|0J2-ayGlzEf@ti z)9E!XDi;zjH>k0ZMExp0w%N;z`mn>z&-GULCZ7sci|e;`r1I&NUZ}gz=5rbZGoAJ4 zhZ+_IzO?y@{c4^$^@W2%S-Q>QH4fWMA`r%_%1Eu#*s|Db^`~1DIbzT+)bv!>l-mq& zR1KN4V#hgYa6(A-R3}UDDfLclx|~tHvHFU0d}Hvnx*Z!6`IhgLSko%L=SPDdRJ}DS z@)PIPyVkg-i~8jmH}9v?Z6=q6SSe_8eb3-$Aztc5r=QN$&D5C16>3a=6RLc-CF7+^ z4NPYjEek8UW^g!M_l>j9qye4$>AC*1=9ho(iffK#Ne$gu&Mnw`^q%uj0m z*??5Q(tyEIh6~APC|L3@4REEok6%K-nN?(t^J|C)TwM^|rza}PXuTE~t@g$nySoHd zicLWhyeCuWmbX|X1y;)%)`()Q>|h;ZG@}VKERI^n>d2H$+{8jpovh~;zf*=oJ-4|- zgkBlOU40tS|GkiV*gES~J>NSRmKqi={>3^<9{A%&(T;>@1f}`LVF5@tKq!> delta 689 zcmXAnOGwmF6vlto8T~&TA5EdDq}if{BuYV;E<%Vv3k3#R_HlPBnF^_raKti~C^f^AmVD)3u@#)7gy$lK`M z;o=-+0^Jt~Ra^cR)f?u5i%u@eDZOanWkH;;!DJ;@T@-Rnuv{iNa%72N7~Ndg=n-Tc zNzICP(aR0lY?LS5q+jEf95u2Xy$r}{qeR#;(=1JhFsv~oEi>CO!X0_QEH=itr*T)1 zF6WGN<#C?}a>mT9dZd=|TfvaW*P!!6V8oIJE9BL9DoBp4(Gv3c3)U&lWSlIW=Yo`w zRpaYh&MXdn*Bqe-2jLKY`)$jgWy;+UXgt~YOh z#Su2Dkmjzn*^(ba9X6|NPT8E7lgSy@C7Ub7PE~P7=!(!cLRGE%_8`?6&Ip4x9-C&H z(U|mMhSNsY#PH)0#%l+87A4%}YK(g#%G*rVID6ECI$5Ib09kT_J|_( zidyywFKr@ByEw>xvQ=jldUO$TSgJBzwDB4fL8{ov6mN*bO(}1AheQ32KfG5}2YsyN z11>e~GiiKOC_zoALuE;M}Xj-+!@q?c#I_YMH PUkbSu*R5joi23jz^W?Xh diff --git a/nms_sync/bin/com/nms/thread/SyncThread$3$1.class b/nms_sync/bin/com/nms/thread/SyncThread$3$1.class index 2fe9630a10b640ce7fff093b8c5254ddb99d6f61..67fe42e53e3170fedc0387c6f91d7566c7debb8a 100644 GIT binary patch delta 157 zcmWN{yAHu%96<5&H;FW<#ol-T1Czw&5qJiJ)ns9?*d->3x+bn^UFu7fszkzSuzLa? zz~GyH$;nZcvYg0}-u7zbV$D8rY?2H}F(ku?EMxLaC@`g{dx;q}=CoMQW~r|gfi`5# yO?%hrf zH|<^b2Mb;}d|2|s5m<}KM&h`VXDbD5k)4z|NE0P{juPO>Gr~#U`10l4sF>a#By2D} diff --git a/nms_sync/bin/com/nms/thread/SyncThread$3.class b/nms_sync/bin/com/nms/thread/SyncThread$3.class index 231cef11f14b936b8d99c77068dcfc8936ab3e8f..4f124eb5d79b518c21d0a65f2953a380207bb8a2 100644 GIT binary patch delta 25 gcmbQsJ(qjKDHg_=lTWiGFwU8*!)gO$XR?|A0C^1vmjD0& delta 25 gcmbQsJ(qjKDHg_QlTWiGFwUH;!)gO$XR?|A0C=hhjsO4v diff --git a/nms_sync/bin/com/nms/thread/SyncThread.class b/nms_sync/bin/com/nms/thread/SyncThread.class index c4a2a477eac9cee8811b04c1f9632af548af506b..37c01f90be6b60567e70d2cf1fdb24f65fd2d9be 100644 GIT binary patch delta 110 zcmdn4v0Y=sHNn76#y1RIjPDt`89y;ZGJa?1XA)tU$Ry4%nMspj3X=`PRHk4cJB(ox zQ#8YLrYwe;OtlP0nHm_5F*O6#bubt(O=391G@Icp(|m?=Op6&VY*rU?U}U^JIYZc% O^*RG9!;Q(SgnI!>T_KSG delta 110 zcmdn4v0Y=sHNn6(#y1S@jPDsb7(X#YGJa?1VG?2JV-jbWz@*7Ak;#T(5>qgc9mdel z6wNS&DT`qmQ!T?GrUr(?OwB-b9SjCclNe4i&1N{oG@s!#(_)6Ro7IIJ7#S~2&Jea` Oy~4oCaCP!3;a&hdL?KTA diff --git a/nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java b/nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java index 18f1b31..fcf5f5d 100644 --- a/nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java +++ b/nms_sync/src/com/nms/thread/SyncSlaveToMasterThread.java @@ -108,6 +108,9 @@ public class SyncSlaveToMasterThread implements Runnable{ for(Record insertData:insertDatas){ Record seqData = Db.use("masterDataSource").findFirst("select nextval('seq_"+record.getStr("table_name")+"') seqId from dual"); insertData.set(record.getStr("id_name"), seqData.getLong("seqId")); + if(record.getStr("table_name").equals("event_record_library")) { + insertData.set("sync_status",1); + } } Db.use("masterDataSource").batchSave(record.getStr("table_name"), insertDatas, record.getInt("batch_size")); // 同步完成后 取出最后一条数据的id 更新到table_sync_info表中 用作下次使用 diff --git a/nms_sync/src/com/nms/thread/SyncThread.java b/nms_sync/src/com/nms/thread/SyncThread.java index db99c15..378ed13 100644 --- a/nms_sync/src/com/nms/thread/SyncThread.java +++ b/nms_sync/src/com/nms/thread/SyncThread.java @@ -118,6 +118,9 @@ public class SyncThread implements Runnable { for(Record insertData:insertDatas){ Record seqData = Db.use(url).findFirst("select nextval('seq_"+record.getStr("table_name")+"') seqId from dual"); insertData.set(record.getStr("id_name"), seqData.getLong("seqId")); + if(record.getStr("table_name").equals("event_record_library")) { + insertData.set("sync_status",1); + } } Db.use(url).batchSave(record.getStr("table_name"), insertDatas, record.getInt("batch_size")); // 同步完成后 取出最后一条数据的id 更新到table_sync_info表中 用作下次使用