Commit @b65e809b418a5fecd5c8e3ee52381813ad10a21d

037eb28

b65e809

src/main/java/com/takensoft/cms/author/service/Impl/AuthorServiceImpl.java

--- src/main/java/com/takensoft/cms/author/service/Impl/AuthorServiceImpl.java

+++ src/main/java/com/takensoft/cms/author/service/Impl/AuthorServiceImpl.java


 import com.takensoft.cms.menu.service.MenuAuthorService;
 import com.takensoft.common.Pagination;
 import com.takensoft.common.exception.*;
+import com.takensoft.common.idgen.service.IdgenService;
 import com.takensoft.common.util.JWTUtil;
 import lombok.RequiredArgsConstructor;
 import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;

     private final AuthorDAO authorDAO;
     private final MenuAuthorService menuAuthorService;
     private final JWTUtil jwtUtil;
+    private final IdgenService authrtCdIdgn;
 
     /**
      * @param authorVO - 권한 정보

         try {
             // 등록된 토큰에서 사용자 정보 조회
             authorVO.setRgtr(jwtUtil.getWriter());
+            authorVO.setAuthrtCdId(authrtCdIdgn.getNextStringId());
             int result = authorDAO.save(authorVO);
             if(result == 0) {
                 throw new CustomInsertFailException("권한 등록에 실패했습니다.");

037eb28

b65e809

src/main/java/com/takensoft/cms/author/vo/AuthorVO.java

--- src/main/java/com/takensoft/cms/author/vo/AuthorVO.java

+++ src/main/java/com/takensoft/cms/author/vo/AuthorVO.java


     private String mdfr;             // 수정자
     private String mdfrNm;           // 수정자명
     private String mdfcnDt;          // 수정일
+    private String authrtCdId;        // 권한코드아이디
 
 }

037eb28

b65e809

src/main/java/com/takensoft/cms/bbs/vo/BbsMngVO.java

--- src/main/java/com/takensoft/cms/bbs/vo/BbsMngVO.java

+++ src/main/java/com/takensoft/cms/bbs/vo/BbsMngVO.java


     private String mdfcnDt;                 // 수정일
     private String cd;                      // 페이지 유형
     private int bbsCnCnt;                   // 게시물 수
+    private String bbsTypeKornNm;           // 게시판유형한글명
 
     public BbsMngVO() {
         this.fileExtnNmList = new ArrayList<>();

037eb28

b65e809

src/main/java/com/takensoft/cms/loginPolicy/service/impl/LoginModeServiceImpl.java

--- src/main/java/com/takensoft/cms/loginPolicy/service/impl/LoginModeServiceImpl.java

+++ src/main/java/com/takensoft/cms/loginPolicy/service/impl/LoginModeServiceImpl.java


      */
     @Override
     public String getLoginMode() {
-
         return loginModeDAO.selectLatestLoginMode();
     }
 

037eb28

b65e809

src/main/java/com/takensoft/cms/loginPolicy/web/LoginPolicyController.java

--- src/main/java/com/takensoft/cms/loginPolicy/web/LoginPolicyController.java

+++ src/main/java/com/takensoft/cms/loginPolicy/web/LoginPolicyController.java


      */
     @PostMapping(value ="/getLoginMode.json")
     public Object getLoginMode() {
-        String loginMode = loginModeService.getLoginMode();
+     //   String loginMode = loginModeService.getLoginMode();
+        String loginMode = "S";
         return resUtil.successRes(loginMode, MessageCode.COMMON_SUCCESS);
     }
 

037eb28

b65e809

src/main/java/com/takensoft/common/filter/LoginFilter.java

--- src/main/java/com/takensoft/common/filter/LoginFilter.java

+++ src/main/java/com/takensoft/common/filter/LoginFilter.java


 import com.takensoft.cms.mber.vo.LgnHstryVO;
 import com.takensoft.cms.mber.vo.MberVO;
 import com.takensoft.cms.token.vo.RefreshTknVO;
-import com.takensoft.common.config.AppConfig;
 import com.takensoft.common.exception.FilterExceptionHandler;
 import com.takensoft.common.util.HttpRequestUtil;
 import com.takensoft.common.util.JWTUtil;

037eb28

b65e809

src/main/java/com/takensoft/common/idgen/context/ContextIdgen.java

--- src/main/java/com/takensoft/common/idgen/context/ContextIdgen.java

+++ src/main/java/com/takensoft/common/idgen/context/ContextIdgen.java

...	...	@@ -189,4 +189,15 @@
189	189	idgenServiceImpl.setTblNm("CNTXT_PTH_ID");
190	190	return idgenServiceImpl;
191	191	}
	192	+
	193	+ // 권한코드 관리
	194	+ @Bean(name = "authrtCdIdgn")
	195	+ public IdgenService authrtCdIdgn() {
	196	+ IdgenService idgenServiceImpl = new IdgenService();
	197	+ idgenServiceImpl.setCipers(15);
	198	+ idgenServiceImpl.setFillChar('0');
	199	+ idgenServiceImpl.setPrefix("AUTHRT_CD_");
	200	+ idgenServiceImpl.setTblNm("AUTHRT_CD_ID");
	201	+ return idgenServiceImpl;
	202	+ }
