소스 검색

Merge branch '0617' of http://114.135.61.188:53000/ZONIOT/water-iot into 0617

Xiaojh 5 년 전
부모
커밋
3f3cf1a30d
43개의 변경된 파일3358개의 추가작업 그리고 0개의 파일을 삭제
  1. 31 0
      meter-reading-tongzi/ReadMeterMongodb/.gitignore
  2. 118 0
      meter-reading-tongzi/ReadMeterMongodb/.mvn/wrapper/MavenWrapperDownloader.java
  3. BIN
      meter-reading-tongzi/ReadMeterMongodb/.mvn/wrapper/maven-wrapper.jar
  4. 2 0
      meter-reading-tongzi/ReadMeterMongodb/.mvn/wrapper/maven-wrapper.properties
  5. 310 0
      meter-reading-tongzi/ReadMeterMongodb/mvnw
  6. 182 0
      meter-reading-tongzi/ReadMeterMongodb/mvnw.cmd
  7. 57 0
      meter-reading-tongzi/ReadMeterMongodb/pom.xml
  8. 16 0
      meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/DemoApplication.java
  9. 58 0
      meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/controller/SiteController.java
  10. 39 0
      meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/entity/AccountDto.java
  11. 156 0
      meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/entity/MeterInfoDto.java
  12. 97 0
      meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/entity/MeterReadDto.java
  13. 56 0
      meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/entity/RequestReadingMeterDto.java
  14. 53 0
      meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/entity/ResponseMsg.java
  15. 51 0
      meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/entity/ResultDto.java
  16. 166 0
      meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/service/SiteService.java
  17. 18 0
      meter-reading-tongzi/ReadMeterMongodb/src/main/resources/application.yml
  18. 166 0
      meter-reading-tongzi/ReadMeterMongodb/src/main/resources/logback.xml
  19. 13 0
      meter-reading-tongzi/ReadMeterMongodb/src/test/java/com/example/demo/DemoApplicationTests.java
  20. 31 0
      meter-reading-tongzi/ReadMeterMysql/.gitignore
  21. 118 0
      meter-reading-tongzi/ReadMeterMysql/.mvn/wrapper/MavenWrapperDownloader.java
  22. BIN
      meter-reading-tongzi/ReadMeterMysql/.mvn/wrapper/maven-wrapper.jar
  23. 2 0
      meter-reading-tongzi/ReadMeterMysql/.mvn/wrapper/maven-wrapper.properties
  24. 310 0
      meter-reading-tongzi/ReadMeterMysql/mvnw
  25. 182 0
      meter-reading-tongzi/ReadMeterMysql/mvnw.cmd
  26. 105 0
      meter-reading-tongzi/ReadMeterMysql/pom.xml
  27. 17 0
      meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/DemoApplication.java
  28. 58 0
      meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/controller/SiteController.java
  29. 16 0
      meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/dao/SiteDao.java
  30. 39 0
      meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/entity/AccountDto.java
  31. 151 0
      meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/entity/MeterInfoDto.java
  32. 93 0
      meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/entity/MeterReadDto.java
  33. 56 0
      meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/entity/RequestReadingMeterDto.java
  34. 53 0
      meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/entity/ResponseMsg.java
  35. 51 0
      meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/entity/ResultDto.java
  36. 106 0
      meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/service/SiteService.java
  37. 58 0
      meter-reading-tongzi/ReadMeterMysql/src/main/resources/application.yml
  38. 166 0
      meter-reading-tongzi/ReadMeterMysql/src/main/resources/logback.xml
  39. 55 0
      meter-reading-tongzi/ReadMeterMysql/src/main/resources/mapper/SiteMapper.xml
  40. 12 0
      meter-reading-tongzi/ReadMeterMysql/src/main/webapp/WEB-INF/jsp/index.jsp
  41. 13 0
      meter-reading-tongzi/ReadMeterMysql/src/test/java/com/example/demo/DemoApplicationTests.java
  42. 28 0
      meter-reading-tongzi/ReadMeterMysql/src/test/java/com/example/demo/MapperTest.java
  43. 49 0
      meter-reading-tongzi/ReadMeterMysql/src/test/java/com/example/demo/RedisTest.java

+ 31 - 0
meter-reading-tongzi/ReadMeterMongodb/.gitignore

@@ -0,0 +1,31 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+### 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/
+
+### VS Code ###
+.vscode/

