From 23d984c296c7abbf8c8c6e16e653a0381c5dcf82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Tue, 27 Sep 2022 10:54:15 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=EC=A0=95=EC=83=81=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EB=AA=A9=EB=A1=9D=20-=20=EC=8B=9D=EB=B3=84?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/ctr/cntrl/controller/CtrCntrlController.java | 6 +++--- .../biz/api/ctr/cntrl/model/CtrCntrlWarnLogModel.java | 1 + .../palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java index 9a2f77d..df335c2 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java @@ -143,8 +143,8 @@ public class CtrCntrlController { * @param id - 관제 ID * @return */ - @GetMapping(value = "/warn/list/{id}") - public ResponseEntity warnLog(@PathVariable String id){ + @GetMapping(value = "/warn/detail/{id}") + public ResponseEntity warnDetail(@PathVariable String id){ List warnLog; try { @@ -164,7 +164,7 @@ public class CtrCntrlController { * @return */ @GetMapping(value = "/arcrft/warn/list") - public ResponseEntity arcrftWarn(@RequestParam("id") String id){ + public ResponseEntity arcrftWarnList(@RequestParam("id") String id){ List arcrftWarnList; Map result = new HashMap<>(); diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlWarnLogModel.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlWarnLogModel.java index 4addf9f..91cfa41 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlWarnLogModel.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlWarnLogModel.java @@ -9,6 +9,7 @@ import com.palnet.biz.jpa.entity.CtrCntrlWarnLog; @Data public class CtrCntrlWarnLogModel { private Integer warnLogSno; + private String idntfNum; private String warnType; private String cntrlId; private Date createDt; diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java index 3f76ed9..6d59340 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java @@ -189,6 +189,7 @@ public class CtrCntrlService { model.setCreateDt(log.getCreateDt()); model.setWarnLogSno(log.getWarnLogSno()); model.setWarnType(log.getWarnType()); + model.setIdntfNum(log.getIdntfNum()); warnLog.add(model); }