[FEAT] 버스위치정보 수집 스케줄러 및 버스 통계 서비스 구현

data/mysql-files/bus_route_station.csv

@@ -152020,3 +152020,4 @@ routeId,stationId,stationSeq,stationName,mobileNo,regionName,districtCd,centerYn
 249000002,206000564,5,봇들육교,07510,성남,2,N,N,127.1076667,37.4033667
 249000002,206000540,6,삼평교,07496,성남,2,N,N,127.1047833,37.4041333
 249000002,204000341,7,기업성장센터,05332,성남,2,N,N,127.0948,37.4112833
+200000108,200000068,65,율전중학교,01002,수원,2,N,N,126.9658333,37.3010333

data/mysql-files/bus_station.csv

@@ -31187,3 +31187,4 @@ stationId,stationName,mobileNo,regionName,districtCd,centerYn,turnYn,x,y
 234000329,풍산목재,38164,광주,2,N,N,127.2269,37.3608
 234000328,오포1동행정복지센터.오포파출소,38534,광주,2,N,N,127.2318,37.3669
 219000149,중산마을10단지.동신아파트,20259,고양,2,N,N,126.7788333,37.68725
+200000068,율전중학교,01002,수원,2,N,N,126.9658333,37.3010333

server/build.gradle

@@ -33,8 +33,13 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     // XML Parser
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
+
+    // Spring Retry
+    implementation 'org.springframework.retry:spring-retry'
+
     // Swagger
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'    //Swagger
+
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.mysql:mysql-connector-j'
     annotationProcessor 'org.projectlombok:lombok'

server/src/main/java/com/talkka/server/api/datagg/dto/BusLocationBodyDto.java

@@ -21,12 +21,12 @@ public BusLocationEntity toEntity(int apiCallNo, LocalDateTime createdAt) {
 		return BusLocationEntity.builder()
 			.apiRouteId(routeId)
 			.apiStationId(stationId)
-			.stationSeq(stationSeq.shortValue())
+			.stationSeq(stationSeq)
 			.endBus(endBusEnum)
 			.lowPlate(lowPlateEnum)
 			.plateNo(plateNo)
 			.plateType(plateTypeEnum)
-			.remainSeatCount(remainSeatCnt.shortValue())
+			.remainSeatCount(remainSeatCnt)
 			.apiCallNo(apiCallNo)
 			.createdAt(createdAt)
 			.build();

server/src/main/java/com/talkka/server/api/datagg/service/SimpleBusApiService.java

@@ -7,9 +7,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
+import org.springframework.retry.backoff.FixedBackOffPolicy;
+import org.springframework.retry.policy.SimpleRetryPolicy;
+import org.springframework.retry.support.RetryTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.DefaultUriBuilderFactory;
 
@@ -42,15 +46,10 @@ public List<BusRouteSearchBodyDto> getSearchedRouteInfo(String keyword) throws A
 		MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
 		params.add("keyword", keyword);
 		try {
-			URI uri = this.getOpenApiUri(path, params);
-			ResponseEntity<BusRouteSearchRespDto> resp = restTemplate.getForEntity(uri, BusRouteSearchRespDto.class);
-			var body = resp.getBody().msgBody();
-			if (body == null) {
-				throw new ApiClientException("결과가 없습니다.");
-			}
-			return body;
-		} catch (Exception exception) {
-			throw new ApiClientException(exception.getMessage());
+			ResponseEntity<BusRouteSearchRespDto> resp = apiCallWithRetry(path, params, BusRouteSearchRespDto.class);
+			return resp.getBody().msgBody();
+		} catch (RestClientException exception) {
+			throw new ApiClientException("결과가 없습니다.");
 		}
 	}
 
@@ -60,15 +59,10 @@ public List<BusRouteInfoBodyDto> getRouteInfo(String apiRouteId) throws ApiClien
 		MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
 		params.add("routeId", apiRouteId);
 		try {
-			URI uri = this.getOpenApiUri(path, params);
-			ResponseEntity<BusRouteInfoRespDto> resp = restTemplate.getForEntity(uri, BusRouteInfoRespDto.class);
-			var body = resp.getBody().msgBody();
-			if (body == null) {
-				throw new ApiClientException("결과가 없습니다.");
-			}
-			return body;
-		} catch (Exception exception) {
-			throw new ApiClientException(exception.getMessage());
+			ResponseEntity<BusRouteInfoRespDto> resp = apiCallWithRetry(path, params, BusRouteInfoRespDto.class);
+			return resp.getBody().msgBody();
+		} catch (RestClientException exception) {
+			throw new ApiClientException("결과가 없습니다.");
 		}
 	}
 
