diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java index 205c185..3a38ccd 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java @@ -20,7 +20,8 @@ public enum WxTempleteIdEnums { GAO_WEI_ZHI_DAO("n6fSC1wYc3jOfGmuI1Vtbut6TlaBPlt5482SqJ8CE4o","高危提醒"), ER_JIAN_KANG_ZHI_DAO("dqvyESU8UXx1V3cIMQDqj4PLxI6T9-sgihQcs3ZGL9E","儿童健康指导"), - CHAN_JIAN_KANG_ZHI_DAO("jEbeeBKyjcquhFWUUndnRddLqLbK8-QF6yA98cYW_E8","产妇健康指导"); + CHAN_JIAN_KANG_ZHI_DAO("H2_ucLqVEbsZAv-EZcmUDpD1Zul5NGqMoJktHT0u4gw","产妇健康指导"), + CHAN_HOU_FU_CHA("jEbeeBKyjcquhFWUUndnRddLqLbK8-QF6yA98cYW_E8","产后复查");//产后预约和产后复查 private WxTempleteIdEnums(String id, String name){ this.name=name; this.id =id; diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index 4e2795c..f55ce2b 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -611,7 +611,7 @@ public class TempleteMsgGenerateWorker implements Runnable { messageContent = HelperUtils.replaceEL(pat.getUsername(), actualSendDate, messageContent); MessageRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(), - pat.getHospitalId(), template.getId(), pat.getId(), title, DateUtils.getDateStr(actualSendDate,DateUtils.Y_M_D), "", WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId()); + pat.getHospitalId(), template.getId(), pat.getId(), title, DateUtils.getDateStr(actualSendDate,DateUtils.Y_M_D), "", WxTempleteIdEnums.CHAN_HOU_FU_CHA.getId()); messages.add(request); } @@ -672,7 +672,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String title = "产后复查"; MessageRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(), - pat.getHospitalId(), template.getId(), pat.getId(), title, days, "", WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId()); + pat.getHospitalId(), template.getId(), pat.getId(), title, days, "", WxTempleteIdEnums.CHAN_HOU_FU_CHA.getId()); messages.add(request); } } diff --git a/platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncDataService.java b/platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncDataService.java index 9d77e73..b315857 100644 --- a/platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncDataService.java +++ b/platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncDataService.java @@ -43,7 +43,27 @@ public class SyncDataService { private MongoTemplate mongoTemplate; - private static ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(5, 10, 1, TimeUnit.HOURS, new LinkedBlockingQueue()); + private static ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(1, 2, 1, TimeUnit.HOURS, new LinkedBlockingQueue()); + + public void deleteData(String hospitalId,String personId) { + Query query = new MongoQuery(new MongoCondition("hospitalId", hospitalId, MongoOper.IS)).convertToMongoQuery(); + + List list = mongoTemplate.find(query, Patients.class); + System.out.println("delete size = "+list.size()); + int count = 0; + if(CollectionUtils.isNotEmpty(list)) + { + for(Patients pat : list) + { + + String pid = pat.getPid(); + query = new MongoQuery(new MongoCondition("id", pid, MongoOper.IS)).convertToMongoQuery(); + count++; + mongoTemplate.findAllAndRemove(query, PersonModel.class); + } + } + System.out.println("==========="+count); + } private class Chanle extends Thread { @@ -90,7 +110,7 @@ public class SyncDataService { @Override public void run() { try { - syncChuZhen(pid, id, mongoTemplate,lastMenses,weeks); + syncChuZhen(pid, id, mongoTemplate, lastMenses, weeks); syncFuzhen(pid, id, mongoTemplate,lastMenses,weeks); } catch (Exception e) { ExceptionUtils.catchException(e, "SyncAntExChu thread error.id:" + id+",pid:"+pid); @@ -333,7 +353,7 @@ public class SyncDataService { person.setPhone(DataUtil.getString(map.get("P_MOBILEPHONE"))); person.setCreated(DataUtil.getDate(map.get("P_FILINGTIME"))); person.setModified(DataUtil.getDate(map.get("P_OPERTIME"))); - mongoTemplate.save(person); + // mongoTemplate.save(person); patients.setPid(person.getId()); @@ -640,7 +660,7 @@ public class SyncDataService { patients.setVcCardNo(DataUtil.getString(map.get("VC_CARDNO"))); //就诊卡号 - mongoTemplate.save(patients); + // mongoTemplate.save(patients); System.out.println(patients.getId() + "============"); patientsQueue.add(new SimplePatient(person.getId(), patients.getId(),DataUtil.getDate(map.get("P_LASTMENSTRUALPERIOD")),weeks)); diff --git a/platform-sync-data/src/main/java/com/lyms/platform/sync/data/util/JDBCUtil.java b/platform-sync-data/src/main/java/com/lyms/platform/sync/data/util/JDBCUtil.java index 1f72e4a..efc7222 100644 --- a/platform-sync-data/src/main/java/com/lyms/platform/sync/data/util/JDBCUtil.java +++ b/platform-sync-data/src/main/java/com/lyms/platform/sync/data/util/JDBCUtil.java @@ -1,5 +1,7 @@ package com.lyms.platform.sync.data.util; +import com.lyms.platform.common.utils.PropertiesUtils; + import java.sql.*; import java.util.ArrayList; import java.util.HashMap; @@ -11,27 +13,21 @@ import java.util.Map; */ public class JDBCUtil { + static String oracle_url = PropertiesUtils.getPropertyValue("oracle.url"); + static String oracle_name = PropertiesUtils.getPropertyValue("oracle.name"); + static String oracle_pwd = PropertiesUtils.getPropertyValue("oracle.pwd"); + + static String mysql_url = PropertiesUtils.getPropertyValue("mysql.url"); + static String mysql_name = PropertiesUtils.getPropertyValue("mysql.name"); + static String mysql_pwd = PropertiesUtils.getPropertyValue("mysql.pwd"); + public static Connection getOracleConnection() { Connection con = null; try { Class.forName("oracle.jdbc.driver.OracleDriver"); - String url = "jdbc:oracle:thin:@119.90.57.27:1521:orcl"; - String userName = "lyms_21"; - String pwd = "LYMS_21"; - con = DriverManager.getConnection(url, userName, pwd); - } catch (Exception e) { - e.printStackTrace(); - } - return con; - } - - public static Connection getMysqlConnectionForNewPlatform() { - Connection con = null; - try { - Class.forName("com.mysql.jdbc.Driver"); - String url = "jdbc:mysql://119.90.57.26:3306/center?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; - String userName = "center"; - String pwd = "lyms2015"; + String url = oracle_url; + String userName = oracle_name; + String pwd = oracle_pwd; con = DriverManager.getConnection(url, userName, pwd); } catch (Exception e) { e.printStackTrace(); @@ -43,9 +39,9 @@ public class JDBCUtil { Connection con = null; try { Class.forName("com.mysql.jdbc.Driver"); - String url = "jdbc:mysql://192.168.1.39:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; - String userName = "platform"; - String pwd = "platform123"; + String url = mysql_url; + String userName = mysql_name; + String pwd = mysql_pwd; con = DriverManager.getConnection(url, userName, pwd); } catch (Exception e) { e.printStackTrace(); diff --git a/platform-sync-data/src/main/java/com/lyms/platform/sync/data/web/controller/SyncDataController.java b/platform-sync-data/src/main/java/com/lyms/platform/sync/data/web/controller/SyncDataController.java index 876ff7d..b72310c 100644 --- a/platform-sync-data/src/main/java/com/lyms/platform/sync/data/web/controller/SyncDataController.java +++ b/platform-sync-data/src/main/java/com/lyms/platform/sync/data/web/controller/SyncDataController.java @@ -44,4 +44,12 @@ public class SyncDataController { return "baby starting..........."; } + + @RequestMapping(value = "/delete", method = RequestMethod.GET) + @ResponseBody + public String deleteData(@RequestParam(required = true) String hospitalId,@RequestParam(required = false) String pid) { + syncDataService.deleteData(hospitalId,pid); + return "delete starting..........."; + } + } \ No newline at end of file diff --git a/platform-sync-data/src/main/resources/config.properties b/platform-sync-data/src/main/resources/config.properties new file mode 100644 index 0000000..9a6b7ff --- /dev/null +++ b/platform-sync-data/src/main/resources/config.properties @@ -0,0 +1,10 @@ +oracle.url=jdbc:oracle:thin:@119.90.57.27:1521:orcl +oracle.name=LYMS_QHDCESHI8 +oracle.pwd=LYMS_QHDCESHI8 + +#oracle.name=lyms_21 +#oracle.pwd=LYMS_21 + +mysql.url=jdbc:mysql://192.168.1.39:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 +mysql.name=platform +mysql.pwd=platform123 \ No newline at end of file diff --git a/platform-sync-data/src/main/resources/database.properties b/platform-sync-data/src/main/resources/database.properties index e69de29..738fc2f 100644 --- a/platform-sync-data/src/main/resources/database.properties +++ b/platform-sync-data/src/main/resources/database.properties @@ -0,0 +1,5 @@ +mongo.db.host=192.168.1.41 +mongo.db.port=27018 +mongo.db.dbname=platform +mongo.db.username=platform +mongo.db.password=platform123 \ No newline at end of file diff --git a/platform-sync-data/src/main/resources/spring/applicationContext-mvc.xml b/platform-sync-data/src/main/resources/spring/applicationContext-mvc.xml index ce3fb7a..3a679f9 100644 --- a/platform-sync-data/src/main/resources/spring/applicationContext-mvc.xml +++ b/platform-sync-data/src/main/resources/spring/applicationContext-mvc.xml @@ -8,6 +8,7 @@ default-lazy-init="true"> + + + + + classpath:database.properties + + + + + + + + - + - - + + - +