+ 118 - 0
meter-reading-tongzi/ReadMeterMongodb/.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,118 @@
+/*
+ * Copyright 2007-present the original author or 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.
+ */
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+            + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if (mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if (mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if (!outputFile.getParentFile().exists()) {
+            if (!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

BIN
meter-reading-tongzi/ReadMeterMongodb/.mvn/wrapper/maven-wrapper.jar


+ 2 - 0
meter-reading-tongzi/ReadMeterMongodb/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

+ 310 - 0
meter-reading-tongzi/ReadMeterMongodb/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
meter-reading-tongzi/ReadMeterMongodb/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%

+ 57 - 0
meter-reading-tongzi/ReadMeterMongodb/pom.xml

@@ -0,0 +1,57 @@
+<?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>
+    <groupId>com.example</groupId>
+    <artifactId>ReadMeterMongodb</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>ReadMeterMongodb</name>
+    <description>Demo project for Spring Boot</description>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.3.1.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <!-- 跳过打包检测 -->
+        <skipTests>true</skipTests>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- mongo db-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                </configuration>
+            </plugin>
+        </plugins>
+   </build>
+
+</project>

+ 16 - 0
meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/DemoApplication.java

@@ -0,0 +1,16 @@
+package com.example.demo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+
+
+@SpringBootApplication
+public class DemoApplication {
+
+    public static void main(String[] args) {
+
+        SpringApplication.run(DemoApplication.class, args);
+    }
+
+}

+ 58 - 0
meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/controller/SiteController.java

@@ -0,0 +1,58 @@
+package com.example.demo.controller;
+
+import com.example.demo.entity.RequestReadingMeterDto;
+import com.example.demo.entity.ResponseMsg;
+import com.example.demo.service.SiteService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping("/Site")
+public class SiteController {
+
+    private static Logger logger = LoggerFactory.getLogger(SiteController.class);
+
+
+    @Autowired
+    private SiteService siteService;
+    /**
+     * 查询水表读数
+     * @param requestReadingMeterDto
+     * @param request
+     * @return
+     */
+    @RequestMapping( value = "/ReadingMeter" ,method = {RequestMethod.POST})
+    @ResponseBody
+    public  ResponseMsg ReadingMeter( @RequestBody RequestReadingMeterDto requestReadingMeterDto, HttpServletRequest request){
+            logger.info("查询水表读数:"+requestReadingMeterDto.toString());
+            ResponseMsg responseMsg= siteService.getMeterRead(requestReadingMeterDto);
+            return responseMsg;
+    }
+
+    /**
+     * 查询水表信息
+     * @param requestReadingMeterDto
+     * @param request
+     * @return
+     */
+    @RequestMapping( value = "/MeterInfo" ,method = {RequestMethod.POST})
+    @ResponseBody
+    public  ResponseMsg MeterInfo( @RequestBody RequestReadingMeterDto requestReadingMeterDto, HttpServletRequest request){
+        logger.info("查询水表信息:"+requestReadingMeterDto.toString());
+        ResponseMsg responseMsg= siteService.getMeterInfo(requestReadingMeterDto);
+        return responseMsg;
+    }
+
+}
+
+
+
+

+ 39 - 0
meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/entity/AccountDto.java

@@ -0,0 +1,39 @@
+package com.example.demo.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+
+public class AccountDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("UserName")
+    private  String UserName;   //账号
+    @JsonProperty("Password")
+    private  String Password;   //密码
+
+    public String getUserName() {
+        return UserName;
+    }
+
+    public void setUserName(String userName) {
+        UserName = userName;
+    }
+
+    public String getPassword() {
+        return Password;
+    }
+
+    public void setPassword(String password) {
+        Password = password;
+    }
+
+    @Override
+    public String toString() {
+        return "AccountDto{" +
+                "UserName='" + UserName + '\'' +
+                ", Password='" + Password + '\'' +
+                '}';
+    }
+}

+ 156 - 0
meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/entity/MeterInfoDto.java

@@ -0,0 +1,156 @@
+package com.example.demo.entity;
+
+import org.springframework.data.mongodb.core.mapping.Field;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class MeterInfoDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Field("meterNo")
+    private String MeterCode;  //水表表号
+    private int ValveStatus =   1;    //阀门状态(0:关、1:开、8:应急开阀(没有则不约定))
+    private Integer SignalStrength; //信号强度 格式:23 ; 长度两位,数据不统一则转换为统一数据
+    @Field("readTime")
+    private Date SamplTime;  //设备时间
+    private BigDecimal Pressure;   //水压 单位:Bar
+    private Integer Temperature;    //温度 单位:℃
+    @Field("readData")
+    private BigDecimal Forwardflow;    //正向流量 单位:m³
+    private BigDecimal Reverseflow;    //反向流量 单位:m³
+    private BigDecimal Instantflow;    //瞬时流量 单位:h/m³
+    private Double Voltage;    //电压 单位:V
+    private Integer MeterStatus;    //表具状态(详见注释)
+    private BigDecimal Lat;    //纬度 例如:31.820545900000
+    private BigDecimal Lng;    //经度 例如:118.57926100000
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getMeterCode() {
+        return MeterCode;
+    }
+
+    public void setMeterCode(String meterCode) {
+        MeterCode = meterCode;
+    }
+
+    public int getValveStatus() {
+        return ValveStatus;
+    }
+
+    public void setValveStatus(int valveStatus) {
+        ValveStatus = valveStatus;
+    }
+
+    public Integer getSignalStrength() {
+        return SignalStrength;
+    }
+
+    public void setSignalStrength(Integer signalStrength) {
+        SignalStrength = signalStrength;
+    }
+
+    public Date getSamplTime() {
+        return SamplTime;
+    }
+
+    public void setSamplTime(Date samplTime) {
+        SamplTime = samplTime;
+    }
+
+    public BigDecimal getPressure() {
+        return Pressure;
+    }
+
+    public void setPressure(BigDecimal pressure) {
+        Pressure = pressure;
+    }
+
+    public Integer getTemperature() {
+        return Temperature;
+    }
+
+    public void setTemperature(Integer temperature) {
+        Temperature = temperature;
+    }
+
+    public BigDecimal getForwardflow() {
+        return Forwardflow;
+    }
+
+    public void setForwardflow(BigDecimal forwardflow) {
+        Forwardflow = forwardflow;
+    }
+
+    public BigDecimal getReverseflow() {
+        return Reverseflow;
+    }
+
+    public void setReverseflow(BigDecimal reverseflow) {
+        Reverseflow = reverseflow;
+    }
+
+    public BigDecimal getInstantflow() {
+        return Instantflow;
+    }
+
+    public void setInstantflow(BigDecimal instantflow) {
+        Instantflow = instantflow;
+    }
+
+    public Double getVoltage() {
+        return Voltage;
+    }
+
+    public void setVoltage(Double voltage) {
+        Voltage = voltage;
+    }
+
+    public Integer getMeterStatus() {
+        return MeterStatus;
+    }
+
+    public void setMeterStatus(Integer meterStatus) {
+        MeterStatus = meterStatus;
+    }
+
+    public BigDecimal getLat() {
+        return Lat;
+    }
+
+    public void setLat(BigDecimal lat) {
+        Lat = lat;
+    }
+
+    public BigDecimal getLng() {
+        return Lng;
+    }
+
+    public void setLng(BigDecimal lng) {
+        Lng = lng;
+    }
+
+    @Override
+    public String toString() {
+        return "MeterInfoDto{" +
+                "MeterCode='" + MeterCode + '\'' +
+                ", ValveStatus=" + ValveStatus +
+                ", SignalStrength=" + SignalStrength +
+                ", SamplTime=" + SamplTime +
+                ", Pressure=" + Pressure +
+                ", Temperature=" + Temperature +
+                ", Forwardflow=" + Forwardflow +
+                ", Reverseflow=" + Reverseflow +
+                ", Instantflow=" + Instantflow +
+                ", Voltage=" + Voltage +
+                ", MeterStatus=" + MeterStatus +
+                ", Lat=" + Lat +
+                ", Lng=" + Lng +
+                '}';
+    }
+}

+ 97 - 0
meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/entity/MeterReadDto.java

@@ -0,0 +1,97 @@
+package com.example.demo.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class MeterReadDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @Field("meterNo")
+    private String MeterCode;   //水表表号
+
+    private Integer ValveStatus = 1;    //阀门状态(0:关、1:开),NB表有应急开阀的则为8:应急开阀(没有则不约定). 无阀门的,默认值为:1.
+    @Field("readData")
+    private BigDecimal ReadScale;   //读数(指定水表表号的指定日期的抄表读数。如果当天没有冻结数据,则返回前一天的数据。如果前一天没有数据,则视为异常。异常读数为:-1)
+    private String ConcentratorAddress; //集中器码址 注:NB表无码址则为空
+    private Integer PointNum;   //测量点号(采集通道号),集中器分配的表的通道号
+   // @JsonFormat(pattern="yyyy年MM月dd日 HH时mm分ss秒",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Field("readTime")
+    private Date ReadingTime; //冻结时间(读数时间或者上次采集时间)(yyyy-MM-dd HH:mm:ss)
+    private String Remark = "";//|备注(允许空)
+
+    public String getMeterCode() {
+        return MeterCode;
+    }
+
+    public void setMeterCode(String meterCode) {
+        MeterCode = meterCode;
+    }
+
+    public Integer getValveStatus() {
+        return ValveStatus;
+    }
+
+    public void setValveStatus(Integer valveStatus) {
+        ValveStatus = valveStatus;
+    }
+
+    public BigDecimal getReadScale() {
+        return ReadScale;
+    }
+
+    public void setReadScale(BigDecimal readScale) {
+        ReadScale = readScale;
+    }
+
+    public String getConcentratorAddress() {
+        return ConcentratorAddress;
+    }
+
+    public void setConcentratorAddress(String concentratorAddress) {
+        ConcentratorAddress = concentratorAddress;
+    }
+
+    public Integer getPointNum() {
+        return PointNum;
+    }
+
+    public void setPointNum(Integer pointNum) {
+        PointNum = pointNum;
+    }
+
+    public Date getReadingTime() {
+        return ReadingTime;
+    }
+
+    public void setReadingTime(Date readingTime) {
+        ReadingTime = readingTime;
+    }
+
+    public String getRemark() {
+        return Remark;
+    }
+
+    public void setRemark(String remark) {
+        Remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "MeterReadDto{" +
+                "MeterCode='" + MeterCode + '\'' +
+                ", ValveStatus=" + ValveStatus +
+                ", ReadScale=" + ReadScale +
+                ", ConcentratorAddress='" + ConcentratorAddress + '\'' +
+                ", PointNum=" + PointNum +
+                ", ReadingTime=" + ReadingTime +
+                ", Remark='" + Remark + '\'' +
+                '}';
+    }
+}

+ 56 - 0
meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/entity/RequestReadingMeterDto.java

@@ -0,0 +1,56 @@
+package com.example.demo.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+public class RequestReadingMeterDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("MeterCode")
+    private List<String> MeterCode; //水表表号(传空数组时返回当前最新的全部抄表读数。允许多个值,比如:[“01010001”, “01010002”, “01010003”, “01010004”, ……]返回指定水表表号的指定日期的抄表读数。)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonProperty("ReadingTime")
+    private Date ReadingTime; //冻结日期(yyyy-MM-dd),如果不传,则默认今天的
+    @JsonProperty("Account")
+    private AccountDto Account; //鉴权账户信息
+
+    public List<String> getMeterCode() {
+        return MeterCode;
+    }
+
+    public void setMeterCode(List<String> meterCode) {
+        MeterCode = meterCode;
+    }
+
+    public Date getReadingTime() {
+        return ReadingTime;
+    }
+
+    public void setReadingTime(Date readingTime) {
+        ReadingTime = readingTime;
+    }
+
+    public AccountDto getAccount() {
+        return Account;
+    }
+
+    public void setAccount(AccountDto account) {
+        Account = account;
+    }
+
+    @Override
+    public String toString() {
+        return "RequestReadingMeterDto{" +
+                "MeterCode=" + MeterCode +
+                ", ReadingTime='" + ReadingTime + '\'' +
+                ", Account=" + Account +
+                '}';
+    }
+}

