From 38f89fcd7a51503c32423ec8f5cb7dc42a6c75a8 Mon Sep 17 00:00:00 2001
From: eastargh <eastarnv@naver.com>
Date: Fri, 21 Aug 2026 17:25:17 +0900
Subject: [PATCH] =?UTF-8?q?IIM=EC=97=B0=EB=8F=99=20=EC=9D=B4=EB=A0=A5=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../onl/admin/rule/layoutSyncHistoryMan.jsp   | 26 ++++++---
 .../admin/rule/layoutSyncHistoryManDetail.jsp | 16 +++---
 .../history/LayoutSyncHistoryService.java     |  3 +
 .../rule/layoutsync/LayoutSyncController.java | 56 +++++++------------
 .../history/ui/LayoutSyncHistoryUISearch.java |  3 +
 5 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/WebContent/jsp/onl/admin/rule/layoutSyncHistoryMan.jsp b/WebContent/jsp/onl/admin/rule/layoutSyncHistoryMan.jsp
index b0c7973..d02f75c 100644
--- a/WebContent/jsp/onl/admin/rule/layoutSyncHistoryMan.jsp
+++ b/WebContent/jsp/onl/admin/rule/layoutSyncHistoryMan.jsp
@@ -47,14 +47,15 @@
                 mtype: 'POST',
                 url: url,
                 postData: getSearchForJqgrid("cmd", "LIST"),
-                colNames: ['No', 'Service Name', 'Command', '레이아웃명', '연동시간', '결과'],
+                colNames: ['No', 'Service Name', 'Command', '레이아웃명', '연동시간', '결과', '결과메세지'],
                 colModel: [
-                    {name: 'seqno', align: 'center', width: 80, sortable: false},
-                    {name: 'serviceName', align: 'center', width: 120, sortable: false},
-                    {name: 'command', align: 'center', width: 90, sortable: false},
-                    {name: 'loutName', align: 'left', width: 300, sortable: false},
+                    {name: 'seqno', align: 'center', width: 50, sortable: false},
+                    {name: 'serviceName', align: 'center', width: 100, sortable: false},
+                    {name: 'command', align: 'center', width: 80, sortable: false},
+                    {name: 'loutName', align: 'left', width: 180, sortable: false},
                     {name: 'recvAmndHms', align: 'center', width: 140, sortable: false},
-                    {name: 'prcssRslt', align: 'center', width: 70, sortable: false, formatter: formatPrcssRslt}
+                    {name: 'prcssRslt', align: 'center', width: 60, sortable: false, formatter: formatPrcssRslt},
+                    {name: 'prcssRsltCmnt', align: 'left', width: 300, sortable: false}
                 ],
                 jsonReader: {repeatitems: false},
                 pager: $('#pager'),
@@ -127,7 +128,8 @@
             <table class="search_condition" cellspacing=0;>
                 <colgroup>
                     <col style="width:120px;"><col style="width:260px;">
-                    <col style="width:120px;"><col style="width:*;">
+                    <col style="width:120px;"><col style="width:260px;">
+                    <col style="width:120px;"><col style="width:260px;">
                 </colgroup>
                 <tbody>
                 <tr>
@@ -140,6 +142,16 @@
                         <input type="text" name="searchEndYYYYMMDD" value="" id="endDatepicker" size="10" readonly="readonly" style="width:100px; border:1px solid #ebebec;">
                         <input type="hidden" name="searchStartDate" value="">
                         <input type="hidden" name="searchEndDate" value="">
+                    </th>
+                    <th>결과</th>
+                   	<td>
+                        <div class="select-style" style="display:inline-block; margin-left:6px;">
+                            <select name="searchPrcssRslt">
+                                <option value="">전체</option>
+                                <option value="S">성공</option>
+                                <option value="F">실패</option>
+                            </select>
+                        </div>
                     </td>
                 </tr>
                 </tbody>
