Commit @52c91c62aadeaada3f725bba7405abfe271cd925

6fc6147

52c91c6

src/main/java/com/takensoft/cms/loginPolicy/dao/LoginPolicyDAO.java

--- src/main/java/com/takensoft/cms/loginPolicy/dao/LoginPolicyDAO.java

+++ src/main/java/com/takensoft/cms/loginPolicy/dao/LoginPolicyDAO.java


      *
      * 중복로그인 조회
      */
-    Boolean selectLatestPolicy();
+    String selectLatestPolicy();
 
     /**
      * @param loginPolicyVO - 중복로그인 정보

6fc6147

52c91c6

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

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

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


      */
     @Override
     public boolean getPolicy() {
-        return loginPolicyDAO.selectLatestPolicy();
+        String policyStatus =  loginPolicyDAO.selectLatestPolicy();
+
+        if(policyStatus.equals("Y")){
+            return true;
+        }else{
+            return false;
+        }
     }
 
     /**

      */
     @Override
     public int insertPolicy(LoginPolicyVO loginPolicyVO) {
-        loginPolicyVO.setId(loginPolicyIdgn.getNextStringId()); // ID 자동 생성
+        loginPolicyVO.setPolicyId(loginPolicyIdgn.getNextStringId()); // ID 자동 생성
         return loginPolicyDAO.insertPolicy(loginPolicyVO);
     }
 

6fc6147

52c91c6

src/main/java/com/takensoft/cms/loginPolicy/vo/LoginPolicyVO.java

--- src/main/java/com/takensoft/cms/loginPolicy/vo/LoginPolicyVO.java

+++ src/main/java/com/takensoft/cms/loginPolicy/vo/LoginPolicyVO.java


 @AllArgsConstructor
 public class LoginPolicyVO {
 
-    private String id;                  // 중복로그인 ID
+    private String policyId;                  // 중복로그인 ID
     private boolean allowMultipleLogin;  // 중복 로그인 허용 여부
-    private String mbrId;            // 수정한 관리자 ID
+    private String rgtr;            // 수정한 관리자 ID
 }

6fc6147

52c91c6

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


             boolean allow = (Boolean) params.get("allowMultipleLogin");
 
             String token = request.getHeader("Authorization");
-            String adminId = (String) jwtUtil.getClaim(token, "mbrId");
+            String mbrId = (String) jwtUtil.getClaim(token, "mbrId");
 