+ 53 - 0
meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/entity/ResponseMsg.java

@@ -0,0 +1,53 @@
+package com.example.demo.entity;
+
+import java.io.Serializable;
+
+public class ResponseMsg  implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private  Boolean Success;   //是否成功(True:成功、False:失败)
+    private  String ErrorMsg;   //错误消息
+    private ResultDto Result;   //返回数据对象
+
+    public ResponseMsg(){
+
+    }
+    public ResponseMsg( Boolean success, String errorMsg,ResultDto result){
+            this.Success=success;
+            this.ErrorMsg=errorMsg;
+            this.Result=result;
+    }
+
+    public Boolean getSuccess() {
+        return Success;
+    }
+
+    public void setSuccess(Boolean success) {
+        Success = success;
+    }
+
+    public String getErrorMsg() {
+        return ErrorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        ErrorMsg = errorMsg;
+    }
+
+    public ResultDto getResult() {
+        return Result;
+    }
+
+    public void setResult(ResultDto result) {
+        Result = result;
+    }
+
+    @Override
+    public String toString() {
+        return "ResponseMsg{" +
+                "Success=" + Success +
+                ", ErrorMsg='" + ErrorMsg + '\'' +
+                ", Result=" + Result +
+                '}';
+    }
+}

+ 51 - 0
meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/entity/ResultDto.java

@@ -0,0 +1,51 @@
+package com.example.demo.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ResultDto<T> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private int Total;  //记录条数
+
+    private List<T> Data;    //水表读数列表(查无此水表,则不包含返回值内)
+
+    public ResultDto(){}
+
+    public ResultDto(List<T> data){
+        if(data !=null){
+            this.Total=data.size();
+        }else{
+            this.Total=0;
+        }
+        this.Data=data;
+    }
+
+    public int getTotal() {
+
+        return Total;
+    }
+
+    public void setTotal(int total) {
+
+        Total = total;
+    }
+
+    public List<T> getData() {
+        return Data;
+    }
+
+    public void setData(List<T> data) {
+
+        Data = data;
+    }
+
+    @Override
+    public String toString() {
+        return "ResultDto{" +
+                "Total=" + Total +
+                ", Data=" + Data+
+                '}';
+    }
+}

+ 166 - 0
meter-reading-tongzi/ReadMeterMongodb/src/main/java/com/example/demo/service/SiteService.java

