From 8158d6ede6b529eb894c2c6998c8727ff45b8aed Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 13 Sep 2016 15:16:05 +0800 Subject: [PATCH] code update --- .../platform/common/enums/ProjectTypeEnums.java | 2 +- .../lyms/platform/common/utils/StringUtils.java | 12 +- .../platform/data/service/impl/SmsServiceImpl.java | 35 +++--- .../lyms/platform/data/util/AmsMessageService.java | 2 +- .../src/main/resources/config.properties | 2 +- .../operate/web/facade/BabyBookbuildingFacade.java | 92 ++++++++++++++- .../operate/web/facade/BookbuildingFacade.java | 131 +-------------------- .../operate/web/facade/MatDeliverFacade.java | 4 + .../platform/operate/web/facade/PatientFacade.java | 2 +- .../operate/web/facade/SmsConfigFacade.java | 4 +- .../src/main/resources/config.properties | 2 +- 11 files changed, 133 insertions(+), 155 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ProjectTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ProjectTypeEnums.java index 7d8cb76..8866a8d 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ProjectTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ProjectTypeEnums.java @@ -9,7 +9,7 @@ package com.lyms.platform.common.enums; public enum ProjectTypeEnums { - YNXT(4,"院内系统web版"),QYPT(5,"区域平台"); + YNXT(5,"院内系统web版"),QYPT(4,"区域平台"); ProjectTypeEnums(int id, String name) { this.id = id; diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java index b592e86..7407cdd 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java @@ -163,7 +163,17 @@ public final class StringUtils { { if (StringUtils.isNotEmpty(repalceStr)) { - return repalceStr.replace("{{姓名}}",name); + return repalceStr.replace("{{姓名}}", name); + } + return repalceStr; + } + + public static String replaceBaby(String name,Date birth,String repalceStr) + { + if (StringUtils.isNotEmpty(repalceStr)) + { + String date = DateUtil.getyyyy_MM_dd(birth); + return repalceStr.replace("{{姓名}}",name).replace("{{出生日期}}",date); } return repalceStr; } diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index 96e2aa6..6fa9063 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -1577,23 +1577,24 @@ public class SmsServiceImpl implements SmsService{ } } //产妇为分娩日期 - else if (sendDateType == SendDateEnums.TSRQ.getId()) - { - Integer specialDateType = template.getSpecialDateType(); - if (specialDateType == SpecialDateEnums.FM.getId()) - { - //分娩都为分娩后第二天发送短信 - Date dueDate = DateUtil.addDay(new Date(),-1); - //把时间格式化成 yyyy_MM_dd 的日期 - dueDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(dueDate)); - - patientsQuery.setDueDateStart(dueDate); - patientsQuery.setDueDateEnd(dueDate); - - messages.addAll(getChanMessageRequestList(patientsQuery, config, template)); - } - - } + //在填写分娩记录处生成 +// else if (sendDateType == SendDateEnums.TSRQ.getId()) +// { +// Integer specialDateType = template.getSpecialDateType(); +// if (specialDateType == SpecialDateEnums.FM.getId()) +// { +// //分娩都为分娩后第二天发送短信 +// Date dueDate = DateUtil.addDay(new Date(),-1); +// //把时间格式化成 yyyy_MM_dd 的日期 +// dueDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(dueDate)); +// +// patientsQuery.setDueDateStart(dueDate); +// patientsQuery.setDueDateEnd(dueDate); +// +// messages.addAll(getChanMessageRequestList(patientsQuery, config, template)); +// } +// +// } } } 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 cd6b0bd..337ec60 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("245", + getMessageTemplateMap("44288137-ccde-4a11-9eeb-839450320e12", AmsServiceTypeEnum.CHILD_GUIDE); } diff --git a/platform-data-api/src/main/resources/config.properties b/platform-data-api/src/main/resources/config.properties index 6225809..e817c6f 100644 --- a/platform-data-api/src/main/resources/config.properties +++ b/platform-data-api/src/main/resources/config.properties @@ -2,4 +2,4 @@ center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/ #区域平台访问短信中心的token -center_token=YMer2016 \ No newline at end of file +center_token=e0c56363-00d6-42ee-bbe0-23c553583062 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index ce88b92..c0359c3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -486,12 +486,12 @@ public class BabyBookbuildingFacade { /** * 创建建档短信 */ - private void createBuildSms(BabyModel babyModel) + public void createBuildSms(BabyModel babyModel) { //判断医院是否启动和对应的服务项是否启用 SmsConfigModel configModel = new SmsConfigModel(); - BaseResponse response = smsConfigFacade.hospitalIsStart(babyModel.getHospitalId(),configModel); + BaseResponse response = smsConfigFacade.hospitalIsStart(babyModel.getHospitalId(),configModel,SmsServiceEnums.FWKT.getId()); if (response != null) { return; @@ -609,7 +609,7 @@ public class BabyBookbuildingFacade { List messages = new ArrayList<>(); MessageRequest mr = new MessageRequest(); String content = "【" + messagePrefix + "】" + templateModel.getContent(); - mr.setContent(StringUtils.replaceName(babyModel.getName(),content)); + mr.setContent(StringUtils.replaceBaby(babyModel.getName(),babyModel.getBirth(),content)); mr.setObjType(ServiceObjEnums.BABYOBJ.getId()); mr.setPhone(babyModel.getMphone()); //短信商 @@ -640,6 +640,90 @@ public class BabyBookbuildingFacade { } + public static void main(String[] args) + { + + Integer serviceType = 1; + Integer serviceStatus = 3; + List sendList = new ArrayList<>(); + List temps = new ArrayList<>(); + + SmsTemplateModel model = new SmsTemplateModel(); + model.setServiceType(100); + model.setServiceStatus(7); + temps.add(model); + + if (CollectionUtils.isNotEmpty(temps)) { + + for (SmsTemplateModel temp : temps) { + if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { + sendList.add(temp); + break; + } + } + + for (SmsTemplateModel temp : temps) { + if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) { + if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId()) { + sendList.add(temp); + break; + } + } + } + + for (SmsTemplateModel temp : temps) { + if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) { + if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() + || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.SUSPEND.getId()) { + sendList.add(temp); + break; + } + } + } + + + for (SmsTemplateModel temp : temps) { + if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) { + if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId()) { + sendList.add(temp); + break; + } + } + } + + + for (SmsTemplateModel temp : temps) { + if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) { + if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()) { + sendList.add(temp); + break; + } + } + } + + + for (SmsTemplateModel temp : temps) { + if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) { + if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()) { + sendList.add(temp); + break; + } + } + } + + + for (SmsTemplateModel temp : temps) { + if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) { + sendList.add(temp); + break; + } + } + + System.out.print(sendList.size()); + } + } + + /** @@ -1556,7 +1640,7 @@ public class BabyBookbuildingFacade { //判断医院是否启动和对应的服务项是否启用 SmsConfigModel configModel = new SmsConfigModel(); - BaseResponse response = smsConfigFacade.hospitalIsStart(hospitalId,configModel); + BaseResponse response = smsConfigFacade.hospitalIsStart(hospitalId,configModel,SmsServiceEnums.YSGXHZD.getId()); if (response != null) { return response; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index b4a75a7..dcb52ef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -242,44 +242,10 @@ public class BookbuildingFacade { private void createBuildSms(Patients patient) { - OrganizationQuery orgQuery = new OrganizationQuery(); - orgQuery.setYn(YnEnums.YES.getId()); - orgQuery.setId(Integer.parseInt(patient.getHospitalId())); - List list = organizationService.queryOrganization(orgQuery); - boolean isRunning = false; - if (CollectionUtils.isNotEmpty(list)) - { - Organization org = list.get(0); - if (org != null) - { - Integer status = org.getStatus(); - if (status != null && (status == HospitalStatusEnums.SYX.getId() || status == HospitalStatusEnums.ZSYX.getId())) - { - isRunning = true; - } - } - } - if (!isRunning) - { - return; - } - - SmsConfigQuery configQuery = new SmsConfigQuery(); - configQuery.setYn(YnEnums.YES.getId()); - configQuery.setHospitalId(patient.getHospitalId()); - //查询出对应医院配置 - List configs = smsConfigService.querySmsConfig(configQuery); - boolean isStart = false; - if (CollectionUtils.isNotEmpty(configs)) - { - String serviceStr = configs.get(0).getSmsService(); - if (StringUtils.isNotEmpty(serviceStr)) - { - isStart = isStartService(SmsServiceEnums.FWKT.getId(), serviceStr); - } - - } - if (!isStart) + //判断医院是否启动和对应的服务项是否启用 + SmsConfigModel configModel = new SmsConfigModel(); + BaseResponse response = smsConfigFacade.hospitalIsStart(patient.getHospitalId(),configModel,SmsServiceEnums.FWKT.getId()); + if (response != null) { return; } @@ -338,98 +304,11 @@ public class BookbuildingFacade { } } - -// for (SmsTemplateModel temp : temps) -// { -// if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) -// { -// sendList.add(temp); -// break; -// } -// } -// -// for (SmsTemplateModel temp : temps) -// { -// if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) -// { -// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() ) -// { -// sendList.add(temp); -// break; -// } -// } -// } -// -// for (SmsTemplateModel temp : temps) -// { -// if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) -// { -// if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() -// || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()|| serviceStatus == ServiceStatusEnums.SUSPEND.getId()) -// { -// sendList.add(temp); -// break; -// } -// } -// } -// -// -// for (SmsTemplateModel temp : temps) -// { -// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) -// { -// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() ) -// { -// sendList.add(temp); -// break; -// } -// } -// } -// -// -// -// for (SmsTemplateModel temp : temps) -// { -// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) -// { -// if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() ) -// { -// sendList.add(temp); -// break; -// } -// } -// } -// -// -// -// for (SmsTemplateModel temp : temps) -// { -// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) -// { -// if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() ) -// { -// sendList.add(temp); -// break; -// } -// } -// } -// -// -// -// for (SmsTemplateModel temp : temps) -// { -// if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) -// { -// sendList.add(temp); -// break; -// } -// } - if (CollectionUtils.isNotEmpty(sendList)) { //短信前缀 - String messagePrefix = smsConfigFacade.getSmsPrefix(configs.get(0), patient.getBookbuildingDoctor()); + String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, patient.getBookbuildingDoctor()); for (SmsTemplateModel templateModel : sendList) { if (templateModel != null && templateModel.getStatus() == 1) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index d425ede..c1e4fa0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -55,6 +55,9 @@ public class MatDeliverFacade { @Autowired private StopPregnancyService stopPregnancyService; + @Autowired + private BabyBookbuildingFacade babyBookbuildingFacade; + private static Map ONE_ENUMS = new HashMap<>(); private static Map babyMap = new HashMap<>(); @@ -468,6 +471,7 @@ public class MatDeliverFacade { babyModel.setPid(personService.addPerson(personModel).getId()); } babyIds.add(babyService.addOneBaby(babyModel).getId()); + babyBookbuildingFacade.createBuildSms(babyModel); i++; } maternalDeliverModel.setBaby(babyList); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 8fdbde6..e3a6b26 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -522,7 +522,7 @@ public class PatientFacade { //判断医院是否启动和对应的服务项是否启用 SmsConfigModel configModel = new SmsConfigModel(); - BaseResponse response = smsConfigFacade.hospitalIsStart(hospital,configModel); + BaseResponse response = smsConfigFacade.hospitalIsStart(hospital,configModel,SmsServiceEnums.YSGXHZD.getId()); if (response != null) { return response; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java index dc9c6f1..121eb1e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java @@ -716,7 +716,7 @@ public class SmsConfigFacade { } - public BaseResponse hospitalIsStart(String hospitalId,SmsConfigModel configModel) + public BaseResponse hospitalIsStart(String hospitalId,SmsConfigModel configModel,int service) { OrganizationQuery orgQuery = new OrganizationQuery(); orgQuery.setYn(YnEnums.YES.getId()); @@ -755,7 +755,7 @@ public class SmsConfigFacade { String serviceStr = configs.get(0).getSmsService(); if (StringUtils.isNotEmpty(serviceStr)) { - isStart = isStartService(SmsServiceEnums.FWKT.getId(), serviceStr); + isStart = isStartService(service, serviceStr); } } if (!isStart) diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index ffd9217..30b762f 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -2,7 +2,7 @@ center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/ #区域平台访问短信中心的token -center_token=YMer2016 +center_token=e0c56363-00d6-42ee-bbe0-23c553583062 #His系统版本 0：未使用，1：桓台，2：新乐 his_version=0 \ No newline at end of file -- 1.8.3.1