Browse Source

npe 수정

pull/18/head
qkr7828 9 months ago
parent
commit
4d4c33e3d0
  1. 4
      pav-server/src/main/java/com/palnet/biz/api/bas/dron/controller/BasDronController.java
  2. 3
      pav-server/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java

4
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}") @GetMapping(value = "/idntf/list/{id}")
@Operation(summary = "드론정보 조회", description = "드론[기체]일련번호로 식별장치를 조회합니다.") @Operation(summary = "드론정보 조회", description = "드론[기체]일련번호로 식별장치를 조회합니다.")
public ResponseEntity<? extends BasicResponse> mylist(@Parameter(name="id", description = "기체일련번호", in = ParameterIn.PATH, example = "6") @PathVariable Integer id) { public ResponseEntity<? extends BasicResponse> mylist(@Parameter(name="id", description = "기체일련번호", in = ParameterIn.PATH, example = "1") @PathVariable Integer id) {
List<BasIdntfModel> result = null; List<BasIdntfModel> result = null;
// 기체일련번호확인[id] 입력값 검증처리 // 기체일련번호확인[id] 입력값 검증처리
@ -342,7 +342,7 @@ public class BasDronController {
* @return * @return
*/ */
@PutMapping(value = "/idntf/update/{id}") @PutMapping(value = "/idntf/update/{id}")
@Operation(summary = "드론식별장치 정보 수정", description = "드론[기체]식별장치 정보를 수정합니다.") @Operation(summary = "드론식별장치 정보 수정", description = "드론[기체]식별장치 정보를 수정합니다. 실제로 존재하는 기체번호(idntfNum)의 소유자명과 핸드폰 번호를 수정합니다.")
public ResponseEntity<? extends BasicResponse> updateIdntf(@RequestBody BasIdntfUpdateModel rq) { public ResponseEntity<? extends BasicResponse> updateIdntf(@RequestBody BasIdntfUpdateModel rq) {
Map<String , Object> resultMap = new HashMap<String,Object>(); Map<String , Object> resultMap = new HashMap<String,Object>();

3
pav-server/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java

@ -88,11 +88,14 @@ public class BasDronService {
List<BasIdntfModel> resultList = query.idntfList(arcrftSno); List<BasIdntfModel> resultList = query.idntfList(arcrftSno);
if(resultList.size() != 0) {
for(BasIdntfModel model : resultList){ for(BasIdntfModel model : resultList){
if(model.getHpno() != null && !model.getHpno().isEmpty()){ if(model.getHpno() != null && !model.getHpno().isEmpty()){
model.setHpno(EncryptUtils.decrypt(model.getHpno())); model.setHpno(EncryptUtils.decrypt(model.getHpno()));
} }
} }
}
return resultList; return resultList;
} }

Loading…
Cancel
Save