이호영 이호영 2024-07-05
utils 정리중
@339e233c0b7db0eac3cc9dd5a2c123f45f26e838
src/main/java/itn/com/cmm/util/DateUtils.java (Renamed from src/main/java/itn/com/cmm/util/DateUtil.java)
--- src/main/java/itn/com/cmm/util/DateUtil.java
+++ src/main/java/itn/com/cmm/util/DateUtils.java
@@ -3,8 +3,6 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.Month;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
@@ -23,9 +21,9 @@
  * 
  * 
  */
-public final class DateUtil {
+public final class DateUtils {
 
-    // 날짜를 포맷하는 포맷터 정의
+    // 날짜를 포맷하는 기본 포맷터 정의
     private static final DateTimeFormatter SLUSH_FORMATTER = DateTimeFormatter.ofPattern("yyyy/MM/dd");
 
     /** 
src/main/java/itn/let/fax/admin/service/impl/FaxAdmServiceImpl.java
--- src/main/java/itn/let/fax/admin/service/impl/FaxAdmServiceImpl.java
+++ src/main/java/itn/let/fax/admin/service/impl/FaxAdmServiceImpl.java
@@ -20,7 +20,7 @@
 import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
-import itn.com.cmm.util.DateUtil;
+import itn.com.cmm.util.DateUtils;
 import itn.com.utl.fcc.service.EgovDateUtil;
 import itn.let.fax.admin.service.FaxAdmService;
 import itn.let.fax.admin.service.FaxStatVO;
@@ -195,8 +195,8 @@
 		String date = simpleDateFormat.format(new Date());
 		if("".equals(faxGroupDataVO.getSearchDateType()) || faxGroupDataVO.getSearchDateType() == null) {
 			faxGroupDataVO.setSearchDateType("month");
-			faxGroupDataVO.setSearchYear(DateUtil.getNowYearToString());
-			faxGroupDataVO.setSearchMonth(DateUtil.getNowMonthToString());
+			faxGroupDataVO.setSearchYear(DateUtils.getNowYearToString());
+			faxGroupDataVO.setSearchMonth(DateUtils.getNowMonthToString());
 		}
     	
 		List<FaxGroupDataVO> faxGroupListVO = faxDao.selectFaxStatList(faxGroupDataVO);
src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java
--- src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java
+++ src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java
@@ -30,7 +30,7 @@
 import egovframework.rte.fdl.cmmn.exception.FdlException;
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
-import itn.com.cmm.util.DateUtil;
+import itn.com.cmm.util.DateUtils;
 import itn.com.cmm.util.FaxUtil;
 import itn.let.fax.user.service.FaxConvertMngVO;
 import itn.let.fax.user.service.FaxConvertVO;
@@ -240,8 +240,8 @@
     	if(StringUtils.isEmpty(faxGroupDataVO.getSearchStartDate()) 
     		&&	StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate())
     		) {
-    		faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay());
-    		faxGroupDataVO.setSearchEndDate(DateUtil.getTodayYearAndMonthAndLastDay());
+    		faxGroupDataVO.setSearchStartDate(DateUtils.getTodayYearAndMonthAndFirstDay());
+    		faxGroupDataVO.setSearchEndDate(DateUtils.getTodayYearAndMonthAndLastDay());
     	}
     	
 		/** pageing */
@@ -287,9 +287,9 @@
 		Map<String, Object> dateMap = new HashMap<String, Object>();
 		
 		
-		dateMap.put("year", DateUtil.getNowYearToString());
-		dateMap.put("month", DateUtil.getNowMonthToString());
-		dateMap.put("day", DateUtil.getNowDayToString());
+		dateMap.put("year", DateUtils.getNowYearToString());
+		dateMap.put("month", DateUtils.getNowMonthToString());
+		dateMap.put("day", DateUtils.getNowDayToString());
 		resultMap.put("dateMap", dateMap);
 		
 		return resultMap;
@@ -606,7 +606,7 @@
     		&&	StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate())
     		) {
 //    		faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay());
-    		faxGroupDataVO.setSearchEndDate(DateUtil.getTodayYearAndMonthAndLastDay());
+    		faxGroupDataVO.setSearchEndDate(DateUtils.getTodayYearAndMonthAndLastDay());
     	}
     	
 		/** pageing */
src/main/java/itn/let/mjo/msgCustom/web/MjonMsgCustomWebController.java
--- src/main/java/itn/let/mjo/msgCustom/web/MjonMsgCustomWebController.java
+++ src/main/java/itn/let/mjo/msgCustom/web/MjonMsgCustomWebController.java
@@ -35,7 +35,7 @@
 import itn.com.cmm.service.EgovFileMngService;
 import itn.com.cmm.service.EgovFileMngUtil;
 import itn.com.cmm.service.FileVO;
