From fca05cee65321e0cb68c319fac3b6adacd38a5d5 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 25 Dec 2017 14:21:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=A8=A1=E6=9D=BF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/SmsTemplateModel.java | 10 ++++++++++ .../java/com/lyms/platform/query/SmsTemplateQuery.java | 16 ++++++++++++++++ .../platform/operate/web/facade/SmsTemplateFacade.java | 8 ++++---- .../platform/operate/web/request/SmsTemplateRequest.java | 11 +++++++++++ .../platform/operate/web/result/SmsTemplateResult.java | 11 +++++++++++ 5 files changed, 52 insertions(+), 4 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java index 27fe43b..c0a6daf 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java @@ -61,8 +61,18 @@ public class SmsTemplateModel extends BaseModel { private Integer status; + //模板类型 0推送 1短信 + private Integer templateType; private Integer yn; + public Integer getTemplateType() { + return templateType; + } + + public void setTemplateType(Integer templateType) { + this.templateType = templateType; + } + public Integer getStatus() { return status; } 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 e8760a0..8df316f 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 @@ -63,6 +63,10 @@ public class SmsTemplateQuery extends BaseQuery implements IConvertToNativeQuery //启用状态 0未启用 1启用 private Integer status; + //模板类型 0推送 1短信 + private Integer templateType; + + @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -102,6 +106,10 @@ public class SmsTemplateQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("status", status, MongoOper.IS); } + if (null != templateType) { + condition = condition.and("templateType", templateType, MongoOper.IS); + } + if (null != content) { condition = condition.and("content", content, MongoOper.LIKE); @@ -109,6 +117,14 @@ public class SmsTemplateQuery extends BaseQuery implements IConvertToNativeQuery return condition.toMongoQuery(); } + public Integer getTemplateType() { + return templateType; + } + + public void setTemplateType(Integer templateType) { + this.templateType = templateType; + } + public String getId() { return id; } 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 51bfd82..a187b30 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 @@ -114,15 +114,14 @@ public class SmsTemplateFacade { model.setSendFrequency(request.getSendFrequency()); model.setServiceObj(request.getServiceObj()); model.setSendTimeType(request.getSendTimeType()); - model.setServiceType(request.getServiceType()); model.setServiceStatus(request.getServiceStatus()); model.setSmsType(request.getSmsType()); model.setStart(request.getStart()); model.setEnd(request.getEnd()); model.setSpecialDateType(request.getSpecialDateType()); - model.setStatus(request.getStatus()); + model.setTemplateType(request.getTemplateType()); return model; } @@ -190,8 +189,8 @@ public class SmsTemplateFacade { result.setStart(model.getStart()); result.setEnd(model.getEnd()); result.setSpecialDateType(model.getSpecialDateType()); - result.setStatus(model.getStatus()); + result.setTemplateType(model.getTemplateType()); return result; } @@ -214,6 +213,7 @@ public class SmsTemplateFacade { query.setContent(request.getContent()); query.setServiceObj(request.getServiceObj()); query.setHospitalId(request.getHospitalId()); + query.setTemplateType(request.getTemplateType()); if (request.getServiceObj() != null && request.getServiceObj() == 0) { //查询全部 @@ -285,11 +285,11 @@ public class SmsTemplateFacade { str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange; } - result.put("sendDate",str); result.put("sendTimes", SendTimeEnums.getNameById(temp.getSendTimeType())); result.put("status",(temp.getStatus() == null || temp.getStatus() == 0 ) ? "未启用" : "启用"); result.put("model",getSmsTemplateResult(temp)); + result.put("templateType",(temp.getTemplateType() == null || temp.getTemplateType() == 0 ) ? "推送" : "短信"); results.add(result); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java index 681c37b..1137de8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java @@ -64,6 +64,17 @@ public class SmsTemplateRequest extends BaseQuery { //启用状态 0未启用 1启用 private Integer status; + //模板类型 0推送 1短信 + private Integer templateType; + + public Integer getTemplateType() { + return templateType; + } + + public void setTemplateType(Integer templateType) { + this.templateType = templateType; + } + public Integer getStatus() { return status; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsTemplateResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsTemplateResult.java index 34cd8f0..a23135f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsTemplateResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsTemplateResult.java @@ -49,6 +49,17 @@ public class SmsTemplateResult { //启用状态 0未启用 1启用 private Integer status; + //模板类型 0推送 1短信 + private Integer templateType; + + public Integer getTemplateType() { + return templateType; + } + + public void setTemplateType(Integer templateType) { + this.templateType = templateType; + } + public Integer getStatus() { return status; } -- 1.8.3.1