@@ -0,0 +1,166 @@
+package com.example.demo.service;
+
+import com.example.demo.entity.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class SiteService {
+
+    @Autowired
+    MongoTemplate mongoTemplate;
+
+    @Value("${Account.username}")
+    private String username;    //账号
+    @Value("${Account.password}")
+    private String password;    //密码
+
+
+    public ResponseMsg getMeterInfo(RequestReadingMeterDto requestReadingMeterDto){
+        //验证账号密码
+        if(requestReadingMeterDto.getAccount() != null&&
+                username.equals(requestReadingMeterDto.getAccount().getUserName())&&password.equals(requestReadingMeterDto.getAccount().getPassword())){
+        }else{
+            return new ResponseMsg( false,"账户验证失败",new ResultDto());
+        }
+
+        if(requestReadingMeterDto.getMeterCode() != null && requestReadingMeterDto.getMeterCode() .size()>0){
+            List<MeterInfoDto> meterInfos = this.queryMeterInfoList(requestReadingMeterDto.getMeterCode());
+            if(meterInfos.size()>0){
+                return new ResponseMsg( true,"成功",new ResultDto(meterInfos));
+            }else{
+                return new ResponseMsg( false,"未查询到水表信息",new ResultDto());
+            }
+        }else{
+            return new ResponseMsg( false,"未输入需查询的表号",new ResultDto());
+        }
+    }
+
+    /**
+     * 获取抄表数据
+     * @param requestReadingMeterDto
+     * @return
+     */
+    public ResponseMsg getMeterRead(RequestReadingMeterDto requestReadingMeterDto){
+
+        //验证账号密码
+        if(requestReadingMeterDto.getAccount() != null&&
+                username.equals(requestReadingMeterDto.getAccount().getUserName())&&password.equals(requestReadingMeterDto.getAccount().getPassword())){
+        }else{
+            return new ResponseMsg( false,"账户验证失败",new ResultDto());
+        }
+
+        //查询数据
+        if(requestReadingMeterDto != null) {
+
+            if(requestReadingMeterDto.getReadingTime() == null){
+                return new ResponseMsg( false,"查询日期为空",new ResultDto());
+            }
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+            Integer readDate= Integer.valueOf(formatter.format(requestReadingMeterDto.getReadingTime()));
+            List<String> meterCodes = requestReadingMeterDto.getMeterCode();
+            if (meterCodes != null && meterCodes.size() > 1000) {    //数量查询限制
+                return new ResponseMsg(false, "查询表数请限制在1000个以内", new ResultDto());
+            }
+            //查询数据
+            List<MeterReadDto> meterReads = this.queryReadInfoList(meterCodes,readDate);
+
+            if (meterCodes != null && meterCodes.size() > 0 && meterReads.size() != meterCodes.size()) {
+                //遍历未查询到表的编码
+                for (MeterReadDto meterReadDto : meterReads) {
+                    meterCodes.remove(meterReadDto.getMeterCode());//移除已经查询到的表号
+                }
+                if(meterCodes.size()==0){
+                    return new ResponseMsg( true,"成功",new ResultDto(meterReads));
+                }
+                Calendar c = Calendar.getInstance();
+                c.setTime(requestReadingMeterDto.getReadingTime());
+                c.add(Calendar.DAY_OF_MONTH, -1);
+                Integer yesterday = Integer.valueOf(formatter.format(requestReadingMeterDto.getReadingTime()));
+                //查询前一天的数据
+                List<MeterReadDto> meterRead2 = this.queryReadInfoList(meterCodes,yesterday);
+                //遍历未查询到表的编码
+                for (MeterReadDto meterReadDto : meterRead2) {
+                    meterCodes.remove(meterReadDto.getMeterCode());//移除已经查询到的表号
+                }
+                meterReads.addAll(meterRead2);//合并两次查询的数据
+
+                //未查询到的数据标记异常
+                for (String meterCode : meterCodes) {
+                    MeterReadDto meterReadDto = new MeterReadDto();
+                    meterReadDto.setMeterCode(meterCode);
+                    meterReadDto.setReadScale(new BigDecimal(-1));
+                    meterReadDto.setValveStatus(1);
+                    meterReadDto.setReadingTime(new Date());
+                    meterReads.add(meterReadDto);
+                }
+            }
+            //返回查询数据
+            if (meterReads != null && meterReads.size() > 0) {
+                 return new ResponseMsg( true,"成功",new ResultDto(meterReads));
+            }else{
+                 return new ResponseMsg( false,"未查询到有效数据",new ResultDto());
+            }
+        }else{
+            return new ResponseMsg( false,"查询条件为空",new ResultDto());
+        }
+    }
+
+    public List<MeterReadDto> queryReadInfoList(List<String> meterCodes, Integer readDate){
+        Query query = new Query();
+        if(meterCodes != null && meterCodes.size()>0){
+            query.addCriteria(Criteria.where("meterNo").in(meterCodes)) ;
+        }
+        query.addCriteria(Criteria.where("readData").ne(null));
+        query.addCriteria(Criteria.where("customerId").is(3));
+        query.addCriteria(Criteria.where("status").is(1));
+        query.addCriteria(Criteria.where("readDate").is(readDate));
+        query.fields().include("meterNo");
+        query.fields().include("readData");
+        query.fields().include("readTime");
+        query.with(Sort.by(Sort.Order.desc("sendTime")));
+
+        List<MeterReadDto> list = mongoTemplate.find(query, MeterReadDto.class,"sc_meter_read_record");
+        return list;
+    }
+
+    public List<MeterInfoDto> queryMeterInfoList(List<String> meterCodes) {
+
+        Criteria criteria = Criteria.where("readData").ne(null)
+                .and("customerId").is(3)
+                .and("status").is(1);
+        if(meterCodes != null && meterCodes.size()>0){
+            criteria.and("meterNo").in(meterCodes);
+        }
+
+        Aggregation agg = Aggregation.newAggregation(
+                Aggregation.match(criteria),
+                Aggregation.sort(Sort.Direction.DESC, "readDate"),//在聚合之前对数据进行排序
+                Aggregation.group("deviceId")
+                        .first("meterNo").as("meterNo")
+                        .first("readTime").as("readTime")
+                        .first("readData").as("readData")
+        );
+        AggregationResults<MeterInfoDto> durationData =
+                mongoTemplate.aggregate(agg, "sc_meter_read_record", MeterInfoDto.class);
+        List<MeterInfoDto> MeterInfoDtos = durationData.getMappedResults();
+        return MeterInfoDtos;
+
+    }
+
+
+
+}

+ 18 - 0
meter-reading-tongzi/ReadMeterMongodb/src/main/resources/application.yml

@@ -0,0 +1,18 @@
+server:
+  port: 8081
+
+Account:
+  username: wangli
+  password: 123456
+
+spring:
+  data:
+    mongodb:
+      uri: mongodb://114.135.61.188:17017/water-iot-database
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+#showSql
+logging:
+  level:
+    org.springframework.data.mongodb.core: DEBUG
+

+ 166 - 0
meter-reading-tongzi/ReadMeterMongodb/src/main/resources/logback.xml

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <!-- 项目名称 -->
+    <property name="PROJECT_NAME" value="demo2" />
+
+    <!-- 文件输出格式 -->
+    <property name="PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n"/>
+    <!-- 输出文件路径 -->
+    <property name="OPEN_FILE_PATH" value="/mnt/prd/integration/tongzi/logs "/>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${PATTERN}</pattern>
+<!--            <charset>UTF-8</charset>-->
+        </encoder>
+    </appender>
+
+    <!-- ch.qos.logback.core.rolling.RollingFileAppender 文件日志输出 -->
+    <appender name="OPEN-FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!--不能有这项配置!!!!!-->
+        <!--<Encoding>UTF-8</Encoding>-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${OPEN_FILE_PATH}/all/log.%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!--日志文件最大的大小-->
+                <MaxFileSize>10MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>${PATTERN}</pattern>
+        </layout>
+    </appender>
+
+    <!--输出到debug-->
+    <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${OPEN_FILE_PATH}/debug/log.%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <MaxFileSize>10MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <append>true</append>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印DEBUG日志 -->
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--输出到info-->
+    <appender name="info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${OPEN_FILE_PATH}/info/log.%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <MaxFileSize>10MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <append>true</append>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印INFO日志 -->
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--输出到error-->
+    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <FileNamePattern>${OPEN_FILE_PATH}/error/log.%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+        <MaxHistory>30</MaxHistory>
+        <TimeBasedFileNamingAndTriggeringPolicy
+                class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <MaxFileSize>10MB</MaxFileSize>
+        </TimeBasedFileNamingAndTriggeringPolicy>
+    </rollingPolicy>
+    <append>true</append>
+    <encoder>
+        <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+        <charset>utf-8</charset>
+    </encoder>
+    <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印ERROR日志 -->
+        <level>ERROR</level>
+        <onMatch>ACCEPT</onMatch>
+        <onMismatch>DENY</onMismatch>
+    </filter>
+</appender>
+
+    <!--输出到warn-->
+    <appender name="warn" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${OPEN_FILE_PATH}/warn/log.%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <MaxFileSize>10MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <append>true</append>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印WARN日志 -->
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="myInfo" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${OPEN_FILE_PATH}/myInfo/log.%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <MaxFileSize>10MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <append>true</append>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+<!--        <filter class="ch.qos.logback.classic.filter.LevelFilter">-->
+<!--            <level>INFO</level>-->
+<!--            <onMatch>ACCEPT</onMatch>-->
+<!--            <onMismatch>DENY</onMismatch>-->
+<!--        </filter>-->
+    </appender>
+
+
+    <!-- 控制台输出日志级别 -->
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="OPEN-FILE"/>
+        <appender-ref ref="debug" />
+        <appender-ref ref="info" />
+        <appender-ref ref="error" />
+        <appender-ref ref="warn" />
+    </root>
+    <!-- 指定项目中某个包,一把为执行sql的mapper包,当有日志操作行为时的日志记录级别DEBUG -->
+    <!-- 级别依次为从高到低:FATAL > ERROR > WARN > INFO > DEBUG > TRACE  -->
+    <logger name="com.example.demo.dao" level="DEBUG">
+        <appender-ref ref="myInfo" />
+    </logger>
+    <logger name="com.example.demo.controller" level="info">
+        <appender-ref ref="myInfo" />
+    </logger>
+</configuration>

