Формат времени в UTC
This commit is contained in:
+9
-7
@@ -8,10 +8,12 @@ import org.springframework.web.bind.annotation.RequestMapping
|
||||
import org.springframework.web.bind.annotation.RequestParam
|
||||
import org.springframework.web.bind.annotation.RestController
|
||||
import space.nstart.pcp.pcp_request_service.configuration.CustomValidationException
|
||||
import space.nstart.pcp.pcp_request_service.utils.UtcDateTimes
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.AngularMotionCalculationRequestDTO
|
||||
import java.net.URLDecoder
|
||||
import java.nio.charset.StandardCharsets
|
||||
import java.time.LocalDateTime
|
||||
import java.time.format.DateTimeParseException
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/angular-motion")
|
||||
@@ -43,12 +45,12 @@ class AngularMotionController(
|
||||
return null
|
||||
}
|
||||
val decoded = URLDecoder.decode(raw, StandardCharsets.UTF_8)
|
||||
val normalized = if (decoded.length == 16) "$decoded:00" else decoded
|
||||
return runCatching { LocalDateTime.parse(normalized) }
|
||||
.getOrElse {
|
||||
throw CustomValidationException(
|
||||
"Некорректный формат времени '$decoded'. Ожидается yyyy-MM-dd'T'HH:mm или yyyy-MM-dd'T'HH:mm:ss",
|
||||
)
|
||||
}
|
||||
return try {
|
||||
UtcDateTimes.parse(decoded)
|
||||
} catch (_: DateTimeParseException) {
|
||||
throw CustomValidationException(
|
||||
"Некорректный формат времени '$decoded'. Ожидается ISO-8601 UTC/offset, например 2026-06-17T06:28:27Z, или legacy UTC-naive yyyy-MM-dd'T'HH:mm:ss",
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
package space.nstart.pcp.pcp_request_service.configuration
|
||||
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import java.time.Clock
|
||||
|
||||
@Configuration
|
||||
class TimeConfiguration {
|
||||
|
||||
@Bean
|
||||
fun clock(): Clock = Clock.systemUTC()
|
||||
}
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
package space.nstart.pcp.pcp_request_service.configuration
|
||||
|
||||
import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import space.nstart.pcp.pcp_request_service.utils.UtcDateTimes
|
||||
import tools.jackson.core.JsonGenerator
|
||||
import tools.jackson.core.JsonParser
|
||||
import tools.jackson.databind.DeserializationContext
|
||||
import tools.jackson.databind.SerializationContext
|
||||
import tools.jackson.databind.deser.std.StdDeserializer
|
||||
import tools.jackson.databind.module.SimpleModule
|
||||
import tools.jackson.databind.ser.std.StdSerializer
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Configuration
|
||||
class UtcTimeJsonConfiguration {
|
||||
|
||||
@Bean
|
||||
fun ballisticsUtcLocalDateTimeCustomizer(): JsonMapperBuilderCustomizer = JsonMapperBuilderCustomizer { builder ->
|
||||
builder.addModule(
|
||||
SimpleModule("pcp-ballistics-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, UtcLocalDateTimeDeserializer())
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeSerializer : StdSerializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, ctxt: SerializationContext) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeDeserializer : StdDeserializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
+28
-14
@@ -15,9 +15,11 @@ import org.springframework.web.bind.annotation.RestController
|
||||
import space.nstart.pcp.pcp_request_service.configuration.CustomValidationException
|
||||
import space.nstart.pcp.pcp_request_service.service.SatelliteIcEventService
|
||||
import space.nstart.pcp.pcp_request_service.service.SatelliteService
|
||||
import space.nstart.pcp.pcp_request_service.utils.UtcDateTimes
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.ExactTimePositionRequestDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.SatelliteICDTO
|
||||
import java.time.LocalDateTime
|
||||
import java.time.format.DateTimeParseException
|
||||
|
||||
|
||||
@RestController
|
||||
@@ -61,11 +63,11 @@ class SatelliteController {
|
||||
@Parameter(description = "Идентификатор NORAD", example = "56756")
|
||||
@PathVariable("norad_id") noradId : Long,
|
||||
@Parameter(description = "Время начала (если null, то мин. время для выбранного КА)")
|
||||
@RequestParam("time_start") timeStart : LocalDateTime?,
|
||||
@RequestParam("time_start", required = false) timeStart : String?,
|
||||
@Parameter(description = "Время конца (если null, то макс. время для выбранного КА)")
|
||||
@RequestParam("time_stop") timeStrop : LocalDateTime?
|
||||
@RequestParam("time_stop", required = false) timeStrop : String?
|
||||
) =
|
||||
satelliteService.getOrbPoints(noradId, timeStart, timeStrop)
|
||||
satelliteService.getOrbPoints(noradId, parseOptionalUtcDateTime("time_start", timeStart), parseOptionalUtcDateTime("time_stop", timeStrop))
|
||||
|
||||
@Operation(
|
||||
summary = "Получить доступные интервалы прогноза по всем КА",
|
||||
@@ -74,9 +76,9 @@ class SatelliteController {
|
||||
@GetMapping("/orbit/availability")
|
||||
fun getOrbitAvailability(
|
||||
@Parameter(description = "Проверяемое время. Если null, возвращаются все КА, для которых есть точки ПДЦМ")
|
||||
@RequestParam("time", required = false) time: LocalDateTime?
|
||||
@RequestParam("time", required = false) time: String?
|
||||
) =
|
||||
satelliteService.getOrbitAvailability(time)
|
||||
satelliteService.getOrbitAvailability(parseOptionalUtcDateTime("time", time))
|
||||
|
||||
|
||||
@GetMapping("/orbit/availability/{id}")
|
||||
@@ -96,11 +98,11 @@ class SatelliteController {
|
||||
@Parameter(description = "Идентификатор NORAD", example = "56756")
|
||||
@PathVariable("norad_id") noradId : Long,
|
||||
@Parameter(description = "Время начала (если null, то мин. время для выбранного КА)")
|
||||
@RequestParam("time_start") timeStart : LocalDateTime?,
|
||||
@RequestParam("time_start", required = false) timeStart : String?,
|
||||
@Parameter(description = "Время конца (если null, то макс. время для выбранного КА)")
|
||||
@RequestParam("time_stop") timeStrop : LocalDateTime?
|
||||
@RequestParam("time_stop", required = false) timeStrop : String?
|
||||
) =
|
||||
satelliteService.getAscNodes(noradId, timeStart, timeStrop)
|
||||
satelliteService.getAscNodes(noradId, parseOptionalUtcDateTime("time_start", timeStart), parseOptionalUtcDateTime("time_stop", timeStrop))
|
||||
|
||||
|
||||
@Operation(
|
||||
@@ -112,11 +114,11 @@ class SatelliteController {
|
||||
@Parameter(description = "Идентификатор NORAD", example = "56756")
|
||||
@PathVariable("norad_id") noradId : Long,
|
||||
@Parameter(description = "Время начала (если null, то мин. время для выбранного КА)")
|
||||
@RequestParam("time_start") timeStart : LocalDateTime?,
|
||||
@RequestParam("time_start", required = false) timeStart : String?,
|
||||
@Parameter(description = "Время конца (если null, то макс. время для выбранного КА)")
|
||||
@RequestParam("time_stop") timeStrop : LocalDateTime?
|
||||
@RequestParam("time_stop", required = false) timeStrop : String?
|
||||
) =
|
||||
satelliteService.getFL(noradId, timeStart, timeStrop, 60.0)
|
||||
satelliteService.getFL(noradId, parseOptionalUtcDateTime("time_start", timeStart), parseOptionalUtcDateTime("time_stop", timeStrop), 60.0)
|
||||
|
||||
|
||||
|
||||
@@ -130,11 +132,11 @@ class SatelliteController {
|
||||
@Parameter(description = "Идентификатор NORAD", example = "56756")
|
||||
@PathVariable("norad_id") noradId : Long,
|
||||
@Parameter(description = "Время начала (если null, то мин. время для выбранного КА)")
|
||||
@RequestParam("time_start") timeStart : LocalDateTime,
|
||||
@RequestParam("time_start") timeStart : String,
|
||||
@Parameter(description = "Время конца (если null, то макс. время для выбранного КА)")
|
||||
@RequestParam("time_stop") timeStrop : LocalDateTime
|
||||
@RequestParam("time_stop") timeStrop : String
|
||||
) =
|
||||
satelliteService.getRVA(noradId, timeStart, timeStrop)
|
||||
satelliteService.getRVA(noradId, parseRequiredUtcDateTime("time_start", timeStart), parseRequiredUtcDateTime("time_stop", timeStrop))
|
||||
|
||||
|
||||
@PostMapping("/{satellite_id}/clear")
|
||||
@@ -143,4 +145,16 @@ class SatelliteController {
|
||||
) =
|
||||
satelliteService.clear(satelliteId)
|
||||
|
||||
private fun parseOptionalUtcDateTime(name: String, value: String?): LocalDateTime? =
|
||||
value?.let { parseRequiredUtcDateTime(name, it) }
|
||||
|
||||
private fun parseRequiredUtcDateTime(name: String, value: String): LocalDateTime =
|
||||
try {
|
||||
UtcDateTimes.parse(value)
|
||||
} catch (_: DateTimeParseException) {
|
||||
throw CustomValidationException(
|
||||
"Некорректный формат параметра '$name': '$value'. Ожидается ISO-8601 UTC/offset, например 2026-06-17T06:28:27Z, или legacy UTC-naive yyyy-MM-dd'T'HH:mm:ss",
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+2
-1
@@ -1,5 +1,6 @@
|
||||
package space.nstart.pcp.pcp_request_service.entity
|
||||
|
||||
import space.nstart.pcp.pcp_request_service.utils.UtcDateTimes
|
||||
import ballistics.types.KeplerParams
|
||||
import ballistics.types.RevolutionParameter
|
||||
import ballistics.utils.fromDateTime
|
||||
@@ -26,7 +27,7 @@ class AscNodeEntity(
|
||||
@Column(nullable = false)
|
||||
val satelliteId : Long = 0,
|
||||
@Column(name = "t", nullable = false)
|
||||
val time : LocalDateTime = LocalDateTime.now(),
|
||||
val time : LocalDateTime = UtcDateTimes.now(),
|
||||
@Column(nullable = false)
|
||||
val revolution : Long = 0,
|
||||
val longitude : Double = 0.0,
|
||||
|
||||
+3
-2
@@ -1,5 +1,6 @@
|
||||
package space.nstart.pcp.pcp_request_service.entity
|
||||
|
||||
import space.nstart.pcp.pcp_request_service.utils.UtcDateTimes
|
||||
import ballistics.utils.toDateTime
|
||||
import jakarta.persistence.Column
|
||||
import jakarta.persistence.Entity
|
||||
@@ -26,13 +27,13 @@ class EarthCellViewsEntity(
|
||||
@Column(name = "rev_begin", nullable = false)
|
||||
val revolutionBegin : Long = 0,
|
||||
@Column(nullable = false)
|
||||
val timeBegin : LocalDateTime = LocalDateTime.now(),
|
||||
val timeBegin : LocalDateTime = UtcDateTimes.now(),
|
||||
@Column(nullable = false)
|
||||
val revSignBegin : Int = 0,
|
||||
@Column(name = "rev_end", nullable = false)
|
||||
val revolutionEnd: Long = 0,
|
||||
@Column(nullable = false)
|
||||
val timeEnd : LocalDateTime = LocalDateTime.now(),
|
||||
val timeEnd : LocalDateTime = UtcDateTimes.now(),
|
||||
@Column(nullable = false)
|
||||
val revSignEnd : Int = 0,
|
||||
@Column(name = "roll_min")
|
||||
|
||||
+3
-2
@@ -1,5 +1,6 @@
|
||||
package space.nstart.pcp.pcp_request_service.entity
|
||||
|
||||
import space.nstart.pcp.pcp_request_service.utils.UtcDateTimes
|
||||
import ballistics.types.FleghtLineSector
|
||||
import ballistics.utils.toDateTime
|
||||
import jakarta.persistence.Column
|
||||
@@ -22,9 +23,9 @@ class EarthCoverageEntity(
|
||||
@Column(nullable = false)
|
||||
val cellNumber : Long = 0,
|
||||
@Column(nullable = false)
|
||||
val tStart : LocalDateTime = LocalDateTime.now(),
|
||||
val tStart : LocalDateTime = UtcDateTimes.now(),
|
||||
@Column(nullable = false)
|
||||
val tStop : LocalDateTime = LocalDateTime.now(),
|
||||
val tStop : LocalDateTime = UtcDateTimes.now(),
|
||||
) {
|
||||
constructor(fl : FleghtLineSector, sector : Int, sat : Long) : this(
|
||||
null,
|
||||
|
||||
+2
-1
@@ -1,5 +1,6 @@
|
||||
package space.nstart.pcp.pcp_request_service.entity
|
||||
|
||||
import space.nstart.pcp.pcp_request_service.utils.UtcDateTimes
|
||||
import ballistics.types.FlightLine
|
||||
import ballistics.utils.toDateTime
|
||||
import jakarta.persistence.*
|
||||
@@ -19,7 +20,7 @@ class FlightLineEntity(
|
||||
@Column(nullable = false)
|
||||
val satelliteId : Long = 0,
|
||||
@Column(name = "t", nullable = false)
|
||||
val time : LocalDateTime = LocalDateTime.now(),
|
||||
val time : LocalDateTime = UtcDateTimes.now(),
|
||||
@Column(nullable = false)
|
||||
val revolution : Long = 0,
|
||||
@Column(nullable = false)
|
||||
|
||||
+2
-1
@@ -1,5 +1,6 @@
|
||||
package space.nstart.pcp.pcp_request_service.entity
|
||||
|
||||
import space.nstart.pcp.pcp_request_service.utils.UtcDateTimes
|
||||
import ballistics.types.OrbitalPoint
|
||||
import ballistics.utils.fromDateTime
|
||||
import ballistics.utils.math.Vector3D
|
||||
@@ -18,7 +19,7 @@ class PDCMEntity (
|
||||
@Column(nullable = false)
|
||||
val satelliteId : Long = 0,
|
||||
@Column(name = "t", nullable = false)
|
||||
val time : LocalDateTime = LocalDateTime.now(),
|
||||
val time : LocalDateTime = UtcDateTimes.now(),
|
||||
@Column(nullable = false)
|
||||
val revolution : Long = 0,
|
||||
val x: Double = 0.0,
|
||||
|
||||
+7
-5
@@ -1,5 +1,6 @@
|
||||
package space.nstart.pcp.pcp_request_service.entity
|
||||
|
||||
import space.nstart.pcp.pcp_request_service.utils.UtcDateTimes
|
||||
import jakarta.persistence.Column
|
||||
import jakarta.persistence.Entity
|
||||
import jakarta.persistence.EnumType
|
||||
@@ -27,7 +28,7 @@ class SatelliteInitialConditionEntity(
|
||||
@Column(name = "movement_model", nullable = false)
|
||||
val movementModel: MovementModel = MovementModel.FOTO,
|
||||
@Column(name = "orb_time", nullable = false)
|
||||
val orbTime: LocalDateTime = LocalDateTime.now(),
|
||||
val orbTime: LocalDateTime = UtcDateTimes.now(),
|
||||
@Column(name = "orb_revolution", nullable = false)
|
||||
val orbRevolution: Long = 0,
|
||||
@Column(nullable = false)
|
||||
@@ -47,13 +48,13 @@ class SatelliteInitialConditionEntity(
|
||||
@Column(nullable = false)
|
||||
val f81: Double = 147.8,
|
||||
@Column(name = "received_at", nullable = false)
|
||||
val receivedAt: LocalDateTime = LocalDateTime.now(),
|
||||
val receivedAt: LocalDateTime = UtcDateTimes.now(),
|
||||
@Column(name = "calculated_at")
|
||||
var calculatedAt: LocalDateTime? = null,
|
||||
@Column(name = "last_calculated", nullable = false)
|
||||
var lastCalculated: Boolean = false
|
||||
) {
|
||||
constructor(request: SatelliteICDTO) : this(
|
||||
constructor(request: SatelliteICDTO, receivedAt: LocalDateTime = UtcDateTimes.now()) : this(
|
||||
satelliteId = request.satelliteId,
|
||||
movementModel = request.movementModel,
|
||||
orbTime = request.ic.orbPoint.time,
|
||||
@@ -65,10 +66,11 @@ class SatelliteInitialConditionEntity(
|
||||
vy = request.ic.orbPoint.vy,
|
||||
vz = request.ic.orbPoint.vz,
|
||||
sBall = request.ic.sBall,
|
||||
f81 = request.ic.f81
|
||||
f81 = request.ic.f81,
|
||||
receivedAt = receivedAt
|
||||
)
|
||||
|
||||
fun markLastCalculated(calculatedAt: LocalDateTime = LocalDateTime.now()) {
|
||||
fun markLastCalculated(calculatedAt: LocalDateTime = UtcDateTimes.now()) {
|
||||
this.calculatedAt = calculatedAt
|
||||
this.lastCalculated = true
|
||||
}
|
||||
|
||||
+6
-3
@@ -1,6 +1,8 @@
|
||||
package space.nstart.pcp.pcp_request_service.service
|
||||
|
||||
import org.springframework.stereotype.Service
|
||||
import space.nstart.pcp.pcp_request_service.utils.UtcDateTimes
|
||||
import java.time.Clock
|
||||
import org.springframework.transaction.annotation.Transactional
|
||||
import space.nstart.pcp.pcp_request_service.entity.SatelliteInitialConditionEntity
|
||||
import space.nstart.pcp.pcp_request_service.repository.SatelliteInitialConditionRepository
|
||||
@@ -8,17 +10,18 @@ import space.nstart.pcp.pcp_types_lib.dto.ballistics.SatelliteICDTO
|
||||
|
||||
@Service
|
||||
class SatelliteInitialConditionService(
|
||||
private val satelliteInitialConditionRepository: SatelliteInitialConditionRepository
|
||||
private val satelliteInitialConditionRepository: SatelliteInitialConditionRepository,
|
||||
private val clock: Clock
|
||||
) {
|
||||
|
||||
@Transactional
|
||||
fun saveReceived(request: SatelliteICDTO): SatelliteInitialConditionEntity =
|
||||
satelliteInitialConditionRepository.save(SatelliteInitialConditionEntity(request))
|
||||
satelliteInitialConditionRepository.save(SatelliteInitialConditionEntity(request, UtcDateTimes.now(clock)))
|
||||
|
||||
@Transactional
|
||||
fun markLastCalculated(initialCondition: SatelliteInitialConditionEntity) {
|
||||
satelliteInitialConditionRepository.clearLastCalculated(initialCondition.satelliteId)
|
||||
initialCondition.markLastCalculated()
|
||||
initialCondition.markLastCalculated(UtcDateTimes.now(clock))
|
||||
satelliteInitialConditionRepository.save(initialCondition)
|
||||
}
|
||||
|
||||
|
||||
+10
-6
@@ -44,6 +44,7 @@ import space.nstart.pcp.pcp_request_service.repository.EarthCoverageRepository
|
||||
import space.nstart.pcp.pcp_request_service.repository.FlightLineRepository
|
||||
import space.nstart.pcp.pcp_request_service.repository.PDCMRepository
|
||||
import space.nstart.pcp.pcp_request_service.utils.ContourClipService
|
||||
import space.nstart.pcp.pcp_request_service.utils.UtcDateTimes
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.AscNodeDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.ExactTimePositionRequestDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.InitialConditionsDTO
|
||||
@@ -62,6 +63,7 @@ import space.nstart.pcp.pcp_types_lib.dto.ballistics.SatelliteOrbitAvailabilityD
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.TLEDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.TargetPositionDTO
|
||||
import tools.jackson.databind.ObjectMapper
|
||||
import java.time.Clock
|
||||
import java.time.LocalDateTime
|
||||
import kotlin.collections.forEach
|
||||
import kotlin.math.PI
|
||||
@@ -105,6 +107,8 @@ class SatelliteService {
|
||||
@Autowired
|
||||
private lateinit var stationCatalogClient: StationCatalogClient
|
||||
|
||||
@Autowired
|
||||
private lateinit var clock: Clock
|
||||
|
||||
val astro = AstronomerJ2000(EarthType.PZ90d02)
|
||||
|
||||
@@ -761,8 +765,8 @@ class SatelliteService {
|
||||
fun getOrbPoints(id : Long, tn : LocalDateTime?, tk : LocalDateTime?) =
|
||||
pdcmRepository.findBySatelliteIdAndTimeBetween(
|
||||
id,
|
||||
tn?: LocalDateTime.now(),
|
||||
tk?: LocalDateTime.now().plusDays(1))
|
||||
tn?: UtcDateTimes.now(clock),
|
||||
tk?: UtcDateTimes.now(clock).plusDays(1))
|
||||
.map { it.toDTO()
|
||||
}
|
||||
|
||||
@@ -780,8 +784,8 @@ class SatelliteService {
|
||||
|
||||
fun getFL(id : Long, tn : LocalDateTime?, tk : LocalDateTime?, step : Double?) =
|
||||
flightLineRepository.findBySatelliteIdAndTimeBetween(id,
|
||||
tn?: LocalDateTime.now(),
|
||||
tk?: LocalDateTime.now().plusDays(1)
|
||||
tn?: UtcDateTimes.now(clock),
|
||||
tk?: UtcDateTimes.now(clock).plusDays(1)
|
||||
)
|
||||
.map { it.toDTO() }
|
||||
|
||||
@@ -902,8 +906,8 @@ class SatelliteService {
|
||||
|
||||
return ascNodeRepository.findBySatelliteIdAndTimeBetween(
|
||||
id,
|
||||
tn ?: LocalDateTime.now(),
|
||||
tk ?: LocalDateTime.now().plusDays(1)
|
||||
tn ?: UtcDateTimes.now(clock),
|
||||
tk ?: UtcDateTimes.now(clock).plusDays(1)
|
||||
)
|
||||
.map {
|
||||
val keps = calculateKeplerParams(
|
||||
|
||||
+59
@@ -0,0 +1,59 @@
|
||||
package space.nstart.pcp.pcp_request_service.utils
|
||||
|
||||
import java.time.Clock
|
||||
import java.time.Instant
|
||||
import java.time.LocalDateTime
|
||||
import java.time.OffsetDateTime
|
||||
import java.time.ZoneOffset
|
||||
import java.time.format.DateTimeFormatter
|
||||
import java.time.format.DateTimeParseException
|
||||
|
||||
/**
|
||||
* UTC boundary helpers for pcp-ballistics-service.
|
||||
*
|
||||
* Domain and database still use LocalDateTime, but every value is treated as an
|
||||
* absolute UTC instant without a stored zone (UTC-naive). Public API values may
|
||||
* be sent either as UTC/offset ISO strings or as legacy naive ISO strings;
|
||||
* offset values are normalized to UTC LocalDateTime.
|
||||
*/
|
||||
object UtcDateTimes {
|
||||
val UTC: ZoneOffset = ZoneOffset.UTC
|
||||
|
||||
fun now(clock: Clock = Clock.systemUTC()): LocalDateTime =
|
||||
LocalDateTime.ofInstant(clock.instant(), UTC)
|
||||
|
||||
fun parse(value: String): LocalDateTime {
|
||||
val normalized = normalize(value)
|
||||
|
||||
parseOffset(normalized)?.let { return it }
|
||||
parseInstant(normalized)?.let { return it }
|
||||
parseLocal(normalized)?.let { return it }
|
||||
|
||||
throw DateTimeParseException(
|
||||
"Expected ISO-8601 UTC/offset date-time or legacy UTC-naive date-time",
|
||||
value,
|
||||
0
|
||||
)
|
||||
}
|
||||
|
||||
fun format(value: LocalDateTime): String = value.toInstant(UTC).toString()
|
||||
|
||||
private fun normalize(value: String): String {
|
||||
val trimmed = value.trim().replace(Regex(" (\\d{2}:\\d{2})$"), "+\$1")
|
||||
return if (trimmed.length == 16) "$trimmed:00" else trimmed
|
||||
}
|
||||
|
||||
private fun parseOffset(value: String): LocalDateTime? = runCatching {
|
||||
OffsetDateTime.parse(value, DateTimeFormatter.ISO_DATE_TIME)
|
||||
.withOffsetSameInstant(UTC)
|
||||
.toLocalDateTime()
|
||||
}.getOrNull()
|
||||
|
||||
private fun parseInstant(value: String): LocalDateTime? = runCatching {
|
||||
LocalDateTime.ofInstant(Instant.parse(value), UTC)
|
||||
}.getOrNull()
|
||||
|
||||
private fun parseLocal(value: String): LocalDateTime? = runCatching {
|
||||
LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
|
||||
}.getOrNull()
|
||||
}
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
package space.nstart.pcp.pcp_request_service.utils
|
||||
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.Test
|
||||
import java.time.LocalDateTime
|
||||
|
||||
class UtcDateTimesTest {
|
||||
|
||||
@Test
|
||||
fun `parses utc instant with z suffix`() {
|
||||
assertEquals(
|
||||
LocalDateTime.of(2026, 6, 17, 6, 28, 27, 334_000_000),
|
||||
UtcDateTimes.parse("2026-06-17T06:28:27.334Z")
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `normalizes offset date time to utc naive local date time`() {
|
||||
assertEquals(
|
||||
LocalDateTime.of(2026, 6, 17, 6, 28, 27),
|
||||
UtcDateTimes.parse("2026-06-17T09:28:27+03:00")
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `keeps legacy naive date time as utc naive`() {
|
||||
assertEquals(
|
||||
LocalDateTime.of(2026, 6, 17, 6, 28, 0),
|
||||
UtcDateTimes.parse("2026-06-17T06:28")
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `formats utc naive date time with z suffix`() {
|
||||
assertEquals(
|
||||
"2026-06-17T06:28:27.334Z",
|
||||
UtcDateTimes.format(LocalDateTime.of(2026, 6, 17, 6, 28, 27, 334_000_000))
|
||||
)
|
||||
}
|
||||
}
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
package space.nstart.pcp.pcp_satellites_service.configuration
|
||||
|
||||
import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.core.convert.converter.Converter
|
||||
import org.springframework.format.FormatterRegistry
|
||||
import org.springframework.web.reactive.config.WebFluxConfigurer
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import tools.jackson.core.JsonGenerator
|
||||
import tools.jackson.core.JsonParser
|
||||
import tools.jackson.databind.DeserializationContext
|
||||
import tools.jackson.databind.SerializationContext
|
||||
import tools.jackson.databind.deser.std.StdDeserializer
|
||||
import tools.jackson.databind.module.SimpleModule
|
||||
import tools.jackson.databind.ser.std.StdSerializer
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Configuration
|
||||
class UtcTimeJsonConfiguration : WebFluxConfigurer {
|
||||
|
||||
@Bean
|
||||
fun complexMissionUtcLocalDateTimeCustomizer(): JsonMapperBuilderCustomizer = JsonMapperBuilderCustomizer { builder ->
|
||||
builder.addModule(
|
||||
SimpleModule("pcp-complex-mission-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, UtcLocalDateTimeDeserializer())
|
||||
)
|
||||
}
|
||||
|
||||
override fun addFormatters(registry: FormatterRegistry) {
|
||||
registry.addConverter(UtcLocalDateTimeQueryParamConverter())
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeQueryParamConverter : Converter<String, LocalDateTime> {
|
||||
override fun convert(source: String): LocalDateTime = UtcDateTimes.parse(source)
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeSerializer : StdSerializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, ctxt: SerializationContext) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeDeserializer : StdDeserializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
+4
-3
@@ -12,6 +12,7 @@ import jakarta.persistence.Id
|
||||
import jakarta.persistence.Index
|
||||
import jakarta.persistence.OneToMany
|
||||
import jakarta.persistence.Table
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Entity
|
||||
@@ -34,7 +35,7 @@ class ComplexPlanRunEntity(
|
||||
var status: ComplexPlanRunStatus = ComplexPlanRunStatus.CREATED,
|
||||
|
||||
@Column(name = "created_at", nullable = false)
|
||||
var createdAt: LocalDateTime = LocalDateTime.now(),
|
||||
var createdAt: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "started_at")
|
||||
var startedAt: LocalDateTime? = null,
|
||||
@@ -46,10 +47,10 @@ class ComplexPlanRunEntity(
|
||||
var durationMs: Long? = null,
|
||||
|
||||
@Column(name = "interval_start", nullable = false)
|
||||
var intervalStart: LocalDateTime = LocalDateTime.now(),
|
||||
var intervalStart: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "interval_end", nullable = false)
|
||||
var intervalEnd: LocalDateTime = LocalDateTime.now(),
|
||||
var intervalEnd: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "requested_by")
|
||||
var requestedBy: String? = null,
|
||||
|
||||
+3
-2
@@ -17,6 +17,7 @@ import jakarta.persistence.PreUpdate
|
||||
import jakarta.persistence.Table
|
||||
import jakarta.persistence.Index
|
||||
import space.nstart.pcp.pcp_types_lib.dto.satellite.mission.ModeDataRates
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Entity
|
||||
@@ -46,10 +47,10 @@ class SatelliteModeEntity(
|
||||
var type: SatelliteModeType = SatelliteModeType.SURVEY,
|
||||
|
||||
@Column(name = "start_time", nullable = false)
|
||||
var startTime: LocalDateTime = LocalDateTime.now(),
|
||||
var startTime: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "end_time", nullable = false)
|
||||
var endTime: LocalDateTime = LocalDateTime.now(),
|
||||
var endTime: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "revolution", nullable = false)
|
||||
var revolution: Long = 0,
|
||||
|
||||
+4
-3
@@ -12,6 +12,7 @@ import jakarta.persistence.JoinColumn
|
||||
import jakarta.persistence.ManyToOne
|
||||
import jakarta.persistence.OneToMany
|
||||
import jakarta.persistence.Table
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Entity
|
||||
@@ -34,13 +35,13 @@ class SatelliteModeSnapshotEntity(
|
||||
var satelliteId: Long = 0,
|
||||
|
||||
@Column(name = "interval_start", nullable = false)
|
||||
var intervalStart: LocalDateTime = LocalDateTime.now(),
|
||||
var intervalStart: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "interval_end", nullable = false)
|
||||
var intervalEnd: LocalDateTime = LocalDateTime.now(),
|
||||
var intervalEnd: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "created_at", nullable = false)
|
||||
var createdAt: LocalDateTime = LocalDateTime.now(),
|
||||
var createdAt: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "is_active", nullable = false)
|
||||
var isActive: Boolean = false,
|
||||
|
||||
+3
-2
@@ -2,12 +2,13 @@ package space.nstart.pcp.pcp_satellites_service.model.mode
|
||||
|
||||
import space.nstart.pcp.pcp_satellites_service.entity.SatelliteModeSource
|
||||
import space.nstart.pcp.pcp_types_lib.dto.satellite.modes.SurveyModeInfoDTO
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
|
||||
class SurveyMode(
|
||||
val revolution : Long = 1,
|
||||
val time : LocalDateTime = LocalDateTime.now(),
|
||||
val timeStop : LocalDateTime = LocalDateTime.now(),
|
||||
val time : LocalDateTime = UtcDateTimes.now(),
|
||||
val timeStop : LocalDateTime = UtcDateTimes.now(),
|
||||
val roll : Double = 0.0,
|
||||
val latitude : Double = 0.0,
|
||||
val longitude : Double = 0.0,
|
||||
|
||||
+7
-6
@@ -14,6 +14,7 @@ import space.nstart.pcp.pcp_types_lib.dto.requests.slots.BookingRequestDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.requests.slots.SlotDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.requests.slots.SurveySlotDTO
|
||||
import tools.jackson.databind.ObjectMapper
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Service
|
||||
@@ -34,8 +35,8 @@ class SlotService(webClientBuilderProvider: ObjectProvider<WebClient.Builder>) {
|
||||
UriComponentsBuilder
|
||||
.fromUriString("/api/slots/poly-cover")
|
||||
.queryParam("wkt", wkt)
|
||||
.queryParam("timeStart", tn)
|
||||
.queryParam("timeStop", tk)
|
||||
.queryParam("timeStart", UtcDateTimes.format(tn))
|
||||
.queryParam("timeStop", UtcDateTimes.format(tk))
|
||||
.queryParam("cov", cov)
|
||||
.apply {
|
||||
sats.forEach { queryParam("satellites", it) }
|
||||
@@ -49,8 +50,8 @@ class SlotService(webClientBuilderProvider: ObjectProvider<WebClient.Builder>) {
|
||||
.uri(
|
||||
"/api/slots/poly-cover?wkt={wkt}&timeStart={timeStart}&timeStop={timeStop}&revSign={revSign}&cov={cov}",
|
||||
wkt,
|
||||
tn,
|
||||
tk,
|
||||
UtcDateTimes.format(tn),
|
||||
UtcDateTimes.format(tk),
|
||||
sign,
|
||||
cov
|
||||
)
|
||||
@@ -71,8 +72,8 @@ class SlotService(webClientBuilderProvider: ObjectProvider<WebClient.Builder>) {
|
||||
.uri(
|
||||
"/api/slots/mission/satellite?satellite_id={satelliteId}&timeStart={timeStart}&timeStop={timeStop}",
|
||||
id,
|
||||
tn,
|
||||
tk
|
||||
UtcDateTimes.format(tn),
|
||||
UtcDateTimes.format(tk)
|
||||
)
|
||||
.retrieve()
|
||||
.onStatus({ status -> status.isError }) { response ->
|
||||
|
||||
+3
-2
@@ -16,6 +16,7 @@ import space.nstart.pcp.pcp_types_lib.dto.ballistics.ObjViewRequestDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.OrbPointDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.PointViewParamDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.SquareViewParamDTO
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.Duration
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@@ -82,8 +83,8 @@ class BallisticsClient(
|
||||
.uri { uriBuilder ->
|
||||
uriBuilder
|
||||
.path("/api/satellites/{satelliteId}/flight-line")
|
||||
.queryParam("time_start", timeStart)
|
||||
.queryParam("time_stop", timeStop)
|
||||
.queryParam("time_start", UtcDateTimes.format(timeStart))
|
||||
.queryParam("time_stop", UtcDateTimes.format(timeStop))
|
||||
.build(satelliteId)
|
||||
}
|
||||
.retrieve()
|
||||
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
package space.nstart.pcp.pcp_coverage_scheme_service.configuration
|
||||
|
||||
import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.core.convert.converter.Converter
|
||||
import org.springframework.format.FormatterRegistry
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import tools.jackson.core.JsonGenerator
|
||||
import tools.jackson.core.JsonParser
|
||||
import tools.jackson.databind.DeserializationContext
|
||||
import tools.jackson.databind.SerializationContext
|
||||
import tools.jackson.databind.deser.std.StdDeserializer
|
||||
import tools.jackson.databind.module.SimpleModule
|
||||
import tools.jackson.databind.ser.std.StdSerializer
|
||||
import java.time.Clock
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Configuration
|
||||
class UtcTimeConfiguration : WebMvcConfigurer {
|
||||
|
||||
@Bean
|
||||
fun clock(): Clock = Clock.systemUTC()
|
||||
|
||||
@Bean
|
||||
fun coverageSchemeUtcLocalDateTimeCustomizer(): JsonMapperBuilderCustomizer = JsonMapperBuilderCustomizer { builder ->
|
||||
builder.addModule(
|
||||
SimpleModule("pcp-coverage-scheme-service-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, UtcLocalDateTimeDeserializer())
|
||||
)
|
||||
}
|
||||
|
||||
override fun addFormatters(registry: FormatterRegistry) {
|
||||
registry.addConverter(UtcLocalDateTimeQueryParamConverter())
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeQueryParamConverter : Converter<String, LocalDateTime> {
|
||||
override fun convert(source: String): LocalDateTime = UtcDateTimes.parse(source)
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeSerializer : StdSerializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, ctxt: SerializationContext) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeDeserializer : StdDeserializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
+28
@@ -1,11 +1,21 @@
|
||||
package space.nstart.pcp.complan
|
||||
|
||||
import com.fasterxml.jackson.core.JsonGenerator
|
||||
import com.fasterxml.jackson.core.JsonParser
|
||||
import com.fasterxml.jackson.databind.DeserializationContext
|
||||
import com.fasterxml.jackson.databind.JsonDeserializer
|
||||
import com.fasterxml.jackson.databind.JsonSerializer
|
||||
import com.fasterxml.jackson.databind.ObjectMapper
|
||||
import com.fasterxml.jackson.databind.SerializationFeature
|
||||
import com.fasterxml.jackson.databind.SerializerProvider
|
||||
import com.fasterxml.jackson.databind.module.SimpleModule
|
||||
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
|
||||
import com.fasterxml.jackson.module.kotlin.registerKotlinModule
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Configuration
|
||||
class JacksonConfig {
|
||||
|
||||
@@ -13,8 +23,26 @@ class JacksonConfig {
|
||||
fun objectMapper(): ObjectMapper {
|
||||
val mapper = ObjectMapper()
|
||||
mapper.registerModule(JavaTimeModule())
|
||||
.registerModule(utcLocalDateTimeModule())
|
||||
.registerKotlinModule()
|
||||
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
|
||||
return mapper
|
||||
}
|
||||
}
|
||||
|
||||
private fun utcLocalDateTimeModule(): SimpleModule = SimpleModule("pcp-dynamic-plan-service-jackson2-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, Jackson2UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, Jackson2UtcLocalDateTimeDeserializer())
|
||||
|
||||
private class Jackson2UtcLocalDateTimeSerializer : JsonSerializer<LocalDateTime>() {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, serializers: SerializerProvider) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class Jackson2UtcLocalDateTimeDeserializer : JsonDeserializer<LocalDateTime>() {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
|
||||
+2
-1
@@ -58,6 +58,7 @@ import kotlin.math.abs
|
||||
import kotlin.math.max
|
||||
import kotlin.math.roundToLong
|
||||
import kotlin.math.sin
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
private const val INTERVAL_COVERAGE_AREA_TOLERANCE = 1.0e-9
|
||||
private const val INTERVAL_ROUTE_WIDTH_RATIO = 0.9
|
||||
@@ -841,7 +842,7 @@ class BasicPlanCalculator(
|
||||
val resultFilePath = if (request.saveResultToFile && status == ComplexPlanCalculationStatus.COMPLETED) {
|
||||
observationParametersDebugFileWriter.write(
|
||||
ObservationParametersDebugFileDTO(
|
||||
createdAt = LocalDateTime.now(),
|
||||
createdAt = UtcDateTimes.now(),
|
||||
requestId = request.requestId,
|
||||
satelliteIds = selectedSatelliteIds,
|
||||
missingSatelliteIds = missingSatelliteIds,
|
||||
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
package space.nstart.pcp.complan.config
|
||||
|
||||
import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.core.convert.converter.Converter
|
||||
import org.springframework.format.FormatterRegistry
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import tools.jackson.core.JsonGenerator
|
||||
import tools.jackson.core.JsonParser
|
||||
import tools.jackson.databind.DeserializationContext
|
||||
import tools.jackson.databind.SerializationContext
|
||||
import tools.jackson.databind.deser.std.StdDeserializer
|
||||
import tools.jackson.databind.module.SimpleModule
|
||||
import tools.jackson.databind.ser.std.StdSerializer
|
||||
import java.time.Clock
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Configuration
|
||||
class UtcTimeConfiguration : WebMvcConfigurer {
|
||||
|
||||
@Bean
|
||||
fun clock(): Clock = Clock.systemUTC()
|
||||
|
||||
@Bean
|
||||
fun dynamicPlanUtcLocalDateTimeCustomizer(): JsonMapperBuilderCustomizer = JsonMapperBuilderCustomizer { builder ->
|
||||
builder.addModule(
|
||||
SimpleModule("pcp-dynamic-plan-service-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, UtcLocalDateTimeDeserializer())
|
||||
)
|
||||
}
|
||||
|
||||
override fun addFormatters(registry: FormatterRegistry) {
|
||||
registry.addConverter(UtcLocalDateTimeQueryParamConverter())
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeQueryParamConverter : Converter<String, LocalDateTime> {
|
||||
override fun convert(source: String): LocalDateTime = UtcDateTimes.parse(source)
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeSerializer : StdSerializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, ctxt: SerializationContext) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeDeserializer : StdDeserializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -11,6 +11,7 @@ import jakarta.persistence.ManyToOne
|
||||
import jakarta.persistence.Table
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
@Table(name = "dynamic_plan_route")
|
||||
@Entity
|
||||
@@ -31,10 +32,10 @@ class DynamicPlanRouteEntity(
|
||||
var satelliteId: Long = 0,
|
||||
|
||||
@Column(name = "start_time", nullable = false)
|
||||
var startTime: LocalDateTime = LocalDateTime.now(),
|
||||
var startTime: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "end_time", nullable = false)
|
||||
var endTime: LocalDateTime = LocalDateTime.now(),
|
||||
var endTime: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "duration", nullable = false)
|
||||
var duration: Double = 0.0,
|
||||
|
||||
+2
-1
@@ -11,6 +11,7 @@ import space.nstart.pcp.complan.types.DynamicPlanRevolutionMode
|
||||
import space.nstart.pcp.complan.types.DynamicPlanRunStatus
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
@Table(name = "dynamic_plan_run")
|
||||
@Entity
|
||||
@@ -47,7 +48,7 @@ class DynamicPlanRunEntity(
|
||||
var filterCoveredRoutes: Boolean = false,
|
||||
|
||||
@Column(name = "created_at", nullable = false)
|
||||
var createdAt: LocalDateTime = LocalDateTime.now(),
|
||||
var createdAt: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "started_at")
|
||||
var startedAt: LocalDateTime? = null,
|
||||
|
||||
+17
-11
@@ -10,10 +10,10 @@ import space.nstart.pcp.complan.types.ObjViewRequestDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.ExactTimePositionRequestDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.FlightLineDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.ObjDTO as BallisticsObjDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.ObjViewRequestDTO as BallisticsObjViewRequestDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.OrbPointDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.SatelliteOrbitAvailabilityDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.SquareViewParamDTO
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
|
||||
/**Получение данных от сервиса баллистики*/
|
||||
@@ -39,7 +39,7 @@ class BallTaskServce {
|
||||
UriComponentsBuilder
|
||||
.fromUriString(ballisticsServiceUrl)
|
||||
.path("/api/satellites/orbit/availability")
|
||||
.apply { time?.let { queryParam("time", it) } }
|
||||
.apply { time?.let { queryParam("time", UtcDateTimes.format(it)) } }
|
||||
.toUriString()
|
||||
)
|
||||
.retrieve()
|
||||
@@ -53,8 +53,8 @@ class BallTaskServce {
|
||||
UriComponentsBuilder
|
||||
.fromUriString(ballisticsServiceUrl)
|
||||
.path("/api/satellites/$noradId/flight-line")
|
||||
.queryParam("time_start", timeStart)
|
||||
.queryParam("time_stop", timeStop)
|
||||
.queryParam("time_start", UtcDateTimes.format(timeStart))
|
||||
.queryParam("time_stop", UtcDateTimes.format(timeStop))
|
||||
.toUriString()
|
||||
)
|
||||
.retrieve()
|
||||
@@ -65,7 +65,13 @@ class BallTaskServce {
|
||||
RestClient.create()
|
||||
.post()
|
||||
.uri(buildBallisticsUri("/api/satellites/$noradId/extract-time"))
|
||||
.body(request)
|
||||
.body(
|
||||
mapOf(
|
||||
"time" to UtcDateTimes.format(request.time),
|
||||
"timeStop" to request.timeStop?.let { UtcDateTimes.format(it) },
|
||||
"stepMs" to request.stepMs
|
||||
)
|
||||
)
|
||||
.retrieve()
|
||||
.body(ORB_POINT_LIST_TYPE)
|
||||
.orEmpty()
|
||||
@@ -80,16 +86,16 @@ class BallTaskServce {
|
||||
.post()
|
||||
.uri(buildBallisticsUri("/api/obj-view/mpl-square"))
|
||||
.body(
|
||||
BallisticsObjViewRequestDTO(
|
||||
satellites = satellites,
|
||||
timeStart = timeStart,
|
||||
timeStop = timeStop,
|
||||
obj = BallisticsObjDTO(
|
||||
mapOf(
|
||||
"satellites" to satellites,
|
||||
"timeStart" to UtcDateTimes.format(timeStart),
|
||||
"timeStop" to UtcDateTimes.format(timeStop),
|
||||
"obj" to BallisticsObjDTO(
|
||||
id = obj.id.toString(),
|
||||
position = obj.position,
|
||||
contourWKT = obj.contourWKT
|
||||
),
|
||||
sunAngleMin = objects.sunAngleMin
|
||||
"sunAngleMin" to objects.sunAngleMin
|
||||
)
|
||||
)
|
||||
.retrieve()
|
||||
|
||||
+6
-5
@@ -28,6 +28,7 @@ import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import java.util.concurrent.ExecutorService
|
||||
import kotlin.math.roundToLong
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
@Service
|
||||
class DynamicPlanRunService(
|
||||
@@ -59,7 +60,7 @@ class DynamicPlanRunService(
|
||||
calculationMode = request.calculationMode,
|
||||
revolutionMode = request.revolutionMode,
|
||||
filterCoveredRoutes = request.filterCoveredRoutes,
|
||||
createdAt = LocalDateTime.now()
|
||||
createdAt = UtcDateTimes.now()
|
||||
)
|
||||
)
|
||||
} ?: throw ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Failed to create calculation run")
|
||||
@@ -135,7 +136,7 @@ class DynamicPlanRunService(
|
||||
return@execute 0
|
||||
}
|
||||
|
||||
val finishedAt = LocalDateTime.now()
|
||||
val finishedAt = UtcDateTimes.now()
|
||||
runs.forEach { run ->
|
||||
run.status = DynamicPlanRunStatus.FAILED
|
||||
run.finishedAt = finishedAt
|
||||
@@ -171,7 +172,7 @@ class DynamicPlanRunService(
|
||||
transactionTemplate.execute {
|
||||
val run = runRepository.findById(runId).orElse(null) ?: return@execute null
|
||||
run.status = DynamicPlanRunStatus.RUNNING
|
||||
run.startedAt = LocalDateTime.now()
|
||||
run.startedAt = UtcDateTimes.now()
|
||||
run.errorMessage = null
|
||||
runRepository.save(run)
|
||||
run.toRequest()
|
||||
@@ -182,7 +183,7 @@ class DynamicPlanRunService(
|
||||
val run = runRepository.findById(runId).orElseThrow()
|
||||
val result = output.result
|
||||
run.status = DynamicPlanRunStatus.COMPLETED
|
||||
run.finishedAt = LocalDateTime.now()
|
||||
run.finishedAt = UtcDateTimes.now()
|
||||
run.durationMs = result.durationMs
|
||||
run.resultStatus = result.status.name
|
||||
run.routesCount = result.routesCount
|
||||
@@ -200,7 +201,7 @@ class DynamicPlanRunService(
|
||||
transactionTemplate.execute {
|
||||
val run = runRepository.findById(runId).orElseThrow()
|
||||
run.status = DynamicPlanRunStatus.FAILED
|
||||
run.finishedAt = LocalDateTime.now()
|
||||
run.finishedAt = UtcDateTimes.now()
|
||||
run.errorMessage = error.message ?: error::class.java.simpleName
|
||||
runRepository.save(run)
|
||||
}
|
||||
|
||||
+3
-2
@@ -6,6 +6,7 @@ import org.locationtech.jts.geom.LineString
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.FlightLineDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.RevolutionSign
|
||||
import java.time.LocalDateTime
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Класс космического аппарата**
|
||||
@@ -17,9 +18,9 @@ class SpaceCraft (
|
||||
val flightLine : MutableList<FlightLineDTO> = mutableListOf()
|
||||
|
||||
/**Время начала планирования аппарата*/
|
||||
var timeStart: LocalDateTime = LocalDateTime.now()
|
||||
var timeStart: LocalDateTime = UtcDateTimes.now()
|
||||
/**Время конца планирования аппарата*/
|
||||
var timeStop : LocalDateTime = LocalDateTime.now()
|
||||
var timeStop : LocalDateTime = UtcDateTimes.now()
|
||||
/**
|
||||
* Создание линий полета восходящего и нисходящего витка
|
||||
* @param geomFactory фабрика геометрии
|
||||
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
package space.nstart.pcp.pcp_mission_planing_service.configuration
|
||||
|
||||
import com.fasterxml.jackson.core.JsonGenerator
|
||||
import com.fasterxml.jackson.core.JsonParser
|
||||
import com.fasterxml.jackson.databind.DeserializationContext
|
||||
import com.fasterxml.jackson.databind.JsonDeserializer
|
||||
import com.fasterxml.jackson.databind.JsonSerializer
|
||||
import com.fasterxml.jackson.databind.ObjectMapper
|
||||
import com.fasterxml.jackson.databind.SerializerProvider
|
||||
import com.fasterxml.jackson.databind.module.SimpleModule
|
||||
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Configuration
|
||||
class Jackson2UtcConfiguration {
|
||||
|
||||
@Bean
|
||||
fun jackson2ObjectMapper(): ObjectMapper = jacksonObjectMapper()
|
||||
.findAndRegisterModules()
|
||||
.registerModule(utcLocalDateTimeModule())
|
||||
}
|
||||
|
||||
private fun utcLocalDateTimeModule(): SimpleModule = SimpleModule("pcp-mission-planing-service-jackson2-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, Jackson2UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, Jackson2UtcLocalDateTimeDeserializer())
|
||||
|
||||
private class Jackson2UtcLocalDateTimeSerializer : JsonSerializer<LocalDateTime>() {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, serializers: SerializerProvider) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class Jackson2UtcLocalDateTimeDeserializer : JsonDeserializer<LocalDateTime>() {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
package space.nstart.pcp.pcp_mission_planing_service.configuration
|
||||
|
||||
import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.core.convert.converter.Converter
|
||||
import org.springframework.format.FormatterRegistry
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import tools.jackson.core.JsonGenerator
|
||||
import tools.jackson.core.JsonParser
|
||||
import tools.jackson.databind.DeserializationContext
|
||||
import tools.jackson.databind.SerializationContext
|
||||
import tools.jackson.databind.deser.std.StdDeserializer
|
||||
import tools.jackson.databind.module.SimpleModule
|
||||
import tools.jackson.databind.ser.std.StdSerializer
|
||||
import java.time.Clock
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Configuration
|
||||
class UtcTimeConfiguration : WebMvcConfigurer {
|
||||
|
||||
@Bean
|
||||
fun clock(): Clock = Clock.systemUTC()
|
||||
|
||||
@Bean
|
||||
fun missionPlaningUtcLocalDateTimeCustomizer(): JsonMapperBuilderCustomizer = JsonMapperBuilderCustomizer { builder ->
|
||||
builder.addModule(
|
||||
SimpleModule("pcp-mission-planing-service-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, UtcLocalDateTimeDeserializer())
|
||||
)
|
||||
}
|
||||
|
||||
override fun addFormatters(registry: FormatterRegistry) {
|
||||
registry.addConverter(UtcLocalDateTimeQueryParamConverter())
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeQueryParamConverter : Converter<String, LocalDateTime> {
|
||||
override fun convert(source: String): LocalDateTime = UtcDateTimes.parse(source)
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeSerializer : StdSerializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, ctxt: SerializationContext) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeDeserializer : StdDeserializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -13,6 +13,7 @@ import space.nstart.pcp.pcp_types_lib.dto.ballistics.PointViewParamDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.RadioVisibilityAreaDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.SquareViewParamDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.SquareViewParamsWithPointsDTO
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
|
||||
|
||||
@@ -55,8 +56,8 @@ class BallisticsService(webClientBuilderProvider: ObjectProvider<WebClient.Build
|
||||
.get()
|
||||
.uri("/api/satellites/{id}/rva?time_start={time_start}&time_stop={time_stop}",
|
||||
id,
|
||||
tn,
|
||||
tk)
|
||||
UtcDateTimes.format(tn),
|
||||
UtcDateTimes.format(tk))
|
||||
.retrieve()
|
||||
.bodyToFlux<RadioVisibilityAreaDTO>()
|
||||
.toIterable()
|
||||
|
||||
+5
-3
@@ -13,8 +13,9 @@ import space.nstart.pcp.pcp_types_lib.dto.requests.slots.BookedSlotStatus
|
||||
import space.nstart.pcp.pcp_types_lib.dto.requests.slots.BookedSlotsStatusChangedEvent
|
||||
import space.nstart.pcp.pcp_types_lib.message.KafkaMessage
|
||||
import space.nstart.pcp.pcp_types_lib.message.PcpKafkaEvent
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.nio.charset.StandardCharsets
|
||||
import java.time.LocalDateTime
|
||||
import java.time.Clock
|
||||
import java.util.UUID
|
||||
|
||||
@Component
|
||||
@@ -26,7 +27,8 @@ class BookedSlotsEventPublisher(
|
||||
kafkaTemplateProvider: ObjectProvider<KafkaTemplate<String, Any>>,
|
||||
objectMapperProvider: ObjectProvider<ObjectMapper>,
|
||||
@Value("\${app.kafka.topics.booked-slots:pcp.booked-slots}") private val topic: String,
|
||||
@Value("\${spring.application.name:pcp-mission-planing-service}") private val applicationName: String
|
||||
@Value("\${spring.application.name:pcp-mission-planing-service}") private val applicationName: String,
|
||||
private val clock: Clock = Clock.systemUTC()
|
||||
) {
|
||||
|
||||
private val logger = LoggerFactory.getLogger(this::class.java)
|
||||
@@ -59,7 +61,7 @@ class BookedSlotsEventPublisher(
|
||||
val event = BookedSlotsStatusChangedEvent(
|
||||
bookedSlotIds = normalizedIds,
|
||||
status = status,
|
||||
occurredAt = LocalDateTime.now(),
|
||||
occurredAt = UtcDateTimes.now(clock),
|
||||
sourceService = applicationName,
|
||||
missionId = missionId,
|
||||
modeId = modeId,
|
||||
|
||||
+3
-2
@@ -10,6 +10,7 @@ import reactor.core.publisher.Mono
|
||||
import space.nstart.pcp.pcp_types_lib.configuration.CustomErrorException
|
||||
import space.nstart.pcp.pcp_types_lib.dto.satellite.mission.SatelliteModeResponseDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.satellite.mission.SatelliteModeSnapshotResponseDTO
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import tools.jackson.databind.ObjectMapper
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@@ -70,8 +71,8 @@ class ComplexMissionService(webClientBuilderProvider: ObjectProvider<WebClient.B
|
||||
.uri(
|
||||
"/api/satellites/snapshots/{snapshotId}/modes?intervalStart={intervalStart}&intervalEnd={intervalEnd}",
|
||||
snapshotId,
|
||||
intervalStart,
|
||||
intervalEnd
|
||||
UtcDateTimes.format(intervalStart),
|
||||
UtcDateTimes.format(intervalEnd)
|
||||
)
|
||||
.retrieve()
|
||||
.onStatus({ status -> status.isError }) { response ->
|
||||
|
||||
+6
-3
@@ -60,6 +60,8 @@ import space.nstart.pcp.pcp_types_lib.dto.ballistics.ObjViewRequestDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.PositionDTO
|
||||
import space.nstart.pcp.pcp_types_lib.dto.requests.slots.BookedSlotStatus
|
||||
import space.nstart.pcp.pcp_types_lib.dto.satellite.mission.SatelliteModeResponseDTO
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.Clock
|
||||
import java.time.Duration
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
@@ -81,6 +83,7 @@ class MissionPlaningService(
|
||||
private val complexMissionService: ComplexMissionService,
|
||||
private val satelliteCatalogClient: SatelliteCatalogClient,
|
||||
private val satelliteMissionTypeFactory: SatelliteMissionTypeFactory,
|
||||
private val clock: Clock = Clock.systemUTC(),
|
||||
private val logger: Logger = LoggerFactory.getLogger(MissionPlaningService::class.java)
|
||||
) {
|
||||
|
||||
@@ -432,7 +435,7 @@ class MissionPlaningService(
|
||||
overrideIntervalEnd: LocalDateTime? = null,
|
||||
comPlanSnapshotId: Long? = null
|
||||
): MissionSurveyCalculationResponseDTO {
|
||||
val startedAt = LocalDateTime.now()
|
||||
val startedAt = UtcDateTimes.now(clock)
|
||||
logger.info(
|
||||
"Расчет плана съемки stage 5 по persisted snapshot этапа 4 для миссии {}: requestedComPlanSnapshotId={}",
|
||||
missionId,
|
||||
@@ -520,7 +523,7 @@ class MissionPlaningService(
|
||||
)
|
||||
|
||||
if (survs.isEmpty()) {
|
||||
val finishedAt = LocalDateTime.now()
|
||||
val finishedAt = UtcDateTimes.now(clock)
|
||||
return MissionSurveyCalculationResponseDTO(
|
||||
missionId = missionId,
|
||||
completed = true,
|
||||
@@ -565,7 +568,7 @@ class MissionPlaningService(
|
||||
modeBookings.size
|
||||
)
|
||||
|
||||
val finishedAt = LocalDateTime.now()
|
||||
val finishedAt = UtcDateTimes.now(clock)
|
||||
return MissionSurveyCalculationResponseDTO(
|
||||
missionId = missionId,
|
||||
completed = true,
|
||||
|
||||
+27
@@ -1,10 +1,19 @@
|
||||
package org.nstart.dep265.requestservice.config
|
||||
|
||||
import com.fasterxml.jackson.core.JsonGenerator
|
||||
import com.fasterxml.jackson.core.JsonParser
|
||||
import com.fasterxml.jackson.databind.DeserializationContext
|
||||
import com.fasterxml.jackson.databind.JsonDeserializer
|
||||
import com.fasterxml.jackson.databind.JsonSerializer
|
||||
import com.fasterxml.jackson.databind.ObjectMapper
|
||||
import com.fasterxml.jackson.databind.SerializerProvider
|
||||
import com.fasterxml.jackson.databind.module.SimpleModule
|
||||
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
|
||||
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Configuration
|
||||
class JacksonConfig {
|
||||
@@ -18,5 +27,23 @@ class JacksonConfig {
|
||||
return jacksonObjectMapper()
|
||||
.registerModule(JavaTimeModule())
|
||||
.findAndRegisterModules()
|
||||
.registerModule(utcLocalDateTimeModule())
|
||||
}
|
||||
|
||||
private fun utcLocalDateTimeModule(): SimpleModule = SimpleModule("pcp-request-service-jackson2-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, Jackson2UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, Jackson2UtcLocalDateTimeDeserializer())
|
||||
}
|
||||
|
||||
private class Jackson2UtcLocalDateTimeSerializer : JsonSerializer<LocalDateTime>() {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, serializers: SerializerProvider) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class Jackson2UtcLocalDateTimeDeserializer : JsonDeserializer<LocalDateTime>() {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
package org.nstart.dep265.requestservice.config
|
||||
|
||||
import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.core.convert.converter.Converter
|
||||
import org.springframework.format.FormatterRegistry
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import tools.jackson.core.JsonGenerator
|
||||
import tools.jackson.core.JsonParser
|
||||
import tools.jackson.databind.DeserializationContext
|
||||
import tools.jackson.databind.SerializationContext
|
||||
import tools.jackson.databind.deser.std.StdDeserializer
|
||||
import tools.jackson.databind.module.SimpleModule
|
||||
import tools.jackson.databind.ser.std.StdSerializer
|
||||
import java.time.Clock
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Configuration
|
||||
class UtcTimeConfiguration : WebMvcConfigurer {
|
||||
|
||||
@Bean
|
||||
fun clock(): Clock = Clock.systemUTC()
|
||||
|
||||
@Bean
|
||||
fun requestServiceUtcLocalDateTimeCustomizer(): JsonMapperBuilderCustomizer = JsonMapperBuilderCustomizer { builder ->
|
||||
builder.addModule(
|
||||
SimpleModule("pcp-request-service-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, UtcLocalDateTimeDeserializer())
|
||||
)
|
||||
}
|
||||
|
||||
override fun addFormatters(registry: FormatterRegistry) {
|
||||
registry.addConverter(UtcLocalDateTimeQueryParamConverter())
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeQueryParamConverter : Converter<String, LocalDateTime> {
|
||||
override fun convert(source: String): LocalDateTime = UtcDateTimes.parse(source)
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeSerializer : StdSerializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, ctxt: SerializationContext) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeDeserializer : StdDeserializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
+8
-9
@@ -12,7 +12,6 @@ import org.nstart.dep265.requestservice.dto.RequestStatusDto
|
||||
import org.nstart.dep265.requestservice.dto.RequestWithCellsResponseDto
|
||||
import org.nstart.dep265.requestservice.dto.SurveyTypeDto
|
||||
import org.nstart.dep265.requestservice.service.RequestService
|
||||
import org.springframework.format.annotation.DateTimeFormat
|
||||
import org.springframework.http.ResponseEntity
|
||||
import org.springframework.web.bind.annotation.DeleteMapping
|
||||
import org.springframework.web.bind.annotation.GetMapping
|
||||
@@ -41,10 +40,10 @@ class RequestController(
|
||||
@RequestParam(required = false) surveyType: SurveyTypeDto?,
|
||||
@RequestParam(required = false) kpp: Int?,
|
||||
@RequestParam(required = false) highPriorityTransmit: Boolean?,
|
||||
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) beginFrom: LocalDateTime?,
|
||||
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) beginTo: LocalDateTime?,
|
||||
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) endFrom: LocalDateTime?,
|
||||
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) endTo: LocalDateTime?,
|
||||
@RequestParam(required = false) beginFrom: LocalDateTime?,
|
||||
@RequestParam(required = false) beginTo: LocalDateTime?,
|
||||
@RequestParam(required = false) endFrom: LocalDateTime?,
|
||||
@RequestParam(required = false) endTo: LocalDateTime?,
|
||||
@RequestParam(defaultValue = "false") includeDeleted: Boolean,
|
||||
@RequestParam(defaultValue = "0") page: Int,
|
||||
@RequestParam(defaultValue = "50") size: Int,
|
||||
@@ -73,10 +72,10 @@ class RequestController(
|
||||
@RequestParam(required = false) surveyType: SurveyTypeDto?,
|
||||
@RequestParam(required = false) kpp: Int?,
|
||||
@RequestParam(required = false) highPriorityTransmit: Boolean?,
|
||||
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) beginFrom: LocalDateTime?,
|
||||
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) beginTo: LocalDateTime?,
|
||||
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) endFrom: LocalDateTime?,
|
||||
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) endTo: LocalDateTime?,
|
||||
@RequestParam(required = false) beginFrom: LocalDateTime?,
|
||||
@RequestParam(required = false) beginTo: LocalDateTime?,
|
||||
@RequestParam(required = false) endFrom: LocalDateTime?,
|
||||
@RequestParam(required = false) endTo: LocalDateTime?,
|
||||
@RequestParam(defaultValue = "false") includeDeleted: Boolean,
|
||||
@RequestParam(defaultValue = "0") page: Int,
|
||||
@RequestParam(defaultValue = "50") size: Int,
|
||||
|
||||
+4
-1
@@ -7,6 +7,8 @@ import org.nstart.dep265.requestservice.repository.RequestCellRepository
|
||||
import org.nstart.dep265.requestservice.repository.RequestRepository
|
||||
import org.springframework.stereotype.Service
|
||||
import org.springframework.transaction.annotation.Transactional
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.Clock
|
||||
import java.time.LocalDateTime
|
||||
|
||||
class GridRebuildAlreadyRunningException : RuntimeException("Grid rebuild is already running")
|
||||
@@ -20,6 +22,7 @@ class GridRebuildService(
|
||||
private val requestGridProjectionService: RequestGridProjectionService,
|
||||
private val earthCellRepository: EarthCellRepository,
|
||||
private val gridRebuildLockService: GridRebuildLockService,
|
||||
private val clock: Clock = Clock.systemUTC(),
|
||||
) {
|
||||
@Transactional
|
||||
fun rebuildGrid(): GridRebuildResponseDto {
|
||||
@@ -40,7 +43,7 @@ class GridRebuildService(
|
||||
return GridRebuildResponseDto(
|
||||
cellsCount = earthCellRepository.count(),
|
||||
rebuiltRequestProjectionsCount = activeRequests.size.toLong(),
|
||||
rebuiltAt = LocalDateTime.now(),
|
||||
rebuiltAt = UtcDateTimes.now(clock),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+4
-1
@@ -11,6 +11,8 @@ import org.springframework.scheduling.annotation.Scheduled
|
||||
import org.springframework.stereotype.Service
|
||||
import org.springframework.transaction.support.TransactionCallback
|
||||
import org.springframework.transaction.support.TransactionOperations
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.Clock
|
||||
import java.time.Duration
|
||||
import java.time.LocalDateTime
|
||||
import java.util.concurrent.ExecutionException
|
||||
@@ -25,6 +27,7 @@ class OutboxPublisherService(
|
||||
|
||||
@param:Qualifier("outboxTransactionOperations")
|
||||
private val transactionOperations: TransactionOperations,
|
||||
private val clock: Clock = Clock.systemUTC(),
|
||||
) {
|
||||
private val log = LoggerFactory.getLogger(this::class.java)
|
||||
|
||||
@@ -42,7 +45,7 @@ class OutboxPublisherService(
|
||||
return try {
|
||||
transactionOperations.execute(
|
||||
TransactionCallback {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now(clock)
|
||||
val events = outboxEventRepository.findPublishableForUpdateSkipLocked(
|
||||
eventType = RequestStatusOutboxService.REQUEST_STATUS_EVENT_TYPE,
|
||||
now = now,
|
||||
|
||||
+4
-1
@@ -9,6 +9,8 @@ import org.springframework.scheduling.annotation.Scheduled
|
||||
import org.springframework.stereotype.Service
|
||||
import org.springframework.transaction.support.TransactionCallback
|
||||
import org.springframework.transaction.support.TransactionOperations
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.Clock
|
||||
import java.time.LocalDateTime
|
||||
|
||||
/**
|
||||
@@ -33,6 +35,7 @@ class RequestExpiryService(
|
||||
|
||||
@param:Qualifier("requestExpiryTransactionOperations")
|
||||
private val transactionOperations: TransactionOperations,
|
||||
private val clock: Clock = Clock.systemUTC(),
|
||||
) {
|
||||
private val log = LoggerFactory.getLogger(this::class.java)
|
||||
|
||||
@@ -55,7 +58,7 @@ class RequestExpiryService(
|
||||
return 0
|
||||
}
|
||||
val maxBatches = requestExpiryProperties.maxBatchesPerRun.coerceAtLeast(1)
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now(clock)
|
||||
|
||||
var expiredTotal = 0
|
||||
var batchIndex = 0
|
||||
|
||||
+5
-2
@@ -38,6 +38,8 @@ import org.springframework.data.domain.PageRequest
|
||||
import org.springframework.data.domain.Sort
|
||||
import org.springframework.stereotype.Service
|
||||
import org.springframework.transaction.annotation.Transactional
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.Clock
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
|
||||
@@ -53,6 +55,7 @@ class RequestService(
|
||||
private val requestGridProjectionService: RequestGridProjectionService,
|
||||
private val requestLifecycleService: RequestLifecycleService,
|
||||
private val entityManager: EntityManager,
|
||||
private val clock: Clock = Clock.systemUTC(),
|
||||
) {
|
||||
@Transactional
|
||||
fun createRequest(request: CreateRequestDto): CreateRequestResponseDto {
|
||||
@@ -65,7 +68,7 @@ class RequestService(
|
||||
"beginDateTime должен быть раньше endDateTime"
|
||||
}
|
||||
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now(clock)
|
||||
val normalizedGeometry = geometryService.parsePolygonalGeometry(request.geometry)
|
||||
val normalizedGeometryWkt = geometryService.toWkt(normalizedGeometry)
|
||||
val geometryArea = geometryService.area(normalizedGeometry)
|
||||
@@ -159,7 +162,7 @@ class RequestService(
|
||||
@Transactional
|
||||
fun deleteRequest(id: UUID): DeleteRequestResponseDto? {
|
||||
val request = requestRepository.findById(id).orElse(null) ?: return null
|
||||
val deletedAt = request.deletedAt ?: LocalDateTime.now()
|
||||
val deletedAt = request.deletedAt ?: UtcDateTimes.now(clock)
|
||||
request.status = RequestStatus.DELETED
|
||||
request.deletedAt = deletedAt
|
||||
request.updatedAt = deletedAt
|
||||
|
||||
+4
-1
@@ -14,6 +14,8 @@ import org.springframework.dao.DuplicateKeyException
|
||||
import org.springframework.stereotype.Service
|
||||
import org.springframework.transaction.support.TransactionCallback
|
||||
import org.springframework.transaction.support.TransactionOperations
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.Clock
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import kotlin.math.max
|
||||
@@ -35,6 +37,7 @@ class RouteMatchingService(
|
||||
|
||||
@param:Qualifier("routeMatchingTransactionOperations")
|
||||
private val routeMatchingTransactionOperations: TransactionOperations,
|
||||
private val clock: Clock = Clock.systemUTC(),
|
||||
) {
|
||||
private val log = LoggerFactory.getLogger(this::class.java)
|
||||
|
||||
@@ -43,7 +46,7 @@ class RouteMatchingService(
|
||||
|
||||
val routeId = route.routeId
|
||||
val routeRollRange = route.rollAngle
|
||||
val matchedAt: LocalDateTime = LocalDateTime.now()
|
||||
val matchedAt: LocalDateTime = UtcDateTimes.now(clock)
|
||||
val routeGeometry = geometryService.parsePolygonalGeometry(route.geometry)
|
||||
|
||||
val candidateRequestIds = requestRepository.findRequestIdsForRoute(
|
||||
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
package space.nstart.pcp.routepassportconsumer.config
|
||||
|
||||
import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.core.convert.converter.Converter
|
||||
import org.springframework.format.FormatterRegistry
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import tools.jackson.core.JsonGenerator
|
||||
import tools.jackson.core.JsonParser
|
||||
import tools.jackson.databind.DeserializationContext
|
||||
import tools.jackson.databind.SerializationContext
|
||||
import tools.jackson.databind.deser.std.StdDeserializer
|
||||
import tools.jackson.databind.module.SimpleModule
|
||||
import tools.jackson.databind.ser.std.StdSerializer
|
||||
import java.time.Clock
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Configuration
|
||||
class UtcTimeConfiguration : WebMvcConfigurer {
|
||||
|
||||
@Bean
|
||||
fun clock(): Clock = Clock.systemUTC()
|
||||
|
||||
@Bean
|
||||
fun routeProcessingUtcLocalDateTimeCustomizer(): JsonMapperBuilderCustomizer = JsonMapperBuilderCustomizer { builder ->
|
||||
builder.addModule(
|
||||
SimpleModule("pcp-route-processing-service-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, UtcLocalDateTimeDeserializer())
|
||||
)
|
||||
}
|
||||
|
||||
override fun addFormatters(registry: FormatterRegistry) {
|
||||
registry.addConverter(UtcLocalDateTimeQueryParamConverter())
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeQueryParamConverter : Converter<String, LocalDateTime> {
|
||||
override fun convert(source: String): LocalDateTime = UtcDateTimes.parse(source)
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeSerializer : StdSerializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, ctxt: SerializationContext) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeDeserializer : StdDeserializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
+2
-1
@@ -18,6 +18,7 @@ import com.fasterxml.jackson.databind.ObjectMapper as JpaJsonObjectMapper
|
||||
import tools.jackson.databind.ObjectMapper
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Сохраняет разобранный route passport и outbox-события в одной DB transaction.
|
||||
@@ -38,7 +39,7 @@ class RoutePassportIngestionService(
|
||||
rawPayload: String,
|
||||
sourceRecord: RoutePassportSourceRecordMetadata,
|
||||
) {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val routePassportDto = parsedMessage.routePassportDto
|
||||
val existingRoutePassport = routePassportRepository.findById(routePassportDto.routeId)
|
||||
val routeCreated = existingRoutePassport.isEmpty
|
||||
|
||||
+3
-3
@@ -8,11 +8,11 @@ import space.nstart.pcp.pcp_types_lib.dto.routes.RawPassportEnvelopeDto
|
||||
import space.nstart.pcp.pcp_types_lib.dto.routes.RoutePassportDto
|
||||
import space.nstart.pcp.pcp_types_lib.dto.routes.RoutePassportMessageMetadata
|
||||
import space.nstart.pcp.routepassportconsumer.exception.RoutePassportContractException
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import tools.jackson.core.JacksonException
|
||||
import tools.jackson.databind.ObjectMapper
|
||||
import java.math.BigDecimal
|
||||
import java.nio.charset.StandardCharsets
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
|
||||
/**
|
||||
@@ -63,8 +63,8 @@ class RoutePassportJsonParserService(
|
||||
routeNameShort = collection,
|
||||
orbitNumber = properties.orbitNumber.toLong(),
|
||||
orbitState = properties.orbitState,
|
||||
intervalBegin = LocalDateTime.parse(properties.intervalBegin),
|
||||
intervalEnd = LocalDateTime.parse(properties.intervalEnd),
|
||||
intervalBegin = UtcDateTimes.parse(properties.intervalBegin),
|
||||
intervalEnd = UtcDateTimes.parse(properties.intervalEnd),
|
||||
rollAngle = properties.rollAngle.toAngleRangeDto(fieldName = "rollAngle"),
|
||||
visirAngle = properties.visirAngle.toAngleRangeDto(fieldName = "visirAngle"),
|
||||
resolutionRange = properties.resolutionRange.toBigDecimal(),
|
||||
|
||||
+4
-3
@@ -10,6 +10,7 @@ import space.nstart.pcp.routepassportconsumer.repository.RoutePassportOutboxRepo
|
||||
import java.time.Duration
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Owns transactional claim and status transitions for route passport outbox rows.
|
||||
@@ -32,7 +33,7 @@ class RoutePassportOutboxService(
|
||||
return emptyList()
|
||||
}
|
||||
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val lockedUntil = now.plus(Duration.ofMillis(outboxProperties.lockTimeoutMs))
|
||||
val claimedRows = routePassportOutboxRepository.findDueForUpdateSkipLocked(outboxProperties.batchSize)
|
||||
|
||||
@@ -70,7 +71,7 @@ class RoutePassportOutboxService(
|
||||
*/
|
||||
@Transactional
|
||||
fun markPublished(outboxId: UUID) {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val outbox = findOutbox(outboxId)
|
||||
|
||||
outbox.status = RoutePassportOutboxStatus.PUBLISHED
|
||||
@@ -99,7 +100,7 @@ class RoutePassportOutboxService(
|
||||
*/
|
||||
@Transactional
|
||||
fun markRetryOrFailed(outboxId: UUID, exception: Exception) {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val outbox = findOutbox(outboxId)
|
||||
|
||||
outbox.attempts += 1
|
||||
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
package space.nstart.pcp.pcp_satellite_catalog_service.configuration
|
||||
|
||||
import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.core.convert.converter.Converter
|
||||
import org.springframework.format.FormatterRegistry
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import tools.jackson.core.JsonGenerator
|
||||
import tools.jackson.core.JsonParser
|
||||
import tools.jackson.databind.DeserializationContext
|
||||
import tools.jackson.databind.SerializationContext
|
||||
import tools.jackson.databind.deser.std.StdDeserializer
|
||||
import tools.jackson.databind.module.SimpleModule
|
||||
import tools.jackson.databind.ser.std.StdSerializer
|
||||
import java.time.Clock
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Configuration
|
||||
class UtcTimeConfiguration : WebMvcConfigurer {
|
||||
|
||||
@Bean
|
||||
fun clock(): Clock = Clock.systemUTC()
|
||||
|
||||
@Bean
|
||||
fun satelliteCatalogUtcLocalDateTimeCustomizer(): JsonMapperBuilderCustomizer = JsonMapperBuilderCustomizer { builder ->
|
||||
builder.addModule(
|
||||
SimpleModule("pcp-satellite-catalog-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, UtcLocalDateTimeDeserializer())
|
||||
)
|
||||
}
|
||||
|
||||
override fun addFormatters(registry: FormatterRegistry) {
|
||||
registry.addConverter(UtcLocalDateTimeQueryParamConverter())
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeQueryParamConverter : Converter<String, LocalDateTime> {
|
||||
override fun convert(source: String): LocalDateTime = UtcDateTimes.parse(source)
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeSerializer : StdSerializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, ctxt: SerializationContext) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeDeserializer : StdDeserializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
+28
@@ -1,15 +1,24 @@
|
||||
package space.nstart.pcp_tgu_service.config
|
||||
|
||||
/** Настраивает Jackson-сериализацию для payload'ов клиента Camunda. */
|
||||
import com.fasterxml.jackson.core.JsonGenerator
|
||||
import com.fasterxml.jackson.core.JsonParser
|
||||
import com.fasterxml.jackson.databind.DeserializationContext
|
||||
import com.fasterxml.jackson.databind.JsonDeserializer
|
||||
import com.fasterxml.jackson.databind.JsonSerializer
|
||||
import com.fasterxml.jackson.databind.ObjectMapper
|
||||
import com.fasterxml.jackson.databind.SerializerProvider
|
||||
import com.fasterxml.jackson.databind.SerializationFeature
|
||||
import com.fasterxml.jackson.databind.json.JsonMapper
|
||||
import com.fasterxml.jackson.databind.module.SimpleModule
|
||||
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
|
||||
import com.fasterxml.jackson.module.kotlin.KotlinModule
|
||||
import io.camunda.client.api.JsonMapper as CamundaJsonMapper
|
||||
import io.camunda.client.impl.CamundaObjectMapper
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Configuration
|
||||
class CamundaJacksonConfig {
|
||||
@@ -24,6 +33,7 @@ class CamundaJacksonConfig {
|
||||
return JsonMapper.builder()
|
||||
.addModule(KotlinModule.Builder().build())
|
||||
.addModule(JavaTimeModule())
|
||||
.addModule(jackson2UtcLocalDateTimeModule())
|
||||
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
|
||||
.build()
|
||||
}
|
||||
@@ -34,3 +44,21 @@ class CamundaJacksonConfig {
|
||||
return CamundaObjectMapper(objectMapper)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private fun jackson2UtcLocalDateTimeModule(): SimpleModule = SimpleModule("pcp-tgu-service-jackson2-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, Jackson2UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, Jackson2UtcLocalDateTimeDeserializer())
|
||||
|
||||
private class Jackson2UtcLocalDateTimeSerializer : JsonSerializer<LocalDateTime>() {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, serializers: SerializerProvider) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class Jackson2UtcLocalDateTimeDeserializer : JsonDeserializer<LocalDateTime>() {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
|
||||
+68
@@ -0,0 +1,68 @@
|
||||
package space.nstart.pcp_tgu_service.config
|
||||
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
|
||||
import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.core.convert.converter.Converter
|
||||
import org.springframework.format.FormatterRegistry
|
||||
import org.springframework.web.reactive.function.client.WebClient
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import tools.jackson.core.JsonGenerator
|
||||
import tools.jackson.core.JsonParser
|
||||
import tools.jackson.databind.DeserializationContext
|
||||
import tools.jackson.databind.SerializationContext
|
||||
import tools.jackson.databind.deser.std.StdDeserializer
|
||||
import tools.jackson.databind.module.SimpleModule
|
||||
import tools.jackson.databind.ser.std.StdSerializer
|
||||
import java.time.Clock
|
||||
import java.time.LocalDateTime
|
||||
|
||||
/**
|
||||
* UTC contract for REST JSON and query parameters.
|
||||
*
|
||||
* Domain/JPA models still keep LocalDateTime as UTC-naive values. External API accepts explicit
|
||||
* UTC/offset strings and legacy naive strings, normalizes offsets to UTC, and writes responses
|
||||
* as ISO-8601 UTC strings with Z.
|
||||
*/
|
||||
@Configuration
|
||||
class UtcTimeConfiguration : WebMvcConfigurer {
|
||||
|
||||
@Bean
|
||||
fun clock(): Clock = Clock.systemUTC()
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean(WebClient.Builder::class)
|
||||
fun webClientBuilder(): WebClient.Builder = WebClient.builder()
|
||||
|
||||
@Bean
|
||||
fun tguUtcLocalDateTimeCustomizer(): JsonMapperBuilderCustomizer = JsonMapperBuilderCustomizer { builder ->
|
||||
builder.addModule(
|
||||
SimpleModule("pcp-tgu-service-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, UtcLocalDateTimeDeserializer())
|
||||
)
|
||||
}
|
||||
|
||||
override fun addFormatters(registry: FormatterRegistry) {
|
||||
registry.addConverter(UtcLocalDateTimeQueryParamConverter())
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeQueryParamConverter : Converter<String, LocalDateTime> {
|
||||
override fun convert(source: String): LocalDateTime = UtcDateTimes.parse(source)
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeSerializer : StdSerializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, ctxt: SerializationContext) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeDeserializer : StdDeserializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
+2
-7
@@ -1,7 +1,6 @@
|
||||
package space.nstart.pcp_tgu_service.controller
|
||||
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
|
||||
import org.springframework.format.annotation.DateTimeFormat
|
||||
import org.springframework.web.bind.annotation.GetMapping
|
||||
import org.springframework.web.bind.annotation.PathVariable
|
||||
import org.springframework.web.bind.annotation.PostMapping
|
||||
@@ -90,12 +89,8 @@ class TestTguController(
|
||||
@GetMapping("/external-points/{noradId}")
|
||||
fun getExternalPoints(
|
||||
@PathVariable noradId: Long,
|
||||
@RequestParam("time_start")
|
||||
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
|
||||
timeStart: LocalDateTime,
|
||||
@RequestParam("time_stop")
|
||||
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
|
||||
timeStop: LocalDateTime
|
||||
@RequestParam("time_start") timeStart: LocalDateTime,
|
||||
@RequestParam("time_stop") timeStop: LocalDateTime
|
||||
): String =
|
||||
externalPointsClient.fetchRawVisibilityPayload(noradId, timeStart, timeStop)
|
||||
|
||||
|
||||
+4
-4
@@ -10,8 +10,8 @@ import java.util.UUID
|
||||
/**
|
||||
* DTO ответа REST API для плана.
|
||||
*
|
||||
* Времена ([startTime]/[endTime]) — naive `LocalDateTime`, сериализуются как ISO-строка без зоны
|
||||
* (напр. `"2026-05-29T01:00:00"`). Хранение, домен и API работают на одних настенных часах.
|
||||
* Времена ([startTime]/[endTime]) — UTC-naive `LocalDateTime` в домене/БД.
|
||||
* На REST-границе сериализуются как ISO-8601 UTC с `Z` (например `"2026-05-29T01:00:00Z"`).
|
||||
*/
|
||||
data class PlanResponse(
|
||||
|
||||
@@ -21,10 +21,10 @@ data class PlanResponse(
|
||||
/** Идентификатор космического аппарата */
|
||||
val spacecraftId: String,
|
||||
|
||||
/** Время начала плана (ISO без зоны). */
|
||||
/** Время начала плана (UTC). */
|
||||
val startTime: LocalDateTime,
|
||||
|
||||
/** Время окончания плана (ISO без зоны). */
|
||||
/** Время окончания плана (UTC). */
|
||||
val endTime: LocalDateTime,
|
||||
|
||||
/** Идентификатор пункта закладки */
|
||||
|
||||
+3
-2
@@ -8,6 +8,7 @@ import jakarta.persistence.Id
|
||||
import jakarta.persistence.Table
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Persisted job на запуск короткого BPMN-процесса обновления слотов accepted plan.
|
||||
@@ -39,10 +40,10 @@ class AcceptedPlanSlotsUpdateJobEntity(
|
||||
var lastError: String? = null,
|
||||
|
||||
@Column(name = "created_at", nullable = false)
|
||||
var createdAt: LocalDateTime = LocalDateTime.now(),
|
||||
var createdAt: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
var updatedAt: LocalDateTime = LocalDateTime.now()
|
||||
var updatedAt: LocalDateTime = UtcDateTimes.now()
|
||||
) {
|
||||
/** Создаёт пустой экземпляр сущности, необходимый для JPA. */
|
||||
constructor() : this(planId = UUID.randomUUID())
|
||||
|
||||
+3
-2
@@ -8,6 +8,7 @@ import jakarta.persistence.Id
|
||||
import jakarta.persistence.Table
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Одна попытка выдачи persisted plan через один BPMN process instance.
|
||||
@@ -45,10 +46,10 @@ class PlanIssueAttemptEntity(
|
||||
var finishedAt: LocalDateTime? = null,
|
||||
|
||||
@Column(name = "created_at", nullable = false)
|
||||
var createdAt: LocalDateTime = LocalDateTime.now(),
|
||||
var createdAt: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
var updatedAt: LocalDateTime = LocalDateTime.now()
|
||||
var updatedAt: LocalDateTime = UtcDateTimes.now()
|
||||
) {
|
||||
/** Создаёт пустой экземпляр сущности, необходимый для JPA. */
|
||||
constructor() : this(attemptId = UUID.randomUUID(), planId = UUID.randomUUID(), attemptNo = 0)
|
||||
|
||||
+3
-2
@@ -8,6 +8,7 @@ import jakarta.persistence.Id
|
||||
import jakarta.persistence.Table
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Persisted business-plan с устойчивым planId по unique business key.
|
||||
@@ -56,10 +57,10 @@ class PlannedPlanEntity(
|
||||
var dismissedAt: LocalDateTime? = null,
|
||||
|
||||
@Column(name = "created_at", nullable = false)
|
||||
var createdAt: LocalDateTime = LocalDateTime.now(),
|
||||
var createdAt: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
var updatedAt: LocalDateTime = LocalDateTime.now()
|
||||
var updatedAt: LocalDateTime = UtcDateTimes.now()
|
||||
) {
|
||||
/** Создаёт пустой экземпляр сущности, необходимый для JPA. */
|
||||
constructor() : this(
|
||||
|
||||
+2
-1
@@ -6,6 +6,7 @@ import jakarta.persistence.Id
|
||||
import jakarta.persistence.Table
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Dedup-запись Kafka decision event по eventId.
|
||||
@@ -18,7 +19,7 @@ class ProcessedPlanDecisionEventEntity(
|
||||
var eventId: UUID,
|
||||
|
||||
@Column(name = "received_at", nullable = false)
|
||||
var receivedAt: LocalDateTime = LocalDateTime.now()
|
||||
var receivedAt: LocalDateTime = UtcDateTimes.now()
|
||||
) {
|
||||
/** Создаёт пустой экземпляр сущности, необходимый для JPA. */
|
||||
constructor() : this(eventId = UUID.randomUUID())
|
||||
|
||||
+2
-1
@@ -7,6 +7,7 @@ import jakarta.persistence.Id
|
||||
import jakarta.persistence.Table
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
@Entity
|
||||
@Table(name = "spacecraft_planning_state")
|
||||
@@ -42,7 +43,7 @@ class SpacecraftPlanningStateEntity(
|
||||
var pausedAfterReject: Boolean = false,
|
||||
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
var updatedAt: LocalDateTime = LocalDateTime.now()
|
||||
var updatedAt: LocalDateTime = UtcDateTimes.now()
|
||||
) {
|
||||
/** Создаёт пустой экземпляр сущности, необходимый для JPA. */
|
||||
constructor() : this(spacecraftId = "")
|
||||
|
||||
+3
-2
@@ -5,6 +5,7 @@ import jakarta.persistence.Entity
|
||||
import jakarta.persistence.Id
|
||||
import jakarta.persistence.Table
|
||||
import java.time.LocalDateTime
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Persisted snapshot КА из НСИ, используемый как вход для refresh jobs.
|
||||
@@ -44,10 +45,10 @@ class SpacecraftSnapshotEntity(
|
||||
var active: Boolean = true,
|
||||
|
||||
@Column(name = "created_at", nullable = false)
|
||||
var createdAt: LocalDateTime = LocalDateTime.now(),
|
||||
var createdAt: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
var updatedAt: LocalDateTime = LocalDateTime.now()
|
||||
var updatedAt: LocalDateTime = UtcDateTimes.now()
|
||||
) {
|
||||
/** Создаёт пустой экземпляр сущности, необходимый для JPA. */
|
||||
constructor() : this(spacecraftId = "", noradId = 0)
|
||||
|
||||
+3
-2
@@ -5,6 +5,7 @@ import jakarta.persistence.Entity
|
||||
import jakarta.persistence.Id
|
||||
import jakarta.persistence.Table
|
||||
import java.time.LocalDateTime
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Полный raw snapshot окон видимости КА из баллистики.
|
||||
@@ -40,10 +41,10 @@ class SpacecraftVisibilitySnapshotEntity(
|
||||
var windowsCount: Int? = null,
|
||||
|
||||
@Column(name = "created_at", nullable = false)
|
||||
var createdAt: LocalDateTime = LocalDateTime.now(),
|
||||
var createdAt: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
var updatedAt: LocalDateTime = LocalDateTime.now()
|
||||
var updatedAt: LocalDateTime = UtcDateTimes.now()
|
||||
) {
|
||||
/** Создаёт пустой экземпляр сущности, необходимый для JPA. */
|
||||
constructor() : this(spacecraftId = "", noradId = 0, payloadJson = "", payloadHash = "", fetchedAt = LocalDateTime.MIN)
|
||||
|
||||
+3
-2
@@ -7,6 +7,7 @@ import jakarta.persistence.Enumerated
|
||||
import jakarta.persistence.Id
|
||||
import jakarta.persistence.Table
|
||||
import java.time.LocalDateTime
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Job на перечитывание окон видимости одного КА у баллистики.
|
||||
@@ -41,10 +42,10 @@ class VisibilityRefreshJobEntity(
|
||||
var rerunRequested: Boolean = false,
|
||||
|
||||
@Column(name = "requested_at", nullable = false)
|
||||
var requestedAt: LocalDateTime = LocalDateTime.now(),
|
||||
var requestedAt: LocalDateTime = UtcDateTimes.now(),
|
||||
|
||||
@Column(name = "updated_at", nullable = false)
|
||||
var updatedAt: LocalDateTime = LocalDateTime.now()
|
||||
var updatedAt: LocalDateTime = UtcDateTimes.now()
|
||||
) {
|
||||
/** Создаёт пустой экземпляр сущности, необходимый для JPA. */
|
||||
constructor() : this(spacecraftId = "")
|
||||
|
||||
+6
-4
@@ -13,6 +13,7 @@ import org.springframework.web.reactive.function.client.WebClientException
|
||||
import org.springframework.web.reactive.function.client.WebClientResponseException
|
||||
import java.time.LocalDateTime
|
||||
import java.time.temporal.ChronoUnit
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Клиент внешнего API с окнами видимости КА.
|
||||
@@ -20,6 +21,7 @@ import java.time.temporal.ChronoUnit
|
||||
@Component
|
||||
class ExternalPointsClient(
|
||||
externalApiProperties: ExternalApiProperties,
|
||||
webClientBuilder: WebClient.Builder,
|
||||
private val platformService: PlatformService,
|
||||
private val planningProperties: PlanningProperties,
|
||||
private val visibilityPayloadParser: VisibilityPayloadParser
|
||||
@@ -27,7 +29,7 @@ class ExternalPointsClient(
|
||||
|
||||
private val log = LoggerFactory.getLogger(javaClass)
|
||||
|
||||
private val webClient: WebClient = WebClient.builder()
|
||||
private val webClient: WebClient = webClientBuilder
|
||||
.baseUrl(externalApiProperties.baseUrl)
|
||||
.build()
|
||||
|
||||
@@ -36,7 +38,7 @@ class ExternalPointsClient(
|
||||
* которые разрешены для работы TGU.
|
||||
*/
|
||||
fun fetchAllSpacecraftPoints(): List<SpacecraftPoints> {
|
||||
val timeStart = LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES)
|
||||
val timeStart = UtcDateTimes.now().truncatedTo(ChronoUnit.MINUTES)
|
||||
val timeStop = timeStart.plusDays(planningProperties.externalPointsLookaheadDays)
|
||||
|
||||
return platformService.loadAllowedPlatforms()
|
||||
@@ -93,8 +95,8 @@ class ExternalPointsClient(
|
||||
.uri { uriBuilder ->
|
||||
uriBuilder
|
||||
.path("/api/satellites/{satelliteId}/rva")
|
||||
.queryParam("time_start", timeStart)
|
||||
.queryParam("time_stop", timeStop)
|
||||
.queryParam("time_start", UtcDateTimes.format(timeStart))
|
||||
.queryParam("time_stop", UtcDateTimes.format(timeStop))
|
||||
.build(satelliteId)
|
||||
}
|
||||
.retrieve()
|
||||
|
||||
+33
-5
@@ -4,6 +4,7 @@ import org.springframework.http.HttpStatus
|
||||
import org.springframework.stereotype.Component
|
||||
import org.springframework.web.reactive.function.client.WebClient
|
||||
import org.springframework.web.server.ResponseStatusException
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import space.nstart.pcp_tgu_service.config.MissionPlaningProperties
|
||||
import java.time.Duration
|
||||
import java.time.LocalDateTime
|
||||
@@ -23,10 +24,25 @@ data class MissionBlankRequest(
|
||||
val missionStop: LocalDateTime
|
||||
)
|
||||
|
||||
@Component
|
||||
class MissionPlaningClient(properties: MissionPlaningProperties) {
|
||||
private data class MissionCloneOutboundRequest(
|
||||
val mode: String,
|
||||
val windowStart: String? = null,
|
||||
val windowStop: String? = null
|
||||
)
|
||||
|
||||
private val webClient: WebClient = WebClient.builder()
|
||||
private data class MissionBlankOutboundRequest(
|
||||
val satelliteId: Long,
|
||||
val missionStart: String,
|
||||
val missionStop: String
|
||||
)
|
||||
|
||||
@Component
|
||||
class MissionPlaningClient(
|
||||
properties: MissionPlaningProperties,
|
||||
webClientBuilder: WebClient.Builder
|
||||
) {
|
||||
|
||||
private val webClient: WebClient = webClientBuilder
|
||||
.baseUrl(properties.baseUrl)
|
||||
.build()
|
||||
|
||||
@@ -35,7 +51,7 @@ class MissionPlaningClient(properties: MissionPlaningProperties) {
|
||||
fun cloneMission(missionId: UUID, req: MissionCloneRequest): MissionCloneResponse =
|
||||
webClient.post()
|
||||
.uri("/api/missions/{id}/clone", missionId)
|
||||
.bodyValue(req)
|
||||
.bodyValue(req.toOutbound())
|
||||
.retrieve()
|
||||
.onStatus({ it.isError }) { resp ->
|
||||
resp.bodyToMono(String::class.java).defaultIfEmpty("").map { body ->
|
||||
@@ -53,11 +69,23 @@ class MissionPlaningClient(properties: MissionPlaningProperties) {
|
||||
"Пустой ответ mission-planing на клон миссии $missionId"
|
||||
)
|
||||
|
||||
private fun MissionCloneRequest.toOutbound(): MissionCloneOutboundRequest = MissionCloneOutboundRequest(
|
||||
mode = mode,
|
||||
windowStart = windowStart?.let(UtcDateTimes::format),
|
||||
windowStop = windowStop?.let(UtcDateTimes::format)
|
||||
)
|
||||
|
||||
private fun MissionBlankRequest.toOutbound(): MissionBlankOutboundRequest = MissionBlankOutboundRequest(
|
||||
satelliteId = satelliteId,
|
||||
missionStart = UtcDateTimes.format(missionStart),
|
||||
missionStop = UtcDateTimes.format(missionStop)
|
||||
)
|
||||
|
||||
/** Создаёт пустую миссию на окно (план новой цепочки «без истории»). */
|
||||
fun createBlankMission(req: MissionBlankRequest): MissionCloneResponse =
|
||||
webClient.post()
|
||||
.uri("/api/missions/blank")
|
||||
.bodyValue(req)
|
||||
.bodyValue(req.toOutbound())
|
||||
.retrieve()
|
||||
.onStatus({ it.isError }) { resp ->
|
||||
resp.bodyToMono(String::class.java).defaultIfEmpty("").map { body ->
|
||||
|
||||
+5
-17
@@ -6,10 +6,8 @@ import space.nstart.pcp_tgu_service.domain.InsertionPoint
|
||||
import space.nstart.pcp_tgu_service.domain.ObservationWindow
|
||||
import space.nstart.pcp_tgu_service.domain.SpacecraftPoints
|
||||
import space.nstart.pcp_tgu_service.dto.ExternalRvaItemDto
|
||||
import java.time.Instant
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
import java.time.ZoneId
|
||||
import java.time.format.DateTimeParseException
|
||||
import java.time.temporal.ChronoUnit
|
||||
|
||||
/**
|
||||
@@ -43,21 +41,11 @@ class VisibilityPayloadParser(
|
||||
}
|
||||
|
||||
/**
|
||||
* Разбирает ISO-строку времени баллистики в naive `LocalDateTime`.
|
||||
* Разбирает ISO-строку времени баллистики в UTC-naive `LocalDateTime`.
|
||||
*
|
||||
* Если время приходит с зоной (`...Z`/офсет), момент проецируем в локальный пояс JVM
|
||||
* (`ZoneId.systemDefault()`): naive-время в системе — настенные часы локальной зоны, в которой
|
||||
* работают все сервисы, без UTC-семантики. Naive-строку без зоны берём как есть.
|
||||
*
|
||||
* Обрезаем до микросекунд — это эффективная точность системы: `planned_plan.start_time/end_time`
|
||||
* хранятся как Postgres `timestamp(6)`, при записи наносекундный хвост баллистики всё равно теряется.
|
||||
* Без обрезки проекция (наносекунды) и persisted-планы (микросекунды) перестают совпадать по
|
||||
* бизнес-ключу — ломается дедуп в read-пути и матчинг базы в [calculatePlansAfter].
|
||||
* Явные UTC/offset-строки нормализуются в UTC, legacy naive-строки считаются UTC-naive.
|
||||
* Обрезаем до микросекунд — это эффективная точность persisted-планов в БД.
|
||||
*/
|
||||
private fun toLocalDateTime(value: String): LocalDateTime =
|
||||
try {
|
||||
LocalDateTime.ofInstant(Instant.parse(value), ZoneId.systemDefault())
|
||||
} catch (_: DateTimeParseException) {
|
||||
LocalDateTime.parse(value)
|
||||
}.truncatedTo(ChronoUnit.MICROS)
|
||||
UtcDateTimes.parse(value).truncatedTo(ChronoUnit.MICROS)
|
||||
}
|
||||
|
||||
+2
-1
@@ -5,6 +5,7 @@ import org.springframework.transaction.annotation.Transactional
|
||||
import space.nstart.pcp_tgu_service.repository.AcceptedPlanSlotsUpdateJobRepository
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Создаёт persisted job обновления слотов для accepted plan.
|
||||
@@ -16,6 +17,6 @@ class AcceptedPlanSlotsUpdateJobService(
|
||||
/** Idempotent enqueue: один planId получает максимум одну job. */
|
||||
@Transactional
|
||||
fun enqueue(planId: UUID) {
|
||||
acceptedPlanSlotsUpdateJobRepository.insertPendingIfAbsent(planId, LocalDateTime.now())
|
||||
acceptedPlanSlotsUpdateJobRepository.insertPendingIfAbsent(planId, UtcDateTimes.now())
|
||||
}
|
||||
}
|
||||
|
||||
+4
-3
@@ -11,6 +11,7 @@ import space.nstart.pcp_tgu_service.repository.AcceptedPlanSlotsUpdateJobReposit
|
||||
import java.net.InetAddress
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Scale-out safe worker, который запускает updateAcceptedPlanSlots для accepted plan.
|
||||
@@ -35,7 +36,7 @@ class AcceptedPlanSlotsUpdateWorker(
|
||||
/** Claim видим для тестов; в production защищён FOR UPDATE SKIP LOCKED. */
|
||||
fun claimJobs(limit: Int): List<AcceptedPlanSlotsUpdateJobEntity> =
|
||||
transactionTemplate.execute {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val jobs = acceptedPlanSlotsUpdateJobRepository.findClaimableForUpdate(now, limit)
|
||||
jobs.forEach { job ->
|
||||
job.status = AcceptedPlanSlotsUpdateJobStatus.RUNNING
|
||||
@@ -69,7 +70,7 @@ class AcceptedPlanSlotsUpdateWorker(
|
||||
|
||||
private fun markDone(planId: UUID, processInstanceKey: Long) {
|
||||
transactionTemplate.executeWithoutResult {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val job = acceptedPlanSlotsUpdateJobRepository.findById(planId).orElse(null) ?: return@executeWithoutResult
|
||||
job.status = AcceptedPlanSlotsUpdateJobStatus.DONE
|
||||
job.processInstanceKey = processInstanceKey
|
||||
@@ -83,7 +84,7 @@ class AcceptedPlanSlotsUpdateWorker(
|
||||
|
||||
private fun markAmbiguous(planId: UUID, processInstanceKey: Long?, ex: Exception) {
|
||||
transactionTemplate.executeWithoutResult {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val job = acceptedPlanSlotsUpdateJobRepository.findById(planId).orElse(null) ?: return@executeWithoutResult
|
||||
job.status = AcceptedPlanSlotsUpdateJobStatus.AMBIGUOUS
|
||||
job.processInstanceKey = processInstanceKey ?: job.processInstanceKey
|
||||
|
||||
+2
-1
@@ -18,6 +18,7 @@ import space.nstart.pcp_tgu_service.repository.PlannedPlanRepository
|
||||
import space.nstart.pcp_tgu_service.repository.SpacecraftPlanningStateJpaRepository
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Создаёт план новой цепочки (вкладка «Планы», действие оператора «Создать план») и сразу считает
|
||||
@@ -46,7 +47,7 @@ class CreateChainPlanUseCase(
|
||||
private val log = LoggerFactory.getLogger(javaClass)
|
||||
|
||||
fun createChainPlan(req: CreateChainPlanRequest): CreateChainPlanResponse {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
|
||||
if (!req.windowStop.isAfter(req.windowStart)) {
|
||||
throw ResponseStatusException(HttpStatus.UNPROCESSABLE_ENTITY, "windowStop должен быть позже windowStart")
|
||||
|
||||
+2
-1
@@ -16,6 +16,7 @@ import space.nstart.pcp_tgu_service.repository.PlannedPlanRepository
|
||||
import space.nstart.pcp_tgu_service.repository.SpacecraftPlanningStateJpaRepository
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Создаёт черновик плана (DRAFT) на основе существующего базового плана.
|
||||
@@ -45,7 +46,7 @@ class CreateDraftUseCase(
|
||||
val base = plannedPlanRepository.findById(basePlanId)
|
||||
.orElseThrow { ResponseStatusException(HttpStatus.NOT_FOUND, "Plan $basePlanId not found") }
|
||||
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
|
||||
return when (req.mode) {
|
||||
DraftMode.REPLACE -> createReplaceDraft(base, now)
|
||||
|
||||
+4
-3
@@ -9,6 +9,7 @@ import space.nstart.pcp_tgu_service.entity.PlannedPlanStatus
|
||||
import space.nstart.pcp_tgu_service.repository.PlannedPlanRepository
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* «Снять с учёта» / «Вернуть на учёт» терминально-негативный план.
|
||||
@@ -44,8 +45,8 @@ class DismissPlanUseCase(
|
||||
log.info("План {} уже снят с учёта ({}) — идемпотентно", planId, plan.dismissedAt)
|
||||
return
|
||||
}
|
||||
plan.dismissedAt = LocalDateTime.now()
|
||||
plan.updatedAt = LocalDateTime.now()
|
||||
plan.dismissedAt = UtcDateTimes.now()
|
||||
plan.updatedAt = UtcDateTimes.now()
|
||||
plannedPlanRepository.save(plan)
|
||||
log.info("План {} (status={}) снят с учёта", planId, plan.status)
|
||||
}
|
||||
@@ -59,7 +60,7 @@ class DismissPlanUseCase(
|
||||
return
|
||||
}
|
||||
plan.dismissedAt = null
|
||||
plan.updatedAt = LocalDateTime.now()
|
||||
plan.updatedAt = UtcDateTimes.now()
|
||||
plannedPlanRepository.save(plan)
|
||||
log.info("План {} (status={}) возвращён на учёт", planId, plan.status)
|
||||
}
|
||||
|
||||
+7
-6
@@ -20,6 +20,7 @@ import space.nstart.pcp_tgu_service.repository.ProcessedPlanDecisionEventReposit
|
||||
import space.nstart.pcp_tgu_service.repository.SpacecraftPlanningStateJpaRepository
|
||||
import java.time.Duration
|
||||
import java.time.LocalDateTime
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Обрабатывает decision и закладочные feedback-события идемпотентно по eventId.
|
||||
@@ -132,7 +133,7 @@ class HandlePlanDecisionUseCase(
|
||||
)
|
||||
}
|
||||
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
plan.status = PlannedPlanStatus.LAID_IN
|
||||
plan.updatedAt = now
|
||||
|
||||
@@ -213,7 +214,7 @@ class HandlePlanDecisionUseCase(
|
||||
return
|
||||
}
|
||||
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
plan.status = terminalStatus
|
||||
plan.updatedAt = now
|
||||
plannedPlanRepository.save(plan)
|
||||
@@ -225,7 +226,7 @@ class HandlePlanDecisionUseCase(
|
||||
message: PlanDecisionMessage,
|
||||
attempt: PlanIssueAttemptEntity
|
||||
) {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
attempt.status = when (message.decision) {
|
||||
PlanDecision.ACCEPTED -> PlanIssueAttemptStatus.ACCEPTED
|
||||
PlanDecision.REJECTED -> PlanIssueAttemptStatus.REJECTED
|
||||
@@ -241,7 +242,7 @@ class HandlePlanDecisionUseCase(
|
||||
attempt: PlanIssueAttemptEntity,
|
||||
plan: PlannedPlanEntity
|
||||
) {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
recordDecisionOnAttempt(message, attempt)
|
||||
|
||||
plan.status = PlannedPlanStatus.AWAITING_LAYIN
|
||||
@@ -262,7 +263,7 @@ class HandlePlanDecisionUseCase(
|
||||
plan: PlannedPlanEntity,
|
||||
state: SpacecraftPlanningStateEntity
|
||||
) {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
recordDecisionOnAttempt(message, attempt)
|
||||
|
||||
plan.status = PlannedPlanStatus.REJECTED
|
||||
@@ -307,7 +308,7 @@ class HandlePlanDecisionUseCase(
|
||||
}
|
||||
|
||||
private fun claimEvent(eventId: java.util.UUID): Boolean =
|
||||
processedPlanDecisionEventRepository.insertIfAbsent(eventId, LocalDateTime.now()) != 0
|
||||
processedPlanDecisionEventRepository.insertIfAbsent(eventId, UtcDateTimes.now()) != 0
|
||||
|
||||
private fun getOrCreateLockedState(spacecraftId: String): SpacecraftPlanningStateEntity {
|
||||
spacecraftPlanningStateJpaRepository.findById(spacecraftId).orElse(null)
|
||||
|
||||
+2
-1
@@ -7,6 +7,7 @@ import space.nstart.pcp_tgu_service.dto.StationParamsChangedMessage
|
||||
import space.nstart.pcp_tgu_service.repository.ProcessedPlanDecisionEventRepository
|
||||
import space.nstart.pcp_tgu_service.repository.SpacecraftSnapshotRepository
|
||||
import java.time.LocalDateTime
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* На изменение параметров станций перезапрашивает ЗРВ у баллистики по всем активным КА.
|
||||
@@ -25,7 +26,7 @@ class HandleStationParamsChangedUseCase(
|
||||
/** Идемпотентно по eventId; ставит refresh job по всем активным КА. */
|
||||
@Transactional
|
||||
fun handle(message: StationParamsChangedMessage) {
|
||||
val claimed = processedPlanDecisionEventRepository.insertIfAbsent(message.eventId, LocalDateTime.now()) != 0
|
||||
val claimed = processedPlanDecisionEventRepository.insertIfAbsent(message.eventId, UtcDateTimes.now()) != 0
|
||||
if (!claimed) {
|
||||
return
|
||||
}
|
||||
|
||||
+6
-5
@@ -20,6 +20,7 @@ import space.nstart.pcp_tgu_service.repository.SpacecraftPlanningStateJpaReposit
|
||||
import space.nstart.pcp_tgu_service.repository.SpacecraftSnapshotRepository
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Выдаёт дозревшие планы. В on-demand-модели голова цепочки считается из снапшота ЗРВ
|
||||
@@ -83,7 +84,7 @@ class IssueDuePlanWorker(
|
||||
|
||||
/** Готовит выдачу головы проекции для КА под lock'ом состояния (scale-out safe). */
|
||||
private fun prepareDueForSpacecraft(spacecraftId: String): PreparedAttempt? {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val state = getOrCreateLockedState(spacecraftId)
|
||||
// Форвард-цепочку не выдаём, пока по КА есть выдача «в работе»: ISSUING или WAITING_DECISION
|
||||
// в пределах grace после старта. Прошедший grace больше не блокирует — молчаливо продолжаем
|
||||
@@ -154,7 +155,7 @@ class IssueDuePlanWorker(
|
||||
.maxByOrNull { plan -> plan.endTime }?.planId ?: fallback
|
||||
|
||||
private fun prepareSpecificPlan(planId: UUID): PreparedAttempt? {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val plan = plannedPlanRepository.findById(planId).orElse(null) ?: return null
|
||||
val state = getOrCreateLockedState(plan.spacecraftId)
|
||||
assertReissuableInSlot(plan, now)
|
||||
@@ -176,7 +177,7 @@ class IssueDuePlanWorker(
|
||||
}
|
||||
|
||||
private fun prepareDraftPromotion(draftPlanId: UUID): PreparedAttempt? {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val plan = plannedPlanRepository.findById(draftPlanId).orElse(null) ?: return null
|
||||
if (plan.status != PlannedPlanStatus.DRAFT) {
|
||||
throw ResponseStatusException(
|
||||
@@ -326,7 +327,7 @@ class IssueDuePlanWorker(
|
||||
|
||||
private fun markStarted(response: ProcessStartResponse) {
|
||||
transactionTemplate.executeWithoutResult {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val attempt = planIssueAttemptRepository.findById(response.attemptId).orElse(null) ?: return@executeWithoutResult
|
||||
val plan = plannedPlanRepository.findById(response.planId).orElse(null) ?: return@executeWithoutResult
|
||||
|
||||
@@ -350,7 +351,7 @@ class IssueDuePlanWorker(
|
||||
|
||||
private fun markAmbiguous(preparedAttempt: PreparedAttempt) {
|
||||
transactionTemplate.executeWithoutResult {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val attempt = planIssueAttemptRepository.findById(preparedAttempt.attemptId).orElse(null) ?: return@executeWithoutResult
|
||||
val plan = plannedPlanRepository.findById(preparedAttempt.planId).orElse(null) ?: return@executeWithoutResult
|
||||
attempt.status = PlanIssueAttemptStatus.AMBIGUOUS
|
||||
|
||||
+2
-1
@@ -12,6 +12,7 @@ import space.nstart.pcp_tgu_service.repository.PlannedPlanRepository
|
||||
import space.nstart.pcp_tgu_service.repository.SpacecraftSnapshotRepository
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Read-сервис планов: объединяет persisted (выданные, история — вечно) с вычисленной
|
||||
@@ -80,7 +81,7 @@ class PlanQueryService(
|
||||
.sortedBy { response -> response.startTime }
|
||||
|
||||
private fun historySince(historyDays: Long): LocalDateTime =
|
||||
LocalDateTime.now().minusDays(historyDays.coerceAtLeast(0))
|
||||
UtcDateTimes.now().minusDays(historyDays.coerceAtLeast(0))
|
||||
|
||||
private fun PlannedPlanEntity.businessKey(): String =
|
||||
"$spacecraftId|$startTime|$endTime|$kppId"
|
||||
|
||||
+2
-1
@@ -7,6 +7,7 @@ import space.nstart.pcp_tgu_service.integration.api.VisibilityPayloadParser
|
||||
import space.nstart.pcp_tgu_service.repository.SpacecraftVisibilitySnapshotRepository
|
||||
import java.security.MessageDigest
|
||||
import java.time.LocalDateTime
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Сохраняет raw visibility payload. Расписание считается on-demand из снапшота
|
||||
@@ -25,7 +26,7 @@ class SpacecraftVisibilitySnapshotService(
|
||||
val payloadHash = sha256(payloadJson)
|
||||
val existing = spacecraftVisibilitySnapshotRepository.findById(spacecraftId).orElse(null)
|
||||
val metadata = runCatching { extractMetadata(spacecraftId, payloadJson) }.getOrNull()
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
|
||||
if (existing == null) {
|
||||
spacecraftVisibilitySnapshotRepository.save(
|
||||
|
||||
+5
-6
@@ -5,7 +5,7 @@ import org.springframework.transaction.support.TransactionTemplate
|
||||
import space.nstart.pcp_tgu_service.domain.PlatformCatalogItem
|
||||
import space.nstart.pcp_tgu_service.repository.SpacecraftSnapshotRepository
|
||||
import java.time.LocalDateTime
|
||||
import java.time.ZoneId
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Синхронизирует разрешённые КА из НСИ в БД и ставит refresh jobs.
|
||||
@@ -26,7 +26,7 @@ class SyncSpacecraftFromNsiUseCase(
|
||||
}
|
||||
|
||||
private fun persistAllowedSpacecraft(allowedPlatforms: List<PlatformCatalogItem>) {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val allowedSpacecraftIds = allowedPlatforms.mapNotNull { platform -> platform.noradId?.toString() }
|
||||
|
||||
allowedPlatforms.forEach { platform ->
|
||||
@@ -40,10 +40,9 @@ class SyncSpacecraftFromNsiUseCase(
|
||||
name = platform.name,
|
||||
status = platform.status,
|
||||
mission = platform.mission,
|
||||
// validFrom/validTo приходят как Instant; в naive-поля БД пишем настенные часы локальной
|
||||
// зоны JVM (ZoneId.systemDefault()) — naive-время в системе локальное, без UTC-семантики.
|
||||
validFrom = platform.validFrom?.let { LocalDateTime.ofInstant(it, ZoneId.systemDefault()) },
|
||||
validTo = platform.validTo?.let { LocalDateTime.ofInstant(it, ZoneId.systemDefault()) },
|
||||
// validFrom/validTo приходят как Instant; в naive-поля БД пишем UTC-naive момент.
|
||||
validFrom = platform.validFrom?.let { LocalDateTime.ofInstant(it, UtcDateTimes.UTC) },
|
||||
validTo = platform.validTo?.let { LocalDateTime.ofInstant(it, UtcDateTimes.UTC) },
|
||||
now = now
|
||||
)
|
||||
visibilityRefreshJobService.enqueue(spacecraftId, noradId, "NSI_SYNC")
|
||||
|
||||
+3
-2
@@ -12,6 +12,7 @@ import space.nstart.pcp_tgu_service.repository.PlanIssueAttemptRepository
|
||||
import space.nstart.pcp_tgu_service.repository.PlannedPlanRepository
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Test-only helper: генерирует decision event для последней (живой) attempt persisted plan.
|
||||
@@ -50,7 +51,7 @@ class TestPlanDecisionService(
|
||||
planId = plan.planId,
|
||||
attemptId = attempt.attemptId,
|
||||
decision = decision,
|
||||
decisionTime = LocalDateTime.now(),
|
||||
decisionTime = UtcDateTimes.now(),
|
||||
reason = reason?.takeIf { it.isNotBlank() } ?: DEFAULT_REASON
|
||||
)
|
||||
handlePlanDecisionUseCase.handle(message)
|
||||
@@ -70,7 +71,7 @@ class TestPlanDecisionService(
|
||||
eventId = UUID.randomUUID(),
|
||||
spacecraftId = plan.spacecraftId,
|
||||
planId = plan.planId,
|
||||
occurredAt = LocalDateTime.now(),
|
||||
occurredAt = UtcDateTimes.now(),
|
||||
reason = reason?.takeIf { it.isNotBlank() } ?: DEFAULT_REASON
|
||||
)
|
||||
handlePlanDecisionUseCase.handleLayinConfirmed(message)
|
||||
|
||||
+2
-1
@@ -4,6 +4,7 @@ import org.springframework.stereotype.Service
|
||||
import org.springframework.transaction.annotation.Transactional
|
||||
import space.nstart.pcp_tgu_service.repository.VisibilityRefreshJobRepository
|
||||
import java.time.LocalDateTime
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Coalesce-сервис для visibility_refresh_job по spacecraftId.
|
||||
@@ -15,6 +16,6 @@ class VisibilityRefreshJobService(
|
||||
/** Ставит или переоткрывает refresh job без дублей. */
|
||||
@Transactional
|
||||
fun enqueue(spacecraftId: String, noradId: Long?, reason: String) {
|
||||
visibilityRefreshJobRepository.upsertPending(spacecraftId, noradId, reason, LocalDateTime.now())
|
||||
visibilityRefreshJobRepository.upsertPending(spacecraftId, noradId, reason, UtcDateTimes.now())
|
||||
}
|
||||
}
|
||||
|
||||
+7
-6
@@ -13,6 +13,7 @@ import space.nstart.pcp_tgu_service.repository.VisibilityRefreshJobRepository
|
||||
import java.net.InetAddress
|
||||
import java.time.LocalDateTime
|
||||
import java.time.temporal.ChronoUnit
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
|
||||
/**
|
||||
* Claim'ит visibility_refresh_job, читает raw payload у баллистики и сохраняет snapshot.
|
||||
@@ -38,7 +39,7 @@ class VisibilityRefreshWorker(
|
||||
|
||||
private fun claimJobs(limit: Int): List<VisibilityRefreshJobEntity> =
|
||||
transactionTemplate.execute {
|
||||
val now = LocalDateTime.now()
|
||||
val now = UtcDateTimes.now()
|
||||
val jobs = visibilityRefreshJobRepository.findPendingForUpdate(now, limit)
|
||||
jobs.forEach { job ->
|
||||
job.status = JobStatus.RUNNING
|
||||
@@ -61,10 +62,10 @@ class VisibilityRefreshWorker(
|
||||
}
|
||||
|
||||
try {
|
||||
val timeStart = LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES)
|
||||
val timeStart = UtcDateTimes.now().truncatedTo(ChronoUnit.MINUTES)
|
||||
val timeStop = timeStart.plusDays(planningProperties.externalPointsLookaheadDays)
|
||||
val payload = externalPointsClient.fetchRawVisibilityPayload(noradId, timeStart, timeStop)
|
||||
spacecraftVisibilitySnapshotService.saveSnapshot(spacecraftId, noradId, payload, LocalDateTime.now())
|
||||
spacecraftVisibilitySnapshotService.saveSnapshot(spacecraftId, noradId, payload, UtcDateTimes.now())
|
||||
markDone(spacecraftId)
|
||||
} catch (ex: Exception) {
|
||||
log.warn("Visibility refresh job failed. spacecraftId={}, noradId={}", spacecraftId, noradId, ex)
|
||||
@@ -79,7 +80,7 @@ class VisibilityRefreshWorker(
|
||||
job.rerunRequested = false
|
||||
job.lockedBy = null
|
||||
job.lockedUntil = null
|
||||
job.updatedAt = LocalDateTime.now()
|
||||
job.updatedAt = UtcDateTimes.now()
|
||||
visibilityRefreshJobRepository.save(job)
|
||||
}
|
||||
}
|
||||
@@ -90,7 +91,7 @@ class VisibilityRefreshWorker(
|
||||
job.status = if (job.attempts >= MAX_ATTEMPTS) JobStatus.FAILED else JobStatus.PENDING
|
||||
job.lockedBy = null
|
||||
job.lockedUntil = null
|
||||
job.updatedAt = LocalDateTime.now()
|
||||
job.updatedAt = UtcDateTimes.now()
|
||||
visibilityRefreshJobRepository.save(job)
|
||||
}
|
||||
}
|
||||
@@ -102,7 +103,7 @@ class VisibilityRefreshWorker(
|
||||
job.reason = reason
|
||||
job.lockedBy = null
|
||||
job.lockedUntil = null
|
||||
job.updatedAt = LocalDateTime.now()
|
||||
job.updatedAt = UtcDateTimes.now()
|
||||
visibilityRefreshJobRepository.save(job)
|
||||
}
|
||||
}
|
||||
|
||||
+18
-6
@@ -1,25 +1,37 @@
|
||||
package space.nstart.pcp_tgu_service.dto
|
||||
|
||||
import com.fasterxml.jackson.core.JsonGenerator
|
||||
import com.fasterxml.jackson.databind.JsonSerializer
|
||||
import com.fasterxml.jackson.databind.SerializerProvider
|
||||
import com.fasterxml.jackson.databind.SerializationFeature
|
||||
import com.fasterxml.jackson.databind.module.SimpleModule
|
||||
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.Assertions.assertFalse
|
||||
import org.junit.jupiter.api.Test
|
||||
import space.nstart.pcp_tgu_service.entity.PlannedPlanStatus
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
|
||||
/**
|
||||
* Контракт формата времени на проводе для [PlanResponse]: naive `LocalDateTime` → ISO без зоны
|
||||
* (напр. `"2026-05-29T01:00:00"`). Тест ловит случайный возврат к OffsetDateTime/Z или числовым меткам.
|
||||
* Контракт формата времени на проводе для [PlanResponse]: UTC-naive `LocalDateTime` → ISO UTC с Z
|
||||
* (напр. `"2026-05-29T01:00:00Z"`). Тест ловит случайный возврат к naive-строкам или числовым меткам.
|
||||
*/
|
||||
class PlanResponseContractTest {
|
||||
|
||||
private val mapper = jacksonObjectMapper().findAndRegisterModules()
|
||||
.registerModule(
|
||||
SimpleModule().addSerializer(LocalDateTime::class.java, object : JsonSerializer<LocalDateTime>() {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, serializers: SerializerProvider) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
})
|
||||
)
|
||||
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
|
||||
|
||||
@Test
|
||||
fun `serializes plan times as naive ISO without zone`() {
|
||||
fun `serializes plan times as UTC ISO with Z`() {
|
||||
val response = PlanResponse(
|
||||
planId = UUID.fromString("00000000-0000-0000-0000-000000000001"),
|
||||
spacecraftId = "25544",
|
||||
@@ -31,8 +43,8 @@ class PlanResponseContractTest {
|
||||
|
||||
val node = mapper.readTree(mapper.writeValueAsString(response))
|
||||
|
||||
assertEquals("2026-05-29T01:00:00", node.get("startTime").asText())
|
||||
assertEquals("2026-05-29T02:00:00", node.get("endTime").asText())
|
||||
assertFalse(node.get("startTime").asText().endsWith("Z"), "не ожидалась зона Z")
|
||||
assertEquals("2026-05-29T01:00:00Z", node.get("startTime").asText())
|
||||
assertEquals("2026-05-29T02:00:00Z", node.get("endTime").asText())
|
||||
assertFalse(node.get("startTime").asText().contains("["), "не ожидался zoned date-time с ID зоны")
|
||||
}
|
||||
}
|
||||
|
||||
+4
-6
@@ -19,9 +19,8 @@ class VisibilityPayloadParserTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `projects zoned instant into JVM default zone as naive local LocalDateTime`() {
|
||||
// naive-время в системе — настенные часы локальной зоны JVM (без UTC-семантики). Парсер проецирует
|
||||
// зонированный инстант через ZoneId.systemDefault(), поэтому на МСК (+3) 14:14Z даёт локальные 17:14.
|
||||
fun `normalizes zoned instant to UTC naive LocalDateTime`() {
|
||||
// Зонированный инстант должен нормализоваться в UTC-naive время независимо от зоны JVM.
|
||||
TimeZone.setDefault(TimeZone.getTimeZone("Europe/Moscow"))
|
||||
val payload = """
|
||||
[{
|
||||
@@ -35,9 +34,8 @@ class VisibilityPayloadParserTest {
|
||||
|
||||
val window = parser.parse("20", payload).points.single().observationWindows.single()
|
||||
|
||||
// Инстант 14:14Z спроецирован в локальную зону JVM (МСК, +3) — настенные 17:14.
|
||||
assertEquals(LocalDateTime.parse("2026-06-02T17:14:08"), window.startTime)
|
||||
assertEquals(LocalDateTime.parse("2026-06-02T17:20:00"), window.endTime)
|
||||
assertEquals(LocalDateTime.parse("2026-06-02T14:14:08"), window.startTime)
|
||||
assertEquals(LocalDateTime.parse("2026-06-02T14:20:00"), window.endTime)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { TguApiError } from '../model/tguTypes'
|
||||
import { toLocalIso } from '../utils/localTime'
|
||||
import { toUtcIso } from '../utils/localTime'
|
||||
import { apiFetch } from './apiFetch'
|
||||
|
||||
const BASE = '/api/pcp-ballistics'
|
||||
@@ -67,7 +67,7 @@ export type PointVisibilityParam = {
|
||||
noradId: number
|
||||
/** Идентификатор объекта (цели) из запроса. */
|
||||
objectId: string
|
||||
/** Момент видимости (локальное время, ISO без зоны). */
|
||||
/** Момент видимости (UTC ISO). */
|
||||
time: string
|
||||
/** Номер витка. */
|
||||
revolution: number
|
||||
@@ -161,7 +161,7 @@ export async function fetchPointVisibility(
|
||||
|
||||
/** Целеуказание (момент/угол места/азимут/дальность) границы зоны радиовидимости. */
|
||||
export type RvaTargetPosition = {
|
||||
/** Момент (локальное время, ISO без зоны). */
|
||||
/** Момент (UTC ISO). */
|
||||
time: string
|
||||
/** Угол места, град. */
|
||||
elevation: number
|
||||
@@ -233,13 +233,13 @@ export async function fetchSatelliteRva(
|
||||
}
|
||||
|
||||
/**
|
||||
* LocalDateTime без зоны (локальные настенные часы): YYYY-MM-DDTHH:mm:ss.
|
||||
* UTC ISO date-time for API DTO/query params.
|
||||
* @param ms Время в миллисекундах от эпохи.
|
||||
*
|
||||
* @returns Строка LocalDateTime без зоны.
|
||||
* @returns Строка UTC date-time.
|
||||
*/
|
||||
function toLocalDateTime(ms: number): string {
|
||||
return toLocalIso(ms)
|
||||
return toUtcIso(ms)
|
||||
}
|
||||
|
||||
function extractErrorText(body: string): string {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { TguApiError } from '../model/tguTypes'
|
||||
import { toLocalIso } from '../utils/localTime'
|
||||
import { toUtcIso } from '../utils/localTime'
|
||||
import { apiFetch } from './apiFetch'
|
||||
|
||||
/**
|
||||
@@ -20,9 +20,9 @@ export const MAX_COMPLEX_PLAN_RANGE_MS = MAX_COMPLEX_PLAN_RANGE_DAYS * 24 * 60 *
|
||||
export type ComplexPlanRunStatus = 'CREATED' | 'RUNNING' | 'COMPLETED' | 'FAILED'
|
||||
|
||||
export type RunComplexPlanParams = {
|
||||
/** Начало интервала расчёта (эпоха-мс, локальное). */
|
||||
/** Начало интервала расчёта (эпоха-мс, абсолютный момент). */
|
||||
fromMs: number
|
||||
/** Конец интервала расчёта (эпоха-мс, локальное). */
|
||||
/** Конец интервала расчёта (эпоха-мс, абсолютный момент). */
|
||||
toMs: number
|
||||
/** NORAD-id КА, по которым считаем (все эксплуатируемые КА вкладки «Планы»). */
|
||||
satelliteIds: number[]
|
||||
@@ -82,7 +82,7 @@ export type ComplexPlanRunSummary = {
|
||||
coveredAreaPercent: number
|
||||
}
|
||||
|
||||
/** Режим съёмки/сброса из результата расчёта (SatelliteModeResponseDTO). Времена — локальные. */
|
||||
/** Режим съёмки/сброса из результата расчёта (SatelliteModeResponseDTO). Времена приходят из API как UTC ISO и отображаются в локальной зоне браузера. */
|
||||
export type ComplexPlanMode = {
|
||||
id: number
|
||||
satelliteId: number
|
||||
@@ -115,8 +115,8 @@ export type ComplexPlanMode = {
|
||||
*/
|
||||
export async function runComplexPlan(params: RunComplexPlanParams): Promise<ComplexPlanRunResult> {
|
||||
const body = {
|
||||
intervalStart: toLocalIso(params.fromMs),
|
||||
intervalEnd: toLocalIso(params.toMs),
|
||||
intervalStart: toUtcIso(params.fromMs),
|
||||
intervalEnd: toUtcIso(params.toMs),
|
||||
satelliteIds: params.satelliteIds,
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ export type SurveyRouteAnchor = 'CENTERED' | 'FORWARD'
|
||||
export type BuildSurveyRouteParams = {
|
||||
/** Идентификатор КА (NORAD — тот же, что в obj-view/mpl-point). */
|
||||
satelliteId: number
|
||||
/** Момент видимости (локальное время, ISO без зоны). */
|
||||
/** Момент видимости (UTC ISO). */
|
||||
time: string
|
||||
/** Длительность съёмки, секунды. */
|
||||
durationSeconds: number
|
||||
@@ -22,17 +22,17 @@ export type BuildSurveyRouteParams = {
|
||||
/** Способ построения окна относительно момента видимости. */
|
||||
anchor?: SurveyRouteAnchor
|
||||
/**
|
||||
* Начало интервала плана (локальное время, ISO без зоны). Передаётся при сохранении,
|
||||
* Начало интервала плана (UTC ISO). Передаётся при сохранении,
|
||||
* чтобы при автосоздании миссии/плана задать корректное окно (для пересечений/наложений).
|
||||
*/
|
||||
planStart?: string
|
||||
/** Конец интервала плана (локальное время, ISO без зоны). См. planStart. */
|
||||
/** Конец интервала плана (UTC ISO). См. planStart. */
|
||||
planEnd?: string
|
||||
}
|
||||
|
||||
export type SurveyRoute = {
|
||||
satelliteId: number
|
||||
/** Начало съёмки (локальное время, ISO без зоны). */
|
||||
/** Начало съёмки (UTC ISO). */
|
||||
timeStart: string
|
||||
/** Длительность съёмки, секунды. */
|
||||
duration: number
|
||||
@@ -87,9 +87,9 @@ export type SaveDropRouteParams = {
|
||||
station: string
|
||||
/** Номер витка зоны радиовидимости. */
|
||||
revolution: number
|
||||
/** Начало зоны (локальное время, ISO без зоны). */
|
||||
/** Начало зоны (UTC ISO). */
|
||||
zoneStart: string
|
||||
/** Конец зоны (локальное время, ISO без зоны). */
|
||||
/** Конец зоны (UTC ISO). */
|
||||
zoneStop: string
|
||||
/** Идентификаторы режимов съёмки (survey_modes), сбрасываемых в этой зоне. */
|
||||
surveyModeIds: number[]
|
||||
@@ -168,7 +168,7 @@ export async function saveDropRoute(
|
||||
return JSON.parse(text) as DropMode
|
||||
}
|
||||
|
||||
/** Итог расчёта плана съёмки (ответ /surveys/calculate). Времена — локальные. */
|
||||
/** Итог расчёта плана съёмки (ответ /surveys/calculate). Времена приходят из API как UTC ISO и отображаются UI в локальной зоне браузера. */
|
||||
export type SurveyCalculationResult = {
|
||||
missionId: string
|
||||
completed: boolean
|
||||
|
||||
@@ -12,7 +12,7 @@ export type DraftMode = 'replace' | 'fork-forward'
|
||||
|
||||
export type CreateDraftRequest = {
|
||||
mode: DraftMode
|
||||
/** Начало окна целевой ЗРВ (naive, ISO без зоны, локальное). Обязательно для fork-forward. */
|
||||
/** Начало окна целевой ЗРВ (UTC ISO). Обязательно для fork-forward. */
|
||||
windowStart?: string
|
||||
/** Конец окна целевой ЗРВ. Обязательно для fork-forward. */
|
||||
windowStop?: string
|
||||
@@ -54,7 +54,7 @@ export type ZrvWindowResponse = {
|
||||
/**
|
||||
* Запрос создания плана новой цепочки (вкладка «Планы»). Окно набирается из двух ЗРВ:
|
||||
* `windowStart`/`windowKppId` — старт выбранной стартовой зоны, `windowStop` — конец конечной.
|
||||
* Времена — naive (ISO без зоны, локальное), как ждёт `LocalDateTime` бэка. `basePlanId` — предыстория
|
||||
* Времена отправляются в API как UTC ISO с `Z`. `basePlanId` — предыстория
|
||||
* (история тянется) либо `null` (цепочка без истории, пустой план).
|
||||
*/
|
||||
export type CreateChainPlanRequest = {
|
||||
|
||||
@@ -20,7 +20,7 @@ import type { MapPolygon, Tgu2DMapScene } from "../tgu-map-2d/model/mapTypes";
|
||||
import type { Tgu2DMapSelection } from "../tgu-map-2d/model/mapSelectionTypes";
|
||||
import { Tgu2DMapView } from "../tgu-map-2d/Tgu2DMapView";
|
||||
import { MapObjectInspector } from "../tgu-map-2d/MapObjectInspector";
|
||||
import { formatLocalDateTime, parseLocal, toLocalInputValue, toLocalIso } from "../../utils/localTime";
|
||||
import { formatLocalDateTime, parseLocal, toLocalInputValue, toUtcIso } from "../../utils/localTime";
|
||||
import { formatVolume } from "../../utils/dataVolume";
|
||||
|
||||
type TguComplexPlanTabProps = {
|
||||
@@ -173,7 +173,7 @@ export function TguComplexPlanTab({ range, platforms }: TguComplexPlanTabProps)
|
||||
let cancelled = false;
|
||||
setRequestsLoading(true);
|
||||
setRequestsError(undefined);
|
||||
fetchRequestsForMap({ endFrom: toLocalIso(fromMs), beginTo: toLocalIso(toMs) })
|
||||
fetchRequestsForMap({ endFrom: toUtcIso(fromMs), beginTo: toUtcIso(toMs) })
|
||||
.then((result) => {
|
||||
if (!cancelled) setRequestItems(result.items);
|
||||
})
|
||||
|
||||
@@ -18,7 +18,7 @@ import {
|
||||
import { abandonDraft, createDraft, fetchDraftPlans } from "../../api/tguPlanApi";
|
||||
import { TguApiError } from "../../model/tguTypes";
|
||||
import type { TguPlanUi } from "../../model/timelineTypes";
|
||||
import { parseLocal, toLocalIso } from "../../utils/localTime";
|
||||
import { parseLocal, toUtcIso } from "../../utils/localTime";
|
||||
import { Tgu2DMapView } from "../tgu-map-2d/Tgu2DMapView";
|
||||
import { parseWktPolygon } from "../tgu-map-2d/geometry/wktParser";
|
||||
import { buildStationMarkers } from "../tgu-map-2d/Tgu2DMapLayers";
|
||||
@@ -360,8 +360,8 @@ export function TguEditorTab({ selectedSpacecraftId, selectedPlan, appliedRange,
|
||||
useEffect(() => {
|
||||
const controller = new AbortController();
|
||||
void fetchRequestsForMap({
|
||||
endFrom: toLocalIso(window.fromMs),
|
||||
beginTo: toLocalIso(window.toMs)
|
||||
endFrom: toUtcIso(window.fromMs),
|
||||
beginTo: toUtcIso(window.toMs)
|
||||
}).then((result) => {
|
||||
if (!controller.signal.aborted) {
|
||||
setRequestItems(result.items);
|
||||
@@ -458,7 +458,7 @@ export function TguEditorTab({ selectedSpacecraftId, selectedPlan, appliedRange,
|
||||
void buildSurveyRoute({
|
||||
satelliteId: numericNorad,
|
||||
// Окно задано явно (начало/конец) — строим вперёд от начала на выбранную длительность.
|
||||
time: toLocalIso(routeWindow.startMs),
|
||||
time: toUtcIso(routeWindow.startMs),
|
||||
durationSeconds,
|
||||
roll: routeRoll,
|
||||
captureAngle: DEFAULT_CAPTURE_ANGLE_DEG,
|
||||
@@ -617,9 +617,9 @@ export function TguEditorTab({ selectedSpacecraftId, selectedPlan, appliedRange,
|
||||
noradId: noradId ? Number(noradId) : 0,
|
||||
stationId: Number.isFinite(stationNum) ? stationNum : 0,
|
||||
revolution: work.revolution ?? 0,
|
||||
onStart: { time: toLocalIso(work.startMs).slice(0, 19), elevation: 0, azimuth: 0, range: 0 },
|
||||
onMaximum: { time: toLocalIso(midMs).slice(0, 19), elevation: 0, azimuth: 0, range: 0 },
|
||||
onStop: { time: toLocalIso(work.endMs).slice(0, 19), elevation: 0, azimuth: 0, range: 0 },
|
||||
onStart: { time: toUtcIso(work.startMs), elevation: 0, azimuth: 0, range: 0 },
|
||||
onMaximum: { time: toUtcIso(midMs), elevation: 0, azimuth: 0, range: 0 },
|
||||
onStop: { time: toUtcIso(work.endMs), elevation: 0, azimuth: 0, range: 0 },
|
||||
duration: Math.max(1, (work.endMs - work.startMs) / 1000)
|
||||
};
|
||||
editDropPrefillRef.current = { zone, surveyIds: work.surveyIds ?? [] };
|
||||
@@ -744,15 +744,15 @@ export function TguEditorTab({ selectedSpacecraftId, selectedPlan, appliedRange,
|
||||
if (editWork) await deleteEditedModeFromDraft(draftId, draftExistedBefore, editWork, "SURVEY");
|
||||
savedRoute = await saveSurveyRoute(draftId, {
|
||||
satelliteId: numericNorad,
|
||||
time: toLocalIso(routeWindow.startMs),
|
||||
time: toUtcIso(routeWindow.startMs),
|
||||
durationSeconds: routeDurationSeconds,
|
||||
roll: routeRoll,
|
||||
captureAngle: DEFAULT_CAPTURE_ANGLE_DEG,
|
||||
revolution: selectedShootPass.revolution ?? 0,
|
||||
anchor: "FORWARD",
|
||||
// Окно выбранного плана — чтобы при автосоздании миссии/плана задать корректный интервал.
|
||||
planStart: toLocalIso(selectedPlan.startMs),
|
||||
planEnd: toLocalIso(selectedPlan.endMs)
|
||||
planStart: toUtcIso(selectedPlan.startMs),
|
||||
planEnd: toUtcIso(selectedPlan.endMs)
|
||||
});
|
||||
setSurveyRoute(savedRoute);
|
||||
// Ждём перечитывания planModes ДО снятия editingWorkId ниже: иначе на миг editingModeId
|
||||
@@ -853,8 +853,8 @@ export function TguEditorTab({ selectedSpacecraftId, selectedPlan, appliedRange,
|
||||
zoneStop: selectedZone.onStop.time.slice(0, 19),
|
||||
surveyModeIds: [...selectedDropSurveyIds],
|
||||
// Окно выбранного плана — для автосоздания миссии/плана с корректным интервалом.
|
||||
planStart: toLocalIso(selectedPlan.startMs),
|
||||
planEnd: toLocalIso(selectedPlan.endMs)
|
||||
planStart: toUtcIso(selectedPlan.startMs),
|
||||
planEnd: toUtcIso(selectedPlan.endMs)
|
||||
});
|
||||
savedDropId = savedDrop.id;
|
||||
savedDropVolumeMb = savedDrop.volumeMb;
|
||||
|
||||
@@ -13,7 +13,7 @@ import { Tgu2DMapSidebar } from "./Tgu2DMapSidebar";
|
||||
import { Tgu2DMapToolbar } from "./Tgu2DMapToolbar";
|
||||
import { Tgu2DMapView } from "./Tgu2DMapView";
|
||||
import { getTgu2DMapIntervalState, TGU_2D_MAP_INTERVAL_WARNING } from "./tgu2DMapInterval";
|
||||
import { parseLocal, toLocalInputValue, toLocalIso } from "../../utils/localTime";
|
||||
import { parseLocal, toLocalInputValue, toUtcIso } from "../../utils/localTime";
|
||||
|
||||
type Tgu2DMapTabProps = {
|
||||
range: TimelineRange;
|
||||
@@ -82,8 +82,8 @@ export function Tgu2DMapTab({
|
||||
try {
|
||||
const result = await fetchRequestsForMap(
|
||||
{
|
||||
endFrom: toLocalIso(fromMs),
|
||||
beginTo: toLocalIso(toMs)
|
||||
endFrom: toUtcIso(fromMs),
|
||||
beginTo: toUtcIso(toMs)
|
||||
},
|
||||
(loaded, total) => {
|
||||
setRequestsState((current) => ({ ...current, loadedCount: loaded, totalItems: total }));
|
||||
|
||||
@@ -22,10 +22,10 @@ describe("futureZrvOptions", () => {
|
||||
]);
|
||||
});
|
||||
|
||||
it("produces naive (no zone) start/stop strings", () => {
|
||||
it("produces UTC start/stop strings", () => {
|
||||
const [option] = futureZrvOptions([zrv("2026-06-03T13:00:00", "2026-06-03T13:10:00")], NOW);
|
||||
expect(option.start).toBe("2026-06-03T13:00:00");
|
||||
expect(option.stop).toBe("2026-06-03T13:10:00");
|
||||
expect(option.start).toBe(new Date(2026, 5, 3, 13, 0, 0).toISOString());
|
||||
expect(option.stop).toBe(new Date(2026, 5, 3, 13, 10, 0).toISOString());
|
||||
expect(option.kppId).toBe("KPP-1");
|
||||
});
|
||||
});
|
||||
@@ -33,11 +33,11 @@ describe("futureZrvOptions", () => {
|
||||
describe("buildChainPlanRequest", () => {
|
||||
const start: ZrvOption = {
|
||||
id: "a", startMs: Date.UTC(2026, 5, 3, 13, 0, 0), endMs: Date.UTC(2026, 5, 3, 13, 10, 0),
|
||||
start: "2026-06-03T13:00:00", stop: "2026-06-03T13:10:00", kppId: "KPP-1"
|
||||
start: "2026-06-03T13:00:00.000Z", stop: "2026-06-03T13:10:00.000Z", kppId: "KPP-1"
|
||||
};
|
||||
const end: ZrvOption = {
|
||||
id: "b", startMs: Date.UTC(2026, 5, 3, 15, 0, 0), endMs: Date.UTC(2026, 5, 3, 15, 10, 0),
|
||||
start: "2026-06-03T15:00:00", stop: "2026-06-03T15:10:00", kppId: "KPP-2"
|
||||
start: "2026-06-03T15:00:00.000Z", stop: "2026-06-03T15:10:00.000Z", kppId: "KPP-2"
|
||||
};
|
||||
|
||||
it("spans from start zone begin to end zone finish and keeps the start kpp", () => {
|
||||
@@ -45,16 +45,16 @@ describe("buildChainPlanRequest", () => {
|
||||
expect(req).toEqual({
|
||||
spacecraftId: "25544",
|
||||
basePlanId: "base-1",
|
||||
windowStart: "2026-06-03T13:00:00",
|
||||
windowStop: "2026-06-03T15:10:00",
|
||||
windowStart: "2026-06-03T13:00:00.000Z",
|
||||
windowStop: "2026-06-03T15:10:00.000Z",
|
||||
windowKppId: "KPP-1"
|
||||
});
|
||||
});
|
||||
|
||||
it("allows a single-zone window (start == end zone)", () => {
|
||||
const req = buildChainPlanRequest("25544", null, start, start);
|
||||
expect(req.windowStart).toBe("2026-06-03T13:00:00");
|
||||
expect(req.windowStop).toBe("2026-06-03T13:10:00");
|
||||
expect(req.windowStart).toBe("2026-06-03T13:00:00.000Z");
|
||||
expect(req.windowStop).toBe("2026-06-03T13:10:00.000Z");
|
||||
expect(req.basePlanId).toBeNull();
|
||||
});
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { parseLocal, toLocalIso } from "../../utils/localTime";
|
||||
import { parseLocal, toUtcIso } from "../../utils/localTime";
|
||||
import type { CreateChainPlanRequest, ZrvWindowResponse } from "../../api/tguPlanApi";
|
||||
|
||||
/**
|
||||
* Опция выбора ЗРВ в диалоге «Создать план». Из стартовой зоны берутся начало окна и КПП, из
|
||||
* конечной — конец окна. `start`/`stop` — naive (ISO без зоны, локальное), как ждёт `LocalDateTime` бэка;
|
||||
* конечной — конец окна. `start`/`stop` — UTC ISO строки для API;
|
||||
* `startMs`/`endMs` — для сортировки/сравнения и подсветки на таймлайне.
|
||||
*/
|
||||
export type ZrvOption = {
|
||||
@@ -11,9 +11,9 @@ export type ZrvOption = {
|
||||
id: string;
|
||||
startMs: number;
|
||||
endMs: number;
|
||||
/** Naive (локальное) начала зоны. */
|
||||
/** UTC ISO начала зоны. */
|
||||
start: string;
|
||||
/** Naive (локальное) конца зоны. */
|
||||
/** UTC ISO конца зоны. */
|
||||
stop: string;
|
||||
kppId: string;
|
||||
};
|
||||
@@ -28,8 +28,8 @@ export function futureZrvOptions(windows: ZrvWindowResponse[], nowMs: number): Z
|
||||
id: `${zrv.kppId}|${zrv.startTime}|${zrv.endTime}`,
|
||||
startMs,
|
||||
endMs,
|
||||
start: toNaive(startMs),
|
||||
stop: toNaive(endMs),
|
||||
start: toApiUtc(startMs),
|
||||
stop: toApiUtc(endMs),
|
||||
kppId: zrv.kppId
|
||||
};
|
||||
})
|
||||
@@ -60,6 +60,6 @@ export function buildChainPlanRequest(
|
||||
};
|
||||
}
|
||||
|
||||
function toNaive(ms: number): string {
|
||||
return toLocalIso(ms);
|
||||
function toApiUtc(ms: number): string {
|
||||
return toUtcIso(ms);
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import type { RequestAtPoint } from "./RequestDetailsPanel";
|
||||
import type { Tgu2DMapSelection } from "../tgu-map-2d/model/mapSelectionTypes";
|
||||
import type { GeoPoint, MapPolygon } from "../tgu-map-2d/model/mapTypes";
|
||||
import { generateUuid } from "../../utils/uuid";
|
||||
import { parseLocal, toLocalInputValue, toLocalIso } from "../../utils/localTime";
|
||||
import { parseLocal, toLocalInputValue, toUtcIso } from "../../utils/localTime";
|
||||
import { DateTime24Field } from "../../components/timeFields";
|
||||
import { RequestCreatePanel, type RequestFormSubmit } from "./RequestCreatePanel";
|
||||
import { RequestDetailsPanel } from "./RequestDetailsPanel";
|
||||
@@ -82,7 +82,7 @@ export function TguRequestsTab({ range, invalidRange, platforms }: TguRequestsTa
|
||||
setRequestsState((current) => ({ ...current, loading: true, error: undefined, loadedCount: 0 }));
|
||||
try {
|
||||
const result = await fetchRequestsForMap(
|
||||
{ endFrom: toLocalIso(fromMs), beginTo: toLocalIso(toMs) },
|
||||
{ endFrom: toUtcIso(fromMs), beginTo: toUtcIso(toMs) },
|
||||
(loaded, total) => setRequestsState((current) => ({ ...current, loadedCount: loaded, totalItems: total }))
|
||||
);
|
||||
setRequestsState((current) => ({
|
||||
@@ -204,8 +204,8 @@ export function TguRequestsTab({ range, invalidRange, platforms }: TguRequestsTa
|
||||
name: form.name,
|
||||
geometry,
|
||||
importance: form.importance,
|
||||
beginDateTime: toLocalIso(parseLocal(form.beginDateTime)),
|
||||
endDateTime: toLocalIso(parseLocal(form.endDateTime)),
|
||||
beginDateTime: toUtcIso(parseLocal(form.beginDateTime)),
|
||||
endDateTime: toUtcIso(parseLocal(form.endDateTime)),
|
||||
kpp: form.kpp,
|
||||
highPriorityTransmit: form.highPriorityTransmit,
|
||||
optics: form.optics,
|
||||
|
||||
@@ -23,7 +23,7 @@ import type { Tgu2DMapLayersState } from "../tgu-map-2d/model/mapLayerTypes";
|
||||
import type { Tgu2DMapSelection } from "../tgu-map-2d/model/mapSelectionTypes";
|
||||
import { MapObjectInspector } from "../tgu-map-2d/MapObjectInspector";
|
||||
import { Tgu2DMapView } from "../tgu-map-2d/Tgu2DMapView";
|
||||
import { formatLocalDateTimeSeconds, parseLocal, toLocalInputValue, toLocalIso } from "../../utils/localTime";
|
||||
import { formatLocalDateTimeSeconds, parseLocal, toLocalInputValue, toUtcIso } from "../../utils/localTime";
|
||||
import { SlotDaySelector, type SlotDay } from "./SlotDaySelector";
|
||||
import { PassStepper } from "./PassStepper";
|
||||
import { groupPasses } from "./slotPasses";
|
||||
@@ -469,7 +469,7 @@ export function TguSlotsTab({ range }: TguSlotsTabProps) {
|
||||
setRequestsLoading(true);
|
||||
setRequestsError(undefined);
|
||||
try {
|
||||
const result = await fetchRequestsForMap({ endFrom: toLocalIso(fromMs), beginTo: toLocalIso(toMs) });
|
||||
const result = await fetchRequestsForMap({ endFrom: toUtcIso(fromMs), beginTo: toUtcIso(toMs) });
|
||||
setRequestItems(result.items);
|
||||
setRequestsTotal(result.totalItems);
|
||||
setRequestsTruncated(result.truncated);
|
||||
@@ -730,8 +730,8 @@ export function TguSlotsTab({ range }: TguSlotsTabProps) {
|
||||
const result = await fetchRequestSlots(
|
||||
{
|
||||
requestId: selectedRequestId,
|
||||
timeStart: toLocalIso(parsedRange.fromMs),
|
||||
timeStop: toLocalIso(parsedRange.toMs),
|
||||
timeStart: toUtcIso(parsedRange.fromMs),
|
||||
timeStop: toUtcIso(parsedRange.toMs),
|
||||
revSign: revSign || undefined,
|
||||
// cov=true (режим покрытия) ровно когда задана стратегия — это путь «Подобрать
|
||||
// покрытие». «Показать все слоты» идёт без стратегии и получает полный набор кандидатов,
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
/**
|
||||
* Единый разбор и форматирование времени в локальной зоне.
|
||||
* Единые утилиты времени для UI.
|
||||
*
|
||||
* Бэкенд (Kotlin `LocalDateTime`) отдаёт время как ISO-строку без зоны
|
||||
* (например `"2026-05-29T01:00:00"`) — это настенные часы локальной зоны, в которой
|
||||
* работают все сервисы, без UTC-семантики. Браузер по умолчанию трактует такую naive-строку
|
||||
* как локальное время — это нам и нужно: разбор, показ и ввод идут в зоне браузера, а
|
||||
* сериализация назад отдаёт те же настенные часы naive-строкой без зоны.
|
||||
* Контракт API после UTC-перевода:
|
||||
* - backend/БД/DTO используют UTC;
|
||||
* - API отдаёт ISO-8601 UTC с `Z`;
|
||||
* - UI показывает время в часовом поясе браузера;
|
||||
* - значения из локальных полей ввода перед отправкой в API конвертируются в UTC ISO.
|
||||
*
|
||||
* Строки с явной зоной (`...Z`/офсет, напр. валидность платформ из НСИ) парсятся как
|
||||
* абсолютный момент и показываются в локальной зоне.
|
||||
* Legacy-строки API без зоны всё ещё могут встретиться при неполностью обновлённых сервисах.
|
||||
* В основном UI они обычно приходят из локальных input-полей, поэтому `parseLocal` сохраняет старое
|
||||
* поведение: naive-строка разбирается как локальное время браузера. После полного перевода API
|
||||
* новые ответы должны приходить с `Z` и будут разобраны как абсолютный UTC-момент.
|
||||
*/
|
||||
|
||||
function pad(n: number): string {
|
||||
@@ -60,10 +62,15 @@ export function toLocalInputValue(ms: number): string {
|
||||
}
|
||||
|
||||
/**
|
||||
* naive `LocalDateTime` без зоны (`YYYY-MM-DDTHH:mm:ss`) из локальных компонент эпохи-мс.
|
||||
* Все бэкенды ожидают `LocalDateTime` без зоны — настенные часы локальной зоны.
|
||||
* Локальная ISO-строка без зоны (`YYYY-MM-DDTHH:mm:ss`) из локальных компонент.
|
||||
* Оставлена для локальных UI-расчётов и полей времени, не использовать для отправки API DTO.
|
||||
*/
|
||||
export function toLocalIso(ms: number): string {
|
||||
const d = new Date(ms);
|
||||
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
|
||||
}
|
||||
|
||||
/** UTC ISO-строка для DTO/query-параметров API. */
|
||||
export function toUtcIso(ms: number): string {
|
||||
return new Date(ms).toISOString();
|
||||
}
|
||||
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
package space.nstart.pcp.slots_service.configuration
|
||||
|
||||
import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
import org.springframework.core.convert.converter.Converter
|
||||
import org.springframework.format.FormatterRegistry
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import tools.jackson.core.JsonGenerator
|
||||
import tools.jackson.core.JsonParser
|
||||
import tools.jackson.databind.DeserializationContext
|
||||
import tools.jackson.databind.SerializationContext
|
||||
import tools.jackson.databind.deser.std.StdDeserializer
|
||||
import tools.jackson.databind.module.SimpleModule
|
||||
import tools.jackson.databind.ser.std.StdSerializer
|
||||
import java.time.Clock
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Configuration
|
||||
class UtcTimeConfiguration : WebMvcConfigurer {
|
||||
|
||||
@Bean
|
||||
fun clock(): Clock = Clock.systemUTC()
|
||||
|
||||
@Bean
|
||||
fun pcpUiUtcLocalDateTimeCustomizer(): JsonMapperBuilderCustomizer = JsonMapperBuilderCustomizer { builder ->
|
||||
builder.addModule(
|
||||
SimpleModule("pcp-ui-service-utc-local-date-time")
|
||||
.addSerializer(LocalDateTime::class.java, UtcLocalDateTimeSerializer())
|
||||
.addDeserializer(LocalDateTime::class.java, UtcLocalDateTimeDeserializer())
|
||||
)
|
||||
}
|
||||
|
||||
override fun addFormatters(registry: FormatterRegistry) {
|
||||
registry.addConverter(UtcLocalDateTimeQueryParamConverter())
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeQueryParamConverter : Converter<String, LocalDateTime> {
|
||||
override fun convert(source: String): LocalDateTime = UtcDateTimes.parse(source)
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeSerializer : StdSerializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun serialize(value: LocalDateTime, gen: JsonGenerator, ctxt: SerializationContext) {
|
||||
gen.writeString(UtcDateTimes.format(value))
|
||||
}
|
||||
}
|
||||
|
||||
private class UtcLocalDateTimeDeserializer : StdDeserializer<LocalDateTime>(LocalDateTime::class.java) {
|
||||
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime {
|
||||
val value = p.valueAsString ?: throw IllegalArgumentException("Expected ISO-8601 UTC date-time string")
|
||||
return UtcDateTimes.parse(value)
|
||||
}
|
||||
}
|
||||
+2
-3
@@ -1,6 +1,5 @@
|
||||
package space.nstart.pcp.slots_service.controller
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat
|
||||
import org.springframework.web.bind.annotation.GetMapping
|
||||
import org.springframework.web.bind.annotation.RequestMapping
|
||||
import org.springframework.web.bind.annotation.RequestParam
|
||||
@@ -46,8 +45,8 @@ class BookingsController(
|
||||
|
||||
@GetMapping
|
||||
fun bookedSlots(
|
||||
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) timeStart: LocalDateTime?,
|
||||
@RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) timeStop: LocalDateTime?,
|
||||
@RequestParam(required = false) timeStart: LocalDateTime?,
|
||||
@RequestParam(required = false) timeStop: LocalDateTime?,
|
||||
@RequestParam(required = false) requestId: String?,
|
||||
@RequestParam(required = false) satelliteIds: List<Long>?,
|
||||
): List<BookedSlotViewDTO> {
|
||||
|
||||
+5
-2
@@ -27,6 +27,7 @@ import space.nstart.pcp.slots_service.service.BallisticsService
|
||||
import space.nstart.pcp.slots_service.service.SatelliteCatalogService
|
||||
import space.nstart.pcp.slots_service.service.SatellitePdcmService
|
||||
import space.nstart.pcp.slots_service.service.SlotService
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
import java.time.format.DateTimeFormatter
|
||||
import java.time.format.DateTimeParseException
|
||||
@@ -103,14 +104,16 @@ class CatalogRestController(
|
||||
|
||||
private fun parseSendInitialConditionsTime(time: String?): LocalDateTime {
|
||||
val normalizedTime = time?.trim()?.takeIf { it.isNotEmpty() }
|
||||
?: return LocalDateTime.now()
|
||||
?: return UtcDateTimes.now()
|
||||
|
||||
UtcDateTimes.parseOrNull(normalizedTime)?.let { return it }
|
||||
|
||||
return try {
|
||||
LocalDateTime.parse(normalizedTime, sendInitialConditionsTimeFormatter)
|
||||
} catch (exception: DateTimeParseException) {
|
||||
throw ResponseStatusException(
|
||||
HttpStatus.BAD_REQUEST,
|
||||
"Параметр time должен быть в формате dd.mm.yyyy hh:MM:ss.zzz",
|
||||
"Параметр time должен быть ISO-8601 UTC/offset или legacy dd.mm.yyyy hh:MM:ss.zzz",
|
||||
exception
|
||||
)
|
||||
}
|
||||
|
||||
+3
-2
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.AngularMotionCalculationRequestDTO
|
||||
import space.nstart.pcp.slots_service.dto.dynamicplan.DynamicPlanCalculationRequestDTO
|
||||
import space.nstart.pcp.slots_service.service.DynamicPlanService
|
||||
import java.time.LocalDateTime
|
||||
import java.util.UUID
|
||||
|
||||
@Controller
|
||||
@@ -83,14 +84,14 @@ class AngularMotionRestController(
|
||||
) {
|
||||
@GetMapping("/satellites")
|
||||
@ResponseBody
|
||||
fun satellites(@RequestParam(required = false) time: String?) =
|
||||
fun satellites(@RequestParam(required = false) time: LocalDateTime?) =
|
||||
dynamicPlanService.getAngularMotionSatellites(time)
|
||||
|
||||
@GetMapping("/satellites/{satelliteId}/flight-line")
|
||||
@ResponseBody
|
||||
fun flightLine(
|
||||
@PathVariable satelliteId: Long,
|
||||
@RequestParam time: String
|
||||
@RequestParam time: LocalDateTime
|
||||
) = dynamicPlanService.getAngularMotionFlightLine(satelliteId, time)
|
||||
|
||||
@PostMapping("/calculate")
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ class MapController {
|
||||
fun showMap(model: Model): Mono<String> {
|
||||
model.addAttribute("requests", earthService.reqs().collectList().block())
|
||||
model.addAttribute("satellites", complexMissionService.satellites().collectList().block())
|
||||
model.addAttribute("stations", stationService.stations().collectList().block())
|
||||
model.addAttribute("stations", stationService.allStationsOrEmpty())
|
||||
return Mono.just("map")
|
||||
}
|
||||
|
||||
|
||||
+2
-3
@@ -15,9 +15,9 @@ import space.nstart.pcp.slots_service.dto.tlecomparison.TlePositionDTO
|
||||
import space.nstart.pcp.slots_service.dto.tlecomparison.TlePositionDeltaDTO
|
||||
import space.nstart.pcp.slots_service.dto.tlecomparison.TleTextRequestDTO
|
||||
import space.nstart.pcp.slots_service.service.BallisticsService
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.Duration
|
||||
import java.time.LocalDateTime
|
||||
import java.time.format.DateTimeFormatter
|
||||
import java.util.Locale
|
||||
import kotlin.math.abs
|
||||
import kotlin.math.sqrt
|
||||
@@ -144,14 +144,13 @@ class TleComparisonController(
|
||||
)
|
||||
|
||||
private fun timeRow(code: String, name: String, first: LocalDateTime?, second: LocalDateTime?): TleCompareRowDTO {
|
||||
val formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME
|
||||
val delta = if (first != null && second != null) {
|
||||
val seconds = Duration.between(first, second).seconds
|
||||
formatSecondsDelta(seconds)
|
||||
} else {
|
||||
null
|
||||
}
|
||||
return TleCompareRowDTO(code, name, first?.format(formatter), second?.format(formatter), delta)
|
||||
return TleCompareRowDTO(code, name, first?.let(UtcDateTimes::format), second?.let(UtcDateTimes::format), delta)
|
||||
}
|
||||
|
||||
private fun numberRow(code: String, name: String, first: Double?, second: Double?): TleCompareRowDTO =
|
||||
|
||||
+3
-7
@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema
|
||||
import lombok.AllArgsConstructor
|
||||
import lombok.Data
|
||||
import lombok.NoArgsConstructor
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
|
||||
|
||||
@@ -23,13 +24,8 @@ class CZMLClock(
|
||||
var step : String = "SYSTEM_CLOCK_MULTIPLIER"
|
||||
) {
|
||||
constructor(tn : LocalDateTime, tk : LocalDateTime, cur : LocalDateTime) : this(
|
||||
interval ="${
|
||||
tn.toString()
|
||||
}/${
|
||||
tk
|
||||
.toString()
|
||||
}",
|
||||
currentTime = cur.toString()
|
||||
interval = "${UtcDateTimes.format(tn)}/${UtcDateTimes.format(tk)}",
|
||||
currentTime = UtcDateTimes.format(cur)
|
||||
)
|
||||
|
||||
}
|
||||
+13
-28
@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor
|
||||
import lombok.Data
|
||||
import lombok.NoArgsConstructor
|
||||
import space.nstart.pcp.pcp_types_lib.dto.ballistics.AscNodeDTO
|
||||
import space.nstart.pcp.pcp_types_lib.utils.UtcDateTimes
|
||||
import java.time.LocalDateTime
|
||||
import java.time.ZoneOffset
|
||||
|
||||
@@ -28,6 +29,10 @@ class CZMLPath(
|
||||
|
||||
private fun fromDateTime(t: LocalDateTime) = t.toEpochSecond(ZoneOffset.UTC) + t.nano / 1e9
|
||||
|
||||
private fun utcIso(t: Double): String = UtcDateTimes.format(
|
||||
LocalDateTime.ofEpochSecond(t.toLong(), ((t % 1) * 1e9).toInt(), ZoneOffset.UTC)
|
||||
)
|
||||
|
||||
constructor(
|
||||
vuz: Iterable<AscNodeDTO>, epoch: LocalDateTime, epochStop: LocalDateTime, width: Int, resolution: Int,
|
||||
material: CZMLMaterial
|
||||
@@ -44,26 +49,16 @@ class CZMLPath(
|
||||
if (dt > 1) {
|
||||
lt.add(
|
||||
CZMLInterval(
|
||||
"${
|
||||
LocalDateTime.ofEpochSecond((t).toLong(), (t % 1 * 1e9).toInt(), ZoneOffset.UTC)
|
||||
}/${
|
||||
LocalDateTime.ofEpochSecond(fromDateTime(v.time).toLong(), (fromDateTime(v.time) % 1 * 1e9).toInt(), ZoneOffset.UTC)
|
||||
.toString()
|
||||
}",
|
||||
LocalDateTime.ofEpochSecond((t).toLong(), (t % 1 * 1e9).toInt(), ZoneOffset.UTC).toString(),
|
||||
"${utcIso(t)}/${utcIso(fromDateTime(v.time))}",
|
||||
utcIso(t),
|
||||
listOf(0.0, dt, dt, 0.0)
|
||||
)
|
||||
)
|
||||
|
||||
tt.add(
|
||||
CZMLInterval(
|
||||
"${
|
||||
LocalDateTime.ofEpochSecond(t.toLong(), ((t) % 1 * 1e9).toInt(), ZoneOffset.UTC)
|
||||
}/${
|
||||
LocalDateTime.ofEpochSecond((fromDateTime(v.time)).toLong(), (fromDateTime(v.time) % 1 * 1e9).toInt(), ZoneOffset.UTC)
|
||||
.toString()
|
||||
}",
|
||||
LocalDateTime.ofEpochSecond((t).toLong(), (t % 1 * 1e9).toInt(), ZoneOffset.UTC).toString(),
|
||||
"${utcIso(t)}/${utcIso(fromDateTime(v.time))}",
|
||||
utcIso(t),
|
||||
listOf(0.0, 0.0, dt, dt)
|
||||
)
|
||||
)
|
||||
@@ -76,26 +71,16 @@ class CZMLPath(
|
||||
if (dt > 1) {
|
||||
lt.add(
|
||||
CZMLInterval(
|
||||
"${
|
||||
LocalDateTime.ofEpochSecond((t).toLong(), (t % 1 * 1e9).toInt(), ZoneOffset.UTC)
|
||||
}/${
|
||||
LocalDateTime.ofEpochSecond((tk).toLong(), (tk % 1 * 1e9).toInt(), ZoneOffset.UTC)
|
||||
.toString()
|
||||
}",
|
||||
LocalDateTime.ofEpochSecond((t).toLong(), (t % 1 * 1e9).toInt(), ZoneOffset.UTC).toString(),
|
||||
"${utcIso(t)}/${utcIso(tk)}",
|
||||
utcIso(t),
|
||||
listOf(0.0, dt, dt, 0.0)
|
||||
)
|
||||
)
|
||||
|
||||
tt.add(
|
||||
CZMLInterval(
|
||||
"${
|
||||
LocalDateTime.ofEpochSecond((t).toLong(), (t % 1 * 1e9).toInt(), ZoneOffset.UTC)
|
||||
}/${
|
||||
LocalDateTime.ofEpochSecond((tk).toLong(), (tk % 1 * 1e9).toInt(), ZoneOffset.UTC)
|
||||
.toString()
|
||||
}",
|
||||
LocalDateTime.ofEpochSecond((t).toLong(), (t % 1 * 1e9).toInt(), ZoneOffset.UTC).toString(),
|
||||
"${utcIso(t)}/${utcIso(tk)}",
|
||||
utcIso(t),
|
||||
listOf(0.0, 0.0, dt, dt)
|
||||
)
|
||||
)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user