jiangjiazhi / regional-platform

Commit 3ff5019ab726884fbc363fcd871e274e45405227

Authored by liquanyu about 7 years ago

Exists in master and in 6 other branches

同步

Showing 3 changed files with 14 additions and 25 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java

...	...	@@ -64,13 +64,9 @@
64	64	}
65	65
66	66	public boolean savePostMysql(String sql ,String sqlId) {
67		- SyncMysqlDataModel syncMysqlDataModel = new SyncMysqlDataModel();
68		- syncMysqlDataModel.setSql(sql);
69		- syncMysqlDataModel.setSqlId(sqlId);
70		-
71	67	SyncDataModel model = new SyncDataModel();
72	68	model.setStatus(1);
73		- model.setJsonData(Base64.encodeBase64String(SerializUtils.objToByte((Serializable) syncMysqlDataModel)));
	69	+ model.setJsonData(Base64.encodeBase64String(sql.getBytes()));
74	70	model.setAction("POSTMYSQL");
75	71	model.setCreated(new Date());
76	72	model.setClassName("syncmysql");

...	...	@@ -194,10 +194,10 @@
194	194	{
195	195	try {
196	196	String data = LymsEncodeUtil.aesDecrypt(json,"Lymsh@2016");
197		- SyncMysqlDataModel mysqlDataModel = (SyncMysqlDataModel)SerializUtils.byteToObj(org.apache.commons.codec.binary.Base64.decodeBase64(data));
198		- if (mysqlDataModel != null && org.apache.commons.lang.StringUtils.isNotEmpty(mysqlDataModel.getSql()))
	197	+ String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(data),"gbk");
	198	+ if (sql != null)
199	199	{
200		- organizationService.execSql(mysqlDataModel.getSql());
	200	+ organizationService.execSql(sql);
201	201	}
202	202	} catch (Exception e) {
203	203	ExceptionUtils.catchException(e,"exce sql error. JSONDATA="+json);
204	204
...	...	@@ -209,20 +209,17 @@
209	209	public static void main(String[] args)
210	210	{
211	211	try {
212		-// SyncMysqlDataModel syncMysqlDataModel = new SyncMysqlDataModel();
213		-// syncMysqlDataModel.setSql(Base64.encodeBase64String("select * from asdfasdf".getBytes()));
214		-// syncMysqlDataModel.setSqlId("sqlId");
215		-//
216		-// String json = JsonUtil.obj2JsonString(syncMysqlDataModel);
217		- SyncMysqlDataModel mysqlDataModel = JsonUtil.str2Obj("{\"sql\":\"aW5zZXJ0IGludG8gYmFieV9leWVfY2hlY2soIGlkLGNyZWF0ZWQseW4sb3BlcmF0ZXJJZCxob3NwaXRhbElkLGJhYnlJZCxwaWQsY2hlY2tNb250aElkLGNoZWNrSG9zcGl0YWwsY2hlY2tUaW1lLHJpc2tGYWN0b3IsZXh0UmlnaHRFeWVsb29rLGV4dFJpZ2h0RXllbG9va090aGVyLGJsaW5rUmlnaHRSZWZsZXgscHVwaWxsYXJ5UmlnaHRSZWZsZXgscmVkUmlnaHRSZWZsZXgsZXh0TGVmdEV5ZWxvb2ssZXh0TGVmdEV5ZWxvb2tPdGhlcixibGlua0xlZnR0UmVmbGV4LHB1cGlsbGFyeUxlZnRSZWZsZXgscmVkTGVmdFJlZmxleCxmdW5kdXNSZXN1bHQsaGFuZGxlT3BpbmlvbnNJZCxndWlkYW5jZU9waW5pb25zLGRvY3RvcixuZXh0Q2hlY2tNb250aElkLG5leHRDaGVja1RpbWUsZXh0RXllbG9vayxleHRFeWVsb29rT3RoZXIscmVkUmVmbGV4LHJlZFJlZmxleE90aGVyLHIxLHIyLGwxLGwyLG9wdG9tZXRyeSxjb25qdW5jdGl2YSxjb25qdW5jdGl2YU90aGVyLGNvcm5lYWwsY29ybmVhbE90aGVyLGxhY3JpbWFsQXBwYXJhdHVzLGxhY3JpbWFsQXBwYXJhdHVzT3RoZXIsZXllTW92ZW1lbnRzSWQsZXllUG9zaXRpb25JZCxleWVQb3NpdGlvbk90aGVyLGJpbm9jdWxhclZpc2lvbixvdGhlcixsVmlzaW9uLHJWaXNpb24scmVmcmFjdGlvbkwxLHJlZnJhY3Rpb25MMixyZWZyYWN0aW9uUjEscmVmcmFjdGlvblIyLG55c3RhZ211cyxmaXhhdGlvbkNhcmQgKSB2YWx1ZXMoJzVhZDRjMjlhYTg1MjFhOTExZWU1OTJlYycsJzIwMTgtNC0xNiAyMzozNDo1MCcsJzEnLCcyMTAwMDAyOTkwJywnMjEwMDAwMTcwNScsJzVhZDRhNWMxYTg1MjcwODc2MDE0ZmI4ZScsJzVhZDRhNWMxYTg1MjcwODc2MDE0ZmI4NCcsJzMnLCfH2LvKtbrR3cq+0r3UuicsJzIwMTgtNC0xNiAyMzozNDo1MCcsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsJzQnLCfR276musO1w7rcJywnMjEwMDAwMjk5MCcsbnVsbCxudWxsLCd5YW5nJyxudWxsLCd5YW5nJyxudWxsLCcyMycsJzQ1JyxudWxsLG51bGwsbnVsbCwneWFuZycsbnVsbCwneWFuZycsbnVsbCwneWFuZycsbnVsbCwneHonLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsJ3lhbmcnLG51bGwp\\\",\\\"sqlId\\\":\\\"com.lyms.platform.permission.dao.master.BabyEyeCheckMapper.save\"}", SyncMysqlDataModel.class);
218		- //String str = org.apache.commons.codec.binary.Base64.encodeBase64String(mysqlDataModel.getSql().getBytes());
219		- //String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64("YVc1elpYSjBJR2x1ZEc4Z1ltRmllVjlsZVdWZlkyaGxZMnNvSUdsa0xHTnlaV0YwWldRc2VXNHNiM0JsY21GMFpYSkpaQ3hvYjNOd2FYUmhiRWxrTEdKaFlubEpaQ3h3YVdRc1kyaGxZMnROYjI1MGFFbGtMR05vWldOclNHOXpjR2wwWVd3c1kyaGxZMnRVYVcxbExISnBjMnRHWVdOMGIzSXNaWGgwVW1sbmFIUkZlV1ZzYjI5ckxHVjRkRkpwWjJoMFJYbGxiRzl2YTA5MGFHVnlMR0pzYVc1clVtbG5hSFJTWldac1pYZ3NjSFZ3YVd4c1lYSjVVbWxuYUhSU1pXWnNaWGdzY21Wa1VtbG5hSFJTWldac1pYZ3NaWGgwVEdWbWRFVjVaV3h2YjJzc1pYaDBUR1ZtZEVWNVpXeHZiMnRQZEdobGNpeGliR2x1YTB4bFpuUjBVbVZtYkdWNExIQjFjR2xzYkdGeWVVeGxablJTWldac1pYZ3NjbVZrVEdWbWRGSmxabXhsZUN4bWRXNWtkWE5TWlhOMWJIUXNhR0Z1Wkd4bFQzQnBibWx2Ym5OSlpDeG5kV2xrWVc1alpVOXdhVzVwYjI1ekxHUnZZM1J2Y2l4dVpYaDBRMmhsWTJ0TmIyNTBhRWxrTEc1bGVIUkRhR1ZqYTFScGJXVXNaWGgwUlhsbGJHOXZheXhsZUhSRmVXVnNiMjlyVDNSb1pYSXNjbVZrVW1WbWJHVjRMSEpsWkZKbFpteGxlRTkwYUdWeUxISXhMSEl5TEd3eExHd3lMRzl3ZEc5dFpYUnllU3hqYjI1cWRXNWpkR2wyWVN4amIyNXFkVzVqZEdsMllVOTBhR1Z5TEdOdmNtNWxZV3dzWTI5eWJtVmhiRTkwYUdWeUxHeGhZM0pwYldGc1FYQndZWEpoZEhWekxHeGhZM0pwYldGc1FYQndZWEpoZEhWelQzUm9aWElzWlhsbFRXOTJaVzFsYm5SelNXUXNaWGxsVUc5emFYUnBiMjVKWkN4bGVXVlFiM05wZEdsdmJrOTBhR1Z5TEdKcGJtOWpkV3hoY2xacGMybHZiaXh2ZEdobGNpeHNWbWx6YVc5dUxISldhWE5wYjI0c2NtVm1jbUZqZEdsdmJrd3hMSEpsWm5KaFkzUnBiMjVNTWl4eVpXWnlZV04wYVc5dVVqRXNjbVZtY21GamRHbHZibEl5TEc1NWMzUmhaMjExY3l4bWFYaGhkR2x2YmtOaGNtUWdLU0IyWVd4MVpYTW9KelZoWkRSaFpUWTNZVGcxTWpNNVltRXdNemhpTkdZMU55Y3NKekl3TVRndE5DMHhOaUF5TWpvd09Eb3pPU2NzSnpFbkxDY3lNVEF3TURBeU9Ua3dKeXduTWpFd01EQXdNVGN3TlNjc0p6VmhaRFJoWlRReFlUZzFNak01WW1Fd016aGlOR1kwWkNjc0p6VmhaRFJoWlRReFlUZzFNak01WW1Fd016aGlOR1kwTlNjc0p6TW5MQ2ZIMkx2S3RiclIzY3ErMHIzVXVpY3NKekl3TVRndE5DMHhOaUF5TWpvd09Eb3pPU2NzYm5Wc2JDeHVkV3hzTEc1MWJHd3NiblZzYkN4dWRXeHNMRzUxYkd3c2JuVnNiQ3h1ZFd4c0xHNTFiR3dzYm5Wc2JDeHVkV3hzTEc1MWJHd3NiblZzYkN4dWRXeHNMQ2N5TVRBd01EQXlPVGt3Snl4dWRXeHNMRzUxYkd3c2JuVnNiQ3h1ZFd4c0xDZDVhVzRuTEc1MWJHd3NKekV5Snl3bk16UW5MQ2MxTmljc0p6YzRKeXh1ZFd4c0xDZDVZVzVuSnl4dWRXeHNMRzUxYkd3c2JuVnNiQ3duZVdsdUp5eHVkV3hzTENkNGRDY3NiblZzYkN4dWRXeHNMRzUxYkd3c2JuVnNiQ3h1ZFd4c0xHNTFiR3dzYm5Wc2JDeHVkV3hzTEc1MWJHd3NiblZzYkN4dWRXeHNMRzUxYkd3cA=="), "utf-8");
220		- String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(mysqlDataModel.getSql()));
221		-// String sql1 = new String(org.apache.commons.codec.binary.Base64.decodeBase64(sql), "utf-8");
222		- System.out.println(sql);
	212	+ String json = "aW5zZXJ0IGludG8gYmFieV9wYXRpZW50X2V4dGVuZF9lYXJfc2NyZWVuIChpZCxiYWJ5X2lkLHNjcmVlbl90eXBlLGNoZWNrX2hvc3BpdGFsX2lkLHNjcmVlbl9kYXRlLGhpZ2hfcmlza19jYXVzZSxvYWVfbGVmdCxvYWVfcmlnaHQsYWFicl9sZWZ0LGFhYnJfcmlnaHQsYWJyX2xlZnQsYWJyX3JpZ2h0LGdqYjJfZGVsXzM1LGdqYjJfZGVsXzE3NixnamIyX2RlbF8yMzUsZ2piMl9kZWxfMjk5LGdqYjNfc2xjMjZhNF81MzgsZ2piM19zbGMyNmE0XzIxNjgsZ2piM19zbGMyNmE0X2l2czcscnJuYV8xNDk0LHJybmFfMTU1NSxwcm9jZXNzX29wdGlvbl90eXBlLHByb2Nlc3Nfb3B0aW9uX2Rlc2MsZ3VpZF9vcGluaW9uLGNoZWNrX2RvY3Rvcl9pZCxyZWZlcnJhbF9kYXRlLGNyZWF0ZV9kYXRlLGNyZWF0ZV91c2VyX2lkLGNyZWF0ZV9ob3NwaXRhbF9pZCxuZXh0X2NoZWNrX3RpbWUsbGFzdF91cGRhdGVfZGF0ZSxsYXN0X3VwZGF0ZV91c2VyX2lkLGxhc3RfdXBkYXRlX2hvc3BpdGFsX2lkLHN0YXR1cyxzY3JfaXNwYXNzLHBpZCkgdmFsdWVzICgnZmRlMzc5OWY5NTZjNDg1Y2E4OTE0ZjczZjQ4YWVkZjMnLCc1YWE2ODNjMWE4NTI0MjhjOTI3ZTE3NjQnLDIsJzIxMDAwMDE3MDUnLCcyMDE4LTQtMTcgMjoyMjoyNycsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsMixudWxsLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCwyLCfH69PaM7j21MLE2r340NC9+NK7sr287LLp1e+2zycsJ7e0t7S4tLi0t7S3tLi0uLS3tLe0uLS4tLe0t7S4tLi0t7S3tLi0uLS3tLe0uLS4tLfvt8m3yScsJzIxMDAwMDI5OTAnLG51bGwsJzIwMTgtNC0xNyAyOjIyOjI3JywnMjEwMDAwMjk5MCcsJzIxMDAwMDE3MDUnLG51bGwsJzIwMTgtNC0xNyAyOjIyOjI3JywnMjEwMDAwMjk5MCcsJzIxMDAwMDE3MDUnLDAsMiwnNWFhNjgzYzFhODUyNDI4YzkyN2UxNzYyJyk=";
	213	+// json = org.apache.commons.codec.binary.Base64.encodeBase64String(json.getBytes());
	214	+// json = LymsEncodeUtil.aesEncrypt(json, "Lymsh@2016");
	215	+
	216	+// String data = LymsEncodeUtil.aesDecrypt(json,"Lymsh@2016");
	217	+ String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(json),"utf-8");
	218	+ System.out.println(sql);
	219	+
223	220	}catch (Exception e)
224	221	{
225		-
	222	+ e.printStackTrace();
226	223	}
227	224
228	225	}

