lin 4 jaren geleden
commit
c20bceea2f

+ 33 - 0
.gitignore

@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/

+ 310 - 0
mvnw

@@ -0,0 +1,310 @@
+#!/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 /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="`which 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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$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 \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

+ 182 - 0
mvnw.cmd

@@ -0,0 +1,182 @@
+@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 "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "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%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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 "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\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%
+
+exit /B %ERROR_CODE%

+ 83 - 0
pom.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.3.1.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>com.zoniot</groupId>
+	<artifactId>reading-meter</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>reading-meter</name>
+	<description>Demo project for Spring Boot</description>
+
+	<properties>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<!-- 构建Restful API -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>2.7.0</version>
+		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>2.7.0</version>
+		</dependency>
+		<!-- 数据源连接池 -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid-spring-boot-starter</artifactId>
+			<version>1.1.9</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.41</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.mybatis.spring.boot</groupId>
+			<artifactId>mybatis-spring-boot-starter</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

+ 14 - 0
src/main/java/com/zoniot/readingmeter/ReadingMeterApplication.java

@@ -0,0 +1,14 @@
+package com.zoniot.readingmeter;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
+
+@SpringBootApplication
+public class ReadingMeterApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(ReadingMeterApplication.class, args);
+	}
+
+}

+ 68 - 0
src/main/java/com/zoniot/readingmeter/config/SwaggerConfig.java

@@ -0,0 +1,68 @@
+package com.zoniot.readingmeter.config;
+
+import org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.service.AuthorizationScope;
+import springfox.documentation.service.SecurityReference;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.List;
+
+import static com.google.common.collect.Lists.newArrayList;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+    @Bean
+    public Docket api() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .ignoredParameterTypes(BasicErrorController.class)
+                .groupName("web")
+                .select()
+                .apis(RequestHandlerSelectors.any())
+                .paths(PathSelectors.any())
+                .build()
+                .apiInfo(apiInfo())
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }
+
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("接口文档Api")
+                .build();
+    }
+
+    private List<ApiKey> securitySchemes() {
+        return newArrayList(
+                new ApiKey("Authorization", "Authorization", "header"));
+    }
+
+    private List<SecurityContext> securityContexts() {
+        return newArrayList(
+                SecurityContext.builder()
+                        .securityReferences(defaultAuth())
+                        .forPaths(PathSelectors.regex("^(?!auth).*$"))
+                        .build()
+        );
+    }
+
+    List<SecurityReference> defaultAuth() {
+        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+        authorizationScopes[0] = authorizationScope;
+        return newArrayList(
+                new SecurityReference("Authorization", authorizationScopes));
+    }
+
+}

+ 53 - 0
src/main/java/com/zoniot/readingmeter/controller/ReadingMeterController.java

@@ -0,0 +1,53 @@
+package com.zoniot.readingmeter.controller;
+
+import com.zoniot.readingmeter.model.AjaxMessage;
+import com.zoniot.readingmeter.model.DataMessage;
+import com.zoniot.readingmeter.model.ResponseMessage;
+import com.zoniot.readingmeter.service.ReadingMeterService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Controller
+@Api(tags = "抄表")
+public class ReadingMeterController {
+    @Autowired
+    private ReadingMeterService readingMeterService;
+
+    @ResponseBody
+    @GetMapping("/ReadingMeter")
+    @ApiOperation(value = "查询抄表")
+    public AjaxMessage<List<DataMessage>> getReadingMeter(
+            @ApiParam(value = "水表表号,多个英文逗号隔开", required = false) @RequestParam(required = false) List<String> MeterCode,
+            @ApiParam(value = "冻结日期 yyyy-MM-dd", required = false) @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate ReadingTime,
+            @ApiParam(value = "账户", required = false) @RequestParam(required = false) String Account,
+            @ApiParam(value = "密码", required = false) @RequestParam(required = false) String Password
+
+    ){
+
+        List<DataMessage> list = readingMeterService.getReadingMeter(MeterCode,ReadingTime);
+        return new AjaxMessage<>(list);
+    }
+
+    @ResponseBody
+    @GetMapping("/SwitchMeter")
+    @ApiOperation(value = "开关阀")
+    public ResponseMessage switchMeter(
+            @ApiParam(value = "水表表号", required = true) @RequestParam(required = true) String MeterCode,
+            @ApiParam(value = "开关阀指令0 -关阀 1 –开阀", required = true) @RequestParam(required = true) String Command,
+            @ApiParam(value = "原因", required = false) @RequestParam(required = false) String Reason,
+            @ApiParam(value = "备注", required = false) @RequestParam(required = false) String Remark,
+            @ApiParam(value = "账户", required = false) @RequestParam(required = false) String Account,
+            @ApiParam(value = "密码", required = false) @RequestParam(required = false) String Password
+
+    ){
+        return readingMeterService.switchMeter(MeterCode,Command,Reason,Remark);
+    }
+}

