공지사항 세션관련 수정

src/main/java/com/oqpo/api/config/JwtTokenProvider.java

@@ -29,6 +29,7 @@ public class JwtTokenProvider { // JWT 토큰을 생성 및 검증 모듈
 
     // Jwt 토큰 생성
     public String createToken(String mId, String userNm, String systemAdminYn, String authTpCd, Boolean isLogin, String afflShopId, String brandId, String authTpNm) {
+
         Claims claims = Jwts.claims().setSubject(mId);
         claims.put(ApiConstants.CLAIMS_USER_NM, userNm);
         claims.put(ApiConstants.CLAIMS_SYSTEM_ADMIN_YN, systemAdminYn);

src/main/java/com/oqpo/api/entity/oper/UserMngEntity.java

@@ -1,5 +1,6 @@
 package com.oqpo.api.entity.oper;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

src/main/java/com/oqpo/api/service/SessionService.java

@@ -53,9 +53,11 @@ public class SessionService extends CommonService {
             memberEntity.setSystemAdminYn(jwtTokenProvider.getSystemAdminYn(connKey));
             memberEntity.setAuthTpCd(jwtTokenProvider.getAuthTpCd(connKey));
             memberEntity.setAuthTpNm(jwtTokenProvider.getAuthTpNm(connKey));
-            //memberEntity.setAfflShopId(jwtTokenProvider.getAfflShopId(connKey));
-            //memberEntity.setBrandId(jwtTokenProvider.getBrandId(connKey));
-            //memberEntity.setAuthTpNm(jwtTokenProvider.getAuthTpNm(connKey));
+            memberEntity.setAfflShopId(jwtTokenProvider.getAfflShopId(connKey));
+            memberEntity.setBrandId(jwtTokenProvider.getBrandId(connKey));
+            memberEntity.setAuthTpNm(jwtTokenProvider.getAuthTpNm(connKey));
+
+
 
         } catch (Exception e) {
             e.getStackTrace();

src/main/java/com/oqpo/api/service/SigninService.java

@@ -73,6 +73,7 @@ public class SigninService implements UserDetailsService {
                     memberEntity.getBrandId(),
                     memberEntity.getAuthTpNm());
             log.debug("connKey==>>>{}", connKey);
+
             //로그인 이력 남기기
             userMngService.updateLoginDt(memberEntity.getUserId());
 

src/main/java/com/oqpo/api/service/oper/NticeService.java

@@ -30,7 +30,7 @@ public class NticeService extends CommonService {
       공지 검색 리스트 조회
      */
 
-    public GridResponse selectNticeGridList(String afflShopId, String brandId, String authTpCd, String sAfflShopId, String sBrandId, String fromDt, String toDt, String sNticeTitl, GridRequest gridRequest) throws Exception {
+    public GridResponse selectNticeGridList( String afflShopId, String brandId, String authTpCd, String sAfflShopId, String sBrandId, String fromDt, String toDt, String sNticeTitl, GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
@@ -81,7 +81,6 @@ public class NticeService extends CommonService {
             entity.setBrandChk(saveNticeRequest.getBrandChk());
             entity.setShopChk(saveNticeRequest.getShopChk());
             entity.setSupplyChk(saveNticeRequest.getSupplyChk());
-            log.info("=============>" + entity.getBrandId() + "==" + entity.getAfflShopId() + "==" + entity.getNticeTitl() );
             if ("C".equals(saveNticeRequest.getViewCd())) {
                 // 신규 공지번호 생성
                 entity.setNticeNo(fnGetKeyNo(6));
@@ -134,8 +133,8 @@ public class NticeService extends CommonService {
                 .map(m -> NticeTargetResponse.builder()
                         .viewCd("R")
                         .nticeNo(m.getNticeNo())
-                        .userId(m.getBrandId())
-                        .userNm(m.getBrandNm())
+                        .brandId(m.getBrandId())
+                        .brandNm(m.getBrandNm())
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);

src/main/java/com/oqpo/api/service/oper/UserMngService.java

@@ -84,7 +84,6 @@ public class UserMngService extends CommonService {
     public void saveUser(String userId, SaveUserRequest saveUserRequest) throws Exception {
         try {
 
-            System.out.println("=====================saveUser");
             // 기본정보 저장
             UserMngEntity entity = new UserMngEntity();
             entity.setUserId(saveUserRequest.getUserId());
@@ -106,14 +105,12 @@ public class UserMngService extends CommonService {
 
             if ("C".equals(saveUserRequest.getViewCd())) {
                 //패스워드 암호화
-                System.out.println("=====================패스워드");
                 String password = passwordEncoder.encode(saveUserRequest.getTelNo().replace("-",""));//aes256.aesEncode(entity.getTelNo());
                 entity.setUserPw(password);
                 userMngMapper.insertUserInfo(userId, entity);
             } else if ("U".equals(saveUserRequest.getViewCd())) {
                 userMngMapper.updateUserInfo(userId, entity);
             }
-            System.out.println("=====================getGridInsertData");
             // 사용자 권한정보 저장
             // 신규건
             if (saveUserRequest.getGridInsertData() != null) {

src/main/java/com/oqpo/api/web/controller/oper/NticeController.java

@@ -43,8 +43,7 @@ public class NticeController {
     })
     @ApiOperation(value = " 공지 그리드 리스트")
     @PostMapping("/detail-grid-list")
-    public ResponseEntity<GridResponse> detailGridList(@ApiIgnore String afflShopId,@ApiIgnore String brandId,@ApiIgnore String authTpCd,@RequestBody @Valid NticeGridRequest nticeGridRequest) throws Exception {
-
+    public ResponseEntity<GridResponse> detailGridList(@ApiIgnore String afflShopId , @ApiIgnore String brandId, @ApiIgnore String authTpCd, @RequestBody @Valid NticeGridRequest nticeGridRequest) throws Exception {
         return ResponseEntity.ok(nticeService.selectNticeGridList( afflShopId, brandId, authTpCd, nticeGridRequest.getSAfflShopId(), nticeGridRequest.getSBrandId(), nticeGridRequest.getFromDt(), nticeGridRequest.getToDt(), nticeGridRequest.getSNticeTitl(),  nticeGridRequest.toDTO(nticeGridRequest)));
     }
 

src/main/java/com/oqpo/api/web/resolver/ArgumentResolver.java

@@ -60,9 +60,9 @@ public class ArgumentResolver implements HandlerMethodArgumentResolver {
             if (parameter.getParameterName().equals(SYSTEM_ADMIN_YN)) return tokenResponse.getSystemAdminYn();
             if (parameter.getParameterName().equals(SUPER_ADMIN_YN)) return tokenResponse.getSuperAdminYn();
             if (parameter.getParameterName().equals(AUTH_TP_CD)) return tokenResponse.getAuthTpCd();
-            if (parameter.getParameterName().equals(AFFL_SHOP_ID)) return tokenResponse.getAuthTpCd();
-            if (parameter.getParameterName().equals(BRAND_ID)) return tokenResponse.getAuthTpCd();
-            if (parameter.getParameterName().equals(AUTH_TP_NM)) return tokenResponse.getAuthTpCd();
+            if (parameter.getParameterName().equals(AFFL_SHOP_ID)) return tokenResponse.getAfflShopId();
+            if (parameter.getParameterName().equals(BRAND_ID)) return tokenResponse.getBrandId();
+            if (parameter.getParameterName().equals(AUTH_TP_NM)) return tokenResponse.getAuthTpNm();
             return tokenResponse;
         } catch(Exception e) {
             e.printStackTrace();

src/main/resources/mybatis/sqlmaps/oper/Ntice.xml

@@ -11,7 +11,6 @@
                 when  date_format(now(),'%Y%m%d') <![CDATA[ > ]]> A.noti_ed_day then '공지종료' end as ntice_stat_nm
                 ,date_format(A.noti_st_day ,'%Y.%m.%d') as noti_st_day, date_format(A.add_dt ,'%Y.%m.%d') as add_dt
         from np_ntice A
-        left outer join np_ntice_target B on B.ntice_no = A.ntice_no and B.brand_id = A.brand_id
         where 1=1
         <if test="authTpCd == '30'">
          and A.affl_shop_id = #{afflShopId}
@@ -19,14 +18,17 @@
         <if test="authTpCd == '40' ">
             and A.brand_id = #{brandId}
             and A.brand_chk = 'Y'
+            and  (A.target_cd = 'A' or ( A.target_cd = 'T' and  (select 1 from np_ntice_target where ntice_no = A.ntice_no and brand_id = #{brandId} ) = 1  ))
         </if>
         <if test="authTpCd == '50' ">
             and A.brand_id = #{brandId}
             and A.shop_chk = 'Y'
+            and  (A.target_cd = 'A' or ( A.target_cd = 'T' and  (select 1 from np_ntice_target where ntice_no = A.ntice_no and brand_id = #{brandId} ) = 1  ))
         </if>
         <if test="authTpCd == '60' ">
             and A.brand_id = #{brandId}
             and A.supply_chk = 'Y'
+            and  (A.target_cd = 'A' or ( A.target_cd = 'T' and  (select 1 from np_ntice_target where ntice_no = A.ntice_no and brand_id = #{brandId} ) = 1  ))
         </if>
         <if test="sAfflShopId != null and sAfflShopId != ''">
             and    A.affl_shop_id = #{sAfflShopId}