From f521d7c7f48d6a50aaf16950405702727fe5e473 Mon Sep 17 00:00:00 2001
From: changkyu choi <okoookoo@naver.com>
Date: Tue, 10 Dec 2024 11:32:19 +0900
Subject: [PATCH] =?UTF-8?q?Canvas=20=EC=84=A4=EC=A0=95=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/canvasSetting/CanvasSettingMapper.java   |  3 +++
 .../biz/canvasSetting/CanvasSettingService.java  | 16 +++++++++-------
 .../biz/canvasSetting/dto/CanvasSettingInfo.java |  4 ++--
 .../canvasSetting/canvasSettingMapper.xml        | 12 ++++++++++--
 4 files changed, 24 insertions(+), 11 deletions(-)

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 f4b6a2d2..02f36942 100644
--- a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingMapper.java
+++ b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingMapper.java
@@ -7,6 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CanvasSettingMapper {
 	
+	// Canvas Setting 유무 조회
+	public CanvasSettingInfo getCanvasSettingCnt(String objectNo);
+		
 	// Canvas Setting 조회(objectNo)
 	public CanvasSettingInfo selectCanvasSetting(String objectNo);
 	
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 6154b86c..ccc613cf 100644
--- a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java
+++ b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java
@@ -1,14 +1,12 @@
 package com.interplug.qcast.biz.canvasSetting;
 
 import com.interplug.qcast.biz.canvasSetting.dto.CanvasSettingInfo;
-import com.interplug.qcast.biz.canvasStatus.dto.CanvasStatusResponse;
 import com.interplug.qcast.config.Exception.ErrorCode;
 import com.interplug.qcast.config.Exception.QcastException;
 
 import lombok.RequiredArgsConstructor;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.springframework.stereotype.Service;
@@ -24,6 +22,7 @@ public class CanvasSettingService {
 	}
 
 	// Canvas Setting 등록
+	@SuppressWarnings("static-access")
 	public Map<String, String> insertCanvasSetting(CanvasSettingInfo csi) throws QcastException {
 		
 		Map<String, String> response = new HashMap<>();
@@ -31,18 +30,21 @@ public class CanvasSettingService {
 		if (csi.getObjectNo() == null) {			
 			throw new QcastException (ErrorCode.INVALID_INPUT_VALUE ,"올바르지 않은 입력값입니다.");
 		}
-		
+				
 		try {
-		
+			
 			// 먼저 데이터가 존재하는지 확인
-			CanvasSettingInfo existingSetting = canvasSettingMapper.selectCanvasSetting(csi.getObjectNo());
-	
+			CanvasSettingInfo cntData = canvasSettingMapper.getCanvasSettingCnt(csi.getObjectNo());
+			
+			System.out.println("dssdsssdsdsds cnt : " + cntData.getCnt().intValue());
+			
 			// 데이터가 존재하지 않으면 insert
-			if (existingSetting.getObjectNo() == null) {
+			if (cntData.getCnt().intValue() < 1) {
 				canvasSettingMapper.insertCanvasSetting(csi);
 				
 				response.put("objectNo", csi.getObjectNo());
 				response.put("returnMessage", "common.message.confirm.mark");
+				
 			} else {			
 				canvasSettingMapper.updateCanvasSetting(csi);
 				
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 695044ff..64670aec 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
@@ -37,7 +37,7 @@ public class CanvasSettingInfo {
 	private Integer gridHorizon;
 	private Integer gridVertical;
 	private Integer gridRatio;
-	private String 	gridDimen;
+	private Integer	gridDimen;
 	private String 	gridColor;
 	private String 	wordFont;
 	private String 	wordFontStyle;
@@ -66,5 +66,5 @@ public class CanvasSettingInfo {
 	private Date 	registDatetime; 		//생성일시
 	private Date 	lastEditDatetime; 		//수정일시
 	private String 	returnMessage;			//return message
-    
+	private Integer cnt;					//견적서 유무    
 }
diff --git a/src/main/resources/mappers/canvasSetting/canvasSettingMapper.xml b/src/main/resources/mappers/canvasSetting/canvasSettingMapper.xml
index bd30950f..a72775c7 100644
--- a/src/main/resources/mappers/canvasSetting/canvasSettingMapper.xml
+++ b/src/main/resources/mappers/canvasSetting/canvasSettingMapper.xml
@@ -2,6 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.interplug.qcast.biz.canvasSetting.CanvasSettingMapper">
+
+	<select id="getCanvasSettingCnt" parameterType="string"
+            resultType="com.interplug.qcast.biz.canvasSetting.dto.CanvasSettingInfo">
+        /* sqlid : com.interplug.qcast.canvasSetting.getCanvasSettingCnt Canvas Setting 유무 */
+        SELECT COUNT(1) AS cnt
+        FROM TB_CANVAS_SETTING
+         WHERE object_no = #{objectNo}
+    </select>
     
     <select id="selectCanvasSetting" parameterType="string"
             resultType="com.interplug.qcast.biz.canvasSetting.dto.CanvasSettingInfo">
@@ -67,8 +75,8 @@
     </select>    
     
     <insert id="insertCanvasSetting" parameterType="com.interplug.qcast.biz.canvasSetting.dto.CanvasSettingInfo">
-        /* sqlid : com.interplug.qcast.canvasSetting.insertCanvasSetting Canvas Setting 등록 */
-	    INSERT INTO TB_CANVAS_SETTING
+        /* sqlid : com.interplug.qcast.canvasSetting.insertCanvasSetting Canvas Setting 등록 */	     
+	       INSERT INTO TB_CANVAS_SETTING
 	              ( 
 					object_no
 			 	  , alloc_display