|
|
|
@ -88,6 +88,7 @@ public class InnerSocketService {
|
|
|
|
|
ControlGpsStorage simpleControlStorage = ControlGpsStorage.getInstance(); |
|
|
|
|
simpleControlStorage.put(objectId, controlId); |
|
|
|
|
} |
|
|
|
|
log.debug(">>>> get control id : {}", simpleControlDto.getControlId()); |
|
|
|
|
|
|
|
|
|
return simpleControlDto; |
|
|
|
|
} |
|
|
|
@ -95,28 +96,28 @@ public class InnerSocketService {
|
|
|
|
|
// socket으로부터 받은 dron 정보 저장
|
|
|
|
|
public void setDronData(DroneDto droneDto) { |
|
|
|
|
|
|
|
|
|
if ("01".equals(droneDto.getTypeCd())) { |
|
|
|
|
// 비행 이력 생성
|
|
|
|
|
CtrCntrlBas ctrCntrlBas = ctrCntrlBasRepository.findById(droneDto.getControlId()).orElse(null); |
|
|
|
|
if (ctrCntrlBas != null) { |
|
|
|
|
log.debug(BaseErrorCode.DATA_ALREADY_EXISTS.message()); |
|
|
|
|
ctrCntrlBas = null; |
|
|
|
|
} else { |
|
|
|
|
CtrCntrlBas insertCtrCntrlBas = CtrCntrlBas.builder() |
|
|
|
|
.cntrlId(droneDto.getControlId()) |
|
|
|
|
.idntfNum(droneDto.getObjectId()) |
|
|
|
|
.objectTypeCd(droneDto.getObjectType()) |
|
|
|
|
.statusCd(droneDto.getTypeCd()) |
|
|
|
|
.procStatusYn("N") |
|
|
|
|
.cntrlStDt(droneDto.getControlStartDt()) |
|
|
|
|
.createDt(Instant.now()) |
|
|
|
|
.updateDt(Instant.now()) |
|
|
|
|
.build(); |
|
|
|
|
|
|
|
|
|
ctrCntrlBas = ctrCntrlBasRepository.save(insertCtrCntrlBas); |
|
|
|
|
} |
|
|
|
|
// 비행 이력 기본 생성
|
|
|
|
|
CtrCntrlBas ctrCntrlBas = ctrCntrlBasRepository.findById(droneDto.getControlId()).orElse(null); |
|
|
|
|
if (ctrCntrlBas == null) { |
|
|
|
|
CtrCntrlBas insertCtrCntrlBas = CtrCntrlBas.builder() |
|
|
|
|
.cntrlId(droneDto.getControlId()) |
|
|
|
|
.idntfNum(droneDto.getObjectId()) |
|
|
|
|
.objectTypeCd(droneDto.getObjectType()) |
|
|
|
|
.statusCd(droneDto.getTypeCd()) |
|
|
|
|
.procStatusYn("N") |
|
|
|
|
.cntrlStDt(droneDto.getControlStartDt()) |
|
|
|
|
.createDt(Instant.now()) |
|
|
|
|
.updateDt(Instant.now()) |
|
|
|
|
.build(); |
|
|
|
|
|
|
|
|
|
ctrCntrlBas = ctrCntrlBasRepository.save(insertCtrCntrlBas); |
|
|
|
|
} else { |
|
|
|
|
log.debug(BaseErrorCode.DATA_ALREADY_EXISTS.message()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if ("01".equals(droneDto.getTypeCd())) { |
|
|
|
|
log.debug(">>>> drone dto type cd is 01"); |
|
|
|
|
// 비행 이력 생성
|
|
|
|
|
// 비행 이력, 비행 계획서 mapping
|
|
|
|
|
if (!"PA".equals(droneDto.getObjectId().substring(0, 2))) return; |
|
|
|
|
|
|
|
|
@ -163,6 +164,8 @@ public class InnerSocketService {
|
|
|
|
|
fltPlanCtrCntrlRelRepository.save(fltPlanCtrCntrlRel); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
log.debug(">>>> drone dto type cd is not 01"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// history 생성
|
|
|
|
@ -192,7 +195,9 @@ public class InnerSocketService {
|
|
|
|
|
.sensorDust(droneDto.getSensorDust()) |
|
|
|
|
|
|
|
|
|
.build(); |
|
|
|
|
|
|
|
|
|
log.debug(">>> send data :: control_id : {}", ctrCntrlHstry.getCntrlId()); |
|
|
|
|
log.debug(">>> send data :: oid, cid : {}, {}", droneDto.getObjectId(), droneDto.getControlId()); |
|
|
|
|
log.debug(">>> send data :: ctrCntrlBas : {}", ctrCntrlBas); |
|
|
|
|
ctrCntrlHstry = ctrCntrlHstryRepository.save(ctrCntrlHstry); |
|
|
|
|
|
|
|
|
|
if ("01".equals(droneDto.getTypeCd()) || "99".equals(droneDto.getTypeCd())) { |
|
|
|
@ -209,8 +214,6 @@ public class InnerSocketService {
|
|
|
|
|
.build(); |
|
|
|
|
|
|
|
|
|
ctrCntrlHstryAreaRepository.save(ctrCntrlHstryArea); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|