-            if (adminId == null || adminId.isBlank()) {
+            if (mbrId == null || mbrId.isBlank()) {
                 return resUtil.errorRes(MessageCode.COMMON_BAD_REQUEST);
             }
 
             LoginPolicyVO loginPolicyVO = new LoginPolicyVO();
             loginPolicyVO.setAllowMultipleLogin(allow);
-            loginPolicyVO.setMbrId(adminId);
+            loginPolicyVO.setRgtr(mbrId);
 
             int result = loginPolicyService.insertPolicy(loginPolicyVO);
 

6fc6147

52c91c6

src/main/java/com/takensoft/common/config/RedisConfig.java

--- src/main/java/com/takensoft/common/config/RedisConfig.java

+++ src/main/java/com/takensoft/common/config/RedisConfig.java


 package com.takensoft.common.config;
 
-import com.takensoft.cms.loginPolicy.dao.LoginPolicyDAO;
+import com.takensoft.cms.loginPolicy.service.LoginPolicyService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;

     @Value("${redis.port}")
     private int redisPort;
 
-    private final LoginPolicyDAO loginPolicyDAO;
+    private final LoginPolicyService loginPolicyService;
 
-    public RedisConfig(LoginPolicyDAO loginPolicyDAO) {
-        this.loginPolicyDAO = loginPolicyDAO;
+    public RedisConfig(LoginPolicyService loginPolicyService) {
+        this.loginPolicyService = loginPolicyService;
     }
 
     @Bean

      * 중복 로그인 허용 여부를 반환하는 메서드
      */
     public boolean isAllowMultipleLogin() {
-        Boolean result = loginPolicyDAO.selectLatestPolicy();
-        return Boolean.TRUE.equals(result);
+        Boolean result = loginPolicyService.getPolicy();
+        return result;
     }
 
 }

6fc6147

52c91c6

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

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

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


     작성일 : 2025.03.22
     내 용 : 중복로그인 관련
 -->
-<mapper namespace="com.takensoft.cms.logionPolicy.dao.LogionPolicyDAO">
+<mapper namespace="com.takensoft.cms.loginPolicy.dao.LoginPolicyDAO">
 
     <!--
         작성자 : 김혜민
         작성일 : 2025.03.22
         내 용 : 중복로그인 여부 최신값 조회
     -->
-    <select id="selectLatestPolicy" resultType="boolean">
+    <select id="selectLatestPolicy" resultType="String">
         SELECT allow_multiple_login
         FROM login_policy_history
-        ORDER BY updated_at DESC
+        ORDER BY reg_dt DESC
         LIMIT 1
     </select>
 

     -->
     <insert id="insertPolicy" parameterType="LoginPolicyVO">
         INSERT INTO login_policy_history (
-            id,
+            policy_id,
             allow_multiple_login,
-            mbrId,
-            updated_at
+            rgtr,
+            reg_dt
         )
         VALUES (
-            #{id},
+            #{policyId},
             #{allowMultipleLogin},
-            #{mbrId},
+            #{rgtr},
             NOW()
         )
     </insert>

...	...	@@ -24,7 +24,7 @@
24	24	*
25	25	* 중복로그인 조회
26	26	*/
27		- Boolean selectLatestPolicy();
	27	+ String selectLatestPolicy();
28	28
29	29	/**
30	30	* @param loginPolicyVO - 중복로그인 정보

...	...	@@ -54,7 +54,13 @@
54	54	*/
55	55	@Override
56	56	public boolean getPolicy() {
57		- return loginPolicyDAO.selectLatestPolicy();
	57	+ String policyStatus = loginPolicyDAO.selectLatestPolicy();
	58	+
	59	+ if(policyStatus.equals("Y")){
	60	+ return true;
	61	+ }else{
	62	+ return false;
	63	+ }
58	64	}
59	65
60	66	/**
...	...	@@ -65,7 +71,7 @@
65	71	*/
66	72	@Override
67	73	public int insertPolicy(LoginPolicyVO loginPolicyVO) {
68		- loginPolicyVO.setId(loginPolicyIdgn.getNextStringId()); // ID 자동 생성
	74	+ loginPolicyVO.setPolicyId(loginPolicyIdgn.getNextStringId()); // ID 자동 생성
69	75	return loginPolicyDAO.insertPolicy(loginPolicyVO);
70	76	}
71	77

...	...	@@ -57,15 +57,15 @@
57	57	boolean allow = (Boolean) params.get("allowMultipleLogin");
58	58
59	59	String token = request.getHeader("Authorization");
60		- String adminId = (String) jwtUtil.getClaim(token, "mbrId");
	60	+ String mbrId = (String) jwtUtil.getClaim(token, "mbrId");
61	61
62		- if (adminId == null \|\| adminId.isBlank()) {
	62	+ if (mbrId == null \|\| mbrId.isBlank()) {
63	63	return resUtil.errorRes(MessageCode.COMMON_BAD_REQUEST);
64	64	}
65	65
66	66	LoginPolicyVO loginPolicyVO = new LoginPolicyVO();
67	67	loginPolicyVO.setAllowMultipleLogin(allow);
68		- loginPolicyVO.setMbrId(adminId);
	68	+ loginPolicyVO.setRgtr(mbrId);
69	69
70	70	int result = loginPolicyService.insertPolicy(loginPolicyVO);
71	71

...	...	@@ -1,6 +1,6 @@
1	1	package com.takensoft.common.config;
2	2
3		-import com.takensoft.cms.loginPolicy.dao.LoginPolicyDAO;
	3	+import com.takensoft.cms.loginPolicy.service.LoginPolicyService;
4	4	import org.springframework.beans.factory.annotation.Value;
5	5	import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
6	6	import org.springframework.context.annotation.Bean;
...	...	@@ -28,10 +28,10 @@
28	28	@Value("${redis.port}")
29	29	private int redisPort;
30	30
31		- private final LoginPolicyDAO loginPolicyDAO;
	31	+ private final LoginPolicyService loginPolicyService;
32	32
33		- public RedisConfig(LoginPolicyDAO loginPolicyDAO) {
34		- this.loginPolicyDAO = loginPolicyDAO;
	33	+ public RedisConfig(LoginPolicyService loginPolicyService) {
	34	+ this.loginPolicyService = loginPolicyService;
35	35	}
36	36
37	37	@Bean
...	...	@@ -55,8 +55,8 @@
55	55	* 중복 로그인 허용 여부를 반환하는 메서드
56	56	*/
57	57	public boolean isAllowMultipleLogin() {
58		- Boolean result = loginPolicyDAO.selectLatestPolicy();
59		- return Boolean.TRUE.equals(result);
	58	+ Boolean result = loginPolicyService.getPolicy();
	59	+ return result;
60	60	}
61	61
62	62	}

...	...	@@ -5,17 +5,17 @@
5	5	작성일 : 2025.03.22
6	6	내 용 : 중복로그인 관련
7	7	-->
8		-<mapper namespace="com.takensoft.cms.logionPolicy.dao.LogionPolicyDAO">
	8	+<mapper namespace="com.takensoft.cms.loginPolicy.dao.LoginPolicyDAO">
9	9
10	10	<!--
11	11	작성자 : 김혜민
12	12	작성일 : 2025.03.22
13	13	내 용 : 중복로그인 여부 최신값 조회
14	14	-->
15		- <select id="selectLatestPolicy" resultType="boolean">
	15	+ <select id="selectLatestPolicy" resultType="String">
16	16	SELECT allow_multiple_login
17	17	FROM login_policy_history
18		- ORDER BY updated_at DESC
	18	+ ORDER BY reg_dt DESC
19	19	LIMIT 1
20	20	</select>
21	21
...	...	@@ -26,15 +26,15 @@
26	26	-->
27	27	<insert id="insertPolicy" parameterType="LoginPolicyVO">
28	28	INSERT INTO login_policy_history (
29		- id,
	29	+ policy_id,
30	30	allow_multiple_login,
31		- mbrId,
32		- updated_at
	31	+ rgtr,
	32	+ reg_dt
33	33	)
34	34	VALUES (
35		- #{id},
	35	+ #{policyId},
36	36	#{allowMultipleLogin},
37		- #{mbrId},
	37	+ #{rgtr},
38	38	NOW()
39	39	)
40	40	</insert>

...	...	@@ -20,7 +20,7 @@
20	20	@AllArgsConstructor
21	21	public class LoginPolicyVO {
22	22
23		- private String id; // 중복로그인 ID
	23	+ private String policyId; // 중복로그인 ID
24	24	private boolean allowMultipleLogin; // 중복 로그인 허용 여부
25		- private String mbrId; // 수정한 관리자 ID
	25	+ private String rgtr; // 수정한 관리자 ID
26	26	} (파일 끝에 줄바꿈 문자 없음)

Delete comment