From 74e06aaf2f69bd431cddfd8b7245c635b3177d3c Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 29 Jan 2019 16:30:02 +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

---
 .../com/lyms/platform/pojo/BabyNutritionModel.java | 54 +++++++++++++++++++
 .../operate/web/facade/BabyNutritionFacade.java    |  2 +-
 .../operate/web/request/BabyNutritionRequest.java  | 62 ++++++++++++++++++++++
 .../operate/web/result/BabyNutritionResult.java    | 61 +++++++++++++++++++++
 .../operate/web/result/NutritionFoodResult.java    |  9 ++++
 5 files changed, 187 insertions(+), 1 deletion(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java
index db17796..493689f 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java
@@ -103,6 +103,60 @@ public class BabyNutritionModel {
     //喂养方式
     private String feedType;
 
+    //干果及硬果类
+    private List<Map> oilGg;
+
+    //干豆类
+    private List<Map> beansGd;
+    //豆类制品
+    private List<Map> beansDl;
+
+    //水果类;
+    private List<Map> fruits;
+
+    //鲜豆类
+    private List<Map> vegXd;
+
+    public List<Map> getOilGg() {
+        return oilGg;
+    }
+
+    public void setOilGg(List<Map> oilGg) {
+        this.oilGg = oilGg;
+    }
+
+    public List<Map> getBeansGd() {
+        return beansGd;
+    }
+
+    public void setBeansGd(List<Map> beansGd) {
+        this.beansGd = beansGd;
+    }
+
+    public List<Map> getBeansDl() {
+        return beansDl;
+    }
+
+    public void setBeansDl(List<Map> beansDl) {
+        this.beansDl = beansDl;
+    }
+
+    public List<Map> getFruits() {
+        return fruits;
+    }
+
+    public void setFruits(List<Map> fruits) {
+        this.fruits = fruits;
+    }
+
+    public List<Map> getVegXd() {
+        return vegXd;
+    }
+
+    public void setVegXd(List<Map> vegXd) {
+        this.vegXd = vegXd;
+    }
+
     public Date getNutritiTime() {
         return nutritiTime;
     }
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 6f88110..1951fe4 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
@@ -139,7 +139,7 @@ public class BabyNutritionFacade {
         BaseObjectResponse objectResponse = new BaseObjectResponse();
         Map<String,String> map = new HashMap<String, String>();
         String data = HttpClientUtil.doGet(amsUrl + "/v1/getPlatfromCategoryFoods", map, "utf-8", "3d19960bf3e81e7d816c4f26051c49ba");
-        NutritionFoodResult result = JsonUtil.str2Obj(data, NutritionFoodResult.class);
+        NutritionFoodResult result = JsonUtil.jkstr2Obj(data, NutritionFoodResult.class);
         objectResponse.setData(result);
         objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
         objectResponse.setErrormsg("成功");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java
index 5011c0b..451ca70 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java
@@ -64,6 +64,8 @@ public class BabyNutritionRequest implements IBasicRequestConvert<BabyNutritionM
     //油脂及其他
     private List<Map> meatYz;
 
+
+
     //肉产品使用频率 次/周
     private String meatCz;
     //肉产品使用频率 为主
@@ -110,6 +112,20 @@ public class BabyNutritionRequest implements IBasicRequestConvert<BabyNutritionM
     //营养填写日期
     private String nutritiTime;
 
+    //干果及硬果类
+    private List<Map> oilGg;
+
+    //干豆类
+    private List<Map> beansGd;
+    //豆类制品
+    private List<Map> beansDl;
+
+    //水果类;
+    private List<Map> fruits;
+
+    //鲜豆类
+    private List<Map> vegXd;
+
 
     @Override
     public BabyNutritionModel convertToDataModel() {
@@ -151,9 +167,55 @@ public class BabyNutritionRequest implements IBasicRequestConvert<BabyNutritionM
         model.setMeal(JsonUtil.obj2JsonString(meal));
         model.setFeedType(feedType);
         model.setNutritiTime(DateUtil.parseYMD(nutritiTime));
+        model.setOilGg(oilGg);
+        model.setBeansGd(beansGd);
+        model.setBeansDl(beansDl);
+        model.setVegXd(vegXd);
+        model.setFruits(fruits);
         return model;
     }
 
+
+    public List<Map> getOilGg() {
+        return oilGg;
+    }
+
+    public void setOilGg(List<Map> oilGg) {
+        this.oilGg = oilGg;
+    }
+
+    public List<Map> getBeansGd() {
+        return beansGd;
+    }
+
+    public void setBeansGd(List<Map> beansGd) {
+        this.beansGd = beansGd;
+    }
+
+    public List<Map> getBeansDl() {
+        return beansDl;
+    }
+
+    public void setBeansDl(List<Map> beansDl) {
+        this.beansDl = beansDl;
+    }
+
+    public List<Map> getFruits() {
+        return fruits;
+    }
+
+    public void setFruits(List<Map> fruits) {
+        this.fruits = fruits;
+    }
+
+    public List<Map> getVegXd() {
+        return vegXd;
+    }
+
+    public void setVegXd(List<Map> vegXd) {
+        this.vegXd = vegXd;
+    }
+
     public String getNutritiTime() {
         return nutritiTime;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java
index 5a59025..7be09b7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java
@@ -104,6 +104,21 @@ public class BabyNutritionResult {
     //喂养方式
     private String feedType;
 
+    //干果及硬果类
+    private List<Map> oilGg;
+
+    //干豆类
+    private List<Map> beansGd;
+    //豆类制品
+    private List<Map> beansDl;
+
+    //水果类;
+    private List<Map> fruits;
+
+    //鲜豆类
+    private List<Map> vegXd;
+
+
     public BabyNutritionResult convertToResult(BabyNutritionModel model) {
         setId(model.getId());
         setHospitalId(model.getHospitalId());
@@ -144,9 +159,55 @@ public class BabyNutritionResult {
         setCreated(DateUtil.getyyyy_MM_dd(model.getCreated()));
         setModified(DateUtil.getyyyy_MM_dd(model.getModified()));
         setNutritiTime(DateUtil.getyyyy_MM_dd(model.getNutritiTime()));
+
+        setOilGg(model.getOilGg());
+        setBeansGd(model.getBeansGd());
+        setBeansDl(model.getBeansDl());
+        setVegXd(model.getVegXd());
+        setFruits(model.getFruits());
         return this;
     }
 
+    public List<Map> getOilGg() {
+        return oilGg;
+    }
+
+    public void setOilGg(List<Map> oilGg) {
+        this.oilGg = oilGg;
+    }
+
+    public List<Map> getBeansGd() {
+        return beansGd;
+    }
+
+    public void setBeansGd(List<Map> beansGd) {
+        this.beansGd = beansGd;
+    }
+
+    public List<Map> getBeansDl() {
+        return beansDl;
+    }
+
+    public void setBeansDl(List<Map> beansDl) {
+        this.beansDl = beansDl;
+    }
+
+    public List<Map> getFruits() {
+        return fruits;
+    }
+
+    public void setFruits(List<Map> fruits) {
+        this.fruits = fruits;
+    }
+
+    public List<Map> getVegXd() {
+        return vegXd;
+    }
+
+    public void setVegXd(List<Map> vegXd) {
+        this.vegXd = vegXd;
+    }
+
     public String getNutritiTime() {
         return nutritiTime;
     }
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
index 7d7a780..34726a8 100644
--- 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
@@ -13,6 +13,15 @@ public class NutritionFoodResult {
     private List<foods> fruitsFoods;
     private List<foods> eggFoods;
     private List<foods> beanFoods;
+    private List<foods> oilFoods;
+
+    public List<foods> getOilFoods() {
+        return oilFoods;
+    }
+
+    public void setOilFoods(List<foods> oilFoods) {
+        this.oilFoods = oilFoods;
+    }
 
     public List<foods> getMainFoods() {
         return mainFoods;
-- 
1.8.3.1