Skip to content

메인 배포 #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gourderased merged 3 commits into from
Nov 6, 2024
Merged

메인 배포 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86ba459
Update README.md
junseokkim Oct 25, 2024
316f84e
Update README.md
junseokkim Oct 25, 2024
2be88b6
FIX : 예상 대기시간, 인원 수정
gourderased Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# server
IoT기술을 활용한 실시간 버스 정류장 대기줄 파악 및 대체 노선 추천 어플리케이션
4 changes: 2 additions & 2 deletions src/main/java/com/cloudcomputing/ohhanahana/dto/response/SensorDataResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ public class SensorDataResponse {
private String currentLocation;
private String currentDateTime;
private Congestion congestion;
private String expectedWaitingTime;
private int expectedWaitingTime;
private String expectedWaitingPeople;

public static SensorDataResponse toDTO(String currentLocation, String currentDateTime,
Congestion congestion,
String expectedWaitingTime, String expectedWaitingPeople) {
int expectedWaitingTime, String expectedWaitingPeople) {

return SensorDataResponse.builder()
.currentLocation(currentLocation)
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/cloudcomputing/ohhanahana/service/SensorDataService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,22 +99,22 @@ private Congestion determineCongestion(int sensor1Value, int sensor2Value, int s
}
}

private String calculateWaitingTime(Congestion congestion) throws JAXBException {
private int calculateWaitingTime(Congestion congestion) throws JAXBException {
int remain511Minute = busService.get511BusRemainMinute();

return switch (congestion) {
case SPARE -> remain511Minute + "분";
case NORMAL -> remain511Minute + 5 + "분";
case CONGESTION -> remain511Minute + 10 + "분";
default -> "-";
case SPARE -> remain511Minute;
case NORMAL -> remain511Minute;
case CONGESTION -> remain511Minute + 10;
default -> 0;
};
}

private String calculatePeople(Congestion congestion) {
return switch (congestion) {
case SPARE -> "15명";
case NORMAL -> "25명";
case CONGESTION -> "35명";
case SPARE -> "15";
case NORMAL -> "25";
case CONGESTION -> "35";
default -> "-";
};
}
Expand Down