+ 13 - 0
meter-reading-tongzi/ReadMeterMongodb/src/test/java/com/example/demo/DemoApplicationTests.java

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

+ 31 - 0
meter-reading-tongzi/ReadMeterMysql/.gitignore

@@ -0,0 +1,31 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+### 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/
+
+### VS Code ###
+.vscode/

+ 118 - 0
meter-reading-tongzi/ReadMeterMysql/.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,118 @@
+/*
+ * Copyright 2007-present the original author or 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.
+ */
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+            + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if (mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if (mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if (!outputFile.getParentFile().exists()) {
+            if (!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

BIN
meter-reading-tongzi/ReadMeterMysql/.mvn/wrapper/maven-wrapper.jar


+ 2 - 0
meter-reading-tongzi/ReadMeterMysql/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

+ 310 - 0
meter-reading-tongzi/ReadMeterMysql/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
meter-reading-tongzi/ReadMeterMysql/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%

+ 105 - 0
meter-reading-tongzi/ReadMeterMysql/pom.xml

@@ -0,0 +1,105 @@
+<?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>
+    <groupId>com.example</groupId>
+    <artifactId>readMeterMysql</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>readMeterMysql</name>
+    <description>Demo project for Spring Boot</description>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.3.1.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <!-- 跳过打包检测 -->
+        <skipTests>true</skipTests>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jdbc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.1.3</version>
+        </dependency>
+        <!-- MySQL -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- redis -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+        </dependency>
+        <!--Druid-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>0.2.9</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <!-- tomcatd的jsp支持 -->
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+        </dependency>
+        <!-- servlet容器 -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                </configuration>
+            </plugin>
+        </plugins>
+   </build>
+
+</project>

+ 17 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/DemoApplication.java

@@ -0,0 +1,17 @@
+package com.example.demo;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+
+@MapperScan("com.example.demo.dao")
+@SpringBootApplication
+public class DemoApplication {
+
+    public static void main(String[] args) {
+
+        SpringApplication.run(DemoApplication.class, args);
+    }
+
+}

+ 58 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/controller/SiteController.java

@@ -0,0 +1,58 @@
+package com.example.demo.controller;
+
+import com.example.demo.entity.RequestReadingMeterDto;
+import com.example.demo.entity.ResponseMsg;
+import com.example.demo.service.SiteService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping("/Site")
+public class SiteController {
+
+    private static Logger logger = LoggerFactory.getLogger(SiteController.class);
+
+    @Autowired
+    private SiteService siteService;
+
+    /**
+     * 查询水表读数
+     * @param requestReadingMeterDto
+     * @param request
+     * @return
+     */
+    @RequestMapping( value = "/ReadingMeter" ,method = {RequestMethod.POST})
+    @ResponseBody
+    public  ResponseMsg ReadingMeter( @RequestBody RequestReadingMeterDto requestReadingMeterDto, HttpServletRequest request){
+            logger.info("查询水表读数:"+requestReadingMeterDto.toString());
+            ResponseMsg responseMsg= siteService.getMeterRead(requestReadingMeterDto);
+            return responseMsg;
+    }
+
+    /**
+     * 查询水表信息
+     * @param requestReadingMeterDto
+     * @param request
+     * @return
+     */
+    @RequestMapping( value = "/MeterInfo" ,method = {RequestMethod.POST})
+    @ResponseBody
+    public  ResponseMsg MeterInfo( @RequestBody RequestReadingMeterDto requestReadingMeterDto, HttpServletRequest request){
+        logger.info("查询水表信息:"+requestReadingMeterDto.toString());
+        ResponseMsg responseMsg= siteService.getMeterInfo(requestReadingMeterDto);
+        return responseMsg;
+    }
+
+}
+
+
+
+

+ 16 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/dao/SiteDao.java

@@ -0,0 +1,16 @@
+package com.example.demo.dao;
+
+import com.example.demo.entity.MeterInfoDto;
+import com.example.demo.entity.MeterReadDto;
+import com.example.demo.entity.RequestReadingMeterDto;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface SiteDao {
+
+
+    List<MeterReadDto> getMeterRead(RequestReadingMeterDto requestReadingMeterDto);
+    List<MeterInfoDto> getMeterInfo(List<String> list);
+}

+ 39 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/entity/AccountDto.java

@@ -0,0 +1,39 @@
+package com.example.demo.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+
+public class AccountDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("UserName")
+    private  String UserName;   //账号
+    @JsonProperty("Password")
+    private  String Password;   //密码
+
+    public String getUserName() {
+        return UserName;
+    }
+
+    public void setUserName(String userName) {
+        UserName = userName;
+    }
+
+    public String getPassword() {
+        return Password;
+    }
+
+    public void setPassword(String password) {
+        Password = password;
+    }
+
+    @Override
+    public String toString() {
+        return "AccountDto{" +
+                "UserName='" + UserName + '\'' +
+                ", Password='" + Password + '\'' +
+                '}';
+    }
+}

+ 151 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/entity/MeterInfoDto.java

@@ -0,0 +1,151 @@
+package com.example.demo.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class MeterInfoDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String MeterCode;  //水表表号
+    private int ValveStatus;    //阀门状态(0:关、1:开、8:应急开阀(没有则不约定))
+    private Integer SignalStrength; //信号强度 格式:23 ; 长度两位,数据不统一则转换为统一数据
+    private Date SamplTime;  //设备时间
+    private BigDecimal Pressure;   //水压 单位:Bar
+    private Integer Temperature;    //温度 单位:℃
+    private BigDecimal Forwardflow;    //正向流量 单位:m³
+    private BigDecimal Reverseflow;    //反向流量 单位:m³
+    private BigDecimal Instantflow;    //瞬时流量 单位:h/m³
+    private Double Voltage;    //电压 单位:V
+    private Integer MeterStatus;    //表具状态(详见注释)
+    private BigDecimal Lat;    //纬度 例如:31.820545900000
+    private BigDecimal Lng;    //经度 例如:118.57926100000
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getMeterCode() {
+        return MeterCode;
+    }
+
+    public void setMeterCode(String meterCode) {
+        MeterCode = meterCode;
+    }
+
+    public int getValveStatus() {
+        return ValveStatus;
+    }
+
+    public void setValveStatus(int valveStatus) {
+        ValveStatus = valveStatus;
+    }
+
+    public Integer getSignalStrength() {
+        return SignalStrength;
+    }
+
+    public void setSignalStrength(Integer signalStrength) {
+        SignalStrength = signalStrength;
+    }
+
+    public Date getSamplTime() {
+        return SamplTime;
+    }
+
+    public void setSamplTime(Date samplTime) {
+        SamplTime = samplTime;
+    }
+
+    public BigDecimal getPressure() {
+        return Pressure;
+    }
+
+    public void setPressure(BigDecimal pressure) {
+        Pressure = pressure;
+    }
+
+    public Integer getTemperature() {
+        return Temperature;
+    }
+
+    public void setTemperature(Integer temperature) {
+        Temperature = temperature;
+    }
+
+    public BigDecimal getForwardflow() {
+        return Forwardflow;
+    }
+
+    public void setForwardflow(BigDecimal forwardflow) {
+        Forwardflow = forwardflow;
+    }
+
+    public BigDecimal getReverseflow() {
+        return Reverseflow;
+    }
+
+    public void setReverseflow(BigDecimal reverseflow) {
+        Reverseflow = reverseflow;
+    }
+
+    public BigDecimal getInstantflow() {
+        return Instantflow;
+    }
+
+    public void setInstantflow(BigDecimal instantflow) {
+        Instantflow = instantflow;
+    }
+
+    public Double getVoltage() {
+        return Voltage;
+    }
+
+    public void setVoltage(Double voltage) {
+        Voltage = voltage;
+    }
+
+    public Integer getMeterStatus() {
+        return MeterStatus;
+    }
+
+    public void setMeterStatus(Integer meterStatus) {
+        MeterStatus = meterStatus;
+    }
+
+    public BigDecimal getLat() {
+        return Lat;
+    }
+
+    public void setLat(BigDecimal lat) {
+        Lat = lat;
+    }
+
+    public BigDecimal getLng() {
+        return Lng;
+    }
+
+    public void setLng(BigDecimal lng) {
+        Lng = lng;
+    }
+
+    @Override
+    public String toString() {
+        return "MeterInfoDto{" +
+                "MeterCode='" + MeterCode + '\'' +
+                ", ValveStatus=" + ValveStatus +
+                ", SignalStrength=" + SignalStrength +
+                ", SamplTime=" + SamplTime +
+                ", Pressure=" + Pressure +
+                ", Temperature=" + Temperature +
+                ", Forwardflow=" + Forwardflow +
+                ", Reverseflow=" + Reverseflow +
+                ", Instantflow=" + Instantflow +
+                ", Voltage=" + Voltage +
+                ", MeterStatus=" + MeterStatus +
+                ", Lat=" + Lat +
+                ", Lng=" + Lng +
+                '}';
+    }
+}

+ 93 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/entity/MeterReadDto.java

@@ -0,0 +1,93 @@
+package com.example.demo.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class MeterReadDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String MeterCode;   //水表表号
+    private Integer ValveStatus;    //阀门状态(0:关、1:开),NB表有应急开阀的则为8:应急开阀(没有则不约定). 无阀门的,默认值为:1.
+    private BigDecimal ReadScale;   //读数(指定水表表号的指定日期的抄表读数。如果当天没有冻结数据,则返回前一天的数据。如果前一天没有数据,则视为异常。异常读数为:-1)
+    private String ConcentratorAddress; //集中器码址 注:NB表无码址则为空
+    private Integer PointNum;   //测量点号(采集通道号),集中器分配的表的通道号
+   // @JsonFormat(pattern="yyyy年MM月dd日 HH时mm分ss秒",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ReadingTime; //冻结时间(读数时间或者上次采集时间)(yyyy-MM-dd HH:mm:ss)
+    private String Remark;//|备注(允许空)
+
+    public String getMeterCode() {
+        return MeterCode;
+    }
+
+    public void setMeterCode(String meterCode) {
+        MeterCode = meterCode;
+    }
+
+    public Integer getValveStatus() {
+        return ValveStatus;
+    }
+
+    public void setValveStatus(Integer valveStatus) {
+        ValveStatus = valveStatus;
+    }
+
+    public BigDecimal getReadScale() {
+        return ReadScale;
+    }
+
+    public void setReadScale(BigDecimal readScale) {
+        ReadScale = readScale;
+    }
+
+    public String getConcentratorAddress() {
+        return ConcentratorAddress;
+    }
+
+    public void setConcentratorAddress(String concentratorAddress) {
+        ConcentratorAddress = concentratorAddress;
+    }
+
+    public Integer getPointNum() {
+        return PointNum;
+    }
+
+    public void setPointNum(Integer pointNum) {
+        PointNum = pointNum;
+    }
+
+    public Date getReadingTime() {
+        return ReadingTime;
+    }
+
+    public void setReadingTime(Date readingTime) {
+        ReadingTime = readingTime;
+    }
+
+    public String getRemark() {
+        return Remark;
+    }
+
+    public void setRemark(String remark) {
+        Remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "MeterReadDto{" +
+                "MeterCode='" + MeterCode + '\'' +
+                ", ValveStatus=" + ValveStatus +
+                ", ReadScale=" + ReadScale +
+                ", ConcentratorAddress='" + ConcentratorAddress + '\'' +
+                ", PointNum=" + PointNum +
+                ", ReadingTime=" + ReadingTime +
+                ", Remark='" + Remark + '\'' +
+                '}';
+    }
+}

+ 56 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/entity/RequestReadingMeterDto.java

@@ -0,0 +1,56 @@
+package com.example.demo.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+public class RequestReadingMeterDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("MeterCode")
+    private List<String> MeterCode; //水表表号(传空数组时返回当前最新的全部抄表读数。允许多个值,比如:[“01010001”, “01010002”, “01010003”, “01010004”, ……]返回指定水表表号的指定日期的抄表读数。)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonProperty("ReadingTime")
+    private Date ReadingTime; //冻结日期(yyyy-MM-dd),如果不传,则默认今天的
+    @JsonProperty("Account")
+    private AccountDto Account; //鉴权账户信息
+
+    public List<String> getMeterCode() {
+        return MeterCode;
+    }
+
+    public void setMeterCode(List<String> meterCode) {
+        MeterCode = meterCode;
+    }
+
+    public Date getReadingTime() {
+        return ReadingTime;
+    }
+
+    public void setReadingTime(Date readingTime) {
+        ReadingTime = readingTime;
+    }
+
+    public AccountDto getAccount() {
+        return Account;
+    }
+
+    public void setAccount(AccountDto account) {
+        Account = account;
+    }
+
+    @Override
+    public String toString() {
+        return "RequestReadingMeterDto{" +
+                "MeterCode=" + MeterCode +
+                ", ReadingTime='" + ReadingTime + '\'' +
+                ", Account=" + Account +
+                '}';
+    }
+}

