dingxin 6 years ago
parent
commit
4f21c69a36
25 changed files with 992 additions and 17 deletions
  1. 29
    0
      CODE/foreign-service/.gitignore
  2. 114
    0
      CODE/foreign-service/.mvn/wrapper/MavenWrapperDownloader.java
  3. BIN
      CODE/foreign-service/.mvn/wrapper/maven-wrapper.jar
  4. 1
    0
      CODE/foreign-service/.mvn/wrapper/maven-wrapper.properties
  5. 286
    0
      CODE/foreign-service/mvnw
  6. 161
    0
      CODE/foreign-service/mvnw.cmd
  7. 139
    0
      CODE/foreign-service/pom.xml
  8. 13
    0
      CODE/foreign-service/src/main/java/com/community/huiju/foreign/ForeignServiceApplication.java
  9. 4
    0
      CODE/foreign-service/src/main/resources/application-dev.yml
  10. 0
    0
      CODE/foreign-service/src/main/resources/application-prod.yml
  11. 15
    0
      CODE/foreign-service/src/main/resources/application.yml
  12. 16
    0
      CODE/foreign-service/src/test/java/com/community/huiju/foreign/ForeignServiceApplicationTests.java
  13. 6
    5
      CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/HkController.java
  14. 30
    0
      CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MonitoringController.java
  15. 17
    0
      CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpEquipmentMapper.java
  16. 14
    0
      CODE/smart-community/app-api/src/main/java/com/community/huiju/service/IMonitoringService.java
  17. 2
    0
      CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/HKServiceImpl.java
  18. 55
    4
      CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MonitoringServiceImpl.java
  19. BIN
      CODE/smart-community/community-common/target/community-common-0.0.1.jar
  20. 13
    0
      CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpRentalHouseController.java
  21. 8
    0
      CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpRentalHouseService.java
  22. 44
    0
      CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpRentalHouseServiceImpl.java
  23. 8
    0
      VUECODE/smart-property-manage/src/api/rental.js
  24. 10
    1
      VUECODE/smart-property-manage/src/store/modules/rental.js
  25. 7
    7
      VUECODE/smart-property-manage/src/views/rental/rentalEdit.vue

+ 29
- 0
CODE/foreign-service/.gitignore View File

1
+HELP.md
2
+/target/
3
+!.mvn/wrapper/maven-wrapper.jar
4
+
5
+### STS ###
6
+.apt_generated
7
+.classpath
8
+.factorypath
9
+.project
10
+.settings
11
+.springBeans
12
+.sts4-cache
13
+
14
+### IntelliJ IDEA ###
15
+.idea
16
+*.iws
17
+*.iml
18
+*.ipr
19
+
20
+### NetBeans ###
21
+/nbproject/private/
22
+/nbbuild/
23
+/dist/
24
+/nbdist/
25
+/.nb-gradle/
26
+/build/
27
+
28
+### VS Code ###
29
+.vscode/

+ 114
- 0
CODE/foreign-service/.mvn/wrapper/MavenWrapperDownloader.java View File

1
+/*
2
+Licensed to the Apache Software Foundation (ASF) under one
3
+or more contributor license agreements.  See the NOTICE file
4
+distributed with this work for additional information
5
+regarding copyright ownership.  The ASF licenses this file
6
+to you under the Apache License, Version 2.0 (the
7
+"License"); you may not use this file except in compliance
8
+with the License.  You may obtain a copy of the License at
9
+
10
+  https://www.apache.org/licenses/LICENSE-2.0
11
+
12
+Unless required by applicable law or agreed to in writing,
13
+software distributed under the License is distributed on an
14
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15
+KIND, either express or implied.  See the License for the
16
+specific language governing permissions and limitations
17
+under the License.
18
+*/
19
+
20
+import java.io.File;
21
+import java.io.FileInputStream;
22
+import java.io.FileOutputStream;
23
+import java.io.IOException;
24
+import java.net.URL;
25
+import java.nio.channels.Channels;
26
+import java.nio.channels.ReadableByteChannel;
27
+import java.util.Properties;
28
+
29
+public class MavenWrapperDownloader {
30
+
31
+    /**
32
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
33
+     */
34
+    private static final String DEFAULT_DOWNLOAD_URL =
35
+            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
36
+
37
+    /**
38
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
39
+     * use instead of the default one.
40
+     */
41
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
42
+            ".mvn/wrapper/maven-wrapper.properties";
43
+
44
+    /**
45
+     * Path where the maven-wrapper.jar will be saved to.
46
+     */
47
+    private static final String MAVEN_WRAPPER_JAR_PATH =
48
+            ".mvn/wrapper/maven-wrapper.jar";
49
+
50
+    /**
51
+     * Name of the property which should be used to override the default download url for the wrapper.
52
+     */
53
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
54
+
55
+    public static void main(String args[]) {
56
+        System.out.println("- Downloader started");
57
+        File baseDirectory = new File(args[0]);
58
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
59
+
60
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
61
+        // wrapperUrl parameter.
62
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
63
+        String url = DEFAULT_DOWNLOAD_URL;
64
+        if (mavenWrapperPropertyFile.exists()) {
65
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
66
+            try {
67
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
68
+                Properties mavenWrapperProperties = new Properties();
69
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
70
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
71
+            } catch (IOException e) {
72
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
73
+            } finally {
74
+                try {
75
+                    if (mavenWrapperPropertyFileInputStream != null) {
76
+                        mavenWrapperPropertyFileInputStream.close();
77
+                    }
78
+                } catch (IOException e) {
79
+                    // Ignore ...
80
+                }
81
+            }
82
+        }
83
+        System.out.println("- Downloading from: : " + url);
84
+
85
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
86
+        if (!outputFile.getParentFile().exists()) {
87
+            if (!outputFile.getParentFile().mkdirs()) {
88
+                System.out.println(
89
+                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
90
+            }
91
+        }
92
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
93
+        try {
94
+            downloadFileFromURL(url, outputFile);
95
+            System.out.println("Done");
96
+            System.exit(0);
97
+        } catch (Throwable e) {
98
+            System.out.println("- Error downloading");
99
+            e.printStackTrace();
100
+            System.exit(1);
101
+        }
102
+    }
103
+
104
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
105
+        URL website = new URL(urlString);
106
+        ReadableByteChannel rbc;
107
+        rbc = Channels.newChannel(website.openStream());
108
+        FileOutputStream fos = new FileOutputStream(destination);
109
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
110
+        fos.close();
111
+        rbc.close();
112
+    }
113
+
114
+}

