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); }