시스템관리 메뉴 엑션 권한 부분 수정 조치

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

@@ -43,6 +43,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
                         .excludePathPatterns("/api/member/find-id")
                         .excludePathPatterns("/api/member/find-pw")
                         .excludePathPatterns("/api/verinfo/info-lastver")
+                        .excludePathPatterns("/api/session/bsnsbrand")
                         .excludePathPatterns("/api/file/download/**");
             }
 

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

@@ -29,4 +29,7 @@ public interface BrandMapper {
 
     String selectBrandInitPw(@Param("brandId") String brandId )throws Exception;
 
+    List<BrandEntity> selectBsnsBrandList(@Param("bsnsRegNo") String bsnsRegNo)throws Exception;
+
+
 }

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

@@ -2,6 +2,7 @@ package com.oqpo.api.service;
 
 import com.oqpo.api.config.JwtTokenProvider;
 import com.oqpo.api.entity.oper.MemberEntity;
+import com.oqpo.api.entity.stinfo.BrandEntity;
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.service.oper.AfflService;
@@ -11,12 +12,15 @@ import com.oqpo.api.service.system.ActionService;
 import com.oqpo.api.service.system.CodeService;
 import com.oqpo.api.service.system.MenuService;
 import com.oqpo.api.web.dto.response.session.MsessionResponse;
+import com.oqpo.api.web.dto.response.session.SessionBrandListResponse;
 import com.oqpo.api.web.dto.response.session.SessionResponse;
+import com.oqpo.api.web.dto.response.stinfo.brand.BsnsBrandListResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 @Service
 @Slf4j
@@ -70,22 +74,35 @@ public class SessionService extends CommonService {
                 brandService.selectTargetBrandGridList(memberEntity.getUserId(), memberEntity.getAuthTpCd()));
     }
 
-    public MsessionResponse mdata(HttpServletRequest request) throws Exception {
+    public SessionResponse mdata(HttpServletRequest request) throws Exception {
         MemberEntity memberEntity = new MemberEntity();
         String connKey = jwtTokenProvider.resolveToken(request);
         try {
             memberEntity.setUserId(jwtTokenProvider.getUserId(connKey));
+            memberEntity.setUserNm(jwtTokenProvider.getUserNm(connKey));
+            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));
+
+
         } catch (Exception e) {
             e.getStackTrace();
             throw new GlobalException(SystemMessageCode.NEED_AUTH);
         }
-        return MsessionResponse.toDTO(memberEntity,
-                userMngService.selectMobileUserInfo(memberEntity.getUserId()),
-                menuService.selectMobleMenuList()
-                /*,
-                nkUserInfoService.selectMobileUserStoreList(memberEntity.getUserId())
-                */
-                );
+        return SessionResponse.toDTO(memberEntity,
+                codeService.codeList(memberEntity.getUserId()),
+                menuService.authMenuList(memberEntity.getUserId(), memberEntity),
+                actionService.actionList(memberEntity.getUserId(), memberEntity),
+                afflService.selectTargetAfflGridList(memberEntity.getUserId(), memberEntity.getAuthTpCd()),
+                brandService.selectTargetBrandGridList(memberEntity.getUserId(), memberEntity.getAuthTpCd()));
+    }
 
+    //selectBsnsBrandList
+    public SessionBrandListResponse bsnsBrandList(String bsnsRegNo) throws Exception {
+        return SessionBrandListResponse.toDTO(brandService.selectBsnsBrandList(bsnsRegNo));
     }
+
 }

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

@@ -2,6 +2,8 @@ package com.oqpo.api.service.stinfo;
 
 
 
+import com.oqpo.api.entity.ActionEntity;
+import com.oqpo.api.entity.CodeEntity;
 import com.oqpo.api.entity.oper.*;
 import com.oqpo.api.entity.stinfo.BrandEntity;
 import com.oqpo.api.entity.stinfo.ItemClassMngEntity;
@@ -15,12 +17,10 @@ import com.oqpo.api.web.dto.request.GridRequest;
 import com.oqpo.api.web.dto.request.oper.salemgr.SaveSaleMgrMgnlRequest;
 import com.oqpo.api.web.dto.request.stinfo.brand.SaveBrandInfolRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.code.CodeSearchListResponse;
 import com.oqpo.api.web.dto.response.oper.affl.AfflShopInfoResponse;
 import com.oqpo.api.web.dto.response.oper.salemgr.SaleMgrMgnInfoResponse;
