tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utils 정리중

Browse Source
This commit is contained in:
hylee 2024-07-05 16:14:00 +09:00
parent 9347f1d24a
commit 339e233c0b
9 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/itn/com/cmm/util/DateUtil.java → src/main/java/itn/com/cmm/util/DateUtils.java
View File

@ -3,8 +3,6 @@ package itn.com.cmm.util;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.Month;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.Date; import java.util.Date;
@ -23,9 +21,9 @@ import java.util.Date;
* *
* *
*/ */
public final class DateUtil { public final class DateUtils {
// 날짜를 포맷하는 포맷터 정의 // 날짜를 포맷하는 기본 포맷터 정의
private static final DateTimeFormatter SLUSH_FORMATTER = DateTimeFormatter.ofPattern("yyyy/MM/dd"); private static final DateTimeFormatter SLUSH_FORMATTER = DateTimeFormatter.ofPattern("yyyy/MM/dd");
/** /**

6
src/main/java/itn/let/fax/admin/service/impl/FaxAdmServiceImpl.java
View File

@ -20,7 +20,7 @@ import org.springframework.stereotype.Service;
import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; 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.com.utl.fcc.service.EgovDateUtil;
import itn.let.fax.admin.service.FaxAdmService; import itn.let.fax.admin.service.FaxAdmService;
import itn.let.fax.admin.service.FaxStatVO; import itn.let.fax.admin.service.FaxStatVO;
@ -195,8 +195,8 @@ public class FaxAdmServiceImpl extends EgovAbstractServiceImpl implements FaxAdm
String date = simpleDateFormat.format(new Date()); String date = simpleDateFormat.format(new Date());
if("".equals(faxGroupDataVO.getSearchDateType()) || faxGroupDataVO.getSearchDateType() == null) { if("".equals(faxGroupDataVO.getSearchDateType()) || faxGroupDataVO.getSearchDateType() == null) {
faxGroupDataVO.setSearchDateType("month"); faxGroupDataVO.setSearchDateType("month");
faxGroupDataVO.setSearchYear(DateUtil.getNowYearToString()); faxGroupDataVO.setSearchYear(DateUtils.getNowYearToString());
faxGroupDataVO.setSearchMonth(DateUtil.getNowMonthToString()); faxGroupDataVO.setSearchMonth(DateUtils.getNowMonthToString());
} }
List<FaxGroupDataVO> faxGroupListVO = faxDao.selectFaxStatList(faxGroupDataVO); List<FaxGroupDataVO> faxGroupListVO = faxDao.selectFaxStatList(faxGroupDataVO);

14
src/main/java/itn/let/fax/user/service/impl/FaxServiceImpl.java
View File

@ -30,7 +30,7 @@ import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.cmmn.exception.FdlException;
import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; 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.com.cmm.util.FaxUtil;
import itn.let.fax.user.service.FaxConvertMngVO; import itn.let.fax.user.service.FaxConvertMngVO;
import itn.let.fax.user.service.FaxConvertVO; import itn.let.fax.user.service.FaxConvertVO;
@ -240,8 +240,8 @@ public class FaxServiceImpl extends EgovAbstractServiceImpl implements FaxServic
if(StringUtils.isEmpty(faxGroupDataVO.getSearchStartDate()) if(StringUtils.isEmpty(faxGroupDataVO.getSearchStartDate())
&& StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate()) && StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate())
) { ) {
faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay()); faxGroupDataVO.setSearchStartDate(DateUtils.getTodayYearAndMonthAndFirstDay());
faxGroupDataVO.setSearchEndDate(DateUtil.getTodayYearAndMonthAndLastDay()); faxGroupDataVO.setSearchEndDate(DateUtils.getTodayYearAndMonthAndLastDay());
} }
/** pageing */ /** pageing */
@ -287,9 +287,9 @@ public class FaxServiceImpl extends EgovAbstractServiceImpl implements FaxServic
Map<String, Object> dateMap = new HashMap<String, Object>(); Map<String, Object> dateMap = new HashMap<String, Object>();
dateMap.put("year", DateUtil.getNowYearToString()); dateMap.put("year", DateUtils.getNowYearToString());
dateMap.put("month", DateUtil.getNowMonthToString()); dateMap.put("month", DateUtils.getNowMonthToString());
dateMap.put("day", DateUtil.getNowDayToString()); dateMap.put("day", DateUtils.getNowDayToString());
resultMap.put("dateMap", dateMap); resultMap.put("dateMap", dateMap);
return resultMap; return resultMap;
@ -606,7 +606,7 @@ public class FaxServiceImpl extends EgovAbstractServiceImpl implements FaxServic
&& StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate()) && StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate())
) { ) {
// faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay()); // faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay());
faxGroupDataVO.setSearchEndDate(DateUtil.getTodayYearAndMonthAndLastDay()); faxGroupDataVO.setSearchEndDate(DateUtils.getTodayYearAndMonthAndLastDay());
} }
/** pageing */ /** pageing */

12
src/main/java/itn/let/mjo/msgCustom/web/MjonMsgCustomWebController.java
View File

