From 45ddbd4911de976b52bf3ffed6216e1ff440073f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 11 Aug 2016 11:48:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E7=9F=AD=E4=BF=A1=E5=8F=91?= =?UTF-8?q?=E9=80=81=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/common/enums/ProjectTypeEnums.java | 39 ++++++++++++++++++++++ .../platform/common/enums/SmsProviderEnums.java | 39 ++++++++++++++++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 18 +++++----- .../operate/web/facade/BookbuildingFacade.java | 10 +++--- .../operate/web/utils/MessageCenterService.java | 20 +++++------ 5 files changed, 104 insertions(+), 22 deletions(-) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/ProjectTypeEnums.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/SmsProviderEnums.java 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 new file mode 100644 index 0000000..fee9ef3 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ProjectTypeEnums.java @@ -0,0 +1,39 @@ +package com.lyms.platform.common.enums; + + + +/** + * 项目类型 + * Created by lqy on 2016/08/11 + */ +public enum ProjectTypeEnums { + + + YNXT(1,"院内系统web版"),QYPT(2,"区域平台"); + + ProjectTypeEnums(int id, String name) { + this.id = id; + this.name = name; + } + + private int id; + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsProviderEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsProviderEnums.java new file mode 100644 index 0000000..3613cbd --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsProviderEnums.java @@ -0,0 +1,39 @@ +package com.lyms.platform.common.enums; + + + +/** + * 短信商 + * Created by lqy on 2016/08/11 + */ +public enum SmsProviderEnums { + + + ALDY(1,"阿里大鱼"),YM(2,"易美"); + + SmsProviderEnums(int id, String name) { + this.id = id; + this.name = name; + } + + private int id; + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + +} 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 923cf36..f92163a 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 @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; @@ -453,8 +454,8 @@ public class BabyBookbuildingFacade { mr.setObjType(ServiceObjEnums.BABYOBJ.getId()); mr.setPhone(babyModel.getMphone()); //短信商 - mr.setServiceType(1);//待定 - mr.setTypeId(1); //待定 + mr.setServiceType(SmsProviderEnums.ALDY.getId()); + mr.setTypeId(ProjectTypeEnums.YNXT.getId()); mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); mr.setSubTypeId(SmsServiceEnums.FWKT.getId()); @@ -464,9 +465,9 @@ public class BabyBookbuildingFacade { messages.add(mr); if (CollectionUtils.isNotEmpty(messages)) { - smsList.setTypeId(1); + smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); smsList.setMessages(messages); - //调用发送接口 TODO + MessageCenterService.saveSmsCenter(smsList); } } } @@ -1394,8 +1395,8 @@ public class BabyBookbuildingFacade { mr.setObjType(ServiceObjEnums.BABYOBJ.getId()); mr.setPhone(model.getMphone()); //短信商 - mr.setServiceType(1);//待定 - mr.setTypeId(1); //待定 + mr.setServiceType(SmsProviderEnums.ALDY.getId()); + mr.setTypeId(ProjectTypeEnums.YNXT.getId()); mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId()); @@ -1406,9 +1407,10 @@ public class BabyBookbuildingFacade { } if (CollectionUtils.isNotEmpty(messages)) { - smsList.setTypeId(1); + smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); smsList.setMessages(messages); - //调用发送接口 TODO + //调用发送接口 + MessageCenterService.saveSmsCenter(smsList); } BaseResponse objectResponse = new BaseResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); 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 e8d9229..e21d55f 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 @@ -14,6 +14,7 @@ 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; +import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; @@ -268,8 +269,8 @@ public class BookbuildingFacade { mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); mr.setPhone(patient.getPhone()); //短信商 - mr.setServiceType(1);//待定 - mr.setTypeId(1); //待定 + mr.setServiceType(SmsProviderEnums.ALDY.getId()); + mr.setTypeId(ProjectTypeEnums.YNXT.getId()); mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); mr.setSubTypeId(SmsServiceEnums.FWKT.getId()); @@ -279,9 +280,10 @@ public class BookbuildingFacade { messages.add(mr); if (CollectionUtils.isNotEmpty(messages)) { - smsList.setTypeId(1); + mr.setTypeId(ProjectTypeEnums.YNXT.getId()); smsList.setMessages(messages); - //调用发送接口 TODO + //调用发送接口 + MessageCenterService.saveSmsCenter(smsList); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java index 4dca111..6dfc021 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java @@ -48,16 +48,16 @@ public class MessageCenterService { */ public static boolean saveSmsCenter(MessageListRequest list) { - String json = JsonUtil.obj2JsonString(list); - String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN); - if (StringUtils.isNotEmpty(result)) - { - Map map = JsonUtil.str2Obj(result, Map.class); - if ("0".equals(map.get("errorcode"))) - { - return true; - } - } +// String json = JsonUtil.obj2JsonString(list); +// String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN); +// if (StringUtils.isNotEmpty(result)) +// { +// Map map = JsonUtil.str2Obj(result, Map.class); +// if ("0".equals(map.get("errorcode"))) +// { +// return true; +// } +// } return false; } -- 1.8.3.1