Skip to content

Commit

Permalink
Merge pull request #130 from egovframe-contribution/util_bugFix
Browse files Browse the repository at this point in the history 
feat 코드리팩토링 -> addCalender메서드를 생성하여 중복코드 삭제
  • Loading branch information
@jei007
jei007 authored Nov 3, 2023
2 parents b79411a + dd8ac86 commit ba876be
Showing 1 changed file with 18 additions and 45 deletions.
63 changes: 18 additions & 45 deletions ...org.egovframe.rte.fdl.string/src/main/java/org/egovframe/rte/fdl/string/EgovDateUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,7 @@ protected EgovDateUtil() {
public static String getCalcDateAsString(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) {
Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara));

if (EgovStringUtil.equals(sGuBun, "day")) {
cd.add(Calendar.DATE, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "month")) {
cd.add(Calendar.MONTH, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "year")) {
cd.add(Calendar.YEAR, iTerm);
}
addCalender(iTerm, sGuBun, cd);

return getFormalYear(cd) + getFormalMonth(cd) + getFormalDay(cd);
}
Expand Down Expand Up @@ -100,13 +94,7 @@ public static String getCalcYearAsString(String sYearPara, String sMonthPara, St

Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara));

if (EgovStringUtil.equals(sGuBun, "day")) {
cd.add(Calendar.DATE, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "month")) {
cd.add(Calendar.MONTH, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "year")) {
cd.add(Calendar.YEAR, iTerm);
}
addCalender(iTerm, sGuBun, cd);

return getFormalYear(cd);
}
Expand All @@ -132,13 +120,7 @@ public static String getCalcYearAsString(String sYearPara, String sMonthPara, St
public static String getCalcMonthAsString(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) {
Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara));

if (EgovStringUtil.equals(sGuBun, "day")) {
cd.add(Calendar.DATE, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "month")) {
cd.add(Calendar.MONTH, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "year")) {
cd.add(Calendar.YEAR, iTerm);
}
addCalender(iTerm, sGuBun, cd);

return getFormalMonth(cd);
}
Expand All @@ -164,13 +146,7 @@ public static String getCalcMonthAsString(String sYearPara, String sMonthPara, S
public static String getCalcDayAsString(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) {
Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara));

if (EgovStringUtil.equals(sGuBun, "day")) {
cd.add(Calendar.DATE, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "month")) {
cd.add(Calendar.MONTH, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "year")) {
cd.add(Calendar.YEAR, iTerm);
}
addCalender(iTerm, sGuBun, cd);

return getFormalDay(cd);
}
Expand All @@ -196,13 +172,7 @@ public static String getCalcDayAsString(String sYearPara, String sMonthPara, Str
public static int getCalcYearAsInt(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) {
Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara));

if (EgovStringUtil.equals(sGuBun, "day")) {
cd.add(Calendar.DATE, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "month")) {
cd.add(Calendar.MONTH, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "year")) {
cd.add(Calendar.YEAR, iTerm);
}
addCalender(iTerm, sGuBun, cd);

return cd.get(Calendar.YEAR);
}
Expand All @@ -228,13 +198,7 @@ public static int getCalcYearAsInt(String sYearPara, String sMonthPara, String s
public static int getCalcMonthAsInt(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) {
Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara));

if (EgovStringUtil.equals(sGuBun, "day")) {
cd.add(Calendar.DATE, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "month")) {
cd.add(Calendar.MONTH, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "year")) {
cd.add(Calendar.YEAR, iTerm);
}
addCalender(iTerm, sGuBun, cd);

return cd.get(Calendar.MONTH) + 1;
}
Expand All @@ -260,15 +224,25 @@ public static int getCalcMonthAsInt(String sYearPara, String sMonthPara, String
public static int getCalcDayAsInt(String sYearPara, String sMonthPara, String sDayPara, int iTerm, String sGuBun) {
Calendar cd = new GregorianCalendar(Integer.parseInt(sYearPara), Integer.parseInt(sMonthPara) - 1, Integer.parseInt(sDayPara));

addCalender(iTerm, sGuBun, cd);

return cd.get(Calendar.DAY_OF_MONTH);
}

/**
* sGuBun의 종류에 따라 년/월/일 캘린더에 추가
* @param iTerm
* @param sGuBun
* @param cd
*/
private static void addCalender(int iTerm, String sGuBun, Calendar cd) {
if (EgovStringUtil.equals(sGuBun, "day")) {
cd.add(Calendar.DATE, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "month")) {
cd.add(Calendar.MONTH, iTerm);
} else if (EgovStringUtil.equals(sGuBun, "year")) {
cd.add(Calendar.YEAR, iTerm);
}

return cd.get(Calendar.DAY_OF_MONTH);
}

/**
Expand Down Expand Up @@ -844,5 +818,4 @@ public static String toString(Date date, String format, Locale locale) {
String tmp = sdf.format(date);
return tmp;
}

}

0 comments on commit ba876be

Please sign in to comment.