Commit 2cda76001c4fe636e74d5b50d706704bab63cd8c

Authored by jiangjiazhi

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java View file @ 2cda760
... ... @@ -133,7 +133,7 @@
133 133 @RequestMapping(value = "/queryDiagnose", method = RequestMethod.GET)
134 134 @ResponseBody
135 135 public BaseObjectResponse queryDiagnose(@RequestParam(required = true)String keyword) throws UnsupportedEncodingException {
136   - keyword = new String(keyword.getBytes("ISO-8859-1"),"UTF-8");
  136 + // keyword = new String(keyword.getBytes("ISO-8859-1"),"UTF-8");
137 137 return babyBookbuildingFacade.queryDiagnose(keyword);
138 138 }
139 139  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java View file @ 2cda760
... ... @@ -17,7 +17,9 @@
17 17 import org.springframework.stereotype.Controller;
18 18 import org.springframework.web.bind.annotation.*;
19 19  
  20 +import javax.validation.Valid;
20 21  
  22 +
21 23 /**
22 24 * 儿保检查
23 25 */
... ... @@ -39,7 +41,7 @@
39 41 */
40 42 @RequestMapping(method = RequestMethod.POST, value = "/addOrUpBabyCheck")
41 43 @ResponseBody
42   - public BaseResponse addOrUpBabyCheck(@RequestBody BabyCheckRequest request) {
  44 + public BaseResponse addOrUpBabyCheck(@Valid @RequestBody BabyCheckRequest request) {
43 45 if (request != null && !StringUtils.isEmpty(request.getId()))
44 46 {
45 47 return babyCheckFacade.updateBabyCheck(request);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java View file @ 2cda760
... ... @@ -11,6 +11,7 @@
11 11 import org.springframework.stereotype.Controller;
12 12 import org.springframework.web.bind.annotation.*;
13 13  
  14 +import javax.validation.Valid;
14 15 import java.util.List;
15 16 import java.util.Map;
16 17  
17 18  
... ... @@ -30,9 +31,9 @@
30 31 * @param request
31 32 * @return
32 33 */
33   - @RequestMapping(method = RequestMethod.POST, value = "/addSmsConfig")
  34 + @RequestMapping(method = RequestMethod.POST, value = "/addOrUpSmsConfig")
34 35 @ResponseBody
35   - public BaseResponse addSmsConfig(@RequestBody SmsConfigRequest request) {
  36 + public BaseResponse addOrUpSmsConfig(@Valid @RequestBody SmsConfigRequest request) {
36 37 if (!StringUtils.isEmpty(request.getId()))
37 38 {
38 39 return smsConfigFacade.updateSmsConfig(request);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java View file @ 2cda760
... ... @@ -13,7 +13,9 @@
13 13 import org.springframework.stereotype.Controller;
14 14 import org.springframework.web.bind.annotation.*;
15 15  
  16 +import javax.validation.Valid;
16 17  
  18 +
17 19 /**
18 20 * 消息模板配置配置
19 21 * Created by lqy on 2016/6/27.
... ... @@ -31,7 +33,7 @@
31 33 */
32 34 @RequestMapping(method = RequestMethod.POST, value = "/addOrUpSmsTemplate")
33 35 @ResponseBody
34   - public BaseResponse addOrUpSmsTemplate(@RequestBody SmsTemplateRequest request) {
  36 + public BaseResponse addOrUpSmsTemplate(@Valid @RequestBody SmsTemplateRequest request) {
35 37 if (!StringUtils.isEmpty(request.getId()))
36 38 {
37 39 return smsTemplateFacade.updateSmsTemplate(request);