BIN
CODE/foreign-service/.mvn/wrapper/maven-wrapper.jar View File


+ 1
- 0
CODE/foreign-service/.mvn/wrapper/maven-wrapper.properties View File

1
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip

+ 286
- 0
CODE/foreign-service/mvnw View File

1
+#!/bin/sh
2
+# ----------------------------------------------------------------------------
3
+# Licensed to the Apache Software Foundation (ASF) under one
4
+# or more contributor license agreements.  See the NOTICE file
5
+# distributed with this work for additional information
6
+# regarding copyright ownership.  The ASF licenses this file
7
+# to you under the Apache License, Version 2.0 (the
8
+# "License"); you may not use this file except in compliance
9
+# with the License.  You may obtain a copy of the License at
10
+#
11
+#    https://www.apache.org/licenses/LICENSE-2.0
12
+#
13
+# Unless required by applicable law or agreed to in writing,
14
+# software distributed under the License is distributed on an
15
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16
+# KIND, either express or implied.  See the License for the
17
+# specific language governing permissions and limitations
18
+# under the License.
19
+# ----------------------------------------------------------------------------
20
+
21
+# ----------------------------------------------------------------------------
22
+# Maven2 Start Up Batch script
23
+#
24
+# Required ENV vars:
25
+# ------------------
26
+#   JAVA_HOME - location of a JDK home dir
27
+#
28
+# Optional ENV vars
29
+# -----------------
30
+#   M2_HOME - location of maven2's installed home dir
31
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
32
+#     e.g. to debug Maven itself, use
33
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
34
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
35
+# ----------------------------------------------------------------------------
36
+
37
+if [ -z "$MAVEN_SKIP_RC" ] ; then
38
+
39
+  if [ -f /etc/mavenrc ] ; then
40
+    . /etc/mavenrc
41
+  fi
42
+
43
+  if [ -f "$HOME/.mavenrc" ] ; then
44
+    . "$HOME/.mavenrc"
45
+  fi
46
+
47
+fi
48
+
49
+# OS specific support.  $var _must_ be set to either true or false.
50
+cygwin=false;
51
+darwin=false;
52
+mingw=false
53
+case "`uname`" in
54
+  CYGWIN*) cygwin=true ;;
55
+  MINGW*) mingw=true;;
56
+  Darwin*) darwin=true
57
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
58
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
59
+    if [ -z "$JAVA_HOME" ]; then
60
+      if [ -x "/usr/libexec/java_home" ]; then
61
+        export JAVA_HOME="`/usr/libexec/java_home`"
62
+      else
63
+        export JAVA_HOME="/Library/Java/Home"
64
+      fi
65
+    fi
66
+    ;;
67
+esac
68
+
69
+if [ -z "$JAVA_HOME" ] ; then
70
+  if [ -r /etc/gentoo-release ] ; then
71
+    JAVA_HOME=`java-config --jre-home`
72
+  fi
73
+fi
74
+
75
+if [ -z "$M2_HOME" ] ; then
76
+  ## resolve links - $0 may be a link to maven's home
77
+  PRG="$0"
78
+
79
+  # need this for relative symlinks
80
+  while [ -h "$PRG" ] ; do
81
+    ls=`ls -ld "$PRG"`
82
+    link=`expr "$ls" : '.*-> \(.*\)$'`
83
+    if expr "$link" : '/.*' > /dev/null; then
84
+      PRG="$link"
85
+    else
86
+      PRG="`dirname "$PRG"`/$link"
87
+    fi
88
+  done
89
+
90
+  saveddir=`pwd`
91
+
92
+  M2_HOME=`dirname "$PRG"`/..
93
+
94
+  # make it fully qualified
95
+  M2_HOME=`cd "$M2_HOME" && pwd`
96
+
97
+  cd "$saveddir"
98
+  # echo Using m2 at $M2_HOME
99
+fi
100
+
101
+# For Cygwin, ensure paths are in UNIX format before anything is touched
102
+if $cygwin ; then
103
+  [ -n "$M2_HOME" ] &&
104
+    M2_HOME=`cygpath --unix "$M2_HOME"`
105
+  [ -n "$JAVA_HOME" ] &&
106
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
107
+  [ -n "$CLASSPATH" ] &&
108
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
109
+fi
110
+
111
+# For Mingw, ensure paths are in UNIX format before anything is touched
112
+if $mingw ; then
113
+  [ -n "$M2_HOME" ] &&
114
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
115
+  [ -n "$JAVA_HOME" ] &&
116
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
117
+  # TODO classpath?
118
+fi
119
+
120
+if [ -z "$JAVA_HOME" ]; then
121
+  javaExecutable="`which javac`"
122
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
123
+    # readlink(1) is not available as standard on Solaris 10.
124
+    readLink=`which readlink`
125
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
126
+      if $darwin ; then
127
+        javaHome="`dirname \"$javaExecutable\"`"
128
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
129
+      else
130
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
131
+      fi
132
+      javaHome="`dirname \"$javaExecutable\"`"
133
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
134
+      JAVA_HOME="$javaHome"
135
+      export JAVA_HOME
136
+    fi
137
+  fi
138
+fi
139
+
140
+if [ -z "$JAVACMD" ] ; then
141
+  if [ -n "$JAVA_HOME"  ] ; then
142
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
143
+      # IBM's JDK on AIX uses strange locations for the executables
144
+      JAVACMD="$JAVA_HOME/jre/sh/java"
145
+    else
146
+      JAVACMD="$JAVA_HOME/bin/java"
147
+    fi
148
+  else
149
+    JAVACMD="`which java`"
150
+  fi
151
+fi
152
+
153
+if [ ! -x "$JAVACMD" ] ; then
154
+  echo "Error: JAVA_HOME is not defined correctly." >&2
155
+  echo "  We cannot execute $JAVACMD" >&2
156
+  exit 1
157
+fi
158
+
159
+if [ -z "$JAVA_HOME" ] ; then
160
+  echo "Warning: JAVA_HOME environment variable is not set."
161
+fi
162
+
163
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
164
+
165
+# traverses directory structure from process work directory to filesystem root
166
+# first directory with .mvn subdirectory is considered project base directory
167
+find_maven_basedir() {
168
+
169
+  if [ -z "$1" ]
170
+  then
171
+    echo "Path not specified to find_maven_basedir"
172
+    return 1
173
+  fi
174
+
175
+  basedir="$1"
176
+  wdir="$1"
177
+  while [ "$wdir" != '/' ] ; do
178
+    if [ -d "$wdir"/.mvn ] ; then
179
+      basedir=$wdir
180
+      break
181
+    fi
182
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
183
+    if [ -d "${wdir}" ]; then
184
+      wdir=`cd "$wdir/.."; pwd`
185
+    fi
186
+    # end of workaround
187
+  done
188
+  echo "${basedir}"
189
+}
190
+
191
+# concatenates all lines of a file
192
+concat_lines() {
193
+  if [ -f "$1" ]; then
194
+    echo "$(tr -s '\n' ' ' < "$1")"
195
+  fi
196
+}
197
+
198
+BASE_DIR=`find_maven_basedir "$(pwd)"`
199
+if [ -z "$BASE_DIR" ]; then
200
+  exit 1;
201
+fi
202
+
203
+##########################################################################################
204
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
205
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
206
+##########################################################################################
207
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
208
+    if [ "$MVNW_VERBOSE" = true ]; then
209
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
210
+    fi
211
+else
212
+    if [ "$MVNW_VERBOSE" = true ]; then
213
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
214
+    fi
215
+    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
216
+    while IFS="=" read key value; do
217
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
218
+      esac
219
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
220
+    if [ "$MVNW_VERBOSE" = true ]; then
221
+      echo "Downloading from: $jarUrl"
222
+    fi
223
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
224
+
225
+    if command -v wget > /dev/null; then
226
+        if [ "$MVNW_VERBOSE" = true ]; then
227
+          echo "Found wget ... using wget"
228
+        fi
229
+        wget "$jarUrl" -O "$wrapperJarPath"
230
+    elif command -v curl > /dev/null; then
231
+        if [ "$MVNW_VERBOSE" = true ]; then
232
+          echo "Found curl ... using curl"
233
+        fi
234
+        curl -o "$wrapperJarPath" "$jarUrl"
235
+    else
236
+        if [ "$MVNW_VERBOSE" = true ]; then
237
+          echo "Falling back to using Java to download"
238
+        fi
239
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
240
+        if [ -e "$javaClass" ]; then
241
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
242
+                if [ "$MVNW_VERBOSE" = true ]; then
243
+                  echo " - Compiling MavenWrapperDownloader.java ..."
244
+                fi
245
+                # Compiling the Java class
246
+                ("$JAVA_HOME/bin/javac" "$javaClass")
247
+            fi
248
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
249
+                # Running the downloader
250
+                if [ "$MVNW_VERBOSE" = true ]; then
251
+                  echo " - Running MavenWrapperDownloader.java ..."
252
+                fi
253
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
254
+            fi
255
+        fi
256
+    fi
257
+fi
258
+##########################################################################################
259
+# End of extension
260
+##########################################################################################
261
+
262
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
263
+if [ "$MVNW_VERBOSE" = true ]; then
264
+  echo $MAVEN_PROJECTBASEDIR
265
+fi
266
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
267
+
268
+# For Cygwin, switch paths to Windows format before running java
269
+if $cygwin; then
270
+  [ -n "$M2_HOME" ] &&
271
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
272
+  [ -n "$JAVA_HOME" ] &&
273
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
274
+  [ -n "$CLASSPATH" ] &&
275
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
276
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
277
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
278
+fi
279
+
280
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
281
+
282
+exec "$JAVACMD" \
283
+  $MAVEN_OPTS \
284
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
285
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
286
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