+ 53 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/entity/ResponseMsg.java

@@ -0,0 +1,53 @@
+package com.example.demo.entity;
+
+import java.io.Serializable;
+
+public class ResponseMsg  implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private  Boolean Success;   //是否成功(True:成功、False:失败)
+    private  String ErrorMsg;   //错误消息
+    private ResultDto Result;   //返回数据对象
+
+    public ResponseMsg(){
+
+    }
+    public ResponseMsg( Boolean success, String errorMsg,ResultDto result){
+            this.Success=success;
+            this.ErrorMsg=errorMsg;
+            this.Result=result;
+    }
+
+    public Boolean getSuccess() {
+        return Success;
+    }
+
+    public void setSuccess(Boolean success) {
+        Success = success;
+    }
+
+    public String getErrorMsg() {
+        return ErrorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        ErrorMsg = errorMsg;
+    }
+
+    public ResultDto getResult() {
+        return Result;
+    }
+
+    public void setResult(ResultDto result) {
+        Result = result;
+    }
+
+    @Override
+    public String toString() {
+        return "ResponseMsg{" +
+                "Success=" + Success +
+                ", ErrorMsg='" + ErrorMsg + '\'' +
+                ", Result=" + Result +
+                '}';
+    }
+}

+ 51 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/entity/ResultDto.java

