배치 모니터링 수정

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,9 +328,16 @@ 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(
 			//월배치일 경우 날짜		
@@ -341,9 +350,15 @@ 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 (
 			//일배치일 경우 날짜	
 			jobId.equals("BATCH_003")||
@@ -356,16 +371,27 @@ public class SysMgtController {
 			jobId.equals("BATCH_018")||
 			jobId.equals("BATCH_019")){
 			
-			strDate = dayDateFormat.format(new Date());
-			logger.info("strDate={}",strDate);
+			try {
+				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());
-			logger.info("strDate={}",strDate);
+			try {
+				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>