+ 161
- 0
CODE/foreign-service/mvnw.cmd View File

1
+@REM ----------------------------------------------------------------------------
2
+@REM Licensed to the Apache Software Foundation (ASF) under one
3
+@REM or more contributor license agreements.  See the NOTICE file
4
+@REM distributed with this work for additional information
5
+@REM regarding copyright ownership.  The ASF licenses this file
6
+@REM to you under the Apache License, Version 2.0 (the
7
+@REM "License"); you may not use this file except in compliance
8
+@REM with the License.  You may obtain a copy of the License at
9
+@REM
10
+@REM    https://www.apache.org/licenses/LICENSE-2.0
11
+@REM
12
+@REM Unless required by applicable law or agreed to in writing,
13
+@REM software distributed under the License is distributed on an
14
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15
+@REM KIND, either express or implied.  See the License for the
16
+@REM specific language governing permissions and limitations
17
+@REM under the License.
18
+@REM ----------------------------------------------------------------------------
19
+
20
+@REM ----------------------------------------------------------------------------
21
+@REM Maven2 Start Up Batch script
22
+@REM
23
+@REM Required ENV vars:
24
+@REM JAVA_HOME - location of a JDK home dir
25
+@REM
26
+@REM Optional ENV vars
27
+@REM M2_HOME - location of maven2's installed home dir
28
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
29
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
30
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
31
+@REM     e.g. to debug Maven itself, use
32
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
33
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
34
+@REM ----------------------------------------------------------------------------
35
+
36
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
37
+@echo off
38
+@REM set title of command window
39
+title %0
40
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
41
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
42
+
43
+@REM set %HOME% to equivalent of $HOME
44
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
45
+
46
+@REM Execute a user defined script before this one
47
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
48
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
49
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
50
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
51
+:skipRcPre
52
+
53
+@setlocal
54
+
55
+set ERROR_CODE=0
56
+
57
+@REM To isolate internal variables from possible post scripts, we use another setlocal
58
+@setlocal
59
+
60
+@REM ==== START VALIDATION ====
61
+if not "%JAVA_HOME%" == "" goto OkJHome
62
+
63
+echo.
64
+echo Error: JAVA_HOME not found in your environment. >&2
65
+echo Please set the JAVA_HOME variable in your environment to match the >&2
66
+echo location of your Java installation. >&2
67
+echo.
68
+goto error
69
+
70
+:OkJHome
71
+if exist "%JAVA_HOME%\bin\java.exe" goto init
72
+
73
+echo.
74
+echo Error: JAVA_HOME is set to an invalid directory. >&2
75
+echo JAVA_HOME = "%JAVA_HOME%" >&2
76
+echo Please set the JAVA_HOME variable in your environment to match the >&2
77
+echo location of your Java installation. >&2
78
+echo.
79
+goto error
80
+
81
+@REM ==== END VALIDATION ====
82
+
83
+:init
84
+
85
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
86
+@REM Fallback to current working directory if not found.
87
+
88
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
89
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
90
+
91
+set EXEC_DIR=%CD%
92
+set WDIR=%EXEC_DIR%
93
+:findBaseDir
94
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
95
+cd ..
96
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
97
+set WDIR=%CD%
98
+goto findBaseDir
99
+
100
+:baseDirFound
101
+set MAVEN_PROJECTBASEDIR=%WDIR%
102
+cd "%EXEC_DIR%"
103
+goto endDetectBaseDir
104
+
105
+:baseDirNotFound
106
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
107
+cd "%EXEC_DIR%"
108
+
109
+:endDetectBaseDir
110
+
111
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
112
+
113
+@setlocal EnableExtensions EnableDelayedExpansion
114
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
115
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
116
+
117
+:endReadAdditionalConfig
118
+
119
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
120
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
121
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
122
+
123
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
124
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
125
+	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B 
126
+)
127
+
128
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
129
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
130
+if exist %WRAPPER_JAR% (
131
+    echo Found %WRAPPER_JAR%
132
+) else (
133
+    echo Couldn't find %WRAPPER_JAR%, downloading it ...
134
+	echo Downloading from: %DOWNLOAD_URL%
135
+    powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
136
+    echo Finished downloading %WRAPPER_JAR%
137
+)
138
+@REM End of extension
139
+
140
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
141
+if ERRORLEVEL 1 goto error
142
+goto end
143
+
144
+:error
145
+set ERROR_CODE=1
146
+
147
+:end
148
+@endlocal & set ERROR_CODE=%ERROR_CODE%
149
+
150
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
151
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
152
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
153
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
154
+:skipRcPost
155
+
156
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
157
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
158
+
159
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
160
+
161
+exit /B %ERROR_CODE%

