From 1e3f8f0801cafd23034c242e5f035ecbe2dac47e Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Tue, 7 Jan 2025 11:15:37 +0900 Subject: [PATCH] =?UTF-8?q?Canvas=EA=B8=B0=EB=B3=B8=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=A1=B0=EA=B1=B4=20roof=5Fseq=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80int=20>>=20Integer=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CanvasBasicSettingController.java | 10 +++++----- .../canvasBasicSetting/CanvasBasicSettingMapper.java | 2 +- .../canvasBasicSetting/CanvasBasicSettingService.java | 4 ++-- .../qcast/biz/master/ApiConstructionBuilder.java | 6 +++--- .../qcast/biz/master/ApiTrestleDetailBuilder.java | 6 +++--- .../qcast/biz/master/dto/ApiConstructionRequest.java | 2 +- .../qcast/biz/master/dto/ApiConstructionResponse.java | 2 +- .../biz/master/dto/ApiTrestleDetailModuleResponse.java | 4 ++-- .../biz/master/dto/ApiTrestleDetailRackResponse.java | 2 +- .../qcast/biz/master/dto/ApiTrestleDetailRequest.java | 4 ++-- .../qcast/biz/master/dto/ApiTrestleDetailResponse.java | 4 ++-- .../qcast/biz/master/dto/ApiTrestleResponse.java | 2 +- .../canvasBasicSetting/canvasBasicSettingMapper.xml | 6 ++++-- 13 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java index ad6d62a0..cd7368ef 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java @@ -24,12 +24,12 @@ public class CanvasBasicSettingController { private final CanvasBasicSettingService canvasBasicSettingService; @Operation(description = "Canvas Basic Setting 정보를 조회 한다.") - @GetMapping("/canvas-basic-settings/by-object/{objectNo}") - public List selectCanvasBasicSetting(@PathVariable String objectNo) { + @GetMapping("/canvas-basic-settings/by-object/{roofSeq}/{objectNo}") + public List selectCanvasBasicSetting(@PathVariable String roofSeq, @PathVariable String objectNo) { - log.debug("Basic Setting 조회 ::::: " + objectNo); + log.debug("Basic Setting 조회 ::::: " + objectNo + " : " + roofSeq); - return canvasBasicSettingService.selectCanvasBasicSetting(objectNo); + return canvasBasicSettingService.selectCanvasBasicSetting(roofSeq, objectNo); } @Operation(description = "Canvas Basic Setting 정보를 등록 한다.") @@ -43,7 +43,7 @@ public class CanvasBasicSettingController { } @Operation(description = "Canvas 지붕재추가 Setting 정보를 삭제 한다.") - @DeleteMapping("/canvas-basic-settings/delete-RoofMaterials/{objectNo}/{roofApply}") + @DeleteMapping("/canvas-basic-settings/delete-RoofMaterials/{roofSeq}/{objectNo}") @ResponseStatus(HttpStatus.NO_CONTENT) public void deleteRoofMaterialsAdd(@PathVariable String objectNo, @PathVariable String roofSeq) throws QcastException { canvasBasicSettingService.deleteRoofMaterialsAdd(objectNo, roofSeq); diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingMapper.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingMapper.java index d8db856f..b572e20d 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingMapper.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingMapper.java @@ -15,7 +15,7 @@ public interface CanvasBasicSettingMapper { public CanvasBasicSettingInfo getCanvasBasicSettingCnt(String objectNo); // Canvas Basic Setting 조회(objectNo) - public List selectCanvasBasicSetting(String objectNo); + public List selectCanvasBasicSetting(String roofSeq, String objectNo); // Canvas Basic Setting 등록 public void insertCanvasBasicSetting(CanvasBasicSettingInfo csi); diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java index 0c41cea2..385a874e 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java @@ -22,8 +22,8 @@ public class CanvasBasicSettingService { private final CanvasBasicSettingMapper canvasBasicSettingMapper; // Canvas Basic Setting 조회(objectNo) - public List selectCanvasBasicSetting(String objectNo) { - return canvasBasicSettingMapper.selectCanvasBasicSetting(objectNo); + public List selectCanvasBasicSetting(String roofSeq, String objectNo) { + return canvasBasicSettingMapper.selectCanvasBasicSetting(roofSeq, objectNo); } // Canvas Basic Setting 등록 diff --git a/src/main/java/com/interplug/qcast/biz/master/ApiConstructionBuilder.java b/src/main/java/com/interplug/qcast/biz/master/ApiConstructionBuilder.java index 5178d091..8c7bfcbe 100644 --- a/src/main/java/com/interplug/qcast/biz/master/ApiConstructionBuilder.java +++ b/src/main/java/com/interplug/qcast/biz/master/ApiConstructionBuilder.java @@ -43,7 +43,7 @@ public class ApiConstructionBuilder { private String raftBaseCd; @Schema(description = "하제(망둥어)피치") - private int roofPitch; + private Integer roofPitch; public ApiConstructionBuilder setModuleTpCd(String moduleTpCd){ this.moduleTpCd = moduleTpCd; @@ -100,13 +100,13 @@ public class ApiConstructionBuilder { return this; } - public ApiConstructionBuilder setRoofPitch(int roofPitch){ + public ApiConstructionBuilder setRoofPitch(Integer roofPitch){ this.roofPitch = roofPitch; return this; } public ApiConstructionBuilder (String moduleTpCd, String roofMatlCd, String trestleMkrCd, String constMthdCd, String roofBaseCd, String illuminationTp, - String instHt, String stdWindSpeed, String stdSnowLd, String inclCd, String raftBaseCd, int roofPitch) { + String instHt, String stdWindSpeed, String stdSnowLd, String inclCd, String raftBaseCd, Integer roofPitch) { this.moduleTpCd = moduleTpCd; this.roofMatlCd = roofMatlCd; this.trestleMkrCd = trestleMkrCd; diff --git a/src/main/java/com/interplug/qcast/biz/master/ApiTrestleDetailBuilder.java b/src/main/java/com/interplug/qcast/biz/master/ApiTrestleDetailBuilder.java index 18ef021f..4e027419 100644 --- a/src/main/java/com/interplug/qcast/biz/master/ApiTrestleDetailBuilder.java +++ b/src/main/java/com/interplug/qcast/biz/master/ApiTrestleDetailBuilder.java @@ -43,10 +43,10 @@ public class ApiTrestleDetailBuilder { private String constTp; @Schema(description = "혼합모듈번호") - private int mixMatlNo; + private Integer mixMatlNo; @Schema(description = "하제(망둥어)피치") - private int roofPitch; + private Integer roofPitch; public ApiTrestleDetailBuilder setModuleTpCd(String moduleTpCd){ this.moduleTpCd = moduleTpCd; @@ -114,7 +114,7 @@ public class ApiTrestleDetailBuilder { } public ApiTrestleDetailBuilder (String moduleTpCd, String roofMatlCd, String trestleMkrCd, String constMthdCd, String roofBaseCd, String illuminationTp, - String instHt, String stdWindSpeed, String stdSnowLd, String inclCd, String constTp, int mixMatlNo, int roofPitch) { + String instHt, String stdWindSpeed, String stdSnowLd, String inclCd, String constTp, Integer mixMatlNo, Integer roofPitch) { this.moduleTpCd = moduleTpCd; this.roofMatlCd = roofMatlCd; this.trestleMkrCd = trestleMkrCd; diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionRequest.java index 77e8624f..5109c0f1 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionRequest.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionRequest.java @@ -46,6 +46,6 @@ public class ApiConstructionRequest { private String raftBaseCd; @Schema(description = "하제(망둥어)피치") - private int roofPitch; + private Integer roofPitch; } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionResponse.java index aefabb74..3950dfe8 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionResponse.java @@ -28,7 +28,7 @@ public class ApiConstructionResponse { private String cvrYn; @Schema(description = "처마커버설치최대단수") - private int cvrLmtRow; + private Integer cvrLmtRow; @Schema(description = "낙설방지금구설치가능여부") private String snowGdPossYn; diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailModuleResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailModuleResponse.java index 2b6bfa0d..53b8d206 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailModuleResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailModuleResponse.java @@ -25,9 +25,9 @@ public class ApiTrestleDetailModuleResponse { private String color; @Schema(description = "모듈최대단수") - private int moduleMaxRows; + private Integer moduleMaxRows; @Schema(description = "순번") - private int priority; + private Integer priority; } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRackResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRackResponse.java index 1a35044f..801b44cc 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRackResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRackResponse.java @@ -10,7 +10,7 @@ import lombok.Setter; public class ApiTrestleDetailRackResponse { @Schema(description = "모듈총단수") - private int moduleRows; + private Integer moduleRows; @Schema(description = "랙단수코드") private String rackRowsCds; diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRequest.java index 787fc387..691d08be 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRequest.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRequest.java @@ -46,9 +46,9 @@ public class ApiTrestleDetailRequest { private String constTp; @Schema(description = "혼합모듈번호") - private int mixMatlNo; + private Integer mixMatlNo; @Schema(description = "하제(망둥어)피치") - private int roofPitch; + private Integer roofPitch; } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailResponse.java index c068e0ff..6e3de880 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailResponse.java @@ -18,10 +18,10 @@ public class ApiTrestleDetailResponse { private String plvrYn; @Schema(description = "모듈최대단수") - private int moduleMaxRows; + private Integer moduleMaxRows; @Schema(description = "모듈최대열수") - private int moduleMaxCols; + private Integer moduleMaxCols; @Schema(description = "지붕기준모듈설치간격-처마") private double eaveIntvl; diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleResponse.java index f76c3a2a..19b44c85 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleResponse.java @@ -58,6 +58,6 @@ public class ApiTrestleResponse { private String rackYn; @Schema(description = "순번") - private int priority; + private Integer priority; } \ No newline at end of file diff --git a/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml b/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml index 09454668..3e5dccc1 100644 --- a/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml +++ b/src/main/resources/mappers/canvasBasicSetting/canvasBasicSettingMapper.xml @@ -28,8 +28,10 @@ FROM TB_CANVAS_BASIC_SETUP cbs LEFT JOIN TB_CANVAS_ROOF_MATERIALS_ADD crma ON cbs.object_no = crma.object_no - WHERE crma.roof_apply = 1 - AND cbs.object_no = #{objectNo} + WHERE cbs.object_no = #{objectNo} + + AND crma.roof_seq = 0 +