diff --git a/WebContent/jsp/onl/admin/rule/layoutSyncHistoryManDetail.jsp b/WebContent/jsp/onl/admin/rule/layoutSyncHistoryManDetail.jsp
index fd09081..b735fbb 100644
--- a/WebContent/jsp/onl/admin/rule/layoutSyncHistoryManDetail.jsp
+++ b/WebContent/jsp/onl/admin/rule/layoutSyncHistoryManDetail.jsp
@@ -105,25 +105,25 @@
             </colgroup>
             <tr>
                 <th>No</th>
-                <td colspan="3"><span id="seqno"></span></td>
-            </tr>
-            <tr>
+                <td><span id="seqno"></span></td>
                 <th>Service Name</th>
                 <td><span id="serviceName"></span></td>
-                <th>Command</th>
-                <td><span id="command"></span></td>
             </tr>
             <tr>
                 <th>레이아웃명</th>
                 <td><span id="loutName"></span></td>
-                <th>연동시간</th>
-                <td><span id="recvAmndHms"></span></td>
+                <th>Command</th>
+                <td><span id="command"></span></td>
             </tr>
             <tr>
+                <th>연동시간</th>
+                <td><span id="recvAmndHms"></span></td>
                 <th>결과</th>
                 <td><span id="prcssRslt"></span></td>
+            </tr>
+            <tr>
                 <th>결과메세지</th>
-                <td><span id="prcssRsltCmnt"></span></td>
+                <td colspan="3"><span id="prcssRsltCmnt"></span></td>
             </tr>
             <tr>
                 <th>수신데이타</th>
diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/layoutsync/history/LayoutSyncHistoryService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/layoutsync/history/LayoutSyncHistoryService.java
index a32c6f3..68c4ffa 100644
--- a/src/main/java/com/eactive/eai/rms/data/entity/onl/layoutsync/history/LayoutSyncHistoryService.java
+++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/layoutsync/history/LayoutSyncHistoryService.java
@@ -37,6 +37,9 @@ public class LayoutSyncHistoryService extends AbstractDataService<LayoutSyncHist
 		if (StringUtils.isNotBlank(search.getSearchEndDate())) {
 			query.where(q.recvamndhms.loe(parseYYYYMMDD(search.getSearchEndDate()).atTime(23, 59, 59)));
 		}
+		if (StringUtils.isNotBlank(search.getSearchPrcssRslt())) {
+			query.where(q.prcssrslt.eq(search.getSearchPrcssRslt()));
+		}
 
 		long totalCount = query.select(q.count()).fetchOne();
 
diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/rule/layoutsync/LayoutSyncController.java b/src/main/java/com/eactive/eai/rms/onl/manage/rule/layoutsync/LayoutSyncController.java
index 9610920..b133df9 100644
--- a/src/main/java/com/eactive/eai/rms/onl/manage/rule/layoutsync/LayoutSyncController.java
+++ b/src/main/java/com/eactive/eai/rms/onl/manage/rule/layoutsync/LayoutSyncController.java
@@ -3,7 +3,6 @@ package com.eactive.eai.rms.onl.manage.rule.layoutsync;
 import java.io.ByteArrayInputStream;		
 import java.io.File;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
 import java.text.ParseException;
@@ -681,59 +680,46 @@ public class LayoutSyncController extends OnlBaseAnnotationController implements
 //	    	// 요청 전문
 	    	sis = request.getInputStream();
 
-    		JSONObject json = (JSONObject) JSONValue.parse(new InputStreamReader(sis, "EUC-KR"));
-
-    		// JJB 향후제거 shkim 2020-05-13 연계 테스트 체크 
-    		//logger.error("\n\n MMI SYNC Request : " + json.toString());
-    		
-	        // log 기록
 	        byte[] arg = new byte[request.getContentLength()];
-	        int resultSet =0;
 	        int total = 0;