+ 139
- 0
CODE/foreign-service/pom.xml View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4
+    <modelVersion>4.0.0</modelVersion>
5
+    <parent>
6
+        <groupId>org.springframework.boot</groupId>
7
+        <artifactId>spring-boot-starter-parent</artifactId>
8
+        <version>2.1.4.RELEASE</version>
9
+        <relativePath/> <!-- lookup parent from repository -->
10
+    </parent>
11
+    <groupId>com.example</groupId>
12
+    <artifactId>foreign-service</artifactId>
13
+    <version>0.0.1-SNAPSHOT</version>
14
+    <name>foreign-service</name>
15
+    <description>对外访问服务</description>
16
+
17
+    <properties>
18
+        <java.version>1.8</java.version>
19
+        <mybatis.plus.version>3.1.1</mybatis.plus.version>
20
+        <fastjson.version>1.2.58</fastjson.version>
21
+        <springfox-swagger2.version>2.7.0</springfox-swagger2.version>
22
+        <commons.logging.version>1.2</commons.logging.version>
23
+    </properties>
24
+
25
+    <dependencies>
26
+        <dependency>
27
+            <groupId>org.springframework.boot</groupId>
28
+            <artifactId>spring-boot-starter-web</artifactId>
29
+        </dependency>
30
+
31
+        <dependency>
32
+            <groupId>mysql</groupId>
33
+            <artifactId>mysql-connector-java</artifactId>
34
+            <scope>runtime</scope>
35
+        </dependency>
36
+        <dependency>
37
+            <groupId>org.projectlombok</groupId>
38
+            <artifactId>lombok</artifactId>
39
+            <optional>true</optional>
40
+        </dependency>
41
+
42
+        <dependency>
43
+            <groupId>com.baomidou</groupId>
44
+            <artifactId>mybatis-plus-boot-starter</artifactId>
45
+            <version>${mybatis.plus.version}</version>
46
+        </dependency>
47
+
48
+        <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
49
+        <dependency>
50
+            <groupId>com.alibaba</groupId>
51
+            <artifactId>fastjson</artifactId>
52
+            <version>${fastjson.version}</version>
53
+        </dependency>
54
+
55
+        <dependency>
56
+            <groupId>io.springfox</groupId>
57
+            <artifactId>springfox-swagger2</artifactId>
58
+            <version>${springfox-swagger2.version}</version>
59
+        </dependency>
60
+
61
+        <dependency>
62
+            <groupId>io.springfox</groupId>
63
+            <artifactId>springfox-swagger-ui</artifactId>
64
+            <version>${springfox-swagger2.version}</version>
65
+        </dependency>
66
+
67
+        <dependency>
68
+            <groupId>commons-logging</groupId>
69
+            <artifactId>commons-logging</artifactId>
70
+            <version>${commons.logging.version}</version>
71
+        </dependency>
72
+
73
+        <!-- https://mvnrepository.com/artifact/com.alibaba/druid-spring-boot-starter -->
74
+        <dependency>
75
+            <groupId>com.alibaba</groupId>
76
+            <artifactId>druid-spring-boot-starter</artifactId>
77
+            <version>1.1.16</version>
78
+        </dependency>
79
+
80
+
81
+        <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
82
+        <dependency>
83
+            <groupId>com.google.guava</groupId>
84
+            <artifactId>guava</artifactId>
85
+            <version>26.0-jre</version>
86
+        </dependency>
87
+
88
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
89
+        <dependency>
90
+            <groupId>org.apache.commons</groupId>
91
+            <artifactId>commons-lang3</artifactId>
92
+            <version>3.8.1</version>
93
+        </dependency>
94
+
95
+        <!-- https://mvnrepository.com/artifact/commons-lang/commons-lang -->
96
+        <dependency>
97
+            <groupId>commons-lang</groupId>
98
+            <artifactId>commons-lang</artifactId>
99
+            <version>2.6</version>
100
+        </dependency>
101
+
102
+        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
103
+        <dependency>
104
+            <groupId>com.squareup.okhttp3</groupId>
105
+            <artifactId>okhttp</artifactId>
106
+            <version>3.11.0</version>
107
+        </dependency>
108
+
109
+        <dependency>
110
+            <groupId>commons-httpclient</groupId>
111
+            <artifactId>commons-httpclient</artifactId>
112
+            <version>3.1</version>
113
+        </dependency>
114
+
115
+        <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
116
+        <dependency>
117
+            <groupId>commons-io</groupId>
118
+            <artifactId>commons-io</artifactId>
119
+            <version>1.4</version>
120
+        </dependency>
121
+
122
+
123
+        <dependency>
124
+            <groupId>org.springframework.boot</groupId>
125
+            <artifactId>spring-boot-starter-test</artifactId>
126
+            <scope>test</scope>
127
+        </dependency>
128
+    </dependencies>
129
+
130
+    <build>
131
+        <plugins>
132
+            <plugin>
133
+                <groupId>org.springframework.boot</groupId>
134
+                <artifactId>spring-boot-maven-plugin</artifactId>
135
+            </plugin>
136
+        </plugins>
137
+    </build>
138
+
139
+</project>

