From bae47a3ff19ceb8e615e5a21b71a922f38452e11 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 29 Jan 2019 11:35:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E8=90=A5=E5=85=BB=E6=8A=A5?= =?UTF-8?q?=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/utils/HttpClientUtil.java | 13 +++++---- .../web/controller/BabyNutritionController.java | 31 ++++++++++++++++------ .../operate/web/facade/BabyNutritionFacade.java | 22 ++++++++++++++- .../src/main/resources/config.properties | 3 +++ 4 files changed, 53 insertions(+), 16 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java index 9e6fca8..cf5bf48 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java @@ -226,13 +226,12 @@ public class HttpClientUtil { public static void main(String[] args) throws Exception { Map map = new HashMap(); + map.put("categoryId","1"); map.put("page","1"); - map.put("limit","10"); - map.put("patientIds", "5ab064e9e4b087666f0621d7"); - long start = System.currentTimeMillis(); - String s = doGet("https://area-weihai-api.healthbaby.com.cn:12356/getAppLis", map, "utf-8", "3d19960bf3e81e7d816c4f26051c49ba"); - System.out.println(s); - long end = System.currentTimeMillis(); - System.out.print(end -start); + map.put("limit","1000"); +// map.put("nutritionId",nutritionId); +// map.put("title", title); + String s = HttpClientUtil.doGet("http://ams.api.stage.healthbaby.com.cn/v1/foods", map, "utf-8", "3d19960bf3e81e7d816c4f26051c49ba"); + System.out.println(s ); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java index 2d4f612..07cbf68 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java @@ -3,17 +3,10 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; -import com.lyms.platform.common.base.LoginContext; -import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.utils.StringUtils; -import com.lyms.platform.operate.web.facade.AutoMatchFacade; -import com.lyms.platform.operate.web.facade.BabyCheckFacade; import com.lyms.platform.operate.web.facade.BabyNutritionFacade; -import com.lyms.platform.operate.web.request.BabyCheckRequest; import com.lyms.platform.operate.web.request.BabyNutritionRequest; -import com.lyms.platform.permission.service.CouponService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -44,7 +37,7 @@ public class BabyNutritionController extends BaseController{ public BaseResponse addOrUpBabyNutrition(@Valid @RequestBody BabyNutritionRequest request, HttpServletRequest httpServletRequest) { - return babyNutritionFacade.addOrUpBabyNutrition(request); + return babyNutritionFacade.addOrUpBabyNutrition(request,getUserId(httpServletRequest)); } @@ -73,6 +66,28 @@ public class BabyNutritionController extends BaseController{ } + /** + * 从ams获取儿童营养食谱 + * @param categoryId 食物类别 + * @param nutritionId 营养元素 + * @param title 食物名称 + * @param id 食物名称 + * @return + */ + @RequestMapping(value = "/queryBabyNutritionFood", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse queryBabyNutritionFood(@RequestParam(required = false)String categoryId, + @RequestParam(required = false)String nutritionId, + @RequestParam(required = false)String id, + @RequestParam(required = false)String title){ + return babyNutritionFacade.queryBabyNutritionFood(categoryId,nutritionId,title,id); + } + + + + + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index c26cfbd..a616ab9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -27,6 +27,8 @@ import java.util.*; public class BabyNutritionFacade { + public static final String amsUrl = PropertiesUtils.getPropertyValue("ams_url"); + @Autowired private BabyCheckFacade babyCheckFacade; @@ -37,6 +39,9 @@ public class BabyNutritionFacade { @Autowired private MeasureDataInfoService mysqlMeasureDataInfoService; + @Autowired + private AutoMatchFacade autoMatchFacade; + public BaseObjectResponse queryBabyNutritionRecord(String babyId) { Map resMap = new HashMap<>(); @@ -47,6 +52,7 @@ public class BabyNutritionFacade { List> list = new ArrayList<>(); BabyNutritionQuery babyQuery = new BabyNutritionQuery(); + babyQuery.setBabyId(babyId); List models = babyNutritionService.queryBabyNutritions(babyQuery); if (CollectionUtils.isNotEmpty(models)) { @@ -87,7 +93,9 @@ public class BabyNutritionFacade { return map; } - public BaseResponse addOrUpBabyNutrition(BabyNutritionRequest request) { + public BaseResponse addOrUpBabyNutrition(BabyNutritionRequest request,Integer userId) { + + String hospitalId = autoMatchFacade.getHospitalId(userId); BabyNutritionModel model = request.convertToDataModel(); if (StringUtils.isNotEmpty(model.getId())) @@ -97,6 +105,7 @@ public class BabyNutritionFacade { } else { + model.setHospitalId(hospitalId); model.setModified(new Date()); model.setCreated(new Date()); babyNutritionService.addBabyNutrition(model); @@ -120,4 +129,15 @@ public class BabyNutritionFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + public BaseObjectResponse queryBabyNutritionFood(String categoryId, String nutritionId, String title,String id) { + + Map map = new HashMap(); + map.put("categoryId",categoryId); + map.put("nutritionId",nutritionId); + map.put("title", title); + map.put("id", id == null ? null : String.valueOf(id)); + String s = HttpClientUtil.doGet(amsUrl+"/v1/foods", map, "utf-8", "3d19960bf3e81e7d816c4f26051c49ba"); + return null; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index 4daddcd..c9c8bd8 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -29,3 +29,6 @@ virtual_call_url=http://localhost:8090/Voice.ashx #证件照上传目录D:\\vs\\images img_path=/data/images +#ams地址 测试环境 http://ams.api.stage.healthbaby.com.cn 线上http://ams.api.healthbaby.com.cn +ams_url=http://ams.api.stage.healthbaby.com.cn + -- 1.8.3.1