+ 12 - 0
src/main/java/com/zoniot/readingmeter/dao/ScMeterReadRecordMapper.java

@@ -0,0 +1,12 @@
+package com.zoniot.readingmeter.dao;
+
+import com.zoniot.readingmeter.model.DataMessage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ScMeterReadRecordMapper {
+    List<DataMessage> getReadingMeter(@Param("customerId") Integer customerId, @Param("meterCodes") List<String> meterCodes, @Param("date") Integer date);
+}

+ 179 - 0
src/main/java/com/zoniot/readingmeter/entity/ScMeterReadRecord.java

@@ -0,0 +1,179 @@
+package com.zoniot.readingmeter.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+@ApiModel(value="com-zoniot-readingmeter-entity-ScMeterReadRecord")
+@Data
+public class ScMeterReadRecord {
+    /**
+    * 主键
+    */
+    @ApiModelProperty(value="主键")
+    private Long id;
+
+    /**
+    * 读表日期
+    */
+    @ApiModelProperty(value="读表日期")
+    private Integer readDate;
+
+    /**
+    * 站点
+    */
+    @ApiModelProperty(value="站点")
+    private Integer siteId;
+
+    /**
+    * 场景
+    */
+    @ApiModelProperty(value="场景")
+    private Integer sysId;
+
+    /**
+    * 省
+    */
+    @ApiModelProperty(value="省")
+    private Integer province;
+
+    /**
+    * 市
+    */
+    @ApiModelProperty(value="市")
+    private Integer city;
+
+    /**
+    * 区
+    */
+    @ApiModelProperty(value="区")
+    private Integer region;
+
+    /**
+    * 小区
+    */
+    @ApiModelProperty(value="小区")
+    private Integer community;
+
+    /**
+    * 客户
+    */
+    @ApiModelProperty(value="客户")
+    private Integer customerId;
+
+    /**
+    * 集中器
+    */
+    @ApiModelProperty(value="集中器")
+    private Integer concentratorId;
+
+    /**
+    * 采集器
+    */
+    @ApiModelProperty(value="采集器")
+    private Integer collectorId;
+
+    /**
+    * 建筑
+    */
+    @ApiModelProperty(value="建筑")
+    private Integer buildingId;
+
+    /**
+    * 安装地址
+    */
+    @ApiModelProperty(value="安装地址")
+    private String location;
+
+    /**
+    * 设备类型
+    */
+    @ApiModelProperty(value="设备类型")
+    private Integer deviceTypeId;
+
+    /**
+    * 设备id
+    */
+    @ApiModelProperty(value="设备id")
+    private Long deviceId;
+
+    /**
+    * 节点编号
+    */
+    @ApiModelProperty(value="节点编号")
+    private String deviceNo;
+
+    /**
+    * 电子号
+    */
+    @ApiModelProperty(value="电子号")
+    private String meterNo;
+
+    /**
+    * 档案号
+    */
+    @ApiModelProperty(value="档案号")
+    private String meterFileNo;
+
+    /**
+    * 读表时间
+    */
+    @ApiModelProperty(value="读表时间")
+    private LocalDateTime readTime;
+
+    /**
+    * 读表状态
+    */
+    @ApiModelProperty(value="读表状态")
+    private String readStatus;
+
+    /**
+    * 读表数据
+    */
+    @ApiModelProperty(value="读表数据")
+    private String readData;
+
+    /**
+    * 最近有效数据
+    */
+    @ApiModelProperty(value="最近有效数据")
+    private String lastValid;
+
+    /**
+    * 距离上次的消耗
+    */
+    @ApiModelProperty(value="距离上次的消耗")
+    private BigDecimal lastCost;
+
+    /**
+    * 状态
+    */
+    @ApiModelProperty(value="状态")
+    private Integer status;
+
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty(value="创建时间")
+    private LocalDateTime dateCreate;
+
+    /**
+    * 更新时间
+    */
+    @ApiModelProperty(value="更新时间")
+    private LocalDateTime dateUpdate;
+
+    /**
+    * 创建人
+    */
+    @ApiModelProperty(value="创建人")
+    private String createBy;
+
+    /**
+    * 更新人
+    */
+    @ApiModelProperty(value="更新人")
+    private String updateBy;
+}