@@ -0,0 +1,51 @@
+package com.example.demo.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ResultDto<T> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private int Total;  //记录条数
+
+    private List<T> Data;    //水表读数列表(查无此水表,则不包含返回值内)
+
+    public ResultDto(){}
+
+    public ResultDto(List<T> data){
+        if(data !=null){
+            this.Total=data.size();
+        }else{
+            this.Total=0;
+        }
+        this.Data=data;
+    }
+
+    public int getTotal() {
+
+        return Total;
+    }
+
+    public void setTotal(int total) {
+
+        Total = total;
+    }
+
+    public List<T> getData() {
+        return Data;
+    }
+
+    public void setData(List<T> data) {
+
+        Data = data;
+    }
+
+    @Override
+    public String toString() {
+        return "ResultDto{" +
+                "Total=" + Total +
+                ", Data=" + Data+
+                '}';
+    }
+}

+ 106 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/java/com/example/demo/service/SiteService.java

@@ -0,0 +1,106 @@
+package com.example.demo.service;
+
+import com.example.demo.dao.SiteDao;
+import com.example.demo.entity.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+@Service
+public class SiteService {
+
+    @Autowired
+    private SiteDao siteDao;
+
+    @Value("${Account.username}")
+    private String username;    //账号
+    @Value("${Account.password}")
+    private String password;    //密码
+
+
+    public ResponseMsg getMeterInfo(RequestReadingMeterDto requestReadingMeterDto){
+
+        if(requestReadingMeterDto.getMeterCode() != null && requestReadingMeterDto.getMeterCode() .size()>0){
+            List<MeterInfoDto> meterInfos = siteDao.getMeterInfo(requestReadingMeterDto.getMeterCode());
+            if(meterInfos.size()>0){
+                return new ResponseMsg( true,"成功",new ResultDto(meterInfos));
+            }else{
+                return new ResponseMsg( false,"未查询到水表信息",new ResultDto());
+            }
+        }else{
+            return new ResponseMsg( false,"未输入需查询的表号",new ResultDto());
+        }
+    }
+
+    /**
+     * 获取抄表数据
+     * @param requestReadingMeterDto
+     * @return
+     */
+    public ResponseMsg getMeterRead(RequestReadingMeterDto requestReadingMeterDto){
+
+        //验证账号密码
+        if(requestReadingMeterDto.getAccount() != null&&
+                username.equals(requestReadingMeterDto.getAccount().getUserName())&&password.equals(requestReadingMeterDto.getAccount().getPassword())){
+        }else{
+            return new ResponseMsg( false,"账户验证失败",new ResultDto());
+        }
+
+        //查询数据
+        if(requestReadingMeterDto != null) {
+            List<String> meterCodes = requestReadingMeterDto.getMeterCode();
+            if (meterCodes != null && meterCodes.size() > 1000) {    //数量查询限制
+                return new ResponseMsg(false, "查询表数请限制在1000个以内", new ResultDto());
+            }
+            //查询数据
+            List<MeterReadDto> meterReads = siteDao.getMeterRead(requestReadingMeterDto);
+
+            if (meterCodes != null && meterCodes.size() > 0 && meterReads.size() != meterCodes.size()) {
+                //遍历未查询到表的编码
+                for (MeterReadDto meterReadDto : meterReads) {
+                    meterCodes.remove(meterReadDto.getMeterCode());//移除已经查询到的表号
+                }
+                if(meterCodes.size()==0){
+                    return new ResponseMsg( true,"成功",new ResultDto(meterReads));
+                }
+                Calendar c = Calendar.getInstance();
+                c.setTime(requestReadingMeterDto.getReadingTime());
+                c.add(Calendar.DAY_OF_MONTH, -1);
+                requestReadingMeterDto.setReadingTime(c.getTime());
+                requestReadingMeterDto.setMeterCode(meterCodes);
+                //查询前一天的数据
+                List<MeterReadDto> meterRead2 = siteDao.getMeterRead(requestReadingMeterDto);
+                //遍历未查询到表的编码
+                for (MeterReadDto meterReadDto : meterRead2) {
+                    meterCodes.remove(meterReadDto.getMeterCode());//移除已经查询到的表号
+                }
+                meterReads.addAll(meterRead2);//合并两次查询的数据
+
+                //未查询到的数据标记异常
+                for (String meterCode : meterCodes) {
+                    MeterReadDto meterReadDto = new MeterReadDto();
+                    meterReadDto.setMeterCode(meterCode);
+                    meterReadDto.setReadScale(new BigDecimal(-1));
+                    meterReadDto.setValveStatus(1);
+                    meterReadDto.setReadingTime(new Date());
+                    meterReads.add(meterReadDto);
+                }
+            }
+            //返回查询数据
+            if (meterReads != null && meterReads.size() > 0) {
+                 return new ResponseMsg( true,"成功",new ResultDto(meterReads));
+            }else{
+                 return new ResponseMsg( false,"未查询到有效数据",new ResultDto());
+            }
+        }else{
+            return new ResponseMsg( false,"查询条件为空",new ResultDto());
+        }
+    }
+
+
+
+
+}

+ 58 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/resources/application.yml

