공지사항 api 수정

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

@@ -80,11 +80,6 @@ public class JwtTokenProvider { // JWT 토큰을 생성 및 검증 모듈
         return (Boolean)claims.getBody().get(ApiConstants.CLAIMS_IS_LOGIN);
     }
 
-    public TokenResponse getTokenInfo(String token) {
-        Jws<Claims> claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token);
-        return TokenResponse.toDTO(claims);
-    }
-
     // Jwt 토큰에서 소속 가맹점 타입 정보
     public String getAfflShopId(String token) {
         Jws<Claims> claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token);
@@ -103,6 +98,11 @@ public class JwtTokenProvider { // JWT 토큰을 생성 및 검증 모듈
         return (String)claims.getBody().get(ApiConstants.CLAIMS_AUTH_TP_NM);
     }
 
+    public TokenResponse getTokenInfo(String token) {
+        Jws<Claims> claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token);
+        return TokenResponse.toDTO(claims);
+    }
+
     // Request의 Header에서 token 파싱 : "X-AUTH-TOKEN: jwt토큰"
     public String resolveToken(HttpServletRequest req) {
         return req.getHeader(ApiConstants.AUTH_TOKEN);

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

@@ -30,6 +30,9 @@ public class NticeEntity implements Serializable {
     private String addDt;
     private String nticeStatNm;
     private String rnum;
+    private String brandChk;
+    private String shopChk;
+    private String supplyChk;
 
     private NticeTargetEntity nticeTargetEntity;
 

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

@@ -13,7 +13,7 @@ public class NticeTargetEntity implements Serializable {
     private static final long serialVersionUID = -3590936033715917450L;
 
     private String nticeNo;
-    private String userId;
-    private String userNm;
+    private String brandId;
+    private String brandNm;
 
 }

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

@@ -28,7 +28,7 @@ public interface NticeMapper {
 
     int insertNticeTarget(@Param("userId") String userId, @Param("nticeNo") String nticeNo, List<NticeTargetEntity> gridInsertData) throws Exception;
 
-    int deleteNticeTarget(@Param("userId") String userId, List<NticeTargetEntity> gridDeleteData) throws Exception;
+    int deleteNticeTarget(@Param("nticeNo") String nticeNo, List<NticeTargetEntity> gridDeleteData) throws Exception;
     int updateNticeViewCnt(@Param("nticeNo") String nticeNo) throws Exception;
 
     List<NticeEntity> selectMNticeList(@Param("userId") String userId)throws Exception;

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

@@ -53,6 +53,9 @@ 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));
 
         } catch (Exception e) {
             e.getStackTrace();

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

@@ -63,9 +63,6 @@ public class SigninService implements UserDetailsService {
             SecurityContextHolder.getContext().setAuthentication(authentication);
             memberEntity = (MemberEntity) authentication.getPrincipal();
 
-            System.out.println("===============================");
-            System.out.println("==memberEntity.getAuthTpNm()=============================>>>" + memberEntity.getAuthTpNm());
-            System.out.println("===============================");
             connKey = jwtTokenProvider.createToken (
                     memberEntity.getUserId(),
                     memberEntity.getUserNm(),

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

@@ -76,7 +76,12 @@ public class NticeService extends CommonService {
             entity.setNotiStDay(saveNticeRequest.getNotiStDay().replace(".", ""));
             entity.setNotiEdDay(saveNticeRequest.getNotiEdDay().replace(".", ""));
             entity.setFileNo(saveNticeRequest.getFileNo());
-
+            entity.setBrandId(saveNticeRequest.getBrandId());
+            entity.setAfflShopId(saveNticeRequest.getAfflShopId());
+            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));
@@ -95,6 +100,7 @@ public class NticeService extends CommonService {
 
             // 삭제건
             List<NticeTargetEntity> gridDeleteData = saveNticeRequest.toNticeTargetEntities(saveNticeRequest.getGridDeleteData());
+
             if (gridDeleteData.size() > 0) {
                 nticeMapper.deleteNticeTarget(entity.getNticeNo(), gridDeleteData);
             }
@@ -128,8 +134,8 @@ public class NticeService extends CommonService {
                 .map(m -> NticeTargetResponse.builder()
                         .viewCd("R")
                         .nticeNo(m.getNticeNo())
-                        .userId(m.getUserId())
-                        .userNm(m.getUserNm())
+                        .userId(m.getBrandId())
+                        .userNm(m.getBrandNm())
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);

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

@@ -64,7 +64,6 @@ public class SigninController {
     @ApiOperation(value = "Swagger 로그인")
     @PostMapping("/sign-in-swagger")
     public ResponseEntity<JwtResponse> signinSwagger(@RequestBody @Valid SigninRequest signinRequest) throws Exception {
-        System.out.println("sign-in-swagger==========================" + signinRequest.getUserId() + "===" + signinRequest.getPassword() ); ;
         //log.debug("password==>>>{}", passwordEncoder.encode(password));
         return ResponseEntity.ok(signinService.signin(signinRequest.getUserId(), signinRequest.getPassword()));
     }

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

@@ -44,6 +44,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 {
+
         return ResponseEntity.ok(nticeService.selectNticeGridList( afflShopId, brandId, authTpCd, nticeGridRequest.getSAfflShopId(), nticeGridRequest.getSBrandId(), nticeGridRequest.getFromDt(), nticeGridRequest.getToDt(), nticeGridRequest.getSNticeTitl(),  nticeGridRequest.toDTO(nticeGridRequest)));
     }
 
@@ -61,6 +62,7 @@ public class NticeController {
     @ApiOperation(value = "공지정보 저장")
     @PostMapping("/save-ntice")
     public ResponseEntity<SaveResponse> saveUser(@ApiIgnore String userId, @RequestBody @Valid SaveNticeRequest saveNticeRequest) throws Exception {
+
         nticeService.saveNtice(userId, saveNticeRequest);
         return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
     }
@@ -83,7 +85,7 @@ public class NticeController {
     }
 
     /**
-     * 설명 : 공지타게ㅐㅅ 그리드 리스트
+     * 설명 : 공지타겟 그리드 리스트
      *
      * @param nticeTargetGridRequest
      * @return

src/main/java/com/oqpo/api/web/dto/request/oper/ntice/SaveNticeRequest.java

@@ -15,6 +15,14 @@ public class SaveNticeRequest {
     @ApiModelProperty(value = "CRUD")
     private String viewCd;
 
+    @NotBlank
+    @ApiModelProperty(value = "가맹점아이디")
+    private String afflShopId;
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
     @ApiModelProperty(value = "공지번호")
     private String nticeNo;
 
@@ -45,6 +53,15 @@ public class SaveNticeRequest {
     @ApiModelProperty(value = "파일번호")
     private String fileNo;
 
+    @ApiModelProperty(value = "브랜드대상여부")
+    private String brandChk;
+
+    @ApiModelProperty(value = "매장대상여부")
+    private String shopChk;
+
+    @ApiModelProperty(value = "공급사대상여부")
+    private String supplyChk;
+
 
     @ApiModelProperty(value = "등록상세리스트")
     private List<SaveNticeTarget> gridInsertData;
@@ -59,7 +76,7 @@ public class SaveNticeRequest {
         List<NticeTargetEntity> entities = new ArrayList<>();
         gridData.forEach(x -> {
             NticeTargetEntity entity = new NticeTargetEntity();
-            entity.setUserId(x.getUserId());
+            entity.setBrandId(x.getBrandId());
             entity.setNticeNo(x.getNticeNo());
             entities.add(entity);
         });
@@ -71,8 +88,8 @@ public class SaveNticeRequest {
     @AllArgsConstructor(access = AccessLevel.PROTECTED)
     static class SaveNticeTarget {
         @NotBlank
-        @ApiModelProperty(value = "사용자 ID")
-        private String userId;
+        @ApiModelProperty(value = "브랜드아이디")
+        private String brandId;
 
         @ApiModelProperty(value = "공지번호")
         private String nticeNo;

src/main/java/com/oqpo/api/web/dto/response/oper/ntice/NticeResponse.java

@@ -12,6 +12,18 @@ import lombok.*;
 @JsonInclude(JsonInclude.Include.ALWAYS)
 public class NticeResponse {
 
+    @ApiModelProperty(value = "가맹점아이디")
+    private String afflShopId;
+
+    @ApiModelProperty(value = "가맹점명")
+    private String afflShopNm;
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
+    @ApiModelProperty(value = "브랜드명")
+    private String brandNm;
+
     @ApiModelProperty(value = "공지번호")
     private String nticeNo;
 
@@ -42,10 +54,23 @@ public class NticeResponse {
     @ApiModelProperty(value = "파일번호")
     private String fileNo;
 
+    @ApiModelProperty(value = "브랜드대상여부")
+    private String brandChk;
+
+    @ApiModelProperty(value = "매장대상여부")
+    private String shopChk;
+
+    @ApiModelProperty(value = "공급사대상여부")
+    private String supplyChk;
+
     public static NticeResponse toDTO(NticeEntity entity) {
         if (entity == null) return null;
         return NticeResponse.builder()
                 .nticeNo(entity.getNticeNo())
+                .afflShopId(entity.getAfflShopId())
+                .afflShopNm(entity.getAfflShopNm())
+                .brandId(entity.getBrandId())
+                .brandNm(entity.getBrandNm())
                 .nticeTitl(entity.getNticeTitl() == null ? "" : entity.getNticeTitl())
                 .nticeDesc(entity.getNticeDesc() == null ? "" : entity.getNticeDesc())
                 .targetCd(entity.getTargetCd())
@@ -55,6 +80,9 @@ public class NticeResponse {
                 .notiEdDay(entity.getNotiEdDay())
                 .fileNo(entity.getFileNo() == null ? "" : entity.getFileNo())
                 .viewCnt(entity.getViewCnt())
+                .brandChk(entity.getBrandChk() == null ? "N" : entity.getBrandChk())
+                .shopChk(entity.getShopChk() == null ? "N" : entity.getShopChk())
+                .supplyChk(entity.getSupplyChk() == null ? "N" : entity.getSupplyChk())
                 .build();
     }
 }

src/main/java/com/oqpo/api/web/dto/response/oper/ntice/NticeTargetResponse.java

@@ -16,10 +16,10 @@ public class NticeTargetResponse {
     @ApiModelProperty(value = "공지번호")
     private String nticeNo;
 
-    @ApiModelProperty(value = "사용자 id")
-    private String userId;
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
 
-    @ApiModelProperty(value = "사용자명")
-    private String userNm;
+    @ApiModelProperty(value = "브랜드명")
+    private String brandNm;
 
 }

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

@@ -26,6 +26,18 @@ public class TokenResponse {
     @ApiModelProperty(value = "로그인 구별 정보")
     private Boolean isLogin;
 
+    @ApiModelProperty(value = "가맹점아이디")
+    private String afflShopId;
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
+
+    @ApiModelProperty(value = "로그인회사명")
+    private String authTpNm;
+
+
+
     public static TokenResponse toDTO(Jws<Claims> claims) {
         return TokenResponse.builder()
                 .userId(claims.getBody().getSubject())
@@ -33,6 +45,9 @@ public class TokenResponse {
                 .superAdminYn((String) claims.getBody().get(ApiConstants.CLAIMS_SUPER_ADMIN_YN))
                 .authTpCd((String) claims.getBody().get(ApiConstants.CLAIMS_AUTH_TP_CD))
                 .isLogin((Boolean)claims.getBody().get(ApiConstants.CLAIMS_IS_LOGIN))
+                .afflShopId((String) claims.getBody().get(ApiConstants.CLAIMS_AFFL_SHOP_ID))
+                .brandId((String) claims.getBody().get(ApiConstants.CLAIMS_BRAND_ID))
+                .authTpNm((String) claims.getBody().get(ApiConstants.CLAIMS_AUTH_TP_NM))
                 .build();
     }
 }

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

@@ -42,12 +42,10 @@ public class TokenCheckInterceptor extends HandlerInterceptorAdapter {
 
 
             if (!jobService.saveJob(memberEntity, path)) {
-                System.out.println("====================================start");
                 throw new UnauthorizedException(SystemMessageCode.NOT_AUTH.getMessage());
             }
 */
         }catch(UnauthorizedException e) {
-            System.out.println("====================================exception");
             e.printStackTrace();
             throw new UnauthorizedException(e.getErrorMessage());
         }

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

@@ -21,6 +21,9 @@ public class ArgumentResolver implements HandlerMethodArgumentResolver {
     private final String SYSTEM_ADMIN_YN = "systemAdminYn";
     private final String SUPER_ADMIN_YN = "superAdminYn";
     private final String AUTH_TP_CD = "authTpCd";
+    private final String AFFL_SHOP_ID = "afflShopId";
+    private final String BRAND_ID = "brandId";
+    private final String AUTH_TP_NM = "authTpNm";
 
     @Override
     public boolean supportsParameter(MethodParameter parameter) {
@@ -32,6 +35,12 @@ public class ArgumentResolver implements HandlerMethodArgumentResolver {
             return true;
         }  else if (parameter.getParameterName().equals(AUTH_TP_CD)) {
             return true;
+        }  else if (parameter.getParameterName().equals(AFFL_SHOP_ID)) {
+            return true;
+        }  else if (parameter.getParameterName().equals(BRAND_ID)) {
+            return true;
+        }  else if (parameter.getParameterName().equals(AUTH_TP_NM)) {
+            return true;
         }  else if (parameter.getParameterType() == TokenResponse.class) {
             return true;
         }
@@ -47,15 +56,13 @@ public class ArgumentResolver implements HandlerMethodArgumentResolver {
 
             if (tokenResponse == null) return null;
 
-            System.out.println("parameter.getParameterName()============" + parameter.getParameterName());
-            System.out.println("getUserId=================>" + tokenResponse.getUserId());
-            System.out.println("getSystemAdminYn=================>" + tokenResponse.getSystemAdminYn());
-            System.out.println("getSuperAdminYn=================>" + tokenResponse.getSuperAdminYn());
-            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(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();
             return tokenResponse;
         } catch(Exception e) {
             e.printStackTrace();

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

@@ -11,8 +11,8 @@
                 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
-        and A.brand_id in (select B.brand_id from np_ntice_target B where B.ntice_no = A.ntice_no )
         <if test="authTpCd == '30'">
          and A.affl_shop_id = #{afflShopId}
         </if>
@@ -29,10 +29,10 @@
             and A.supply_chk = 'Y'
         </if>
         <if test="sAfflShopId != null and sAfflShopId != ''">
-            and    affl_shop_id = #{sAfflShopId}
+            and    A.affl_shop_id = #{sAfflShopId}
         </if>
         <if test="sBrandId != null and sBrandId != ''">
-            and    brand_id = #{sBrandId}
+            and    A.brand_id = #{sBrandId}
         </if>
         <if test="fromDt != null and fromDt != '' and  toDt != null and toDt != ''  ">
             <![CDATA[
@@ -84,11 +84,11 @@
             and A.brand_id = #{brandId}
             and A.supply_chk = 'Y'
         </if>
-        <if test="afflShopId != null and afflShopId != ''">
-            and    affl_shop_id = #{afflShopId}
+        <if test="sAfflShopId != null and sAfflShopId != ''">
+            and    A.affl_shop_id = #{sAfflShopId}
         </if>
-        <if test="brandId != null and brandId != ''">
-            and    brand_id = #{brandId}
+        <if test="sBrandId != null and sBrandId != ''">
+            and    A.brand_id = #{sBrandId}
         </if>
         <if test="fromDt != null and fromDt != '' and  toDt != null and toDt != ''  ">
             <![CDATA[
@@ -106,7 +106,8 @@
         select  /* ntice.selectnticeinfo */
                  ntice_no, target_cd, ntice_titl, ntice_desc, del_yn , fn_code_nm('TARGET_CD', target_cd) as target_nm
                 , date_format(noti_st_day ,'%Y.%m.%d') as noti_st_day, date_format(noti_ed_day ,'%Y.%m.%d') as noti_ed_day
-                , view_cnt, file_no
+                , view_cnt, file_no, affl_shop_id, brand_id, fn_affl_nm(affl_shop_id) as affl_shop_nm, fn_brand_nm(brand_id) as brand_nm
+                , brand_chk, shop_chk, supply_chk
         from np_ntice
         where ntice_no = #{nticeNo}
     </select>
@@ -114,23 +115,23 @@
 
     <select id="selectNticeTargetGridList" resultType="com.oqpo.api.entity.oper.NticeTargetEntity">
         select  /* ntice.selectNticeTargetGridList*/
-                ntarget.ntice_no, ntarget.user_id , uinfo.user_nm
+                ntarget.ntice_no, ntarget.brand_id , binfo.brand_nm
         from   np_ntice_target ntarget
-        join np_user_info uinfo on uinfo.user_id = ntarget.user_id
+        join brand_base_info binfo on binfo.brand_id = ntarget.brand_id
         where ntarget.ntice_no = #{nticeNo}
         <choose>
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
                     <if test="gridRequest.sord == 'asc'.toString()">
-                        order by uinfo.user_nm asc
+                        order by binfo.brand_nm asc
                     </if>
                     <if test="gridRequest.sord == 'desc'.toString()">
-                        order by uinfo.user_nm desc
+                        order by binfo.brand_nm desc
                     </if>
                 </if>
             </when>
             <otherwise>
-                order by uinfo.user_nm asc
+                order by binfo.brand_nm asc
             </otherwise>
         </choose>
         <if test="gridRequest.pagingYn == true">
@@ -147,10 +148,10 @@
     <insert id="insertNticeInfo" >
             insert into np_ntice  /* ntice.insertNticeInfo*/
             (ntice_no, target_cd, ntice_titl, ntice_desc, del_yn, noti_st_day, noti_ed_day
-             , file_no, add_dt, add_id, chg_dt, chg_id)
+             , file_no, add_dt, add_id, chg_dt, chg_id, affl_shop_id, brand_id, brand_chk, shop_chk, supply_chk)
             values
             (#{entity.nticeNo}, #{entity.targetCd}, #{entity.nticeTitl} , #{entity.nticeDesc} , #{entity.delYn} , #{entity.notiStDay} , #{entity.notiEdDay}
-            , #{entity.fileNo} , now(), #{userId}, now(), #{userId})
+            , #{entity.fileNo} , now(), #{userId}, now(), #{userId}, #{entity.afflShopId}, #{entity.brandId}, #{entity.brandChk}, #{entity.shopChk}, #{entity.supplyChk})
     </insert>
 
     <update id="updateNticeInfo">
@@ -164,24 +165,27 @@
               ,noti_st_day  = #{entity.notiStDay}
               ,noti_ed_day  = #{entity.notiEdDay}
               ,file_no      = #{entity.fileNo}
+              ,brand_chk    = #{entity.brandChk}
+              ,shop_chk     = #{entity.shopChk}
+              ,supply_chk   = #{entity.supplyChk}
         where ntice_no = #{entity.nticeNo}
     </update>
 
     <insert id="insertNticeTarget" >
         insert into np_ntice_target /* ntice.insertNticeTarget*/
-        (ntice_no, user_id, add_dt, add_id)
+        (ntice_no, brand_id, add_dt, add_id)
         values
         <foreach collection="gridInsertData" item="item" separator=",">
-            ( #{nticeNo},#{item.userId}, now(), #{userId})
+            ( #{nticeNo},#{item.brandId}, now(), #{userId})
         </foreach>
     </insert>
 
     <delete id="deleteNticeTarget">
         delete from np_ntice_target /* ntice.deleteNticeTarget*/
         where  ntice_no  =  #{nticeNo}
-        and    user_id   in
+        and    brand_id   in
         <foreach collection="gridDeleteData" item="item" separator="," open="(" close=")">
-            #{item.userId}
+            #{item.brandId}
         </foreach>
     </delete>