+ 13
- 0
CODE/foreign-service/src/main/java/com/community/huiju/foreign/ForeignServiceApplication.java View File

1
+package com.community.huiju.foreign;
2
+
3
+import org.springframework.boot.SpringApplication;
4
+import org.springframework.boot.autoconfigure.SpringBootApplication;
5
+
6
+@SpringBootApplication
7
+public class ForeignServiceApplication {
8
+
9
+    public static void main(String[] args) {
10
+        SpringApplication.run(ForeignServiceApplication.class, args);
11
+    }
12
+
13
+}

+ 4
- 0
CODE/foreign-service/src/main/resources/application-dev.yml View File

1
+spring:
2
+  datasource:
3
+    druid:
4
+      driver-class-name: com

+ 0
- 0
CODE/foreign-service/src/main/resources/application-prod.yml View File


+ 15
- 0
CODE/foreign-service/src/main/resources/application.yml View File

1
+server:
2
+  port: 8033
3
+spring:
4
+  application:
5
+    name: foreign-service
6
+  profiles: dev
7
+
8
+
9
+
10
+
11
+
12
+
13
+mybatis-plus:
14
+  type-aliases-package: com.community.huiju.foreign.model
15
+  mapper-locations: classpath:mapper/*.xml

+ 16
- 0
CODE/foreign-service/src/test/java/com/community/huiju/foreign/ForeignServiceApplicationTests.java View File

1
+package com.community.huiju.foreign;
2
+
3
+import org.junit.Test;
4
+import org.junit.runner.RunWith;
5
+import org.springframework.boot.test.context.SpringBootTest;
6
+import org.springframework.test.context.junit4.SpringRunner;
7
+
8
+@RunWith(SpringRunner.class)
9
+@SpringBootTest
10
+public class ForeignServiceApplicationTests {
11
+
12
+    @Test
13
+    public void contextLoads() {
14
+    }
15
+
16
+}

+ 6
- 5
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/HkController.java View File

25
 @RefreshScope
25
 @RefreshScope
26
 @RequestMapping("/")
26
 @RequestMapping("/")
27
 @Api(value = "海康相关的API",description = "海康相关的API")
27
 @Api(value = "海康相关的API",description = "海康相关的API")
28
-public class HkController {
28
+public class HkController extends BaseController {
29
 
29
 
30
 	@Autowired
30
 	@Autowired
31
 	private IHKService ihkService;
31
 	private IHKService ihkService;
61
 
61
 
62
 	@ApiOperation(value = "门口机开门", notes = "门口机开门")
62
 	@ApiOperation(value = "门口机开门", notes = "门口机开门")
63
 	@ApiImplicitParams({
63
 	@ApiImplicitParams({
64
-			@ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userVerifyId", value = "用户审核房产id")
64
+			@ApiImplicitParam(dataTypeClass = Integer.class, paramType = "header", name = "X-Auth-Token", value = "用户审核房产id")
65
 	})
65
 	})
66
-	@RequestMapping(value = "/visual/syncControl", method = RequestMethod.GET)
67
-	public ResponseBean syncControl(@RequestParam("userVerifyId") Integer userVerifyId, HttpServletRequest request, HttpSession session){
66
+	@RequestMapping(value = "/visual/syncControl", method = RequestMethod.POST)
67
+	public ResponseBean syncControl( HttpServletRequest request, HttpSession session){
68
 		ResponseBean responseBean = new ResponseBean();
68
 		ResponseBean responseBean = new ResponseBean();
69
-		responseBean = ihkService.syncControl(userVerifyId);
69
+		UserElement userElement = getUserElement(session);
70
+		responseBean = ihkService.syncControl(userElement.getUserVerifyId());
70
 		return responseBean;
71
 		return responseBean;
71
 	}
72
 	}
72
 
73
 

+ 30
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MonitoringController.java View File

1
 package com.community.huiju.controller;
1
 package com.community.huiju.controller;
2
 
2
 
3
 import com.community.commom.mode.ResponseBean;
3
 import com.community.commom.mode.ResponseBean;
4
+import com.community.commom.session.UserElement;
4
 import com.community.huiju.service.IMonitoringService;
5
 import com.community.huiju.service.IMonitoringService;
5
 import io.swagger.annotations.Api;
6
 import io.swagger.annotations.Api;
6
 import io.swagger.annotations.ApiImplicitParam;
7
 import io.swagger.annotations.ApiImplicitParam;
66
         return response;
67
         return response;
67
     }
68
     }
68
 
69
 
70
+    @ApiOperation(value = "获取监控列表数据 HLS",notes = "根据小区ID获取")
71
+    @ApiImplicitParams({
72
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
73
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
74
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行")
75
+    })
76
+    @RequestMapping(value = "/monitoring/hls/{communityId}",method = RequestMethod.GET)
77
+    public ResponseBean getListHLS(@PathVariable("communityId") Integer communityId,
78
+                                   @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
79
+                                   @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize) {
80
+
81
+        ResponseBean responseBean = new ResponseBean();
82
+        responseBean = iMonitoringService.getHlsByCommunityId(communityId, pageNo, pageSize);
83
+        return responseBean;
84
+    }
85
+
86
+
87
+    @ApiOperation(value = "获取可是对讲数据 HLS",notes = "获取可是对讲数据")
88
+    @ApiImplicitParams({
89
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
90
+    })
91
+    @RequestMapping(value = "/monitoring/intercom",method = RequestMethod.GET)
92
+    public ResponseBean getIntercomHLS(HttpSession session) {
93
+        ResponseBean responseBean = new ResponseBean();
94
+        UserElement userElement = getUserElement(session);
95
+        responseBean = iMonitoringService.getIntercomHLS(userElement);
96
+        return responseBean;
97
+    }
98
+
69
 }
99
 }

+ 17
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpEquipmentMapper.java View File

36
             "where tm.community_id = #{communityId} and tm.equipment_type = 1")
36
             "where tm.community_id = #{communityId} and tm.equipment_type = 1")
37
     List<TpEquipment> selectByCommunityId(@Param("communityId") Integer communityId);
37
     List<TpEquipment> selectByCommunityId(@Param("communityId") Integer communityId);
38
 
38
 
39
+    /**
40
+     * 根据小区获取 监控列表 HLS
41
+     * @param communityId
42
+     * @return
43
+     */
44
+    @ResultMap("BaseResultMap")
45
+    @Select("select " +
46
+            "tm.*, " +
47
+            "(select `key` FROM tp_configuration WHERE id = tm.url_id) as monitoringUrl, " +
48
+            "(select `key` FROM tp_configuration WHERE id = tm.security_guard_tel_id) as securityGuardTel, " +
49
+            "(select `key` FROM tp_configuration WHERE id = tm.security_room_tel_id) as securityRoomTel, " +
50
+            "(select `key` FROM tp_configuration WHERE id = tm.address_id) as monitoringAddress " +
51
+            "FROM " +
52
+            "tp_equipment tm " +
53
+            "where tm.community_id = #{communityId} and tm.equipment_type = 1")
54
+    List<TpEquipment> selectHlsByCommunityId(@Param("communityId") Integer communityId);
55
+
39
     /**
56
     /**
40
      * 根据小区 和 房间号 查询所有设备
57
      * 根据小区 和 房间号 查询所有设备
41
      * @param communityId
58
      * @param communityId

+ 14
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/IMonitoringService.java View File

1
 package com.community.huiju.service;
1
 package com.community.huiju.service;
2
 
2
 
3
 import com.community.commom.mode.ResponseBean;
3
 import com.community.commom.mode.ResponseBean;
4
+import com.community.commom.session.UserElement;
4
 
5
 
5
 /**
6
 /**
6
  * 监控 业务接口
7
  * 监控 业务接口
26
      */
