From 69a4adfb8876e7bc02e0fe6c27f6dd8120b8bb8c Mon Sep 17 00:00:00 2001
From: thkim <thkim@dbnt.co.kr>
Date: Mon, 16 Mar 2026 17:48:41 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B2=80=EC=88=98=EB=93=B1=EB=A1=9D?=
 =?UTF-8?q?=EB=8C=80=EA=B8=B0=20=EB=AA=A9=EB=A1=9D=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EB=88=84=EB=A5=BC=20=EB=95=8C,=20?=
 =?UTF-8?q?=EC=95=95=EB=B0=80=EC=8B=9C=ED=97=98=20=EC=9C=A0=ED=9A=A8?=
 =?UTF-8?q?=EC=84=B1=20(=EC=A4=91=EB=B3=B5)=20=EA=B2=80=EC=82=AC=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/geoinfo/com/WebConfirm.java | 92 +++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/src/main/java/geoinfo/com/WebConfirm.java b/src/main/java/geoinfo/com/WebConfirm.java
index 5fb494b5..3d5bf867 100644
--- a/src/main/java/geoinfo/com/WebConfirm.java
+++ b/src/main/java/geoinfo/com/WebConfirm.java
@@ -268,6 +268,82 @@ public class WebConfirm
 
         return result;
     }
+    
+    
+    
+    /**
+     * TEMP_CONSOLIDATION 테이블의 압밀시험 데이터 중복을 검사합니다.
+     * (SAMPLE_CODE, CONSOL_P, CONSOL_E 조합 중복 검사)
+     *
+     * @param request      HttpServletRequest
+     * @param PROJECT_CODE 검사할 프로젝트 코드
+     * @return 유효성 검사 결과 (success: true/false, errorMessage: "...")
+     */
+    private Map<String, Object> validationCheckTempConsolidation(HttpServletRequest request, final String PROJECT_CODE) {
+        Map<String, Object> result = new HashMap<>();
+        DatabaseQuery validationQuery = null;
+        ResultSet rs = null;
+
+        // SAMPLE_CODE, CONSOL_P, CONSOL_E 조합으로 중복 건 조회 SQL
+        final String validationSql = "SELECT " +
+                                     "    SAMPLE_CODE, " +
+                                     "    CONSOL_P, " +
+                                     "    CONSOL_E, " +
+                                     "    COUNT(1) AS \"COUNT\" " +
+                                     "FROM " +
+                                     "    TEMP_CONSOLIDATION " +
+                                     "WHERE " +
+                                     "    PROJECT_CODE = [PROJECT_CODE] " +
+                                     "GROUP BY " +
+                                     "    SAMPLE_CODE, " +
+                                     "    CONSOL_P, " +
+                                     "    CONSOL_E " +
+                                     "HAVING " +
+                                     "    1 < COUNT(1)";
+
+        try {
+            validationQuery = new DatabaseQuery(validationSql);
+            validationQuery.setParam("PROJECT_CODE", PROJECT_CODE);
+            
+            rs = validationQuery.execute(connection); 
+
+            StringBuilder errorMessages = new StringBuilder();
+
+            while (rs.next()) {
+                String sampleCode = rs.getString("SAMPLE_CODE");
+                double consolP   = rs.getDouble("CONSOL_P");
+                double consolE   = rs.getDouble("CONSOL_E");
+                int count        = rs.getInt("COUNT");
+
+                errorMessages.append("- 시료코드[" + sampleCode + "]의 하중(" + consolP + ") 및 간극비(" + consolE + ") 데이터가 " + count + "개 중복됨.\\n");
+            }
+
+            if (errorMessages.length() > 0) {
+                result.put("success", false);
+                result.put("errorMessage", errorMessages.toString().trim());
+            } else {
+                result.put("success", true);
+                result.put("errorMessage", "");
+            }
+
+        } catch (SQLException e) {
+            logger.error("Consolidation validation check error", e);
+            result.put("success", false);
+            result.put("errorMessage", "압밀시험 유효성 검사 중 데이터베이스 오류가 발생했습니다: " + e.getMessage());
+        } finally {
+            try {
+                if (rs != null) rs.close();
+                if (validationQuery != null) validationQuery.close();
+            } catch (SQLException sqle) {
+                logger.error("Error closing validation resources", sqle);
+            }
+        }
+
+        return result;
+    }
+    
+    
+    
 
     /**
      * 날짜 문자열이 8자리 숫자로 구성되어 있는지 확인합니다.
@@ -314,6 +390,22 @@ public class WebConfirm
 
             
             
+            // 유효성 체크 ▼▼▼▼▼▼▼▼▼▼▼▼▼▼▼▼
+			// ==========================================================================
+			// 압밀시험 정보(TEMP_CONSOLIDATION) 중복 체크 수행
+			// ==========================================================================
+			Map<String, Object> consolValidation = validationCheckTempConsolidation(request, PROJECT_CODE);
+			
+			if (!(Boolean) consolValidation.get("success")) {
+				String errorMessage = (String) consolValidation.get("errorMessage");
+				logger.warn("Consolidation validation failed for PROJECT_CODE [{}]: {}", PROJECT_CODE, errorMessage);
+			 
+				// 예외를 발생시켜 전체 로직 롤백 및 사용자 알림	
+				throw new SQLException("등록에 실패하였습니다.\\n\\n압밀시험 정보(TEMP_CONSOLIDATION) 중 시료코드, 하중, 간극비 조합이 중복되었습니다. 데이터를 확인해 주세요:\\n\\n" + errorMessage);
+			}
+			// ==========================================================================
+            // 유효성 체크 ▲▲▲▲▲▲▲▲▲▲▲▲▲▲▲▲
+            
             
             
             //(connection = connectionPool.getConnection()).setAutoCommit(false);