jbcheong/hubez-admin
1
0
Fork 0
mirror of http://git.mhez-qa.uplus.co.kr/hubez/hubez-admin.git synced 2025-12-07 02:30:05 +09:00
Code Issues Projects Releases Wiki Activity

배치 모니터링 수정

Browse Source
This commit is contained in:
Leeminha
2022-11-10 15:17:33 +09:00
parent 21e3f1de49
commit 4aca52d46d
4 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/modules/sysMgt/views/BatchDetail.vue
View File

@@ -146,10 +146,10 @@ export default {
], ],
columns: [ columns: [
// {name: 'batchId', header:'배치ID', align:'center', width:'20%'}, // {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: '검색 결과가 없습니다.', noDataStr: '검색 결과가 없습니다.',
params: { params: {

12
frontend/src/modules/sysMgt/views/BatchList.vue
View File

@@ -58,20 +58,20 @@ export default {
] ]
], ],
columns: [ 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 type: CustomATagRenderer
, options: { , options: {
callback: this.batchDetail, callback: this.batchDetail,
} }
}}, }},
{name: 'batchId', header:'배치ID', align:'center', width:'8%'},
{name: 'batchCycle', header:'실행일자',align:'center', width:'8%'}, {name: 'batchCycle', header:'실행일자',align:'center', width:'8%'},
{name: 'batchTime', header:'실행시간',align:'center', width:'7%'}, {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%'}
] ]
} }
}; };

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

@@ -29,7 +29,9 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -326,10 +328,17 @@ public class SysMgtController {
SimpleDateFormat timeDateFormat = new SimpleDateFormat(timeBatch); SimpleDateFormat timeDateFormat = new SimpleDateFormat(timeBatch);
logger.info("callUrl={}",callUrl); logger.info("callUrl={}",callUrl);
String jobId = (String) batchReqMap.get("batchId"); String jobId = (String) batchReqMap.get("batchId");
String strDate = (String) batchReqMap.get("strDate"); String strDate = (String) batchReqMap.get("strDate");
logger.info("유입날짜 확인 {}",batchReqMap.get("strDate"));
if( if(
//월배치일 경우 날짜 //월배치일 경우 날짜
jobId.equals("BATCH_001")|| jobId.equals("BATCH_001")||
@@ -341,8 +350,14 @@ public class SysMgtController {
jobId.equals("BATCH_011")|| jobId.equals("BATCH_011")||
jobId.equals("BATCH_020")) { 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 ( } else if (
//일배치일 경우 날짜 //일배치일 경우 날짜
@@ -356,16 +371,27 @@ public class SysMgtController {
jobId.equals("BATCH_018")|| jobId.equals("BATCH_018")||
jobId.equals("BATCH_019")){ 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 { } 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 { try {
logger.info("batchReqMap={}",batchReqMap);
jsonObject.put("strDate", strDate); jsonObject.put("strDate", strDate);
jsonObject.put("jobId", jobId); jsonObject.put("jobId", jobId);

2
src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml
View File

@@ -455,7 +455,7 @@
GROUP BY GROUP BY
BATCH_ID) BATCH_ID)
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> </select>