27
      */
27
     ResponseBean getMonitoringToken(Integer communityId, Integer pageNo, Integer pageSize);
28
     ResponseBean getMonitoringToken(Integer communityId, Integer pageNo, Integer pageSize);
28
 
29
 
30
+    /**
31
+     * 获取视频流地址 HLS
32
+     * @param communityId
33
+     * @return
34
+     */
35
+    ResponseBean getHlsByCommunityId(Integer communityId, Integer pageNo, Integer pageSize);
36
+
37
+    /**
38
+     * 可是对讲 视频流
39
+     * @param userElement
40
+     * @return
41
+     */
42
+    ResponseBean getIntercomHLS(UserElement userElement);
29
 }
43
 }

+ 2
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/HKServiceImpl.java View File

321
 
321
 
322
     @Override
322
     @Override
323
     public ResponseBean syncControl(Integer userVerifyId) {
323
     public ResponseBean syncControl(Integer userVerifyId) {
324
+        // TODO 暂时只支持开单元门
325
+
324
         ResponseBean responseBean = new ResponseBean();
326
         ResponseBean responseBean = new ResponseBean();
325
 
327
 
326
         // 查询当前的房产
328
         // 查询当前的房产

+ 55
- 4
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MonitoringServiceImpl.java View File

5
 import com.community.commom.mode.ResponseBean;
5
 import com.community.commom.mode.ResponseBean;
6
 import com.community.commom.hk.HKConstant;
6
 import com.community.commom.hk.HKConstant;
7
 import com.community.commom.hk.HKOpenApi;
7
 import com.community.commom.hk.HKOpenApi;
8
-import com.community.huiju.dao.TpEquipmentMapper;
9
-import com.community.huiju.dao.TpEquipmentTreeMapper;
10
-import com.community.huiju.model.TpEquipment;
11
-import com.community.huiju.model.TpEquipmentTree;
8
+import com.community.commom.session.UserElement;
9
+import com.community.huiju.dao.*;
10
+import com.community.huiju.model.*;
12
 import com.community.huiju.service.IMonitoringService;
11
 import com.community.huiju.service.IMonitoringService;
13
 import com.github.pagehelper.Page;
12
 import com.github.pagehelper.Page;
14
 import com.github.pagehelper.PageHelper;
13
 import com.github.pagehelper.PageHelper;
18
 import org.springframework.beans.factory.annotation.Autowired;
17
 import org.springframework.beans.factory.annotation.Autowired;
19
 import org.springframework.stereotype.Service;
18
 import org.springframework.stereotype.Service;
20
 
19
 
20
+import java.util.HashMap;
21
 import java.util.List;
21
 import java.util.List;
22
 import java.util.Map;
22
 import java.util.Map;
23
 
23
 
35
     @Autowired
35
     @Autowired
36
     private TpEquipmentTreeMapper tpEquipmentTreeMapper;
36
     private TpEquipmentTreeMapper tpEquipmentTreeMapper;
37
 
37
 
38
+    @Autowired
39
+    private TpConfigurationMapper tpConfigurationMapper;
40
+
41
+    @Autowired
42
+    private TaUserVerifyMapper taUserVerifyMapper;
43
+
44
+    @Autowired
45
+    private TpPhaseMapper tpPhaseMapper;
46
+
47
+    @Autowired
48
+    private TpBuildingMapper tpBuildingMapper;
49
+
50
+    @Autowired
51
+    private TpUnitMapper tpUnitMapper;
52
+
53
+    @Autowired
54
+    private TpLevelMapper tpLevelMapper;
55
+
38
     @Override
56
     @Override
39
     public ResponseBean getByCommunityId(Integer communityId,Integer pageNo, Integer pageSize) {
57
     public ResponseBean getByCommunityId(Integer communityId,Integer pageNo, Integer pageSize) {
40
 
58
 
134
 
152
 
135
         return response;
153
         return response;
136
     }
154
     }
155
+
156
+    @Override
157
+    public ResponseBean getHlsByCommunityId(Integer communityId, Integer pageNo, Integer pageSize) {
158
+        ResponseBean response = new ResponseBean();
159
+        Page<TpEquipment> page = PageHelper.startPage(pageNo, pageSize);
160
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectHlsByCommunityId(communityId);
161
+
162
+        Map<String, Object> map = Maps.newHashMap();
163
+        map.put("pageNo", page.getPageNum());
164
+        map.put("pageSize", page.getPageSize());
165
+        map.put("total", page.getTotal());
166
+        map.put("list", tpEquipments);
167
+        response.addSuccess(map);
168
+        return response;
169
+    }
170
+
171
+    @Override
172
+    public ResponseBean getIntercomHLS(UserElement userElement) {
173
+        ResponseBean responseBean = new ResponseBean();
174
+
175
+        TpUnit tpUnit = tpUnitMapper.selectByPrimaryKey(userElement.getUnitId());
176
+
177
+
178
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userElement.getCommunityId(), userElement.getUnitId(), 3);
179
+        TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(tpEquipments.get(0).getUuidId());
180
+
181
+        Map<String,Object> map = new HashMap<>();
182
+        map.put("url", tpConfiguration.getKey());
183
+        map.put("address", tpUnit.getPhaseName() + tpUnit.getBuildingName() + tpUnit.getName());
184
+        map.put("token", "sssss");
185
+        responseBean.addSuccess(map);
186
+        return responseBean;
187
+    }
137
 }
