Merge pull request #83 from Capstone-QuarterBack/feature

Feature

Author: dbspq52

src/main/java/com/example/quaterback/api/domain/charger/entity/ChargerEntity.java

@@ -39,6 +39,7 @@ public class ChargerEntity {
 
     public ChargerDomain toDomain() {
         return ChargerDomain.builder()
+                .id(id)
                 .stationId(station.getStationId())
                 .evseId(evseId)
                 .chargerStatus(chargerStatus)

src/main/java/com/example/quaterback/api/domain/txinfo/repository/SpringDataJpaTxInfoRepository.java

@@ -229,4 +229,7 @@ WHEN HOUR(started_time) >= 6 AND HOUR(started_time) < 18 THEN 'DAY'
         GROUP BY timeType
         """, nativeQuery = true)
     List<DayNightMeterValueDto> findMeterValueGroupedByTimeType();
+
+    TransactionInfoEntity findTop1ByEvseId_IdOrderByStartedTimeDesc(Long chargerPk);
+
 }

src/main/java/com/example/quaterback/api/domain/txlog/repository/SpringDataJpaTxLogRepository.java

@@ -5,11 +5,14 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface SpringDataJpaTxLogRepository extends JpaRepository<TransactionLogEntity, Long> {
     @Query("SELECT AVG(t.meterValue) FROM TransactionLogEntity t WHERE t.transactionId = :transactionId")
     Integer avgMeterValueByTransactionId(@Param("transactionId") String transactionId);
 
     TransactionLogEntity findTopByTransactionIdOrderByTimestampDesc(String txId);
+
+    List<TransactionLogEntity> findByTransactionIdOrderByTimestampAsc(String transactionId);
 }

src/main/java/com/example/quaterback/api/feature/monitoring/controller/StationMonitoringController.java

@@ -2,6 +2,7 @@
 
 import com.example.quaterback.api.feature.monitoring.dto.response.*;
 import com.example.quaterback.api.feature.monitoring.facade.StationMonitoringFacade;
+import com.example.quaterback.websocket.transaction.event.service.TransactionEventService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -18,6 +19,7 @@
 public class StationMonitoringController {
 
     private final StationMonitoringFacade stationMonitoringFacade;
+    private final TransactionEventService transactionEventService;
 
     @GetMapping("/charging-history/{stationId}")
     public ChargingRecordResponsePage getChargingHistoryPaged(
@@ -74,4 +76,13 @@ public Long todoCharger() {
     public EssValueResponse getEssValue(@PathVariable(name = "stationId") String stationId) {
         return stationMonitoringFacade.getEssValue(stationId);
     }
+
+    @GetMapping("/live-streaming/{evseId}/{stationId}")
+    public List<TimeAndValueDto> getLive(
+            @PathVariable(name = "evseId") Integer evseId,
+            @PathVariable(name = "stationId") String stationId
+    ){
+         return transactionEventService.getLiveInfo(evseId,stationId);
+
+    }
 }

src/main/java/com/example/quaterback/api/feature/monitoring/dto/response/TimeAndValueDto.java

@@ -0,0 +1,20 @@
+package com.example.quaterback.api.feature.monitoring.dto.response;
+
+import com.example.quaterback.api.domain.txlog.entity.TransactionLogEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TimeAndValueDto {
+    LocalDateTime timestamp;
+    Double value;
+
+    public static TimeAndValueDto from(TransactionLogEntity entity){
+        return new TimeAndValueDto(entity.getTimestamp(), entity.getMeterValue());
+    }
+}

src/main/java/com/example/quaterback/websocket/transaction/event/service/TransactionEventService.java

@@ -1,9 +1,16 @@
 package com.example.quaterback.websocket.transaction.event.service;
 
+import com.example.quaterback.api.domain.charger.domain.ChargerDomain;
+import com.example.quaterback.api.domain.charger.repository.ChargerRepository;
+import com.example.quaterback.api.domain.station.repository.ChargingStationRepository;
 import com.example.quaterback.api.domain.txinfo.domain.TransactionInfoDomain;
+import com.example.quaterback.api.domain.txinfo.entity.TransactionInfoEntity;
+import com.example.quaterback.api.domain.txinfo.repository.SpringDataJpaTxInfoRepository;
 import com.example.quaterback.api.domain.txinfo.repository.TxInfoRepository;
 import com.example.quaterback.api.domain.txinfo.service.TransactionInfoService;
 import com.example.quaterback.api.domain.txlog.domain.TransactionLogDomain;
+import com.example.quaterback.api.domain.txlog.entity.TransactionLogEntity;
+import com.example.quaterback.api.domain.txlog.repository.SpringDataJpaTxLogRepository;
 import com.example.quaterback.api.domain.txlog.repository.TxLogRepository;
 import com.example.quaterback.api.feature.dashboard.dto.query.ChargerUsageQuery;
 import com.example.quaterback.api.feature.dashboard.dto.query.DashboardSummaryQuery;
@@ -15,6 +22,7 @@
 import com.example.quaterback.api.feature.monitoring.dto.query.DailyUsageQuery;
 import com.example.quaterback.api.feature.monitoring.dto.query.HourlyCongestionQuery;
 import com.example.quaterback.api.feature.monitoring.dto.response.HourlyCongestion;
+import com.example.quaterback.api.feature.monitoring.dto.response.TimeAndValueDto;
 import com.example.quaterback.common.redis.service.RedisMapSessionToStationService;
 import com.example.quaterback.websocket.transaction.event.converter.TransactionEventConverter;
 import com.example.quaterback.websocket.transaction.event.domain.TransactionEventDomain;
@@ -39,7 +47,9 @@ public class TransactionEventService {
     private final TxLogRepository txLogRepository;
     private final RedisMapSessionToStationService redisMappingService;
     private final TransactionInfoService transactionInfoService;
-
+    private final ChargerRepository chargerRepository;
+    private final SpringDataJpaTxInfoRepository springDataJpaTxInfoRepository;
+    private final SpringDataJpaTxLogRepository springDataJpaTxLogRepository;
     public String saveTxInfo(JsonNode jsonNode, String sessionId) {
         TransactionEventDomain txEventDomain = converter.convertToStartedTransactionDomain(jsonNode);
 
@@ -109,4 +119,17 @@ public Page<TransactionInfoDomain> findTransactionInfo(String stationId, Integer
     public DailyUsageQuery findOneDayUsageInfo(String stationId, Integer evseId, LocalDate date) {
         return txInfoRepository.findDailyUsageByEvseIdAndDate( stationId, evseId, date);
     }
+
+
+    public List<TimeAndValueDto> getLiveInfo (Integer evseId, String stationId) {
+        log.info("1");
+        ChargerDomain chargerDomain =  chargerRepository.findByStationIdAndEvseId(stationId, evseId);
+        log.info(chargerDomain.getId().toString());
+        TransactionInfoEntity transactionInfoEntity = springDataJpaTxInfoRepository.findTop1ByEvseId_IdOrderByStartedTimeDesc(chargerDomain.getId());
+        log.info("3");
+        List<TransactionLogEntity> txEntities = springDataJpaTxLogRepository.findByTransactionIdOrderByTimestampAsc(transactionInfoEntity.getTransactionId());
+        log.info("4");
+        return txEntities.stream()
+                .map(TimeAndValueDto::from).toList();
+    }
 }