From 546908d8ac7a5758f9b080969a6800e998dc271d Mon Sep 17 00:00:00 2001 From: landong2015 Date: Wed, 7 Dec 2016 11:17:54 +0800 Subject: [PATCH] update --- .../com/lyms/platform/pojo/PremaritalCheckup.java | 10 ++--- .../web/controller/FolicAcidController.java | 31 +++++++------- .../web/facade/PremaritalCheckupFacade.java | 2 +- .../web/request/PremaritalCheckupAddRequest.java | 10 ++--- .../operate/web/request/WomenGuideSmsRequest.java | 48 ++++++++++++++++++++++ 5 files changed, 73 insertions(+), 28 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/WomenGuideSmsRequest.java diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index 89c546b..9163a66 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -277,7 +277,7 @@ public class PremaritalCheckup extends BaseModel { //血型 private String xueXing; //RH血型 - private String RHXueXing; + private String rhxueXing; //血糖 private String xueTang; /* 肝功能 */ @@ -1303,12 +1303,12 @@ public class PremaritalCheckup extends BaseModel { this.xueXing = xueXing; } - public String getRHXueXing() { - return RHXueXing; + public String getRhxueXing() { + return rhxueXing; } - public void setRHXueXing(String RHXueXing) { - this.RHXueXing = RHXueXing; + public void setRhxueXing(String rhxueXing) { + this.rhxueXing = rhxueXing; } public String getXueTang() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java index a8a8188..c6b895f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java @@ -30,43 +30,40 @@ public class FolicAcidController extends BaseController{ //发放 @RequestMapping(value = "/addOrUpdateFolicAcid", method = RequestMethod.POST) @ResponseBody -// @TokenRequired + @TokenRequired public BaseResponse addOrUpdateFolicAcid(@RequestBody FolicAcidAddRequest folicAcidAddRequest, HttpServletRequest request) { //获取当前登录用户ID -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - - return folicAcidFacade.addOrUpdateFolicAcid(folicAcidAddRequest,1); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return folicAcidFacade.addOrUpdateFolicAcid(folicAcidAddRequest,loginState.getId()); } //获取单个发放记录 @RequestMapping(value = "/getFolicAcid", method = RequestMethod.GET) @ResponseBody -// @TokenRequired + @TokenRequired public BaseObjectResponse getFolicAcid(@Valid FolicAcidQueryRequest folicAcidQueryRequest, HttpServletRequest request) { - return folicAcidFacade.getFolicAcid(folicAcidQueryRequest); } //叶酸发放管理 @RequestMapping(value = "/queryFolicAcid", method = RequestMethod.GET) @ResponseBody -// @TokenRequired + @TokenRequired public BaseListResponse queryFolicAcid(@Valid FolicAcidQueryRequest folicAcidQueryRequest, HttpServletRequest request) { - return folicAcidFacade.queryFolicAcid(folicAcidQueryRequest); } - // - @RequestMapping(value = "/folicAcidExport", method = RequestMethod.GET) - @ResponseBody -// @TokenRequired - public BaseListResponse folicAcidExport(@Valid FolicAcidQueryRequest folicAcidQueryRequest, - HttpServletRequest request) { - - return folicAcidFacade.queryFolicAcid(folicAcidQueryRequest); - } +// // +// @RequestMapping(value = "/folicAcidExport", method = RequestMethod.GET) +// @ResponseBody +//// @TokenRequired +// public BaseListResponse folicAcidExport(@Valid FolicAcidQueryRequest folicAcidQueryRequest, +// HttpServletRequest request) { +// +// return folicAcidFacade.queryFolicAcid(folicAcidQueryRequest); +// } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 0f83fcd..5a833c8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -424,7 +424,7 @@ public class PremaritalCheckupFacade { /* 血型 */ checkup.setXueXing(addRequest.getXueXing()); - checkup.setRHXueXing(addRequest.getRhXueXing()); + checkup.setRhxueXing(addRequest.getRhxueXing()); checkup.setXueTang(addRequest.getXueTang()); /* 肝功能 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java index 8a1845b..7660ff3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java @@ -266,7 +266,7 @@ public class PremaritalCheckupAddRequest { //血型 private String xueXing; //RH血型 - private String rhXueXing; + private String rhxueXing; //血糖 private String xueTang; /* 肝功能 */ @@ -1261,12 +1261,12 @@ public class PremaritalCheckupAddRequest { this.xueXing = xueXing; } - public String getRhXueXing() { - return rhXueXing; + public String getRhxueXing() { + return rhxueXing; } - public void setRhXueXing(String rhXueXing) { - this.rhXueXing = rhXueXing; + public void setRhxueXing(String rhxueXing) { + this.rhxueXing = rhxueXing; } public String getXueTang() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/WomenGuideSmsRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/WomenGuideSmsRequest.java new file mode 100644 index 0000000..f7518a6 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/WomenGuideSmsRequest.java @@ -0,0 +1,48 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; +import org.hibernate.validator.constraints.NotBlank; + +import java.util.List; + +/** + * Created by Administrator on 2016/12/7 0007. + */ +@Form +public class WomenGuideSmsRequest { + + //短信内容 + @FormParam + @NotBlank(message = "短信内容不能为空") + private String smsContent; + + //妇女IDs + private List ids; + //1 妇女 2: 孕妇 3: 产妇 + private String type; + + public String getSmsContent() { + return smsContent; + } + + public void setSmsContent(String smsContent) { + this.smsContent = smsContent; + } + + public List getIds() { + return ids; + } + + public void setIds(List ids) { + this.ids = ids; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } +} -- 1.8.3.1