-import itn.com.cmm.util.DateUtil;
+import itn.com.cmm.util.DateUtils;
 import itn.com.utl.fcc.service.EgovStringUtil;
 import itn.let.lett.service.HashConfVO;
 import itn.let.lett.service.LetterService;
@@ -145,8 +145,8 @@
     	// 내 보관함 - 기본 날짜 검색 셋팅
     	// 오늘 날짜에서 365일 날짜 가져와서 
     	// 검색날짜에 입력
-    	model.addAttribute("myStartDate", DateUtil.getDateDaysAgo(365));
-    	model.addAttribute("myEndDate", DateUtil.getCurrentDate());
+    	model.addAttribute("myStartDate", DateUtils.getDateDaysAgo(365));
+    	model.addAttribute("myEndDate", DateUtils.getCurrentDate());
     	
     	
 		
@@ -229,10 +229,10 @@
 		// 검색 데이터가 없거나
 		// 시작일자가 종료일자보다 이후이거나
 		// 총 기간이 365일이 넘으면 현재일부터 365일 전 날짜를 넣어서 검색
-		if(!DateUtil.dateChkAndValueChk(mjonMsgCustomVO.getSearchStartDate(),mjonMsgCustomVO.getSearchEndDate(), 365 )) {
+		if(!DateUtils.dateChkAndValueChk(mjonMsgCustomVO.getSearchStartDate(),mjonMsgCustomVO.getSearchEndDate(), 365 )) {
 
-			mjonMsgCustomVO.setSearchStartDate(DateUtil.getDateDaysAgo(365));
-			mjonMsgCustomVO.setSearchEndDate(DateUtil.getCurrentDate());
+			mjonMsgCustomVO.setSearchStartDate(DateUtils.getDateDaysAgo(365));
+			mjonMsgCustomVO.setSearchEndDate(DateUtils.getCurrentDate());
 			
 		};
 		
src/main/java/itn/let/mjo/pay/web/MjonPayController.java
--- src/main/java/itn/let/mjo/pay/web/MjonPayController.java
+++ src/main/java/itn/let/mjo/pay/web/MjonPayController.java
@@ -61,7 +61,7 @@
 import itn.com.cmm.LoginVO;
 import itn.com.cmm.service.EgovCmmUseService;
 import itn.com.cmm.service.FileVO;
-import itn.com.cmm.util.DateUtil;
+import itn.com.cmm.util.DateUtils;
 import itn.com.cmm.util.MJUtil;
 import itn.com.cmm.util.RedirectUrlMaker;
 import itn.com.cmm.util.StringUtil;
@@ -2018,8 +2018,8 @@
 
     			{
     				// 초기 날짜 셋팅
-    				model.addAttribute("startDate", DateUtil.getDateDaysAgo(365));
-    				model.addAttribute("endDate", DateUtil.getCurrentDate());
+    				model.addAttribute("startDate", DateUtils.getDateDaysAgo(365));
+    				model.addAttribute("endDate", DateUtils.getCurrentDate());
     			}
 
 
@@ -2108,9 +2108,9 @@
 //			mjonPayVO.setStartDate(mjonPayVO.getStartDate() == null ? DateUtil.getDateDaysAgo(365) : mjonPayVO.getStartDate());
 //			mjonPayVO.setEndDate(mjonPayVO.getEndDate() == null ? DateUtil.getCurrentDate() : mjonPayVO.getEndDate());
 			
-			if(!DateUtil.dateChkAndValueChk(mjonPayVO.getSearchStartDate(),mjonPayVO.getSearchEndDate(), 365 )) {
-				mjonPayVO.setStartDate(DateUtil.getDateDaysAgo(365));
-				mjonPayVO.setEndDate(DateUtil.getCurrentDate());
+			if(!DateUtils.dateChkAndValueChk(mjonPayVO.getSearchStartDate(),mjonPayVO.getSearchEndDate(), 365 )) {
+				mjonPayVO.setStartDate(DateUtils.getDateDaysAgo(365));
+				mjonPayVO.setEndDate(DateUtils.getCurrentDate());
 			};
 			
 			
@@ -2713,8 +2713,8 @@
 		}
 		{
 			// 초기 날짜 셋팅
-			model.addAttribute("startDate", DateUtil.getDateDaysAgo(365));
-			model.addAttribute("endDate", DateUtil.getCurrentDate());
+			model.addAttribute("startDate", DateUtils.getDateDaysAgo(365));
+			model.addAttribute("endDate", DateUtils.getCurrentDate());
 		}
 		
 		return "/web/pay/PayUserSWList";
@@ -2762,10 +2762,10 @@
 			// 검색 데이터가 없거나
 			// 시작일자가 종료일자보다 이후이거나
 			// 총 기간이 365일이 넘으면 현재일부터 365일 전 날짜를 넣어서 검색
-			if(!DateUtil.dateChkAndValueChk(mjonMsgVO.getStartDate(),mjonMsgVO.getEndDate(), 365 )) {
+			if(!DateUtils.dateChkAndValueChk(mjonMsgVO.getStartDate(),mjonMsgVO.getEndDate(), 365 )) {
 
-				mjonMsgVO.setStartDate(DateUtil.getDateDaysAgo(365));
-				mjonMsgVO.setEndDate(DateUtil.getCurrentDate());
+				mjonMsgVO.setStartDate(DateUtils.getDateDaysAgo(365));
+				mjonMsgVO.setEndDate(DateUtils.getCurrentDate());
 				
 			};
 			
src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java
--- src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java
+++ src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java
@@ -16,7 +16,7 @@
 
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import itn.com.cmm.LoginVO;
-import itn.com.cmm.util.DateUtil;
+import itn.com.cmm.util.DateUtils;
 import itn.com.utl.fcc.service.EgovStringUtil;
 import itn.let.mjo.apikey.service.ApiCallInfoMngService;
 import itn.let.mjo.apikey.service.ApiKeyMngService;
@@ -202,8 +202,8 @@
 		if (resultList.size()>0) {
 			if(StringUtils.isNotEmpty(resultList.get(0).getFrstRegistPnttm()))
 			{
-				resultList.get(0).setFrstRegistPnttm(DateUtil.getChangFormatS(resultList.get(0).getFrstRegistPnttm()));
-				resultList.get(0).setLastUpdtPnttm(DateUtil.getChangFormatS(resultList.get(0).getLastUpdtPnttm()));
+				resultList.get(0).setFrstRegistPnttm(DateUtils.getChangFormatS(resultList.get(0).getFrstRegistPnttm()));
+				resultList.get(0).setLastUpdtPnttm(DateUtils.getChangFormatS(resultList.get(0).getLastUpdtPnttm()));
 			}
 			
 			model.addAttribute("apiVO", resultList.get(0));
@@ -216,7 +216,7 @@
     		System.out.println("!!!!!!!!!!!!!!!!!");
     		resultList_call.forEach(t-> {
 				try {
-					t.setFrstRegistPnttm(DateUtil.getChangFormatS(t.getFrstRegistPnttm()));
+					t.setFrstRegistPnttm(DateUtils.getChangFormatS(t.getFrstRegistPnttm()));
 				} catch (ParseException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java
--- src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java
+++ src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java
@@ -16,7 +16,7 @@
 import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
-import itn.com.cmm.util.DateUtil;
+import itn.com.cmm.util.DateUtils;
 import itn.let.fax.user.service.FaxGroupDataVO;
 import itn.let.fax.user.service.impl.FaxDAO;
 import itn.let.mjo.mjocommon.MjonCommon;
@@ -860,8 +860,8 @@
     	if(StringUtils.isEmpty(faxGroupDataVO.getSearchStartDate()) 
     		&&	StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate())
     		) {
-    		faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay());
-    		faxGroupDataVO.setSearchEndDate(DateUtil.getTodayYearAndMonthAndLastDay());
+    		faxGroupDataVO.setSearchStartDate(DateUtils.getTodayYearAndMonthAndFirstDay());
+    		faxGroupDataVO.setSearchEndDate(DateUtils.getTodayYearAndMonthAndLastDay());
     	}
     	
 		/** pageing */
src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
--- src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
+++ src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
@@ -42,7 +42,7 @@
 		<!-- 
 			20240704 이호영 추가 /cmnDateAndChk.js
 		 -->
-		<script type="text/javascript" src="/publish/js/cmnDateAndChk.js"></script>
+		<script type="text/javascript" src="/publish/js/dateUtils.js"></script>
 		<script type="text/javascript" src="/publish/js/content.js?date=202211070003"></script>
 		<script type="text/javascript" src="/publish/js/popupLayer.js"></script>
 		<script type="text/javascript" src="/publish/js/popup.js"></script>
src/main/webapp/publish/js/dateUtils.js (Renamed from src/main/webapp/publish/js/cmnDateAndChk.js)
--- src/main/webapp/publish/js/cmnDateAndChk.js
+++ src/main/webapp/publish/js/dateUtils.js
No changes
Add a comment
List