-import com.oqpo.api.web.dto.response.stinfo.brand.BrandInfoResponse;
-import com.oqpo.api.web.dto.response.stinfo.brand.BrandSearchListResponse;
-import com.oqpo.api.web.dto.response.stinfo.brand.BrandSearchResponse;
-import com.oqpo.api.web.dto.response.stinfo.brand.AfflBrandSearchResponse;
+import com.oqpo.api.web.dto.response.stinfo.brand.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -244,4 +244,20 @@ public class BrandService extends CommonService {
         }
     }
 
+    /*
+        사업자번호 브랜드 리스트
+     */
+    public List<BrandEntity> selectBsnsBrandList(String bsnsRegNo) throws Exception {
+
+        List<BrandEntity> entities = brandMapper.selectBsnsBrandList(bsnsRegNo);
+
+        return entities;
+    }
+
+    /*
+    public BsnsBrandListResponse selectBsnsBrandList(String bsnsRegNo) throws Exception {
+        List<BrandEntity> entities = brandMapper.selectBsnsBrandList(bsnsRegNo);
+        return BsnsBrandListResponse.toDTO(entities);
+    }
+    */
 }

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

@@ -3,7 +3,9 @@ package com.oqpo.api.web.controller;
 import com.oqpo.api.service.SessionService;
 import com.oqpo.api.web.dto.response.session.HashedResponse;
 import com.oqpo.api.web.dto.response.session.MsessionResponse;
+import com.oqpo.api.web.dto.response.session.SessionBrandListResponse;
 import com.oqpo.api.web.dto.response.session.SessionResponse;
+import com.oqpo.api.web.dto.response.stinfo.brand.BsnsBrandListResponse;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -16,10 +18,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PatchMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -107,8 +106,27 @@ public class SessionController {
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
     })
     @ApiOperation(value = "모바일 기본정보 전송")