188
 }

BIN
CODE/smart-community/community-common/target/community-common-0.0.1.jar View File


+ 13
- 0
CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpRentalHouseController.java View File

87
 		return responseBean;
87
 		return responseBean;
88
 	}
88
 	}
89
 	
89
 	
90
+	@ApiOperation(value = "更新公寓", notes = "更新公寓")
91
+	@ApiImplicitParams({
92
+			@ApiImplicitParam(paramType = "body", dataType = "TpRentalHouse", name = "rentalHouse", value = "公寓"),
93
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
94
+	})
95
+	@RequestMapping(value = "/rental/update",method = RequestMethod.POST)
96
+	public ResponseBean updateRental(@RequestBody TpRentalHouse rentalHouse, HttpSession session){
97
+		ResponseBean responseBean = new ResponseBean();
98
+		UserElement userElement = getUserElement(session);
99
+		responseBean = tpRentalHouseService.updateRental(rentalHouse,userElement);
100
+		return responseBean;
101
+	}
102
+	
90
 	@ApiOperation(value = "获取公寓信息", notes = "获取公寓信息")
103
 	@ApiOperation(value = "获取公寓信息", notes = "获取公寓信息")
91
 	@ApiImplicitParams({
104
 	@ApiImplicitParams({
92
 			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "id", value = "公寓Id"),
105
 			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "id", value = "公寓Id"),

+ 8
- 0
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpRentalHouseService.java View File

45
 	 * @return
45
 	 * @return
46
 	 */
46
 	 */
47
 	TpRentalHouse getRentalById(Integer id);
47
 	TpRentalHouse getRentalById(Integer id);
48
+	
49
+	/**
50
+	 * 更新公寓
51
+	 * @param rentalHouse
52
+	 * @param userElement
53
+	 * @return
54
+	 */
55
+	ResponseBean updateRental(TpRentalHouse rentalHouse, UserElement userElement);
48
 }
56
 }

+ 44
- 0
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpRentalHouseServiceImpl.java View File

145
 		tpRentalHouse.setAppCarouselImg(imgList);
145
 		tpRentalHouse.setAppCarouselImg(imgList);
146
 		return tpRentalHouse;
146
 		return tpRentalHouse;
147
 	}
147
 	}
148
+	
149
+	/**
150
+	 * 更新公寓
151
+	 *
152
+	 * @param rentalHouse
153
+	 * @param userElement
154
+	 * @return
155
+	 */
156
+	@Override
157
+	public ResponseBean updateRental(TpRentalHouse rentalHouse, UserElement userElement) {
158
+		ResponseBean responseBean = new ResponseBean();
159
+		rentalHouse.setUpdateDate(LocalDateTime.now());
160
+		rentalHouse.setUpdateUser(userElement.getId());
161
+		tpRentalHouseMapper.updateById(rentalHouse);
162
+		//更新首页图片
163
+		QueryWrapper<TpRentalHouseImg> tpRentalHouseImgQueryWrapper = new QueryWrapper<>();
164
+		tpRentalHouseImgQueryWrapper.eq("community_id", rentalHouse.getCommunityId());
165
+		tpRentalHouseImgQueryWrapper.eq("rental_house_id",rentalHouse.getId());
166
+		tpRentalHouseImgQueryWrapper.eq("img_type","1");
167
+		TpRentalHouseImg tpRentalHouseImg = new TpRentalHouseImg();
168
+		tpRentalHouseImg.setImgUrl(rentalHouse.getAppListImg());
169
+		tpRentalHouseImgMapper.update(tpRentalHouseImg,tpRentalHouseImgQueryWrapper);
170
+		//更新轮播图,先删除在添加
171
+		QueryWrapper<TpRentalHouseImg> deleteQueryWrapper = new QueryWrapper<>();
172
+		deleteQueryWrapper.eq("community_id", rentalHouse.getCommunityId());
173
+		deleteQueryWrapper.eq("rental_house_id",rentalHouse.getId());
174
+		deleteQueryWrapper.eq("img_type","2");
175
+		tpRentalHouseImgMapper.delete(deleteQueryWrapper);
176
+		//插入公寓轮播图信息
177
+		List<String> imgList = rentalHouse.getAppCarouselImg();
178
+		List<TpRentalHouseImg> rentalHouseImgList = new ArrayList<>();
179
+		imgList.stream().forEach(e -> {
180
+			TpRentalHouseImg rentalHouseImg = new TpRentalHouseImg();
181
+			rentalHouseImg.setCommunityId(rentalHouse.getCommunityId());
182
+			rentalHouseImg.setCreateDate(LocalDateTime.now());
183
+			rentalHouseImg.setRentalHouseId(rentalHouse.getId());
184
+			rentalHouseImg.setImgType("2");
185
+			rentalHouseImg.setImgUrl(e);
186
+			rentalHouseImgList.add(rentalHouseImg);
187
+		});
188
+		tpRentalHouseImgMapper.batchInsert(rentalHouseImgList);
189
+		responseBean.addSuccess("更新成功");
190
+		return responseBean;
191
+	}
148
 }
192
 }

+ 8
- 0
VUECODE/smart-property-manage/src/api/rental.js View File

36
   })
36
   })
37
 }
37
 }
38
 
38
 
