diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..60a90b6 --- /dev/null +++ b/build.gradle @@ -0,0 +1,34 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.5' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'ru.mcs' +version = '0.0.1-SNAPSHOT' +description = 'Demo project for Spring Boot' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(24) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-webflux' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'io.projectreactor:reactor-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar Binary files differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d4081da --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..23d15a9 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..f4ad435 --- /dev/null +++ b/readme.md @@ -0,0 +1 @@ +# Web UI для сервиса tracker-service \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ba67232 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'tracker-web-ui' diff --git a/src/main/java/ru/mcs/tracker/TrackerWebUiApplication.java b/src/main/java/ru/mcs/tracker/TrackerWebUiApplication.java new file mode 100644 index 0000000..17a1da3 --- /dev/null +++ b/src/main/java/ru/mcs/tracker/TrackerWebUiApplication.java @@ -0,0 +1,13 @@ +package ru.mcs.tracker; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TrackerWebUiApplication { + + public static void main(String[] args) { + SpringApplication.run(TrackerWebUiApplication.class, args); + } + +} diff --git a/src/main/java/ru/mcs/tracker/ui/config/RestClientConfig.java b/src/main/java/ru/mcs/tracker/ui/config/RestClientConfig.java new file mode 100644 index 0000000..be87e8f --- /dev/null +++ b/src/main/java/ru/mcs/tracker/ui/config/RestClientConfig.java @@ -0,0 +1,21 @@ +package ru.mcs.tracker.ui.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestClient; + +@Configuration +public class RestClientConfig { + + @Value("${api.base-url}") + private String baseUrl; + + @Bean + public RestClient restClient() { + return RestClient.builder() + .baseUrl(baseUrl) + .defaultHeader("Content-Type", "application/json") + .build(); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mcs/tracker/ui/controller/WebController.java b/src/main/java/ru/mcs/tracker/ui/controller/WebController.java new file mode 100644 index 0000000..250c9da --- /dev/null +++ b/src/main/java/ru/mcs/tracker/ui/controller/WebController.java @@ -0,0 +1,85 @@ +package ru.mcs.tracker.ui.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import ru.mcs.tracker.ui.dto.LocationDto; +import ru.mcs.tracker.ui.service.LocationApiService; + +import java.time.LocalDateTime; +import java.util.List; + +@Controller +public class WebController { + + private static final Logger logger = LoggerFactory.getLogger(WebController.class); + private final LocationApiService locationApiService; + + public WebController(LocationApiService locationApiService) { + this.locationApiService = locationApiService; + logger.info("WebController initialized"); + } + + @GetMapping("/") + public String index(Model model) { + logger.info("Loading index page"); + try { + List deviceGuids = locationApiService.getDeviceGuids(); + model.addAttribute("deviceGuids", deviceGuids); + logger.debug("Loaded {} device GUIDs", deviceGuids.size()); + } catch (Exception e) { + logger.error("Error loading device GUIDs: {}", e.getMessage(), e); + model.addAttribute("error", "Unable to load device list"); + } + return "index"; + } + + @GetMapping("/track") + public String track( + @RequestParam String deviceGuid, + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime start, + @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime end, + Model model) { + + logger.info("Tracking device: {}", deviceGuid); + + // Если даты не указаны, используем последние 24 часа + if (start == null) { + start = LocalDateTime.now().minusHours(24); + } + if (end == null) { + end = LocalDateTime.now(); + } + + try { + var locations = locationApiService.getLocations(deviceGuid, start, end); + model.addAttribute("locations", locations); + model.addAttribute("deviceGuid", deviceGuid); + model.addAttribute("start", start); + model.addAttribute("end", end); + + logger.debug("Loaded {} locations for device {}", locations.size(), deviceGuid); + + } catch (Exception e) { + logger.error("Error loading locations for device {}: {}", deviceGuid, e.getMessage(), e); + model.addAttribute("error", "Unable to load location data"); + } + + return "track"; + } + + @GetMapping("/track/{deviceGuid}/data") + @ResponseBody + public List getTrackData( + @PathVariable String deviceGuid, + @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime start, + @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime end) { + return locationApiService.getLocations(deviceGuid, start, end); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mcs/tracker/ui/dto/LocationDto.java b/src/main/java/ru/mcs/tracker/ui/dto/LocationDto.java new file mode 100644 index 0000000..bdf9a0a --- /dev/null +++ b/src/main/java/ru/mcs/tracker/ui/dto/LocationDto.java @@ -0,0 +1,16 @@ +package ru.mcs.tracker.ui.dto; + +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Getter +@Setter +public class LocationDto { + private Long id; + private String deviceGuid; + private Double latitude; + private Double longitude; + private LocalDateTime timestamp; +} \ No newline at end of file diff --git a/src/main/java/ru/mcs/tracker/ui/service/LocationApiService.java b/src/main/java/ru/mcs/tracker/ui/service/LocationApiService.java new file mode 100644 index 0000000..4ae6d70 --- /dev/null +++ b/src/main/java/ru/mcs/tracker/ui/service/LocationApiService.java @@ -0,0 +1,80 @@ +package ru.mcs.tracker.ui.service; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestClient; +import ru.mcs.tracker.ui.dto.LocationDto; + +import java.time.LocalDateTime; +import java.util.Collections; +import java.util.List; + +@Service +public class LocationApiService { + + private static final Logger logger = LoggerFactory.getLogger(LocationApiService.class); + + private final RestClient restClient; + private final String baseUrl; + + public LocationApiService(RestClient restClient, @Value("${api.base-url}") String baseUrl) { + this.restClient = restClient; + this.baseUrl = baseUrl; + logger.info("LocationApiService initialized with base URL: {}", baseUrl); + } + + public List getLocations(String deviceGuid, LocalDateTime start, LocalDateTime end) { + try { + logger.debug("Requesting locations for device: {}, from: {} to: {}", deviceGuid, start, end); + + ResponseEntity> response = restClient.get() + .uri(uriBuilder -> uriBuilder + .path("/api/locations/{deviceGuid}") + .queryParam("start", start) + .queryParam("end", end) + .build(deviceGuid)) + .retrieve() + .toEntity(new ParameterizedTypeReference>() {}); + + if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) { + logger.debug("Received {} locations", response.getBody().size()); + return response.getBody(); + } else { + logger.warn("No locations found for device: {}", deviceGuid); + return Collections.emptyList(); + } + + } catch (Exception e) { + logger.error("Error retrieving locations: {}", e.getMessage(), e); + return Collections.emptyList(); + } + } + + public List getDeviceGuids() { + try { + logger.debug("Requesting device GUIDs from API"); + + ResponseEntity> response = restClient.get() + .uri("/api/locations/devices") + .retrieve() + .toEntity(new ParameterizedTypeReference>() {}); + + if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) { + logger.debug("Received {} device GUIDs", response.getBody().size()); + return response.getBody(); + } else { + logger.warn("No device GUIDs found"); + return Collections.emptyList(); + } + + } catch (Exception e) { + logger.error("Error retrieving device GUIDs: {}", e.getMessage(), e); + return Collections.emptyList(); + } + } +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..68026cc --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,26 @@ +server.port=8081 +api.base-url=http://localhost:8080 + +# Thymeleaf +spring.thymeleaf.cache=false +spring.thymeleaf.prefix=classpath:/templates/ +spring.thymeleaf.suffix=.html +spring.thymeleaf.mode=HTML +spring.thymeleaf.encoding=UTF-8 + +# ??????????? +logging.level.root=INFO +logging.level.com.example.locationweb=DEBUG +logging.level.org.springframework.web=DEBUG +logging.level.org.springframework.web.client=DEBUG +logging.file.name=logs/application.log +logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n +logging.pattern.file=%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + +# Actuator ??? ??????????? +management.endpoints.web.exposure.include=health,info,metrics +management.endpoint.health.show-details=always + +# ????????? RestClient +rest.client.connection-timeout=5000 +rest.client.read-timeout=10000 \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html new file mode 100644 index 0000000..baa9f16 --- /dev/null +++ b/src/main/resources/templates/index.html @@ -0,0 +1,45 @@ + + + + + + Device Tracking + + + +
+

Device Tracking System

+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+ + +
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/track.html b/src/main/resources/templates/track.html new file mode 100644 index 0000000..7321b46 --- /dev/null +++ b/src/main/resources/templates/track.html @@ -0,0 +1,144 @@ + + + + + + Device Tracking - <span th:text="${deviceGuid}"></span> + + + + + +
+

Tracking Device:

+ +
+

Time Range: + - + +

+

Locations found:

+ Back to device selection +
+ + + +
+ +
+

Location History

+
+ + + + + + + + + + + + + + + +
TimestampLatitudeLongitude
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/test/java/ru/mcs/tracker/TrackerWebUiApplicationTests.java b/src/test/java/ru/mcs/tracker/TrackerWebUiApplicationTests.java new file mode 100644 index 0000000..2644e68 --- /dev/null +++ b/src/test/java/ru/mcs/tracker/TrackerWebUiApplicationTests.java @@ -0,0 +1,13 @@ +package ru.mcs.tracker; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class LocationWebUiApplicationTests { + + @Test + void contextLoads() { + } + +}