Canvas기본설정 조회 조건 roof_seq 추가int >> Integer 수정

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}")
+  @GetMapping("/canvas-basic-settings/by-object/{roofSeq}/{objectNo}")
-  public List<CanvasBasicSettingResponse> selectCanvasBasicSetting(@PathVariable String objectNo) {
+  public List<CanvasBasicSettingResponse> 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);

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<CanvasBasicSettingResponse> selectCanvasBasicSetting(String objectNo);
+	public List<CanvasBasicSettingResponse> selectCanvasBasicSetting(String roofSeq, String objectNo);
 	
 	// Canvas Basic Setting 등록
 	public void insertCanvasBasicSetting(CanvasBasicSettingInfo csi);

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<CanvasBasicSettingResponse> selectCanvasBasicSetting(String objectNo) {
+	public List<CanvasBasicSettingResponse> selectCanvasBasicSetting(String roofSeq, String objectNo) {
-		return canvasBasicSettingMapper.selectCanvasBasicSetting(objectNo);
+		return canvasBasicSettingMapper.selectCanvasBasicSetting(roofSeq, objectNo);
 	}
 
 	// Canvas Basic Setting 등록

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;

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;

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;
 
 }

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;

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;
 
 }

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;

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;
 	
 }

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;

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;
 
 }

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
+		 WHERE cbs.object_no = #{objectNo}
-		   AND cbs.object_no = #{objectNo}
+		   <if test="roofSeq != '1'">
+            AND crma.roof_seq = 0
+           </if>
     </select>    
     
     <insert id="insertCanvasBasicSetting" parameterType="com.interplug.qcast.biz.canvasBasicSetting.dto.CanvasBasicSettingInfo">