From e34376857cda14c8181e7dd5d626c509bda7fa46 Mon Sep 17 00:00:00 2001
From: Leeminha <bangle0621@gmail.com>
Date: Wed, 21 Dec 2022 16:26:00 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=B9=98=EB=AA=A8=EB=8B=88=ED=84=B0?=
 =?UTF-8?q?=EB=A7=81=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=95=98=EB=93=9C?=
 =?UTF-8?q?=EC=BD=94=EB=94=A9=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../co/uplus/ez/api/sysMgt/SysMgtService.java | 19 ++++-
 .../co/uplus/ez/api/sysMgt/dto/BatchList.java | 21 +++--
 .../mapper/mysql/sysMgt/sysMgt-mapper.xml     | 82 +++----------------
 3 files changed, 42 insertions(+), 80 deletions(-)

diff --git a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java
index 43d1e13..6c46f9f 100644
--- a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java
+++ b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java
@@ -421,12 +421,25 @@ public class SysMgtService {
 		
 		List<BatchList> batchLists = sysmgtmapper.batchListSelect();
 		
+		for(int i=0; i<batchLists.size(); i++) {
+		
+			String batchDesc = batchLists.get(i).getBatchDesc();
+			
+			String[] batchArr = batchDesc.split("@");
+			log.info("배치 셋팅 배열 확인={},{},{}",batchArr[0],batchArr[1],batchArr[2]);
+			
+			batchLists.get(i).setBatchType(batchArr[0]);
+			batchLists.get(i).setBatchCycle(batchArr[1]);
+			batchLists.get(i).setBatchTime(batchArr[2]);
+			
+			log.info("배치 셋팅 정보 확인하기1={}",batchLists.get(i).getBatchType());
+			log.info("배치 셋팅 정보 확인하기2={}",batchLists.get(i).getBatchCycle());
+			log.info("배치 셋팅 정보 확인하기3={}",batchLists.get(i).getBatchTime());
+		}
 		
 		BatchListRes batchListRes = new BatchListRes();
 		batchListRes.setList(batchLists);
-		
-		
-		
+
 		return new BatchListResDto(ApiResponseCode.SUCCESS, batchListRes);
 				
 	}
