diff --git a/class.png b/class.png new file mode 100644 index 0000000..2dd839a --- /dev/null +++ b/class.png Binary files differ diff --git a/class.pu b/class.pu new file mode 100644 index 0000000..d2e39bb --- /dev/null +++ b/class.pu @@ -0,0 +1,47 @@ +@startuml +class Mapper <> { + - id : Long + - osmid : String + - tasks : List +} + +class Task <> { + - id : Long + - citycode : String + - meshcode : String + - cityname : String + - mappers : List +} +note right : spring.datasource.url=jdbc:h2:mem:taskdb + +interface TaskRepository <> { +} + +interface MapperRepository <> { +} + +class MapperController <> { + - repository : MapperRepository + + showList(model) + + addMapper(mapper) + + process(mapper, result) + + editMapper(id, model) + + deleteMapper(id) +} + +interface CommandLineRunner + +class DataLoader <> { + - repository : TaskRepository + + run() +} + +TaskRepository <|-- Task +DataLoader *-- TaskRepository +CommandLineRunner <|-- DataLoader + +Mapper .o Task +MapperRepository <|-- Mapper +MapperController *-- MapperRepository +@enduml + diff --git a/controller.png b/controller.png new file mode 100644 index 0000000..b67a972 --- /dev/null +++ b/controller.png Binary files differ diff --git a/controller.pu b/controller.pu new file mode 100644 index 0000000..efd3a21 --- /dev/null +++ b/controller.pu @@ -0,0 +1,24 @@ +@startuml + +[*] --> index : / + +state index { + state users + users : *{id} + users : *{osmid} + users : *{task.cityname} +} +state form { + state mapper { + mapper : osmid + mapper : task.cityname + } +} + +index --> index : /delete/{id} +index --> form : /edit/{id} +index --> form : /add +form --> index : /process[!hasErrors] +form --> form : /process[hasErrors] + +@enduml \ No newline at end of file diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..8a8fb22 --- /dev/null +++ b/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + 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 + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. 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, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..5a6e937 --- /dev/null +++ b/pom.xml @@ -0,0 +1,103 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.1 + + + osm.surveyor.solr + task-bldg + 0.0.1-SNAPSHOT + war + task-bldg + TaskingManager for Plateau BLDG + + 11 + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-validation + + + + + org.webjars + bootstrap + 5.1.3 + + + org.webjars + webjars-locator-core + + + org.webjars.npm + bootstrap-icons + 1.7.2 + + + nz.net.ultraq.thymeleaf + thymeleaf-layout-dialect + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + com.h2database + h2 + runtime + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/src/main/java/osm/surveyor/task/DataLoader.java b/src/main/java/osm/surveyor/task/DataLoader.java new file mode 100644 index 0000000..d83271e --- /dev/null +++ b/src/main/java/osm/surveyor/task/DataLoader.java @@ -0,0 +1,29 @@ +package osm.surveyor.task; + +import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; + +import lombok.RequiredArgsConstructor; +import osm.surveyor.task.model.Task; + +@RequiredArgsConstructor +@Component +public class DataLoader implements CommandLineRunner { + private final TaskRepository repository; + + @Override + public void run(String... args) throws Exception { + Task task = new Task(); + task.setCitycode("01100"); + task.setMeshcode("000000"); + task.setCityname("北海道 札幌市"); + repository.save(task); + + task = new Task(); + task.setCitycode("07203"); + task.setMeshcode("000000"); + task.setCityname("福島県 郡山市"); + repository.save(task); + } + +} diff --git a/src/main/java/osm/surveyor/task/MapperController.java b/src/main/java/osm/surveyor/task/MapperController.java new file mode 100644 index 0000000..1f43654 --- /dev/null +++ b/src/main/java/osm/surveyor/task/MapperController.java @@ -0,0 +1,51 @@ +package osm.surveyor.task; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +import lombok.RequiredArgsConstructor; +import osm.surveyor.task.model.Mapper; + +@RequiredArgsConstructor +@Controller +public class MapperController { + private final MapperRepository repository; + + @GetMapping("/") + public String showList(Model model) { + model.addAttribute("mappers", repository.findAll()); + return "index"; + } + + @GetMapping("/add") + public String addMapper(@ModelAttribute Mapper mapper) { + return "form"; + } + + @PostMapping("/process") + public String process(@Validated @ModelAttribute Mapper mapper, BindingResult result) { + if (result.hasErrors()) { + return "form"; + } + repository.save(mapper); + return "redirect:/"; + } + + @GetMapping("/edit/{id}") + public String editMapper(@PathVariable Long id, Model model) { + model.addAttribute("mapper", repository.findById(id)); + return "form"; + } + + @GetMapping("/delete/{id}") + public String deleteMapper(@PathVariable Long id) { + repository.deleteById(id); + return "redirect:/"; + } +} diff --git a/src/main/java/osm/surveyor/task/MapperRepository.java b/src/main/java/osm/surveyor/task/MapperRepository.java new file mode 100644 index 0000000..1902c87 --- /dev/null +++ b/src/main/java/osm/surveyor/task/MapperRepository.java @@ -0,0 +1,8 @@ +package osm.surveyor.task; + +import org.springframework.data.jpa.repository.JpaRepository; + +import osm.surveyor.task.model.Mapper; + +public interface MapperRepository extends JpaRepository { +} diff --git a/src/main/java/osm/surveyor/task/TaskBldgApplication.java b/src/main/java/osm/surveyor/task/TaskBldgApplication.java new file mode 100644 index 0000000..9a457d9 --- /dev/null +++ b/src/main/java/osm/surveyor/task/TaskBldgApplication.java @@ -0,0 +1,13 @@ +package osm.surveyor.task; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TaskBldgApplication { + + public static void main(String[] args) { + SpringApplication.run(TaskBldgApplication.class, args); + } + +} diff --git a/src/main/java/osm/surveyor/task/TaskRepository.java b/src/main/java/osm/surveyor/task/TaskRepository.java new file mode 100644 index 0000000..54ab9c5 --- /dev/null +++ b/src/main/java/osm/surveyor/task/TaskRepository.java @@ -0,0 +1,9 @@ +package osm.surveyor.task; + +import org.springframework.data.jpa.repository.JpaRepository; + +import osm.surveyor.task.model.Task; + +public interface TaskRepository extends JpaRepository { + +} diff --git a/src/main/java/osm/surveyor/task/model/Mapper.java b/src/main/java/osm/surveyor/task/model/Mapper.java new file mode 100644 index 0000000..3d4c94e --- /dev/null +++ b/src/main/java/osm/surveyor/task/model/Mapper.java @@ -0,0 +1,30 @@ +package osm.surveyor.task.model; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +public class Mapper { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + // 必須入力、(null,空白不可) + @NotBlank + @Size(max = 40) + private String osmid; + + // 'Task' とのリレーション + @ManyToOne + private Task task; +} diff --git a/src/main/java/osm/surveyor/task/model/Task.java b/src/main/java/osm/surveyor/task/model/Task.java new file mode 100644 index 0000000..00ae1fb --- /dev/null +++ b/src/main/java/osm/surveyor/task/model/Task.java @@ -0,0 +1,39 @@ +package osm.surveyor.task.model; + +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +public class Task { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotBlank + @Size(max = 40) + private String citycode; + + @NotBlank + @Size(max = 40) + private String meshcode; + + @NotBlank + @Size(max = 40) + private String cityname; + + // 'Mapper' とのリレーション + @OneToMany(mappedBy = "task") + private List mappers; +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..95f2f81 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,5 @@ +spring.messages.fallback-to-system-locale=false +spring.datasource.url=jdbc:h2:mem:taskdb +spring.datasource.generate-unique-name=false +spring.h2.console.enabled=true +spring.jpa.show-sql=true diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties new file mode 100644 index 0000000..f507ff9 --- /dev/null +++ b/src/main/resources/messages.properties @@ -0,0 +1,5 @@ +mapper = Mapper +osmid = OpenStreetMap userid +confirmationMessage = Registration has been completed with the following +register = Register +tasklist = Task list \ No newline at end of file diff --git a/src/main/resources/messages_ja.properties b/src/main/resources/messages_ja.properties new file mode 100644 index 0000000..5f61138 --- /dev/null +++ b/src/main/resources/messages_ja.properties @@ -0,0 +1,5 @@ +mapper = ユーザ登録 +osmid = OpenStreetMapのユーザID +confirmationMessage = 以下の内容で登録が完了しました。 +register = 登録 +tasklist = タスクリスト diff --git a/src/main/resources/static/css/app.css b/src/main/resources/static/css/app.css new file mode 100644 index 0000000..34a01c1 --- /dev/null +++ b/src/main/resources/static/css/app.css @@ -0,0 +1,64 @@ +/* Color */ +.bg-image { + background: + linear-gradient(to bottom, + rgba(34, 74, 190, 1), + rgba(34, 74, 190, 0.7) + ), + url('/img/photo.jpg'); + background-size: cover; +} + +.text-navy { + color: #224abe; +} + +.btn-navy { + color: white; + background-color: #224abe; +} + +.btn-navy:hover { + color: white; + background-color: #0d47a1; +} + +/* Off-Canvas (SideBar) */ +.offcanvas { + width: 200px; +} + +@media (min-width: 992px) { + .offcanvas { + transform: none; + visibility: visible !important; + } + + .offcanvas-outside { + transition: margin-left 0.3s ease-in-out; + margin-left: 200px; + } +} + +.btn-circle { + width: 40px; + height: 40px; + border-radius: 50%; + opacity: 0.5; + border: 0; +} + +/* Link */ +a { + text-decoration: none; +} + +/* Size */ +.mh-100 { + height: calc(100vh - 56px) +} + +/* Table */ +.table > :not(:first-child) { + border-top: 0; +} diff --git a/src/main/resources/static/img/photo.jpg b/src/main/resources/static/img/photo.jpg new file mode 100644 index 0000000..3dc82c0 --- /dev/null +++ b/src/main/resources/static/img/photo.jpg Binary files differ diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html new file mode 100644 index 0000000..ee0a35d --- /dev/null +++ b/src/main/resources/templates/error.html @@ -0,0 +1,33 @@ + + + + + + + + +
+
+
+ + +
+
+ +
+
+
+
+ +
ページを表示できません
+ ← ホームに戻る +
+
+
+
+
+ + + diff --git a/src/main/resources/templates/form.html b/src/main/resources/templates/form.html new file mode 100644 index 0000000..198bd91 --- /dev/null +++ b/src/main/resources/templates/form.html @@ -0,0 +1,63 @@ + + + + + + + + +
+
+
+ + +
+
+ +
+
+ +
+
+
マッパー登録
+
+
+
+ + +
+ + +
+
+
+ +
+ + +
+ +
+ +
+
+
+ +
+
+
+
+
+ + + diff --git a/src/main/resources/templates/fragments/sidebar.html b/src/main/resources/templates/fragments/sidebar.html new file mode 100644 index 0000000..46ae356 --- /dev/null +++ b/src/main/resources/templates/fragments/sidebar.html @@ -0,0 +1,27 @@ + + + + + + + + + +
+ +
+ + + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html new file mode 100644 index 0000000..a082d3a --- /dev/null +++ b/src/main/resources/templates/index.html @@ -0,0 +1,72 @@ + + + + + + + + +
+
+
+ + +
+
+ +
+
+ +
+
+
マッパー一覧
+
+
+ + + + + + + + + + + + + + + + + + + + +
#OSM アカウント名city name
+ + + 編集 + + + + + 削除 + +
+
+
+ +
+
+
+
+
+ + + diff --git a/src/main/resources/templates/layout/layout.html b/src/main/resources/templates/layout/layout.html new file mode 100644 index 0000000..a9579e6 --- /dev/null +++ b/src/main/resources/templates/layout/layout.html @@ -0,0 +1,72 @@ + + + + + + + + + + + Plateau-BLDG import task + + + +
+ +
+ + +
+
+ + + + diff --git a/src/main/webapp/hello.html b/src/main/webapp/hello.html new file mode 100644 index 0000000..04db792 --- /dev/null +++ b/src/main/webapp/hello.html @@ -0,0 +1,19 @@ + + + + +Insert title here + + + + + + <body> + <p>This page uses frames. The current browser you are using does not support frames.</p> + </body> + + + +

Hello World demo

+ + \ No newline at end of file diff --git a/src/test/java/osm/surveyor/task/TaskBldgApplicationTests.java b/src/test/java/osm/surveyor/task/TaskBldgApplicationTests.java new file mode 100644 index 0000000..d386f5a --- /dev/null +++ b/src/test/java/osm/surveyor/task/TaskBldgApplicationTests.java @@ -0,0 +1,13 @@ +package osm.surveyor.task; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class TaskBldgApplicationTests { + + @Test + void contextLoads() { + } + +}