192	203	} (파일 끝에 줄바꿈 문자 없음)

037eb28

b65e809

src/main/resources/mybatis/mapper/author/author-SQL.xml

--- src/main/resources/mybatis/mapper/author/author-SQL.xml

+++ src/main/resources/mybatis/mapper/author/author-SQL.xml


     <select id="findByCheckAuthorCode" parameterType="AuthorVO" resultType="boolean">
         SELECT COUNT(authrt_cd)
           FROM authrt_info
-         WHERE authrt_cd = #{authrtCd}
+         WHERE use_yn = 'Y'
+         AND authrt_cd = #{authrtCd}
          <if test="originAuthrtCd != null and originAuthrtCd != ''">
            AND authrt_cd != #{originAuthrtCd}
          </if>

              , ai.mdfr
              , (SELECT mbr_nm FROM mbr_info WHERE mbr_id = ai.mdfr) AS mdfr_nm
              , TO_CHAR(ai.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
+             , ai.authrt_cd_id
           FROM authrt_info ai
     </sql>
 

             , sys_pvsn_yn
             , rgtr
             , reg_dt
+            , authrt_cd_id
         ) VALUES (
             #{authrtCd}
             , #{authrtNm}

             , 1
             , #{rgtr}
             , NOW()
+            , #{authrtCdId}
         )
     </insert>
     <!--

              , use_yn = #{useYn}
              , mdfr = #{mdfr}
              , mdfcn_dt = NOW()
-        WHERE authrt_cd = #{originAuthrtCd}
+        WHERE authrt_cd = #{authrtCd}
     </update>
 </mapper>

037eb28

b65e809

src/main/resources/mybatis/mapper/bbs/bbsMng-SQL.xml

--- src/main/resources/mybatis/mapper/bbs/bbsMng-SQL.xml

+++ src/main/resources/mybatis/mapper/bbs/bbsMng-SQL.xml


     <sql id="selectBbsMng">
         SELECT
                bm.bbs_mng_id