...	...	@@ -65,7 +65,7 @@
65	65	public static void addSqlToQueue1(String sql ,String sqlId)
66	66	{
67	67	SqlRequest request = new SqlRequest();
68		- request.setSql(Base64.encodeBase64String(sql.getBytes()));
	68	+ request.setSql(sql);
69	69	request.setSqlId(sqlId);
70	70	syncSqlQueue1.add(request);
71	71	System.out.println("syncSqlQueue1 size = " + syncSqlQueue.size());
...	...	@@ -120,7 +120,6 @@
120	120	}
121	121	}
122	122	} catch (Exception e) {
123		- syncSqlQueue.add(request);
124	123	ExceptionUtils.catchException(e, "HandleThread syncSqlQueue thread error." + request);
125	124	}
126	125	}
127	126
128	127
...	...	@@ -140,11 +139,8 @@
140	139	try {
141	140	Thread.sleep(3000);
142	141	request = syncSqlQueue1.take();
143		- System.out.println(request);
144	142	syncDataService.savePostMysql(request.getSql(),request.getSqlId());
145		-
146	143	} catch (Exception e) {
147		- syncSqlQueue1.add(request);
148	144	ExceptionUtils.catchException(e, "HandleThread syncSqlQueue1 thread error." + request);
149	145	}
150	146	}