@@ -78,15 +72,10 @@ public List<BusRouteStationBodyDto> getRouteStationInfo(String apiRouteId) throw
 		MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
 		params.add("routeId", apiRouteId);
 		try {
-			URI uri = this.getOpenApiUri(path, params);
-			ResponseEntity<BusRouteStationRespDto> resp = restTemplate.getForEntity(uri, BusRouteStationRespDto.class);
-			var body = resp.getBody().msgBody();
-			if (body == null) {
-				throw new ApiClientException("결과가 없습니다.");
-			}
-			return body;
-		} catch (Exception exception) {
-			throw new ApiClientException(exception.getMessage());
+			ResponseEntity<BusRouteStationRespDto> resp = apiCallWithRetry(path, params, BusRouteStationRespDto.class);
+			return resp.getBody().msgBody();
+		} catch (RestClientException exception) {
+			throw new ApiClientException("결과가 없습니다.");
 		}
 	}
 
@@ -96,15 +85,10 @@ public List<BusLocationBodyDto> getBusLocationInfo(String apiRouteId) throws Api
 		MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
 		params.add("routeId", apiRouteId);
 		try {
-			URI uri = this.getOpenApiUri(path, params);
-			ResponseEntity<BusLocationRespDto> resp = restTemplate.getForEntity(uri, BusLocationRespDto.class);
-			var body = resp.getBody().msgBody();
-			if (body == null) {
-				throw new ApiClientException("결과가 없습니다.");
-			}
-			return body;
-		} catch (Exception exception) {
-			throw new ApiClientException(exception.getMessage());
+			ResponseEntity<BusLocationRespDto> resp = apiCallWithRetry(path, params, BusLocationRespDto.class);
+			return resp.getBody().msgBody();
+		} catch (RestClientException exception) {
+			throw new ApiClientException("결과가 없습니다.");
 		}
 	}
 
@@ -139,4 +123,31 @@ private URI getOpenApiUri(String path, MultiValueMap<String, String> params) {
 			.queryParams(params)
 			.build();
 	}
+
+	// 리트라이 로직을 포함한 api call
+	private <T> ResponseEntity<T> apiCallWithRetry(String path, MultiValueMap<String, String> params,
+		Class<T> type) throws RestClientException {
+
+		final int MAX_ATTEMPTS = 10;
+		final int RETRY_INTERVAL = 200;
+
+		// 이후 bean 으로 등록하는것 고려
+		RetryTemplate retryTemplate = new RetryTemplate();
+
+		SimpleRetryPolicy retryPolicy = new SimpleRetryPolicy();
+		retryPolicy.setMaxAttempts(MAX_ATTEMPTS);
+		retryTemplate.setRetryPolicy(retryPolicy);
+
+		FixedBackOffPolicy backOffPolicy = new FixedBackOffPolicy();
+		backOffPolicy.setBackOffPeriod(RETRY_INTERVAL);
+		retryTemplate.setBackOffPolicy(backOffPolicy);
+
+		// 재시도마다 새로운 api key 로 시도
+		// 파싱 실패시 RestClientException 터트림
+		return retryTemplate.execute(context -> {
+			// 재시도마다 새로운 api key 로 시도
+			URI uri = this.getOpenApiUri(path, params);
+			return restTemplate.getForEntity(uri, type); // 파싱 실패시 RestClientException 터트림
+		});
+	}
 }

server/src/main/java/com/talkka/server/bus/controller/BusLocationProcessController.java

@@ -0,0 +1,24 @@
+package com.talkka.server.bus.controller;
+
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.talkka.server.bus.dao.BusLocationRepository;
+import com.talkka.server.bus.service.BusLocationProcessor;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/bus/stat")
+public class BusLocationProcessController {
+	private final BusLocationProcessor busLocationProcessor;
+	private final BusLocationRepository busLocationRepository;
+
+	@PostMapping("/process/all")
+	public String process() {
+		busLocationProcessor.start(busLocationRepository.findAll());
+		return "success";
+	}
+}

