From a673481244d1b4d4a1e6dba4ce1dfcb32e90a342 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 30 Jun 2016 16:39:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=A8=A1=E6=9D=BF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/biz/dal/ISmsTemplateDao.java | 1 + .../platform/biz/dal/impl/SmsTemplateDaoImpl.java | 7 +- .../platform/biz/service/SmsTemplateService.java | 20 ++++- .../com/lyms/platform/common/enums/ExpEnums.java | 55 ++++++++++++ .../lyms/platform/common/enums/FmTypeEnums.java | 16 ++++ .../lyms/platform/common/enums/SendDateEnums.java | 45 ++++++++-- .../platform/common/enums/SendFrequencyEnums.java | 12 +++ .../lyms/platform/common/enums/SendTimeEnums.java | 12 ++- .../platform/common/enums/ServiceObjEnums.java | 16 ++++ .../platform/common/enums/ServiceStatusEnums.java | 36 ++++++-- .../lyms/platform/common/enums/SexTypeEnums.java | 16 ++++ .../platform/common/enums/SmsServiceEnums.java | 44 ++++++++++ .../platform/common/enums/SpecialDateEnums.java | 54 ++++++++---- .../java/com/lyms/platform/pojo/BabyModel.java | 9 ++ .../com/lyms/platform/query/SmsTemplateQuery.java | 49 +++++++++++ .../web/controller/BabyBookbuildingController.java | 2 +- .../operate/web/controller/EnumsController.java | 99 ++++++++++++++++++++++ .../web/controller/SmsTemplateController.java | 14 ++- .../web/facade/AntenatalExaminationFacade.java | 2 +- .../operate/web/facade/BabyBookbuildingFacade.java | 32 +++++-- .../operate/web/facade/SmsTemplateFacade.java | 87 ++++++++++++++++++- .../web/request/BabyBookbuildingAddRequest.java | 10 +++ .../operate/web/result/BabyBuildResult.java | 11 +++ 23 files changed, 602 insertions(+), 47 deletions(-) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/ExpEnums.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISmsTemplateDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISmsTemplateDao.java index 49b4791..66ace9d 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISmsTemplateDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISmsTemplateDao.java @@ -17,4 +17,5 @@ public interface ISmsTemplateDao { public List querySmsTemplates(MongoQuery mongoQuery); + int queryBabyManageCount(MongoQuery mongoQuery); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SmsTemplateDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SmsTemplateDaoImpl.java index e4ecfe3..323b70f 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SmsTemplateDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SmsTemplateDaoImpl.java @@ -1,12 +1,10 @@ package com.lyms.platform.biz.dal.impl; -import com.lyms.platform.biz.dal.ISmsConfigDao; import com.lyms.platform.biz.dal.ISmsTemplateDao; import com.lyms.platform.common.dao.BaseMongoDAOImpl; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; -import com.lyms.platform.pojo.SmsConfigModel; import com.lyms.platform.pojo.SmsTemplateModel; import org.springframework.stereotype.Repository; @@ -30,4 +28,9 @@ public class SmsTemplateDaoImpl extends BaseMongoDAOImpl imple public List querySmsTemplates(MongoQuery mongoQuery) { return find(mongoQuery.convertToMongoQuery()); } + + @Override + public int queryBabyManageCount(MongoQuery mongoQuery) { + return (int) count(mongoQuery.convertToMongoQuery()); + } } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsTemplateService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsTemplateService.java index d3ad83e..ff3c308 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsTemplateService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsTemplateService.java @@ -2,9 +2,13 @@ package com.lyms.platform.biz.service; import com.lyms.platform.biz.dal.ISmsTemplateDao; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.pojo.SmsTemplateModel; import com.lyms.platform.query.SmsTemplateQuery; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import java.util.List; @@ -25,7 +29,19 @@ public class SmsTemplateService { smsTemplateDao.updateSmsTemplate(model,id); } - public List querySmsTemplates(SmsTemplateQuery query) { - return smsTemplateDao.querySmsTemplates(query.convertToQuery()); + public List querySmsTemplates(SmsTemplateQuery templateQuery) { + MongoQuery query = templateQuery.convertToQuery(); + if (StringUtils.isNotEmpty(templateQuery.getNeed())) { + templateQuery.mysqlBuild(smsTemplateDao.queryBabyManageCount(templateQuery.convertToQuery())); + query.start(templateQuery.getOffset()).end(templateQuery.getLimit()); + } + + return smsTemplateDao.querySmsTemplates(query.addOrder(Sort.Direction.DESC, "created")); + } + + public void deleteTempById(String id) { + SmsTemplateModel model = new SmsTemplateModel(); + model.setYn(YnEnums.NO.getId()); + smsTemplateDao.updateSmsTemplate(model,id); } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ExpEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ExpEnums.java new file mode 100644 index 0000000..961e75d --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ExpEnums.java @@ -0,0 +1,55 @@ +package com.lyms.platform.common.enums; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * + * 体验类型 + * + * @author Administrator + * + */ +public enum ExpEnums { + + SGY(0,"体验3个月服务"),ETFW(1,"体验儿童服务"); + + private ExpEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public static String getNameById(int id){ + for(ExpEnums sex : values()){ + if(id==sex.id){ + return sex.getName(); + } + } + return ""; + } + + public static List getExpEnums() { + List list = new ArrayList<>(); + for (ExpEnums e : ExpEnums.values()) { + Map rootMap = new HashMap(); + rootMap.put("id", e.getId()); + rootMap.put("name", e.getName()); + list.add(rootMap); + } + return list; + } + + private int id; + + private String name; + + public int getId() { + return id; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java index dd836b6..04f670e 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java @@ -1,5 +1,10 @@ package com.lyms.platform.common.enums; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * 分娩方式枚举 *

@@ -13,6 +18,17 @@ public enum FmTypeEnums { this.name = name; } + public static List getFmTypeEnums() { + List list = new ArrayList<>(); + for (FmTypeEnums e : FmTypeEnums.values()) { + Map rootMap = new HashMap(); + rootMap.put("id", e.getId()); + rootMap.put("name", e.getName()); + list.add(rootMap); + } + return list; + } + private String id; private String name; diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SendDateEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SendDateEnums.java index a1a1193..3e75be3 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SendDateEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SendDateEnums.java @@ -13,15 +13,35 @@ import java.util.Map; public enum SendDateEnums { - GL(0,"公历"),NL(1,"农历"),TSRQ(2,"特殊日期"),SLRQ(3,"生理日期"); + GL(0,"公历","0,1,2","0,1"),NL(1,"农历","0,1,2","0,1"),TSRQ(2,"特殊日期","2","1"),SLRQ(3,"生理日期","0","1"); - SendDateEnums(int id, String name) { + SendDateEnums(int id, String name,String freq,String serviceObj) { this.id = id; this.name = name; } private int id; private String name; + //发送频次 + private String freq; + //发送对象 + private String serviceObj; + + public String getFreq() { + return freq; + } + + public void setFreq(String freq) { + this.freq = freq; + } + + public String getServiceObj() { + return serviceObj; + } + + public void setServiceObj(String serviceObj) { + this.serviceObj = serviceObj; + } public String getName() { return name; @@ -40,16 +60,27 @@ public enum SendDateEnums { } - public static List getSendFrequency() { + public static List getSendFrequency(Integer serviceObj,Integer freq) { List list = new ArrayList<>(); for (SendDateEnums e : SendDateEnums.values()) { - Map rootMap = new HashMap(); - rootMap.put("id", e.getId()); - rootMap.put("name", e.getName()); - list.add(rootMap); + if(e.getFreq().contains(String.valueOf(freq)) && e.getServiceObj().contains(String.valueOf(serviceObj))) { + Map rootMap = new HashMap(); + rootMap.put("id", e.getId()); + rootMap.put("name", e.getName()); + list.add(rootMap); + } } return list; } + + public static String getNameById(int id){ + for(SendDateEnums enums:values()){ + if(id==enums.getId()){ + return enums.getName(); + } + } + return ""; + } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SendFrequencyEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SendFrequencyEnums.java index 54b33e9..6b47a99 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SendFrequencyEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SendFrequencyEnums.java @@ -52,4 +52,16 @@ public enum SendFrequencyEnums { } return list; } + + public static String getNameById(Integer id){ + if (id != null) + { + for(SendFrequencyEnums enums:values()){ + if(id==enums.getId()){ + return enums.getName(); + } + } + } + return ""; + } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SendTimeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SendTimeEnums.java index 819590b..425a7cc 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SendTimeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SendTimeEnums.java @@ -13,7 +13,7 @@ import java.util.Map; public enum SendTimeEnums { - DT(0,"当天"),NL(1,"前一天"),TSRQ(2,"前两天"),SLRQ(3,"前三天"); + DT(0,"当天"),QYT(1,"前一天"),QLT(2,"前两天"),QST(3,"前三天"); SendTimeEnums(int id, String name) { this.id = id; @@ -52,4 +52,14 @@ public enum SendTimeEnums { } return list; } + + public static String getNameById(int id) { + for (SendTimeEnums e : SendTimeEnums.values()) { + if(e.getId() == id) + { + return e.getName(); + } + } + return ""; + } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceObjEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceObjEnums.java index 6a66c68..5ae0e7c 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceObjEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceObjEnums.java @@ -51,4 +51,20 @@ public enum ServiceObjEnums { } return list; } + + /** + * 通过id查询 + * @param id + * @return + */ + public static String getServiceObjById(int id) { + + for (ServiceObjEnums e : ServiceObjEnums.values()) { + if (e.getId() == id) + { + return e.getName(); + } + } + return ""; + } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java index a54a52a..1440cd6 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java @@ -21,7 +21,13 @@ public enum ServiceStatusEnums { ADD_OPEN(3,"开通",1), UNSUBSCRIBE(4,"退订",1), SUSPEND(5,"暂停",1), - ADD_OVERDUE(6,"过期",1); + ADD_OVERDUE(6,"过期",1), + + //全部 + ALL(103,"全部",100), + ALL_OPEN(7,"开通",100), + ALL_NO_OPEN(8,"不开通",100), + ALL_OVERDUE(9,"过期",100); private ServiceStatusEnums(int id, String name,int pid){ this.name=name; @@ -51,19 +57,35 @@ public enum ServiceStatusEnums { } - public static List> getServiceStatusAllList() + public static List> getServiceStatusByPid(int pid) { List> list = new ArrayList<>(); for(ServiceStatusEnums s : ServiceStatusEnums.values()) { - Map map = new HashMap<>(); - map.put("id", String.valueOf(s.getId())); - map.put("name", s.getName()); - map.put("pid", String.valueOf(s.getPid())); - list.add(map); + if (s.getPid() == pid) + { + Map map = new HashMap<>(); + map.put("id", String.valueOf(s.getId())); + map.put("name", s.getName()); + map.put("pid", String.valueOf(s.getPid())); + list.add(map); + } + } return list; } + public static String getNameByPid(int id) + { + for(ServiceStatusEnums s : ServiceStatusEnums.values()) { + if (s.getId() == id) + { + return s.getName(); + } + + } + return ""; + } + public String getName() { return name; } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SexTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SexTypeEnums.java index 9fbc3f8..8290832 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SexTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SexTypeEnums.java @@ -1,5 +1,10 @@ package com.lyms.platform.common.enums; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * * 性别枚举 @@ -24,6 +29,17 @@ public enum SexTypeEnums { } return ""; } + + public static List getSexTypeEnums() { + List list = new ArrayList<>(); + for (SexTypeEnums e : SexTypeEnums.values()) { + Map rootMap = new HashMap(); + rootMap.put("id", e.getId()); + rootMap.put("name", e.getName()); + list.add(rootMap); + } + return list; + } private int id; diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java index c7a2894..83f9cd2 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java @@ -110,6 +110,34 @@ public enum SmsServiceEnums { } + + /** + * 只要子节点 + * @param id + * @return + */ + public static List getSmsServiceLeaf(int id) + { + + List list = new ArrayList<>(); + for (SmsServiceEnums e : SmsServiceEnums.values()) { + if(e.getPid() == id) { + Map rootMap = new HashMap(); + rootMap.put("id",e.getId()); + rootMap.put("name",e.getName()); + rootMap.put("pid", e.getPid()); + if (!isLeaf(e.getId())) + { + list.add(rootMap); + } + + + } + } + return list; + + } + /** * 判断是否有子节点 * @param id @@ -144,4 +172,20 @@ public enum SmsServiceEnums { return list; } + + /** + * 通过id查询消息类型名称 + * @param id + * @return + */ + public static String getSmsServiceById(int id) + { + for (SmsServiceEnums e : SmsServiceEnums.values()) { + if(e.getId() == id) { + return e.getName(); + } + } + return ""; + } + } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SpecialDateEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SpecialDateEnums.java index 677e6c2..0f5904f 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SpecialDateEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SpecialDateEnums.java @@ -13,30 +13,42 @@ import java.util.Map; public enum SpecialDateEnums { - JD(0,"建档",2,"0,1,2"), - FWJS(1,"服务结束",2,"0,1,2"), - MMSR(2,"妈妈生日",2,"1"), - ZFSR(3,"丈夫生日",2,"1"), - ETSR(4,"儿童生日",2,"2"), - ETMY(5,"儿童满月",2,"2"), - ETBS(6,"儿童百岁",2,"2"), - FM(7,"分娩",2,"3"), - - YZ(10,"孕周",3,"1"), - ETTS(11,"儿童天数",3,"2"), - ETYL(12,"儿童月龄",3,"2"), - CHTS(13,"产后天数",3,"3"); - SpecialDateEnums(int id, String name,int pid,String serviceObj) { + JD(0,"建档",2,"0,1,2","0"), + FWJS(1,"服务结束",2,"0,1,2","0"), + MMSR(2,"妈妈生日",2,"1","2"), + ZFSR(3,"丈夫生日",2,"1","2"), + ETSR(4,"儿童生日",2,"2","2"), + ETMY(5,"儿童满月",2,"2","0"), + ETBS(6,"儿童百岁",2,"2","0"), + FM(7,"分娩",2,"3","0"), + + YZ(10,"孕周",3,"1","0"), + ETTS(11,"儿童天数",3,"2","0"), + ETYL(12,"儿童月龄",3,"2","0"), + CHTS(13,"产后天数",3,"3","0"); + SpecialDateEnums(int id, String name,int pid,String serviceObj,String freq) { this.id = id; this.name = name; this.pid = pid; this.serviceObj = serviceObj; + this.freq = freq; } + private int id; private String name; private int pid; private String serviceObj; + //发送频次 + private String freq; + + public String getFreq() { + return freq; + } + + public void setFreq(String freq) { + this.freq = freq; + } public int getPid() { return pid; @@ -71,11 +83,21 @@ public enum SpecialDateEnums { } - public static List getSpecialDateByServiceObj(int serviceObj,int sendDateType) { + + public static String getNameById(int id){ + for(SpecialDateEnums enums:values()){ + if(id==enums.getId()){ + return enums.getName(); + } + } + return ""; + } + + public static List getSpecialDateByServiceObj(Integer serviceObj,Integer sendDateType,Integer freq) { List list = new ArrayList<>(); for (SpecialDateEnums e : SpecialDateEnums.values()) { - if(e.getServiceObj().contains(String.valueOf(serviceObj)) && e.getPid() == sendDateType) + if(e.getServiceObj().contains(String.valueOf(serviceObj)) && e.getPid() == sendDateType && e.getFreq().contains(String.valueOf(freq))) { Map rootMap = new HashMap(); rootMap.put("id", e.getId()); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 8e05721..e1900a1 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -183,7 +183,16 @@ public class BabyModel extends BaseModel { private Date nextDate; + //体验类型 + private Integer expType; + public Integer getExpType() { + return expType; + } + + public void setExpType(Integer expType) { + this.expType = expType; + } public Date getNextDate() { return nextDate; 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 183b4ab..5a24611 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 @@ -7,6 +7,8 @@ import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import org.bson.types.ObjectId; +import java.util.Date; + /** * 短信模板配置查询对象 * @@ -28,6 +30,37 @@ public class SmsTemplateQuery extends BaseQuery implements IConvertToNativeQuery private Integer hospitalId; + //发送对象 枚举定义参考 ServiceObjEnums + private Integer serviceObj; + + //服务类型 参见枚举 ServiceTypeEnums + private Integer serviceType; + + //服务状态 参见枚举ServiceStatusEnums + private Integer serviceStatus; + + //消息类型 参见枚举 SmsServiceEnums + private Integer smsType; + + //发送频次 参见枚举 SendFrequencyEnums + private Integer sendFrequency; + + //发送日期类型 参见枚举类 SendDateEnums + private Integer sendDateType; + + + + //特殊日期 发送类型 + private Integer specialDateType; + + + //发送时间 参见枚举类 SendTimeEnums + private Integer sendTimeType; + + //内容 + private String content; + + @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -41,6 +74,22 @@ public class SmsTemplateQuery extends BaseQuery implements IConvertToNativeQuery if (-1 != yn) { condition = condition.and("yn", yn, MongoOper.IS); } + + if (null != smsType) { + condition = condition.and("smsType", smsType, MongoOper.IS); + } + + if (null != serviceType) { + condition = condition.and("serviceType", serviceType, MongoOper.IS); + } + + if (null != serviceObj) { + condition = condition.and("serviceObj", serviceObj, MongoOper.IS); + } + + if (null != content) { + condition = condition.and("content", content, MongoOper.LIKE); + } return condition.toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java index a410c10..d7fe5eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java @@ -159,7 +159,7 @@ public class BabyBookbuildingController extends BaseController{ */ @RequestMapping(value = "/queryBabyList", method = RequestMethod.POST) @ResponseBody - public BaseResponse queryBabyList(@RequestBody BabyManageRequest request){ + public BaseListResponse queryBabyList(@RequestBody BabyManageRequest request){ return babyBookbuildingFacade.queryBabyList(request); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java index 2c190eb..0e84b6a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.enums.*; import com.lyms.platform.permission.model.Organization; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; @@ -190,6 +191,104 @@ public class EnumsController { } return list; } + + + /** + * 获取发送对象 + * @return + */ + @RequestMapping(value = "/getAllServiceObjs", method = RequestMethod.GET) + @ResponseBody + public List getSmsTempEnums() { + return ServiceObjEnums.getServiceObjs(); + } + + + /** + * 服务类型 + * @return + */ + @RequestMapping(value = "/getAllServiceType", method = RequestMethod.GET) + @ResponseBody + public List> getAllServiceType() { + List> list = ServiceTypeEnums.getServiceTypeAllList(); + return list; + } + + /** + * 服务类型 + * @return + */ + @RequestMapping(value = "/getServiceStatusByPid/{pid}", method = RequestMethod.GET) + @ResponseBody + public List> getServiceStatusByPid(@PathVariable("pid") Integer pid) { + List> list = ServiceStatusEnums.getServiceStatusByPid(pid); + return list; + } + + /** + * 获取消息类型 + * @param serviceObjId + * @return + */ + @RequestMapping(value = "/getSmsTypeByObjId/{serviceObjId}", method = RequestMethod.GET) + @ResponseBody + public List getAllServiceStatus(@PathVariable("serviceObjId") Integer serviceObjId) { + List list = SmsServiceEnums.getSmsServiceByServiceObj(serviceObjId); + return list; + } + + /** + * 特殊日期类型查询 + * @param serviceObjId 服务对象 + * @param sendDateType 日期类型 + * @param freq 发送频次 + * @return + */ + @RequestMapping(value = "/getSpecialType/{serviceObjId}/{sendDateType}/{freq}", method = RequestMethod.GET) + @ResponseBody + public List getSpecialType(@PathVariable("serviceObjId") Integer serviceObjId,@PathVariable("sendDateType") Integer sendDateType,@PathVariable("freq") Integer freq) { + List list =SpecialDateEnums.getSpecialDateByServiceObj(serviceObjId, sendDateType,freq); + return list; + } + + + /** + * 发送时间类型 + * @param serviceObjId 服务短信 + * @param freq 发送频次 + * @return + */ + @RequestMapping(value = "/getDateType/{serviceObjId}/{freq}", method = RequestMethod.GET) + @ResponseBody + public List getDateType(@PathVariable("serviceObjId") Integer serviceObjId,@PathVariable("freq") Integer freq) { + List list =SendDateEnums.getSendFrequency(serviceObjId,freq); + return list; + } + + + /** + * 获取发送频率 + * @return + */ + @RequestMapping(value = "/getSendFrequency", method = RequestMethod.GET) + @ResponseBody + public List getSendFrequency() { + List list =SendFrequencyEnums.getSendFrequency(); + return list; + } + + /** + * 发送时间 + * @return + */ + @RequestMapping(value = "/getSendTime", method = RequestMethod.GET) + @ResponseBody + public List getSendTime() { + List list =SendTimeEnums.getSendTime(); + return list; + } + public static void main(String a[]) { for (PatientsTypeEnum e : PatientsTypeEnum.values()) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java index 987669f..9a7929f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; @@ -57,8 +58,19 @@ public class SmsTemplateController extends BaseController { */ @RequestMapping(method = RequestMethod.POST, value = "/querySmsTempList") @ResponseBody - public BaseObjectResponse querySmsTemps(@RequestBody SmsTemplateRequest request) { + public BaseListResponse querySmsTemps(@RequestBody SmsTemplateRequest request) { return smsTemplateFacade.querySmsTemps(request); } + + /** + * 删除模板 + * @param id + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/deleteTempById/{id}") + @ResponseBody + public BaseResponse deleteTempById(@PathVariable("id") String id) { + return smsTemplateFacade.deleteTempById(id); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index c3ed117..9a17357 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -273,7 +273,7 @@ public class AntenatalExaminationFacade { map.put("organizations",convert()); return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - private List convert(){ + public List convert(){ List organization = organizationService.queryHospital(); List data = new ArrayList(); if(CollectionUtils.isNotEmpty(organization)){ 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 836f6f6..35efa77 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 @@ -2,9 +2,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.ServiceStatusEnums; -import com.lyms.platform.common.enums.ServiceTypeEnums; -import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; @@ -25,7 +23,6 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.management.StringValueExp; import java.util.*; /** @@ -55,6 +52,8 @@ public class BabyBookbuildingFacade { @Autowired private YunBookbuildingService yunBookbuildingService; + @Autowired + private AntenatalExaminationFacade antenatalExaminationFacade; /** * 修改儿童建档 @@ -244,6 +243,7 @@ public class BabyBookbuildingFacade { bm.setHospitalId(b.getHospitalId()); bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgar())); + bm.setExpType(b.getExpType()); bm.setCurrentHighRisk(b.getHighRisk()); @@ -347,6 +347,7 @@ public class BabyBookbuildingFacade { result.setServiceType(String.valueOf(model.getServiceType())); result.setVcCardNo(model.getVcCardNo()); result.setHospitalId(model.getHospitalId()); + result.setExpType(model.getExpType()); return result; } @@ -409,6 +410,24 @@ public class BabyBookbuildingFacade { List serviceStatus = ServiceStatusEnums.getServiceStatusList(); map.put("serviceStatus", serviceStatus); + //医院 + List hospitals = antenatalExaminationFacade.convert(); + map.put("hospitals", hospitals); + + //分娩方式 + List fmType = FmTypeEnums.getFmTypeEnums(); + map.put("fmType", fmType); + + //性别 + List sexType = SexTypeEnums.getSexTypeEnums(); + map.put("sexType", sexType); + + //体验类型 + List expType = ExpEnums.getExpEnums(); + map.put("expType", expType); + + + BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(map); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -597,7 +616,7 @@ public class BabyBookbuildingFacade { * @param request * @return */ - public BaseResponse queryBabyList(BabyManageRequest request) { + public BaseListResponse queryBabyList(BabyManageRequest request) { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setYn(YnEnums.YES.getId()); @@ -651,9 +670,10 @@ public class BabyBookbuildingFacade { list.add(result); } } - BaseObjectResponse objectResponse = new BaseObjectResponse(); + BaseListResponse objectResponse = new BaseListResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setData(list); + objectResponse.setPageInfo(babyQuery.getPageInfo()); objectResponse.setErrormsg("成功"); return objectResponse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java index 82b1159..3cf1ed4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java @@ -2,7 +2,8 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.SmsTemplateService; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.enums.*; +import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; @@ -146,7 +147,87 @@ public class SmsTemplateFacade { * @param request * @return */ - public BaseObjectResponse querySmsTemps(SmsTemplateRequest request) { - return null; + public BaseListResponse querySmsTemps(SmsTemplateRequest request) { + + SmsTemplateQuery query = new SmsTemplateQuery(); + query.setYn(YnEnums.YES.getId()); + query.setNeed("1"); + if (request.getServiceObj() != null && request.getServiceObj() == 0) + { + //查询全部 + request.setServiceObj(null); + } + +// if (request.getSmsType() != null && request.getSmsType() == 0) +// { +// +// } + if (request.getServiceType() != null && request.getServiceType() == 100) + { + request.setServiceType(null); + } + + if (request.getServiceStatus() != null && (request.getServiceStatus() == 101 || request.getServiceStatus() == 102 || request.getServiceStatus() == 103)) + { + request.setServiceType(null); + } + + List templates = smsTemplateService.querySmsTemplates(query); + List results = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(templates)) + { + for(SmsTemplateModel temp : templates) + { + Map result = new HashMap(); + result.put("id",temp.getId()); + result.put("smsTypeName", SmsServiceEnums.getSmsServiceById(temp.getSmsType())); + + String serviceObjName = ServiceObjEnums.getServiceObjById(temp.getServiceObj()); + + result.put("serviceObjName", serviceObjName); + result.put("serviceTypeName", ServiceTypeEnums.getTitleById(temp.getServiceType())); + + result.put("serviceStatusName", ServiceStatusEnums.getNameByPid(temp.getServiceStatus())); + result.put("content", temp.getContent()); + + //发送频次 + Integer sendFreq = temp.getSendFrequency(); + + String sendDate = SendDateEnums.getNameById(temp.getSendDateType()); + + + String dateRange = temp.getStart() == null ? "" : (temp.getStart() + " "+ temp.getEnd()); + + String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType()); + String str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate+" "+splDate+ " " +dateRange; + + + + result.put("sendDate",str); + result.put("sendTimes", SendTimeEnums.getNameById(temp.getSendTimeType())); + result.put("status",temp.getStatus() == 0 ? "未启用" : "启用"); + } + } + + BaseListResponse objectResponse = new BaseListResponse(); + objectResponse.setData(results); + objectResponse.setPageInfo(query.getPageInfo()); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + + } + + /** + * 删除模板 + * @param id + * @return + */ + public BaseResponse deleteTempById(String id) { + smsTemplateService.deleteTempById(id); + BaseResponse objectResponse = new BaseResponse(); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index 90cc02e..83fac25 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -124,6 +124,9 @@ public class BabyBookbuildingAddRequest { //会员截止时间 private String vipEndTime; + //体验类型 + private Integer expType; + //高危因素 //private String highRiskReason; @@ -137,6 +140,13 @@ public class BabyBookbuildingAddRequest { this.deliverOrg = deliverOrg; } + public Integer getExpType() { + return expType; + } + + public void setExpType(Integer expType) { + this.expType = expType; + } public Integer getServiceStatus() { return serviceStatus; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index 79c379a..6f0260c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -126,6 +126,17 @@ public class BabyBuildResult { //是否高危 0 非高危 1高危 private Integer highRisk; + //体验类型 + private Integer expType; + + public Integer getExpType() { + return expType; + } + + public void setExpType(Integer expType) { + this.expType = expType; + } + public String getMremark() { return mremark; } -- 1.8.3.1