From 78dee3750a58d0e168d280057663e29077ffb355 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Fri, 17 Dec 2021 11:53:17 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/cmm/Constant.java | 209 ------------------ src/main/java/nlib/cmm/service/PagingVO.java | 4 +- src/main/java/nlib/sch/util/NlibCmmUtil.java | 89 -------- .../nlib/sch/web/NlibSearchController.java | 12 +- 4 files changed, 6 insertions(+), 308 deletions(-) delete mode 100644 src/main/java/nlib/cmm/Constant.java diff --git a/src/main/java/nlib/cmm/Constant.java b/src/main/java/nlib/cmm/Constant.java deleted file mode 100644 index 4fed11be..00000000 --- a/src/main/java/nlib/cmm/Constant.java +++ /dev/null @@ -1,209 +0,0 @@ -package nlib.cmm; - - -/** - * 상수 정의 - * @author Kdmistrator - * - */ -public class Constant { - public static final String ENCODING_UTF8 = "UTF-8"; - //public static final String NAVER_API_CLIENT_ID = "8eXEekRgHTb5SgAJNqOT"; // server//사용하지 말것 - //public static final String NAVER_API_CLIENT_ID = "E2NR9PXuVJf6GHnnaGrs"; // local //사용하지 말것 - //public static final String GOOGLE_API_KEY = "AIzaSyBs9SeIzKKCM392GpdqxORkHDItauzm7WA"; // 사용하지 말것 - - // FCM Server key - public static final String FCM_SERVER_SEND_URL = "https://fcm.googleapis.com/fcm/send"; - public static final String FCM_SERVER_KEY = "AAAAYRjFhhA:APA91bHcWX8Uan5cc1MuXGvwPQdgcmmRwiuYlO_-FA_o-ysoHBvFlwiGUqApNIWCUbsbSTGbKwEVKqPu8WZV5GH7nbVjo5wWXtXyUzn9PfRdEjEsuhK_XhdLEJ5rH714pnBeu-KNgUxm"; - public static final String FCM_SEND_YN = "N"; - - // kccf home key - public static final String KCCF_HOME_KEY = "kccf.home"; - - // com/context-properties.xml 의 ams 서버관련 키값 - public static final String AMS_SERVER_KEY = "ams.server"; - public static final String AMS_FILE_PATH_KEY = "ams.file.url.path"; - public static final String AMS_ASSETS_PATH_KEY = "ams.assets.url.path"; - public static final String AMS_THUMBNAIL_PATH_KEY = "ams.thumbnail.url.path"; - public static final String NFS_DOC_KEY = "ams.doc.path"; - - // upload 경로 - public static final String UPLOAD_HOME_KEY = "file.upload.home"; // 서버경로 (upload폴더 상위경로) : 로컬 개발시 upload 파일이 로컬에 존재하지 않을 경우 사용 - - //pdfview - public static final String PDF_VIEW_KEY = "pdf.view.path"; - - // com/context-properties.xml 의 nas 서버관련 키값 - public static final String NFS_NAS_KEY = "ams.nas.path"; - - // 나클립스 동영상 플레이어 주소 - public static final String MEDIA_PLAYER_KEY = "naclips.server"; - public static final String MEDIA_PLAYER_VOD_KEY = "naclips.vod.path"; - public static final String MEDIA_PLAYER_AUDIO_KEY = "naclips.audio.path"; - - public static final String [] AREA_CODE_ARRAY = {"02", "051", "053", "032", "062", "042", "052", "044" , "031" , "033" , "043" , "041" , "063", "061" , "054" , "055" , "064" , "070", "0505"}; - public static final String [] MOBILE_CODE_ARRAY = {"010", "011", "016", "017", "018", "019"}; - - public static final String [] DF_SIDO_CODE_ARRAY = {"11","26","27","28","29","30","31","41","42","43","44","45","46","47","48","49"}; - public static final String [] DF_SIDO_NAME_ARRAY = {"서울","부산","대구","인천","광주","대전","울산","경기","강원","충북","충남","전북","전남","경북","경남","제주"}; - - public static final String [] AIS_SIDO_NAME_ARRAY = {"서울","부산","대구","인천","광주","대전","울산","경기","강원","충북","충남","전북","전남","경북","경남","제주","세종","북한","전국"}; - public static final String [] AIS_SIDO_PARAM_NAME_ARRAY = {"서울특별시","부산광역시","대구광역시","인천광역시","광주광역시","대전광역시","울산광역시","경기도","강원도","충청북도","충청남도","전라북도","전라남도","경상북도","경상남도","제주특별자치도","세종특별자치시","북한","전국"}; - - public static final String [] SIDO_NAME_ARRAY = {"서울특별시","부산광역시","대구광역시","인천광역시","광주광역시","대전광역시","울산광역시","경기도","강원도","충청북도","충청남도","전라북도","전라남도","경상북도","경상남도","세종특별자치시","제주특별자치도"}; - - public static final String [] DF_DISS_CODE_ARRAY = {"1","2","3","4","5"}; - public static final String [] DF_DISS_NAME_ARRAY = {"감기","눈병","식중독","천식","피부병"}; - - public static final String [] FCST_TIME_ARRAY = {"03","06","09","12","15","18","21","00"}; - public static final String [][] FCST_TIME_MAPPING_ARRAY = {{"01","02","03"}, {"04","05","06"},{"07","08","09"},{"10","11","12"},{"13","14","15"},{"16","17","18"},{"19","20","21"},{"22","23","00"}}; - - public static final String [] GIA_COTENT_TYPE_ID_ARRAY = {"12","14","15","25","28","32","38","39"}; - public static final String [] GIA_COTENT_TYPE_NAME_ARRAY = {"관광지","문화시설","축제/공연/행사","여행코스","레포츠","숙박","쇼핑","음식"}; - // 축제/공연/행사 -> 공연ㆍ행사 - - public static final String [] DF_COUNCIL_CODE_ARRAY = {"GW","GG","GB","GN","GJ","DG","DJ","BU","SU","SJ","US","IC","JB","JN","JJ","CB","CN"}; - public static final String [] AMS_ASSET_TYPE_ARRAY = {"이미지","동영상","오디오","문서","링크"}; - public static final String [] AMS_CATEGORY_ARRAY = {"A","B","C","D","E","F","G","H","I"}; - - public static final String USE_AT_Y = "Y"; - public static final String USE_AT_N = "N"; - - public static final String CMS_SERIES_DEFAULT = "마을신앙"; - - public static final String QNA_ANSW_N = "답변대기"; - public static final String QNA_ANSW_Y = "답변완료"; - public static final String QNA_PROC_P = "2"; - public static final String QNA_PROC_C = "3"; - - public static final String VIEW_TYPE_L = "L"; //목록 - public static final String VIEW_TYPE_D = "D"; //상세 - - - public static final String LOGIN_HIS_TYPE_I = "I"; - public static final String LOGIN_HIS_TYPE_O = "O"; - - public static final String CODE_ID_COM004 = "COM004"; // 게시판 - public static final String CODE_ID_COM013 = "COM013"; // 회원상태 - public static final String CODE_ID_COM034 = "COM034"; // 이용자 - public static final String CODE_ID_FMS004 = "FMS004"; // 테마 - public static final String CODE_ID_FMS005 = "FMS005"; // 시리즈 - public static final String CODE_ID_FMS006 = "FMS006"; // 시대 - public static final String CODE_ID_FMS007 = "FMS007"; // 자료유형 - public static final String CODE_ID_FMS008 = "FMS008"; // 콘텐츠유형 - public static final String CODE_ID_FMS009 = "FMS009"; // 지역 - public static final String CODE_ID_FMS012 = "FMS012"; // 자료유형(대분류) - public static final String CODE_ID_FMS013 = "FMS013"; // 자료유형(중분류) - public static final String CODE_ID_MASTER_TYPE_DIV_CD = "MASTER_TYPE_DIV_CD"; // 자료유형(대분류) - public static final String CODE_ID_DTLS_TYPE_DIV_CD = "DTLS_TYPE_DIV_CD"; // 자료유형(중분류) - public static final String CODE_ID_FMS014 = "FMS014"; // 주제분야(대주제) - public static final String CODE_ID_FMS015 = "FMS015"; // 주제분야(중주제) - public static final String CODE_ID_FMS016 = "FMS016"; // 지역문화정보 - public static final String CODE_ID_FMS017 = "FMS017"; // 배너위치 - public static final String CODE_ID_FMS018 = "FMS018"; // 문화원 지역 - public static final String CODE_ID_FMS019 = "FMS019"; // 지역문화 PICK(자산유형) - public static final String CODE_ID_FMS020 = "FMS020"; // 로고위치 - - public static final String [] ASSETS_CLASS_ARRAY = {"기획","일반","특화","기타"}; //콘텐츠유형 - public static final String [] ASSETS_CLASS_ARRAY_PICK = {"일반","특화"}; // 지역문화Pick 콘텐츠유형 - public static final String [] ASSETS_TYPE_ARRAY_PICK = {"문서", "이미지", "동영상", "오디오", "링크"}; // 지역문화Pick 자산유형 ("웹툰" 제외) - public static final String [] ASSETS_TYPE_ARRAY_PICK_ALL = {"문서", "이미지", "동영상", "오디오", "링크", "웹툰"}; - - public static final String RES_SEARCHTYPE = "문화원소장"; // 소장자료 검색조건 - - public static final String CODE_ID_COM013_P = "P"; // 회원 가입승인상태 - public static final String CODE_ID_COM013_D = "D"; // 회원삭제 상태 - - public static final String CODE_ID_FMS017_M01 = "M01"; // 배너위치 메인 - public static final String CODE_ID_FMS017_M02 = "M02"; // 배너위치 PICK - public static final String CODE_ID_FMS017_M99 = "M99"; // 배너위치 문화원 - - public static final int BBS_ID_NOTICE_MAIN_VIEW = 3; - public static final int BBS_ID_QNA_MAIN_VIEW = 4; - public static final int BBS_ID_CUL_MAIN_VIEW = 2; - - public static final String BASE_DISTANCE = "10"; - - public static final int CMM_CONTENTS_LIMIT_CNT = 6; // 지역문화Pick 목록 이미지 개수 변경 (2019.10.02) - public static final int CMM_TAGS_LIMIT_CNT = 9; - public static final int CMM_CONTENTS_SMALL_LIMIT_CNT = 2; - - public static final String RECOMMEND_YN_Y = "Y"; - public static final String RECOMMEND_YN_N = "N"; - - public static final String HAVE_DETAIL_CONDITION_Y = "Y"; - public static final String HAVE_DETAIL_CONDITION_N = "N"; - - public static final String SEARCH_TYPE_1 = "1"; - public static final String SEARCH_TYPE_2 = "2"; - - public static final String BBS_TOP_YN_Y = "Y"; - public static final int BBS_TOP_CNT = 4; - - public static final String PMS_CONT_TYPE_G = "EXT_GIA_INFO"; // 한국관광공사 - public static final String PMS_CONT_TYPE_C = "CMM_COUNCIL_INFO"; // 문화원 - - public static final String CONTENT_TYPE_A = "A"; // 지역문화 PICK - public static final String CONTENT_TYPE_B = "B"; // BBS - public static final String CONTENT_TYPE_C = "C"; // 지역문화이야기 - public static final String CONTENT_TYPE_G = "G"; // 지역문화체험 -한국관광공사 api - public static final String CONTENT_TYPE_I = "I"; // 문화원 - public static final String CONTENT_TYPE_P = "P"; // 지역문화포스트 - public static final String CONTENT_TYPE_T = "T"; // 지역문화툰 - - public static final String ACTIVITY_TYPE_B = "B"; // 스크랩 - public static final String ACTIVITY_TYPE_O = "O"; // 최근열람 - - public static final String[] M_TYPE_ARRAY = {"이미지","동영상","오디오","링크"}; - public static final String M_TYPE_I = "I"; // 이미지 - public static final String M_TYPE_V = "V"; // 비디오(동영상) - public static final String M_TYPE_A = "A"; // 오디오 - - // 사용 구분 - public static final String UA_TYPE_W = "W"; // 웹 - public static final String UA_TYPE_M = "M"; // 모바일웹 - public static final String UA_TYPE_A = "A"; // 앱 - public static final String UA_TYPE_R = "R"; // RIS - - - public static final String BBS_ID_NOTICE = "BBSMSTR_000000000001"; // 공지사항 - public static final String BBS_ID_FAQ = "BBSMSTR_000000000002"; // FAQ - public static final String BBS_ID_CUL = "BBSMSTR_000000000003"; // 문화원소식 - public static final String BBS_ID_OUR = "BBSMSTR_000000000004"; // 우리문화 - - public static final String [] BBS_ID_ARRAY = {BBS_ID_NOTICE,BBS_ID_FAQ,BBS_ID_CUL,BBS_ID_OUR}; - public static final String [] BBS_NAME_ARRAY = {"공지사항","FAQ","문화원소식","우리문화"}; - - public static final String [] BBS_MAIN_CUL_TYPE_ARRAY1 = {"공지","뉴스"}; - public static final String [] BBS_MAIN_CUL_TYPE_ARRAY2 = {"행사","축제"}; - - public static final String AUTH_GROUP_DEFAULT_ID = "GROUP_00000000000000"; - public static final String AUTH_ORGNZT_DEFAULT_ID = "ORGNZT_0000000000000"; - - public static final String AUTH_ROLE_ANONYMOUS = "ROLE_ANONYMOUS"; - public static final String AUTH_ROLE_KDM = "ROLE_KDM"; - public static final String AUTH_ROLE_KDM_URL = "/kdm/usr/kdmMgrList.do"; - public static final String AUTH_ROLE_SYM = "ROLE_SYM"; - public static final String AUTH_ROLE_SYM_URL = "/kdm/usr/kdmMgrList.do"; - - public static final String[] INTERCEPTOR_PASS_PATH_ARRAY = {"kdm"}; - - public static final String ANDROID = "android"; - public static final String IOS = "ios"; - public static final String PREFIX_M = "/m"; - - public static final String SCHEDULER_EXT_DF_INFO = "건강질병관리"; - public static final String SCHEDULER_EXT_FD_INFO = "문화정보"; - public static final String SCHEDULER_EXT_GIA_INFO = "관광정보"; - public static final String SCHEDULER_MAIN_A_INFO = "메인 지역문화PICK"; - public static final String SCHEDULER_MAIN_C_INFO = "메인 지역문화이야기"; - public static final String SCHEDULER_MAIN_G_INFO = "메인 지역문화정보"; - public static final String SCHEDULER_MAIN_P_INFO = "메인 지역문화포스트"; - public static final String SCHEDULER_MEDIA_HST_INFO = "월별 지방문화원 인기자료"; - - public static final String [] SCHEDULER_NAME_ARRAY = {SCHEDULER_EXT_DF_INFO,SCHEDULER_EXT_FD_INFO,SCHEDULER_EXT_GIA_INFO}; - - public static enum META_OG_TYPE { website, article }; - - public static final String [] NCULTURE_URL_ARRAY = {"www","www1","www2","cms","cms1","cms2","ams","ams1","ams2","vod","vod1","vod2","api","api1","api2","app","app1","app2","vr","cms-dev","ams-dev","kccf-jira","kccf-wiki","kccf-ci","cloud","kccf2019","doc","webzine","docs","minio","minio-dev","port-dev","app-dev","api-dev","vod-dev","newcms","ncms","ncms-dev","ncms-test","newcms-dev","ams-test","ci","local"}; -} diff --git a/src/main/java/nlib/cmm/service/PagingVO.java b/src/main/java/nlib/cmm/service/PagingVO.java index a1d8ca0e..143eb1c7 100644 --- a/src/main/java/nlib/cmm/service/PagingVO.java +++ b/src/main/java/nlib/cmm/service/PagingVO.java @@ -30,9 +30,9 @@ public class PagingVO { private int pageSize = DEFAULT_PAGE_SIZE; /* 페이지 크기 (1페이지당 보여줄 자료건수) */ private int totRecordCount = 0; /* 총건수 */ - private int pageStart = 0; /* 시작번호 (limit용)*/ + private int pageStart = 0; /* 시작번호 (쿼리 limit용)*/ private int startPage = 0; /* 시작페이지 */ - private int endPage = 0; /* 끝페이지 */ + private int endPage = 0; /* 현재 노출페이지중 마지막 페이지 (ex << < 1 2 3 4 5 > >> 중 5 ) */ private int lastPage = 0; /* 마지막페이지 */ private int cntPage = DEFAULT_PAGE_SIZE; /* 페이지 네비게이션에 표시되는 페이지 개수 (ex) << < 1 2 3 4 5 > >> */ diff --git a/src/main/java/nlib/sch/util/NlibCmmUtil.java b/src/main/java/nlib/sch/util/NlibCmmUtil.java index 91d79218..8d3f2700 100644 --- a/src/main/java/nlib/sch/util/NlibCmmUtil.java +++ b/src/main/java/nlib/sch/util/NlibCmmUtil.java @@ -1,9 +1,7 @@ package nlib.sch.util; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; -import java.net.URLEncoder; import java.sql.SQLException; import java.util.List; import java.util.Map; @@ -21,13 +19,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import org.springframework.ui.ModelMap; -import egovframework.rte.fdl.cmmn.exception.EgovBizException; import egovframework.rte.fdl.property.EgovPropertyService; -import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.psl.dataaccess.util.EgovMap; -import nlib.cmm.Constant; /** @@ -52,24 +46,6 @@ public class NlibCmmUtil { public static String reflectionToString(Object obj) { return ToStringBuilder.reflectionToString(obj); } - public static boolean isRoleKdm() { - List listRole = (List) EgovUserDetailsHelper.getAuthorities(); - for (String role : listRole) { - if (Constant.AUTH_ROLE_KDM.equals(role)) { - return true; - } - } - return false; - } - public static boolean isRoleSysKdm() { - List listRole = (List) EgovUserDetailsHelper.getAuthorities(); - for (String role : listRole) { - if (Constant.AUTH_ROLE_SYM.equals(role)) { - return true; - } - } - return false; - } public static String clearXSS(String value) { if (value == null || value.trim().equals("")) { @@ -169,22 +145,6 @@ public class NlibCmmUtil { } return ipAddress; } - public static String returnUrl(HttpServletRequest req, String parameterName) { - String url = req.getRequestURI(); - if (url.startsWith("/logout") || url.startsWith("/error") || "/".equals(url)) { - return ""; - } - String queryString = req.getQueryString(); - if (queryString != null) { - url += "?" + queryString; - try { - url = URLEncoder.encode(url, Constant.ENCODING_UTF8); - } catch (UnsupportedEncodingException e) { - url = ""; - } - } - return "?" + parameterName + "=" + url; - } public static String getUrl(HttpServletRequest req, String domain) { final String uri = req.getRequestURI(); @@ -230,22 +190,6 @@ public class NlibCmmUtil { } return isEmpty; } - public static boolean checkMaxbyte(String chkString, int maxbyte) { - boolean checkResult = true; - if (StringUtils.isBlank(chkString)) return checkResult; - int bytes = 0; - try { - bytes = chkString.getBytes(Constant.ENCODING_UTF8).length; - if (bytes > maxbyte) checkResult = false; - } catch (UnsupportedEncodingException e) { - LOGGER.error("fail in checkMaxbyte() maxbyte="+maxbyte+", bytes="+bytes+", chkString="+chkString, e); - checkResult = false; - } catch (Exception e) { - LOGGER.error("fail in checkMaxbyte() maxbyte="+maxbyte+", bytes="+bytes+", chkString="+chkString, e); - checkResult = false; - } - return checkResult; - } public static String[] getValueArr(List list, String key) { String[] exidArr = null; if (list == null || list.size() == 0) return exidArr; @@ -315,39 +259,6 @@ public class NlibCmmUtil { return ip; } - public static void setNfsPathModelMap(HttpServletRequest req, ModelMap modelMap){ - // ams 경로 - String nfsNasPath = getPropertyStr(Constant.NFS_NAS_KEY); - String nfsDocPath = getPropertyStr(Constant.NFS_DOC_KEY); - modelMap.addAttribute("nfsNasPath", nfsNasPath); - modelMap.addAttribute("nfsDocPath", nfsDocPath); - } - public static String getLinkUrl(String aId, String mId )throws EgovBizException { - - DataMap param = new DataMap(); - param.put("aId", aId); - param.put("mId", mId); - DataMap media = new DataMap(); - String mediaId = media.getString("mediaId"); - String mediaInterfaceId = media.getString("mediaInterfaceId"); - - String rtnStr = ""; - if (StringUtils.isNotEmpty(mediaInterfaceId)) { // mediaInterfaceId가 존재할 경우만 URL 정보 생성 - if(media.get("assetType") != null){ - if(media.get("assetType").toString().equals("문서") ){ - rtnStr = NlibCmmUtil.getPropertyStr(Constant.KCCF_HOME_KEY)+"/npdfView.do?"; - rtnStr += "npdf="+Constant.UA_TYPE_R+mediaInterfaceId; // MEDIA 의 INTERFACE_ID 사용 - - }else if(media.get("assetType").toString().equals("링크")){ - rtnStr = media.get("linkData").toString(); - }else{ - rtnStr = NlibCmmUtil.getPropertyStr(Constant.KCCF_HOME_KEY)+"/lib/libraryDetail.do?contentId="+mediaId; - rtnStr += "&rfType="+Constant.UA_TYPE_R; // 히스토리 등록 시 사용 - } - } - } - return rtnStr; - } } diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 1fb37107..da782a47 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import egovframework.rte.fdl.cmmn.exception.EgovBizException; -import nlib.cmm.Constant; import nlib.cmm.NlibCommonController; import nlib.cmm.service.CodeService; import nlib.cmm.service.NlibProperty; @@ -141,9 +140,6 @@ public class NlibSearchController extends NlibCommonController { //결과 데이터 담기 searchVO.setResultList(operList); - // 경로 - NlibCmmUtil.setNfsPathModelMap(request,model); - model.addAttribute("pageVO", pageVO); model.addAttribute("searchVO", searchVO); @@ -156,8 +152,8 @@ public class NlibSearchController extends NlibCommonController { //주제분야 목록 조회 List> clsf = codeService.listCtClsfs(); //자료유형 - List> firstClassList = codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD); - List> secondClassList = codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD); + List> firstClassList = codeService.listCodes("MASTER_TYPE_DIV_CD"); + List> secondClassList = codeService.listCodes("DTLS_TYPE_DIV_CD"); //검색엔진 주제분야 카운트 List> subject= searchVO.getSubjectCountList(); @@ -497,8 +493,8 @@ public class NlibSearchController extends NlibCommonController { model.addAttribute("secondCategoryList", clsf); //자료유형 - model.addAttribute("firstClassList", codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD)); - model.addAttribute("secondClassList", codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD)); + model.addAttribute("firstClassList", codeService.listCodes("MASTER_TYPE_DIV_CD")); + model.addAttribute("secondClassList", codeService.listCodes("DTLS_TYPE_DIV_CD")); // CSRF 토큰 생성 String token = generateCsrfToken(request);