-             , bm.bbs_type_id
-             , bbs_nm
-             , bbs_up_info
-             , bbs_expln
-             , artcl_cnt
-             , atch_file_use_yn
-             , ntc_use_yn
-             , file_extn_nm
-             , file_sz_lmt
-             , prvt_pst_use_yn
-             , bfr_aftr_pst_use_yn
-             , cmnt_use_yn
-             , bm.use_yn
-             , bm.rgtr
-             , to_char(bm.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
-             , bm.mdfr
-             , to_char(bm.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
-             , cd
-
+                , bm.bbs_type_id
+                , (select SPLIT_PART(bbs_type_korn_nm, ' ', 1) from bbs_type_mng btm where bm.bbs_type_id = btm.bbs_type_id) as bbsTypeKornNm
+                , bbs_nm
+                , bbs_up_info
+                , bbs_expln
+                , artcl_cnt
+                , atch_file_use_yn
+                , ntc_use_yn
+                , file_extn_nm
+                , file_sz_lmt
+                , prvt_pst_use_yn
+                , bfr_aftr_pst_use_yn
+                , cmnt_use_yn
+                , bm.use_yn
+                , bm.rgtr
+                , to_char(bm.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
+                , bm.mdfr
+                , to_char(bm.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
+                , cd
     </sql>
 
     <sql id="selectRequirement">

...	...	@@ -40,6 +40,7 @@
40	40	private String mdfcnDt; // 수정일
41	41	private String cd; // 페이지 유형
42	42	private int bbsCnCnt; // 게시물 수
	43	+ private String bbsTypeKornNm; // 게시판유형한글명
43	44
44	45	public BbsMngVO() {
45	46	this.fileExtnNmList = new ArrayList<>();

...	...	@@ -6,6 +6,7 @@
6	6	import com.takensoft.cms.menu.service.MenuAuthorService;
7	7	import com.takensoft.common.Pagination;
8	8	import com.takensoft.common.exception.*;
	9	+import com.takensoft.common.idgen.service.IdgenService;
9	10	import com.takensoft.common.util.JWTUtil;
10	11	import lombok.RequiredArgsConstructor;
11	12	import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
...	...	@@ -35,6 +36,7 @@
35	36	private final AuthorDAO authorDAO;
36	37	private final MenuAuthorService menuAuthorService;
37	38	private final JWTUtil jwtUtil;
	39	+ private final IdgenService authrtCdIdgn;
38	40
39	41	/**
40	42	* @param authorVO - 권한 정보
...	...	@@ -130,6 +132,7 @@
130	132	try {
131	133	// 등록된 토큰에서 사용자 정보 조회
132	134	authorVO.setRgtr(jwtUtil.getWriter());
	135	+ authorVO.setAuthrtCdId(authrtCdIdgn.getNextStringId());
133	136	int result = authorDAO.save(authorVO);
134	137	if(result == 0) {
135	138	throw new CustomInsertFailException("권한 등록에 실패했습니다.");

...	...	@@ -34,5 +34,6 @@
34	34	private String mdfr; // 수정자
35	35	private String mdfrNm; // 수정자명
36	36	private String mdfcnDt; // 수정일
	37	+ private String authrtCdId; // 권한코드아이디
37	38
38	39	}

...	...	@@ -34,7 +34,6 @@
34	34	*/
35	35	@Override
36	36	public String getLoginMode() {
37		-
38	37	return loginModeDAO.selectLatestLoginMode();
39	38	}
40	39

...	...	@@ -96,7 +96,8 @@
96	96	*/
97	97	@PostMapping(value ="/getLoginMode.json")
98	98	public Object getLoginMode() {
99		- String loginMode = loginModeService.getLoginMode();
	99	+ // String loginMode = loginModeService.getLoginMode();
	100	+ String loginMode = "S";
100	101	return resUtil.successRes(loginMode, MessageCode.COMMON_SUCCESS);
101	102	}
102	103

...	...	@@ -9,7 +9,6 @@
9	9	import com.takensoft.cms.mber.vo.LgnHstryVO;
10	10	import com.takensoft.cms.mber.vo.MberVO;
11	11	import com.takensoft.cms.token.vo.RefreshTknVO;
12		-import com.takensoft.common.config.AppConfig;
13	12	import com.takensoft.common.exception.FilterExceptionHandler;
14	13	import com.takensoft.common.util.HttpRequestUtil;
15	14	import com.takensoft.common.util.JWTUtil;

...	...	@@ -15,7 +15,8 @@
15	15	<select id="findByCheckAuthorCode" parameterType="AuthorVO" resultType="boolean">
16	16	SELECT COUNT(authrt_cd)
17	17	FROM authrt_info
18		- WHERE authrt_cd = #{authrtCd}
	18	+ WHERE use_yn = 'Y'
	19	+ AND authrt_cd = #{authrtCd}
19	20	<if test="originAuthrtCd != null and originAuthrtCd != ''">
20	21	AND authrt_cd != #{originAuthrtCd}
21	22	</if>
...	...	@@ -33,6 +34,7 @@
33	34	, ai.mdfr
34	35	, (SELECT mbr_nm FROM mbr_info WHERE mbr_id = ai.mdfr) AS mdfr_nm
35	36	, TO_CHAR(ai.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
	37	+ , ai.authrt_cd_id
36	38	FROM authrt_info ai
37	39	</sql>
38	40
...	...	@@ -102,6 +104,7 @@
102	104	, sys_pvsn_yn
103	105	, rgtr
104	106	, reg_dt
	107	+ , authrt_cd_id
105	108	) VALUES (
106	109	#{authrtCd}
107	110	, #{authrtNm}
...	...	@@ -110,6 +113,7 @@
110	113	, 1
111	114	, #{rgtr}
112	115	, NOW()
	116	+ , #{authrtCdId}
113	117	)
114	118	</insert>
115	119	<!--
...	...	@@ -125,6 +129,6 @@
125	129	, use_yn = #{useYn}
126	130	, mdfr = #{mdfr}
127	131	, mdfcn_dt = NOW()
128		- WHERE authrt_cd = #{originAuthrtCd}
	132	+ WHERE authrt_cd = #{authrtCd}
129	133	</update>
130	134	</mapper> (파일 끝에 줄바꿈 문자 없음)

...	...	@@ -87,25 +87,25 @@
87	87	<sql id="selectBbsMng">
88	88	SELECT
89	89	bm.bbs_mng_id
90		- , bm.bbs_type_id
91		- , bbs_nm
92		- , bbs_up_info
93		- , bbs_expln
94		- , artcl_cnt
95		- , atch_file_use_yn
96		- , ntc_use_yn
97		- , file_extn_nm
98		- , file_sz_lmt
99		- , prvt_pst_use_yn
100		- , bfr_aftr_pst_use_yn
101		- , cmnt_use_yn
102		- , bm.use_yn
103		- , bm.rgtr
104		- , to_char(bm.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
105		- , bm.mdfr
106		- , to_char(bm.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
107		- , cd
108		-
	90	+ , bm.bbs_type_id
	91	+ , (select SPLIT_PART(bbs_type_korn_nm, ' ', 1) from bbs_type_mng btm where bm.bbs_type_id = btm.bbs_type_id) as bbsTypeKornNm
	92	+ , bbs_nm
	93	+ , bbs_up_info
	94	+ , bbs_expln
	95	+ , artcl_cnt
	96	+ , atch_file_use_yn
	97	+ , ntc_use_yn
	98	+ , file_extn_nm
	99	+ , file_sz_lmt
	100	+ , prvt_pst_use_yn
	101	+ , bfr_aftr_pst_use_yn
	102	+ , cmnt_use_yn
	103	+ , bm.use_yn
	104	+ , bm.rgtr
	105	+ , to_char(bm.reg_dt, 'YYYY-MM-DD HH24:MI') AS reg_dt
	106	+ , bm.mdfr
	107	+ , to_char(bm.mdfcn_dt, 'YYYY-MM-DD HH24:MI') AS mdfcn_dt
	108	+ , cd
109	109	</sql>
110	110
111	111	<sql id="selectRequirement">

Delete comment