From 345a0f1941c18a71b5f0219b7979ec6a97b59ab9 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 20 Jul 2016 08:51:29 +0800 Subject: [PATCH] update code --- .../com/lyms/platform/query/SmsTemplateQuery.java | 6 +++ .../platform/data/service/impl/SmsServiceImpl.java | 3 -- .../operate/web/facade/BabyBookbuildingFacade.java | 49 ++++++++++++++++++++ .../operate/web/facade/BookbuildingFacade.java | 52 ++++++++++++++++++++++ 4 files changed, 107 insertions(+), 3 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SmsTemplateQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SmsTemplateQuery.java index 6e9351a..e8760a0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SmsTemplateQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SmsTemplateQuery.java @@ -92,6 +92,12 @@ public class SmsTemplateQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("serviceObj", serviceObj, MongoOper.IS); } + + if (null != specialDateType) { + condition = condition.and("specialDateType", specialDateType, MongoOper.IS); + } + + if (null != status) { condition = condition.and("status", status, MongoOper.IS); } 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 9473367..60f0b4d 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 @@ -1139,9 +1139,6 @@ public class SmsServiceImpl implements SmsService{ } else if (smsType == SmsServiceEnums.CHFCCXTX.getId()) { - //把时间格式成yyyy_MM_dd - String currentDate = DateUtil.getyyyy_MM_dd(new Date()); - //发送频次 Integer sendFreq = template.getSendFrequency(); 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 3e4e83e..1657c1b 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 @@ -51,11 +51,15 @@ public class BabyBookbuildingFacade { @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; + @Autowired private BabyCheckFacade babyCheckFacade; + @Autowired private PersonService personService; + @Autowired + private SmsTemplateService smsTemplateService; public BaseResponse getBabyBase(String babyId){ //查询儿童的基本信息 @@ -234,6 +238,9 @@ public class BabyBookbuildingFacade { br.setErrormsg("失败"); } + //创建建档短信 + createBuildSms(model); + br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(model.getId()); @@ -243,6 +250,48 @@ public class BabyBookbuildingFacade { /** + * 创建建档短信 + */ + private void createBuildSms(BabyModel babyModel) + { + + SmsTemplateQuery query = new SmsTemplateQuery(); + query.setYn(YnEnums.YES.getId()); + query.setHospitalId(babyModel.getHospitalId()); + query.setServiceObj(ServiceObjEnums.BABYOBJ.getId()); + query.setSpecialDateType(SpecialDateEnums.JD.getId()); + + List temps = smsTemplateService.querySmsTemplates(query); + if (CollectionUtils.isNotEmpty(temps)) + { + SmsTemplateModel templateModel = temps.get(0); + MessageListRequest smsList = new MessageListRequest(); + List messages = new ArrayList<>(); + MessageRequest mr = new MessageRequest(); + mr.setContent(templateModel.getContent()); + mr.setObjType(ServiceObjEnums.BABYOBJ.getId()); + mr.setPhone(babyModel.getMphone()); + //短信商 + mr.setServiceType(1);//待定 + mr.setTypeId(1); //待定 + mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); + mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId()); + + mr.setExt1(babyModel.getHospitalId()); + mr.setExt2(templateModel.getId()); + mr.setExt3(babyModel.getId()); + messages.add(mr); + + if (CollectionUtils.isNotEmpty(messages)) { + smsList.setTypeId(1); + smsList.setMessages(messages); + //调用发送接口 TODO + } + } + } + + + /** * 准备修改和添加的孕妇建档数据 * * @param request 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 5982eca..d60d28a 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 @@ -3,12 +3,15 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.dal.IPersonDao; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.PersonService; +import com.lyms.platform.biz.service.SmsTemplateService; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; +import com.lyms.platform.operate.web.request.MessageListRequest; +import com.lyms.platform.operate.web.request.MessageRequest; import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.operate.web.result.BookbuildingRecordResult; import com.lyms.platform.operate.web.result.PregnantInfoResult; @@ -16,8 +19,10 @@ import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.PersonModel; +import com.lyms.platform.pojo.SmsTemplateModel; import com.lyms.platform.query.BasicConfigQuery; import com.lyms.platform.query.PatientsQuery; +import com.lyms.platform.query.SmsTemplateQuery; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -50,6 +55,9 @@ public class BookbuildingFacade { @Autowired private PersonService personService; + @Autowired + private SmsTemplateService smsTemplateService; + /** * 添加孕妇建档 * @param yunRequest @@ -108,6 +116,9 @@ public class BookbuildingFacade { return br; } + + //生成建档短信 + createBuildSms(p); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(p.getId()); @@ -116,6 +127,47 @@ public class BookbuildingFacade { } /** + * 创建建档短信 + */ + private void createBuildSms(Patients patient) + { + + SmsTemplateQuery query = new SmsTemplateQuery(); + query.setYn(YnEnums.YES.getId()); + query.setHospitalId(patient.getHospitalId()); + query.setServiceObj(ServiceObjEnums.YUNOBJ.getId()); + query.setSpecialDateType(SpecialDateEnums.JD.getId()); + + List temps = smsTemplateService.querySmsTemplates(query); + if (CollectionUtils.isNotEmpty(temps)) + { + SmsTemplateModel templateModel = temps.get(0); + MessageListRequest smsList = new MessageListRequest(); + List messages = new ArrayList<>(); + MessageRequest mr = new MessageRequest(); + mr.setContent(templateModel.getContent()); + mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); + mr.setPhone(patient.getPhone()); + //短信商 + mr.setServiceType(1);//待定 + mr.setTypeId(1); //待定 + mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); + mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId()); + + mr.setExt1(patient.getHospitalId()); + mr.setExt2(templateModel.getId()); + mr.setExt3(patient.getId()); + messages.add(mr); + + if (CollectionUtils.isNotEmpty(messages)) { + smsList.setTypeId(1); + smsList.setMessages(messages); + //调用发送接口 TODO + } + } + } + + /** * 更新孕妇信息 * @param id * @param yunRequest -- 1.8.3.1