-	        try {
-	        	resultSet = sis.readLine(arg, 0, arg.length);
-	        	while(resultSet != -1) {
-	        		total += resultSet;
-	        		resultSet = sis.readLine(arg, total, 1024);
-	        	}
+	        String jsonContent = "";
+        	int resultSet = sis.readLine(arg, 0, arg.length);
+        	while(resultSet != -1) {
+        		total += resultSet;
+        		resultSet = sis.readLine(arg, total, 1024);
+        	}
+
+        	jsonContent = new String(arg, "EUC-KR");
+        	param.put("recvData", jsonContent);
+
+
+    		JSONObject json = (JSONObject) JSONValue.parse(jsonContent);
 
-	        	param.put("recvData", new String(arg, "EUC-KR"));
-	        } catch(Exception e) {
-	        	logger.error("MessageSync.err - don't read the JSON File - " + new String(arg, "EUC-KR"), e);
-	        	param.put("recvData", "");
-	        }
-	        
 	        //syncLayout(param, recvTime, json);
 	        syncLayoutDjb(param, recvTime, json);
-//	        results.getChild("Result").setText("S".equals(param.get("prcssRslt"))?"True":"False");
-//	        results.getChild("ResultMessage").setText("S".equals(param.get("prcssRslt"))?"성공":param.get("prcssRsltCmnt"));
-
-//	        resultS = StringUtils.toXMLString(rDoc, true);
 	        
 	        results.put("Result", "S".equals(param.get("prcssRslt"))?"True":"False");
 	        results.put("ResultMessage", "S".equals(param.get("prcssRslt"))?"성공":param.get("prcssRsltCmnt"));
-
 	        
     	} catch( Exception e ) {
     		logger.error("", e);
     		try {
 	    		if( results != null ) {
-//			        results.getChild("Result").setText("False");
-//			        results.getChild("ResultMessage").setText( e.getMessage() );
-
-//			        resultS = StringUtils.toXMLString(rDoc, true);
 			        results.put("Result", "False");
-			        results.put("ResultMessage", e.getMessage() );
-			        
+			        results.put("ResultMessage", e.getMessage());			        
 	    		}
+	    		
 	    		if( param.get("logPrcssSeqno") == null ) {
 	    			param.put("logPrcssSeqno", UUIDGenerator.getUUID());
-	    			param.put("ServiceName", "MessageSync");
-	    			param.put("RecvAmndHMS", recvTime);
+	    			param.put("serviceName", "MessageSync");
+	    			param.put("recvAmndHMS", recvTime);
 	    		}
-	    		param.put("PrcssRslt", "F");
-				param.put("PrcssRsltCmnt", StringUtils.cuttings(CommonUtil.getArrayString(e.getStackTrace(), "\n"), 4000)[0]);
+	    		param.put("prcssRslt", "F");
+	    		param.put("prcssRsltCmnt", e.getMessage());
+				//param.put("prcssRsltCmnt", StringUtils.cuttings(CommonUtil.getArrayString(e.getStackTrace(), "\n"), 4000)[0]);
+				
 	    		service.addLayoutSyncLog(param);
+	    		
     		} catch(Exception ee) {
         		ee.printStackTrace();
     		}
diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/rule/layoutsync/history/ui/LayoutSyncHistoryUISearch.java b/src/main/java/com/eactive/eai/rms/onl/manage/rule/layoutsync/history/ui/LayoutSyncHistoryUISearch.java
index 5dc072c..7c246bf 100644
--- a/src/main/java/com/eactive/eai/rms/onl/manage/rule/layoutsync/history/ui/LayoutSyncHistoryUISearch.java
+++ b/src/main/java/com/eactive/eai/rms/onl/manage/rule/layoutsync/history/ui/LayoutSyncHistoryUISearch.java
@@ -11,4 +11,7 @@ public class LayoutSyncHistoryUISearch {
 	private String searchStartDate;
 	private String searchEndDate;
 
+	/* 처리 결과 (S/F, 공백=전체) */
+	private String searchPrcssRslt;
+
 }