로그인시 세션 데이타가져오기 정보 반영

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

@@ -28,19 +28,13 @@ public class JwtTokenProvider { // JWT 토큰을 생성 및 검증 모듈
     }
 
     // Jwt 토큰 생성
-    public String createToken(String mId, String userNm, String systemAdminYn, String superAdminYn, String userTypeCd, Boolean isLogin) {
+    public String createToken(String mId, String userNm, String systemAdminYn, String authTpCd, Boolean isLogin) {
         Claims claims = Jwts.claims().setSubject(mId);
         claims.put(ApiConstants.CLAIMS_USER_NM, userNm);
         claims.put(ApiConstants.CLAIMS_SYSTEM_ADMIN_YN, systemAdminYn);
-        claims.put(ApiConstants.CLAIMS_SUPER_ADMIN_YN, superAdminYn);
-        claims.put(ApiConstants.CLAIMS_USER_TYPE_CD, userTypeCd);
+        claims.put(ApiConstants.CLAIMS_AUTH_TP_CD, authTpCd);
         claims.put(ApiConstants.CLAIMS_IS_LOGIN, isLogin);
 
-        System.out.println("-----userNm=================>" + userNm);
-        System.out.println("-------ystemAdminYn=================>" + systemAdminYn);
-        System.out.println("--------superAdminYn=================>" + superAdminYn);
-        System.out.println("---------userTypeCd=================>" + userTypeCd);
-
         Date now = new Date();
         Calendar cal = Calendar.getInstance();
         cal.setTime(now);
@@ -64,11 +58,6 @@ public class JwtTokenProvider { // JWT 토큰을 생성 및 검증 모듈
         return (String)claims.getBody().get(ApiConstants.CLAIMS_USER_NM);
     }
 
-    // Jwt 토큰에서 슈퍼 관리자 여부 정보
-    public String getSuperAdminYn(String token) {
-        Jws<Claims> claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token);
-        return (String)claims.getBody().get(ApiConstants.CLAIMS_SUPER_ADMIN_YN);
-    }
 
     // Jwt 토큰에서 시스템 관리자 여부 정보
     public String getSystemAdminYn(String token) {
@@ -77,9 +66,9 @@ public class JwtTokenProvider { // JWT 토큰을 생성 및 검증 모듈
     }
 
     // Jwt 토큰에서 사용자 타입 정보
-    public String getUserTypeCd(String token) {
+    public String getAuthTpCd(String token) {
         Jws<Claims> claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token);
-        return (String)claims.getBody().get(ApiConstants.CLAIMS_USER_TYPE_CD);
+        return (String)claims.getBody().get(ApiConstants.CLAIMS_AUTH_TP_CD);
     }
 
     // Jwt 토큰에서 로그인 구별 정보

src/main/java/com/oqpo/api/constant/ApiConstants.java

@@ -6,7 +6,7 @@ public interface ApiConstants {
     String CLAIMS_USER_NM = "userNm";
     String CLAIMS_SYSTEM_ADMIN_YN = "systemAdminYn";
     String CLAIMS_SUPER_ADMIN_YN = "superAdminYn";
-    String CLAIMS_USER_TYPE_CD = "userTypeCd";
+    String CLAIMS_AUTH_TP_CD = "authTpCd";
     Integer FILE_MAX = 10; //MB
 
     String STR_TICKET_START = "#";

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

@@ -0,0 +1,46 @@
+package com.oqpo.api.entity.oper;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class AfflEntity implements Serializable {
+    private static final long serialVersionUID = -3590936033715917450L;
+
+    private String afflShopId;
+    private String afflShopNm;
+    private String stCd;
+    private String afflAbbr;
+    private String bsnsRegNo;
+    private String corpRegNo;
+    private String authType;
+    private String bsnsCndt;
+    private String ctgrBsns;
+    private String ownerNm;
+    private String ownerTelNo;
+    private String rprstFaxNo;
+    private String rprstEmal;
+    private String zipNo;
+    private String addr1;
+    private String addr2;
+    private String rprstTelNo;
+    private String latX;
+    private String longY;
+    private String regDt;
+    private String regTm;
+    private String regId;
+    private String joinSttDt;
+    private String joinEndDt;
+    private String cmpnyLogoFileNo;
+    private String delYn;
+    private String sysRegDttm;
+    private String sysRegId;
+    private String sysChgDttm;
+    private String sysChgId;
+
+}

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

@@ -22,14 +22,13 @@ public class MemberEntity implements Serializable, UserDetails {
     private String email;
     private String password;
     private String authNm;
-    private String superAdminYn;
     private String systemAdminYn;
     private String firstLoginDt;
     private String lastLoginDt;
     private String pwErrCnt;
     private String userStatCd;
     private String userStatDt;
-    private String userTypeCd;
+    private String authTpCd;
     private String brandNm;
     private Integer idCnt;
 

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

@@ -28,7 +28,7 @@ public class UserMngEntity implements Serializable {
     private String userStatNm;
     private String userStatDt;
     private String addDt;
-    private String userTypeCd;
+    private String authTpCd;
     private String sadminYn;
     private String frcmptCd;
     private String brandCd;

src/main/java/com/oqpo/api/entity/stinfo/BrandEntity.java

@@ -0,0 +1,41 @@
+package com.oqpo.api.entity.stinfo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class BrandEntity implements Serializable {
+    private static final long serialVersionUID = -3590936033715917450L;
+
+    private String brandId;
+    private String brandNm;
+    private String stCd;
+    private String brandType;
+    private String zipNo;
+    private String addr1;
+    private String addr2;
+    private String telNo;
+    private String faxNo;
+    private String regDt;
+    private String regId;
+    private String emalAddr;
+    private String delYn;
+    private String bnkCd;
+    private String acctNo;
+    private String owacNm;
+    private String afflShopId;
+    private String afflShopNm;
+    private String brandLogoFileNo;
+    private String bsnsRegNo;
+    private String corpRegNo;
+    private String sysRegDttm;
+    private String sysRegId;
+    private String sysChgDttm;
+    private String sysChgId;
+
+}

src/main/java/com/oqpo/api/mapper/oper/AfflMapper.java

@@ -0,0 +1,14 @@
+package com.oqpo.api.mapper.oper;
+
+
+import com.oqpo.api.entity.oper.AfflEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface AfflMapper {
+
+    List<AfflEntity> selectTargetAfflGridList(@Param("userId") String userId, @Param("authTpCd") String authTpCd )throws Exception;
+}

src/main/java/com/oqpo/api/mapper/stinfo/BrandMapper.java

@@ -0,0 +1,14 @@
+package com.oqpo.api.mapper.stinfo;
+
+
+import com.oqpo.api.entity.stinfo.BrandEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface BrandMapper {
+
+    List<BrandEntity> selectTargetBrandGridList(@Param("userId") String userId, @Param("authTpCd") String authTpCd)throws Exception;
+}

src/main/java/com/oqpo/api/mapper/system/CodeMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 @Mapper
 public interface CodeMapper {
-    List<CodeEntity> selectCodeDtlGridList(@Param("codeCd") String codeCd, GridRequest gridRequest) throws Exception;
+    List<CodeEntity> selectCodeDtlGridList(@Param("codeCd") String codeCd, @Param("useYn") String useYn, GridRequest gridRequest) throws Exception;
 
     List<CodeEntity> selectSearchCodeList(@Param("sCodeNm") String sCodeNm, @Param("sCodeTpCd") String sCodeTpCd, @Param("sUseYn") String sUseYn) throws Exception;
 

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

@@ -4,8 +4,9 @@ import com.oqpo.api.config.JwtTokenProvider;
 import com.oqpo.api.entity.oper.MemberEntity;
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.exception.GlobalException;
-import com.oqpo.api.service.oper.PopService;
+import com.oqpo.api.service.oper.AfflService;
 import com.oqpo.api.service.oper.UserMngService;
+import com.oqpo.api.service.stinfo.BrandService;
 import com.oqpo.api.service.system.ActionService;
 import com.oqpo.api.service.system.CodeService;
 import com.oqpo.api.service.system.MenuService;
@@ -32,12 +33,14 @@ public class SessionService extends CommonService {
     @Autowired
     private ActionService actionService;
 
+    @Autowired
+    private UserMngService userMngService;
 
     @Autowired
-    private PopService popService;
+    private AfflService afflService;
 
     @Autowired
-    private UserMngService userMngService;
+    private BrandService brandService;
 
 
 
@@ -48,8 +51,7 @@ public class SessionService extends CommonService {
             memberEntity.setUserId(jwtTokenProvider.getUserId(connKey));
             memberEntity.setUserNm(jwtTokenProvider.getUserNm(connKey));
             memberEntity.setSystemAdminYn(jwtTokenProvider.getSystemAdminYn(connKey));
-            memberEntity.setSuperAdminYn(jwtTokenProvider.getSuperAdminYn(connKey));
-            memberEntity.setUserTypeCd(jwtTokenProvider.getUserTypeCd(connKey));
+            memberEntity.setAuthTpCd(jwtTokenProvider.getAuthTpCd(connKey));
         } catch (Exception e) {
             e.getStackTrace();
             throw new GlobalException(SystemMessageCode.NEED_AUTH);
@@ -58,7 +60,8 @@ public class SessionService extends CommonService {
                 codeService.codeList(memberEntity.getUserId()),
                 menuService.authMenuList(memberEntity.getUserId(), memberEntity),
                 actionService.actionList(memberEntity.getUserId(), memberEntity),
-                popService.selectOpenPop(""));
+                afflService.selectTargetAfflGridList(memberEntity.getUserId(), memberEntity.getAuthTpCd()),
+                brandService.selectTargetBrandGridList(memberEntity.getUserId(), memberEntity.getAuthTpCd()));
     }
 
     public MsessionResponse mdata(HttpServletRequest request) throws Exception {

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

@@ -58,20 +58,15 @@ public class SigninService implements UserDetailsService {
         MemberEntity memberEntity = null;
         String connKey = "";
         try {
-            //log.debug("password==>>>{}", passwordEncoder.encode(password));
             UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(userId, password);
-            //System.out.println("1111111111111111") ;
             Authentication authentication = authenticationManager.authenticate(token);
-            //System.out.println("2222222222222") ;
             SecurityContextHolder.getContext().setAuthentication(authentication);
-            //System.out.println("333333333333333333333") ;
             memberEntity = (MemberEntity) authentication.getPrincipal();
             connKey = jwtTokenProvider.createToken (
                     memberEntity.getUserId(),
                     memberEntity.getUserNm(),
                     memberEntity.getSystemAdminYn(),
-                    memberEntity.getSuperAdminYn(),
-                    memberEntity.getUserTypeCd(),
+                    memberEntity.getAuthTpCd(),
                     true);
             //log.debug("connKey==>>>{}", connKey);
             //로그인 이력 남기기

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

@@ -0,0 +1,26 @@
+package com.oqpo.api.service.oper;
+
+
+import com.oqpo.api.entity.oper.AfflEntity;
+import com.oqpo.api.mapper.oper.AfflMapper;
+import com.oqpo.api.service.CommonService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class AfflService extends CommonService {
+    @Autowired
+    private AfflMapper afflMapper;
+
+    /*
+      가맹점 리스트 조회
+     */
+    public List<AfflEntity> selectTargetAfflGridList(String userId, String authTpCd) throws Exception {
+        return afflMapper.selectTargetAfflGridList(userId, authTpCd);
+    }
+
+}

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

@@ -90,7 +90,7 @@ public class UserMngService extends CommonService {
             entity.setSuperAdminYn(saveUserRequest.getSuperAdminYn());
             entity.setSystemAdminYn(saveUserRequest.getSystemAdminYn());
             entity.setUserStatCd(saveUserRequest.getUserStatCd());
-            entity.setUserTypeCd(saveUserRequest.getUserTypeCd());
+            entity.setAuthTpCd(saveUserRequest.getAuthTpCd());
             entity.setSadminYn(saveUserRequest.getSadminYn());
             if ("Y".equals(saveUserRequest.getSadminYn())) {
                 entity.setFrcmptCd(saveUserRequest.getUserId().toUpperCase());

src/main/java/com/oqpo/api/service/stinfo/BrandService.java

@@ -0,0 +1,26 @@
+package com.oqpo.api.service.stinfo;
+
+
+import com.oqpo.api.entity.stinfo.BrandEntity;
+import com.oqpo.api.mapper.stinfo.BrandMapper;
+import com.oqpo.api.service.CommonService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class BrandService extends CommonService {
+    @Autowired
+    private BrandMapper brandMapper;
+
+    /*
+      가맹점 리스트 조회
+     */
+    public List<BrandEntity> selectTargetBrandGridList(String userId, String authTpCd) throws Exception {
+        return brandMapper.selectTargetBrandGridList(userId, authTpCd);
+    }
+
+}

src/main/java/com/oqpo/api/service/system/ActionService.java

@@ -25,7 +25,7 @@ public class ActionService extends CommonService {
     @Autowired
     private ActionMapper actionMapper ;
 
-    @Cacheable(value = "actionList", key = "'OQKeyIs' + #userId")
+    //@Cacheable(value = "actionList", key = "'OQKeyIs' + #userId")
     public List<ActionEntity> actionList(String user_id, MemberEntity memberEntity) throws Exception {
 
         List<ActionEntity> entities = actionMapper.selectUserActionList(memberEntity);

src/main/java/com/oqpo/api/service/system/CodeService.java

@@ -26,7 +26,7 @@ public class CodeService extends CommonService {
     @Autowired
     private CodeMapper codeMapper;
 
-    @Cacheable(value = "codeList", key = "'OQKeyIs' + #userId")
+   // @Cacheable(value = "codeList", key = "'OQKeyIs' + #userId")
     public List<CodeEntity> codeList(String userId) throws Exception {
         List<CodeEntity> entities = codeMapper.selectCodeList();
         entities.forEach(entity -> {
@@ -53,12 +53,12 @@ public class CodeService extends CommonService {
     /*
       코드 상세 리스트 조회
      */
-    public GridResponse codeDtlGridList(String codeCd, GridRequest gridRequest) throws Exception {
+    public GridResponse codeDtlGridList(String codeCd, String useYn, GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
         int gridRecords = codeMapper.selectCodeDtlGridListCnt(codeCd);
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<CodeEntity> entities = codeMapper.selectCodeDtlGridList(codeCd, gridRequest);
+        List<CodeEntity> entities = codeMapper.selectCodeDtlGridList(codeCd, useYn, gridRequest);
         List<Object> gridRows = entities.stream()
                 .map(m -> CodeDtlResponse.builder()
                         .viewCd("R")

src/main/java/com/oqpo/api/service/system/JobService.java

@@ -65,7 +65,7 @@ public class JobService extends CommonService {
             // 사용권한 체크
             JobEntity jobEntity = jobMapper.selectConnectUserAuth(memberEntity.getUserId(), path) ;
 
-            if ("N".equals(memberEntity.getSystemAdminYn()) && "N".equals(memberEntity.getSuperAdminYn())) {
+            if ("N".equals(memberEntity.getSystemAdminYn()) ) {
                 if (jobEntity == null )
                 {
                     isAuthChk =  false ;

src/main/java/com/oqpo/api/service/system/MenuService.java

@@ -28,7 +28,7 @@ public class MenuService extends CommonService {
     @Autowired
     private MenuMapper menuMapper;
 
-    @Cacheable(value = "authMenuList", key = "'OQKeyIs' + #userId")
+    //@Cacheable(value = "authMenuList", key = "'OQKeyIs' + #userId")
     public List<MenuEntity> authMenuList(String userId, MemberEntity memberEntity) throws Exception {
         List<MenuEntity> entities = menuMapper.selectUserAuthMenuList(memberEntity);
 

src/main/java/com/oqpo/api/web/controller/SigninController.java

@@ -51,7 +51,6 @@ public class SigninController {
         hashed = StringEscapeUtils.unescapeJava(hashed);
         String userId = CryptoUtil.decrypt(signinRequest.getUserId(), hashed);
         String password = CryptoUtil.decrypt(signinRequest.getPassword(), hashed);
-        System.out.println("sign-in==========================" + userId + "===" + password ) ;
         return ResponseEntity.ok(signinService.signin(userId, password));
     }
 

src/main/java/com/oqpo/api/web/controller/system/CodeController.java

@@ -123,6 +123,6 @@ public class CodeController {
     @ApiOperation(value = "코드 상세 그리드 리스트")
     @PostMapping("/detail-grid-list")
     public ResponseEntity<GridResponse> detailGridList(@RequestBody @Valid CodeGridRequest codeGridRequest) throws Exception {
-        return ResponseEntity.ok(codeService.codeDtlGridList(codeGridRequest.getCodeCd(), codeGridRequest.toDTO(codeGridRequest)));
+        return ResponseEntity.ok(codeService.codeDtlGridList(codeGridRequest.getCodeCd(), codeGridRequest.getUseYn(), codeGridRequest.toDTO(codeGridRequest)));
     }
 }

src/main/java/com/oqpo/api/web/dto/request/code/CodeGridRequest.java

@@ -13,6 +13,9 @@ public class CodeGridRequest extends GridRequest {
     @ApiModelProperty(value = "코드")
     private String codeCd;
 
+    @ApiModelProperty(value = "사용여부")
+    private String useYn;
+
     protected CodeGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
         super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
     }

src/main/java/com/oqpo/api/web/dto/request/oper/usermng/SaveUserRequest.java

@@ -40,8 +40,8 @@ public class SaveUserRequest {
     @ApiModelProperty(value = "업무관리자여부")
     private String systemAdminYn;
 
-    @ApiModelProperty(value = "사용자구분")
-    private String userTypeCd;
+    @ApiModelProperty(value = "권한구분")
+    private String authTpCd;
 
     @ApiModelProperty(value = "가맹점어드민여부")
     private String sadminYn;

src/main/java/com/oqpo/api/web/dto/response/session/FindIdResponse.java

@@ -15,14 +15,10 @@ public class FindIdResponse {
     @ApiModelProperty(value = "사용자ID")
     private String userId;
 
-    @ApiModelProperty(value = "브랜드명")
-    private String brandNm;
-
     public static FindIdResponse toDTO(MemberEntity entity) {
         if (entity == null) return null;
         return FindIdResponse.builder()
                 .userId(entity.getUserId())
-                .brandNm(entity.getBrandNm())
                 .build();
     }
 }

src/main/java/com/oqpo/api/web/dto/response/session/SessionResponse.java

@@ -2,10 +2,12 @@ package com.oqpo.api.web.dto.response.session;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.oqpo.api.entity.*;
+import com.oqpo.api.entity.oper.AfflEntity;
 import com.oqpo.api.entity.oper.MemberEntity;
 import com.oqpo.api.entity.oper.MenuEntity;
 import com.oqpo.api.entity.oper.PopEntity;
 import com.oqpo.api.entity.CodeEntity;
+import com.oqpo.api.entity.stinfo.BrandEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import org.apache.commons.lang3.StringUtils;
@@ -28,8 +30,8 @@ public class SessionResponse {
     @ApiModelProperty(value = "시스템 관리자 여부")
     private String systemAdminYn;
 
-    @ApiModelProperty(value = "사용자타입(내부 N, 영업 P, 가맹 B , 매장 S )")
-    private String userTypeCd;
+    @ApiModelProperty(value = "사용자타입(10 운영자, 20 영업담당자, 30 가맹점, 40 브랜드, 50 매장, 60 공급사)")
+    private String authTpCd;
 
     @ApiModelProperty(value = "코드 리스트")
     private List<CodeInfo> codeList;
@@ -41,18 +43,18 @@ public class SessionResponse {
     private List<ActInfo> actList;
 
     @ApiModelProperty(value = "가맹점 리스트")
-    private List<FrcompInfo> frcompList;
+    private List<AfflInfo> afflList;
 
-    @ApiModelProperty(value = "팝업 리스트")
-    private List<PopInfo> popList;
+    @ApiModelProperty(value = "브랜드 리스트")
+    private List<BrandInfo> brandList;
 
-    public static SessionResponse toDTO(MemberEntity entity, List<CodeEntity> codeList, List<MenuEntity> authMenuList, List<ActionEntity> actList, List<PopEntity> popList) {
+    public static SessionResponse toDTO(MemberEntity entity, List<CodeEntity> codeList, List<MenuEntity> authMenuList, List<ActionEntity> actList, List<AfflEntity> afflList, List<BrandEntity> brandList) {
         if (entity == null) return null;
         return SessionResponse.builder()
                 .userId(entity.getUserId())
                 .userNm(entity.getUserNm())
                 .systemAdminYn(StringUtils.isBlank(entity.getSystemAdminYn()) ? "N" : entity.getSystemAdminYn())
-                .userTypeCd(entity.getUserTypeCd())
+                .authTpCd(entity.getAuthTpCd())
                 .codeList(codeList.stream()
                         .map(m -> CodeInfo.builder()
                                 .codeCd(m.getCodeCd())
@@ -92,13 +94,19 @@ public class SessionResponse {
                                 .viewYn(m.getViewYn())
                                 .build())
                         .collect(Collectors.toList()))
-                .popList(popList.stream()
-                        .map(m -> PopInfo.builder()
-                                .popNo(m.getPopNo())
-                                .viewTargetCd(m.getViewTargetCd())
-                                .menuId(m.getMenu() == null ? "" : m.getMenu().getMenuId() == null ? "" : m.getMenu().getMenuId() )
-                                .popWidth(m.getPopWidth())
-                                .popHeight(m.getPopHeight())
+                .afflList(afflList.stream()
+                         .map(m -> AfflInfo.builder()
+                                 .afflShopId(m.getAfflShopId())
+                                 .afflShopNm(m.getAfflShopNm())
+                                 .afflAbbr(m.getAfflAbbr())
+                                 .build())
+                         .collect(Collectors.toList()))
+                .brandList(brandList.stream()
+                        .map(m -> BrandInfo.builder()
+                                .brandId(m.getBrandId())
+                                .brandNm(m.getBrandNm())
+                                .afflShopId(m.getAfflShopId())
+                                .afflShopNm(m.getAfflShopNm())
                                 .build())
                         .collect(Collectors.toList()))
                 .build();
@@ -203,32 +211,34 @@ public class SessionResponse {
     @Getter
     @Builder
     @AllArgsConstructor(access = AccessLevel.PROTECTED)
-    static class PopInfo {
-        @ApiModelProperty(value = "팝업번호")
-        private String popNo ;
-
-        @ApiModelProperty(value = "팝업오픈구분")
-        private String viewTargetCd;
+    static class AfflInfo {
+        @ApiModelProperty(value = "가맹코드")
+        private String afflShopId ;
 
-        @ApiModelProperty(value = "메뉴ID")
-        private String menuId;
+        @ApiModelProperty(value = "가맹점명")
+        private String afflShopNm;
 
-        @ApiModelProperty(value = "팝업width")
-        private Integer popWidth;
+        @ApiModelProperty(value = "약어")
+        private String afflAbbr;
 
-        @ApiModelProperty(value = "팝업height")
-        private Integer popHeight;
     }
 
+
     @Getter
     @Builder
     @AllArgsConstructor(access = AccessLevel.PROTECTED)
-    static class FrcompInfo {
+    static class BrandInfo {
+        @ApiModelProperty(value = "브랜드아이디")
+        private String brandId ;
+
+        @ApiModelProperty(value = "브랜드명")
+        private String brandNm;
+
         @ApiModelProperty(value = "가맹코드")
-        private String cmpyCd ;
+        private String afflShopId ;
 
         @ApiModelProperty(value = "가맹점명")
-        private String cmpyNm;
+        private String afflShopNm;
 
     }
 

src/main/java/com/oqpo/api/web/dto/response/token/TokenResponse.java

@@ -20,8 +20,8 @@ public class TokenResponse {
     @ApiModelProperty(value = "슈퍼 관리자 여부")
     private String superAdminYn;
 
-    @ApiModelProperty(value = "사용자 타입")
-    private String userTypeCd;
+    @ApiModelProperty(value = "권한구분")
+    private String authTpCd;
 
     @ApiModelProperty(value = "로그인 구별 정보")
     private Boolean isLogin;
@@ -31,7 +31,7 @@ public class TokenResponse {
                 .userId(claims.getBody().getSubject())
                 .systemAdminYn((String) claims.getBody().get(ApiConstants.CLAIMS_SUPER_ADMIN_YN))
                 .superAdminYn((String) claims.getBody().get(ApiConstants.CLAIMS_SUPER_ADMIN_YN))
-                .userTypeCd((String) claims.getBody().get(ApiConstants.CLAIMS_USER_TYPE_CD))
+                .authTpCd((String) claims.getBody().get(ApiConstants.CLAIMS_AUTH_TP_CD))
                 .isLogin((Boolean)claims.getBody().get(ApiConstants.CLAIMS_IS_LOGIN))
                 .build();
     }

src/main/java/com/oqpo/api/web/interceptor/TokenCheckInterceptor.java

@@ -30,7 +30,7 @@ public class TokenCheckInterceptor extends HandlerInterceptorAdapter {
                 throw new UnauthorizedException(SystemMessageCode.NEED_AUTH.getMessage());
             }
             String userId = jwtTokenProvider.getUserId(connKey) ;
-            String userTypeCd = jwtTokenProvider.getUserTypeCd(connKey);
+            String authTpCd = jwtTokenProvider.getAuthTpCd(connKey);
             String path = request.getServletPath();
             //if (path != null && !"".equals(path)) {path = path.replaceFirst("/", "");}
 /*

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

@@ -20,7 +20,7 @@ public class ArgumentResolver implements HandlerMethodArgumentResolver {
     private final String USER_ID = "userId";
     private final String SYSTEM_ADMIN_YN = "systemAdminYn";
     private final String SUPER_ADMIN_YN = "superAdminYn";
-    private final String USER_TYPE_CD = "userTypeCd";
+    private final String AUTH_TP_CD = "authTpCd";
 
     @Override
     public boolean supportsParameter(MethodParameter parameter) {
@@ -30,7 +30,7 @@ public class ArgumentResolver implements HandlerMethodArgumentResolver {
             return true;
         } else if (parameter.getParameterName().equals(SUPER_ADMIN_YN)) {
             return true;
-        }  else if (parameter.getParameterName().equals(USER_TYPE_CD)) {
+        }  else if (parameter.getParameterName().equals(AUTH_TP_CD)) {
             return true;
         }  else if (parameter.getParameterType() == TokenResponse.class) {
             return true;
@@ -51,11 +51,11 @@ public class ArgumentResolver implements HandlerMethodArgumentResolver {
             System.out.println("getUserId=================>" + tokenResponse.getUserId());
             System.out.println("getSystemAdminYn=================>" + tokenResponse.getSystemAdminYn());
             System.out.println("getSuperAdminYn=================>" + tokenResponse.getSuperAdminYn());
-            System.out.println("getUserTypeCd=================>" + tokenResponse.getUserTypeCd());
+            System.out.println("getAuthTpCd=================>" + tokenResponse.getAuthTpCd());
             if (parameter.getParameterName().equals(USER_ID)) return tokenResponse.getUserId();
             if (parameter.getParameterName().equals(SYSTEM_ADMIN_YN)) return tokenResponse.getSystemAdminYn();
             if (parameter.getParameterName().equals(SUPER_ADMIN_YN)) return tokenResponse.getSuperAdminYn();
-            if (parameter.getParameterName().equals(USER_TYPE_CD)) return tokenResponse.getUserTypeCd();
+            if (parameter.getParameterName().equals(AUTH_TP_CD)) return tokenResponse.getAuthTpCd();
             return tokenResponse;
         } catch(Exception e) {
             e.printStackTrace();

src/main/resources/logback-spring.xml

@@ -57,7 +57,7 @@
         <logger name="jdbc.sqlonly" level="INFO"/>
         <logger name="jdbc.resultsettable" level="INFO"/>
         <logger name="org.hibernate" level="OFF" />
-        <logger name="com.noorikiosk.api" level="DEBUG" />
+        <logger name="com.oqpo.api" level="DEBUG" />
 
         <!-- 정의 되지 않은 logger 들에게 일괄 적용됨 -->
         <root level="INFO">
@@ -72,7 +72,7 @@
         <logger name="jdbc.sqlonly" level="INFO"/>
         <logger name="jdbc.resultsettable" level="INFO"/>
         <logger name="org.hibernate" level="OFF" />
-        <logger name="com.noorikiosk.api" level="INFO" />
+        <logger name="com.oqpo.api" level="INFO" />
 
         <!-- 정의 되지 않은 logger 들에게 일괄 적용됨 -->
         <root level="INFO">
@@ -83,7 +83,7 @@
 
     <springProfile name="prod">
         <logger name="org.hibernate" level="ERROR" />
-        <logger name="com.noorikiosk.api" level="INFO" />
+        <logger name="com.oqpo.api" level="INFO" />
 
         <!-- 정의 되지 않은 logger 들에게 일괄 적용됨 -->
         <root level="ERROR">

src/main/resources/mybatis/sqlmaps/Member.xml

@@ -6,18 +6,16 @@
     <select id="selectMemberById" resultType="com.oqpo.api.entity.oper.MemberEntity">
         SELECT /* selectMemberById */
             user_id, user_nm, user_pw as password,
-            system_admin_yn, super_admin_yn, user_type_cd
+            system_admin_yn, super_admin_yn, auth_tp_cd
         FROM np_user_info
         WHERE user_id = #{userId}
     </select>
 
     <select id="selectMemberFindId" resultType="com.oqpo.api.entity.oper.MemberEntity">
         select /* selectMemberFindId */
-                a.user_id, b.brand_nm
+                a.user_id
         from np_user_info a
-            , nk_brand_info b
-        where a.brand_cd = b.brand_cd
-        and a.user_nm = #{userNm}
+        where a.user_nm = #{userNm}
         and a.email = #{email}
         and replace(a.tel_no,'-','') = replace(#{telNo},'-','')
     </select>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oqpo.api.mapper.oper.AfflMapper">
+    <select id="selectTargetAfflGridList" resultType="com.oqpo.api.entity.oper.AfflEntity">
+        select affl_shop_id, affl_shop_nm, affl_abbr
+        from affl_shop_base_info
+        where st_cd = 'S000'
+        <if test="authTpCd == '20' ">
+        and   affl_shop_id in (select affl_shop_id from sale_mgr_mgnt where sale_mgr_id = #{userId} )
+        </if>
+        <if test="authTpCd == '30' or authTpCd == '40' or authTpCd == '50' or authTpCd == '60' ">
+        and   affl_shop_id = (select affl_shop_id from np_user_info where user_id = #{userId} )
+        </if>
+    </select>
+</mapper>

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

@@ -61,10 +61,10 @@
 
     <insert id="insertUserInfo" >
         insert into np_user_info  /* insertUserInfo */
-        (user_id, user_nm, tel_no, email, user_pw, super_admin_yn, system_admin_yn, user_stat_cd, user_stat_dt, user_type_cd, sadmin_yn, frcmpt_cd, brand_cd,  add_dt, add_id, chg_dt, chg_id)
+        (user_id, user_nm, tel_no, email, user_pw, super_admin_yn, system_admin_yn, user_stat_cd, user_stat_dt, auth_tp_cd, sadmin_yn, frcmpt_cd, brand_cd,  add_dt, add_id, chg_dt, chg_id)
         values
         (#{entity.userId}, #{entity.userNm}, #{entity.telNo}, #{entity.email}, #{entity.userPw}
-         ,#{entity.superAdminYn}, #{entity.systemAdminYn},#{entity.userStatCd}, now(), nvl(#{entity.userTypeCd},'S'), nvl(#{entity.sadminYn},'N'),  #{entity.frcmptCd}, #{entity.brandCd}, now(), #{userId}, now(), #{userId})
+         ,#{entity.superAdminYn}, #{entity.systemAdminYn},#{entity.userStatCd}, now(), nvl(#{entity.authTpCd},'60'), nvl(#{entity.sadminYn},'N'),  #{entity.frcmptCd}, #{entity.brandCd}, now(), #{userId}, now(), #{userId})
     </insert>
 
     <update id="updateUserInfo">

src/main/resources/mybatis/sqlmaps/stinfo/brand.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oqpo.api.mapper.stinfo.BrandMapper">
+    <select id="selectTargetBrandGridList" resultType="com.oqpo.api.entity.stinfo.BrandEntity">
+        select brand_id, brand_nm, affl_shop_id, FN_AFFL_NM(affl_shop_id) AS affl_shop_nm
+        from brand_base_info
+        where st_cd = 'S000'
+        <if test="authTpCd == '20' ">
+        and   affl_shop_id in (select affl_shop_id from sale_mgr_mgnt where sale_mgr_id = #{userId} )
+        </if>
+        <if test="authTpCd == '30' ">
+        and   affl_shop_id = (select affl_shop_id from np_user_info where user_id = #{userId} )
+        </if>
+        <if test="authTpCd == '40' or authTpCd == '50' or authTpCd == '60' ">
+            and   brand_id = (select brand_id from np_user_info where user_id = #{userId}
+        </if>
+
+    </select>
+</mapper>

src/main/resources/mybatis/sqlmaps/system/Code.xml

@@ -58,7 +58,9 @@
             , code_desc
         from np_cd_dtl
         where code_cd = #{codeCd}
-        and use_yn = 'Y'
+        <if test="useYn != null and useYn != ''">
+        and use_yn = #{useYn}
+        </if>
         <choose>
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">

src/main/resources/mybatis/sqlmaps/system/Menu.xml

@@ -40,8 +40,8 @@
         , tlist.open_cd, case when tlist.open_cd != 'C' then (select count(*) from np_sys_menu where top_menu_no = tlist.menu_no ) else 0 end as b_menu_cnt
         , tlist.conn_url, tlist.menu_id
         from   tree_menu_list tlist
-        <if test="systemAdminYn neq 'Y'.toString() and superAdminYn neq 'Y'.toString()">
-        join  (	select 1 as top_menu_no, top_menu_no as  menu_no, 'Y'
+        <if test="systemAdminYn neq 'Y'.toString() ">
+        join  (	select 1 as top_menu_no, top_menu_no as  menu_no, 'Y' as wr_yn
         from   np_user_auth uauth
             join np_auth_info ainfo on uauth.auth_no = ainfo.auth_no and ainfo.use_yn = 'Y'
             where  uauth.user_id = #{userId}
@@ -101,7 +101,7 @@
         and menu.use_yn = 'Y'
         and   menu.sys_type_cd = 'W'
         <if test="systemAdminYn eq 'Y'.toString() or superAdminYn eq 'Y'.toString()">
-            and menu.top_menu_no = 1
+            and menu.top_menu_no = 100
             <if test="superAdminYn eq 'Y'.toString()">
                 and menu.menu_no != 2
             </if>
@@ -222,7 +222,7 @@
                 menu_no, menu_id, top_menu_no, menu_nm, use_yn, view_num, conn_url, icon_yn, role_desc, open_cd
                 ,fn_get_menu_nm(top_menu_no) as top_menu_nm
         from   np_sys_menu
-        where  top_menu_no = 1
+        where  top_menu_no = 100
         and    use_yn = 'Y'
         and    open_cd in ('T','C')
         order by view_num asc