@@ -0,0 +1,58 @@
+server:
+  port: 8081
+
+Account:
+  username: wangli
+  password: 123456
+
+spring:
+  datasource:
+    username: zoniot
+#    password: zcxk100@
+    password: zcxk100
+    url: jdbc:mysql://47.112.217.10:3306/smart_city?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC
+#    username: root
+#    password: root
+#    url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    #数据库方式
+    job-store-type: jdbc
+
+  jpa:
+    database: mysql
+    show-sql: true
+#    generate-ddl: true
+#    hibernate:
+#      ddl-auto: update
+#  redis:
+#    host: 127.0.0.1
+#    port: 6379
+#    database: 0
+#    password:
+#    timeout: 100
+#    jedis:
+#      pool:
+#        max-active: 8
+#        max-wait: -1
+#        max-idle: 8
+#        min-idle: 0
+  mvc:
+    view:
+      prefix: /WEB-INF/jsp/
+      suffix: .jsp
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+
+mybatis:
+  mapper-locations: classpath:mapper/*Mapper.xml
+  type-aliases-package: com.example.entity
+  configuration:
+    map-underscore-to-camel-case: true
+
+#showSql
+logging:
+  level:
+    com.example.demo.dao: debug
+    org.springframework.data.mongodb.core: DEBUG
+  file:
+    path: E:\\a

+ 166 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/resources/logback.xml

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <!-- 项目名称 -->
+    <property name="PROJECT_NAME" value="demo2" />
+
+    <!-- 文件输出格式 -->
+    <property name="PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n"/>
+    <!-- 输出文件路径 -->
+    <property name="OPEN_FILE_PATH" value="/mnt/prd/integration/tongzi/logs "/>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${PATTERN}</pattern>
+<!--            <charset>UTF-8</charset>-->
+        </encoder>
+    </appender>
+
+    <!-- ch.qos.logback.core.rolling.RollingFileAppender 文件日志输出 -->
+    <appender name="OPEN-FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!--不能有这项配置!!!!!-->
+        <!--<Encoding>UTF-8</Encoding>-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${OPEN_FILE_PATH}/all/log.%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!--日志文件最大的大小-->
+                <MaxFileSize>10MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>${PATTERN}</pattern>
+        </layout>
+    </appender>
+
+    <!--输出到debug-->
+    <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${OPEN_FILE_PATH}/debug/log.%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <MaxFileSize>10MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <append>true</append>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印DEBUG日志 -->
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--输出到info-->
+    <appender name="info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${OPEN_FILE_PATH}/info/log.%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <MaxFileSize>10MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <append>true</append>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印INFO日志 -->
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--输出到error-->
+    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <FileNamePattern>${OPEN_FILE_PATH}/error/log.%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+        <MaxHistory>30</MaxHistory>
+        <TimeBasedFileNamingAndTriggeringPolicy
+                class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <MaxFileSize>10MB</MaxFileSize>
+        </TimeBasedFileNamingAndTriggeringPolicy>
+    </rollingPolicy>
+    <append>true</append>
+    <encoder>
+        <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+        <charset>utf-8</charset>
+    </encoder>
+    <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印ERROR日志 -->
+        <level>ERROR</level>
+        <onMatch>ACCEPT</onMatch>
+        <onMismatch>DENY</onMismatch>
+    </filter>
+</appender>
+
+    <!--输出到warn-->
+    <appender name="warn" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${OPEN_FILE_PATH}/warn/log.%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <MaxFileSize>10MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <append>true</append>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印WARN日志 -->
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="myInfo" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${OPEN_FILE_PATH}/myInfo/log.%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <MaxFileSize>10MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <append>true</append>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+<!--        <filter class="ch.qos.logback.classic.filter.LevelFilter">-->
+<!--            <level>INFO</level>-->
+<!--            <onMatch>ACCEPT</onMatch>-->
+<!--            <onMismatch>DENY</onMismatch>-->
+<!--        </filter>-->
+    </appender>
+
+
+    <!-- 控制台输出日志级别 -->
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="OPEN-FILE"/>
+        <appender-ref ref="debug" />
+        <appender-ref ref="info" />
+        <appender-ref ref="error" />
+        <appender-ref ref="warn" />
+    </root>
+    <!-- 指定项目中某个包,一把为执行sql的mapper包,当有日志操作行为时的日志记录级别DEBUG -->
+    <!-- 级别依次为从高到低:FATAL > ERROR > WARN > INFO > DEBUG > TRACE  -->
+    <logger name="com.example.demo.dao" level="DEBUG">
+        <appender-ref ref="myInfo" />
+    </logger>
+    <logger name="com.example.demo.controller" level="info">
+        <appender-ref ref="myInfo" />
+    </logger>
+</configuration>

+ 55 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/resources/mapper/SiteMapper.xml

@@ -0,0 +1,55 @@
+<?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.example.demo.dao.SiteDao">
+
+    <select id="getMeterRead" resultType="com.example.demo.entity.MeterReadDto">
+       select
+            a.read_date,
+            a.meter_no as "MeterCode",
+            '1' as	"ValveStatus",
+            a.read_data as "ReadScale",
+            a.read_time as "ReadingTime",
+            '' as "Remark"
+        from sc_meter_read_record a
+        <where>
+            read_data is not null  and customer_id= 2 and status = 1
+            <if test="ReadingTime != null ">
+              and a.read_date=DATE_FORMAT(DATE_SUB(#{ReadingTime},INTERVAL 1 day) ,'%Y%m%d')
+            </if>
+
+            <if test="MeterCode != null and MeterCode.size()>0" >
+                and  a.device_id in (
+                select id from sc_device where device_status = 1 and customer_id =2 and status = 1 and  water_meter_no in
+                <foreach collection="MeterCode" item="listItem" open="(" close=")" separator=",">
+                    <if test="listItem != null and listItem != ''">
+                        #{listItem}
+                    </if>
+                </foreach>
+                )
+            </if>
+        </where>
+    </select>
+
+    <select id="getMeterInfo" resultType="com.example.demo.entity.MeterInfoDto">
+        select
+            b.meter_no as "MeterCode",
+            b.read_data as "Forwardflow",
+            b.read_time as "SamplTime",
+            '1' as "ValveStatus"
+        from (
+            select device_id,max(read_date) read_date from sc_meter_read_record a
+             where read_data is not null  and customer_id= 2 and status = 1
+                 and device_id in (
+                         select id from sc_device
+                            where device_status = 1 and customer_id =2 and status = 1 and   water_meter_no  in
+                            <foreach collection="list" item="listItem" open="(" close=")" separator="," >
+                                <if test="listItem != null and listItem != ''">
+                                    #{listItem}
+                                </if>
+                            </foreach>
+                     )
+             group by device_id
+        ) a
+        left join sc_meter_read_record b on a.device_id=b.device_id and a.read_date=b.read_date and b.status = 1
+    </select>
+</mapper>

+ 12 - 0
meter-reading-tongzi/ReadMeterMysql/src/main/webapp/WEB-INF/jsp/index.jsp

@@ -0,0 +1,12 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Insert title here</title>
+</head>
+<body>
+aaaa
+</body>
+</html>

+ 13 - 0
meter-reading-tongzi/ReadMeterMysql/src/test/java/com/example/demo/DemoApplicationTests.java

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

+ 28 - 0
meter-reading-tongzi/ReadMeterMysql/src/test/java/com/example/demo/MapperTest.java

@@ -0,0 +1,28 @@
+package com.example.demo;
+
+
+import com.example.demo.dao.SiteDao;
+import com.example.demo.entity.MeterReadDto;
+import com.example.demo.entity.RequestReadingMeterDto;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = DemoApplication.class)
+public class MapperTest {
+
+    @Autowired
+    private SiteDao siteDao;
+
+    @Test
+    public void test() {
+        List<MeterReadDto> list= siteDao.getMeterRead(new RequestReadingMeterDto());
+        System.out.println(list);
+    }
+
+}

+ 49 - 0
meter-reading-tongzi/ReadMeterMysql/src/test/java/com/example/demo/RedisTest.java

@@ -0,0 +1,49 @@
+package com.example.demo;
+
+import com.example.demo.dao.SiteDao;
+import com.example.demo.entity.MeterReadDto;
+import com.example.demo.entity.RequestReadingMeterDto;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = DemoApplication.class)
+public class RedisTest {
+
+    @Autowired
+    private SiteDao siteDao;
+
+    @Autowired
+    private RedisTemplate<String, String> redisTemplate;
+
+    @Test
+    public void test() throws JsonProcessingException {
+        //从redis缓存中获得指定的数据
+        String userListData = redisTemplate.boundValueOps("userMapper.Sel(1)").get();
+        //如果redis中没有数据的话
+        if(null==userListData){
+            //查询数据库获得数据
+             List<MeterReadDto> list= siteDao.getMeterRead(new RequestReadingMeterDto());
+            //转换成json格式字符串
+            ObjectMapper om = new ObjectMapper();
+            userListData = om.writeValueAsString(list);
+            //将数据存储到redis中,下次在查询直接从redis中获得数据,不用在查询数据库
+            redisTemplate.boundValueOps("userMapper.Sel(1)").set(userListData);
+            System.out.println("===============从数据库获得数据===============");
+        }else{
+            System.out.println("===============从redis缓存中获得数据===============");
+        }
+
+        System.out.println(userListData);
+
+    }
+
+}