39
+export function updateRental(listQuery) {
40
+  return request({
41
+    url: '/rental/update',
42
+    method: 'post',
43
+    data: listQuery
44
+  })
45
+}
46
+
39
 export function getRental(id) {
47
 export function getRental(id) {
40
   return request({
48
   return request({
41
     url: '/rental/get/' + id,
49
     url: '/rental/get/' + id,

+ 10
- 1
VUECODE/smart-property-manage/src/store/modules/rental.js View File

1
-import { fetchRentalList, shelfRental, obtainedRental, addRental, getRental } from '@/api/rental'
1
+import { fetchRentalList, shelfRental, obtainedRental, addRental, getRental, updateRental } from '@/api/rental'
2
 
2
 
3
 const transaction = {
3
 const transaction = {
4
   namespaced: true,
4
   namespaced: true,
28
         })
28
         })
29
       })
29
       })
30
     },
30
     },
31
+    UpdateRental({ commit }, listQuery) {
32
+      return new Promise((resolve, reject) => {
33
+        updateRental(listQuery).then(response => {
34
+          resolve(response)
35
+        }).catch(error => {
36
+          reject(error)
37
+        })
38
+      })
39
+    },
31
     GetRental({ commit }, id) {
40
     GetRental({ commit }, id) {
32
       return new Promise((resolve, reject) => {
41
       return new Promise((resolve, reject) => {
33
         getRental(id).then(response => {
42
         getRental(id).then(response => {

+ 7
- 7
VUECODE/smart-property-manage/src/views/rental/rentalEdit.vue View File

81
         <el-checkbox v-model="listData.washingMachine" true-label="1" false-label="0">洗衣机</el-checkbox>
81
         <el-checkbox v-model="listData.washingMachine" true-label="1" false-label="0">洗衣机</el-checkbox>
82
         <el-checkbox v-model="listData.airConditioning" true-label="1" false-label="0">空调</el-checkbox>
82
         <el-checkbox v-model="listData.airConditioning" true-label="1" false-label="0">空调</el-checkbox>
83
         <el-checkbox v-model="listData.fridge" true-label="1" false-label="0">冰箱</el-checkbox>
83
         <el-checkbox v-model="listData.fridge" true-label="1" false-label="0">冰箱</el-checkbox>
84
-        <el-checkbox v-model="listData.TV" true-label="1" false-label="0">电视</el-checkbox>
84
+        <el-checkbox v-model="listData.tv" true-label="1" false-label="0">电视</el-checkbox>
85
         <el-checkbox v-model="listData.smartLock" true-label="1" false-label="0">智能锁</el-checkbox>
85
         <el-checkbox v-model="listData.smartLock" true-label="1" false-label="0">智能锁</el-checkbox>
86
         <el-checkbox v-model="listData.waterHeater" true-label="1" false-label="0">热水器</el-checkbox>
86
         <el-checkbox v-model="listData.waterHeater" true-label="1" false-label="0">热水器</el-checkbox>
87
         <el-checkbox v-model="listData.desk" true-label="1" false-label="0">桌子</el-checkbox>
87
         <el-checkbox v-model="listData.desk" true-label="1" false-label="0">桌子</el-checkbox>
88
         <el-checkbox v-model="listData.chair" true-label="1" false-label="0">椅子</el-checkbox>
88
         <el-checkbox v-model="listData.chair" true-label="1" false-label="0">椅子</el-checkbox>
89
-        <el-checkbox v-model="listData.WiFi" true-label="1" false-label="0">网络</el-checkbox>
89
+        <el-checkbox v-model="listData.wiFi" true-label="1" false-label="0">网络</el-checkbox>
90
         <el-checkbox v-model="listData.kitchen" true-label="1" false-label="0">厨房</el-checkbox>
90
         <el-checkbox v-model="listData.kitchen" true-label="1" false-label="0">厨房</el-checkbox>
91
         <el-checkbox v-model="listData.bathroom" true-label="1" false-label="0">独卫</el-checkbox>
91
         <el-checkbox v-model="listData.bathroom" true-label="1" false-label="0">独卫</el-checkbox>
92
         <el-checkbox v-model="listData.balcony" true-label="1" false-label="0">阳台</el-checkbox>
92
         <el-checkbox v-model="listData.balcony" true-label="1" false-label="0">阳台</el-checkbox>
156
         washingMachine: '',
156
         washingMachine: '',
157
         airConditioning: '',
157
         airConditioning: '',
158
         fridge: '',
158
         fridge: '',
159
-        TV: '',
159
+        tv: '',
160
         smartLock: '',
160
         smartLock: '',
161
         waterHeater: '',
161
         waterHeater: '',
162
         desk: '',
162
         desk: '',
163
         chair: '',
163
         chair: '',
164
-        WiFi: '',
164
+        wiFi: '',
165
         kitchen: '',
165
         kitchen: '',
166
         bathroom: '',
166
         bathroom: '',
167
         balcony: ''
167
         balcony: ''
262
     submitForm(formName) { // 提交
262
     submitForm(formName) { // 提交
263
       this.$refs[formName].validate((valid) => {
263
       this.$refs[formName].validate((valid) => {
264
         if (valid) {
264
         if (valid) {
265
-          this.addRental()
265
+          this.updateRental()
266
         } else {
266
         } else {
267
           console.log('error submit!!')
267
           console.log('error submit!!')
268
           return false
268
           return false
278
       console.log(this.isRegistered)
278
       console.log(this.isRegistered)
279
       this.$refs[formName].resetFields()
279
       this.$refs[formName].resetFields()
280
     },
280
     },
281
-    addRental() {
281
+    updateRental() {
282
       // 加载框
282
       // 加载框
283
       const loading = this.$loading({
283
       const loading = this.$loading({
284
         lock: true,
284
         lock: true,
286
         spinner: 'el-icon-loading',
286
         spinner: 'el-icon-loading',
287
         background: 'rgba(0, 0, 0, 0.7)'
287
         background: 'rgba(0, 0, 0, 0.7)'
288
       })
288
       })
289
-      this.$store.dispatch('rental/AddRental', this.listData).then((res) => {
289
+      this.$store.dispatch('rental/UpdateRental', this.listData).then((res) => {
290
         if (res.code === '0') {
290
         if (res.code === '0') {
291
           this.$message({
291
           this.$message({
292
             message: res.message,
292
             message: res.message,