From 257a791e6a5649631a0447daf03abd1b5c874587 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Tue, 3 Sep 2024 13:47:18 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B7=B8=EB=A6=AC=EB=93=9C=20DB=20=EC=BB=AC?= =?UTF-8?q?=EB=9F=BC=20=EC=B6=94=EA=B0=80/=ED=83=80=EC=9E=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CanvasSettingController.java | 2 +- .../canvasSetting/CanvasSettingMapper.java | 2 +- .../canvasSetting/CanvasSettingService.java | 7 ++-- .../canvasSetting/dto/CanvasSettingInfo.java | 39 +++++++++++-------- .../canvasSetting/canvasSettingMapper.xml | 20 ++++++++++ 5 files changed, 47 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingController.java b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingController.java index 1b757865..838f4a36 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingController.java +++ b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingController.java @@ -22,7 +22,7 @@ public class CanvasSettingController { @Operation(description = "Canvas Setting 정보를 조회 한다.") @GetMapping("/canvas-settings/by-object/{objectNo}") - public List selectCanvasSetting(@PathVariable String objectNo) { + public CanvasSettingInfo selectCanvasSetting(@PathVariable String objectNo) { log.debug("Setting 조회 ::::: " + objectNo); diff --git a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingMapper.java b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingMapper.java index 805ef51f..ca263830 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingMapper.java +++ b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; public interface CanvasSettingMapper { // Canvas Setting 조회(objectNo) - public List selectCanvasSetting(String objectNo); + public CanvasSettingInfo selectCanvasSetting(String objectNo); // Canvas Setting 등록 public void insertCanvasSetting(CanvasSettingInfo csi); diff --git a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java index 4621db46..d8b8da22 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java +++ b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java @@ -1,6 +1,5 @@ package com.interplug.qcast.biz.canvasSetting; -import com.interplug.qcast.biz.MainController; import com.interplug.qcast.biz.canvasSetting.dto.CanvasSettingInfo; import lombok.RequiredArgsConstructor; @@ -16,14 +15,14 @@ public class CanvasSettingService { private final CanvasSettingMapper canvasSettingMapper; // Canvas Setting 조회(objectNo) - public List selectCanvasSetting(String objectNo) { + public CanvasSettingInfo selectCanvasSetting(String objectNo) { return canvasSettingMapper.selectCanvasSetting(objectNo); } // Canvas Setting 등록 public String insertCanvasSetting(CanvasSettingInfo csi) { - - try { + + try { canvasSettingMapper.insertCanvasSetting(csi); } catch (Exception e) { System.out.println("오류 발생 : " + e.getMessage()); diff --git a/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java b/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java index 61d9099f..3ac06b33 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java +++ b/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java @@ -10,22 +10,27 @@ import lombok.Setter; public class CanvasSettingInfo { private String objectNo; //견적서 번호 - private String assignDisplay; //할당 표시 - private String drawDisplay; //도면 표시 - private String gridDisplay; //그리드 표시 - private String charDisplay; //문자 표시 - private String flowDisplay; //흐름방향 표시 - private String hallwayDimenDisplay; //복도치수 표시 - private String actualDimenDisplay; //실제치수 표시 - private String noDimenDisplay; //치수 표시 없음 - private String trestleDisplay; //가대 표시 - private String coordiDisplay; //좌표 표시 - private String drawConverDisplay; //도면전환 표시 - private String onlyBorder; //화면표시 테두리만 - private String lineHatch; //화면표시 라인해치 - private String allPainted; //화면표시 모두칠함 - private String adsorpRangeSetting; //흡착범위 설정 - private Date registDatetime; //생성일시 - private Date lastEditDatetime; //수정일시 + private boolean assignDisplay; //할당 표시 + private boolean drawDisplay; //도면 표시 + private boolean gridDisplay; //그리드 표시 + private boolean charDisplay; //문자 표시 + private boolean flowDisplay; //흐름방향 표시 + private boolean hallwayDimenDisplay;//복도치수 표시 + private boolean actualDimenDisplay; //실제치수 표시 + private boolean noDimenDisplay; //치수 표시 없음 + private boolean trestleDisplay; //가대 표시 + private boolean coordiDisplay; //좌표 표시 + private boolean drawConverDisplay; //도면전환 표시 + private boolean onlyBorder; //화면표시 테두리만 + private boolean lineHatch; //화면표시 라인해치 + private boolean allPainted; //화면표시 모두칠함 + private int adsorpRangeSetting; //흡착범위 설정 + private boolean randomGrid; //임의 그리드 + private boolean solidGrid; //실선 그리드 + private boolean dotGrid; //점 그리드 + private boolean gridColorSet; //그리드색 설정 + private boolean adsorpPointAdd; //흡착점 추가 + private Date registDatetime; //생성일시 + private Date lastEditDatetime; //수정일시 } diff --git a/src/main/resources/mappers/canvasSetting/canvasSettingMapper.xml b/src/main/resources/mappers/canvasSetting/canvasSettingMapper.xml index 91008a6b..d181ca77 100644 --- a/src/main/resources/mappers/canvasSetting/canvasSettingMapper.xml +++ b/src/main/resources/mappers/canvasSetting/canvasSettingMapper.xml @@ -22,6 +22,11 @@ , line_hatch , all_painted , adsorp_range_setting + , random_grid + , solid_grid + , dot_grid + , grid_color_set + , adsorp_point_add , regist_datetime , last_edit_datetime FROM TB_CANVAS_SETTING @@ -50,6 +55,11 @@ , line_hatch = #{lineHatch} , all_painted = #{allPainted} , adsorp_range_setting = #{adsorpRangeSetting} + , random_grid = #{randomGrid} + , solid_grid = #{solidGrid} + , dot_grid = #{dotGrid} + , grid_color_set = #{gridColorSet} + , adsorp_point_add = #{adsorpPointAdd} , last_edit_datetime = GETDATE() WHEN NOT MATCHED THEN @@ -71,6 +81,11 @@ , line_hatch , all_painted , adsorp_range_setting + , random_grid + , solid_grid + , dot_grid + , grid_color_set + , adsorp_point_add , regist_datetime ) VALUES ( @@ -90,6 +105,11 @@ , #{lineHatch} , #{allPainted} , #{adsorpRangeSetting} + , #{randomGrid} + , #{solidGrid} + , #{dotGrid} + , #{gridColorSet} + , #{adsorpPointAdd} , GETDATE() );