From 9f247b6c9fee5e6e77708a9918d86531661c6480 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 19 May 2023 16:56:24 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20:=20=EB=A9=94=EB=89=B4=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EC=BB=AC=EB=9F=BC=EB=AA=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD(menu=5Fordr=20->=20srt=5Ford)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/sql/외부연계.sql | 2 +- .../framework/biz/mng/menu/MenuCreateMngVO.java | 16 ++++++++-------- .../framework/biz/mng/menu/MenuListMngVO.java | 16 ++++++++-------- .../framework/biz/mng/menu/XitMenuInfoVO.java | 2 +- .../menu/service/bean/MenuMgtServiceBean.java | 4 ++-- .../xit/fims/framework/core/XitMenuManageVO.java | 2 +- .../framework/cache/cachemenu-mysql-mapper.xml | 6 +++--- .../framework/cmm/XitFrameCrud-mysql-mapper.xml | 12 ++++++------ .../framework/cmm/XitFrameUnit-mysql-mapper.xml | 12 ++++++------ .../framework/cmm/XitMain-mysql-mapper.xml | 8 ++++---- .../mng/menu/menu-by-role-mysql-mapper.xml | 4 ++-- .../framework/mng/menu/menu-mysql-mapper.xml | 12 ++++++------ .../framework/mng/menu/XitMenuListMng.xml | 2 +- .../biz/mng/menu/backup/XitMenuListMng_edit.jsp | 6 +++--- .../biz/mng/menu/backup/XitMenuListMng_input.jsp | 6 +++--- .../framework/biz/mng/menu/mngMenuMgtForm.jsp | 2 +- .../framework/biz/mng/menu/mngMenuMgtPopup.jsp | 6 +++--- 17 files changed, 59 insertions(+), 59 deletions(-) diff --git a/db/sql/외부연계.sql b/db/sql/외부연계.sql index 12607646..384a4828 100644 --- a/db/sql/외부연계.sql +++ b/db/sql/외부연계.sql @@ -131,7 +131,7 @@ UPDATE tb_ec_ctzn_sttemnt ; SELECT menu_no - , menu_ordr + , srt_ord , menu_nm , prnt_no , dscrp diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuCreateMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuCreateMngVO.java index b0de6cdb..37f66103 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuCreateMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuCreateMngVO.java @@ -42,7 +42,7 @@ public class MenuCreateMngVO extends BaseVO { /** 부모메뉴ID **/ private String prntNo; /** 메뉴순서 **/ - private String menuOrdr; + private String srtOrd; /** 메뉴명 **/ private String menuNm; /** 프로그램명 **/ @@ -176,18 +176,18 @@ public class MenuCreateMngVO extends BaseVO { this.prntNo = prntNo; } /** - * menuOrdr attribute 값을 리턴한다. + * srtOrd attribute 값을 리턴한다. * @return String */ - public String getMenuOrdr() { - return menuOrdr; + public String getSrtOrd() { + return srtOrd; } /** - * menuOrdr attribute 값을 설정한다. - * @param menuOrdr String + * srtOrd attribute 값을 설정한다. + * @param srtOrd String */ - public void setMenuOrdr(String menuOrdr) { - this.menuOrdr = menuOrdr; + public void setSrtOrd(String srtOrd) { + this.srtOrd = srtOrd; } /** * menuNm attribute 값을 리턴한다. diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java index b361e8f7..0053b73e 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java @@ -21,7 +21,7 @@ public class MenuListMngVO { /** 메뉴번호 */ private int menuNo; /** 메뉴순서 */ - private int menuOrdr; + private int srtOrd; /** 메뉴명 */ private String menuNm; /** 상위메뉴번호 */ @@ -81,18 +81,18 @@ public class MenuListMngVO { this.menuNo = menuNo; } /** - * menuOrdr attribute를 리턴한다. + * srtOrd attribute를 리턴한다. * @return int */ - public int getMenuOrdr() { - return menuOrdr; + public int getSrtOrd() { + return srtOrd; } /** - * menuOrdr attribute 값을 설정한다. - * @param menuOrdr int + * srtOrd attribute 값을 설정한다. + * @param srtOrd int */ - public void setMenuOrdr(int menuOrdr) { - this.menuOrdr = menuOrdr; + public void setSrtOrd(int srtOrd) { + this.srtOrd = srtOrd; } /** * menuNm attribute를 리턴한다. diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/menu/XitMenuInfoVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/menu/XitMenuInfoVO.java index ac202067..e3d8f3e2 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/menu/XitMenuInfoVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/menu/XitMenuInfoVO.java @@ -20,7 +20,7 @@ public class XitMenuInfoVO { private String menuNm; //메뉴 명 private String progrmFileNm; //프로그램 파일 명 private String prntNo; //상위 메뉴 번호 - private String menuOrdr; //메뉴 순서 + private String srtOrd; //메뉴 순서 private String dscrp; //메뉴 설명 private String relateImageCours; //관계 이미지 경로 private String relateImagePath; //관계 이미지 경로 diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/menu/service/bean/MenuMgtServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/menu/service/bean/MenuMgtServiceBean.java index a6ce7b11..b114fb60 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/menu/service/bean/MenuMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/menu/service/bean/MenuMgtServiceBean.java @@ -378,8 +378,8 @@ public class MenuMgtServiceBean extends AbstractServiceBean implements MenuMgtSe cell = row.getCell(1); //메뉴순서 if (cell != null) { Double doubleCell = new Double(cell.getNumericCellValue()); - //vo.setMenuOrdr(Integer.parseInt("" + doubleCell.longValue())); - vo.setMenuOrdr("" + doubleCell.longValue()); + //vo.setSrtOrd(Integer.parseInt("" + doubleCell.longValue())); + vo.setSrtOrd("" + doubleCell.longValue()); } cell = row.getCell(2); //메뉴명 if (cell != null) { diff --git a/src/main/java/kr/xit/fims/framework/core/XitMenuManageVO.java b/src/main/java/kr/xit/fims/framework/core/XitMenuManageVO.java index 0101d716..2d678c75 100644 --- a/src/main/java/kr/xit/fims/framework/core/XitMenuManageVO.java +++ b/src/main/java/kr/xit/fims/framework/core/XitMenuManageVO.java @@ -25,7 +25,7 @@ public class XitMenuManageVO { /** 메뉴번호 */ private int menuNo; /** 메뉴순서 */ - private int menuOrdr; + private int srtOrd; /** 메뉴명 */ private String menuNm; /** 상위메뉴번호 */ diff --git a/src/main/resources/sql/mapper/framework/cache/cachemenu-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cache/cachemenu-mysql-mapper.xml index c3a98459..79b08984 100644 --- a/src/main/resources/sql/mapper/framework/cache/cachemenu-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cache/cachemenu-mysql-mapper.xml @@ -20,7 +20,7 @@ FROM xit_menu_info B INNER JOIN tree_query D ON B.menu_no = D.menu_id - ORDER BY D.parnt_menu_id, B.menu_ordr + ORDER BY D.parnt_menu_id, B.srt_ord diff --git a/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml index f2a3731b..0cf2690e 100644 --- a/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml @@ -1718,7 +1718,7 @@ ,MENU_NM ,PROGRM_FILE_NM ,prnt_no - ,MENU_ORDR + ,srt_ord ,dscrp ,RELATE_IMAGE_COURS ,RELATE_IMAGE_NM @@ -1728,7 +1728,7 @@ AND MENU_NM = #{menu_nm } AND PROGRM_FILE_NM = #{progrm_file_nm } AND prnt_no = #{prnt_no } - AND MENU_ORDR = #{menu_ordr } + AND srt_ord = #{srt_ord } AND dscrp = #{dscrp } AND RELATE_IMAGE_COURS = #{relateImageCours @@ -1742,7 +1742,7 @@ ,MENU_NM ,PROGRM_FILE_NM ,prnt_no - ,MENU_ORDR + ,srt_ord ,dscrp ,RELATE_IMAGE_COURS ,RELATE_IMAGE_NM @@ -1758,7 +1758,7 @@ ,MENU_NM ,PROGRM_FILE_NM ,prnt_no - ,MENU_ORDR + ,srt_ord ,dscrp ,RELATE_IMAGE_COURS ,RELATE_IMAGE_NM @@ -1767,7 +1767,7 @@ ,#{menu_nm } ,#{progrm_file_nm } ,#{prnt_no } - ,#{menu_ordr } + ,#{srt_ord } ,#{dscrp } ,#{relate_image_cours} ,#{relate_image_nm } @@ -1781,7 +1781,7 @@ MENU_NM = IFNULL(#{menu_nm }, MENU_NM) ,PROGRM_FILE_NM = #{progrm_file_nm } ,prnt_no = #{prnt_no } - ,MENU_ORDR = #{menu_ordr } + ,srt_ord = #{srt_ord } ,dscrp = #{dscrp } ,RELATE_IMAGE_COURS = #{relateImageCours diff --git a/src/main/resources/sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml index d058b8fe..be9eed19 100644 --- a/src/main/resources/sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml @@ -53,9 +53,9 @@ INNER JOIN TREE_QUERY D ON B.MENU_NO=D.MENU_ID WHERE 1=1 - - - ORDER BY D.PARNT_MENU_ID, B.MENU_ORDR + + + ORDER BY D.PARNT_MENU_ID, B.srt_ord diff --git a/src/main/resources/sql/mapper/framework/cmm/XitMain-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/XitMain-mysql-mapper.xml index 6b792aa7..445e4a7d 100644 --- a/src/main/resources/sql/mapper/framework/cmm/XitMain-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/XitMain-mysql-mapper.xml @@ -7,7 +7,7 @@ /** 화면 상단 메뉴목록 조회 */ SELECT B.MENU_NO AS "menuNo" - ,B.MENU_ORDR AS "menuOrdr" + ,B.srt_ord AS "srtOrd" ,B.MENU_NM AS "menuNm" ,B.prnt_no AS "prntNo" ,B.dscrp AS "dscrp" @@ -25,7 +25,7 @@ WHERE 1=1 AND B.MENU_NO > 0 AND B.prnt_no = 0 - ORDER BY B.MENU_ORDR + ORDER BY B.srt_ord @@ -34,7 +34,7 @@ /** 화면 좌측 메뉴목록 조회 */ SELECT B.MENU_NO AS "menuNo" - ,B.MENU_ORDR AS "menuOrdr" + ,B.srt_ord AS "srtOrd" ,B.MENU_NM AS "menuNm" ,B.prnt_no AS "prntNo" ,B.RELATE_IMAGE_COURS AS "relateImagePath" @@ -47,7 +47,7 @@ WHERE FA.SCRTY_SETUP_TRGET_ID = #{tmp_UniqId} ) C ON A.AUTHOR_CODE = C.AUTHOR_CODE WHERE 1=1 - ORDER BY B.MENU_ORDR + ORDER BY B.srt_ord diff --git a/src/main/resources/sql/mapper/framework/mng/menu/menu-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/menu/menu-mysql-mapper.xml index 841d6072..eb698751 100644 --- a/src/main/resources/sql/mapper/framework/mng/menu/menu-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/menu/menu-mysql-mapper.xml @@ -8,7 +8,7 @@ ************************************************************************************************************** --> SELECT menu_no - , menu_ordr + , srt_ord , menu_nm , prnt_no , dscrp @@ -56,7 +56,7 @@ , menu_nm , progrm_file_nm , prnt_no - , menu_ordr + , srt_ord , dscrp , relate_image_cours , relate_image_nm @@ -65,7 +65,7 @@ , #{menuNm} , #{progrmFileNm} , #{prntNo} - , #{menuOrdr} + , #{srtOrd} , #{dscrp} , #{relateImageCours} , #{relateImageNm} @@ -78,7 +78,7 @@ SET menu_nm = IF(menu_nm = #{menuNm}, menu_nm, #{menuNm}) , progrm_file_nm = IF(progrm_file_nm = #{progrmFileNm}, progrm_file_nm, #{progrmFileNm}) , prnt_no = IF(prnt_no = #{prntNo}, prnt_no, #{prntNo}) - , menu_ordr = IF(menu_ordr = #{menuOrdr}, menu_ordr, #{menuOrdr}) + , srt_ord = IF(srt_ord = #{srtOrd}, srt_ord, #{srtOrd}) , dscrp = IF(dscrp = #{dscrp}, dscrp, #{dscrp}) , relate_image_cours = IF(relate_image_cours = #{relateImageCours}, relate_image_cours, #{relateImageCours}) , relate_image_nm = IF(relate_image_nm = #{relateImageNm}, relate_image_nm, #{relateImageNm}) @@ -136,7 +136,7 @@ /** 메뉴목록 조회 */ SELECT A.MENU_NO AS "menuNo" - , A.MENU_ORDR AS "menuOrdr" + , A.srt_ord AS "srtOrd" , A.MENU_NM AS "menuNm" , A.prnt_no AS "prntNo" , (SELECT count(B.MENU_NO) @@ -145,7 +145,7 @@ AND B.AUTHOR_CODE = #{authorCode}) AS "chkYeoBu" FROM XIT_MENU_INFO A WHERE A.MENU_NO > 0 - ORDER BY A.MENU_ORDR + ORDER BY A.srt_ord