Задание НУ из ui

2026-05-29 12:41:32 +03:00
parent d693bf799d
commit 3fd702ca47
12 changed files with 418 additions and 12 deletions
@@ -42,6 +42,14 @@ class SatelliteController {
        return ResponseEntity.accepted().build()
    }

+    @GetMapping("/{satellite_id}/initial-conditions/current")
+    fun currentInitialConditions(
+        @PathVariable("satellite_id") satelliteId: Long
+    ): ResponseEntity<SatelliteICDTO> =
+        satelliteService.currentInitialConditions(satelliteId)
+            ?.let { ResponseEntity.ok(it) }
+            ?: ResponseEntity.noContent().build()
+


    @Operation(
@@ -0,0 +1,94 @@
+package space.nstart.pcp.pcp_request_service.entity
+
+import jakarta.persistence.Column
+import jakarta.persistence.Entity
+import jakarta.persistence.EnumType
+import jakarta.persistence.Enumerated
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
+import jakarta.persistence.Table
+import space.nstart.pcp.pcp_types_lib.dto.ballistics.InitialConditionsDTO
+import space.nstart.pcp.pcp_types_lib.dto.ballistics.MovementModel
+import space.nstart.pcp.pcp_types_lib.dto.ballistics.OrbPointDTO
+import space.nstart.pcp.pcp_types_lib.dto.ballistics.SatelliteICDTO
+import java.time.LocalDateTime
+
+@Entity
+@Table(name = "satellite_initial_conditions")
+class SatelliteInitialConditionEntity(
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "satellite_initial_condition_id")
+    val id: Long? = null,
+    @Column(name = "satellite_id", nullable = false)
+    val satelliteId: Long = 0,
+    @Enumerated(EnumType.STRING)
+    @Column(name = "movement_model", nullable = false)
+    val movementModel: MovementModel = MovementModel.FOTO,
+    @Column(name = "orb_time", nullable = false)
+    val orbTime: LocalDateTime = LocalDateTime.now(),
+    @Column(name = "orb_revolution", nullable = false)
+    val orbRevolution: Long = 0,
+    @Column(nullable = false)
+    val x: Double = 0.0,
+    @Column(nullable = false)
+    val y: Double = 0.0,
+    @Column(nullable = false)
+    val z: Double = 0.0,
+    @Column(nullable = false)
+    val vx: Double = 0.0,
+    @Column(nullable = false)
+    val vy: Double = 0.0,
+    @Column(nullable = false)
+    val vz: Double = 0.0,
+    @Column(name = "s_ball", nullable = false)
+    val sBall: Double = 0.0,
+    @Column(nullable = false)
+    val f81: Double = 147.8,
+    @Column(name = "received_at", nullable = false)
+    val receivedAt: LocalDateTime = LocalDateTime.now(),
+    @Column(name = "calculated_at")
+    var calculatedAt: LocalDateTime? = null,
+    @Column(name = "last_calculated", nullable = false)
+    var lastCalculated: Boolean = false
+) {
+    constructor(request: SatelliteICDTO) : this(
+        satelliteId = request.satelliteId,
+        movementModel = request.movementModel,
+        orbTime = request.ic.orbPoint.time,
+        orbRevolution = request.ic.orbPoint.revolution,
+        x = request.ic.orbPoint.x,
+        y = request.ic.orbPoint.y,
+        z = request.ic.orbPoint.z,
+        vx = request.ic.orbPoint.vx,
+        vy = request.ic.orbPoint.vy,
+        vz = request.ic.orbPoint.vz,
+        sBall = request.ic.sBall,
+        f81 = request.ic.f81
+    )
+
+    fun markLastCalculated(calculatedAt: LocalDateTime = LocalDateTime.now()) {
+        this.calculatedAt = calculatedAt
+        this.lastCalculated = true
+    }
+
+    fun toDto() = SatelliteICDTO(
+        satelliteId = satelliteId,
+        movementModel = movementModel,
+        ic = InitialConditionsDTO(
+            orbPoint = OrbPointDTO(
+                time = orbTime,
+                revolution = orbRevolution,
+                vx = vx,
+                vy = vy,
+                vz = vz,
+                x = x,
+                y = y,
+                z = z
+            ),
+            sBall = sBall,
+            f81 = f81
+        )
+    )
+}
@@ -0,0 +1,26 @@
+package space.nstart.pcp.pcp_request_service.repository
+
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Modifying
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
+import org.springframework.transaction.annotation.Transactional
+import space.nstart.pcp.pcp_request_service.entity.SatelliteInitialConditionEntity
+
+interface SatelliteInitialConditionRepository : JpaRepository<SatelliteInitialConditionEntity, Long> {
+    fun findFirstBySatelliteIdAndLastCalculatedTrueOrderByCalculatedAtDescIdDesc(
+        satelliteId: Long
+    ): SatelliteInitialConditionEntity?
+
+    @Modifying
+    @Transactional
+    @Query(
+        """
+        update SatelliteInitialConditionEntity entity
+        set entity.lastCalculated = false
+        where entity.satelliteId = :satelliteId
+          and entity.lastCalculated = true
+        """
+    )
+    fun clearLastCalculated(@Param("satelliteId") satelliteId: Long): Int
+}
@@ -0,0 +1,30 @@
+package space.nstart.pcp.pcp_request_service.service
+
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+import space.nstart.pcp.pcp_request_service.entity.SatelliteInitialConditionEntity
+import space.nstart.pcp.pcp_request_service.repository.SatelliteInitialConditionRepository
+import space.nstart.pcp.pcp_types_lib.dto.ballistics.SatelliteICDTO
+
+@Service
+class SatelliteInitialConditionService(
+    private val satelliteInitialConditionRepository: SatelliteInitialConditionRepository
+) {
+
+    @Transactional
+    fun saveReceived(request: SatelliteICDTO): SatelliteInitialConditionEntity =
+        satelliteInitialConditionRepository.save(SatelliteInitialConditionEntity(request))
+
+    @Transactional
+    fun markLastCalculated(initialCondition: SatelliteInitialConditionEntity) {
+        satelliteInitialConditionRepository.clearLastCalculated(initialCondition.satelliteId)
+        initialCondition.markLastCalculated()
+        satelliteInitialConditionRepository.save(initialCondition)
+    }
+
+    @Transactional(readOnly = true)
+    fun current(satelliteId: Long): SatelliteICDTO? =
+        satelliteInitialConditionRepository
+            .findFirstBySatelliteIdAndLastCalculatedTrueOrderByCalculatedAtDescIdDesc(satelliteId)
+            ?.toDto()
+}
@@ -89,6 +89,10 @@ class SatelliteService {

    @Autowired
    private lateinit var pdcmRepository: PDCMRepository
+
+    @Autowired
+    private lateinit var satelliteInitialConditionService: SatelliteInitialConditionService
+
    @Autowired
    private lateinit var ascNodeRepository: AscNodeRepository
    @Autowired
@@ -185,6 +189,7 @@ class SatelliteService {
    )

    suspend fun resieveRV(rv: SatelliteICDTO) {
+        val savedInitialCondition = satelliteInitialConditionService.saveReceived(rv)
        val bal = Ballistics()
        bal.modDVType = rv.movementModel.toModDVType()

@@ -230,10 +235,15 @@ class SatelliteService {

        prepareEarthCovering(bal, rv.satelliteId)

+        satelliteInitialConditionService.markLastCalculated(savedInitialCondition)
+
        bal.clear()
        logger.info("Расчет для КА ${rv.satelliteId} завершился успешно")
    }

+    fun currentInitialConditions(satelliteId: Long): SatelliteICDTO? =
+        satelliteInitialConditionService.current(satelliteId)
+
    private fun MovementModel.toModDVType(): ModDVType =
        when (this) {
            MovementModel.FOTO -> ModDVType.FOTO
@@ -893,3 +903,16 @@ data class SatelliteBallisticsDeletionSummary(
    val earthCoverageDeleted: Int,
    val earthCellViewsDeleted: Int
 )
+
+
+
+//DT: 11.12.2028 01:24:24.257000000 MDT
+//x=  2610612.004898679
+//y= -3507514.947081291
+//z= -5291534.374006776
+//Vx= -4935.515395115775
+//Vy=  3497.047795669036
+//Vz= -4742.501356855924
+//CS: GSK
+//Sb= 0.06
+//kappa= 0
@@ -0,0 +1,21 @@
+CREATE TABLE IF NOT EXISTS satellite_initial_conditions (
+    satellite_initial_condition_id BIGSERIAL PRIMARY KEY,
+    satellite_id BIGINT NOT NULL,
+    movement_model VARCHAR(32) NOT NULL DEFAULT 'FOTO',
+    orb_time TIMESTAMP NOT NULL,
+    orb_revolution BIGINT NOT NULL,
+    x DOUBLE PRECISION NOT NULL,
+    y DOUBLE PRECISION NOT NULL,
+    z DOUBLE PRECISION NOT NULL,
+    vx DOUBLE PRECISION NOT NULL,
+    vy DOUBLE PRECISION NOT NULL,
+    vz DOUBLE PRECISION NOT NULL,
+    s_ball DOUBLE PRECISION NOT NULL,
+    f81 DOUBLE PRECISION NOT NULL,
+    received_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    calculated_at TIMESTAMP,
+    last_calculated BOOLEAN NOT NULL DEFAULT FALSE
+);
+
+CREATE INDEX idx_satellite_initial_conditions_satellite_id ON satellite_initial_conditions(satellite_id);
+CREATE INDEX idx_satellite_initial_conditions_last_calculated ON satellite_initial_conditions(satellite_id, last_calculated);
@@ -14,6 +14,11 @@ import org.springframework.kafka.core.DefaultKafkaConsumerFactory
 import org.springframework.kafka.listener.adapter.RecordFilterStrategy
 import org.springframework.transaction.annotation.Transactional
 import space.nstart.pcp.pcp_request_service.entity.PDCMEntity
+import space.nstart.pcp.pcp_request_service.entity.SatelliteInitialConditionEntity
+import space.nstart.pcp.pcp_types_lib.dto.ballistics.InitialConditionsDTO
+import space.nstart.pcp.pcp_types_lib.dto.ballistics.MovementModel
+import space.nstart.pcp.pcp_types_lib.dto.ballistics.OrbPointDTO
+import space.nstart.pcp.pcp_types_lib.dto.ballistics.SatelliteICDTO
 import java.time.LocalDateTime
 import kotlin.test.assertEquals

@@ -41,6 +46,9 @@ class PDCMRepositoryTest {
    @Autowired
    private lateinit var repository: PDCMRepository

+    @Autowired
+    private lateinit var satelliteInitialConditionRepository: SatelliteInitialConditionRepository
+
    @Test
    fun `find satellite orbit availability returns all satellites with points when time is null`() {
        persistPoint(11L, LocalDateTime.of(2026, 4, 14, 10, 0))
@@ -74,6 +82,34 @@ class PDCMRepositoryTest {
        assertEquals(LocalDateTime.of(2026, 4, 14, 12, 0), actual.single().timeStop)
    }

+    @Test
+    fun `satellite initial conditions repository returns last calculated condition`() {
+        val oldCondition = satelliteInitialConditionRepository.save(sampleInitialCondition(11L, 1L))
+        oldCondition.markLastCalculated(LocalDateTime.of(2026, 4, 14, 10, 0))
+        satelliteInitialConditionRepository.save(oldCondition)
+
+        val newCondition = satelliteInitialConditionRepository.save(sampleInitialCondition(11L, 2L))
+        satelliteInitialConditionRepository.clearLastCalculated(11L)
+        newCondition.markLastCalculated(LocalDateTime.of(2026, 4, 14, 12, 0))
+        satelliteInitialConditionRepository.save(newCondition)
+        satelliteInitialConditionRepository.save(sampleInitialCondition(11L, 3L))
+
+        entityManager.flush()
+        entityManager.clear()
+
+        val actual = satelliteInitialConditionRepository
+            .findFirstBySatelliteIdAndLastCalculatedTrueOrderByCalculatedAtDescIdDesc(11L)
+
+        assertEquals(2L, actual?.toDto()?.ic?.orbPoint?.revolution)
+        assertEquals(MovementModel.KONDOR, actual?.movementModel)
+        assertEquals(
+            1,
+            satelliteInitialConditionRepository.findAll().count { entity ->
+                entity.satelliteId == 11L && entity.lastCalculated
+            }
+        )
+    }
+
    private fun persistPoint(satelliteId: Long, time: LocalDateTime) {
        entityManager.persist(
            PDCMEntity(
@@ -91,6 +127,28 @@ class PDCMRepositoryTest {
        entityManager.flush()
    }

+    private fun sampleInitialCondition(satelliteId: Long, revolution: Long) =
+        SatelliteInitialConditionEntity(
+            SatelliteICDTO(
+                satelliteId = satelliteId,
+                movementModel = MovementModel.KONDOR,
+                ic = InitialConditionsDTO(
+                    orbPoint = OrbPointDTO(
+                        time = LocalDateTime.of(2026, 4, 14, 10, 0).plusHours(revolution),
+                        revolution = revolution,
+                        vx = 1.0,
+                        vy = 2.0,
+                        vz = 3.0,
+                        x = 4.0,
+                        y = 5.0,
+                        z = 6.0
+                    ),
+                    sBall = 0.2,
+                    f81 = 141.0
+                )
+            )
+        )
+
    @TestConfiguration
    class KafkaFilterStubConfiguration {
        @Bean("kafkaListenerContainerFactory")