@ -35,7 +35,7 @@ import itn.com.cmm.service.EgovCmmUseService;
import itn.com.cmm.service.EgovFileMngService; import itn.com.cmm.service.EgovFileMngService;
import itn.com.cmm.service.EgovFileMngUtil; import itn.com.cmm.service.EgovFileMngUtil;
import itn.com.cmm.service.FileVO; 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.com.utl.fcc.service.EgovStringUtil;
import itn.let.lett.service.HashConfVO; import itn.let.lett.service.HashConfVO;
import itn.let.lett.service.LetterService; import itn.let.lett.service.LetterService;
@ -145,8 +145,8 @@ public class MjonMsgCustomWebController {
// 내 보관함 - 기본 날짜 검색 셋팅 // 내 보관함 - 기본 날짜 검색 셋팅
// 오늘 날짜에서 365일 날짜 가져와서 // 오늘 날짜에서 365일 날짜 가져와서
// 검색날짜에 입력 // 검색날짜에 입력
model.addAttribute("myStartDate", DateUtil.getDateDaysAgo(365)); model.addAttribute("myStartDate", DateUtils.getDateDaysAgo(365));
model.addAttribute("myEndDate", DateUtil.getCurrentDate()); model.addAttribute("myEndDate", DateUtils.getCurrentDate());
@ -229,10 +229,10 @@ public class MjonMsgCustomWebController {
// 검색 데이터가 없거나 // 검색 데이터가 없거나
// 시작일자가 종료일자보다 이후이거나 // 시작일자가 종료일자보다 이후이거나
// 총 기간이 365일이 넘으면 현재일부터 365일 전 날짜를 넣어서 검색 // 총 기간이 365일이 넘으면 현재일부터 365일 전 날짜를 넣어서 검색
if(!DateUtil.dateChkAndValueChk(mjonMsgCustomVO.getSearchStartDate(),mjonMsgCustomVO.getSearchEndDate(), 365 )) { if(!DateUtils.dateChkAndValueChk(mjonMsgCustomVO.getSearchStartDate(),mjonMsgCustomVO.getSearchEndDate(), 365 )) {
mjonMsgCustomVO.setSearchStartDate(DateUtil.getDateDaysAgo(365)); mjonMsgCustomVO.setSearchStartDate(DateUtils.getDateDaysAgo(365));
mjonMsgCustomVO.setSearchEndDate(DateUtil.getCurrentDate()); mjonMsgCustomVO.setSearchEndDate(DateUtils.getCurrentDate());
}; };

22
src/main/java/itn/let/mjo/pay/web/MjonPayController.java
View File

@ -61,7 +61,7 @@ import itn.com.cmm.EgovMessageSource;
import itn.com.cmm.LoginVO; import itn.com.cmm.LoginVO;
import itn.com.cmm.service.EgovCmmUseService; import itn.com.cmm.service.EgovCmmUseService;
import itn.com.cmm.service.FileVO; 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.MJUtil;
import itn.com.cmm.util.RedirectUrlMaker; import itn.com.cmm.util.RedirectUrlMaker;
import itn.com.cmm.util.StringUtil; import itn.com.cmm.util.StringUtil;
@ -2018,8 +2018,8 @@ public class MjonPayController {
{ {
// 초기 날짜 셋팅 // 초기 날짜 셋팅
model.addAttribute("startDate", DateUtil.getDateDaysAgo(365)); model.addAttribute("startDate", DateUtils.getDateDaysAgo(365));
model.addAttribute("endDate", DateUtil.getCurrentDate()); model.addAttribute("endDate", DateUtils.getCurrentDate());
} }
@ -2108,9 +2108,9 @@ public class MjonPayController {
// mjonPayVO.setStartDate(mjonPayVO.getStartDate() == null ? DateUtil.getDateDaysAgo(365) : mjonPayVO.getStartDate()); // mjonPayVO.setStartDate(mjonPayVO.getStartDate() == null ? DateUtil.getDateDaysAgo(365) : mjonPayVO.getStartDate());
// mjonPayVO.setEndDate(mjonPayVO.getEndDate() == null ? DateUtil.getCurrentDate() : mjonPayVO.getEndDate()); // mjonPayVO.setEndDate(mjonPayVO.getEndDate() == null ? DateUtil.getCurrentDate() : mjonPayVO.getEndDate());
if(!DateUtil.dateChkAndValueChk(mjonPayVO.getSearchStartDate(),mjonPayVO.getSearchEndDate(), 365 )) { if(!DateUtils.dateChkAndValueChk(mjonPayVO.getSearchStartDate(),mjonPayVO.getSearchEndDate(), 365 )) {
mjonPayVO.setStartDate(DateUtil.getDateDaysAgo(365)); mjonPayVO.setStartDate(DateUtils.getDateDaysAgo(365));
mjonPayVO.setEndDate(DateUtil.getCurrentDate()); mjonPayVO.setEndDate(DateUtils.getCurrentDate());
}; };
@ -2713,8 +2713,8 @@ public class MjonPayController {
} }
{ {
// 초기 날짜 셋팅 // 초기 날짜 셋팅
model.addAttribute("startDate", DateUtil.getDateDaysAgo(365)); model.addAttribute("startDate", DateUtils.getDateDaysAgo(365));
model.addAttribute("endDate", DateUtil.getCurrentDate()); model.addAttribute("endDate", DateUtils.getCurrentDate());
} }
return "/web/pay/PayUserSWList"; return "/web/pay/PayUserSWList";
@ -2762,10 +2762,10 @@ public class MjonPayController {
// 검색 데이터가 없거나 // 검색 데이터가 없거나
// 시작일자가 종료일자보다 이후이거나 // 시작일자가 종료일자보다 이후이거나
// 총 기간이 365일이 넘으면 현재일부터 365일 전 날짜를 넣어서 검색 // 총 기간이 365일이 넘으면 현재일부터 365일 전 날짜를 넣어서 검색
if(!DateUtil.dateChkAndValueChk(mjonMsgVO.getStartDate(),mjonMsgVO.getEndDate(), 365 )) { if(!DateUtils.dateChkAndValueChk(mjonMsgVO.getStartDate(),mjonMsgVO.getEndDate(), 365 )) {
mjonMsgVO.setStartDate(DateUtil.getDateDaysAgo(365)); mjonMsgVO.setStartDate(DateUtils.getDateDaysAgo(365));
mjonMsgVO.setEndDate(DateUtil.getCurrentDate()); mjonMsgVO.setEndDate(DateUtils.getCurrentDate());
}; };

8
src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java
View File

@ -16,7 +16,7 @@ import org.springframework.web.servlet.ModelAndView;
import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
import itn.com.cmm.LoginVO; 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.com.utl.fcc.service.EgovStringUtil;
import itn.let.mjo.apikey.service.ApiCallInfoMngService; import itn.let.mjo.apikey.service.ApiCallInfoMngService;
import itn.let.mjo.apikey.service.ApiKeyMngService; import itn.let.mjo.apikey.service.ApiKeyMngService;
@ -202,8 +202,8 @@ public class EgovMypageRESTAPIController{
if (resultList.size()>0) { if (resultList.size()>0) {
if(StringUtils.isNotEmpty(resultList.get(0).getFrstRegistPnttm())) if(StringUtils.isNotEmpty(resultList.get(0).getFrstRegistPnttm()))
{ {
resultList.get(0).setFrstRegistPnttm(DateUtil.getChangFormatS(resultList.get(0).getFrstRegistPnttm())); resultList.get(0).setFrstRegistPnttm(DateUtils.getChangFormatS(resultList.get(0).getFrstRegistPnttm()));
resultList.get(0).setLastUpdtPnttm(DateUtil.getChangFormatS(resultList.get(0).getLastUpdtPnttm())); resultList.get(0).setLastUpdtPnttm(DateUtils.getChangFormatS(resultList.get(0).getLastUpdtPnttm()));
} }
model.addAttribute("apiVO", resultList.get(0)); model.addAttribute("apiVO", resultList.get(0));
@ -216,7 +216,7 @@ public class EgovMypageRESTAPIController{
System.out.println("!!!!!!!!!!!!!!!!!"); System.out.println("!!!!!!!!!!!!!!!!!");
resultList_call.forEach(t-> { resultList_call.forEach(t-> {
try { try {
t.setFrstRegistPnttm(DateUtil.getChangFormatS(t.getFrstRegistPnttm())); t.setFrstRegistPnttm(DateUtils.getChangFormatS(t.getFrstRegistPnttm()));
} catch (ParseException e) { } catch (ParseException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();

6
src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java
View File

@ -16,7 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.idgnr.EgovIdGnrService;
import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; 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.FaxGroupDataVO;
import itn.let.fax.user.service.impl.FaxDAO; import itn.let.fax.user.service.impl.FaxDAO;
import itn.let.mjo.mjocommon.MjonCommon; import itn.let.mjo.mjocommon.MjonCommon;
@ -860,8 +860,8 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement
if(StringUtils.isEmpty(faxGroupDataVO.getSearchStartDate()) if(StringUtils.isEmpty(faxGroupDataVO.getSearchStartDate())
&& StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate()) && StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate())
) { ) {
faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay()); faxGroupDataVO.setSearchStartDate(DateUtils.getTodayYearAndMonthAndFirstDay());
faxGroupDataVO.setSearchEndDate(DateUtil.getTodayYearAndMonthAndLastDay()); faxGroupDataVO.setSearchEndDate(DateUtils.getTodayYearAndMonthAndLastDay());
} }
/** pageing */ /** pageing */

2
src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
View File

@ -42,7 +42,7 @@
<!-- <!--
20240704 이호영 추가 /cmnDateAndChk.js 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/content.js?date=202211070003"></script>
<script type="text/javascript" src="/publish/js/popupLayer.js"></script> <script type="text/javascript" src="/publish/js/popupLayer.js"></script>
<script type="text/javascript" src="/publish/js/popup.js"></script> <script type="text/javascript" src="/publish/js/popup.js"></script>

0
src/main/webapp/publish/js/cmnDateAndChk.js → src/main/webapp/publish/js/dateUtils.js
View File