-    @GetMapping("/mdata")
-    public ResponseEntity<MsessionResponse> mdata(HttpServletRequest request) throws Exception {
+    @GetMapping("/data-app")
+    public ResponseEntity<SessionResponse> mdata(HttpServletRequest request) throws Exception {
         return ResponseEntity.ok(sessionService.mdata(request));
     }
+
+
+    /**
+     * 설명 : 모바일 사업자번호 브랜드리스트
+     *
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bsnsRegNo", value = "사업자 번호", required = false, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "사업자번호 브랜드리스트")
+    @GetMapping("/bsnsbrand")
+    public ResponseEntity<SessionBrandListResponse> getBsnsBrandList(@RequestParam(value = "bsnsRegNo", required = true) String bsnsRegNo) throws Exception {
+        return ResponseEntity.ok(sessionService.bsnsBrandList(bsnsRegNo));
+    }
+
+
 }

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

@@ -0,0 +1,51 @@
+package com.oqpo.api.web.dto.response.session;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.ActionEntity;
+import com.oqpo.api.entity.CodeEntity;
+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.stinfo.BrandEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class SessionBrandListResponse {
+
+    @ApiModelProperty(value = "브랜드 리스트")
+    private List<BrandInfo> brandList;
+
+    public static SessionBrandListResponse toDTO(List<BrandEntity> brandList) {
+        if (brandList == null) return null;
+        return SessionBrandListResponse.builder()
+                .brandList(brandList.stream()
+                        .map(m -> BrandInfo.builder()
+                                .brandId(m.getBrandId())
+                                .brandNm(m.getBrandNm())
+                                .build())
+                        .collect(Collectors.toList()))
+                .build();
+    }
+
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class BrandInfo {
+        @ApiModelProperty(value = "브랜드아이디")
+        private String brandId ;
+
+        @ApiModelProperty(value = "브랜드명")
+        private String brandNm;
+    }
+
+}

src/main/java/com/oqpo/api/web/dto/response/stinfo/brand/BsnsBrandListResponse.java

@@ -0,0 +1,42 @@
+package com.oqpo.api.web.dto.response.stinfo.brand;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.stinfo.BrandEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS) //null 값 전송
+public class BsnsBrandListResponse {
+    @ApiModelProperty(value = "조회리스트")
+    private List<BrandInfo> brandList;
+
+    public static BsnsBrandListResponse toDTO(List<BrandEntity> entities) {
+        if (entities == null) return null;
+        return BsnsBrandListResponse.builder()
+                .brandList(entities.stream()
+                        .map(m -> BrandInfo.builder()
+                                .brandId(m.getBrandId())
+                                .brandNm(m.getBrandNm())
+                                .build())
+                        .collect(Collectors.toList()))
+                .build();
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class BrandInfo {
+        @ApiModelProperty(value = "브랜드아이디")
+        private String brandId;
+
+        @ApiModelProperty(value = "브랜드명")
+        private String brandNm;
+    }
+}

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

@@ -197,4 +197,25 @@
          where brand_id  = #{brandId}
     </select>
 
+    <select id="selectBsnsBrandList" resultType="com.oqpo.api.entity.stinfo.BrandEntity">
+        select info.brand_id, fn_brand_nm(info.brand_id) as brand_nm
+        from (
+                select brand_id
+                from brand_base_info
+                where bsns_reg_no = #{bsnsRegNo}
+                or affl_shop_id in (select affl_shop_id
+                from affl_shop_base_info
+                where bsns_reg_no = #{bsnsRegNo})
+                union all
+                select brand_id
+                from store_base_info
+                where bsns_reg_no = #{bsnsRegNo}
+                union all
+                select brand_id
+                from spply_base_info
+                where bsns_reg_no = #{bsnsRegNo}
+        ) info
+        order by brand_nm	asc
+    </select>
+
 </mapper>

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

@@ -20,7 +20,7 @@
          left outer join (
                                  select adtl.wr_yn , adtl.menu_no
                                  from   np_user_auth uauth
-                                   join np_auth_dtl  adtl on uauth.auth_no = adtl.auth_no and adtl.use_yn = 'Y'
+                                   join np_auth_dtl  adtl on uauth.auth_no = adtl.auth_no 
                                  where uauth.user_id = #{userId}  ) uauth
                                 on ainfo.menu_no = uauth.menu_no
         </if>
@@ -33,7 +33,7 @@
            , act.act_id
            , act.act_nm
            , act.conn_url
-           , act.wr_yn
+           , act.wr_yn as write_yn
         from np_act_info act
         inner join np_sys_menu menu
             on menu.menu_no = act.menu_no
@@ -50,7 +50,7 @@
            , act_id
            , act_nm
            , conn_url
-           , wr_yn
+           , wr_yn as write_yn
         from np_act_info
         where menu_no = #{menuNo}
         and use_yn = 'Y'
@@ -100,7 +100,7 @@
             , act_nm
             , use_yn
             , conn_url
-            , wr_yn
+            , wr_yn as write_yn
         from np_act_info
         where menu_no = #{menuNo}
         <choose>

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

@@ -117,7 +117,7 @@
 
     <delete id="deleteAuthDtl" >
         delete from np_auth_dtl /** deleteAuthDtl */
-        where auth_no = #{menuNo}
+        where auth_no = #{authNo}
         and menu_no in
         <foreach collection="gridDeleteData" item="item" separator="," open="(" close=")">
             #{item.menuNo}

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

@@ -19,7 +19,7 @@
         , fn_code_nm('USE_YN', use_yn) as use_yn_nm
         , menu_id
         from np_sys_menu
-        where top_menu_no = 0
+        where top_menu_no = 10
         union all
         select c.level + 1
         , b.menu_no
@@ -41,7 +41,7 @@
         , tlist.conn_url, tlist.menu_id
         from   tree_menu_list tlist
         <if test="systemAdminYn neq 'Y'.toString() ">
-        join  (	select 1 as top_menu_no, top_menu_no as  menu_no, 'Y' as wr_yn
+        join  (	select 100 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}
@@ -278,7 +278,8 @@
             , menu_nm as id_path_nm
             , open_cd
             from np_sys_menu
-            where top_menu_no = 0
+            where top_menu_no = 10
+            and   sys_type_cd = 'W'
             and   open_cd  <![CDATA[ <> ]]> 'p'
             union all
             select c.level + 1
@@ -331,7 +332,7 @@
         , menu_nm as id_path_nm
         , open_cd
         from np_sys_menu
-        where top_menu_no = 0
+        where top_menu_no = 10
         and   open_cd  <![CDATA[ <> ]]> 'p'
         union all
         select c.level + 1