diff --git a/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/BatchList.java b/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/BatchList.java
index c86d665..dc36def 100644
--- a/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/BatchList.java
+++ b/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/BatchList.java
@@ -27,6 +27,18 @@ public class BatchList {
 	//배치 명
 	private String batchNm;
 	
+	//배치 설명. 배치유형(월배치, 일배치)@실행일자@실행시간
+	private String batchDesc;
+	
+	//배치유형(월배치, 일배치)
+	private String batchType;
+	
+	//실행일자(실행주기)
+	private String batchCycle;
+	
+	//실행시간
+	private String batchTime;
+	
 	//상태코드
 	private String sttusCd;
 	
@@ -48,11 +60,6 @@ public class BatchList {
 	//변경 일시
 	private String chgDt;
 	
-	//배치 유형
-	private String batchType;
-	
-	//배치 주기
-	private String batchCycle;
-	
-	private String batchTime;
+
+
 }
diff --git a/src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml b/src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml
index d020982..527e544 100644
--- a/src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml
+++ b/src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml
@@ -376,74 +376,17 @@
 	<select id="batchListSelect" resultType="kr.co.uplus.ez.api.sysMgt.dto.BatchList">
 		/* sysMgt-mapper.xml(batchListSelect) 배치 리스트 조회*/
 		SELECT
-			CASE 
-				WHEN 
-					  ebi.BATCH_ID ='BATCH_017'
-			       or ebi.BATCH_ID ='BATCH_002'
-			       or ebi.BATCH_ID ='BATCH_001'
-			       or ebi.BATCH_ID ='BATCH_004'
-			       or ebi.BATCH_ID ='BATCH_005'
-			       or ebi.BATCH_ID ='BATCH_006'
-			       or ebi.BATCH_ID ='BATCH_009'
-			       or ebi.BATCH_ID ='BATCH_011'
-			       or ebi.BATCH_ID ='BATCH_020'
-			       or ebi.BATCH_ID ='BATCH_021' THEN '월배치'
-		       WHEN ebi.BATCH_ID ='BATCH_016' THEN '매시간'
-		       ELSE '일배치'
-		       END AS batchType,
-		       ebi.BATCH_ID,
-		       ebi.BATCH_NM,
-			CASE
-		       WHEN(
-		             ebi.BATCH_ID = 'BATCH_006'
-		          ) THEN '매월 4일'
-		       WHEN(
-		             ebi.BATCH_ID = 'BATCH_017'
-		          or ebi.BATCH_ID = 'BATCH_002'
-		          or ebi.BATCH_ID = 'BATCH_001'
-		          ) THEN '매월 1일'
-		       WHEN (
-		             ebi.BATCH_ID = 'BATCH_004'
-		          or ebi.BATCH_ID = 'BATCH_005'
-		          or ebi.BATCH_ID = 'BATCH_009'
-		          or ebi.BATCH_ID = 'BATCH_011'
-		          or ebi.BATCH_ID = 'BATCH_020'
-		          ) THEN '매월 1,2,3일'
-		       WHEN ebi.BATCH_ID = 'BATCH_021' THEN '매월 1일, 20일'
-		       ELSE '매일'
-		    END AS batchCycle,
-			ebl.REG_DT,
-			CASE 
-				WHEN ebi.BATCH_ID ='BATCH_003' THEN '00:30'
-				WHEN ebi.BATCH_ID ='BATCH_008' THEN '02:10'
-				WHEN ebi.BATCH_ID ='BATCH_010' THEN '03:00'
-				WHEN ebi.BATCH_ID ='BATCH_012' THEN '04:00'
-				WHEN ebi.BATCH_ID ='BATCH_013' THEN '04:10'
-				WHEN ebi.BATCH_ID ='BATCH_014' THEN '04:20'
-				WHEN ebi.BATCH_ID ='BATCH_015' THEN '04:30'
-				WHEN ebi.BATCH_ID ='BATCH_018' THEN '05:15'
-				WHEN ebi.BATCH_ID ='BATCH_019' THEN '05:30'
-				WHEN ebi.BATCH_ID ='BATCH_016' THEN '매시간'
-				WHEN ebi.BATCH_ID ='BATCH_017' THEN '00:00:05'
-				WHEN ebi.BATCH_ID ='BATCH_002' THEN '00:00:05'
-				WHEN ebi.BATCH_ID ='BATCH_001' THEN '00:00:05'
-				WHEN ebi.BATCH_ID ='BATCH_004' THEN '01:00'
-				WHEN ebi.BATCH_ID ='BATCH_005' THEN '01:00'
-				WHEN ebi.BATCH_ID ='BATCH_006' THEN '02:00'
-				WHEN ebi.BATCH_ID ='BATCH_009' THEN '02:30'
-				WHEN ebi.BATCH_ID ='BATCH_011' THEN '03:30'
-				WHEN ebi.BATCH_ID ='BATCH_020' THEN '05:45'
-				WHEN ebi.BATCH_ID ='BATCH_021' THEN '10:00'
-				WHEN ebi.BATCH_ID ='BATCH_022' THEN '06:00'
-			ELSE '-'
-			END batchTime,
+		      	ebi.BATCH_ID AS BATCH_ID,
+		      	ebi.BATCH_NM AS BATCH_NM,
+				ebl.REG_DT AS REG_DT,
+				ebi.BATCH_DESC AS BATCH_DESC,
 			CASE 
 				WHEN ebl.STTUS_CD = '01' THEN  '시작'
 				WHEN ebl.STTUS_CD = '02' THEN  '성공'
 				WHEN ebl.STTUS_CD = '03' THEN  '실패'
 			ELSE '실패'
 			END AS STTUS_CD,
-			ebl.ERR_MSG
+			ebl.ERR_MSG AS ERR_MSG
 		FROM
 			hubez_admin.EZ_BTEXE_LOG ebl
 		LEFT OUTER JOIN 
@@ -451,15 +394,14 @@
 		WHERE 
 			(ebl.BATCH_ID ,ebl.REG_DT) 
 			IN (
-			SELECT 
-				BATCH_ID, 
-				max(REG_DT) AS REG_DT 
-			FROM 
-				hubez_admin.EZ_BTEXE_LOG ebl2 
-			GROUP BY 
-				BATCH_ID)
+				SELECT 
+						BATCH_ID, 
+						max(REG_DT) AS REG_DT 
+				FROM 	hubez_admin.EZ_BTEXE_LOG ebl2 
+				GROUP 	BY BATCH_ID
+				)
 		GROUP BY BATCH_ID		
-		ORDER BY STTUS_CD DESC, batchType DESC, BATCH_ID ASC
+		ORDER BY STTUS_CD DESC, BATCH_DESC ASC, BATCH_ID ASC
 	</select>