fangcheng / regional-platform

Download as
Browse Code »

Commit 78a5bf093133ccb8a593cffeeb05f2699070a046

Authored by jiangjiazhi
2 parents c884211fb1 75ce25b288
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java View file @ 78a5bf0
1 1 package com.lyms.platform.data.controller;
2 2  
  3 +import com.lyms.platform.common.utils.ResultUtils;
3 4 import com.lyms.platform.data.service.SmsService;
4 5 import org.springframework.beans.factory.annotation.Autowired;
5 6 import org.springframework.stereotype.Controller;
6 7 import org.springframework.web.bind.annotation.RequestMapping;
  8 +import org.springframework.web.bind.annotation.RequestParam;
7 9  
8 10 import javax.servlet.http.HttpServletResponse;
9 11  
... ... @@ -21,7 +23,14 @@
21 23 * @param response
22 24 */
23 25 @RequestMapping(value = "/template")
24   - public void productSms(HttpServletResponse response){
  26 + public void productSms(HttpServletResponse response,@RequestParam("token")String token){
  27 +
  28 + if (!"lyms@2016!000".equals(token))
  29 + {
  30 + ResultUtils.buildParameterErrorResultAndWrite(response, "没有token");
  31 + return;
  32 + }
  33 +
25 34 smsService.productTemplateSms();
26 35 smsService.productChanAmsSms();
27 36 smsService.productYunAmsSms();
28 37  
29 38  
30 39  
... ... @@ -30,25 +39,45 @@
30 39 }
31 40  
32 41 @RequestMapping(value = "/smsTemplate")
33   - public void smsTemplate(HttpServletResponse response){
  42 + public void smsTemplate(HttpServletResponse response,@RequestParam("token")String token){
  43 + if (!"lyms@2016!000".equals(token))
  44 + {
  45 + ResultUtils.buildParameterErrorResultAndWrite(response, "没有token");
  46 + return;
  47 + }
34 48 smsService.productTemplateSms();
35 49 writeString(response, "sms template success");
36 50 }
37 51  
38 52 @RequestMapping(value = "/productChanAmsSms")
39   - public void productChanAmsSms(HttpServletResponse response){
  53 + public void productChanAmsSms(HttpServletResponse response,@RequestParam("token")String token){
  54 + if (!"lyms@2016!000".equals(token))
  55 + {
  56 + ResultUtils.buildParameterErrorResultAndWrite(response, "没有token");
  57 + return;
  58 + }
40 59 smsService.productChanAmsSms();
41 60 writeString(response, "chan ams success");
42 61 }
43 62  
44 63 @RequestMapping(value = "/productYunAmsSms")
45   - public void productYunAmsSms(HttpServletResponse response){
  64 + public void productYunAmsSms(HttpServletResponse response,@RequestParam("token")String token){
  65 + if (!"lyms@2016!000".equals(token))
  66 + {
  67 + ResultUtils.buildParameterErrorResultAndWrite(response, "没有token");
  68 + return;
  69 + }
46 70 smsService.productYunAmsSms();
47 71 writeString(response, "yun ams success");
48 72 }
49 73  
50 74 @RequestMapping(value = "/productChildAmsSms")
51   - public void productChildAmsSms(HttpServletResponse response){
  75 + public void productChildAmsSms(HttpServletResponse response,@RequestParam("token")String token){
  76 + if (!"lyms@2016!000".equals(token))
  77 + {
  78 + ResultUtils.buildParameterErrorResultAndWrite(response, "没有token");
  79 + return;
  80 + }
52 81 smsService.productChildAmsSms();
53 82 writeString(response, "child ams success");
54 83 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java View file @ 78a5bf0
... ... @@ -171,6 +171,7 @@
171 171 @RequestParam(value = "nextDate", required = false) String nextDate,
172 172 @RequestParam(value = "expVip", required = false) Integer expVip,
173 173 @RequestParam(value = "serviceType", required = false) Integer serviceType,
  174 + @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus,
174 175 @RequestParam(value = "name", required = false) String name,
175 176 @RequestParam(value = "highRiskType", required = false) Integer highRiskType,
176 177 @RequestParam(value = "diagnose", required = false) String diagnose,
... ... @@ -192,6 +193,7 @@
192 193 request.setName(name);
193 194 request.setLimit(limit);
194 195 request.setPage(page);
  196 + request.setServiceStatus(serviceStatus);
195 197  
196 198 return babyBookbuildingFacade.queryBabyList(request,loginState.getId());
197 199 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 78a5bf0
... ... @@ -1523,6 +1523,7 @@
1523 1523 result.setMommnyPhone(StringUtils.emptyDeal(model.getMphone()));
1524 1524 result.setMommnyEncryptPhone(StringUtils.encryPhone(model.getMphone()));
1525 1525 result.setServiceStatus(StringUtils.emptyDeal(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus())));
  1526 + result.setServiceType(StringUtils.emptyDeal(model.getServiceType() == null ? "" : ServiceTypeEnums.getTitleById(model.getServiceType())));
1526 1527 result.setNextDate(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate())));
1527 1528 result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date())));
1528 1529 result.setPatientId(model.getParentId());
... ... @@ -1628,6 +1629,13 @@
1628 1629  
1629 1630 if (request.getServiceType() != null && request.getServiceType() != 100) {
1630 1631 babyQuery.setServiceType(request.getServiceType());
  1632 + }
  1633 +
  1634 + if (request.getServiceStatus() != null) {
  1635 + if (!(request.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId() || request.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()))
  1636 + {
  1637 + babyQuery.setServiceStatus(request.getServiceStatus());
  1638 + }
1631 1639 }
1632 1640  
1633 1641 if (request.getExpVip() != null && request.getExpVip() == 1) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java View file @ 78a5bf0
... ... @@ -33,6 +33,9 @@
33 33 //服务状态
34 34 private String serviceStatus;
35 35  
  36 + //服务类型
  37 + private String serviceType;
  38 +
36 39 //是否高危
37 40 private String highRisk;
38 41  
... ... @@ -41,6 +44,14 @@
41 44  
42 45 //诊断
43 46 private String diagnose;
  47 +
  48 + public String getServiceType() {
  49 + return serviceType;
  50 + }
  51 +
  52 + public void setServiceType(String serviceType) {
  53 + this.serviceType = serviceType;
  54 + }
44 55  
45 56 public String getMommnyEncryptPhone() {
46 57 return mommnyEncryptPhone;