Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-api into feature/qcast-api-002

This commit is contained in:
changkyu choi 2024-09-26 15:42:25 +09:00
commit f7a41332d5
8 changed files with 30 additions and 46 deletions

View File

@ -6,10 +6,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@ -17,13 +14,13 @@ import org.springframework.web.bind.annotation.RestController;
@RequiredArgsConstructor
@Tag(name = "DisplayItemController", description = "전시(표시) 제품 관련 API")
public class DisplayItemController {
private final DisplayItemService displayItemService;
@Operation(description = "전시제품 정보를 등록/수정한다. (동기화)")
@GetMapping("/display-item-save")
@ResponseStatus(HttpStatus.OK)
public void setStoreDisplayItemSave(DisplayItemRequest displayItemRequest) throws Exception {
displayItemService.setStoreDisplayItemSave(displayItemRequest);
}
private final DisplayItemService displayItemService;
@Operation(description = "전시제품 정보를 등록/수정한다. (동기화)")
@PostMapping("/display-item-save")
@ResponseStatus(HttpStatus.OK)
public void setStoreDisplayItemSave(@RequestBody DisplayItemRequest displayItemRequest)
throws Exception {
displayItemService.setStoreDisplayItemSave(displayItemRequest);
}
}

View File

@ -4,7 +4,7 @@ import com.interplug.qcast.biz.displayItem.dto.DisplayItemRequest;
import org.apache.ibatis.annotations.Mapper;
@Mapper
interface DisplayItemMapper {
public interface DisplayItemMapper {
int setStoreDisplayItemSave(DisplayItemRequest displayItemRequest) throws Exception;
void setStoreDisplayItemSave(DisplayItemRequest displayItemRequest) throws Exception;
}

View File

@ -10,9 +10,9 @@ import org.springframework.stereotype.Service;
@RequiredArgsConstructor
public class DisplayItemService {
private final DisplayItemMapper displayItemMapper;
private final DisplayItemMapper displayItemMapper;
public void setStoreDisplayItemSave(DisplayItemRequest displayItemRequest) throws Exception {
displayItemMapper.setStoreDisplayItemSave(displayItemRequest);
}
public void setStoreDisplayItemSave(DisplayItemRequest displayItemRequest) throws Exception {
displayItemMapper.setStoreDisplayItemSave(displayItemRequest);
}
}

View File

@ -1,26 +1,19 @@
package com.interplug.qcast.biz.excelDown;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.interplug.qcast.biz.excelDown.dto.NtrCtsCmpRequest;
import com.interplug.qcast.biz.excelDown.dto.NtrCtsCmpResponse;
import com.interplug.qcast.biz.excelDown.dto.QuotItemResponse;
import com.interplug.qcast.biz.excelDown.dto.QuotPlanResponse;
import com.interplug.qcast.biz.excelDown.dto.QuotRequest;
import com.interplug.qcast.biz.excelDown.dto.WrntIsncCmplFileResponse;
import com.interplug.qcast.biz.excelDown.dto.WrntIsncCmplRequest;
import com.interplug.qcast.biz.excelDown.dto.WrntIsncCmplResponse;
import com.interplug.qcast.biz.excelDown.dto.*;
import com.interplug.qcast.config.Exception.BaseException;
import com.interplug.qcast.config.message.Messages;
import com.interplug.qcast.util.ZipFileManager;
import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@Slf4j
@Service
@ -30,8 +23,7 @@ public class ExcelDownService {
private final ZipFileManager zipFileManager;
@Autowired
Messages message;
@Autowired Messages message;
@Value("${file.ini.root.path}")
private String baseDirPath;
@ -56,8 +48,8 @@ public class ExcelDownService {
return excelDownMapper.selectWarrantyIssuedCmpExclDownData(wrntIsncCmplRequest);
}
public void selectWarrantyIssuedCmpFileData(WrntIsncCmplRequest wrntIsncCmplRequest,
HttpServletResponse response) throws Exception {
public void selectWarrantyIssuedCmpFileData(
WrntIsncCmplRequest wrntIsncCmplRequest, HttpServletResponse response) throws Exception {
List<WrntIsncCmplFileResponse> listData =
excelDownMapper.selectWarrantyIssuedCmpFileData(wrntIsncCmplRequest);

View File

@ -6,5 +6,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface StoreFavoriteMapper {
int setStoreFavoriteSave(StoreFavoriteRequest req) throws Exception;
}
int setStoreFavoriteSave(StoreFavoriteRequest storeFavoriteRequest) throws Exception;
}

View File

@ -30,10 +30,7 @@ public class SecurityConfig {
httpSecurity
.httpBasic(HttpBasicConfigurer::disable)
.csrf(CsrfConfigurer::disable)
.cors(Customizer.withDefaults())
.authorizeHttpRequests(
authorize ->
authorize.requestMatchers(WHITELIST).permitAll().anyRequest().authenticated());
.cors(Customizer.withDefaults());
return httpSecurity.build();
}

View File

@ -2,6 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.interplug.qcast.biz.displayItem.DisplayItemMapper">
<insert id="setStoreDisplayItemSave" parameterType="com.interplug.qcast.biz.displayItem.dto.DisplayItemRequest" >
/* sqlid : com.interplug.qcast.displayItem.setStoreDisplayItemSave */
MERGE M_SALES_STORE_DISP_ITEM AS A
@ -20,7 +21,6 @@
START_DATE = #{startDate}
, END_DATE = #{endDate}
, DEL_FLG = #{delFlg}
, DISP_ORDER = #{dispOrder}
, LAST_EDIT_DATETIME = #{lastEditDatetime}
WHEN NOT MATCHED THEN
INSERT (

View File

@ -2,8 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.interplug.qcast.biz.user.UserMapper">
<insert id="setStoreSapCdSave" parameterType="com.interplug.qcast.biz.user.dto.StoreRequest" >
/* sqlid : com.interplug.qcast.user.setStoreSapCdSave */
WITH SALES_STORE_CTE AS (