From 6bc54a479e48d2f2780cc61752620803792bdebc Mon Sep 17 00:00:00 2001 From: landong2015 Date: Mon, 12 Dec 2016 14:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=BB=99=E5=A6=87=E5=A5=B3?= =?UTF-8?q?=E5=8F=91=E9=80=81=E4=B8=AA=E6=80=A7=E5=8C=96=E6=8C=87=E5=AF=BC?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/ResidentsArchiveController.java | 6 +++--- .../lyms/platform/operate/web/facade/ResidentsArchiveFacade.java | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java index b9368b9..2c7a646 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java @@ -141,10 +141,10 @@ public class ResidentsArchiveController extends BaseController { */ @RequestMapping(value = "/sendWomenGuildSms", method = RequestMethod.POST) @ResponseBody -// @TokenRequired + @TokenRequired public BaseResponse womenGuildSms(@RequestBody @Valid WomenGuideSmsRequest womenGuideSmsRequest,HttpServletRequest request){ -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return residentsArchiveFacade.womenGuildSms(womenGuideSmsRequest, null); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return residentsArchiveFacade.womenGuildSms(womenGuideSmsRequest, loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 413f4ab..ee0af92 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -662,7 +662,7 @@ public class ResidentsArchiveFacade{ * @return */ public BaseResponse womenGuildSms(WomenGuideSmsRequest request,Integer userId){ - String hospitalId = "216"; + String hospitalId = ""; //得到当前登录的医院id if (userId != null) { Users dbuser = usersService.getUsers(userId); @@ -671,6 +671,10 @@ public class ResidentsArchiveFacade{ } } + if (StringUtils.isEmpty(hospitalId)){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("医院ID为空"); + } + //判断医院是否启动和对应的服务项是否启用 SmsConfigModel configModel = new SmsConfigModel(); BaseResponse response = smsConfigFacade.hospitalIsStart(hospitalId, configModel, SmsServiceEnums.YSGXHZD.getId()); @@ -702,7 +706,7 @@ public class ResidentsArchiveFacade{ MessageRequest mr = new MessageRequest(); String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, model.getBuildDoctor()); mr.setContent("【" + messagePrefix + "】" + request.getSmsContent()); - mr.setObjType(Integer.valueOf(request.getType())); + mr.setObjType(ServiceObjEnums.FUNV.getId()); mr.setPhone(model.getPhone()); //短信商 mr.setServiceType(SmsProviderEnums.YM.getId()); -- 1.8.3.1