배치 모니터링 수정

frontend/src/modules/sysMgt/views/BatchDetail.vue

@@ -146,10 +146,10 @@ export default {
         ],
         columns: [
           // {name: 'batchId', header:'배치ID', align:'center', width:'20%'},
-          {name: 'stDt', header: '시작 일시', align: 'center', width: '25%'},
+          {name: 'stDt', header: '시작 일시', align: 'center', width: '15%'},
-          {name: 'fnsDt', header: '종료 일시', align: 'center', width: '25%'},
+          {name: 'fnsDt', header: '종료 일시', align: 'center', width: '15%'},
-          {name: 'sttusCd', header:'상태코드', align: 'center', width: '25%'},
+          {name: 'sttusCd', header:'상태코드', align: 'center', width: '10%'},
-          {name: 'errMsg', header:'에러메시지', align: 'center', width: '25%'},
+          {name: 'errMsg', header:'결과', align: 'left', width: '60%'},
         ],
         noDataStr: '검색 결과가 없습니다.',
         params: {

frontend/src/modules/sysMgt/views/BatchList.vue

@@ -58,20 +58,20 @@ export default {
           ]
         ],
         columns: [
-          {name: 'batchType', header: '배치유형', align: 'center', width: '7%'},
+          {name: 'batchType', header: '배치유형', align: 'center', width: '5%'},
+          {name: 'batchId', header:'배치ID', align:'center', width:'9%'},
           {
-            name: 'batchNm', header:'배치명',align:'left', width:'15%', renderer: {
+            name: 'batchNm', header:'배치명',align:'left', width:'14%', renderer: {
             type: CustomATagRenderer
             , options: {
               callback: this.batchDetail,
             }
           }},
-          {name: 'batchId', header:'배치ID', align:'center', width:'8%'},
           {name: 'batchCycle', header:'실행일자',align:'center', width:'8%'},
           {name: 'batchTime', header:'실행시간',align:'center', width:'7%'},
-          {name: 'regDt', header:'배치 수행시간',align:'center', width:'14%'},
+          {name: 'regDt', header:'배치 수행시간',align:'center', width:'13%'},
-          {name: 'sttusCd', header:'상태',align:'center', width:'10%'},
+          {name: 'sttusCd', header:'상태',align:'center', width:'5%'},
-          {name: 'errMsg', header:'메시지',align:'left', width:'36%'}
+          {name: 'errMsg', header:'메시지',align:'left', width:'39%'}
         ]
       }
     };

src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java

@@ -29,7 +29,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -326,10 +328,17 @@ public class SysMgtController {
 		SimpleDateFormat timeDateFormat = new SimpleDateFormat(timeBatch);
 		
 		
+		
+		
+		
 		logger.info("callUrl={}",callUrl);
 		String jobId = (String) batchReqMap.get("batchId");
 		String strDate = (String) batchReqMap.get("strDate");
 
+		logger.info("유입날짜 확인 {}",batchReqMap.get("strDate"));
+		
+		
+		
 		if(
 			//월배치일 경우 날짜		
 			jobId.equals("BATCH_001")||
@@ -341,8 +350,14 @@ public class SysMgtController {
 			jobId.equals("BATCH_011")||
 			jobId.equals("BATCH_020")) {
 			
-			strDate = monthDateFormat.format(new Date());
+			
-			logger.info("strDate={}",strDate);
+			try {
+				Date date = new SimpleDateFormat("yyyy-MM-dd").parse(strDate);
+				strDate = (String)monthDateFormat.format(date);
+			} catch (ParseException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
 			
 		}	else if (
 			//일배치일 경우 날짜	
@@ -356,16 +371,27 @@ public class SysMgtController {
 			jobId.equals("BATCH_018")||
 			jobId.equals("BATCH_019")){
 			
-			strDate = dayDateFormat.format(new Date());
+			try {
-			logger.info("strDate={}",strDate);
+				Date date = new SimpleDateFormat("yyyy-MM-dd").parse(strDate);
+				strDate = (String)dayDateFormat.format(date);
+			} catch (ParseException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}				
+			
 		}	else {
 			
-			strDate = timeDateFormat.format(new Date());
+			try {
-			logger.info("strDate={}",strDate);
+				Date date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S").parse(strDate);
+				strDate = (String)timeDateFormat.format(date);
+			} catch (ParseException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
 		}
 
 		try {
-			logger.info("batchReqMap={}",batchReqMap);
+
 			jsonObject.put("strDate", strDate);
 			jsonObject.put("jobId", jobId);
 			

src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml

@@ -455,7 +455,7 @@
 			GROUP BY 
 				BATCH_ID)
 		GROUP BY BATCH_ID		
-		ORDER BY batchType DESC, BATCH_ID ASC
+		ORDER BY STTUS_CD DESC, batchType DESC, BATCH_ID ASC
 	</select>