Commit 123955f3b5ab686b16713b16f2b8d850edd9f69f
1 parent
bf04fc43c2
Exists in
master
and in
6 other branches
儿童营养报告
Showing 3 changed files with 115 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java
View file @
123955f
... | ... | @@ -13,6 +13,8 @@ |
13 | 13 | |
14 | 14 | import javax.servlet.http.HttpServletRequest; |
15 | 15 | import javax.validation.Valid; |
16 | +import java.io.UnsupportedEncodingException; | |
17 | +import java.util.Map; | |
16 | 18 | |
17 | 19 | |
18 | 20 | /** |
19 | 21 | |
... | ... | @@ -70,10 +72,10 @@ |
70 | 72 | * 从ams获取儿童营养食谱 |
71 | 73 | * @return |
72 | 74 | */ |
73 | - @RequestMapping(value = "/queryBabyNutritionFood", method = RequestMethod.GET) | |
75 | + @RequestMapping(value = "/queryBabyNutritionFood", method = RequestMethod.GET,produces = "application/json; charset=utf-8") | |
74 | 76 | @ResponseBody |
75 | - public String queryBabyNutritionFood(){ | |
76 | - return babyNutritionFacade.queryBabyNutritionFood(); | |
77 | + public BaseObjectResponse queryBabyNutritionFood(){ | |
78 | + return babyNutritionFacade.queryBabyNutritionFood(); | |
77 | 79 | } |
78 | 80 | |
79 | 81 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
View file @
123955f
... | ... | @@ -135,10 +135,15 @@ |
135 | 135 | return objectResponse; |
136 | 136 | } |
137 | 137 | |
138 | - public String queryBabyNutritionFood() { | |
138 | + public BaseObjectResponse queryBabyNutritionFood() { | |
139 | + BaseObjectResponse objectResponse = new BaseObjectResponse(); | |
139 | 140 | Map<String,String> map = new HashMap<String, String>(); |
140 | - String data = HttpClientUtil.doGet(amsUrl+"/v1/getPlatfromCategoryFoods", map, "utf-8", "3d19960bf3e81e7d816c4f26051c49ba"); | |
141 | - return data; | |
141 | + String data = HttpClientUtil.doGet(amsUrl + "/v1/getPlatfromCategoryFoods", map, "utf-8", "3d19960bf3e81e7d816c4f26051c49ba"); | |
142 | + NutritionFoodResult result = JsonUtil.str2Obj(data, NutritionFoodResult.class); | |
143 | + objectResponse.setData(result); | |
144 | + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
145 | + objectResponse.setErrormsg("成功"); | |
146 | + return objectResponse; | |
142 | 147 | } |
143 | 148 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NutritionFoodResult.java
View file @
123955f
1 | +package com.lyms.platform.operate.web.result; | |
2 | + | |
3 | +import java.util.List; | |
4 | + | |
5 | +/** | |
6 | + * Created by Administrator on 2019-01-29. | |
7 | + */ | |
8 | +public class NutritionFoodResult { | |
9 | + private List<foods> mainFoods; | |
10 | + private List<foods> vegFoods; | |
11 | + private List<foods> meatFoods; | |
12 | + private List<foods> milkFoods; | |
13 | + private List<foods> fruitsFoods; | |
14 | + private List<foods> eggFoods; | |
15 | + private List<foods> beanFoods; | |
16 | + | |
17 | + public List<foods> getMainFoods() { | |
18 | + return mainFoods; | |
19 | + } | |
20 | + | |
21 | + public void setMainFoods(List<foods> mainFoods) { | |
22 | + this.mainFoods = mainFoods; | |
23 | + } | |
24 | + | |
25 | + public List<foods> getVegFoods() { | |
26 | + return vegFoods; | |
27 | + } | |
28 | + | |
29 | + public void setVegFoods(List<foods> vegFoods) { | |
30 | + this.vegFoods = vegFoods; | |
31 | + } | |
32 | + | |
33 | + public List<foods> getMeatFoods() { | |
34 | + return meatFoods; | |
35 | + } | |
36 | + | |
37 | + public void setMeatFoods(List<foods> meatFoods) { | |
38 | + this.meatFoods = meatFoods; | |
39 | + } | |
40 | + | |
41 | + public List<foods> getMilkFoods() { | |
42 | + return milkFoods; | |
43 | + } | |
44 | + | |
45 | + public void setMilkFoods(List<foods> milkFoods) { | |
46 | + this.milkFoods = milkFoods; | |
47 | + } | |
48 | + | |
49 | + public List<foods> getFruitsFoods() { | |
50 | + return fruitsFoods; | |
51 | + } | |
52 | + | |
53 | + public void setFruitsFoods(List<foods> fruitsFoods) { | |
54 | + this.fruitsFoods = fruitsFoods; | |
55 | + } | |
56 | + | |
57 | + public List<foods> getEggFoods() { | |
58 | + return eggFoods; | |
59 | + } | |
60 | + | |
61 | + public void setEggFoods(List<foods> eggFoods) { | |
62 | + this.eggFoods = eggFoods; | |
63 | + } | |
64 | + | |
65 | + public List<foods> getBeanFoods() { | |
66 | + return beanFoods; | |
67 | + } | |
68 | + | |
69 | + public void setBeanFoods(List<foods> beanFoods) { | |
70 | + this.beanFoods = beanFoods; | |
71 | + } | |
72 | +} | |
73 | + | |
74 | +class foods{ | |
75 | + private String ids; | |
76 | + private String title; | |
77 | + private Integer categoryId; | |
78 | + | |
79 | + public String getIds() { | |
80 | + return ids; | |
81 | + } | |
82 | + | |
83 | + public void setIds(String ids) { | |
84 | + this.ids = ids; | |
85 | + } | |
86 | + | |
87 | + public String getTitle() { | |
88 | + return title; | |
89 | + } | |
90 | + | |
91 | + public void setTitle(String title) { | |
92 | + this.title = title; | |
93 | + } | |
94 | + | |
95 | + public Integer getCategoryId() { | |
96 | + return categoryId; | |
97 | + } | |
98 | + | |
99 | + public void setCategoryId(Integer categoryId) { | |
100 | + this.categoryId = categoryId; | |
101 | + } | |
102 | +} |