From fc3b958bd568d09198bce0dd9afb715aa89f4716 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 14 Oct 2016 10:58:40 +0800 Subject: [PATCH] code update --- .../main/java/com/lyms/platform/biz/JdbcUtil.java | 4 +-- .../lyms/platform/data/util/AmsMessageService.java | 2 +- .../job/index/service/SyncDataService.java | 38 +++++++++++++++++++--- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java index ee50d3b..0337809 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java @@ -763,7 +763,7 @@ public class JdbcUtil { " INNER JOIN PLAT_DATACONTENT K ON J.ME_WORNINGID = K.DC_ID AND K.DC_ISVALID=1 AND K.DC_DATATYPEID='fb43fd5a-b153-4cb9-9180-c46f5612ba43' AND K.DC_NAME<>'其他'\n" + " --高危等级\n" + " INNER JOIN PLAT_DATACONTENT L ON K.DC_PARENTID=L.DC_ID AND L.DC_ISVALID=1\n" + - " INNER JOIN LYMS_BASICCONFIG LL ON K.DC_NAME=LL.NAME\n" + + " INNER JOIN LYMS_BASICCONFIG LL ON K.DC_NAME=LL.NAME AND LL.PARENTID IN ('49a36aea-c5b6-4162-87d2-9eb3c6ec00c2','eb146c03-b19f-4e28-b85f-fda574b2283b','315107bd-91fe-42a1-9237-752f3c046a40','e637b361-99cf-41eb-84f2-f0dab596e928','224b2329-cb82-4da3-a071-8527f8283aab') \n" + " -- UNION ALL \n" + " --其他高危评分\n" + " --SELECT M.ID,M.MO_CONTENT,M.MO_COLORNAME,M.MO_VALUES FROM MOMMY_OTHERWORNING M\n" + @@ -1000,7 +1000,7 @@ public class JdbcUtil { long startTimes = System.currentTimeMillis(); List> list = getListDataBySql(sql); long endTimes = System.currentTimeMillis(); - System.out.println("chzhenTimes==========="+(endTimes-startTimes)); + System.out.println("fuzhenTimes==========="+(endTimes-startTimes)); for (Map map : list) { AntenatalExaminationModel antxModel = new AntenatalExaminationModel(); antxModel.setPid(pid); diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java index f1ca968..aa9a89b 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java @@ -182,7 +182,7 @@ public class AmsMessageService { public static void main(String[] args) { - getMessageTemplateMap("e50f0678-36c2-46d5-a949-010d16412b76", + getMessageTemplateMap("6a98e4c2-9fa7-47a6-b7f3-ec4c79c687bf", AmsServiceTypeEnum.CHILD_GUIDE); } diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java index fff4f50..24f599f 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java @@ -53,8 +53,9 @@ public class SyncDataService { try { simplePatient = patientsQueue.poll(1, TimeUnit.MINUTES); if (null != simplePatient) { - threadPoolExecutor.execute(new SyncAntEx(simplePatient.getPid(), simplePatient.getId(), mongoTemplate)); - threadPoolExecutor.execute(new SyncAntExChu(simplePatient.getPid(), simplePatient.getId(), mongoTemplate)); +// threadPoolExecutor.execute(new SyncAntEx(simplePatient.getPid(), simplePatient.getId(), mongoTemplate)); +// threadPoolExecutor.execute(new SyncAntExChu(simplePatient.getPid(), simplePatient.getId(), mongoTemplate)); + threadPoolExecutor.execute(new SyncPatCheck(simplePatient.getPid(), simplePatient.getId(), mongoTemplate)); } } catch (Exception e) { ExceptionUtils.catchException(e, "Chanle thread error." + simplePatient); @@ -63,6 +64,32 @@ public class SyncDataService { } } + + private class SyncPatCheck extends Thread { + private String pid; + private String id; + private MongoTemplate mongoTemplate; + + public SyncPatCheck(String pid, String id, MongoTemplate mongoTemplate) { + this.pid = pid; + this.id = id; + this.mongoTemplate = mongoTemplate; + } + + @Override + public void run() { + try { + syncChuZhen(pid, id, mongoTemplate); + syncFuzhen(pid, id, mongoTemplate); + } catch (Exception e) { + ExceptionUtils.catchException(e, "SyncAntExChu thread error.id:" + id+",pid:"+pid); + } + } + + + } + + private class SyncAntExChu extends Thread { private String pid; private String id; @@ -146,6 +173,7 @@ public class SyncDataService { private void syncBaby(Map map) { PersonModel personModel = new PersonModel(); + personModel.setId(DataUtil.getString(map.get("ID"))); personModel.setPhone(DataUtil.getString(map.get("PI_MOTHERPHONE"))); personModel.setName(DataUtil.getString(map.get("PI_NAME"))); personModel.setCardNo(DataUtil.getString(map.get("PI_MOTHERPHONE"))); @@ -420,7 +448,7 @@ public class SyncDataService { patients.setDueDate(DateUtil.addDay(DataUtil.getDate(map.get("P_LASTMENSTRUALPERIOD")), 42 * 7)); person.setCreated(new Date()); - + person.setId(String.valueOf(map.get("PID"))); person.setType(type); person.setYn(YnEnums.YES.getId()); person.setBirth(DataUtil.getDate(map.get("P_BIRTHDAY"))); @@ -742,8 +770,8 @@ public class SyncDataService { " --高危内容\n" + " INNER JOIN PLAT_DATACONTENT K ON J.ME_WORNINGID = K.DC_ID AND K.DC_ISVALID=1 AND K.DC_DATATYPEID='fb43fd5a-b153-4cb9-9180-c46f5612ba43' AND K.DC_NAME<>'其他'\n" + " --高危等级\n" + - " INNER JOIN PLAT_DATACONTENT L ON K.DC_PARENTID=L.DC_ID AND L.DC_ISVALID=1\n" + - " INNER JOIN LYMS_BASICCONFIG LL ON K.DC_NAME=LL.NAME\n" + + " INNER JOIN PLAT_DATACONTENT L ON K.DC_PARENTID=L.DC_ID AND L.DC_ISVALID=1 \n" + + " INNER JOIN LYMS_BASICCONFIG LL ON K.DC_NAME=LL.NAME AND LL.PARENTID IN ('49a36aea-c5b6-4162-87d2-9eb3c6ec00c2','eb146c03-b19f-4e28-b85f-fda574b2283b','315107bd-91fe-42a1-9237-752f3c046a40','e637b361-99cf-41eb-84f2-f0dab596e928','224b2329-cb82-4da3-a071-8527f8283aab') \n" + " -- UNION ALL \n" + " --其他高危评分\n" + " --SELECT M.ID,M.MO_CONTENT,M.MO_COLORNAME,M.MO_VALUES FROM MOMMY_OTHERWORNING M\n" + -- 1.8.3.1