From 081e9b8712c8a783487dda673a0422eef4b08305 Mon Sep 17 00:00:00 2001 From: "DESKTOP-MAVEOS0\\lmh32" Date: Tue, 9 May 2023 20:23:00 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=91=EC=97=85=EC=A4=91=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=A7=84=ED=96=89=20=EC=A4=91=20&=20=EB=B0=B0?= =?UTF-8?q?=EC=B9=98=20=EB=AA=A8=EB=8B=88=ED=84=B0=EB=A7=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/modules/sysMgt/router/index.js | 2 +- .../src/modules/sysMgt/service/sysMgtApi.js | 8 +- .../src/modules/sysMgt/views/BatchDetail.vue | 28 +++-- .../src/modules/sysMgt/views/BatchList.vue | 20 ++- .../src/modules/sysMgt/views/WorkState.vue | 117 +++++++----------- .../uplus/ez/api/sysMgt/SysMgtController.java | 82 +++++------- .../ez/api/sysMgt/dto/BatchDetailReqDto.java | 6 + 7 files changed, 126 insertions(+), 137 deletions(-) diff --git a/frontend/src/modules/sysMgt/router/index.js b/frontend/src/modules/sysMgt/router/index.js index 2c043f3..7e3af13 100644 --- a/frontend/src/modules/sysMgt/router/index.js +++ b/frontend/src/modules/sysMgt/router/index.js @@ -40,7 +40,7 @@ export default [ meta: { public: false } }, { - path: '/sysMgt/batchDetail/:batchId', + path: '/sysMgt/batchDetail', component: BatchDetail, name: 'batchDetail', meta: { public: false } diff --git a/frontend/src/modules/sysMgt/service/sysMgtApi.js b/frontend/src/modules/sysMgt/service/sysMgtApi.js index 6d6059f..cb89df5 100644 --- a/frontend/src/modules/sysMgt/service/sysMgtApi.js +++ b/frontend/src/modules/sysMgt/service/sysMgtApi.js @@ -85,6 +85,11 @@ const notiList = (params) => { return httpClient.post('/api/v1/bo/sysMgt/notiList', params, { withCredentials: false }) } +const setWorkState = (params) => { + console.log("api호출",params) + return httpClient.post('/api/v1/bo/sysMgt/setWorkState', params, { withCredentials: false }) +} + export default { insertAdmin, @@ -104,5 +109,6 @@ export default { batchList, batchDetail, batchExecuteJob, - notiList + notiList, + setWorkState, } diff --git a/frontend/src/modules/sysMgt/views/BatchDetail.vue b/frontend/src/modules/sysMgt/views/BatchDetail.vue index f9f970c..76cfec0 100644 --- a/frontend/src/modules/sysMgt/views/BatchDetail.vue +++ b/frontend/src/modules/sysMgt/views/BatchDetail.vue @@ -9,7 +9,7 @@

- +

@@ -57,10 +57,9 @@
@@ -107,7 +106,7 @@ export default { name: 'batchDetail', data() { return { - //paramBatchId : this.$route.params.batchId, + paramBatchId : this.$route.params.batchId, //날짜 조회 ko: vdp_translation_ko.js, periodDay: 7, @@ -120,8 +119,9 @@ export default { pageType: 'CALC', - batchId : this.$route.params.batchId, - batchNm : this.$route.params.batchNm, + batchId : this.$route.params.props.batchId, + batchNm : this.$route.params.props.batchNm, + batchType: this.$route.params.props.batchType, //상태조회 sttusCd: '', @@ -154,6 +154,8 @@ export default { noDataStr: '검색 결과가 없습니다.', params: { batchId : '', + batchType: '', + batchNm: '', sttusCd: '', startDt: '', endDt: '', @@ -220,6 +222,8 @@ export default { startDt: moment(this.startDate).format('YYYYMMDD'), endDt: moment(this.endDate).format('YYYYMMDD'), batchId: this.batchId, + batchNm: this.batchNm, + batchType: this.batchType, sttusCd: this.sttusCd } this.$refs.table.search(this.grid.params, isKeep); @@ -291,10 +295,14 @@ export default { }, async runExecuteJob(){ + console.log("this.strDate",this.strDate) const params = { - strDate : this.strDate, - batchId : this.batchId + strDate : moment(this.strDate).format('YYYY-MM-DD'), + batchId : this.batchId, + batchType : this.batchType, + batchNm : this.batchNm, } + console.log("params",params) try { const response = await sysMgtApi.batchExecuteJob(params); diff --git a/frontend/src/modules/sysMgt/views/BatchList.vue b/frontend/src/modules/sysMgt/views/BatchList.vue index afcfd74..b6da52c 100644 --- a/frontend/src/modules/sysMgt/views/BatchList.vue +++ b/frontend/src/modules/sysMgt/views/BatchList.vue @@ -7,13 +7,21 @@
+ +
+ diff --git a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java index a9ece02..73ea990 100644 --- a/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java +++ b/src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtController.java @@ -14,6 +14,7 @@ import kr.co.uplus.ez.common.components.ValidComponents; import kr.co.uplus.ez.common.components.WebClientRequestService; import kr.co.uplus.ez.common.data.ApiResponseCode; import kr.co.uplus.ez.common.data.Const; +import springfox.documentation.spring.web.json.Json; import org.apache.http.HttpStatus; import org.apache.http.protocol.HTTP; @@ -274,8 +275,8 @@ public class SysMgtController { /** * data: 2022. 10.24. - * auth: Lee minha - * desc: 배치 리스트 조회 + * auth: Lee + * desc: 배치 리스트 조회. * @return */ @ApiOperation(value = "batchList", notes = "배치 리스트 조회") @@ -286,9 +287,9 @@ public class SysMgtController { } /** - * data : 2022. 10. 26 - * auth : Lee minha - * desc : 배치 상세내용 + * date : 2022. 10. 26 + * auth : Lee + * desc : 배치 상세내용. * @return */ @@ -299,16 +300,21 @@ public class SysMgtController { public BatchDetailResDto batchDetail(@RequestBody @Valid BatchDetailReqDto batchDetailReqDto, BindingResult bindingResult) { + if (validComponents.validParameter(bindingResult)) { return new BatchDetailResDto(ApiResponseCode.CM_PARAMETER_ERROR); } -// batchDetailReqDto.setBatchId("BATCH_010"); - logger.debug("param 확인 : "+ batchDetailReqDto); return sysService.batchDetail(batchDetailReqDto); } + /** + * date : 2022. 10. 26 + * auth : Lee + * @param batchReqMap + * @return + */ @RequestMapping(value = "batchExecuteJob", method = {RequestMethod.POST}) @ResponseBody public BatchExeLogResDto batchExecuteJob(@RequestBody @Valid Map batchReqMap) { @@ -324,35 +330,22 @@ public class SysMgtController { String dayBatch = "yyyyMMdd"; String timeBatch = "yyyyMMddHHmmss"; + SimpleDateFormat monthDateFormat = new SimpleDateFormat(monthBatch); SimpleDateFormat dayDateFormat = new SimpleDateFormat(dayBatch); SimpleDateFormat timeDateFormat = new SimpleDateFormat(timeBatch); - - - - - + logger.info("callUrl={}",callUrl); String jobId = (String) batchReqMap.get("batchId"); + String batchType = (String) batchReqMap.get("batchType"); String strDate = (String) batchReqMap.get("strDate"); - logger.info("유입날짜 확인 {}",batchReqMap.get("strDate")); + logger.info("batchExecuteJob input Date Check = {}",batchReqMap.get("strDate")); + logger.debug("확인 batchType={}",batchType); - - - if( - //월배치일 경우 날짜 - jobId.equals("BATCH_001")|| - jobId.equals("BATCH_002")|| - jobId.equals("BATCH_004")|| - jobId.equals("BATCH_005")|| - jobId.equals("BATCH_006")|| - jobId.equals("BATCH_009")|| - jobId.equals("BATCH_011")|| - jobId.equals("BATCH_017")|| - jobId.equals("BATCH_020")) { - - + // 배치 타입 : 일배치, 월배치, 매시간 + if("월배치".equals(batchType)) { + logger.debug("월배치 batchType={}",batchType); try { Date date = new SimpleDateFormat("yyyy-MM-dd").parse(strDate); strDate = (String)monthDateFormat.format(date); @@ -360,32 +353,17 @@ public class SysMgtController { // TODO Auto-generated catch block e1.printStackTrace(); } - - } else if ( - //일배치일 경우 날짜 - jobId.equals("BATCH_003")|| - jobId.equals("BATCH_008")|| - jobId.equals("BATCH_010")|| - jobId.equals("BATCH_012")|| - jobId.equals("BATCH_013")|| - jobId.equals("BATCH_014")|| - jobId.equals("BATCH_015")|| - jobId.equals("BATCH_018")|| - jobId.equals("BATCH_019")|| - jobId.equals("BATCH_021")|| - jobId.equals("BATCH_022")|| - jobId.equals("BATCH_023")){ - + }else if("일배치".equals(batchType)) { + logger.debug("일배치 batchType={}",batchType); 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 { - + } + }else if("매시간".equals(batchType)) { + logger.debug("매시간 batchType={}",batchType); try { Date date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S").parse(strDate); strDate = (String)timeDateFormat.format(date); @@ -394,7 +372,7 @@ public class SysMgtController { e1.printStackTrace(); } } - + try { jsonObject.put("strDate", strDate); @@ -449,4 +427,10 @@ public class SysMgtController { return sysService.notiList(notiListReqDto); } + @RequestMapping(value = "/setWorkState", method = {RequestMethod.POST}) + @ResponseBody + public void setWorkState(@RequestBody @Valid Object setWorkParam) { + + logger.debug("setWorkParam={}",setWorkParam); + } } diff --git a/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/BatchDetailReqDto.java b/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/BatchDetailReqDto.java index 820bfe2..7b5a545 100644 --- a/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/BatchDetailReqDto.java +++ b/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/BatchDetailReqDto.java @@ -15,6 +15,12 @@ public class BatchDetailReqDto implements Serializable{ //배치 아이디 private String batchId; + //배치명 + private String batchNm; + + //배치 유형 + private String batchType; + //검색 시작일 private String startDt;