+ 35 - 0
src/main/java/com/zoniot/readingmeter/model/AjaxMessage.java

@@ -0,0 +1,35 @@
+package com.zoniot.readingmeter.model;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Ajax信息
+ *
+ */
+@Data
+@ApiModel("返回信息")
+@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY, getterVisibility=JsonAutoDetect.Visibility.NONE)
+public class AjaxMessage<T> {
+
+    @ApiModelProperty(value = "返回状态 1成功、0失败", position = 0)
+    private int IsSuc;
+    @ApiModelProperty(value = "个数", position = 1)
+    private long Total;
+    @ApiModelProperty(value = "返回内容", position = 2)
+    private List<DataMessage> Data;
+
+    public AjaxMessage(List<DataMessage> data) {
+        this.Data = data;
+        this.Total = data.size();
+        this.IsSuc = 1;
+    }
+
+
+
+
+}

+ 31 - 0
src/main/java/com/zoniot/readingmeter/model/DataMessage.java

@@ -0,0 +1,31 @@
+package com.zoniot.readingmeter.model;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel
+@Data
+@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY, getterVisibility=JsonAutoDetect.Visibility.NONE)
+public class DataMessage {
+    @ApiModelProperty("水表表号")
+    private String MeterCode;
+
+    @ApiModelProperty("阀门状态")
+    private String State;
+
+    @ApiModelProperty("读数")
+    private String ReadScale;
+
+    @ApiModelProperty("抄表时间 字符串格式 yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ReadingTime;
+
+    @ApiModelProperty("备注")
+    private String Remark;
+
+}

+ 11 - 0
src/main/java/com/zoniot/readingmeter/model/ResponseMessage.java

@@ -0,0 +1,11 @@
+package com.zoniot.readingmeter.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ResponseMessage {
+    @ApiModelProperty("1成功、0失败")
+    private String Success;
+    private String Message;
+}

+ 68 - 0
src/main/java/com/zoniot/readingmeter/service/AccessTokenService.java

@@ -0,0 +1,68 @@
+package com.zoniot.readingmeter.service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@Component
+public class AccessTokenService {
+
+    //@Autowired
+    //private RedisTemplate<String, String> redisTemplate;
+    private RestTemplate restTemplate = new RestTemplate();
+    @Value("${water-cloud-url}")
+    String apiUrl;
+
+    public String getAccessToken(){
+        String token = null;
+        //token = redisTemplate.opsForValue().get("ningbo:accessToken");
+        if (token != null) {
+            return token;
+        }else {
+            String tokenUrl = apiUrl + "/api/app/login";
+            //log.info("postData : {}", JSON.toJSONString(deviceReplace));
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+
+            Map<String,String> map = new HashMap<>();
+            map.put("appId","senxinju");
+            map.put("appSecretKey","senxinju");
+            String content = JSON.toJSONString(map);
+
+            HttpEntity<String> request = new HttpEntity<>(content, headers);
+
+            ResponseEntity<String> responseEntity = null;
+            try {
+                responseEntity = restTemplate.postForEntity(tokenUrl, request, String.class);
+            }catch (Exception e){
+                log.error("request error e={}",e.getMessage());
+            }
+
+            if (responseEntity != null) {
+                log.info("responseEntity : {} {}", responseEntity.getStatusCodeValue(),responseEntity.getBody());
+                JSONObject jsonObj = (JSONObject) JSONObject.parse(responseEntity.getBody());
+                Integer status = jsonObj.getInteger("status");
+                if (status==0) {
+                    //redisTemplate.opsForValue().set("ningbo:accessToken",accessTokenTem,3500, TimeUnit.SECONDS);
+                    return jsonObj.getJSONObject("data").getString("token");
+                } else {
+                    log.info("请求token错误");
+                }
+            }
+
+        }
+        return token;
+    }
+}

+ 79 - 0
src/main/java/com/zoniot/readingmeter/service/OptService.java

@@ -0,0 +1,79 @@
+package com.zoniot.readingmeter.service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.zoniot.readingmeter.model.ResponseMessage;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RequestCallback;
+import org.springframework.web.client.ResponseExtractor;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Component
+public class OptService {
+    private RestTemplate restTemplate = new RestTemplate();
+    @Value("${water-cloud-url}")
+    String apiUrl;
+    @Autowired
+    private AccessTokenService accessTokenService;
+
+    public ResponseMessage valveControl(String meterNo, String valve){
+
+        ResponseMessage responseMessage = new ResponseMessage();
+
+        String accessToken = accessTokenService.getAccessToken();
+
+        log.info("accessToken={}",accessToken);
+        String tokenUrl = apiUrl + "/api/meter/valve/control";
+        log.info("tokenUrl={}",tokenUrl);
+        //log.info("postData : {}", JSON.toJSONString(deviceReplace));
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+        headers.add("Authorization", "Bearer " + accessToken);
+
+        Map<String,String> map = new HashMap<>();
+        map.put("meterNo",meterNo);
+        map.put("valve",valve);
+        String content = JSON.toJSONString(map);
+
+        log.info("content={}",content);
+        HttpEntity<String> request = new HttpEntity<>(content,headers);
+
+        ResponseEntity<String> responseEntity = null;
+        try {
+
+            RequestCallback requestCallback = restTemplate.httpEntityCallback(request, JSONObject.class);
+            ResponseExtractor<ResponseEntity<String>> responseExtractor = restTemplate.responseEntityExtractor(String.class);
+            responseEntity = restTemplate.execute(tokenUrl, HttpMethod.POST,requestCallback,responseExtractor);
+        }catch (Exception e){
+            log.error("request error e={}",e.getMessage());
+            responseMessage.setSuccess("0");
+            responseMessage.setMessage(e.getMessage());
+        }
+        if (responseEntity != null) {
+            //log.info("responseEntity : {}", responseEntity);
+            log.info("responseEntity : {} {}", responseEntity.getStatusCodeValue(),responseEntity.getBody());
+            JSONObject jsonObj = (JSONObject) JSONObject.parse(responseEntity.getBody());
+            Integer status = jsonObj.getInteger("status");
+            if (status==0) {
+                responseMessage.setSuccess("1");
+            }else {
+                responseMessage.setSuccess("0");
+                responseMessage.setMessage(jsonObj.getString("msg"));
+            }
+
+            return responseMessage;
+        }else {
+            responseMessage.setSuccess("0");
+        }
+        return responseMessage;
+    }
+}

+ 13 - 0
src/main/java/com/zoniot/readingmeter/service/ReadingMeterService.java

@@ -0,0 +1,13 @@
+package com.zoniot.readingmeter.service;
+
+import com.zoniot.readingmeter.model.DataMessage;
+import com.zoniot.readingmeter.model.ResponseMessage;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public interface ReadingMeterService {
+    List<DataMessage> getReadingMeter(List<String> meterCode, LocalDate readingTime);
+
+    ResponseMessage switchMeter(String meterCode, String command, String reason, String remark);
+}

+ 49 - 0
src/main/java/com/zoniot/readingmeter/service/impl/ReadingMeterServiceImpl.java

@@ -0,0 +1,49 @@
+package com.zoniot.readingmeter.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.zoniot.readingmeter.dao.ScMeterReadRecordMapper;
+import com.zoniot.readingmeter.model.DataMessage;
+import com.zoniot.readingmeter.model.ResponseMessage;
+import com.zoniot.readingmeter.service.OptService;
+import com.zoniot.readingmeter.service.ReadingMeterService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+@Slf4j
+@Service
+public class ReadingMeterServiceImpl implements ReadingMeterService {
+
+    @Autowired
+    private OptService optService;
+
+    @Value("${customerId}")
+    Integer customerId;
+
+    @Resource
+    private ScMeterReadRecordMapper scMeterReadRecordMapper;
+    @Override
+    public List<DataMessage> getReadingMeter(List<String> meterCodes, LocalDate readingTime) {
+        log.info("switchMeter meterCodes={},readingTime={}",JSON.toJSONString(meterCodes),readingTime);
+        if (readingTime == null) {
+            readingTime = LocalDate.now().plusDays(-1);
+        }
+        Integer date = Integer.valueOf(readingTime.format(DateTimeFormatter.ofPattern("yyyyMMdd")));;
+        List<DataMessage> list = scMeterReadRecordMapper.getReadingMeter(customerId,meterCodes,date);
+        log.info("switchMeter list size = {}, list={}", list.size(), JSON.toJSONString(list));
+        return list;
+    }
+
+    @Override
+    public ResponseMessage switchMeter(String meterCode, String command, String reason, String remark) {
+        log.info("switchMeter meterCode={},command={},reason={},remark={}",meterCode,command,reason,remark);
+        return optService.valveControl(meterCode,command);
+    }
+}

+ 42 - 0
src/main/resources/application-dev.properties

@@ -0,0 +1,42 @@
+spring.application.name=reading-meter
+server.servlet.context-path=/api
+server.port=8080
+logging.level.root=info
+logging.file.path=C:/logs/reading-meter
+
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.url=jdbc:mysql://114.135.61.188:33306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.username=root
+spring.datasource.password=100Zone@123
+spring.datasource.druid.initial-size=5
+spring.datasource.druid.min-idle=5
+spring.datasource.druid.max-active=20
+spring.datasource.druid.max-wait=60000
+spring.datasource.druid.time-between-eviction-runs-millis=60000
+spring.datasource.druid.min-evictable-idle-time-millis=300000
+spring.datasource.druid.validation-query=SELECT 1
+spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=true
+spring.datasource.druid.test-on-return=false
+spring.datasource.druid.pool-prepared-statements=true
+spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
+spring.datasource.druid.filters=stat,wall
+spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+# mybatis_config
+mybatis.mapper-locations=classpath*:mapper/*.xml
+mybatis.type-aliases-package=com.bz.smart_city.entity
+mybatis.configuration.map-underscore-to-camel-case=true
+mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis.configuration.use-column-label=true
+
+spring.jackson.time-zone=GMT+8
+
+customerId=46
+water-cloud-url=http://114.135.61.188:58080
+
+
+
+
+

+ 37 - 0
src/main/resources/application-prd.properties

@@ -0,0 +1,37 @@
+spring.application.name=reading-meter
+server.servlet.context-path=/api
+server.port=9002
+logging.level.root=info
+logging.file.path=/home/test/intergration/bozhou/logs
+
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.url=jdbc:mysql://47.112.217.10:3306/smart_city?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.username=root
+spring.datasource.password=100Zone@123
+spring.datasource.druid.initial-size=5
+spring.datasource.druid.min-idle=5
+spring.datasource.druid.max-active=20
+spring.datasource.druid.max-wait=60000
+spring.datasource.druid.time-between-eviction-runs-millis=60000
+spring.datasource.druid.min-evictable-idle-time-millis=300000
+spring.datasource.druid.validation-query=SELECT 1
+spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=true
+spring.datasource.druid.test-on-return=false
+spring.datasource.druid.pool-prepared-statements=true
+spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
+spring.datasource.druid.filters=stat,wall
+spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+# mybatis_config
+mybatis.mapper-locations=classpath*:mapper/*.xml
+mybatis.type-aliases-package=com.bz.smart_city.entity
+mybatis.configuration.map-underscore-to-camel-case=true
+mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis.configuration.use-column-label=true
+
+spring.jackson.time-zone=GMT+8
+
+customerId=79
+water-cloud-url=http://39.108.175.9:8090

+ 37 - 0
src/main/resources/application-sit.properties

@@ -0,0 +1,37 @@
+spring.application.name=reading-meter
+server.servlet.context-path=/api
+server.port=9002
+logging.level.root=info
+logging.file.path=/home/test/intergration/bozhou/logs
+
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.url=jdbc:mysql://114.135.61.188:33306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.username=root
+spring.datasource.password=100Zone@123
+spring.datasource.druid.initial-size=5
+spring.datasource.druid.min-idle=5
+spring.datasource.druid.max-active=20
+spring.datasource.druid.max-wait=60000
+spring.datasource.druid.time-between-eviction-runs-millis=60000
+spring.datasource.druid.min-evictable-idle-time-millis=300000
+spring.datasource.druid.validation-query=SELECT 1
+spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=true
+spring.datasource.druid.test-on-return=false
+spring.datasource.druid.pool-prepared-statements=true
+spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
+spring.datasource.druid.filters=stat,wall
+spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+# mybatis_config
+mybatis.mapper-locations=classpath*:mapper/*.xml
+mybatis.type-aliases-package=com.bz.smart_city.entity
+mybatis.configuration.map-underscore-to-camel-case=true
+mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis.configuration.use-column-label=true
+
+spring.jackson.time-zone=GMT+8
+
+customerId=46
+water-cloud-url=http://114.135.61.188:58080

+ 2 - 0
src/main/resources/application.properties

@@ -0,0 +1,2 @@
+#开发环境:dev  测试环境:sit  线上环境:prd  演示环境:uat
+spring.profiles.active=prd

+ 23 - 0
src/main/resources/logback-spring.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <springProperty scope="context" name="LOG_PATH" source="logging.file.path" defaultValue="/tmp" />
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <appender name="TIME_FILE"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/reading-meter.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxHistory>365</maxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="TIME_FILE" />
+    </root>
+</configuration>

+ 58 - 0
src/main/resources/mapper/ScMeterReadRecordMapper.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zoniot.readingmeter.dao.ScMeterReadRecordMapper">
+  <resultMap id="BaseResultMap" type="com.zoniot.readingmeter.entity.ScMeterReadRecord">
+    <!--@mbg.generated-->
+    <!--@Table sc_meter_read_record-->
+    <id column="id" property="id" />
+    <result column="read_date" property="readDate" />
+    <result column="site_id" property="siteId" />
+    <result column="sys_id" property="sysId" />
+    <result column="province" property="province" />
+    <result column="city" property="city" />
+    <result column="region" property="region" />
+    <result column="community" property="community" />
+    <result column="customer_id" property="customerId" />
+    <result column="concentrator_id" property="concentratorId" />
+    <result column="collector_id" property="collectorId" />
+    <result column="building_id" property="buildingId" />
+    <result column="location" property="location" />
+    <result column="device_type_id" property="deviceTypeId" />
+    <result column="device_id" property="deviceId" />
+    <result column="device_no" property="deviceNo" />
+    <result column="meter_no" property="meterNo" />
+    <result column="meter_file_no" property="meterFileNo" />
+    <result column="read_time" property="readTime" />
+    <result column="read_status" property="readStatus" />
+    <result column="read_data" property="readData" />
+    <result column="last_valid" property="lastValid" />
+    <result column="last_cost" property="lastCost" />
+    <result column="status" property="status" />
+    <result column="date_create" property="dateCreate" />
+    <result column="date_update" property="dateUpdate" />
+    <result column="create_by" property="createBy" />
+    <result column="update_by" property="updateBy" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, read_date, site_id, sys_id, province, city, region, community, customer_id, concentrator_id, 
+    collector_id, building_id, `location`, device_type_id, device_id, device_no, meter_no, 
+    meter_file_no, read_time, read_status, read_data, last_valid, last_cost, `status`, 
+    date_create, date_update, create_by, update_by
+  </sql>
+
+  <select id="getReadingMeter" resultType="com.zoniot.readingmeter.model.DataMessage">
+      select
+      meter_no as Meter_Code,
+      read_data as Read_Scale,
+      read_time as Reading_Time,
+      (select valve_status from  sc_water_meter_error_days d where status = 1 and d.device_id = r.device_id) as State
+      from sc_meter_read_record r
+      where status = 1 and read_status = 2
+      and customer_id = #{customerId} and read_date = #{date}
+      <if test ="meterCodes != null and meterCodes.size() != 0">
+          and meter_no in
+          <foreach collection="meterCodes" item="item" open="(" separator="," close=")">#{item}</foreach>
+      </if>
+  </select>
+</mapper>

+ 13 - 0
src/test/java/com/zoniot/readingmeter/ReadingMeterApplicationTests.java

@@ -0,0 +1,13 @@
+package com.zoniot.readingmeter;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class ReadingMeterApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}