java
/
bf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[수정]영양로직 수정, 및 d-day z-index 문제 해결

Browse Source
dev_bert
isol2011 3 years ago
parent 1ca3780092
commit b303f1b182
6 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File

26
src/main/java/com/backoffice/logic/FoodScoreCalculation.java
Unescape View File

@ -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;
}

5
src/main/java/com/backoffice/logic/NutrientScoreCalculation.java
Unescape View File

@ -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) {

4
src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java
Unescape View File

@ -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);

8
src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java
Unescape View File

@ -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);

2
src/main/java/com/backoffice/m/index/M_IndexController.java
Unescape View File

@ -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();

4
src/main/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl
Unescape View File

@ -42,7 +42,7 @@
<!-- D-Day를 등록해주세요 -->
<div class="modal-wrapper">
<div class="modal_content" style="width: 400px;">
<div class="modal_content" style="width: 400px; z-index: 1000">
<div class="head">
<div class="title">D-Day를 등록해주세요</div>
<div id="modal_close_btn"><img src="/bf/m/img/close_ico.png"></div>
@ -67,7 +67,7 @@
</div> -->
</div>
</div>
<div class="modal_layer"></div>
<div class="modal_layer" style="z-index: 100"></div>
</div>
<!-- //D-Day를 등록해주세요 -->

Write Preview
Loading…
Cancel
Save