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 cf5bf48..f932368 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,12 +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","1000"); +// map.put("categoryId","1"); +// map.put("page","1"); +// 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"); + String s = HttpClientUtil.doGet("http://ams.api.stage.healthbaby.com.cn/v1/getPlatfromCategoryFoods", 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 07cbf68..c8ee716 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 @@ -68,26 +68,12 @@ 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); + public String queryBabyNutritionFood(){ + return babyNutritionFacade.queryBabyNutritionFood(); } - - - - - } \ 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 69d9f87..27e8440 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 @@ -132,14 +132,9 @@ public class BabyNutritionFacade { return objectResponse; } - public BaseObjectResponse queryBabyNutritionFood(String categoryId, String nutritionId, String title,String id) { - + public String queryBabyNutritionFood() { 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; + String data = HttpClientUtil.doGet(amsUrl+"/v1/getPlatfromCategoryFoods", map, "utf-8", "3d19960bf3e81e7d816c4f26051c49ba"); + return data; } } \ No newline at end of file