server/src/main/java/com/talkka/server/bus/controller/BusViewController.java

@@ -0,0 +1,34 @@
+package com.talkka.server.bus.controller;
+
+import java.time.LocalDateTime;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.talkka.server.bus.dto.BusViewDto;
+import com.talkka.server.bus.service.BusViewService;
+
+import lombok.RequiredArgsConstructor;
+
+// 테스트용 컨트롤러입니다.
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/bus/route-info")
+public class BusViewController {
+	private final BusViewService busViewService;
+
+	@GetMapping("/now")
+	public ResponseEntity<BusViewDto> getNow(
+		@RequestParam(name = "routeStationId", required = false, defaultValue = "17499") Long routeStationId,
+		@RequestParam(name = "stationNum", required = false, defaultValue = "5") Integer stationNum,
+		@RequestParam(name = "timeRange", required = false, defaultValue = "45") Integer timeRange,
+		@RequestParam(name = "week", required = false, defaultValue = "2") Long week
+	) {
+		LocalDateTime time = LocalDateTime.now().plusHours(8);
+		return ResponseEntity.ok(busViewService.getBusView(routeStationId, stationNum, time, timeRange, week));
+	}
+
+}

server/src/main/java/com/talkka/server/bus/dao/BusLocationEntity.java

@@ -42,7 +42,7 @@ public class BusLocationEntity {
 	private String apiStationId;
 
 	@Column(name = "station_seq", nullable = false)
-	private Short stationSeq;
+	private Integer stationSeq;
 
 	@Column(name = "end_bus", nullable = false, length = 1)
 	@Convert(converter = EndBusConverter.class)
@@ -60,7 +60,7 @@ public class BusLocationEntity {
 	private PlateType plateType;
 
 	@Column(name = "remain_seat_count", nullable = false)
-	private Short remainSeatCount;
+	private Integer remainSeatCount;
 
 	@Column(name = "api_call_no", nullable = false)
 	private Integer apiCallNo;

server/src/main/java/com/talkka/server/bus/dao/BusLocationRepository.java

@@ -1,8 +1,23 @@
 package com.talkka.server.bus.dao;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
- 
+
 @Repository
 public interface BusLocationRepository extends JpaRepository<BusLocationEntity, Long> {
-}
+
+	@Query(value = "select distinct l.apiCallNo from bus_location l")
+	List<Integer> getDistinctApiCallNoList();
+
+	@Query(value = "select count(*) from bus_location")
+	Integer getRowNum();
+
+	List<BusLocationEntity> findByApiCallNo(Integer apiCallNo);
+
+	List<BusLocationEntity> findByCreatedAtBetween(LocalDateTime startTime, LocalDateTime endTime);
+
+}

server/src/main/java/com/talkka/server/bus/dao/BusPlateStatisticEntity.java

@@ -0,0 +1,56 @@
+package com.talkka.server.bus.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import com.talkka.server.bus.enums.PlateType;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity(name = "bus_plate_statistic")
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EntityListeners(AuditingEntityListener.class)
+public class BusPlateStatisticEntity {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+
+	@ManyToOne
+	@JoinColumn(name = "route_id", nullable = false)
+	private BusRouteEntity route;
+
+	@Column(name = "plate_type", nullable = false)
+	private PlateType plateType;
+
+	@Column(name = "plate_no", nullable = false)
+	private String plateNo;
+
+	@Column(name = "epoch_day", nullable = false)
+	private Long epochDay;
+
+	@Column(name = "start_time", nullable = false)
+	private Integer startTime;
+
+	@Column(name = "end_time", nullable = false)
+	private Integer endTime;
+
+	@OneToMany(mappedBy = "plateStatistic", cascade = CascadeType.PERSIST)
+	private List<BusRemainSeatEntity> seats;
+}

server/src/main/java/com/talkka/server/bus/dao/BusPlateStatisticRepository.java

@@ -0,0 +1,8 @@
+package com.talkka.server.bus.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface BusPlateStatisticRepository extends JpaRepository<BusPlateStatisticEntity, Long> {
+}