From 4d4c33e3d074c04ea71cebe6aa40dafd4b22a3be Mon Sep 17 00:00:00 2001 From: qkr7828 Date: Sat, 23 Dec 2023 02:33:17 +0900 Subject: [PATCH] =?UTF-8?q?npe=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/bas/dron/controller/BasDronController.java | 4 ++-- .../palnet/biz/api/bas/dron/service/BasDronService.java | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dron/controller/BasDronController.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dron/controller/BasDronController.java index 4cb7f435..ac2853d2 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dron/controller/BasDronController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dron/controller/BasDronController.java @@ -84,7 +84,7 @@ public class BasDronController { */ @GetMapping(value = "/idntf/list/{id}") @Operation(summary = "드론정보 조회", description = "드론[기체]일련번호로 식별장치를 조회합니다.") - public ResponseEntity mylist(@Parameter(name="id", description = "기체일련번호", in = ParameterIn.PATH, example = "6") @PathVariable Integer id) { + public ResponseEntity mylist(@Parameter(name="id", description = "기체일련번호", in = ParameterIn.PATH, example = "1") @PathVariable Integer id) { List result = null; // 기체일련번호확인[id] 입력값 검증처리 @@ -342,7 +342,7 @@ public class BasDronController { * @return */ @PutMapping(value = "/idntf/update/{id}") - @Operation(summary = "드론식별장치 정보 수정", description = "드론[기체]식별장치 정보를 수정합니다.") + @Operation(summary = "드론식별장치 정보 수정", description = "드론[기체]식별장치 정보를 수정합니다. 실제로 존재하는 기체번호(idntfNum)의 소유자명과 핸드폰 번호를 수정합니다.") public ResponseEntity updateIdntf(@RequestBody BasIdntfUpdateModel rq) { Map resultMap = new HashMap(); diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java index 8d2d2199..73bbfee9 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java @@ -88,9 +88,12 @@ public class BasDronService { List resultList = query.idntfList(arcrftSno); - for(BasIdntfModel model : resultList){ - if(model.getHpno() != null && !model.getHpno().isEmpty()){ - model.setHpno(EncryptUtils.decrypt(model.getHpno())); + + if(resultList.size() != 0) { + for(BasIdntfModel model : resultList){ + if(model.getHpno() != null && !model.getHpno().isEmpty()){ + model.setHpno(EncryptUtils.decrypt(model.getHpno())); + } } }