배치 api 파라미터 패턴 변경 수정
This commit is contained in:
changkyu choi
parent
5285f3fedf
commit
d7f6c7a320
@ -49,7 +49,7 @@ public class DisplayItemController {
|
||||
@Operation(description = "제품 목록을 조회한다.")
|
||||
@GetMapping("/item-list")
|
||||
@ResponseStatus(HttpStatus.OK)
|
||||
public List<ItemResponse> getItemList(@RequestParam("saleStoreId") String saleStoreId)
|
||||
public List<ItemResponse> getItemList(@RequestParam String saleStoreId)
|
||||
throws Exception {
|
||||
return displayItemService.getItemList(saleStoreId);
|
||||
}
|
||||
@ -64,7 +64,7 @@ public class DisplayItemController {
|
||||
@Operation(description = "제품 상세 정보를 조회한다.")
|
||||
@GetMapping("/item-detail")
|
||||
@ResponseStatus(HttpStatus.OK)
|
||||
public ItemDetailResponse getItemDetail(@RequestParam("itemId") String itemId) throws Exception {
|
||||
public ItemDetailResponse getItemDetail(@RequestParam String itemId) throws Exception {
|
||||
return displayItemService.getItemDetail(itemId);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,13 +1,10 @@
|
||||
package com.interplug.qcast.biz.master;
|
||||
|
||||
import com.interplug.qcast.biz.master.dto.ApiConstructionRequest;
|
||||
import com.interplug.qcast.biz.master.dto.ApiConstructionResponse;
|
||||
import com.interplug.qcast.biz.master.dto.ApiModuleTpResponse;
|
||||
import com.interplug.qcast.biz.master.dto.ApiResponse;
|
||||
import com.interplug.qcast.biz.master.dto.ApiRoofMaterialResponse;
|
||||
import com.interplug.qcast.biz.master.dto.ApiTrestleDetailRequest;
|
||||
import com.interplug.qcast.biz.master.dto.ApiTrestleDetailResponse;
|
||||
import com.interplug.qcast.biz.master.dto.ApiTrestleRequest;
|
||||
import com.interplug.qcast.biz.master.dto.ApiTrestleResponse;
|
||||
import com.interplug.qcast.config.Exception.ErrorCode;
|
||||
import com.interplug.qcast.config.Exception.QcastException;
|
||||
@ -15,7 +12,6 @@ import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
@ -36,7 +32,7 @@ public class MasterController {
|
||||
@Operation(description = "모듈 타입별 아이템 목록을 조회한다.")
|
||||
@GetMapping("/getModuleTypeItemList")
|
||||
public ApiResponse<ApiModuleTpResponse> getModuleTypeItemList(
|
||||
@RequestParam("roofMatlCd") String roofMaterialCd) throws QcastException {
|
||||
@RequestParam("roofMatlCd") String roofMaterialCd) throws QcastException {
|
||||
if (roofMaterialCd == null || roofMaterialCd.trim().isEmpty()) {
|
||||
throw new QcastException(ErrorCode.INVALID_INPUT_VALUE);
|
||||
}
|
||||
@ -45,25 +41,78 @@ public class MasterController {
|
||||
|
||||
@Operation(description = "가대 목록 조회")
|
||||
@GetMapping("/getTrestleList")
|
||||
public ApiResponse<ApiTrestleResponse> getTrestleList(@ModelAttribute ApiTrestleRequest params) {
|
||||
System.out.println(" >>>>>>>>>>>>>>>>>>>>>>>>>> " + params.getConstMthdCd());
|
||||
System.out.println(" >>>>>>>>>>>>>>>>>>>>>>>>>> " + params.getModuleTpCd());
|
||||
System.out.println(" >>>>>>>>>>>>>>>>>>>>>>>>>> " + params.getRaftBaseCd());
|
||||
System.out.println(" >>>>>>>>>>>>>>>>>>>>>>>>>> " + params.getRoofBaseCd());
|
||||
System.out.println(" >>>>>>>>>>>>>>>>>>>>>>>>>> " + params.getRoofMatlCd());
|
||||
System.out.println(" >>>>>>>>>>>>>>>>>>>>>>>>>> " + params.getTrestleMkrCd());
|
||||
return masterService.getTrestleList(params);
|
||||
public ApiResponse<ApiTrestleResponse> getTrestleList(
|
||||
@RequestParam(required = false) String moduleTpCd,
|
||||
@RequestParam(required = false) String roofMatlCd,
|
||||
@RequestParam(required = false) String raftBaseCd,
|
||||
@RequestParam(required = false) String trestleMkrCd,
|
||||
@RequestParam(required = false) String constMthdCd,
|
||||
@RequestParam(required = false) String roofBaseCd) {
|
||||
|
||||
return masterService.getTrestleList(moduleTpCd,roofMatlCd,raftBaseCd,trestleMkrCd,constMthdCd,roofBaseCd);
|
||||
}
|
||||
|
||||
@Operation(description = "시공법 목록 조회")
|
||||
@GetMapping("/getConstructionList")
|
||||
public ApiResponse<ApiConstructionResponse> getConstructionList(@ModelAttribute ApiConstructionRequest params) {
|
||||
return masterService.getConstructionList(params);
|
||||
public ApiResponse<ApiConstructionResponse> getConstructionList(
|
||||
@RequestParam String moduleTpCd,
|
||||
@RequestParam String roofMatlCd,
|
||||
@RequestParam String trestleMkrCd,
|
||||
@RequestParam String constMthdCd,
|
||||
@RequestParam String roofBaseCd,
|
||||
@RequestParam String illuminationTp,
|
||||
@RequestParam String instHt,
|
||||
@RequestParam String stdWindSpeed,
|
||||
@RequestParam String stdSnowLd,
|
||||
@RequestParam String inclCd,
|
||||
@RequestParam(required = false) String raftBaseCd,
|
||||
@RequestParam(required = false) Integer roofPitch) throws QcastException {
|
||||
|
||||
if (moduleTpCd == null || moduleTpCd.trim().isEmpty() ||
|
||||
roofMatlCd == null || roofMatlCd.trim().isEmpty() ||
|
||||
trestleMkrCd == null || trestleMkrCd.trim().isEmpty() ||
|
||||
constMthdCd == null || constMthdCd.trim().isEmpty() ||
|
||||
roofBaseCd == null || roofBaseCd.trim().isEmpty() ||
|
||||
illuminationTp == null || illuminationTp.trim().isEmpty() ||
|
||||
instHt == null || instHt.trim().isEmpty() ||
|
||||
stdWindSpeed == null || stdWindSpeed.trim().isEmpty() ||
|
||||
stdSnowLd == null || stdSnowLd.trim().isEmpty() ||
|
||||
inclCd == null || inclCd.trim().isEmpty()) {
|
||||
throw new QcastException(ErrorCode.INVALID_INPUT_VALUE);
|
||||
}
|
||||
return masterService.getConstructionList(moduleTpCd, roofMatlCd, trestleMkrCd, constMthdCd, roofBaseCd, illuminationTp, instHt, stdWindSpeed, stdSnowLd, inclCd, raftBaseCd, roofPitch);
|
||||
}
|
||||
|
||||
@Operation(description = "가대 상세 조회")
|
||||
@GetMapping("/getTrestleDetailList")
|
||||
public ApiResponse<ApiTrestleDetailResponse> getTrestleDetailList(@ModelAttribute ApiTrestleDetailRequest params) {
|
||||
return masterService.getTrestleDetailList(params);
|
||||
public ApiResponse<ApiTrestleDetailResponse> getTrestleDetailList(
|
||||
@RequestParam String moduleTpCd,
|
||||
@RequestParam String roofMatlCd,
|
||||
@RequestParam String trestleMkrCd,
|
||||
@RequestParam String constMthdCd,
|
||||
@RequestParam String roofBaseCd,
|
||||
@RequestParam String illuminationTp,
|
||||
@RequestParam String instHt,
|
||||
@RequestParam String stdWindSpeed,
|
||||
@RequestParam String stdSnowLd,
|
||||
@RequestParam String inclCd,
|
||||
@RequestParam String constTp,
|
||||
@RequestParam(required = false) Integer mixMatlNo,
|
||||
@RequestParam(required = false) Integer roofPitch) throws QcastException {
|
||||
|
||||
if (moduleTpCd == null || moduleTpCd.trim().isEmpty() ||
|
||||
roofMatlCd == null || roofMatlCd.trim().isEmpty() ||
|
||||
trestleMkrCd == null || trestleMkrCd.trim().isEmpty() ||
|
||||
constMthdCd == null || constMthdCd.trim().isEmpty() ||
|
||||
roofBaseCd == null || roofBaseCd.trim().isEmpty() ||
|
||||
illuminationTp == null || illuminationTp.trim().isEmpty() ||
|
||||
instHt == null || instHt.trim().isEmpty() ||
|
||||
stdWindSpeed == null || stdWindSpeed.trim().isEmpty() ||
|
||||
stdSnowLd == null || stdSnowLd.trim().isEmpty() ||
|
||||
inclCd == null || inclCd.trim().isEmpty() ||
|
||||
constTp == null || constTp.trim().isEmpty()) {
|
||||
throw new QcastException(ErrorCode.INVALID_INPUT_VALUE);
|
||||
}
|
||||
return masterService.getTrestleDetailList(moduleTpCd, roofMatlCd, trestleMkrCd, constMthdCd, roofBaseCd, illuminationTp, instHt, stdWindSpeed, stdSnowLd, inclCd, constTp, mixMatlNo, roofPitch);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,17 +1,14 @@
|
||||
package com.interplug.qcast.biz.master;
|
||||
|
||||
import com.interplug.qcast.biz.master.dto.ApiConstructionRequest;
|
||||
import com.interplug.qcast.biz.master.dto.ApiConstructionResponse;
|
||||
import com.interplug.qcast.biz.master.dto.ApiModuleTpResponse;
|
||||
import com.interplug.qcast.biz.master.dto.ApiResponse;
|
||||
import com.interplug.qcast.biz.master.dto.ApiRoofMaterialResponse;
|
||||
import com.interplug.qcast.biz.master.dto.ApiTrestleDetailRequest;
|
||||
import com.interplug.qcast.biz.master.dto.ApiTrestleDetailResponse;
|
||||
import com.interplug.qcast.biz.master.dto.ApiTrestleRequest;
|
||||
import com.interplug.qcast.biz.master.dto.ApiTrestleResponse;
|
||||
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
// @FeignClient(name = "master", url = "${feign.master.url}")
|
||||
@ -28,14 +25,46 @@ public interface MasterService {
|
||||
@RequestParam("roofMatlCd") String roofMaterialCd);
|
||||
|
||||
// 가대 목록 조회
|
||||
@GetMapping("/trestle")
|
||||
public ApiResponse<ApiTrestleResponse> getTrestleList(@ModelAttribute ApiTrestleRequest params);
|
||||
@GetMapping("/trestle")
|
||||
public ApiResponse<ApiTrestleResponse> getTrestleList(
|
||||
@RequestParam(required = false) String moduleTpCd,
|
||||
@RequestParam(required = false) String roofMatlCd,
|
||||
@RequestParam(required = false) String raftBaseCd,
|
||||
@RequestParam(required = false) String trestleMkrCd,
|
||||
@RequestParam(required = false) String constMthdCd,
|
||||
@RequestParam(required = false) String roofBaseCd);
|
||||
|
||||
// 시공법 목록 조회
|
||||
@GetMapping("/construction")
|
||||
public ApiResponse<ApiConstructionResponse> getConstructionList(@ModelAttribute ApiConstructionRequest params);
|
||||
public ApiResponse<ApiConstructionResponse> getConstructionList(
|
||||
@RequestParam String moduleTpCd,
|
||||
@RequestParam String roofMatlCd,
|
||||
@RequestParam String trestleMkrCd,
|
||||
@RequestParam String constMthdCd,
|
||||
@RequestParam String roofBaseCd,
|
||||
@RequestParam String illuminationTp,
|
||||
@RequestParam String instHt,
|
||||
@RequestParam String stdWindSpeed,
|
||||
@RequestParam String stdSnowLd,
|
||||
@RequestParam String inclCd,
|
||||
@RequestParam(required = false) String raftBaseCd,
|
||||
@RequestParam(required = false) Integer roofPitch);
|
||||
|
||||
// 가대 상세 조회
|
||||
@GetMapping("/trestle/detail")
|
||||
public ApiResponse<ApiTrestleDetailResponse> getTrestleDetailList(@ModelAttribute ApiTrestleDetailRequest params);
|
||||
public ApiResponse<ApiTrestleDetailResponse> getTrestleDetailList(
|
||||
@RequestParam String moduleTpCd,
|
||||
@RequestParam String roofMatlCd,
|
||||
@RequestParam String trestleMkrCd,
|
||||
@RequestParam String constMthdCd,
|
||||
@RequestParam String roofBaseCd,
|
||||
@RequestParam String illuminationTp,
|
||||
@RequestParam String instHt,
|
||||
@RequestParam String stdWindSpeed,
|
||||
@RequestParam String stdSnowLd,
|
||||
@RequestParam String inclCd,
|
||||
@RequestParam String constTp,
|
||||
@RequestParam(required = false) Integer mixMatlNo,
|
||||
@RequestParam(required = false) Integer roofPitch);
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user