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 16d5522..5fb9a59 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 @@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; +import java.io.UnsupportedEncodingException; +import java.util.Map; /** @@ -70,10 +72,10 @@ public class BabyNutritionController extends BaseController{ * 从ams获取儿童营养食谱 * @return */ - @RequestMapping(value = "/queryBabyNutritionFood", method = RequestMethod.GET) + @RequestMapping(value = "/queryBabyNutritionFood", method = RequestMethod.GET,produces = "application/json; charset=utf-8") @ResponseBody - public String queryBabyNutritionFood(){ - return babyNutritionFacade.queryBabyNutritionFood(); + public BaseObjectResponse queryBabyNutritionFood(){ + return babyNutritionFacade.queryBabyNutritionFood(); } 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 d9e9dc7..6f88110 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 @@ -135,9 +135,14 @@ public class BabyNutritionFacade { return objectResponse; } - public String queryBabyNutritionFood() { + public BaseObjectResponse queryBabyNutritionFood() { + BaseObjectResponse objectResponse = new BaseObjectResponse(); Map map = new HashMap(); - String data = HttpClientUtil.doGet(amsUrl+"/v1/getPlatfromCategoryFoods", map, "utf-8", "3d19960bf3e81e7d816c4f26051c49ba"); - return data; + String data = HttpClientUtil.doGet(amsUrl + "/v1/getPlatfromCategoryFoods", map, "utf-8", "3d19960bf3e81e7d816c4f26051c49ba"); + NutritionFoodResult result = JsonUtil.str2Obj(data, NutritionFoodResult.class); + objectResponse.setData(result); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NutritionFoodResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NutritionFoodResult.java new file mode 100644 index 0000000..7d7a780 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NutritionFoodResult.java @@ -0,0 +1,102 @@ +package com.lyms.platform.operate.web.result; + +import java.util.List; + +/** + * Created by Administrator on 2019-01-29. + */ +public class NutritionFoodResult { + private List mainFoods; + private List vegFoods; + private List meatFoods; + private List milkFoods; + private List fruitsFoods; + private List eggFoods; + private List beanFoods; + + public List getMainFoods() { + return mainFoods; + } + + public void setMainFoods(List mainFoods) { + this.mainFoods = mainFoods; + } + + public List getVegFoods() { + return vegFoods; + } + + public void setVegFoods(List vegFoods) { + this.vegFoods = vegFoods; + } + + public List getMeatFoods() { + return meatFoods; + } + + public void setMeatFoods(List meatFoods) { + this.meatFoods = meatFoods; + } + + public List getMilkFoods() { + return milkFoods; + } + + public void setMilkFoods(List milkFoods) { + this.milkFoods = milkFoods; + } + + public List getFruitsFoods() { + return fruitsFoods; + } + + public void setFruitsFoods(List fruitsFoods) { + this.fruitsFoods = fruitsFoods; + } + + public List getEggFoods() { + return eggFoods; + } + + public void setEggFoods(List eggFoods) { + this.eggFoods = eggFoods; + } + + public List getBeanFoods() { + return beanFoods; + } + + public void setBeanFoods(List beanFoods) { + this.beanFoods = beanFoods; + } +} + +class foods{ + private String ids; + private String title; + private Integer categoryId; + + public String getIds() { + return ids; + } + + public void setIds(String ids) { + this.ids = ids; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Integer getCategoryId() { + return categoryId; + } + + public void setCategoryId(Integer categoryId) { + this.categoryId = categoryId; + } +}