From 2c3073274c70ced041fb5eaed0c66b83dee4bcfb Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Thu, 20 Feb 2025 16:04:43 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=8B=9C=20response=20?= =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CanvasBasicSettingService.java | 47 +++++++------------ 1 file changed, 17 insertions(+), 30 deletions(-) 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 e328df73..6d567d0e 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java @@ -84,28 +84,23 @@ public class CanvasBasicSettingService { } // Canvas Basic Setting 삭제 - public void deleteCanvasBasicSetting(String objectNo, Integer planNo) throws QcastException { - - if ((objectNo == null || objectNo.trim().isEmpty()) && (planNo == null)) { - throw new QcastException (ErrorCode.INVALID_INPUT_VALUE ,"올바르지 않은 입력값입니다."); - } - - // 먼저 데이터가 존재하는지 확인 - CanvasBasicSettingInfo cntData = canvasBasicSettingMapper.getCanvasBasicSettingCnt(objectNo, planNo); - - log.debug("cntData ::::: " + cntData); - - // 데이터가 존재하지 않으면 insert - if (cntData.getRoofCnt().intValue() > 0) { - // Canvas Basic Setting 정보 삭제 - canvasBasicSettingMapper.deleteCanvasBasicSetting(objectNo, planNo); - // 지붕재추가 정보 삭제 - canvasBasicSettingMapper.deleteRoofMaterialsAdd(objectNo, planNo); - } else { - throw new QcastException(ErrorCode.NOT_FOUND, "삭제할 배치면이 존재하지 않습니다."); - } - + public void deleteCanvasBasicSetting(String objectNo, Integer planNo) throws QcastException { + + if ((objectNo == null || objectNo.trim().isEmpty()) && (planNo == null)) { + throw new QcastException (ErrorCode.INVALID_INPUT_VALUE ,"올바르지 않은 입력값입니다."); } + + try { + // Canvas Basic Setting 정보 삭제 + canvasBasicSettingMapper.deleteCanvasBasicSetting(objectNo, planNo); + // 지붕재추가 정보 삭제 + canvasBasicSettingMapper.deleteRoofMaterialsAdd(objectNo, planNo); + } catch (Exception e) { + if (e instanceof QcastException) throw e; + throw new QcastException(ErrorCode.INTERNAL_SERVER_ERROR, e.getMessage()); + } + + } // 지붕면 할당 Setting 등록 public Map insertRoofAllocSetting(RoofAllocationSettingInfo rasi) throws QcastException { @@ -146,15 +141,7 @@ public class CanvasBasicSettingService { } try { - // 먼저 데이터가 존재하는지 확인 - RoofMaterialsAddInfo cntData = canvasBasicSettingMapper.getRoofMaterialsCnt(objectNo, planNo); - - // 데이터가 존재하지 않으면 수정하지 않고 예외를 던짐 - if (cntData.getRoofCnt().intValue() > 0) { - canvasBasicSettingMapper.deleteRoofMaterialsAdd(objectNo, planNo); - } else { - throw new QcastException(ErrorCode.NOT_FOUND, "삭제할 지붕재가 존재하지 않습니다."); - } + canvasBasicSettingMapper.deleteRoofMaterialsAdd(objectNo, planNo); } catch (Exception e) { if (e instanceof QcastException) throw e; throw new QcastException(ErrorCode.INTERNAL_SERVER_ERROR, e.getMessage());