diff --git a/src/main/java/com/backoffice/logic/FoodScoreCalculation.java b/src/main/java/com/backoffice/logic/FoodScoreCalculation.java index ac308b3..78cdf50 100644 --- a/src/main/java/com/backoffice/logic/FoodScoreCalculation.java +++ b/src/main/java/com/backoffice/logic/FoodScoreCalculation.java @@ -69,15 +69,15 @@ public class FoodScoreCalculation { public static void main(String[] args) { DataMap food = new DataMap(); - food.put("month",12); + food.put("month",6); food.put("dqi_food_1",0); //모유 계산 X - food.put("dqi_food_2",520); //분유 + 유제품 + food.put("dqi_food_2",0); //분유 + 유제품 food.put("dqi_food_3",0); // 2번과 더해져 계산 - food.put("dqi_food_4",1.06667); //통곡물 - food.put("dqi_food_5",30.47); //정제된 곡물 - food.put("dqi_food_6",24.50); //단백질 - food.put("dqi_food_7",34.78); //채소류 - food.put("dqi_food_8",0); //과일류 + food.put("dqi_food_4",0); //통곡물 + food.put("dqi_food_5",28.57); //정제된 곡물 + food.put("dqi_food_6",9.52); //단백질 + food.put("dqi_food_7",9.52); //채소류 + food.put("dqi_food_8",9.52); //과일류 food.put("dqi_food_9",0); //100%과일주스 food.put("dqi_food_10",0); //당함유 음료 food.put("dqi_food_11",0); //당첨가 제품 @@ -94,6 +94,10 @@ public class FoodScoreCalculation { DataMap.printDataMap(score); System.out.println("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ 신호등"); DataMap.printDataMap(light); + System.out.println("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ "); + System.out.println("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ 전체 점수"); + System.out.println("healthyFood:" + score.get("healthyFood")); + System.out.println("unhealthyFood:" + score.get("unhealthyFood")); cal.Foodsort(score); } @@ -244,7 +248,7 @@ public class FoodScoreCalculation { * @return */ private double get_dqi_food5(double x) { - if( x ==0 ) + if( x == 0 ) return 2.5; else if(label==1) { if(x<=29.56) return 2.5; @@ -518,21 +522,25 @@ public class FoodScoreCalculation { private double gethealthyFood() { if (label == 0) { + // (1모유, 2분유) double t = scoreMap.getDouble("dqi_food_1")+scoreMap.getDouble("dqi_food_2"); return t/15*100; } else { + // (1모유, 2분유), 4통곡물, 6단백질식품, 7채소류, 8과일류 return scoreMap.getDouble("dqi_food_1")+scoreMap.getDouble("dqi_food_2")+scoreMap.getDouble("dqi_food_4")+ - scoreMap.getDouble("dqi_food_5")+scoreMap.getDouble("dqi_food_6")+scoreMap.getDouble("dqi_food_7")+scoreMap.getDouble("dqi_food_8"); + scoreMap.getDouble("dqi_food_6")+scoreMap.getDouble("dqi_food_7")+scoreMap.getDouble("dqi_food_8"); } } private double getUnhealthyFood() { if (label == 0) { + // 4통곡물, 6단백질, 7채소류, 8과일류, 9 100%과일주스, 10음료, 11당함유제품, 12짠과자 double t = scoreMap.getDouble("dqi_food_4")+scoreMap.getDouble("dqi_food_6")+ scoreMap.getDouble("dqi_food_7")+scoreMap.getDouble("dqi_food_8")+scoreMap.getDouble("dqi_food_9")+ scoreMap.getDouble("dqi_food_10")+scoreMap.getDouble("dqi_food_11")+scoreMap.getDouble("dqi_food_12"); t=t; return t/40*100; } else { + // 9 100% 과일주스, 10음료, 11당함유제품, 12 짠과자 double t = scoreMap.getDouble("dqi_food_9")+scoreMap.getDouble("dqi_food_10")+scoreMap.getDouble("dqi_food_11")+scoreMap.getDouble("dqi_food_12"); return t*2.5; } diff --git a/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java b/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java index 3184bd6..b159831 100644 --- a/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java +++ b/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java @@ -730,8 +730,9 @@ public class NutrientScoreCalculation { } private long getTotalNutrientsAvg() { - double totalAvg = (getBasicNutrientsScore()+getGrowthNutrientsScore()+getImmuneNutrientsScore())/18; - return Math.round(totalAvg); + double totalAvg = (getBasicNutrientsAvg()+getGrowthNutrientsAvg()+getImmuneNutrientsAvg()); + totalAvg = Math.round(totalAvg/3); + return (long)totalAvg; } private String getLight(double x, double from, double to) { diff --git a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java index 5a8296a..e2abba6 100644 --- a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java +++ b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java @@ -117,9 +117,9 @@ public class M_Bf_foodController extends AbstractControllerManager{ if(today_dm == null) { today_dm = new DataMap(); - today_dm.put("month", rm_child.get("m")); } - + today_dm.put("month", rm_child.get("m")); + NutrientScoreCalculation today_nut = new NutrientScoreCalculation(today_dm); DataMap today_nut_score = today_nut.getScore(); FoodScoreCalculation today_food = new FoodScoreCalculation(today_dm); diff --git a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java index a586a12..c0506a2 100644 --- a/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java +++ b/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java @@ -172,9 +172,9 @@ public class M_Bf_growthController extends AbstractControllerManager{ if(today_dm == null) { today_dm = new DataMap(); - today_dm.put("month", rm_child.get("m")); } - + today_dm.put("month", rm_child.get("m")); + NutrientScoreCalculation today_nut = new NutrientScoreCalculation(today_dm); DataMap today_nut_score = today_nut.getScore(); FoodScoreCalculation today_food = new FoodScoreCalculation(today_dm); @@ -360,9 +360,9 @@ public class M_Bf_growthController extends AbstractControllerManager{ if(today_dm == null) { today_dm = new DataMap(); - today_dm.put("month", rm_child.get("m")); } - + today_dm.put("month", rm_child.get("m")); + NutrientScoreCalculation today_nut = new NutrientScoreCalculation(today_dm); DataMap today_nut_score = today_nut.getScore(); FoodScoreCalculation today_food = new FoodScoreCalculation(today_dm); diff --git a/src/main/java/com/backoffice/m/index/M_IndexController.java b/src/main/java/com/backoffice/m/index/M_IndexController.java index 8f30ded..791b988 100644 --- a/src/main/java/com/backoffice/m/index/M_IndexController.java +++ b/src/main/java/com/backoffice/m/index/M_IndexController.java @@ -219,8 +219,8 @@ public class M_IndexController extends AbstractControllerManager{ if(today_dm == null) { today_dm = new DataMap(); - today_dm.put("month", rm_child.get("m")); } + today_dm.put("month", rm_child.get("m")); NutrientScoreCalculation today_nut = new NutrientScoreCalculation(today_dm); DataMap today_nut_score = today_nut.getScore(); diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl index cfb4f65..009a157 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl @@ -42,7 +42,7 @@