From 946bd933e477790c67a6fe9f0ce2dad3152b51c3 Mon Sep 17 00:00:00 2001
From: zhitong.yu <xynz17@163.com>
Date: 星期六, 22 十一月 2025 16:14:11 +0800
Subject: [PATCH] 发卡充电柜Version 1.0
---
android-app/local.properties | 8 +
/dev/null | 11 -
android-app/build.gradle | 22 +++
android-app/gradle.properties | 9 +
android-app/gradlew | 252 ++++++++++++++++++++++++++++++++++++
android-app/gradlew.bat | 94 +++++++++++++
android-app/settings.gradle | 2
7 files changed, 387 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
deleted file mode 100644
index 7d47a8a..0000000
--- a/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## BSB
-
-瀹氫綅骞冲彴鍚庣
-
diff --git a/android-app/build.gradle b/android-app/build.gradle
new file mode 100644
index 0000000..56902fd
--- /dev/null
+++ b/android-app/build.gradle
@@ -0,0 +1,22 @@
+buildscript {
+ repositories {
+ google()
+ mavenCentral()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:8.1.0'
+ }
+}
+
+allprojects {
+ repositories {
+ google()
+ mavenCentral()
+ }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
+}
+
+
diff --git a/android-app/gradle.properties b/android-app/gradle.properties
new file mode 100644
index 0000000..efb8417
--- /dev/null
+++ b/android-app/gradle.properties
@@ -0,0 +1,9 @@
+android.useAndroidX=true
+android.enableJetifier=true
+
+# 浣跨敤 compileSdk 34 鏃讹紝蹇界暐 Android Gradle 鎻掍欢鐨勭増鏈彁绀�
+android.suppressUnsupportedCompileSdk=34
+
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+
+
diff --git a/android-app/gradlew b/android-app/gradlew
new file mode 100644
index 0000000..f5feea6
--- /dev/null
+++ b/android-app/gradlew
@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright 漏 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions 芦$var禄, 芦${var}禄, 芦${var:-default}禄, 芦${var+SET}禄,
+# 芦${var#prefix}禄, 芦${var%suffix}禄, and 芦$( cmd )禄;
+# * compound commands having a testable exit status, especially 芦case禄;
+# * various built-in commands including 芦command禄, 芦set禄, and 芦ulimit禄.
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/android-app/gradlew.bat b/android-app/gradlew.bat
new file mode 100644
index 0000000..9d21a21
--- /dev/null
+++ b/android-app/gradlew.bat
@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/android-app/local.properties b/android-app/local.properties
new file mode 100644
index 0000000..ca62016
--- /dev/null
+++ b/android-app/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Thu Nov 20 14:24:28 CST 2025
+sdk.dir=C\:\\Users\\Lenovo\\AppData\\Local\\Android\\Sdk
diff --git a/android-app/settings.gradle b/android-app/settings.gradle
new file mode 100644
index 0000000..3afde5f
--- /dev/null
+++ b/android-app/settings.gradle
@@ -0,0 +1,2 @@
+rootProject.name = "FaKaJidAndroid"
+include ':app', ':serialport'
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 96a9af3..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?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.hxzk</groupId>
- <artifactId>Gps_Admin</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>Gps_Admin</name>
- <description>Gps_Admin</description>
- <properties>
- <java.version>1.8</java.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <spring-boot.version>2.6.13</spring-boot.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</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-web</artifactId>
- </dependency>
-<!-- 鏁版嵁搴�-->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>8.0.30</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jdbc</artifactId>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-generator</artifactId>
- <version>3.5.3</version>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.4.3.4</version>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.32</version> <!-- 浣犲彲浠ユ牴鎹渶瑕侀�夋嫨鍚堥�傜殑鐗堟湰 -->
- </dependency>
-<!-- swagger-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>2.9.2</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>2.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
- <version>2.1.0</version>
- </dependency>
-<!-- 璋冭瘯鐩戞帶绫绘彃浠�-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- <scope>runtime</scope>
- <optional>true</optional>
- </dependency>
-<!--瀹炰綋绫诲揩閫熺敓鎴� getter setter-->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.24</version>
- </dependency>
- <!-- JWT Library -->
- <dependency>
- <groupId>com.auth0</groupId>
- <artifactId>java-jwt</artifactId>
- <version>3.10.3</version>
- </dependency>
-<!-- Token-->
- <dependency>
- <groupId>cn.dev33</groupId>
- <artifactId>sa-token-spring-boot-starter</artifactId>
- <version>1.42.0</version>
- </dependency>
-<!-- 鍒嗛〉-->
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>1.4.6</version>
- </dependency>
-<!-- 鐭俊-->
- <dependency>
- <groupId>com.tencentcloudapi</groupId>
- <artifactId>tencentcloud-sdk-java-sms</artifactId>
- <version>3.1.811</version>
- </dependency>
-<!-- redis-->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring-boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring-boot.version}</version>
- <configuration>
- <mainClass>com.hxzk.gps.GpsAdminApplication</mainClass>
- </configuration>
- <executions>
- <execution>
- <id>repackage</id>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/src/main/java/com/hxzk/gps/GpsAdminApplication.java b/src/main/java/com/hxzk/gps/GpsAdminApplication.java
deleted file mode 100644
index 2667a5e..0000000
--- a/src/main/java/com/hxzk/gps/GpsAdminApplication.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.hxzk.gps;
-
-
-import javafx.application.Application;
-import javafx.application.Platform;
-import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
-import javafx.scene.Node;
-import javafx.scene.Scene;
-import javafx.scene.control.*;
-import javafx.scene.layout.*;
-import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
-import javafx.stage.Stage;
-import javafx.stage.StageStyle;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-
-@SpringBootApplication
-@EnableTransactionManagement
-@EnableScheduling
-@EnableCaching
-@MapperScan(basePackages = "com.hxzk.gps.mapper")
-public class GpsAdminApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(GpsAdminApplication.class, args);
- }
-
-
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/controller/Anchor/TbAchorController.java b/src/main/java/com/hxzk/gps/controller/Anchor/TbAchorController.java
deleted file mode 100644
index a0e5131..0000000
--- a/src/main/java/com/hxzk/gps/controller/Anchor/TbAchorController.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.hxzk.gps.controller.Anchor;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.controller.Anchor.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.controller.DepartMent.Results.DepartMentResult;
-import com.hxzk.gps.controller.DepartMent.dto.DpeartMentTreeTableDto;
-
-import com.hxzk.gps.entity.Anchor.TbAchor;
-import com.hxzk.gps.entity.Fence.TbFence;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Anchor.TbAchorService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍩虹珯绠$悊
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@RestController
-@RequestMapping("/Anchor")
-@Api(tags="鍩虹珯绠$悊")
-public class TbAchorController {
- @Autowired
- private TbAchorService achorService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鍩虹珯鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍩虹珯淇℃伅鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindAnchorInfo")
- public ResultTable FindAnchorInfo(@RequestBody TableSearchResult TableSearchResult){
-
- return achorService.FindAnchorInfo(TableSearchResult);
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴灞曠ず鍩虹珯鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴灞曠ず鍩虹珯鍔熻兘")
- @PostMapping("FindScreenAnchor")
- public List<TbAchor> FindScreenAnchor(){
- QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- return achorService.getBaseMapper().selectList(queryWrapper);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Anchor/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/Anchor/dto/TableList.java
deleted file mode 100644
index 4c1b84c..0000000
--- a/src/main/java/com/hxzk/gps/controller/Anchor/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Anchor.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Anchor/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/Anchor/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 624dfce..0000000
--- a/src/main/java/com/hxzk/gps/controller/Anchor/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hxzk.gps.controller.Anchor.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Anchor.dto.TableList;
-import com.hxzk.gps.entity.Anchor.TbAchor;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbAchor achor;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Attendance/TbKaoqingController.java b/src/main/java/com/hxzk/gps/controller/Attendance/TbKaoqingController.java
deleted file mode 100644
index cd74d37..0000000
--- a/src/main/java/com/hxzk/gps/controller/Attendance/TbKaoqingController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.hxzk.gps.controller.Attendance;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.hxzk.gps.controller.Attendance.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Attendance.TbRealkaoqing;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Attendance.TbKaoqingService;
-import com.hxzk.gps.service.Track.TbGpsTrackService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍘嗗彶鑰冨嫟
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@RestController
-@RequestMapping("/Attendance")
-public class TbKaoqingController {
-
- @Autowired
- private TbKaoqingService kaoqingService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鑰冨嫟鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鑰冨嫟淇℃伅鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindAttendanceInfo")
- public ResultTable FindAttendanceInfo(@RequestBody TableSearchResult TableSearchResult){
- return kaoqingService.FindAttendanceInfo(TableSearchResult);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鑰冨嫟瀹炴椂缁熻鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鑰冨嫟瀹炴椂缁熻鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindRealAttendanceInfo")
- public List<TbRealkaoqing> FindRealAttendanceInfo(@RequestBody TableSearchResult TableSearchResult){
- return kaoqingService.FindRealAttendanceInfo(TableSearchResult);
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Attendance/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/Attendance/dto/TableList.java
deleted file mode 100644
index 9a2bed2..0000000
--- a/src/main/java/com/hxzk/gps/controller/Attendance/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Attendance.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Attendance/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/Attendance/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index c68e38b..0000000
--- a/src/main/java/com/hxzk/gps/controller/Attendance/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hxzk.gps.controller.Attendance.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Attendance.dto.TableList;
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbKaoqing kaoqing;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Cabinet/TbCabinetController.java b/src/main/java/com/hxzk/gps/controller/Cabinet/TbCabinetController.java
deleted file mode 100644
index e105405..0000000
--- a/src/main/java/com/hxzk/gps/controller/Cabinet/TbCabinetController.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.hxzk.gps.controller.Cabinet;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.controller.Cabinet.deo.TableSearchResultCabinet;
-import com.hxzk.gps.entity.Cabinet.TbCabinet;
-import com.hxzk.gps.entity.FaKaJi.TbFakaji;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Cabinet.TbCabinetService;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-03
- */
-@RestController
-@RequestMapping("/Cabinet")
-public class TbCabinetController {
-
- @Autowired
- TbCabinetService cabinetService;
-
- @SaCheckLogin
- @PostMapping("FindCabinetInfo")
- ResultTable FindCabinetInfo(@RequestBody TableSearchResultCabinet tableSearchResultCabinet){
- return cabinetService.FindCabinetInfo(tableSearchResultCabinet);
- }
-
-
-
- /*
- * 鏌滈棬鍙蜂笅鎷夊垪琛ㄤ俊鎭�
- * */
- @SaCheckLogin
- @PostMapping("CabinetAutocomplete")
- public List<AuToComplete> FindCustomerChanPin(){
- QueryWrapper<TbCabinet> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- List<TbCabinet> PersonList = cabinetService.getBaseMapper().selectList(queryWrapper);
- List<AuToComplete> addCustomerList = PersonList.stream()
- .map(cabinet -> {
- AuToComplete addCustomer = new AuToComplete();
- addCustomer.setValue(cabinet.getCabinetnum());
- addCustomer.setLabel(cabinet.getCabinetname());
- return addCustomer;
- })
- .collect(Collectors.toList());
-
- return addCustomerList;
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鍙戝崱鏈鸿澶囨柊澧炴帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍙戝崱鏈鸿澶囨柊澧炲姛鑳�")
- @PostMapping("add")
- public ReturnMessage add(@RequestBody TbCabinet tbCabinet){
- return cabinetService.add(tbCabinet);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鍙戝崱鏈鸿澶囦慨鏀规帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍙戝崱鏈鸿澶囦慨鏀瑰姛鑳�")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody TbCabinet tbCabinet){
- return cabinetService.update(tbCabinet);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鍙戝崱鏈鸿澶囧垹闄ゆ帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍙戝崱鏈鸿澶囧垹闄ゅ姛鑳�")
- @PostMapping("delete")
- public ReturnMessage delete(@RequestBody TbCabinet tbCabinet){
- return cabinetService.delete(tbCabinet);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鍙戝崱鏈鸿澶囨壒閲忓垹闄ゆ帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍙戝崱鏈鸿澶囨壒閲忓垹闄ゅ姛鑳�")
- @PostMapping("batchDelete")
- public ReturnMessage batchDelete(@RequestBody List<Integer> ids){
- return cabinetService.batchDelete(ids);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Cabinet/TbFakajiController.java b/src/main/java/com/hxzk/gps/controller/Cabinet/TbFakajiController.java
deleted file mode 100644
index cbf359e..0000000
--- a/src/main/java/com/hxzk/gps/controller/Cabinet/TbFakajiController.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.hxzk.gps.controller.Cabinet;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.entity.FaKaJi.TbFakaji;
-import com.hxzk.gps.service.Cabinet.TbFakajiService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-03
- */
-@RestController
-@RequestMapping("/FaKaJi")
-public class TbFakajiController {
- @Autowired
- TbFakajiService fakajiService;
-
-
-
- @Autowired
- @SaCheckLogin
- @PostMapping("FindFaKaJiInfo")
- List<TbFakaji> FindFaKaJiInfo(@RequestBody TbFakaji fakaji){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("deviceid",fakaji.getDeviceid());
-
- return fakajiService.getBaseMapper().selectList(queryWrapper);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Cabinet/TbFakalogController.java b/src/main/java/com/hxzk/gps/controller/Cabinet/TbFakalogController.java
deleted file mode 100644
index 1ae23ea..0000000
--- a/src/main/java/com/hxzk/gps/controller/Cabinet/TbFakalogController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.hxzk.gps.controller.Cabinet;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.hxzk.gps.controller.Cabinet.deo.TableSearchResultFakalog;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Cabinet.TbFakalogService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍙戝崱鏃ュ織鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-01-XX
- */
-@RestController
-@RequestMapping("/FaKaLog")
-public class TbFakalogController {
-
- @Autowired
- TbFakalogService fakalogService;
-
- @SaCheckLogin
- @ApiOperation(value = "鍙戝崱鏃ュ織鍒楄〃鏌ヨ鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍙戝崱鏃ュ織淇℃伅鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindFaKaLogInfo")
- public ResultTable FindFaKaLogInfo(@RequestBody TableSearchResultFakalog tableSearchResultFakalog) {
- return fakalogService.FindFaKaLogInfo(tableSearchResultFakalog);
- }
-}
-
diff --git a/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultCabinet.java b/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultCabinet.java
deleted file mode 100644
index 40e84cc..0000000
--- a/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultCabinet.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Cabinet.deo;
-
-import com.hxzk.gps.controller.Tag.dto.TableList;
-import com.hxzk.gps.entity.Cabinet.TbCabinet;
-import com.hxzk.gps.entity.Cabinet.TbFakahuanlog;
-import lombok.Data;
-
-@Data
-public class TableSearchResultCabinet<T> {
- private TableList tableList;
- private TbCabinet cabinet;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultFakalog.java b/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultFakalog.java
deleted file mode 100644
index cc85cb7..0000000
--- a/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultFakalog.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hxzk.gps.controller.Cabinet.deo;
-
-import com.hxzk.gps.controller.Tag.dto.TableList;
-import com.hxzk.gps.entity.Cabinet.TbFakalog;
-import lombok.Data;
-
-@Data
-public class TableSearchResultFakalog {
- private TableList tableList;
- private TbFakalog fakalog;
- private String guiziname;
- private String guiziid;
- private String takekacao;
- private String takename;
- private String taketagid;
- private String takeuserid;
- private String savekacao;
- private String savename;
- private String savetagid;
- private String startTime;
- private String endTime;
- private String startSaveTime;
- private String endSaveTime;
-}
-
diff --git a/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultHuan.java b/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultHuan.java
deleted file mode 100644
index fdcc9de..0000000
--- a/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultHuan.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Cabinet.deo;
-
-import com.hxzk.gps.controller.Tag.dto.TableList;
-import com.hxzk.gps.entity.Cabinet.TbFakahuanlog;
-import com.hxzk.gps.entity.Cabinet.TbFakaqulog;
-import lombok.Data;
-
-@Data
-public class TableSearchResultHuan<T> {
- private TableList tableList;
- private TbFakahuanlog fakahuanlog;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultQu.java b/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultQu.java
deleted file mode 100644
index d89cb43..0000000
--- a/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultQu.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hxzk.gps.controller.Cabinet.deo;
-
-import com.hxzk.gps.controller.Tag.dto.TableList;
-import com.hxzk.gps.entity.Cabinet.TbFakaqulog;
-import lombok.Data;
-
-@Data
-public class TableSearchResultQu<T> {
- private TableList tableList;
- private TbFakaqulog fakaqulog;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Company/Results/ChildItem.java b/src/main/java/com/hxzk/gps/controller/Company/Results/ChildItem.java
deleted file mode 100644
index 2e85035..0000000
--- a/src/main/java/com/hxzk/gps/controller/Company/Results/ChildItem.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.hxzk.gps.controller.Company.Results;
-
-import lombok.Data;
-
-import java.util.List;
-@Data
-// 琛ㄧず瀛愰」鐨勭被
-public class ChildItem {
- private String id;
- private String name;
- private String logo;
- private List<ChildItem> children;
-
- // 鏋勯�犲嚱鏁�
- public ChildItem(String id, String name,String logo,List<ChildItem> children) {
- this.id = id;
- this.name = name;
- this.logo = logo;
- this.children = children;
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Company/Results/CompanyDeleteCheckResult.java b/src/main/java/com/hxzk/gps/controller/Company/Results/CompanyDeleteCheckResult.java
deleted file mode 100644
index 25e70bd..0000000
--- a/src/main/java/com/hxzk/gps/controller/Company/Results/CompanyDeleteCheckResult.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.hxzk.gps.controller.Company.Results;
-
-import lombok.Data;
-import java.util.List;
-
-/**
- * 鍏徃鍒犻櫎妫�鏌ョ粨鏋�
- * @author YuZhiTong
- * @since 2025-01-XX
- */
-@Data
-public class CompanyDeleteCheckResult {
-
- /**
- * 鏄惁鍙互鍒犻櫎
- */
- private Boolean canDelete;
-
- /**
- * 妫�鏌ョ粨鏋滄秷鎭�
- */
- private String message;
-
- /**
- * 缁戝畾鏁版嵁缁熻
- */
- private BindingDataSummary bindingData;
-
- /**
- * 鏋勯�犲嚱鏁�
- */
- public CompanyDeleteCheckResult() {}
-
- public CompanyDeleteCheckResult(Boolean canDelete, String message, BindingDataSummary bindingData) {
- this.canDelete = canDelete;
- this.message = message;
- this.bindingData = bindingData;
- }
-
- /**
- * 缁戝畾鏁版嵁姹囨��
- */
- @Data
- public static class BindingDataSummary {
- /**
- * 閮ㄩ棬鏁伴噺
- */
- private Long departmentCount;
-
- /**
- * 浜哄憳鏁伴噺
- */
- private Long personCount;
-
- /**
- * 鐢ㄦ埛鏁伴噺
- */
- private Long userCount;
-
- /**
- * 瑙掕壊鏁伴噺
- */
- private Long roleCount;
-
- /**
- * 閮ㄩ棬鍥炬爣鏁伴噺
- */
- private Long iconCount;
-
- /**
- * 杞﹁締鏁伴噺
- */
- private Long carCount;
-
- /**
- * 鐗╄祫鏁伴噺
- */
- private Long materialCount;
-
- /**
- * 鍦板浘鏁伴噺
- */
- private Long mapCount;
-
- /**
- * 璀﹀憡缁熻鏁伴噺
- */
- private Long warningCount;
-
- /**
- * 鏄惁鏈変换浣曠粦瀹氭暟鎹�
- */
- public Boolean hasAnyBindingData() {
- return (departmentCount != null && departmentCount > 0) ||
- (personCount != null && personCount > 0) ||
- (userCount != null && userCount > 0) ||
- (roleCount != null && roleCount > 0) ||
- (iconCount != null && iconCount > 0) ||
- (carCount != null && carCount > 0) ||
- (materialCount != null && materialCount > 0) ||
- (mapCount != null && mapCount > 0) ||
- (warningCount != null && warningCount > 0);
- }
-
- /**
- * 鑾峰彇缁戝畾鏁版嵁鎬绘暟
- */
- public Long getTotalCount() {
- long total = 0;
- if (departmentCount != null) total += departmentCount;
- if (personCount != null) total += personCount;
- if (userCount != null) total += userCount;
- if (roleCount != null) total += roleCount;
- if (iconCount != null) total += iconCount;
- if (carCount != null) total += carCount;
- if (materialCount != null) total += materialCount;
- if (mapCount != null) total += mapCount;
- if (warningCount != null) total += warningCount;
- return total;
- }
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Company/Results/CompanyDepartmentResult.java b/src/main/java/com/hxzk/gps/controller/Company/Results/CompanyDepartmentResult.java
deleted file mode 100644
index a3daa4d..0000000
--- a/src/main/java/com/hxzk/gps/controller/Company/Results/CompanyDepartmentResult.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.hxzk.gps.controller.Company.Results;
-
-import lombok.Data;
-
-import java.util.List;
-@Data
-public class CompanyDepartmentResult {
- private int code;
- private List<DataItem> data;
- private String msg;
-
- // 鏋勯�犲嚱鏁�
- public CompanyDepartmentResult(int code, List<DataItem> data, String msg) {
- this.code = code;
- this.data = data;
- this.msg = msg;
- }
-
- public CompanyDepartmentResult() {
-
- }
-
- // Getter 鍜� Setter 鏂规硶
- public int getCode() {
- return code;
- }
-
- public void setCode(int code) {
- this.code = code;
- }
-
- public List<DataItem> getData() {
- return data;
- }
-
- public void setData(List<DataItem> data) {
- this.data = data;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-}
-
diff --git a/src/main/java/com/hxzk/gps/controller/Company/Results/CompanyResult.java b/src/main/java/com/hxzk/gps/controller/Company/Results/CompanyResult.java
deleted file mode 100644
index 4f1f06f..0000000
--- a/src/main/java/com/hxzk/gps/controller/Company/Results/CompanyResult.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hxzk.gps.controller.Company.Results;
-
-import com.hxzk.gps.util.Result.TableDto;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class CompanyResult {
- private Integer code;
- private String msg;
- private TableDto data;
-
- public CompanyResult() {
-
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Company/Results/CompanyTreeTableDto.java b/src/main/java/com/hxzk/gps/controller/Company/Results/CompanyTreeTableDto.java
deleted file mode 100644
index 2eab158..0000000
--- a/src/main/java/com/hxzk/gps/controller/Company/Results/CompanyTreeTableDto.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Company.Results;
-
-import lombok.Data;
-
-@Data
-public class CompanyTreeTableDto {
- private String departmentId;
- private Integer pageNum;
- private Integer pageSize;
- private String companyname;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Company/Results/DataItem.java b/src/main/java/com/hxzk/gps/controller/Company/Results/DataItem.java
deleted file mode 100644
index d5f7609..0000000
--- a/src/main/java/com/hxzk/gps/controller/Company/Results/DataItem.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.hxzk.gps.controller.Company.Results;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-// 琛ㄧず鏁版嵁椤圭殑绫�
-public class DataItem {
- private String id;
- private String name;
- private String logo;
- private List<ChildItem> children;
-
- // 鏋勯�犲嚱鏁�
- public DataItem(String id, String name,String logo, List<ChildItem> children) {
- this.id = id;
- this.name = name;
- this.logo = logo;
- this.children = children;
- }
-
- public DataItem() {
-
- }
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Company/TbCompanyController.java b/src/main/java/com/hxzk/gps/controller/Company/TbCompanyController.java
deleted file mode 100644
index ba3088f..0000000
--- a/src/main/java/com/hxzk/gps/controller/Company/TbCompanyController.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.hxzk.gps.controller.Company;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.controller.Company.Results.CompanyDepartmentResult;
-import com.hxzk.gps.controller.Company.Results.CompanyResult;
-import com.hxzk.gps.controller.Company.Results.CompanyTreeTableDto;
-import com.hxzk.gps.controller.Role.Results.AddRoleDto;
-import com.hxzk.gps.entity.Company.TbCompany;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.security.PublicKey;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 鍏徃绠$悊
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-04-17
- */
-@RestController
-@RequestMapping("/Company")
-@Api(tags="鍏徃绠$悊")
-public class TbCompanyController {
-
- @Autowired
- private TbCompanyService tbCompanyService;
-
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鍏徃鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍏徃鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindCompanyInfo")
- public CompanyResult FindCompanyInfo(@RequestBody CompanyTreeTableDto companyTreeTableDto){
- return tbCompanyService.FindCompanyInfo(companyTreeTableDto);
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "鐢ㄦ埛鍏徃瀛愰儴闂ㄥ垪琛ㄦ帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐢ㄦ埛鍏徃瀛愰儴闂ㄥ垪琛�")
- @PostMapping("Company")
- public CompanyDepartmentResult FindUserDepartmentCompany(){
- return tbCompanyService.FindUserDepartmentCompany();
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "鑾峰彇褰撳墠鍏徃绯荤粺鍚嶇О", notes = "璇ユ帴鍙f彁渚涗簡褰撳墠鐧诲綍鐢ㄦ埛鍏徃鐨勭郴缁熷悕绉�")
- @PostMapping("FindCompanyName")
- public String FindCompanyName(){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("companyname",UserInfoUtil.getUserCompany());
- TbCompany tbCompany = tbCompanyService.getBaseMapper().selectOne(queryWrapper);
- return tbCompany.getSystemname();
- }
-
-
- /*
- * 鍏徃涓嬫媺鍒楄〃
- * @param company 鍏徃淇℃伅
- * @return 鍏徃淇℃伅
- * @author YuZhiTong
- * @since 2025-05-19
- * */
- @SaCheckLogin
- @PostMapping("CompanyAutocomplete")
- public List<AuToComplete> CompanyAutocomplete(@RequestBody TbCompany company){
- return tbCompanyService.CompanyAutocomplete(company);
- }
-// 鍥存爮鍒楄〃鎵�灞炲叕鍙�
- @SaCheckLogin
- @PostMapping("FenceCompanyAutocomplete")
- public List<AuToComplete> FenceCompanyAutocomplete(){
- return tbCompanyService.FenceCompanyAutocomplete();
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鍏徃鏂板鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍏徃鏂板鍔熻兘")
- @PostMapping("add")
- public ReturnMessage add(@RequestBody TbCompany company){
- return tbCompanyService.add(company);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鍏徃淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍏徃淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody TbCompany company){
- return tbCompanyService.update(company);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鍏徃鍒犻櫎鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍏徃鍒犻櫎鍔熻兘")
- @PostMapping("delete")
- public ReturnMessage delete(@RequestBody TbCompany company){
- return tbCompanyService.delete(company);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "妫�鏌ュ叕鍙告槸鍚﹀彲浠ュ垹闄�", notes = "璇ユ帴鍙f鏌ュ叕鍙告槸鍚﹀瓨鍦ㄧ粦瀹氭暟鎹紝濡傛灉瀛樺湪鍒欐棤娉曞垹闄�")
- @PostMapping("checkDelete")
- public ReturnMessage checkDelete(@RequestBody TbCompany company){
- return tbCompanyService.checkCompanyCanDelete(company.getId());
- }
- @SaCheckLogin
- @ApiOperation(value = "鑾峰彇鍏徃鎵�灞濱D", notes = "鑾峰彇鍏徃鎵�灞濱D")
- @PostMapping("SelectCompanyId")
- public String SelectCompanyId(){
- return UserInfoUtil.getUserCompanyId();
- }
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/DepartMent/Results/DepartMentIconResult.java b/src/main/java/com/hxzk/gps/controller/DepartMent/Results/DepartMentIconResult.java
deleted file mode 100644
index 858cd02..0000000
--- a/src/main/java/com/hxzk/gps/controller/DepartMent/Results/DepartMentIconResult.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hxzk.gps.controller.DepartMent.Results;
-
-import com.hxzk.gps.util.Result.TableDto;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class DepartMentIconResult {
- private Integer code;
- private String msg;
- private TableDto data;
-
- public DepartMentIconResult() {
-
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/DepartMent/Results/DepartMentResult.java b/src/main/java/com/hxzk/gps/controller/DepartMent/Results/DepartMentResult.java
deleted file mode 100644
index 24dda26..0000000
--- a/src/main/java/com/hxzk/gps/controller/DepartMent/Results/DepartMentResult.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.hxzk.gps.controller.DepartMent.Results;
-
-import com.hxzk.gps.util.Result.TableDto;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class DepartMentResult {
- private Integer code;
- private String msg;
- private TableDto data;
-
-
- public DepartMentResult() {
-
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/DepartMent/TbDepartmentController.java b/src/main/java/com/hxzk/gps/controller/DepartMent/TbDepartmentController.java
deleted file mode 100644
index f98c062..0000000
--- a/src/main/java/com/hxzk/gps/controller/DepartMent/TbDepartmentController.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.hxzk.gps.controller.DepartMent;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.controller.DepartMent.Results.DepartMentResult;
-import com.hxzk.gps.controller.DepartMent.dto.DpeartMentTreeTableDto;
-import com.hxzk.gps.controller.Person.Results.PersonResult;
-import com.hxzk.gps.controller.Person.dto.PersonTreeTableDto;
-import com.hxzk.gps.entity.Company.TbCompany;
-import com.hxzk.gps.entity.Department.TbDepartMentIcon;
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.service.Department.TbDepartmentService;
-import com.hxzk.gps.service.Person.TbPersonService;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 閮ㄩ棬绠$悊
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-18
- */
-@RestController
-@RequestMapping("/Department")
-@Api(tags="閮ㄩ棬绠$悊")
-public class TbDepartmentController {
- @Autowired
- TbDepartmentService departmentService;
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐢ㄩ儴闂ㄥ垪琛ㄦ帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴閮ㄩ棬鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindDepartmentInfo")
- public DepartMentResult FindPersonInfo(@RequestBody DpeartMentTreeTableDto departmentTreeTableDto){
- return departmentService.FindDepartmentInfo(departmentTreeTableDto);
- }
-
- /*
- * 閮ㄩ棬涓嬫媺鍒楄〃
- * @param department 閮ㄩ棬淇℃伅
- * @return 杩斿洖閮ㄩ棬淇℃伅
- * @author YuZhiTong
- * @since 2025-05-19
- * */
- @SaCheckLogin
- @PostMapping("DepartmentAutocomplete")
- public List<AuToComplete> DepartmentAutocomplete(@RequestBody TbDepartment department){
- return departmentService.DepartmentAutocomplete(department);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鎸囧畾閮ㄩ棬鏌ヨ鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鎸囧畾閮ㄩ棬鏌ヨ鍔熻兘")
- @PostMapping("FindOneDepartMent")
- public TbDepartment FindOneDepartMent(@RequestBody TbPerson person){
- return departmentService.FindOneDepartMent(person);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "閮ㄩ棬鏂板鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴閮ㄩ棬鏂板鍔熻兘")
- @PostMapping("add")
- public ReturnMessage add(@RequestBody TbDepartment departMent){
- return departmentService.add(departMent);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "閮ㄩ棬淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴閮ㄩ棬淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody TbDepartment departMent){
- return departmentService.update(departMent);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "閮ㄩ棬鍒犻櫎鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴閮ㄩ棬鍒犻櫎鍔熻兘")
- @PostMapping("delete")
- public ReturnMessage delete(@RequestBody TbDepartment departMent){
- return departmentService.delete(departMent);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/DepartMent/TbDepartmentIconController.java b/src/main/java/com/hxzk/gps/controller/DepartMent/TbDepartmentIconController.java
deleted file mode 100644
index 4a5d273..0000000
--- a/src/main/java/com/hxzk/gps/controller/DepartMent/TbDepartmentIconController.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.hxzk.gps.controller.DepartMent;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.hxzk.gps.controller.DepartMent.Results.DepartMentIconResult;
-import com.hxzk.gps.controller.DepartMent.Results.DepartMentResult;
-import com.hxzk.gps.controller.DepartMent.dto.DpeartMentIconTreeTableDto;
-import com.hxzk.gps.controller.DepartMent.dto.DpeartMentTreeTableDto;
-import com.hxzk.gps.entity.Department.TbDepartMentIcon;
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.service.Department.TbDepartMentIconService;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 閮ㄩ棬鍥炬爣绠$悊
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-20
- */
-@RestController
-@RequestMapping("/DepartmentIcon")
-@Api(tags="閮ㄩ棬鍥炬爣绠$悊")
-public class TbDepartmentIconController {
- @Autowired
- private TbDepartMentIconService tbDepartMentIconService;
-
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐢ㄩ儴闂ㄥ浘鏍囧垪琛ㄦ帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴閮ㄩ棬鍥炬爣鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindDepartmentIconInfo")
- public DepartMentIconResult FindDepartmentIconInfo(@RequestBody DpeartMentIconTreeTableDto departmentIconTreeTableDto){
- return tbDepartMentIconService.FindDepartmentIconInfo(departmentIconTreeTableDto);
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "閮ㄩ棬鍥炬爣鏂板鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴閮ㄩ棬鍥炬爣鏂板鍔熻兘")
- @PostMapping("add")
- public ReturnMessage add(@RequestBody TbDepartMentIcon departMentIcon){
- return tbDepartMentIconService.add(departMentIcon);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "閮ㄩ棬鍥炬爣淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴閮ㄩ棬鍥炬爣淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody TbDepartMentIcon departMentIcon){
- return tbDepartMentIconService.update(departMentIcon);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "閮ㄩ棬鍥炬爣鍒犻櫎鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴閮ㄩ棬鍥炬爣鍒犻櫎鍔熻兘")
- @PostMapping("delete")
- public ReturnMessage delete(@RequestBody TbDepartMentIcon departMentIcon){
- return tbDepartMentIconService.delete(departMentIcon);
- }
-
- @SaCheckLogin
- @PostMapping("DepartmentIconAutocomplete")
- public List<AuToComplete> DepartmentIconAutocomplete(@RequestBody TbDepartMentIcon departMentIcon){
- return tbDepartMentIconService.DepartmentIconAutocomplete(departMentIcon);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/DepartMent/dto/DpeartMentIconTreeTableDto.java b/src/main/java/com/hxzk/gps/controller/DepartMent/dto/DpeartMentIconTreeTableDto.java
deleted file mode 100644
index 610ad91..0000000
--- a/src/main/java/com/hxzk/gps/controller/DepartMent/dto/DpeartMentIconTreeTableDto.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.DepartMent.dto;
-
-import lombok.Data;
-
-@Data
-public class DpeartMentIconTreeTableDto {
- private String departmentId;
- private Integer pageNum;
- private Integer pageSize;
- private String iconname;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/DepartMent/dto/DpeartMentTreeTableDto.java b/src/main/java/com/hxzk/gps/controller/DepartMent/dto/DpeartMentTreeTableDto.java
deleted file mode 100644
index c5be5ed..0000000
--- a/src/main/java/com/hxzk/gps/controller/DepartMent/dto/DpeartMentTreeTableDto.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.DepartMent.dto;
-
-import lombok.Data;
-
-@Data
-public class DpeartMentTreeTableDto {
- private String departmentId;
- private Integer pageNum;
- private Integer pageSize;
- private String departmentname;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Fence/TbFenceController.java b/src/main/java/com/hxzk/gps/controller/Fence/TbFenceController.java
deleted file mode 100644
index 4ff2a00..0000000
--- a/src/main/java/com/hxzk/gps/controller/Fence/TbFenceController.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.hxzk.gps.controller.Fence;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.controller.Fence.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Fence.TbFence;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Fence.TbFenceService;
-import com.hxzk.gps.service.Loragateway.TbLoragatewayService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@RestController
-@RequestMapping("/Fence")
-@Api(tags="鍥存爮绠$悊")
-public class TbFenceController {
- @Autowired
- private TbFenceService fenceService;
- @Autowired
- TbCompanyService companyService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鍥存爮鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍥存爮淇℃伅鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindFenceInfo")
- public ResultTable FindFenceInfo(@RequestBody TableSearchResult TableSearchResult){
- return fenceService.FindFenceInfo(TableSearchResult);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鍥存爮鏂板鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍥存爮鏂板鍔熻兘")
- @PostMapping("add")
- public ReturnMessage add(@RequestBody @Valid TbFence fence){
- return fenceService.add(fence);
- }
-
-
-
- @SaCheckLogin
- @ApiOperation(value = "鍥存爮鍒犻櫎鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍥存爮鍒犻櫎鍔熻兘")
- @PostMapping("delete")
- public ReturnMessage delete(@RequestBody TbFence fence){
- return fenceService.delete(fence);
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴灞曠ず鍥存爮鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴灞曠ず鍥存爮鍔熻兘")
- @PostMapping("FindScreenFence")
- public List<TbFence> FindScreenFence(){
- List<Long> companyname = companyService.getChildCompanyNames(UserInfoUtil.getUserCompany());
- QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.in("company", companyname);
- return fenceService.getBaseMapper().selectList(queryWrapper);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Fence/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/Fence/dto/TableList.java
deleted file mode 100644
index f9c0dbb..0000000
--- a/src/main/java/com/hxzk/gps/controller/Fence/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Fence.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Fence/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/Fence/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 7272e51..0000000
--- a/src/main/java/com/hxzk/gps/controller/Fence/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Fence.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Fence.dto.TableList;
-import com.hxzk.gps.entity.Fence.TbFence;
-import com.hxzk.gps.entity.FzRadar.TbFzanchor;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbFence fence;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Gather/TbPergatherController.java b/src/main/java/com/hxzk/gps/controller/Gather/TbPergatherController.java
deleted file mode 100644
index dc1b9e1..0000000
--- a/src/main/java/com/hxzk/gps/controller/Gather/TbPergatherController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.hxzk.gps.controller.Gather;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.hxzk.gps.controller.Gather.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Gather.TbPergather;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Gather.TbPergatherService;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@RestController
-@RequestMapping("/Gather")
-@Api("浜哄憳鑱氶泦")
-public class TbPergatherController {
- @Autowired
- private TbPergatherService pergatherService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鑱氶泦鍥存爮鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鑱氶泦鍥存爮淇℃伅鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindGatherInfo")
- public ResultTable FindGatherInfo(@RequestBody TableSearchResult TableSearchResult){
- return pergatherService.FindGatherInfo(TableSearchResult);
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鑱氶泦鍥存爮淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡鑱氶泦鍥存爮淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody TbPergather pergather){
- return pergatherService.update(pergather);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Gather/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/Gather/dto/TableList.java
deleted file mode 100644
index 52dcf4c..0000000
--- a/src/main/java/com/hxzk/gps/controller/Gather/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Gather.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Gather/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/Gather/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 6a7f2ea..0000000
--- a/src/main/java/com/hxzk/gps/controller/Gather/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Gather.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Gather.dto.TableList;
-import com.hxzk.gps.entity.Fence.TbFence;
-import com.hxzk.gps.entity.Gather.TbPergather;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbPergather gather;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Heart/TbHeartRecordController.java b/src/main/java/com/hxzk/gps/controller/Heart/TbHeartRecordController.java
deleted file mode 100644
index 184e6a8..0000000
--- a/src/main/java/com/hxzk/gps/controller/Heart/TbHeartRecordController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.hxzk.gps.controller.Heart;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.hxzk.gps.controller.Heart.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Heart.TbHeartRecordService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 蹇冪巼璁板綍
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@RestController
-@RequestMapping("/Heart")
-public class TbHeartRecordController {
- @Autowired
- private TbHeartRecordService heartRecordService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴蹇冪巼璁板綍鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴蹇冪巼璁板綍淇℃伅鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindHeartInfo")
- public ResultTable FindHeartInfo(@RequestBody TableSearchResult TableSearchResult){
- return heartRecordService.FindHeartInfo(TableSearchResult);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Heart/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/Heart/dto/TableList.java
deleted file mode 100644
index 7829305..0000000
--- a/src/main/java/com/hxzk/gps/controller/Heart/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Heart.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Heart/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/Heart/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 62f5de9..0000000
--- a/src/main/java/com/hxzk/gps/controller/Heart/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Heart.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Heart.dto.TableList;
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.hxzk.gps.entity.Heart.TbHeartRecord;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbHeartRecord heartRecord;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/HistoryPower/TbAcHistoryPowerController.java b/src/main/java/com/hxzk/gps/controller/HistoryPower/TbAcHistoryPowerController.java
deleted file mode 100644
index 4f4bd63..0000000
--- a/src/main/java/com/hxzk/gps/controller/HistoryPower/TbAcHistoryPowerController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.hxzk.gps.controller.HistoryPower;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.hxzk.gps.controller.HistoryPower.dto.TableSearchResult.TableAcPowerSearchResult;
-import com.hxzk.gps.result.ResultTable;
-
-import com.hxzk.gps.service.HistoryPower.TbAcHistoryPowerService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 鍩虹珯鍘嗗彶鐢甸噺
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@RestController
-@RequestMapping("/AcHistoryPower")
-public class TbAcHistoryPowerController {
- @Autowired
- private TbAcHistoryPowerService acHistoryPowerService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鍩虹珯鐢甸噺鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍩虹珯鐢甸噺鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindAcHistoryPowerInfo")
- public ResultTable FindAcHistoryPowerInfo(@RequestBody TableAcPowerSearchResult acPowerSearchResult){
- return acHistoryPowerService.FindAcHistoryPowerInfo(acPowerSearchResult);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/HistoryPower/TbHistoryPowerController.java b/src/main/java/com/hxzk/gps/controller/HistoryPower/TbHistoryPowerController.java
deleted file mode 100644
index c707e41..0000000
--- a/src/main/java/com/hxzk/gps/controller/HistoryPower/TbHistoryPowerController.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.hxzk.gps.controller.HistoryPower;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.hxzk.gps.controller.HistoryPower.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Anchor.TbAchorService;
-import com.hxzk.gps.service.HistoryPower.TbAcHistoryPowerService;
-import com.hxzk.gps.service.HistoryPower.TbHistoryPowerService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 璁惧鍘嗗彶鐢甸噺
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@RestController
-@RequestMapping("/TagHistoryPower")
-public class TbHistoryPowerController {
- @Autowired
- private TbHistoryPowerService historyPowerService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鍩虹珯鐢甸噺鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍩虹珯鐢甸噺鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindTagHistoryPowerInfo")
- public ResultTable FindTagHistoryPowerInfo(@RequestBody TableSearchResult TableSearchResult){
- return historyPowerService.FindTagHistoryPowerInfo(TableSearchResult);
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/HistoryPower/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/HistoryPower/dto/TableList.java
deleted file mode 100644
index 3252ecd..0000000
--- a/src/main/java/com/hxzk/gps/controller/HistoryPower/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.HistoryPower.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/HistoryPower/dto/TableSearchResult/TableAcPowerSearchResult.java b/src/main/java/com/hxzk/gps/controller/HistoryPower/dto/TableSearchResult/TableAcPowerSearchResult.java
deleted file mode 100644
index c8386e6..0000000
--- a/src/main/java/com/hxzk/gps/controller/HistoryPower/dto/TableSearchResult/TableAcPowerSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.HistoryPower.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.HistoryPower.dto.TableList;
-import com.hxzk.gps.entity.HistoryPower.TbAcHistoryPower;
-import com.hxzk.gps.entity.HistoryPower.TbHistoryPower;
-import lombok.Data;
-
-@Data
-public class TableAcPowerSearchResult<T> {
- private TableList tableList;
- private TbAcHistoryPower acHistoryPower;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/HistoryPower/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/HistoryPower/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index cd21387..0000000
--- a/src/main/java/com/hxzk/gps/controller/HistoryPower/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.HistoryPower.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.HistoryPower.dto.TableList;
-import com.hxzk.gps.entity.HistoryPower.TbHistoryPower;
-import com.hxzk.gps.entity.Message.TbSendMessageHistory;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbHistoryPower historyPower;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Inspection/TbNewtaskController.java b/src/main/java/com/hxzk/gps/controller/Inspection/TbNewtaskController.java
deleted file mode 100644
index c18fb33..0000000
--- a/src/main/java/com/hxzk/gps/controller/Inspection/TbNewtaskController.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.hxzk.gps.controller.Inspection;
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.hxzk.gps.controller.Inspection.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Inspection.TbNewtaskService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@RestController
-@RequestMapping("/NewTask")
-public class TbNewtaskController {
- @Autowired
- TbNewtaskService newtaskService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴宸℃浠诲姟鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴宸℃浠诲姟鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindNewTaskInfo")
- public ResultTable FindNewTaskInfo(@RequestBody TableSearchResult TableSearchResult){
- return newtaskService.FindNewTaskInfo(TableSearchResult);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Inspection/TbXunjianbaobiaoController.java b/src/main/java/com/hxzk/gps/controller/Inspection/TbXunjianbaobiaoController.java
deleted file mode 100644
index 74bb293..0000000
--- a/src/main/java/com/hxzk/gps/controller/Inspection/TbXunjianbaobiaoController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.hxzk.gps.controller.Inspection;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.hxzk.gps.controller.Inspection.dto.TableSearchResult.TableBaoBiaoSearchResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Inspection.TbXunjianbaobiaoService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@RestController
-@RequestMapping("/Inspection")
-public class TbXunjianbaobiaoController {
- @Autowired
- TbXunjianbaobiaoService xunjianbaobiaoService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴宸℃鎶ヨ〃鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴宸℃宸℃鎶ヨ〃鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindInspectionInfo")
- public ResultTable FindInspectionInfo(@RequestBody TableBaoBiaoSearchResult TableSearchResult){
- return xunjianbaobiaoService.FindInspectionInfo(TableSearchResult);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Inspection/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/Inspection/dto/TableList.java
deleted file mode 100644
index 650d23d..0000000
--- a/src/main/java/com/hxzk/gps/controller/Inspection/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Inspection.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Inspection/dto/TableSearchResult/TableBaoBiaoSearchResult.java b/src/main/java/com/hxzk/gps/controller/Inspection/dto/TableSearchResult/TableBaoBiaoSearchResult.java
deleted file mode 100644
index 207750b..0000000
--- a/src/main/java/com/hxzk/gps/controller/Inspection/dto/TableSearchResult/TableBaoBiaoSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Inspection.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Inspection.dto.TableList;
-import com.hxzk.gps.entity.Inspection.TbNewtask;
-import com.hxzk.gps.entity.Inspection.TbXunjianbaobiao;
-import lombok.Data;
-
-@Data
-public class TableBaoBiaoSearchResult<T> {
- private TableList tableList;
- private TbXunjianbaobiao xunjianbaobiao;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Inspection/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/Inspection/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 938dce6..0000000
--- a/src/main/java/com/hxzk/gps/controller/Inspection/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Inspection.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Inspection.dto.TableList;
-import com.hxzk.gps.entity.Anchor.TbAchor;
-import com.hxzk.gps.entity.Inspection.TbNewtask;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbNewtask newtask;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Languages/LanguageController.java b/src/main/java/com/hxzk/gps/controller/Languages/LanguageController.java
deleted file mode 100644
index 9e8a5d4..0000000
--- a/src/main/java/com/hxzk/gps/controller/Languages/LanguageController.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.hxzk.gps.controller.Languages;
-
-import cn.dev33.satoken.stp.StpUtil;
-import lombok.Data;
-import lombok.Getter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.LocaleResolver;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Locale;
-
-
-
-
-
-@RestController
-public class LanguageController {
- @Autowired
- private LocaleResolver localeResolver;
-
- @GetMapping("/getCurrentLanguage")
- public String getCurrentLanguage(HttpServletRequest request) {
- String sessionId = request.getSession().getId();
-
- // 棣栧厛灏濊瘯浠嶴a-Token浼氳瘽涓幏鍙栬瑷�璁剧疆锛堜紭鍏堢骇鏈�楂橈級
- try {
- String saTokenLanguage = (String) StpUtil.getSession().get("user_language");
- if (saTokenLanguage != null) {
-
-
- if (saTokenLanguage.equals("zh")) {
- return "褰撳墠璇█鏄腑鏂�";
- } else if (saTokenLanguage.equals("en")) {
- return "褰撳墠璇█鏄嫳鏂�";
- }
- }
- } catch (Exception e) {
- System.out.println("鑾峰彇Sa-Token浼氳瘽璇█澶辫触: " + e.getMessage());
- }
-
- // 鍏舵灏濊瘯浠嶩ttpSession涓幏鍙栬瑷�璁剧疆
- String sessionLanguage = (String) request.getSession().getAttribute("session_language");
- if (sessionLanguage != null) {
-
- if (sessionLanguage.equals("zh")) {
- return "褰撳墠璇█鏄腑鏂�";
- } else if (sessionLanguage.equals("en")) {
- return "褰撳墠璇█鏄嫳鏂�";
- }
- }
-
- // 濡傛灉閮芥病鏈夎瑷�璁剧疆锛屽垯浣跨敤locale resolver
- Locale currentLocale = localeResolver.resolveLocale(request);
-
-
- if (currentLocale.getLanguage().equals("zh")) {
- return "褰撳墠璇█鏄腑鏂�";
- } else if (currentLocale.getLanguage().equals("en")) {
- return "褰撳墠璇█鏄嫳鏂�";
- }
- return "褰撳墠璇█鏈煡";
- }
-
- @PostMapping("/setLanguage")
- public String setLanguage(@RequestBody Languages lang, HttpServletRequest request, HttpServletResponse response) {
- String language = lang.getLang();
- Locale locale = "zh".equals(language) ? Locale.SIMPLIFIED_CHINESE : Locale.US;
-
- // 璁剧疆浼氳瘽涓殑璇█灞炴��
- request.getSession().setAttribute("session_language", language);
- // 閲嶈锛氬悓鏃朵娇鐢⊿a-Token鐨勪細璇濆瓨鍌ㄦ満鍒讹紝纭繚涓嶴a-Token浼氳瘽绠$悊涓�鑷�
- StpUtil.getSession().set("user_language", language);
-
- // 閲嶈锛氱‘淇漧ocale resolver姝g‘璁剧疆璇█
- localeResolver.setLocale(request, response, locale);
- // 楠岃瘉璁剧疆鏄惁鐢熸晥
- Locale resolvedLocale = localeResolver.resolveLocale(request);
- return "璇█宸茶缃负: " + language;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/controller/Languages/Languages.java b/src/main/java/com/hxzk/gps/controller/Languages/Languages.java
deleted file mode 100644
index fe114d8..0000000
--- a/src/main/java/com/hxzk/gps/controller/Languages/Languages.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.hxzk.gps.controller.Languages;
-
-import lombok.Data;
-import lombok.Getter;
-
-@Data
-public class Languages {
- private String lang;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Log/TbFzlogController.java b/src/main/java/com/hxzk/gps/controller/Log/TbFzlogController.java
deleted file mode 100644
index 7563bb0..0000000
--- a/src/main/java/com/hxzk/gps/controller/Log/TbFzlogController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.hxzk.gps.controller.Log;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.hxzk.gps.controller.Log.dto.TableSearchResult.TableFzLogSearchResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Log.TbFzlogService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 闃叉挒鏃ュ織
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@RestController
-@RequestMapping("/FzLog")
-public class TbFzlogController {
- @Autowired
- TbFzlogService fzlogService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴闃叉挒鏃ュ織鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴闃叉挒鏃ュ織鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindFzLogInfo")
- public ResultTable FindFzLogInfo(@RequestBody TableFzLogSearchResult TableSearchResult){
- return fzlogService.FindFzLogInfo(TableSearchResult);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Log/TbLixianrecord0829Controller.java b/src/main/java/com/hxzk/gps/controller/Log/TbLixianrecord0829Controller.java
deleted file mode 100644
index 676afc0..0000000
--- a/src/main/java/com/hxzk/gps/controller/Log/TbLixianrecord0829Controller.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.hxzk.gps.controller.Log;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.hxzk.gps.controller.Log.dto.TableSearchResult.TableliXianSearchResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Log.TbFzlogService;
-import com.hxzk.gps.service.Log.TbLixianrecord0829Service;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 绂荤嚎鏃ュ織
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@RestController
-@RequestMapping("/LixianLog")
-public class TbLixianrecord0829Controller {
- @Autowired
- TbLixianrecord0829Service lixianrecord0829Service;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴闃叉挒鏃ュ織鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴闃叉挒鏃ュ織鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindLixianLogInfo")
- public ResultTable FindLixianLogInfo(@RequestBody TableliXianSearchResult TableSearchResult){
- return lixianrecord0829Service.FindLixianLogInfo(TableSearchResult);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Log/TbLoginLogController.java b/src/main/java/com/hxzk/gps/controller/Log/TbLoginLogController.java
deleted file mode 100644
index ea3a2d7..0000000
--- a/src/main/java/com/hxzk/gps/controller/Log/TbLoginLogController.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.hxzk.gps.controller.Log;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.hxzk.gps.controller.Log.dto.TableSearchResult.TableFzLogSearchResult;
-import com.hxzk.gps.controller.Log.dto.TableSearchResult.TableLoginLogSearchResult;
-import com.hxzk.gps.controller.Tag.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Log.TbLoginLogService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-06-09
- */
-@RestController
-@RequestMapping("/LoginLog")
-public class TbLoginLogController {
- @Autowired
- TbLoginLogService loginLogService;
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐧诲綍鏃ュ織鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐧诲綍鏃ュ織鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindLoginLogInfo")
- public ResultTable FindLoginLogInfo(@RequestBody TableLoginLogSearchResult tableLoginLogSearchResult){
- return loginLogService.FindLoginLogInfo(tableLoginLogSearchResult);
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Log/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/Log/dto/TableList.java
deleted file mode 100644
index 6f68dad..0000000
--- a/src/main/java/com/hxzk/gps/controller/Log/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Log.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Log/dto/TableSearchResult/TableFzLogSearchResult.java b/src/main/java/com/hxzk/gps/controller/Log/dto/TableSearchResult/TableFzLogSearchResult.java
deleted file mode 100644
index 3ba69a2..0000000
--- a/src/main/java/com/hxzk/gps/controller/Log/dto/TableSearchResult/TableFzLogSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Log.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Log.dto.TableList;
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.hxzk.gps.entity.Log.TbFzlog;
-import lombok.Data;
-
-@Data
-public class TableFzLogSearchResult<T> {
- private TableList tableList;
- private TbFzlog fzlog;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Log/dto/TableSearchResult/TableLoginLogSearchResult.java b/src/main/java/com/hxzk/gps/controller/Log/dto/TableSearchResult/TableLoginLogSearchResult.java
deleted file mode 100644
index 05ba84e..0000000
--- a/src/main/java/com/hxzk/gps/controller/Log/dto/TableSearchResult/TableLoginLogSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Log.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Log.dto.TableList;
-import com.hxzk.gps.entity.Log.TbLixianrecord0829;
-import com.hxzk.gps.entity.Log.TbLoginLog;
-import lombok.Data;
-
-@Data
-public class TableLoginLogSearchResult<T> {
- private TableList tableList;
- private TbLoginLog loginLog;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Log/dto/TableSearchResult/TableliXianSearchResult.java b/src/main/java/com/hxzk/gps/controller/Log/dto/TableSearchResult/TableliXianSearchResult.java
deleted file mode 100644
index 4df570d..0000000
--- a/src/main/java/com/hxzk/gps/controller/Log/dto/TableSearchResult/TableliXianSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Log.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Log.dto.TableList;
-import com.hxzk.gps.entity.Log.TbFzlog;
-import com.hxzk.gps.entity.Log.TbLixianrecord0829;
-import lombok.Data;
-
-@Data
-public class TableliXianSearchResult<T> {
- private TableList tableList;
- private TbLixianrecord0829 lixianrecord0829;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Loragateway/TbLoragatewayController.java b/src/main/java/com/hxzk/gps/controller/Loragateway/TbLoragatewayController.java
deleted file mode 100644
index c5def7c..0000000
--- a/src/main/java/com/hxzk/gps/controller/Loragateway/TbLoragatewayController.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.hxzk.gps.controller.Loragateway;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.hxzk.gps.controller.Loragateway.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Anchor.TbAchorService;
-import com.hxzk.gps.service.Loragateway.TbLoragatewayService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@RestController
-@RequestMapping("/Loragateway")
-@Api(tags="缃戝叧绠$悊")
-public class TbLoragatewayController {
- @Autowired
- private TbLoragatewayService loragatewayService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴缃戝叧鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴缃戝叧淇℃伅鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindLoragatewayInfo")
- public ResultTable FindLoragatewayInfo(@RequestBody TableSearchResult TableSearchResult){
- return loragatewayService.FindLoragatewayInfo(TableSearchResult);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Loragateway/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/Loragateway/dto/TableList.java
deleted file mode 100644
index d673b6a..0000000
--- a/src/main/java/com/hxzk/gps/controller/Loragateway/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Loragateway.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Loragateway/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/Loragateway/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 52d11ef..0000000
--- a/src/main/java/com/hxzk/gps/controller/Loragateway/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hxzk.gps.controller.Loragateway.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Loragateway.dto.TableList;
-import com.hxzk.gps.entity.Loragateway.TbLoragateway;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbLoragateway loragateway;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Mac/TbMacController.java b/src/main/java/com/hxzk/gps/controller/Mac/TbMacController.java
deleted file mode 100644
index 1a0ac11..0000000
--- a/src/main/java/com/hxzk/gps/controller/Mac/TbMacController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.hxzk.gps.controller.Mac;
-
-import com.hxzk.gps.entity.Mac.TbMac;
-import com.hxzk.gps.service.Mac.TbMacService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-01
- */
-@RestController
-@RequestMapping("/Mac")
-public class TbMacController {
- @Autowired
- TbMacService macService;
- @PostMapping("FindMac")
- public TbMac FindMac(){
- return macService.getOne(null);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Map/Results/MapResult.java b/src/main/java/com/hxzk/gps/controller/Map/Results/MapResult.java
deleted file mode 100644
index f099975..0000000
--- a/src/main/java/com/hxzk/gps/controller/Map/Results/MapResult.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.hxzk.gps.controller.Map.Results;
-
-import com.hxzk.gps.util.Result.TableDto;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class MapResult {
- private Integer code;
- private String msg;
- private TableDto data;
- private Integer pageNum;
- private Integer pageSize;
- private Long total;
-
- public MapResult() {
-
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Map/Results/MarsResult.java b/src/main/java/com/hxzk/gps/controller/Map/Results/MarsResult.java
deleted file mode 100644
index ca40fca..0000000
--- a/src/main/java/com/hxzk/gps/controller/Map/Results/MarsResult.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.hxzk.gps.controller.Map.Results;
-
-import com.hxzk.gps.util.Result.TableDto;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class MarsResult {
- private Integer code;
- private String msg;
- private TableDto data;
- private Integer pageNum;
- private Integer pageSize;
- private Long total;
-
- public MarsResult() {
-
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Map/TbMapController.java b/src/main/java/com/hxzk/gps/controller/Map/TbMapController.java
deleted file mode 100644
index 978b377..0000000
--- a/src/main/java/com/hxzk/gps/controller/Map/TbMapController.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.hxzk.gps.controller.Map;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.controller.Map.Results.MapResult;
-import com.hxzk.gps.controller.Map.Results.MarsResult;
-import com.hxzk.gps.controller.Map.dto.MapTreeTableDto;
-import com.hxzk.gps.controller.Map.dto.MarsTreeTableDto;
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.hxzk.gps.entity.Map.TbMap;
-import com.hxzk.gps.service.Map.TbMapService;
-import com.hxzk.gps.service.Map.TbMarsHomesetService;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@RestController
-@RequestMapping("/TwoMap")
-@Api("浜岀淮鍦板浘")
-public class TbMapController {
- @Autowired
- TbMapService mapService;
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴浜岀淮鍦板浘閰嶇疆鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴浜岀淮鍦板浘閰嶇疆鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindMapInfo")
- public MapResult FindMapInfo(@RequestBody MapTreeTableDto mapTreeTableDto){
- return mapService.FindMapInfo(mapTreeTableDto);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐧诲綍鐢ㄦ埛鎵�灞炲叕鍙稿钩闈㈠湴鍥炬帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐧诲綍鐢ㄦ埛鎵�灞炲叕鍙稿钩闈㈠湴鍥句俊鎭姛鑳�")
- @PostMapping("FindUserCompanyMap")
- public List<AuToComplete> FindUserCompanyMap(){
- return mapService.FindUserCompanyMap();
- }
- @SaCheckLogin
- @PostMapping("FindUserCompanyMapSelect")
- public Map<String, String> FindUserCompanyMapSelect(){
- return mapService.FindUserCompanyMapSelect();
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鏍规嵁鎸囧畾灞傝幏鍙栧钩鍙板湴鍥炬帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡鏍规嵁鎸囧畾灞傝幏鍙栧钩鍙板湴鍥句俊鎭姛鑳�")
- @PostMapping("FindFloorMap")
- public TbMap FindFloorMap(@RequestBody TbMap map){
- QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("floor",map.getFloor());
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- return mapService.getBaseMapper().selectOne(queryWrapper);
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Map/TbMarsHomesetController.java b/src/main/java/com/hxzk/gps/controller/Map/TbMarsHomesetController.java
deleted file mode 100644
index 4f37be3..0000000
--- a/src/main/java/com/hxzk/gps/controller/Map/TbMarsHomesetController.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.hxzk.gps.controller.Map;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.controller.DepartMent.Results.DepartMentIconResult;
-import com.hxzk.gps.controller.DepartMent.dto.DpeartMentIconTreeTableDto;
-import com.hxzk.gps.controller.Map.Results.MarsResult;
-import com.hxzk.gps.controller.Map.dto.MarsTreeTableDto;
-import com.hxzk.gps.entity.Company.TbCompany;
-import com.hxzk.gps.entity.Map.TbMarsHomeset;
-import com.hxzk.gps.entity.User.TbUser;
-import com.hxzk.gps.service.Map.TbMarsHomesetService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 鍦板浘涓績
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@RestController
-@RequestMapping("/ThreeMap")
-@Api("涓夌淮搴曞浘")
-public class TbMarsHomesetController {
- @Autowired
- TbMarsHomesetService tbMarsHomesetService;
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐢ㄤ笁缁村湴鍥鹃厤缃垪琛ㄦ帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴涓夌淮鍦板浘閰嶇疆鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindMarsInfo")
- public MarsResult FindMarsInfo(@RequestBody MarsTreeTableDto marsTreeTableDto){
- return tbMarsHomesetService.FindMarsInfo(marsTreeTableDto);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鑾峰彇涓夌淮鍦板浘閰嶇疆鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鑾峰彇涓夌淮鍦板浘閰嶇疆鏌ヨ鍔熻兘")
- @PostMapping("FindMarsConfig")
- public TbMarsHomeset FindMarsConfig(){
- QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- return tbMarsHomesetService.getOne(queryWrapper);
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴涓夌淮鍦板浘閰嶇疆淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴涓夌淮鍦板浘閰嶇疆淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody TbMarsHomeset marsHomeset){
- return tbMarsHomesetService.update(marsHomeset);
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Map/dto/MapTreeTableDto.java b/src/main/java/com/hxzk/gps/controller/Map/dto/MapTreeTableDto.java
deleted file mode 100644
index 418b728..0000000
--- a/src/main/java/com/hxzk/gps/controller/Map/dto/MapTreeTableDto.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.hxzk.gps.controller.Map.dto;
-
-import lombok.Data;
-
-@Data
-public class MapTreeTableDto {
- private String departmentId;
- private Integer pageNum;
- private Integer pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Map/dto/MarsTreeTableDto.java b/src/main/java/com/hxzk/gps/controller/Map/dto/MarsTreeTableDto.java
deleted file mode 100644
index 2f2a931..0000000
--- a/src/main/java/com/hxzk/gps/controller/Map/dto/MarsTreeTableDto.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.hxzk.gps.controller.Map.dto;
-
-import lombok.Data;
-
-@Data
-public class MarsTreeTableDto {
- private String departmentId;
- private Integer pageNum;
- private Integer pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Menu/MenuController.java b/src/main/java/com/hxzk/gps/controller/Menu/MenuController.java
deleted file mode 100644
index 0772804..0000000
--- a/src/main/java/com/hxzk/gps/controller/Menu/MenuController.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.hxzk.gps.controller.Menu;
-
-import com.hxzk.gps.entity.Menu.Menu;
-import com.hxzk.gps.service.Menu.MenuService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-23
- */
-@RestController
-@RequestMapping("/Menu")
-public class MenuController {
- @Autowired
- MenuService menuService;
-
- /**
- * 鑾峰彇鑿滃崟淇℃伅
- * @return
- */
- @PostMapping("FindMenuInfo")
- public List<Menu>FindMenuInfo(){
- return menuService.list();
- }
-
- /*
- * */
- @PostMapping("AddMenu")
- public void AddMenu(@RequestBody Menu menu){
- menuService.save(menu);
- }
-
- @PostMapping("UpdateMenu")
- public void UpdateMenu(@RequestBody Menu menu){
- if (menu.getParentId() == 0){
- menu.setParentId(null);
- menu.setParent_id(null);
- }else{
- menu.setParent_id(menu.getParentId());
- }
- menuService.updateById(menu);
- }
- @PostMapping("DeleteMenu")
- public void DeleteMenu(@RequestBody Menu menu){
- menuService.removeById(menu);
- }
-
-
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Message/TbSendMessageHistoryController.java b/src/main/java/com/hxzk/gps/controller/Message/TbSendMessageHistoryController.java
deleted file mode 100644
index a2027c4..0000000
--- a/src/main/java/com/hxzk/gps/controller/Message/TbSendMessageHistoryController.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.hxzk.gps.controller.Message;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.hxzk.gps.controller.Message.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Message.TbSendMessageHistory;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Attendance.TbKaoqingService;
-import com.hxzk.gps.service.Message.TbSendMessageHistoryService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.Time.TimeUtil;
-import com.hxzk.gps.util.UDP.Udp_Out;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 淇℃伅璁板綍
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@RestController
-@RequestMapping("/MessageHistory")
-public class TbSendMessageHistoryController {
- @Autowired
- private TbSendMessageHistoryService messageHistoryService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴淇℃伅璁板綍鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴淇℃伅璁板綍鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindMessageInfo")
- public ResultTable FindMessageInfo(@RequestBody TableSearchResult TableSearchResult){
- return messageHistoryService.FindMessageInfo(TableSearchResult);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴涓嬪彂璇煶鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴涓嬪彂璇煶鍔熻兘")
- @PostMapping("sendMessage")
- public Integer sendMessage(@RequestBody TableSearchResult TableSearchResult){
- try {
- if (TableSearchResult.getSendMessageHistory().getTagid().equals("") || TableSearchResult.getSendMessageHistory().getTagid().equals("鎵�鏈変汉")){
- TableSearchResult.getSendMessageHistory().setTagid("ALL");
- }
- String xieyi = "BSTOCS1,TOMESSAGE," + TableSearchResult.getSendMessageHistory().getTagid() + "," + TableSearchResult.getSendMessageHistory().getNeirong() + "," + UserInfoUtil.getUserCompany() + ",END";
- Udp_Out.udp_to_cs(xieyi);
- TbSendMessageHistory messageHistory = TableSearchResult.getSendMessageHistory();
- if (TableSearchResult.getSendMessageHistory().getRadio() == 1){
- messageHistory.setNeirong("铚傞福");
- }
- if (TableSearchResult.getSendMessageHistory().getRadio() == 2){
- messageHistory.setNeirong("闇囧姩");
- }
- if (TableSearchResult.getSendMessageHistory().getRadio() == 3){
- messageHistory.setNeirong(TableSearchResult.getSendMessageHistory().getNeirong());
- }
-
- messageHistory.setUser(UserInfoUtil.getUserName());
- messageHistory.setCompany(UserInfoUtil.getUserCompany());
- messageHistory.setTime(TimeUtil.GetTime());
-
- messageHistoryService.save(messageHistory);
- return 1;
- }catch (Exception e){
- return 0;
- }
-
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Message/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/Message/dto/TableList.java
deleted file mode 100644
index 97487f5..0000000
--- a/src/main/java/com/hxzk/gps/controller/Message/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Message.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Message/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/Message/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 8e6e593..0000000
--- a/src/main/java/com/hxzk/gps/controller/Message/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Message.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Message.dto.TableList;
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.hxzk.gps.entity.Message.TbSendMessageHistory;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbSendMessageHistory sendMessageHistory;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Person/Results/PersonResult.java b/src/main/java/com/hxzk/gps/controller/Person/Results/PersonResult.java
deleted file mode 100644
index 4dcadfe..0000000
--- a/src/main/java/com/hxzk/gps/controller/Person/Results/PersonResult.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.hxzk.gps.controller.Person.Results;
-
-import com.hxzk.gps.util.Result.TableDto;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class PersonResult {
- private Integer code;
- private String msg;
- private TableDto data;
-
-
- public PersonResult() {
-
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Person/TbPersonController.java b/src/main/java/com/hxzk/gps/controller/Person/TbPersonController.java
deleted file mode 100644
index 93e8159..0000000
--- a/src/main/java/com/hxzk/gps/controller/Person/TbPersonController.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.hxzk.gps.controller.Person;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.controller.Person.Results.PersonResult;
-import com.hxzk.gps.controller.Person.dto.PersonTreeTableDto;
-import com.hxzk.gps.controller.Role.Results.AddRoleDto;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.result.ResultList;
-import com.hxzk.gps.service.Person.TbPersonService;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 浜哄憳绠$悊
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-16
- */
-@RestController
-@RequestMapping("/Person")
-@Api(tags="缁堢绠$悊")
-public class TbPersonController {
- @Autowired
- TbPersonService personService;
-
-
- @ApiOperation(value = "骞冲彴浜哄憳鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴缁堢鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindPersonInfo")
- public PersonResult FindPersonInfo(@RequestBody PersonTreeTableDto personTreeTableDto){
- return personService.FindPersonInfo(personTreeTableDto);
- }
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴杞﹁締鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴杞﹁締鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindCarInfo")
- public PersonResult FindCarInfo(@RequestBody PersonTreeTableDto personTreeTableDto){
- return personService.FindCarInfo(personTreeTableDto);
- }
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐗╄祫鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐗╄祫鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindMaterialsInfo")
- public PersonResult FindMaterialsInfo(@RequestBody PersonTreeTableDto personTreeTableDto){
- return personService.FindMaterialsInfo(personTreeTableDto);
- }
- @SaCheckLogin
- @PostMapping("PersonPosition")
- public ResultList PersonPosition(){
- return personService.PersonPosition();
- }
-
-
- @ApiOperation(value = "骞冲彴瀹炴椂浜哄憳浣嶇疆鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴瀹炴椂浜哄憳浣嶇疆鍔熻兘")
- @PostMapping("RealPosition")
- public ResultList RealPosition(){
- return personService.RealPosition();
- }
-
- @ApiOperation(value = "骞冲彴骞抽潰浜岀淮瀹炴椂浜哄憳浣嶇疆鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴瀹炴椂浜哄憳浣嶇疆鍔熻兘")
- @PostMapping("RealPosition2D")
- public ResultList RealPosition2D(){
- return personService.RealPosition2D();
- }
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鏍规嵁濮撳悕鎴栬�呯紪鍙疯幏鍙栦俊鎭帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鏍规嵁濮撳悕鎴栬�呯紪鍙疯幏鍙栦俊鎭姛鑳�")
- @PostMapping("FindOnePersonInfo")
- public TbPerson FindOnePersonInfo(@RequestBody TbPerson person){
- QueryWrapper<TbPerson> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("p_tagid", person.getPTagid()).or().eq("p_name", person.getPTagid());
- return personService.getBaseMapper().selectOne(queryWrapper);
- }
-
- /*
- * 浜哄憳鍚嶇О鑷姩琛ュ叏
- * */
- @SaCheckLogin
- @PostMapping("PersonNameAutocomplete")
- public List<AuToComplete> PersonNameAutocomplete(){
- QueryWrapper<TbPerson> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- List<TbPerson> PersonList = personService.getBaseMapper().selectList(queryWrapper);
- List<AuToComplete> addCustomerList = PersonList.stream()
- .map(person -> {
- AuToComplete addCustomer = new AuToComplete();
- addCustomer.setValue(person.getPName());
- addCustomer.setLink(person.getPTagid());
- return addCustomer;
- })
- .collect(Collectors.toList());
-
- return addCustomerList;
- }
-
- @SaCheckLogin
- @ApiOperation(value = "缁堢鏂板鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴缁堢鏂板鍔熻兘")
- @PostMapping("add")
- public ReturnMessage add(@RequestBody TbPerson person){
- return personService.add(person);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "缁堢淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴缁堢淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody TbPerson person){
- return personService.update(person);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "缁堢鍒犻櫎鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴缁堢鍒犻櫎鍔熻兘")
- @PostMapping("delete")
- public ReturnMessage delete(@RequestBody TbPerson person){
- return personService.delete(person);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Person/dto/PersonTreeTableDto.java b/src/main/java/com/hxzk/gps/controller/Person/dto/PersonTreeTableDto.java
deleted file mode 100644
index bac592c..0000000
--- a/src/main/java/com/hxzk/gps/controller/Person/dto/PersonTreeTableDto.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.hxzk.gps.controller.Person.dto;
-
-import lombok.Data;
-
-@Data
-public class PersonTreeTableDto {
- private String departmentId;
- private Integer pageNum;
- private Integer pageSize;
- private String pName;
- private String pTagid;
- private String ponline;
- private String pdepartment;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Radar/TbFzanchorController.java b/src/main/java/com/hxzk/gps/controller/Radar/TbFzanchorController.java
deleted file mode 100644
index 2c22ef5..0000000
--- a/src/main/java/com/hxzk/gps/controller/Radar/TbFzanchorController.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.hxzk.gps.controller.Radar;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.hxzk.gps.controller.Radar.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.FzRadar.TbFzanchor;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.FzRadar.TbFzanchorService;
-import com.hxzk.gps.service.Loragateway.TbLoragatewayService;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@RestController
-@Api(tags="闃叉挒闆疯揪绠$悊")
-@RequestMapping("/Radar")
-public class TbFzanchorController {
- @Autowired
- private TbFzanchorService fzanchorService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴闃叉挒闆疯揪鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴闃叉挒闆疯揪淇℃伅鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindRadarInfo")
- public ResultTable FindRadarInfo(@RequestBody TableSearchResult TableSearchResult){
- return fzanchorService.FindRadarInfo(TableSearchResult);
- }
-
-
-
-
- @SaCheckLogin
- @ApiOperation(value = "闃叉挒闆疯揪鏂板鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴闃叉挒闆疯揪鏂板鍔熻兘")
- @PostMapping("add")
- public ReturnMessage add(@RequestBody TbFzanchor fzanchor){
- return fzanchorService.add(fzanchor);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "闃叉挒闆疯揪淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴闃叉挒闆疯揪淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody TbFzanchor fzanchor){
- return fzanchorService.update(fzanchor);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "闃叉挒闆疯揪鍒犻櫎鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴闃叉挒闆疯揪鍒犻櫎鍔熻兘")
- @PostMapping("delete")
- public ReturnMessage delete(@RequestBody TbFzanchor fzanchor){
- return fzanchorService.delete(fzanchor);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Radar/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/Radar/dto/TableList.java
deleted file mode 100644
index 244462d..0000000
--- a/src/main/java/com/hxzk/gps/controller/Radar/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Radar.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Radar/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/Radar/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 76a4d7a..0000000
--- a/src/main/java/com/hxzk/gps/controller/Radar/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Radar.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Radar.dto.TableList;
-import com.hxzk.gps.entity.FzRadar.TbFzanchor;
-import com.hxzk.gps.entity.Loragateway.TbLoragateway;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbFzanchor fzanchor;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Role/Results/AddRoleDto.java b/src/main/java/com/hxzk/gps/controller/Role/Results/AddRoleDto.java
deleted file mode 100644
index 9a0435c..0000000
--- a/src/main/java/com/hxzk/gps/controller/Role/Results/AddRoleDto.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hxzk.gps.controller.Role.Results;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class AddRoleDto {
- private Integer id;
- private String name; //瑙掕壊鍚嶇О
- private boolean addrole; //鏂板瑙掕壊鏉冮檺
- private boolean editrole; //缂栬緫瑙掕壊鏉冮檺
- private boolean deleterole; //鍒犻櫎瑙掕壊鏉冮檺
- private String companyid; //鍏徃ID
- private String companyname;
- private List<RoleList> rolist;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Role/Results/RoleCompanyList.java b/src/main/java/com/hxzk/gps/controller/Role/Results/RoleCompanyList.java
deleted file mode 100644
index a244540..0000000
--- a/src/main/java/com/hxzk/gps/controller/Role/Results/RoleCompanyList.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.hxzk.gps.controller.Role.Results;
-
-import lombok.Data;
-
-@Data
-public class RoleCompanyList {
- private String label;
- private String value;
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/controller/Role/Results/RoleList.java b/src/main/java/com/hxzk/gps/controller/Role/Results/RoleList.java
deleted file mode 100644
index e58c0ae..0000000
--- a/src/main/java/com/hxzk/gps/controller/Role/Results/RoleList.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.hxzk.gps.controller.Role.Results;
-
-import io.swagger.models.auth.In;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class RoleList {
- private Integer id;
- private String label;
- private Integer parentId;
- private List<RoleList> children;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Role/Results/RoleResult.java b/src/main/java/com/hxzk/gps/controller/Role/Results/RoleResult.java
deleted file mode 100644
index 552ee4a..0000000
--- a/src/main/java/com/hxzk/gps/controller/Role/Results/RoleResult.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.hxzk.gps.controller.Role.Results;
-
-import com.hxzk.gps.util.Result.TableDto;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class RoleResult {
- private Integer code;
- private String msg;
- private TableDto data;
-
-
- public RoleResult() {
-
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Role/Results/RoleTreeTableDto.java b/src/main/java/com/hxzk/gps/controller/Role/Results/RoleTreeTableDto.java
deleted file mode 100644
index 89cbdd4..0000000
--- a/src/main/java/com/hxzk/gps/controller/Role/Results/RoleTreeTableDto.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Role.Results;
-
-import lombok.Data;
-
-@Data
-public class RoleTreeTableDto {
- private String departmentId;
- private Integer pageNum;
- private Integer pageSize;
- private String name;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Role/RoleController.java b/src/main/java/com/hxzk/gps/controller/Role/RoleController.java
deleted file mode 100644
index 4220559..0000000
--- a/src/main/java/com/hxzk/gps/controller/Role/RoleController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.hxzk.gps.controller.Role;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.hxzk.gps.controller.Role.Results.AddRoleDto;
-import com.hxzk.gps.controller.Role.Results.RoleCompanyList;
-import com.hxzk.gps.controller.Role.Results.RoleResult;
-import com.hxzk.gps.controller.Role.Results.RoleTreeTableDto;
-import com.hxzk.gps.entity.Role.Role;
-import com.hxzk.gps.entity.Role.Rolemenu;
-import com.hxzk.gps.entity.User.TbUser;
-import com.hxzk.gps.service.Role.IRoleService;
-import com.hxzk.gps.service.Role.RoleMenuService;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 瑙掕壊绠$悊
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-08
- */
-@RestController
-@RequestMapping("/Role")
-@Api(tags="瑙掕壊绠$悊")
-public class RoleController {
-
- @Autowired
- private IRoleService roleService;
- @Autowired
- private RoleMenuService roleMenuService;
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴瑙掕壊鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴瑙掕壊鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindRoleInfo")
- public RoleResult FindRoleInfo(@RequestBody RoleTreeTableDto roleTreeTableDto){
- return roleService.FindRoleInfo(roleTreeTableDto);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鎸囧畾鍏徃鎵�鎷ユ湁瑙掕壊鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鎸囧畾鍏徃鎵�鎷ユ湁瑙掕壊鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindCompanyRole")
- public List<RoleCompanyList> FindCompanyRole(@RequestBody Role role){
- return roleService.FindCompanyRole(role.getCompanyid());
- }
-
- @SaCheckLogin
- @ApiOperation(value = "瑙掕壊鏂板鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴瑙掕壊鏂板鍔熻兘")
- @PostMapping("add")
- public ReturnMessage add(@RequestBody AddRoleDto role){
- return roleService.add(role);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "瑙掕壊淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴瑙掕壊淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody AddRoleDto role){
- return roleService.update(role);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "瑙掕壊鍒犻櫎鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴瑙掕壊鍒犻櫎鍔熻兘")
- @PostMapping("delete")
- public ReturnMessage delete(@RequestBody AddRoleDto role){
- return roleService.delete(role);
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "瑙掕壊鑿滃崟淇℃伅鏌ヨ鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴褰撳墠瑙掕壊鑿滃崟淇℃伅鍔熻兘")
- @PostMapping("RoleMentAll")
- public List RoleMentAll(@RequestBody Role role){
- List<Rolemenu> roleList = roleMenuService.FindRoleMenu(role.getId());
- List list = new ArrayList<>();
- for (int i = 0; i < roleList.size();i++){
- list.add(roleList.get(i).getMenuId());
- }
- return list;
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/RtkAnchor/TbRtkanchorController.java b/src/main/java/com/hxzk/gps/controller/RtkAnchor/TbRtkanchorController.java
deleted file mode 100644
index 150904e..0000000
--- a/src/main/java/com/hxzk/gps/controller/RtkAnchor/TbRtkanchorController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.hxzk.gps.controller.RtkAnchor;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.hxzk.gps.controller.RtkAnchor.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.RtkAnchor.TbRtkanchorService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-22
- */
-@RestController
-@RequestMapping("/RtkAnchor")
-@Api(tags="宸垎鍩虹珯绠$悊")
-public class TbRtkanchorController {
- @Autowired
- private TbRtkanchorService achorService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鍩虹珯鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍩虹珯淇℃伅鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindRtkAnchorInfo")
- public ResultTable FindRtkAnchorInfo(@RequestBody TableSearchResult TableSearchResult){
- return achorService.FindRtkAnchorInfo(TableSearchResult);
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/RtkAnchor/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/RtkAnchor/dto/TableList.java
deleted file mode 100644
index 8ad9ea3..0000000
--- a/src/main/java/com/hxzk/gps/controller/RtkAnchor/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.RtkAnchor.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/RtkAnchor/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/RtkAnchor/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 33851ba..0000000
--- a/src/main/java/com/hxzk/gps/controller/RtkAnchor/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hxzk.gps.controller.RtkAnchor.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.RtkAnchor.dto.TableList;
-import com.hxzk.gps.entity.RtkAnchor.TbRtkanchor;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbRtkanchor rtkanchor;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/SMS/TbSmsLogController.java b/src/main/java/com/hxzk/gps/controller/SMS/TbSmsLogController.java
deleted file mode 100644
index 7b5f405..0000000
--- a/src/main/java/com/hxzk/gps/controller/SMS/TbSmsLogController.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.hxzk.gps.controller.SMS;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.hxzk.gps.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Sms.TbSmsLogService;
-import com.hxzk.gps.service.Tag.TbTagService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 鐭俊鏃ュ織
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@RestController
-@RequestMapping("/SMSLog")
-public class TbSmsLogController {
- @Autowired
- private TbSmsLogService smsLogService;
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐭俊鏃ュ織鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐭俊鏃ュ織鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindSMSLogInfo")
- public ResultTable FindSMSLogInfo(@RequestBody TableSearchResult TableSearchResult){
- return smsLogService.FindSMSLogInfo(TableSearchResult);
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/SMS/TbSmsReminderController.java b/src/main/java/com/hxzk/gps/controller/SMS/TbSmsReminderController.java
deleted file mode 100644
index 06a0dfc..0000000
--- a/src/main/java/com/hxzk/gps/controller/SMS/TbSmsReminderController.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.hxzk.gps.controller.SMS;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.hxzk.gps.controller.SMS.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.entity.Sms.TbSmsReminder;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Sms.TbSmsLogService;
-import com.hxzk.gps.service.Sms.TbSmsReminderService;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 鐭俊鎻愮ず
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@RestController
-@RequestMapping("/SMSreminder")
-public class TbSmsReminderController {
- @Autowired
- private TbSmsReminderService smsreminderService;
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐭俊鎻愮ず鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐭俊鏃ュ織鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindSMSreminderInfo")
- public ResultTable FindSMSreminderInfo(@RequestBody TableSearchResult TableSearchResult){
- return smsreminderService.FindSMSreminderInfo(TableSearchResult);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鐭俊鏂板鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐭俊鏂板鍔熻兘")
- @PostMapping("add")
- public ReturnMessage add(@RequestBody TbSmsReminder smsReminder){
- return smsreminderService.add(smsReminder);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鐭俊淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐭俊淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody TbSmsReminder smsReminder){
- return smsreminderService.update(smsReminder);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鐭俊鍒犻櫎鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐭俊鍒犻櫎鍔熻兘")
- @PostMapping("delete")
- public ReturnMessage delete(@RequestBody TbSmsReminder smsReminder){
- return smsreminderService.delete(smsReminder);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/SMS/TbVoicetipController.java b/src/main/java/com/hxzk/gps/controller/SMS/TbVoicetipController.java
deleted file mode 100644
index 22215e4..0000000
--- a/src/main/java/com/hxzk/gps/controller/SMS/TbVoicetipController.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.hxzk.gps.controller.SMS;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.hxzk.gps.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Sms.TbSmsReminderService;
-import com.hxzk.gps.service.Sms.TbVoicetipService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@RestController
-@RequestMapping("/MsgReminder")
-@Api("淇℃伅鎻愮ず")
-public class TbVoicetipController {
- @Autowired
- private TbVoicetipService voicetipService;
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴淇℃伅鎻愮ず鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴淇℃伅鎻愮ず鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindMsgReminderInfo")
- public ResultTable FindMsgReminderInfo(@RequestBody TableSearchResult TableSearchResult){
- return voicetipService.FindMsgReminderInfo(TableSearchResult);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/SMS/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/SMS/dto/TableList.java
deleted file mode 100644
index e7f877b..0000000
--- a/src/main/java/com/hxzk/gps/controller/SMS/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.SMS.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/SMS/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/SMS/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 911501e..0000000
--- a/src/main/java/com/hxzk/gps/controller/SMS/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hxzk.gps.controller.SMS.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.SMS.dto.TableList;
-import com.hxzk.gps.entity.Sms.TbSmsReminder;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbSmsReminder smsReminder;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/System/SystemLogUtil.java b/src/main/java/com/hxzk/gps/controller/System/SystemLogUtil.java
deleted file mode 100644
index 8c195b5..0000000
--- a/src/main/java/com/hxzk/gps/controller/System/SystemLogUtil.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.hxzk.gps.controller.System;
-
-import com.hxzk.gps.entity.System.TbSystemOperationLog;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.util.Time.TimeUtil;
-
-import javax.annotation.Resource;
-
-/**
- * 绯荤粺鏃ュ織宸ュ叿绫伙紝鐢ㄤ簬娣诲姞绯荤粺鎿嶄綔鏃ュ織
- */
-public class SystemLogUtil {
-
- private static TbSystemOperationLogService systemOperationLogService;
-
- private SystemLogUtil() {
- // 绉佹湁鏋勯�犲嚱鏁帮紝闃叉瀹炰緥鍖�
- }
-
- public static void setSystemOperationLogService(TbSystemOperationLogService service) {
- systemOperationLogService = service;
- }
-
- /**
- * 娣诲姞绯荤粺鎿嶄綔鏃ュ織
- * @param name 鎿嶄綔浜哄鍚�
- * @param content 鎿嶄綔鍐呭
- * @param time 鎿嶄綔鏃堕棿
- * @param type 鎿嶄綔绫诲瀷
- * @param ip 鎿嶄綔 IP 鍦板潃
- * @param company 鎿嶄綔浜烘墍灞炲叕鍙�
- * @param sign 鎿嶄綔鏍囪瘑
- * @Param status 鎿嶄綔鐘舵��
- */
- public static void addSystemLog(String name, String content, String time, String type, String ip, String company, String sign,String status) {
- // 娉ㄦ剰锛氶渶瑕佹牴鎹� TbSystemOperationLog 鏋勯�犲嚱鏁扮殑瀹為檯鍙傛暟杩涜璋冩暣
- TbSystemOperationLog systemOperationLog = new TbSystemOperationLog(name, content, time, type, ip, company, sign,status);
- systemOperationLogService.add(systemOperationLog);
- }
-
-
- /*
- * 鍒犻櫎绯荤粺鎿嶄綔鏃ュ織
- * @param isSuccess 鏄惁鎴愬姛
- * @param sign 鎿嶄綔鏍囪瘑
- * @return ReturnMessage 杩斿洖娑堟伅
- * */
- public static ReturnMessage handleDeleteResult(boolean isSuccess,String MessageType, String sign){
- String status = isSuccess ? "Success" : "Error";
- String messageKey = isSuccess ? "DeleteSuccess" : "DeleteError";
- addSystemLog(
- UserInfoUtil.getUserName(),
- MessageUtils.getMessage(MessageType),
- TimeUtil.GetTime(),
- MessageUtils.getMessage("Delete"),
- "127.0.0.1",
- UserInfoUtil.getUserCompany(),
- sign,
- MessageUtils.getMessage(status)
- );
- return isSuccess ? ReturnMessage.ReturnMessageSuccess(messageKey) : ReturnMessage.ReturnMessageError(messageKey);
- }
-
- /*
- * 淇敼绯荤粺鎿嶄綔鏃ュ織
- * @param isSuccess 鏄惁鎴愬姛
- * @param sign 鎿嶄綔鏍囪瘑
- * @return ReturnMessage 杩斿洖娑堟伅
- * */
- public static ReturnMessage handleUpdateResult(boolean isSuccess,String MessageType, String sign){
- String status = isSuccess ? "Success" : "Error";
- String messageKey = isSuccess ? "UpdateSuccess" : "UpdateError";
- addSystemLog(
- UserInfoUtil.getUserName(),
- MessageUtils.getMessage(MessageType),
- TimeUtil.GetTime(),
- MessageUtils.getMessage("Update"),
- "127.0.0.1",
- UserInfoUtil.getUserCompany(),
- sign,
- MessageUtils.getMessage(status)
- );
- return isSuccess ? ReturnMessage.ReturnMessageSuccess(messageKey) : ReturnMessage.ReturnMessageError(messageKey);
- }
-
- /*
- * 鏂板绯荤粺鎿嶄綔鏃ュ織
- * @param isSuccess 鏄惁鎴愬姛
- * @param sign 鎿嶄綔鏍囪瘑
- * @return ReturnMessage 杩斿洖娑堟伅
- * */
- public static ReturnMessage handleAddResult(boolean isSuccess,String MessageType,String sign){
- String status = isSuccess ? "Success" : "Error";
- String messageKey = isSuccess ? "AddSuccess" : "AddError";
- addSystemLog(
- UserInfoUtil.getUserName(),
- MessageUtils.getMessage(MessageType),
- TimeUtil.GetTime(),
- MessageUtils.getMessage("Add"),
- "127.0.0.1",
- UserInfoUtil.getUserCompany(),
- sign,
- MessageUtils.getMessage(status)
- );
- return isSuccess ? ReturnMessage.ReturnMessageSuccess(messageKey) : ReturnMessage.ReturnMessageError(messageKey);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/controller/System/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/System/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 993388e..0000000
--- a/src/main/java/com/hxzk/gps/controller/System/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hxzk.gps.controller.System.TableSearchResult;
-
-import com.hxzk.gps.dto.TableList;
-import com.hxzk.gps.entity.System.TbSystemOperationLog;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbSystemOperationLog systemlog;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/System/TbSystemOperationLogController.java b/src/main/java/com/hxzk/gps/controller/System/TbSystemOperationLogController.java
deleted file mode 100644
index 8431b0d..0000000
--- a/src/main/java/com/hxzk/gps/controller/System/TbSystemOperationLogController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.hxzk.gps.controller.System;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.hxzk.gps.controller.System.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import com.hxzk.gps.service.Tag.TbTagService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 绯荤粺绠$悊
- * 鎿嶄綔鏃ュ織
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-12
- */
-@RestController
-@RequestMapping("/System")
-public class TbSystemOperationLogController {
- @Autowired
- private TbSystemOperationLogService systemOperationLogService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鎿嶄綔鏃ュ織鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鎿嶄綔鏃ュ織鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindSystemLogInfo")
- public ResultTable FindSystemLogInfo(@RequestBody TableSearchResult tableSearchResult){
- return systemOperationLogService.FindSystemLogInfo(tableSearchResult);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Tag/TbTagController.java b/src/main/java/com/hxzk/gps/controller/Tag/TbTagController.java
deleted file mode 100644
index 4ddff53..0000000
--- a/src/main/java/com/hxzk/gps/controller/Tag/TbTagController.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.hxzk.gps.controller.Tag;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.controller.Tag.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.controller.Tag.dto.TagSettingResult;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Tag.TbTagService;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.util.Time.TimeUtil;
-import com.hxzk.gps.util.UDP.TagSetting.UDP_TAG;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@RestController
-@RequestMapping("/Tag")
-@Api(tags="鏍囩绠$悊")
-public class TbTagController {
-
- @Autowired
- private TbTagService tagService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鏍囩鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鏍囩淇℃伅鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindTagInfo")
- public ResultTable FindTagInfo(@RequestBody TableSearchResult TableSearchResult){
- return tagService.FindTagInfo(TableSearchResult);
- }
-
-
-
- /*
- * 缁堢缂栧彿鑷姩琛ュ叏
- * */
- @SaCheckLogin
- @PostMapping("TagidAutocomplete")
- public List<AuToComplete> FindCustomerChanPin(){
- QueryWrapper<TbTag> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- List<TbTag> PersonList = tagService.getBaseMapper().selectList(queryWrapper);
- List<AuToComplete> addCustomerList = PersonList.stream()
- .map(tag -> {
- AuToComplete addCustomer = new AuToComplete();
- addCustomer.setValue(tag.getTagId());
- addCustomer.setLink(tag.getTagId());
- return addCustomer;
- })
- .collect(Collectors.toList());
-
- return addCustomerList;
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鏍囩鏁版嵁鍙戦�佸湴鍧�鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡鏍囩鏁版嵁鍙戦�佸湴鍧�鍔熻兘")
- @PostMapping("SettingTagSendingAddress")
- public TagSettingResult SettingTagSendingAddress(@RequestBody TbTag tag){
- List list = new ArrayList<>();
- String[] tagList = tag.getTagId().split(";");
- String[] ipList = tag.getBaoliu1().split(":");
- Integer number = 0;
- for (int i =0; i<tagList.length;i++){
- tag.setTagId(tagList[i]);
- tag.setBaoliu1(ipList[0]);
- tag.setBaoliu2(ipList[1]);
- String xieyi = UDP_TAG.SendDataAdress(tag);
- list.add(xieyi);
- number++;
- }
- return new TagSettingResult(number,list, TimeUtil.GetTime());
- }
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鏍囩寮�鍚垨鍏抽棴闈欐浼戠湢鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡鏍囩寮�鍚垨鍏抽棴闈欐浼戠湢鍔熻兘")
- @PostMapping("SettingTaghibernate")
- public TagSettingResult SettingTaghibernate(@RequestBody TbTag tag){
- List list = new ArrayList<>();
- String[] tagList = tag.getTagId().split(";");
- Integer number = 0;
- for (int i =0; i<tagList.length;i++){
- tag.setTagId(tagList[i]);
- String xieyi = UDP_TAG.SettingTaghibernate(tag);
- list.add(xieyi);
- number++;
- }
- return new TagSettingResult(number,list, TimeUtil.GetTime());
- }
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鏍囩寮�鍚垨鍏抽棴UWB鍔熻兘鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡鏍囩寮�鍚垨鍏抽棴UWB鍔熻兘鍔熻兘")
- @PostMapping("SettingTagUWB")
- public TagSettingResult SettingTagUWB(@RequestBody TbTag tag){
- List list = new ArrayList<>();
- String[] tagList = tag.getTagId().split(";");
- Integer number = 0;
- for (int i =0; i<tagList.length;i++){
- tag.setTagId(tagList[i]);
- String xieyi = UDP_TAG.SettingTagUWB(tag);
- list.add(xieyi);
- number++;
- }
- return new TagSettingResult(number,list, TimeUtil.GetTime());
- }
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鏍囩寮�鍚垨鍏抽棴鍏呯數宸ヤ綔鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡鏍囩寮�鍚垨鍏抽棴鍏呯數宸ヤ綔鍔熻兘")
- @PostMapping("SettingTagcharge")
- public TagSettingResult SettingTagcharge(@RequestBody TbTag tag){
- List list = new ArrayList<>();
- String[] tagList = tag.getTagId().split(";");
- Integer number = 0;
- for (int i =0; i<tagList.length;i++){
- tag.setTagId(tagList[i]);
- String xieyi = UDP_TAG.SettingTagcharge(tag);
- list.add(xieyi);
- number++;
- }
- return new TagSettingResult(number,list, TimeUtil.GetTime());
- }
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鏍囩璁剧疆TCP宸垎鍦板潃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡鏍囩璁剧疆TCP宸垎鍦板潃鍔熻兘")
- @PostMapping("SettingTagDifferential")
- public TagSettingResult SettingTagDifferential(@RequestBody TbTag tag){
- List list = new ArrayList<>();
- String[] tagList = tag.getTagId().split(";");
- String[] ipList = tag.getBaoliu1().split(":");
- Integer number = 0;
- for (int i =0; i<tagList.length;i++){
- tag.setTagId(tagList[i]);
- tag.setBaoliu1(ipList[0]);
- tag.setBaoliu2(ipList[1]);
- String xieyi = UDP_TAG.SettingTagDifferential(tag);
- list.add(xieyi);
- number++;
- }
- return new TagSettingResult(number,list, TimeUtil.GetTime());
- }
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鏍囩淇敼NTIRP鍦板潃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡鏍囩淇敼NTIRP鍦板潃鍔熻兘")
- @PostMapping("SettingTagNTIRP")
- public TagSettingResult SettingTagNTIRP(@RequestBody TbTag tag){
- List list = new ArrayList<>();
- String[] tagList = tag.getTagId().split(";");
- Integer number = 0;
- for (int i =0; i<tagList.length;i++){
- tag.setTagId(tagList[i]);
- String xieyi = UDP_TAG.SettingTagNTIRP(tag);
- list.add(xieyi);
- number++;
- }
- return new TagSettingResult(number,list, TimeUtil.GetTime());
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "璁惧鏂板鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴璁惧鏂板鍔熻兘")
- @PostMapping("add")
- public ReturnMessage add(@RequestBody TbTag tbTag){
- return tagService.add(tbTag);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "璁惧淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴璁惧淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody TbTag tbTag){
- return tagService.update(tbTag);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "璁惧鍒犻櫎鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴璁惧鍒犻櫎鍔熻兘")
- @PostMapping("delete")
- public ReturnMessage delete(@RequestBody TbTag tbTag){
- return tagService.delete(tbTag);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Tag/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/Tag/dto/TableList.java
deleted file mode 100644
index 4772837..0000000
--- a/src/main/java/com/hxzk/gps/controller/Tag/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Tag.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Tag/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/Tag/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 7896aea..0000000
--- a/src/main/java/com/hxzk/gps/controller/Tag/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hxzk.gps.controller.Tag.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Tag.dto.TableList;
-import com.hxzk.gps.entity.Tag.TbTag;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbTag tag;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Tag/dto/TagSettingResult.java b/src/main/java/com/hxzk/gps/controller/Tag/dto/TagSettingResult.java
deleted file mode 100644
index dcd17e6..0000000
--- a/src/main/java/com/hxzk/gps/controller/Tag/dto/TagSettingResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Tag.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import java.util.List;
-@Data
-@AllArgsConstructor
-public class TagSettingResult {
- private Integer number;
- private List msg;
- private String time;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/ThreeModel/Results/ThreeModelResult.java b/src/main/java/com/hxzk/gps/controller/ThreeModel/Results/ThreeModelResult.java
deleted file mode 100644
index e195b2f..0000000
--- a/src/main/java/com/hxzk/gps/controller/ThreeModel/Results/ThreeModelResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.ThreeModel.Results;
-
-import com.hxzk.gps.util.Result.TableDto;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class ThreeModelResult {
- private Integer code;
- private String msg;
- private TableDto data;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/ThreeModel/TbThreemodelController.java b/src/main/java/com/hxzk/gps/controller/ThreeModel/TbThreemodelController.java
deleted file mode 100644
index e3c5a10..0000000
--- a/src/main/java/com/hxzk/gps/controller/ThreeModel/TbThreemodelController.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.hxzk.gps.controller.ThreeModel;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.hxzk.gps.controller.Map.Results.MarsResult;
-import com.hxzk.gps.controller.Map.dto.MarsTreeTableDto;
-import com.hxzk.gps.controller.ThreeModel.Results.ThreeModelResult;
-import com.hxzk.gps.controller.ThreeModel.deo.ThreeModelDeo;
-import com.hxzk.gps.entity.Map.TbMarsHomeset;
-import com.hxzk.gps.entity.ThreeModel.TbThreemodel;
-import com.hxzk.gps.service.ThreeModel.TbThreemodelService;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-09-03
- */
-@RestController
-@RequestMapping("/Threemodel")
-public class TbThreemodelController {
- @Autowired
- TbThreemodelService tbThreemodelService;
- @Value("${upload.dir-Map-ThreeJS}")
- private String dirMapThree;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐢ㄤ笁缁存ā鍨嬪垪琛ㄦ帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴涓夌淮鍦板浘閰嶇疆鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindThreemodel")
- public ThreeModelResult FindThreemodel(@RequestBody ThreeModelDeo threeModelDeo){
- return tbThreemodelService.FindThreemodel(threeModelDeo);
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴涓夌淮妯″瀷閰嶇疆鏂板鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴涓夌淮妯″瀷閰嶇疆鏂板鍔熻兘")
- @PostMapping("add")
- public ReturnMessage add(@RequestBody TbThreemodel tbThreemodel){
- return tbThreemodelService.add(tbThreemodel);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴涓夌淮妯″瀷閰嶇疆淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴涓夌淮妯″瀷閰嶇疆淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody TbThreemodel tbThreemodel){
- return tbThreemodelService.update(tbThreemodel);
- }
-
- @PostMapping("upload")
- public ReturnMessage upload(
- @RequestParam("files") MultipartFile[] files, // 淇敼杩欓噷
- @RequestParam(value = "departmentId", required = false) String departmentId,
- @RequestParam(value = "filename", required = false) String filename,
- @RequestParam(value = "id", required = false) String id,
- HttpServletRequest request) {
-
- ReturnMessage result = new ReturnMessage();
-
- try {
- // 妫�鏌ユ槸鍚︽湁鏂囦欢涓婁紶
- if (files == null || files.length == 0) {
- result.setCode(400);
- result.setMsg("鏈壘鍒颁笂浼犵殑鏂囦欢");
- return result;
- }
-
- // 鍒涘缓涓婁紶鐩綍
- String uploadDir = dirMapThree;
- if (filename != null && !filename.trim().isEmpty()) {
- uploadDir = uploadDir + "//" + filename.trim();
- }
-
- Path uploadPath = Paths.get(uploadDir);
- if (!Files.exists(uploadPath)) {
- Files.createDirectories(uploadPath);
- }
-
- List<String> successFiles = new ArrayList<>();
- List<String> failedFiles = new ArrayList<>();
-
- // 澶勭悊鎵�鏈変笂浼犵殑鏂囦欢
- for (MultipartFile file : files) {
- String originalFilename = file.getOriginalFilename();
-
- if (originalFilename == null || originalFilename.isEmpty()) {
- failedFiles.add("鏃犲悕鏂囦欢: 鏂囦欢鍚嶄笉鑳戒负绌�");
- continue;
- }
-
- try {
- String safeFilename = Paths.get(originalFilename).getFileName().toString();
- Path filePath = uploadPath.resolve(safeFilename);
-
- // 淇濆瓨鏂囦欢
- file.transferTo(filePath.toFile());
- successFiles.add(originalFilename);
-
- } catch (IOException e) {
- failedFiles.add(originalFilename + ": " + e.getMessage());
- } catch (InvalidPathException e) {
- failedFiles.add(originalFilename + ": 鏂囦欢鍚嶅寘鍚潪娉曞瓧绗�");
- }
- }
-
- // 鏋勫缓杩斿洖缁撴灉
- Map<String, Object> data = new HashMap<>();
- data.put("successFiles", successFiles);
- data.put("failedFiles", failedFiles);
- data.put("uploadPath", uploadDir);
-
-
- if (failedFiles.isEmpty()) {
- result.setCode(200);
- result.setMsg("鎵�鏈夋枃浠朵笂浼犳垚鍔燂紝鍏� " + successFiles.size() + " 涓枃浠�");
- } else if (successFiles.isEmpty()) {
- result.setCode(500);
- result.setMsg("鎵�鏈夋枃浠朵笂浼犲け璐ワ紝鍏� " + failedFiles.size() + " 涓枃浠�");
- } else {
- result.setCode(206);
- result.setMsg("閮ㄥ垎鏂囦欢涓婁紶鎴愬姛锛屾垚鍔�: " + successFiles.size() + ", 澶辫触: " + failedFiles.size());
- }
-
- } catch (Exception e) {
- result.setCode(500);
- result.setMsg("鏈嶅姟鍣ㄥ鐞嗚姹傛椂鍙戠敓閿欒: " + e.getMessage());
- System.out.println("鏂囦欢涓婁紶閿欒: " + e.getMessage());
- }
-
- return result;
- }
- /**
- * 鑾峰彇鏂囦欢鎵╁睍鍚�
- */
- // 鐢熸垚鍞竴鏂囦欢鍚嶇殑杈呭姪鏂规硶
- private String generateUniqueFilename(String originalFilename) {
- int dotIndex = originalFilename.lastIndexOf('.');
- String baseName = (dotIndex > 0) ? originalFilename.substring(0, dotIndex) : originalFilename;
- String extension = (dotIndex > 0) ? originalFilename.substring(dotIndex) : "";
-
- // 浣跨敤鏃堕棿鎴冲拰闅忔満鏁扮‘淇濆敮涓�鎬�
- String timestamp = String.valueOf(System.currentTimeMillis());
- String random = String.valueOf((int)(Math.random() * 1000));
-
- return baseName + "_" + timestamp + "_" + random + extension;
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/ThreeModel/deo/ThreeModelDeo.java b/src/main/java/com/hxzk/gps/controller/ThreeModel/deo/ThreeModelDeo.java
deleted file mode 100644
index 4060b44..0000000
--- a/src/main/java/com/hxzk/gps/controller/ThreeModel/deo/ThreeModelDeo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.ThreeModel.deo;
-
-import lombok.Data;
-
-@Data
-
-public class ThreeModelDeo {
- private String departmentId;
- private Integer pageNum;
- private Integer pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Track/TbGpsTrackController.java b/src/main/java/com/hxzk/gps/controller/Track/TbGpsTrackController.java
deleted file mode 100644
index 399b57a..0000000
--- a/src/main/java/com/hxzk/gps/controller/Track/TbGpsTrackController.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.hxzk.gps.controller.Track;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-import com.hxzk.gps.controller.Track.dto.TableSearchResult.TableGpsTrackSearchResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Loragateway.TbLoragatewayService;
-import com.hxzk.gps.service.Track.TbGpsTrackService;
-import com.hxzk.gps.service.Track.TbTrackService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 杞ㄨ抗绠$悊
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-26
- */
-@RestController
-@RequestMapping("/GpsTrack")
-public class TbGpsTrackController {
- @Autowired
- private TbGpsTrackService GpsTrackService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴杞ㄨ抗鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴杞ㄨ抗淇℃伅鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindGpsTrackInfo")
- public ResultTable FindGpsTrackInfo(@RequestBody TableGpsTrackSearchResult tableGpsTrackSearchResult){
- return GpsTrackService.FindGpsTrackInfo(tableGpsTrackSearchResult);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Track/TbTrackController.java b/src/main/java/com/hxzk/gps/controller/Track/TbTrackController.java
deleted file mode 100644
index defe3e3..0000000
--- a/src/main/java/com/hxzk/gps/controller/Track/TbTrackController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.hxzk.gps.controller.Track;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.hxzk.gps.controller.Track.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.controller.Track.dto.TrackView;
-
-import com.hxzk.gps.entity.Track.TbTrack;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.TrackResultTable;
-import com.hxzk.gps.service.Loragateway.TbLoragatewayService;
-import com.hxzk.gps.service.Track.TbTrackService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.text.ParseException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 杞ㄨ抗绠$悊
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-26
- */
-@RestController
-@RequestMapping("/Track")
-public class TbTrackController {
- @Autowired
- private TbTrackService TrackService;
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴杞ㄨ抗鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴杞ㄨ抗淇℃伅鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindTrackInfo")
- public ResultTable FindTrackInfo(@RequestBody TableSearchResult TableSearchResult){
- return TrackService.FindTrackInfo(TableSearchResult);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴杞ㄨ抗鍥炴斁鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴杞ㄨ抗鍥炴斁鏌ヨ鍔熻兘")
- @PostMapping("FindTrackView")
- public TrackResultTable FindTrackView(@RequestBody TrackView trackView) throws ParseException {
- return TrackService.FindTrackView(trackView);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Track/dto/TableSearchResult/TableGpsTrackSearchResult.java b/src/main/java/com/hxzk/gps/controller/Track/dto/TableSearchResult/TableGpsTrackSearchResult.java
deleted file mode 100644
index 5297f27..0000000
--- a/src/main/java/com/hxzk/gps/controller/Track/dto/TableSearchResult/TableGpsTrackSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Track.dto.TableSearchResult;
-
-import com.hxzk.gps.dto.TableList;
-import com.hxzk.gps.entity.Track.TbGpsTrack;
-import com.hxzk.gps.entity.Track.TbTrack;
-import lombok.Data;
-
-@Data
-public class TableGpsTrackSearchResult<T> {
- private TableList tableList;
- private TbGpsTrack gpsTrack;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Track/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/Track/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index e6159e5..0000000
--- a/src/main/java/com/hxzk/gps/controller/Track/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hxzk.gps.controller.Track.dto.TableSearchResult;
-
-import com.hxzk.gps.dto.TableList;
-import com.hxzk.gps.entity.Track.TbTrack;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbTrack track;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Track/dto/TrackView.java b/src/main/java/com/hxzk/gps/controller/Track/dto/TrackView.java
deleted file mode 100644
index 3bfd4ed..0000000
--- a/src/main/java/com/hxzk/gps/controller/Track/dto/TrackView.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.hxzk.gps.controller.Track.dto;
-
-import lombok.Data;
-
-@Data
-public class TrackView {
- public String layer;
- public String tagid;
- public String[] time;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/UploadFile/UploadPic.java b/src/main/java/com/hxzk/gps/controller/UploadFile/UploadPic.java
deleted file mode 100644
index cff3f63..0000000
--- a/src/main/java/com/hxzk/gps/controller/UploadFile/UploadPic.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.hxzk.gps.controller.UploadFile;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.hxzk.gps.controller.UploadFile.deo.FileUpLoad;
-import com.hxzk.gps.controller.UploadFile.deo.ReturnMessageUpload;
-
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.UUID;
-
-/*
- * 涓婁紶鐓х墖
- * @author YuZhiTong
- * @since 2025-05-19
- *
- * */
-@RestController
-@RequestMapping("/UploadFile")
-public class UploadPic {
-
- @Value("${upload.dir-Person}")
- private String uploadDirPerson;
-
- @Value("${upload.dir-DepartMent}")
- private String uploadDirDepartMent;
-
- @Value("${upload.dir-IP}")
- private String uploadIp;
-
- @Value("${upload.dir-CompanyLogo}")
- private String uploadDirCompanyLogo;
-
- @Value("${upload.dir-Hksxt}")
- private String uploadDirHksxtIcon;
- @Value("${upload.dir-UserImg}")
- private String UserImg;
-
- /*
- * 鍏徃Logo涓婁紶
- * */
- @SaCheckLogin
- @PostMapping("/uploadUserImg")
- public ReturnMessageUpload uploadCompanyLogo(@RequestParam("file") MultipartFile file) {
- if (file.isEmpty()) {
- return new ReturnMessageUpload(200, MessageUtils.getMessage("ErrorPicture"), null);
- }
- try {
- // 鐢熸垚鍞竴鐨勬枃浠跺悕锛岄伩鍏嶆枃浠跺悕鍐茬獊
- String fileName = UUID.randomUUID().toString() + "." + getFileExtension(file.getOriginalFilename());
- // 鏋勫缓鏂囦欢淇濆瓨璺緞
- Path filePath = Paths.get(UserImg, fileName);
- // 妫�鏌ヤ笂浼犵洰褰曟槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄥ垯鍒涘缓
- File dir = new File(UserImg);
- if (!dir.exists()) {
- dir.mkdirs();
- }
- // 灏嗕笂浼犵殑鏂囦欢淇濆瓨鍒版寚瀹氳矾寰�
- Files.copy(file.getInputStream(), filePath, StandardCopyOption.REPLACE_EXISTING);
- FileUpLoad fileUpLoad = new FileUpLoad();
- fileUpLoad.setFileUrl(uploadIp+"User/"+fileName);
- return new ReturnMessageUpload(200, MessageUtils.getMessage("SuccessPicture"), fileUpLoad);
- } catch (IOException e) {
- e.printStackTrace();
- return new ReturnMessageUpload(200, MessageUtils.getMessage("ErrorPicture"), null);
- }
- }
-
-
- /*
- * 缁堢鐓х墖涓婁紶
- * */
- @SaCheckLogin
- @PostMapping("/uploadPersonPic")
- public ReturnMessageUpload uploadPersonPic(@RequestParam("file") MultipartFile file) {
- if (file.isEmpty()) {
- return new ReturnMessageUpload(200, MessageUtils.getMessage("ErrorPicture"), null);
- }
- try {
- // 鐢熸垚鍞竴鐨勬枃浠跺悕锛岄伩鍏嶆枃浠跺悕鍐茬獊
- String fileName = UUID.randomUUID().toString() + "." + getFileExtension(file.getOriginalFilename());
- // 鏋勫缓鏂囦欢淇濆瓨璺緞
- Path filePath = Paths.get(uploadDirPerson, fileName);
- // 妫�鏌ヤ笂浼犵洰褰曟槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄥ垯鍒涘缓
- File dir = new File(uploadDirPerson);
- if (!dir.exists()) {
- dir.mkdirs();
- }
- // 灏嗕笂浼犵殑鏂囦欢淇濆瓨鍒版寚瀹氳矾寰�
- Files.copy(file.getInputStream(), filePath, StandardCopyOption.REPLACE_EXISTING);
- FileUpLoad fileUpLoad = new FileUpLoad();
- fileUpLoad.setFileUrl(uploadIp+"Person/"+fileName);
- return new ReturnMessageUpload(200, MessageUtils.getMessage("SuccessPicture"), fileUpLoad);
- } catch (IOException e) {
- e.printStackTrace();
- return new ReturnMessageUpload(200, MessageUtils.getMessage("ErrorPicture"), null);
- }
- }
-
-
-
- /*
- * 閮ㄩ棬鍥炬爣涓婁紶
- * */
- @SaCheckLogin
- @PostMapping("/uploadDepartMentIconPic")
- public ReturnMessageUpload uploadDepartMentIconPic(@RequestParam("file") MultipartFile file) {
- if (file.isEmpty()) {
- return new ReturnMessageUpload(200, MessageUtils.getMessage("ErrorPicture"), null);
- }
- try {
- // 鐢熸垚鍞竴鐨勬枃浠跺悕锛岄伩鍏嶆枃浠跺悕鍐茬獊
- String fileName = UUID.randomUUID().toString() + "." + getFileExtension(file.getOriginalFilename());
- // 鏋勫缓鏂囦欢淇濆瓨璺緞
- Path filePath = Paths.get(uploadDirDepartMent, fileName);
- // 妫�鏌ヤ笂浼犵洰褰曟槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄥ垯鍒涘缓
- File dir = new File(uploadDirDepartMent);
- if (!dir.exists()) {
- dir.mkdirs();
- }
- // 灏嗕笂浼犵殑鏂囦欢淇濆瓨鍒版寚瀹氳矾寰�
- Files.copy(file.getInputStream(), filePath, StandardCopyOption.REPLACE_EXISTING);
- FileUpLoad fileUpLoad = new FileUpLoad();
- fileUpLoad.setFileUrl(uploadIp+"DepartMent/"+fileName);
- return new ReturnMessageUpload(200, MessageUtils.getMessage("SuccessPicture"), fileUpLoad);
- } catch (IOException e) {
- e.printStackTrace();
- return new ReturnMessageUpload(200, MessageUtils.getMessage("ErrorPicture"), null);
- }
- }
-
- /*
- * 鍏徃Logo涓婁紶
- * */
- @SaCheckLogin
- @PostMapping("/uploadCompanyLogo")
- public ReturnMessageUpload uploadUserImg(@RequestParam("file") MultipartFile file) {
- if (file.isEmpty()) {
- return new ReturnMessageUpload(200, MessageUtils.getMessage("ErrorPicture"), null);
- }
- try {
- // 鐢熸垚鍞竴鐨勬枃浠跺悕锛岄伩鍏嶆枃浠跺悕鍐茬獊
- String fileName = UUID.randomUUID().toString() + "." + getFileExtension(file.getOriginalFilename());
- // 鏋勫缓鏂囦欢淇濆瓨璺緞
- Path filePath = Paths.get(uploadDirCompanyLogo, fileName);
- // 妫�鏌ヤ笂浼犵洰褰曟槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄥ垯鍒涘缓
- File dir = new File(uploadDirCompanyLogo);
- if (!dir.exists()) {
- dir.mkdirs();
- }
- // 灏嗕笂浼犵殑鏂囦欢淇濆瓨鍒版寚瀹氳矾寰�
- Files.copy(file.getInputStream(), filePath, StandardCopyOption.REPLACE_EXISTING);
- FileUpLoad fileUpLoad = new FileUpLoad();
- fileUpLoad.setFileUrl(uploadIp+"CompanyLogo/"+fileName);
- return new ReturnMessageUpload(200, MessageUtils.getMessage("SuccessPicture"), fileUpLoad);
- } catch (IOException e) {
- e.printStackTrace();
- return new ReturnMessageUpload(200, MessageUtils.getMessage("ErrorPicture"), null);
- }
- }
-
- /*
- * 鐩戞帶鍥炬爣涓婁紶
- * */
- @SaCheckLogin
- @PostMapping("/uploadHksxtIcon")
- public ReturnMessageUpload uploadHksxtIcon(@RequestParam("file") MultipartFile file) {
- if (file.isEmpty()) {
- return new ReturnMessageUpload(200, MessageUtils.getMessage("ErrorPicture"), null);
- }
- try {
- // 鐢熸垚鍞竴鐨勬枃浠跺悕锛岄伩鍏嶆枃浠跺悕鍐茬獊
- String fileName = UUID.randomUUID().toString() + "." + getFileExtension(file.getOriginalFilename());
- // 鏋勫缓鏂囦欢淇濆瓨璺緞
- Path filePath = Paths.get(uploadDirHksxtIcon, fileName);
- // 妫�鏌ヤ笂浼犵洰褰曟槸鍚﹀瓨鍦紝濡傛灉涓嶅瓨鍦ㄥ垯鍒涘缓
- File dir = new File(uploadDirHksxtIcon);
- if (!dir.exists()) {
- dir.mkdirs();
- }
- // 灏嗕笂浼犵殑鏂囦欢淇濆瓨鍒版寚瀹氳矾寰�
- Files.copy(file.getInputStream(), filePath, StandardCopyOption.REPLACE_EXISTING);
- FileUpLoad fileUpLoad = new FileUpLoad();
- fileUpLoad.setFileUrl(uploadIp+"Hksxt/"+fileName);
- return new ReturnMessageUpload(200, MessageUtils.getMessage("SuccessPicture"), fileUpLoad);
- } catch (IOException e) {
- e.printStackTrace();
- return new ReturnMessageUpload(200, MessageUtils.getMessage("ErrorPicture"), null);
- }
- }
-
- private String getFileExtension(String fileName) {
- if (fileName != null && fileName.lastIndexOf(".") != -1) {
- return fileName.substring(fileName.lastIndexOf(".") + 1);
- }
- return "";
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/controller/UploadFile/deo/FileUpLoad.java b/src/main/java/com/hxzk/gps/controller/UploadFile/deo/FileUpLoad.java
deleted file mode 100644
index ed3317a..0000000
--- a/src/main/java/com/hxzk/gps/controller/UploadFile/deo/FileUpLoad.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.hxzk.gps.controller.UploadFile.deo;
-
-import lombok.Data;
-
-@Data
-public class FileUpLoad {
- private String fileUrl;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/UploadFile/deo/ReturnMessageUpload.java b/src/main/java/com/hxzk/gps/controller/UploadFile/deo/ReturnMessageUpload.java
deleted file mode 100644
index 63d8ae1..0000000
--- a/src/main/java/com/hxzk/gps/controller/UploadFile/deo/ReturnMessageUpload.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.hxzk.gps.controller.UploadFile.deo;
-
-import lombok.Data;
-
-@Data
-public class ReturnMessageUpload {
-
- private Integer code;
- private String msg;
- private FileUpLoad data;
-
- public ReturnMessageUpload(int code, String msg) {
- this.msg = msg;
- this.code = code;
- }
- public ReturnMessageUpload(int code, String msg,FileUpLoad data) {
- this.msg = "鏂囦欢涓婁紶鎴愬姛";
- this.code = 200;
- this.data=data;
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/User/Results/LoginResult.java b/src/main/java/com/hxzk/gps/controller/User/Results/LoginResult.java
deleted file mode 100644
index 11a9093..0000000
--- a/src/main/java/com/hxzk/gps/controller/User/Results/LoginResult.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hxzk.gps.controller.User.Results;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class LoginResult {
- public Integer code;
- public String msg;
- public String access_token;
-
- public LoginResult(Integer code, String msg, String access_token) {
- this.code = code;
- this.msg = msg;
- this.access_token = access_token;
- }
- public LoginResult(Integer code, String msg) {
- this.code = code;
- this.msg = msg;
- }
- public LoginResult(String access_token) {
- this.access_token = access_token;
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/User/Results/MenuList.java b/src/main/java/com/hxzk/gps/controller/User/Results/MenuList.java
deleted file mode 100644
index 8044678..0000000
--- a/src/main/java/com/hxzk/gps/controller/User/Results/MenuList.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.hxzk.gps.controller.User.Results;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@Data
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class MenuList {
- private Integer id;
- private String path;
- private String name;
- private String component;
- private String redirect;
- private Integer parentId;
- private Map<String,Object> meta;
- private List<MenuList> children;
-
- // Getters and Setters
-
- public void setMeta(String metaJson) {
- ObjectMapper objectMapper = new ObjectMapper();
- try {
- this.meta = objectMapper.readValue(metaJson, new TypeReference<Map<String, Object>>() {});
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- public MenuList() {
- this.children = new ArrayList<>();
- }
-
- // Add other necessary constructors and methods
-}
-
diff --git a/src/main/java/com/hxzk/gps/controller/User/Results/MenuListDtoAll.java b/src/main/java/com/hxzk/gps/controller/User/Results/MenuListDtoAll.java
deleted file mode 100644
index 976e7de..0000000
--- a/src/main/java/com/hxzk/gps/controller/User/Results/MenuListDtoAll.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.hxzk.gps.controller.User.Results;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@Data
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class MenuListDtoAll {
- private Integer id;
- private String path;
- private String label;
- private String component;
- private String redirect;
- private Integer parentId;
- private Map<String,Object> meta;
- private List<MenuListDtoAll> children;
-
- // Getters and Setters
-
- public void setMeta(String metaJson) {
- ObjectMapper objectMapper = new ObjectMapper();
- try {
- this.meta = objectMapper.readValue(metaJson, new TypeReference<Map<String, Object>>() {});
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- public MenuListDtoAll() {
- this.children = new ArrayList<>();
- }
-
- // Add other necessary constructors and methods
-}
-
diff --git a/src/main/java/com/hxzk/gps/controller/User/Results/MenuListResult.java b/src/main/java/com/hxzk/gps/controller/User/Results/MenuListResult.java
deleted file mode 100644
index ce9b4b9..0000000
--- a/src/main/java/com/hxzk/gps/controller/User/Results/MenuListResult.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.hxzk.gps.controller.User.Results;
-
-import lombok.*;
-
-import java.util.List;
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-public class MenuListResult {
- private Integer code;
- private String msg;
- private List data;
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/controller/User/Results/UserResult.java b/src/main/java/com/hxzk/gps/controller/User/Results/UserResult.java
deleted file mode 100644
index 98fa34e..0000000
--- a/src/main/java/com/hxzk/gps/controller/User/Results/UserResult.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.hxzk.gps.controller.User.Results;
-
-import com.hxzk.gps.util.Result.TableDto;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class UserResult {
- private Integer code;
- private String msg;
- private TableDto data;
-
-
- public UserResult() {
-
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/User/Results/UserTreeTableDto.java b/src/main/java/com/hxzk/gps/controller/User/Results/UserTreeTableDto.java
deleted file mode 100644
index a44ba09..0000000
--- a/src/main/java/com/hxzk/gps/controller/User/Results/UserTreeTableDto.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.User.Results;
-
-import lombok.Data;
-
-@Data
-public class UserTreeTableDto {
- private String departmentId;
- private Integer pageNum;
- private Integer pageSize;
- private String username;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/User/TbUserController.java b/src/main/java/com/hxzk/gps/controller/User/TbUserController.java
deleted file mode 100644
index 37deb9c..0000000
--- a/src/main/java/com/hxzk/gps/controller/User/TbUserController.java
+++ /dev/null
@@ -1,262 +0,0 @@
-package com.hxzk.gps.controller.User;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import cn.dev33.satoken.stp.StpUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.controller.User.Results.MenuListResult;
-import com.hxzk.gps.controller.User.Results.UserTreeTableDto;
-import com.hxzk.gps.controller.User.Results.UserResult;
-import com.hxzk.gps.entity.Role.Role;
-import com.hxzk.gps.entity.User.TbUser;
-import com.hxzk.gps.entity.User.dto.LoginResult;
-import com.hxzk.gps.service.Role.IRoleService;
-import com.hxzk.gps.service.User.TbUserService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.util.SMS.TenSMS;
-import com.hxzk.gps.util.Time.TimeUtil;
-import com.tencentcloudapi.common.exception.TencentCloudSDKException;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static com.hxzk.gps.util.AES.AES.encrypt;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * 鐢ㄦ埛绠$悊
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-04-17
- */
-@RestController
-@RequestMapping("/User")
-@Api(tags="鐢ㄦ埛绠$悊")
-public class TbUserController {
- @Autowired
- private TbUserService tbUserService;
- @Autowired
- IRoleService roleService;
- // 鐧诲綍
-
- Map<String,String> UserSmsMap = new HashMap<>();
- @ApiOperation(value = "鐢ㄦ埛瀵嗙爜鐧诲綍鎺ュ彛", notes = "璇ユ帴鍙g敤浜庣敤鎴风櫥褰曠郴缁燂紝鎺ユ敹鐢ㄦ埛鍚嶅拰瀵嗙爜浣滀负鍙傛暟锛岃繑鍥炲姞瀵員oken淇℃伅")
- @PostMapping("/Login")
- public LoginResult Login(@RequestBody TbUser user, HttpServletRequest request) {
- String clientIp = getClientIp(request);
- return tbUserService.Login(user.getUsername(),user.getPassword(),user.getStatus(),clientIp);
- }
- @ApiOperation(value = "鐢ㄦ埛鎵嬫満鍙风櫥褰曟帴鍙�", notes = "璇ユ帴鍙g敤浜庣敤鎴风櫥褰曠郴缁燂紝鎺ユ敹鐢ㄦ埛鍚嶅拰瀵嗙爜浣滀负鍙傛暟锛岃繑鍥炲姞瀵員oken淇℃伅")
- @PostMapping("/phoneLogin")
- public LoginResult phoneLogin(@RequestBody TbUser user, HttpServletRequest request) {
- String clientIp = getClientIp(request);
- String code = UserSmsMap.get(user.getPhone());
- if (code.equals(user.getPassword())){
- //鐧诲綍鎴愬姛
- unfreezeUser(user);
- return tbUserService.phoneLogin(user.getPhone(),clientIp);
- }else{
- return new LoginResult(201, MessageUtils.getMessage("LoginSmSError"), "000");
- }
- }
- @RequestMapping("GetToken")
- public TbUser GetToken(@RequestBody TbUser user) throws Exception {
- TbUser user1 = new TbUser();
- user1.setUsername(encrypt(user.getUsername()));
- user1.setPassword(encrypt(user.getPassword()));
- return user1;
- }
- @ApiOperation(value = "鐢ㄦ埛鍐荤粨鎺ュ彛", notes = "璇ユ帴鍙g敤浜庣敤鎴峰喕缁�")
- @PostMapping("/freezeUser")
- public boolean freezeUser(@RequestBody TbUser user) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("username",user.getUsername());
- user.setStatus("1");
- return tbUserService.update(user,queryWrapper);
- }
-
- @ApiOperation(value = "鐢ㄦ埛瑙e喕鎺ュ彛", notes = "璇ユ帴鍙g敤浜庣敤鎴峰喕缁�")
- @PostMapping("/unfreezeUser")
- public boolean unfreezeUser(@RequestBody TbUser user) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("username",user.getUsername());
- user.setStatus("0");
- return tbUserService.update(user,queryWrapper);
- }
-
- @ApiOperation(value = "妫�鏌ョ櫥褰曟帴鍙�", notes = "璇ユ帴鍙g敤浜庢鏌ョ敤鎴锋槸鍚﹁繕鍦ㄧ櫥褰曠姸鎬侊紝杩斿洖甯冨皵鍊艰〃绀烘槸鍚︾櫥褰�")
- @RequestMapping("isLogin")
- public boolean isLogin(){
- return StpUtil.isLogin();
- }
-
- @ApiOperation(value = "鐢ㄦ埛鑿滃崟鎺ュ彛", notes = "璇ユ帴鍙g敤浜庡睍绀虹敤鎴峰鑸彍鍗曚俊鎭�")
- @SaCheckLogin
- @RequestMapping("MenuList")
- public MenuListResult MenuList(){
- return tbUserService.UserMenu();
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐢ㄦ埛鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐢ㄦ埛鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindUserInfo")
- public UserResult FindUserInfo(@RequestBody UserTreeTableDto userTreeTableDto){
- return tbUserService.FindUserInfo(userTreeTableDto);
- }
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴瀵艰埅鑿滃崟鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴瀵艰埅鑿滃崟鍒楄〃淇℃伅")
- @PostMapping("Menu/All")
- public MenuListResult MenuAll(){
- return tbUserService.MenuAll();
- }
-
-
- @PostMapping("/sendSmsApi")
- public ReturnMessage SendMsage(@RequestBody TbUser user) throws TencentCloudSDKException {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("phone",user.getPhone());
- Integer result = Math.toIntExact(tbUserService.getBaseMapper().selectCount(queryWrapper));
- if (result >= 1){
- //鍙戦�佺煭淇�
- TenSMS tenSMS = new TenSMS();
- String code = generateVerificationCode();
- tenSMS.sms(user.getPhone(),code);
- UserSmsMap.put(user.getPhone(),code);
- return ReturnMessage.ReturnMessageSuccess("SmsSuccess");
- }else{
- return ReturnMessage.ReturnMessageError("PhoneError");
- }
- }
-
-
- @PostMapping("/SendWarning")
- public ReturnMessage SendWarning(@RequestBody TbUser user) throws TencentCloudSDKException {
- TenSMS tenSMS = new TenSMS();
- tenSMS.smsWarning(user.getPhone(), user.getStatus());
- return ReturnMessage.ReturnMessageSuccess("SmsSuccess");
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐢ㄦ埛閫�鍑烘帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐢ㄦ埛閫�鍑�")
- @PostMapping("logout")
- public String logout(){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("username",UserInfoUtil.getUserName());
- TbUser user = new TbUser();
- user.setStatus("0");
- user.setUsername(UserInfoUtil.getUserName());
- tbUserService.getBaseMapper().update(user,queryWrapper);
- StpUtil.logout();
- return "宸查��鍑�";
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐢ㄦ埛娣诲姞鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐢ㄦ埛娣诲姞鍔熻兘")
- @PostMapping("add")
- public ReturnMessage add(@RequestBody TbUser user){
- return tbUserService.add(user);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐢ㄦ埛淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐢ㄦ埛淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody TbUser user){
- return tbUserService.update(user);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐢ㄦ埛鍒犻櫎鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐢ㄦ埛鍒犻櫎鍔熻兘")
- @PostMapping("delete")
- public ReturnMessage delete(@RequestBody TbUser user){
- return tbUserService.delete(user);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鑾峰彇鐢ㄦ埛鍚嶇О鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鑾峰彇鐢ㄦ埛鍚嶇О鍔熻兘")
- @PostMapping("FindUserName")
- public TbUser FindUserName(){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("username",UserInfoUtil.getUserName());
- TbUser user = tbUserService.getBaseMapper().selectOne(queryWrapper);
- return user;
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐢ㄦ埛鏉冮檺鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐢ㄦ埛鏉冮檺鏌ヨ鍔熻兘")
- @GetMapping("buttons")
- public Map loginTest1(){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("username", UserInfoUtil.getUserName());
- TbUser user1 = tbUserService.getBaseMapper().selectOne(queryWrapper);
- QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",user1.getJueseid());
- Role role = roleService.getBaseMapper().selectOne(queryWrapper1);
- List<String> user = new ArrayList<>();
- if (role.isAddrole()){
- user.add("add");
- }
- if (role.isEditrole()){
- user.add("edit");
- }
- if (role.isDeleterole()){
- user.add("delete");
- }
- // 鍒涘缓鏉冮檺鏁版嵁瀵硅薄
- Map<String, List<String>> data = new HashMap<>();
- data.put("role", user);
- // 鍒涘缓鍝嶅簲瀵硅薄
- Map<String, Object> map = new HashMap<>();
- map.put("code", 200);
- map.put("data", data);
- return map;
- }
-
-
-
- private String getClientIp(HttpServletRequest request) {
- String xffHeader = request.getHeader("X-Forwarded-For");
- if (xffHeader == null || xffHeader.isEmpty() || "unknown".equalsIgnoreCase(xffHeader)) {
- // 濡傛灉 X-Forwarded-For 澶翠笉瀛樺湪鎴栬�呮棤鏁堬紝鍒欏皾璇曚粠鍏朵粬甯歌鐨勫ご鑾峰彇
- String proxyClientIp = request.getHeader("Proxy-Client-IP");
- if (proxyClientIp != null && !proxyClientIp.isEmpty() && !"unknown".equalsIgnoreCase(proxyClientIp)) {
- return proxyClientIp;
- }
- String wlProxyClientIp = request.getHeader("WL-Proxy-Client-IP");
- if (wlProxyClientIp != null && !wlProxyClientIp.isEmpty() && !"unknown".equalsIgnoreCase(wlProxyClientIp)) {
- return wlProxyClientIp;
- }
- // 鑻ラ兘娌℃湁锛岀洿鎺ヤ娇鐢� request.getRemoteAddr()
- return request.getRemoteAddr();
- } else {
- // X-Forwarded-For 澶村瓨鍦紝鍙栫涓�涓� IP 鍦板潃
- int index = xffHeader.indexOf(',');
- if (index != -1) {
- return xffHeader.substring(0, index);
- } else {
- return xffHeader;
- }
- }
- }
-
-/*
-* 鐢熸垚鍏綅鏁伴殢鏈洪獙璇佺爜
-* */
- public static String generateVerificationCode() {
- // 鐢熸垚 0 鍒� 999999 涔嬮棿鐨勯殢鏈烘暣鏁�
- int randomNum = (int) (Math.random() * 1000000);
- // 灏嗛殢鏈烘暣鏁版牸寮忓寲涓� 6 浣嶅瓧绗︿覆锛屼笉瓒� 6 浣嶆椂鍓嶉潰琛� 0
- return String.format("%06d", randomNum);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Video/TbHksxtController.java b/src/main/java/com/hxzk/gps/controller/Video/TbHksxtController.java
deleted file mode 100644
index a31258f..0000000
--- a/src/main/java/com/hxzk/gps/controller/Video/TbHksxtController.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.hxzk.gps.controller.Video;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.controller.Video.dto.TableSearchResult.TableVideoSearchResult;
-import com.hxzk.gps.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.entity.Video.TbHksxt;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Video.TbHksxtService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-01
- */
-@RestController
-@RequestMapping("/Video")
-public class TbHksxtController {
- @Autowired
- TbHksxtService hksxtService;
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鎿嶄綔鏃ュ織鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鎿嶄綔鏃ュ織鍒楄〃鏌ヨ鍔熻兘")
- @PostMapping("FindVideoInfo")
- public ResultTable FindVideoInfo(@RequestBody TableVideoSearchResult tableVideoSearchResult){
- return hksxtService.FindVideoInfo(tableVideoSearchResult);
- }
-
-// 娣诲姞鐩戞帶鍒板湴鍥�
- @SaCheckLogin
- @PostMapping("AddVideoMap")
- public List<TbHksxt> AddVideoMap(){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- return hksxtService.getBaseMapper().selectList(queryWrapper);
- }
- @SaCheckLogin
- @ApiOperation(value = "鐩戞帶鏂板鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐩戞帶鏂板鍔熻兘")
- @PostMapping("add")
- public ReturnMessage add(@RequestBody TbHksxt hksxt){
- return hksxtService.add(hksxt);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鐩戞帶淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐩戞帶淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody TbHksxt hksxt){
- return hksxtService.update(hksxt);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鐩戞帶鍒犻櫎鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐩戞帶鍒犻櫎鍔熻兘")
- @PostMapping("delete")
- public ReturnMessage delete(@RequestBody TbHksxt hksxt){
- return hksxtService.delete(hksxt);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Video/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/Video/dto/TableList.java
deleted file mode 100644
index 20d4da2..0000000
--- a/src/main/java/com/hxzk/gps/controller/Video/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Video.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Video/dto/TableSearchResult/TableVideoSearchResult.java b/src/main/java/com/hxzk/gps/controller/Video/dto/TableSearchResult/TableVideoSearchResult.java
deleted file mode 100644
index 8cc9a31..0000000
--- a/src/main/java/com/hxzk/gps/controller/Video/dto/TableSearchResult/TableVideoSearchResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.controller.Video.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Video.dto.TableList;
-import com.hxzk.gps.entity.HistoryPower.TbAcHistoryPower;
-import com.hxzk.gps.entity.Video.TbHksxt;
-import lombok.Data;
-
-@Data
-public class TableVideoSearchResult<T> {
- private TableList tableList;
- private TbHksxt hksxt;
-
-}
diff --git a/src/main/java/com/hxzk/gps/controller/WarnTongJi/WarnTongjiCompanyController.java b/src/main/java/com/hxzk/gps/controller/WarnTongJi/WarnTongjiCompanyController.java
deleted file mode 100644
index 2e19ad3..0000000
--- a/src/main/java/com/hxzk/gps/controller/WarnTongJi/WarnTongjiCompanyController.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.hxzk.gps.controller.WarnTongJi;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.controller.Warning.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Fence.TbFence;
-import com.hxzk.gps.entity.User.TbUser;
-import com.hxzk.gps.entity.WarnTongJi.WarnTongjiCompany;
-import com.hxzk.gps.entity.Warning.TbWarning;
-import com.hxzk.gps.mapper.Warning.TbWarningMapper;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.service.Anchor.TbAchorService;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Department.TbDepartmentService;
-import com.hxzk.gps.service.Fence.TbFenceService;
-import com.hxzk.gps.service.Person.TbPersonService;
-import com.hxzk.gps.service.WarnTongJi.WarnTongjiCompanyService;
-import com.hxzk.gps.service.Warning.TbWarningService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-06-09
- */
-@RestController
-@RequestMapping("/WarningTongJi")
-public class WarnTongjiCompanyController {
- @Autowired
- WarnTongjiCompanyService warnTongjiCompanyService;
- @Autowired
- TbPersonService personService;
- @Autowired
- TbFenceService fenceService;
- @Autowired
- TbAchorService achorService;
- @Autowired
- TbDepartmentService departmentService;
- @Autowired
- TbWarningMapper warningMapper;
- @Autowired
- TbCompanyService companyService;
-
-
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鍛婅鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍛婅鍒楄〃鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindWarningTongJiInfo")
- public ResultTable FindWarningTongJiInfo(@RequestBody TableSearchResult TableSearchResult){
- return warnTongjiCompanyService.FindWarningTongJiInfo(TableSearchResult);
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鐢ㄦ埛淇敼鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鐢ㄦ埛淇敼鍔熻兘")
- @PostMapping("update")
- public ReturnMessage update(@RequestBody WarnTongjiCompany warnTongjiCompany){
- return warnTongjiCompanyService.update(warnTongjiCompany);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴瀹炴椂缁熻鏌ヨ鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴瀹炴椂缁熻鏌ヨ鍔熻兘")
- @PostMapping("FindDayCountInfo")
- public List<WarnTongjiCompany> FindDayCountInfo(){
- return warnTongjiCompanyService.FindDayCountInfo();
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴缁熻椤甸潰鍩虹鏁版嵁鏌ヨ鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴缁熻椤甸潰鍩虹鏁版嵁鏌ヨ鍔熻兘")
- @PostMapping("FindBSCount")
- public List FindBSCount(){
- List<Long> companyids = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- List<Long> companyname = companyService.getChildCompanyNames(UserInfoUtil.getUserCompany());
- List list = new ArrayList<>();
- QueryWrapper queryWrapperOnLinePerson = new QueryWrapper<>();
- queryWrapperOnLinePerson.in("companyid", companyids);
- queryWrapperOnLinePerson.eq("p_online","1");
- list.add(personService.getBaseMapper().selectCount(queryWrapperOnLinePerson));
- QueryWrapper queryWrapperPeronNoLine = new QueryWrapper<>();
- queryWrapperPeronNoLine.in("companyid", companyids);
- queryWrapperPeronNoLine.eq("p_online","0");
- list.add(personService.getBaseMapper().selectCount(queryWrapperPeronNoLine));
- QueryWrapper queryWrapperFence = new QueryWrapper<>();
- queryWrapperFence.in("company", companyname);
- list.add(fenceService.getBaseMapper().selectCount(queryWrapperFence));
- QueryWrapper queryWrapperAchor = new QueryWrapper<>();
- queryWrapperAchor.in("company", companyname);
- list.add(achorService.getBaseMapper().selectCount(queryWrapperAchor));
- QueryWrapper queryWrapperDepartment = new QueryWrapper<>();
- queryWrapperDepartment.in("companyid", companyids);
- list.add(departmentService.getBaseMapper().selectCount(queryWrapperDepartment));
- return list;
- }
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴缁熻椤甸潰鍛婅鏌ヨ鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴缁熻椤甸潰鍛婅鏌ヨ鍔熻兘")
- @PostMapping("FindBSWarningCount")
- public List FindBSWarningCount(){
- List list = new ArrayList<>();
- List<Long> list1 = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- list.add(warningMapper.FindDayCountInfo("SOS",list1));
- list.add(warningMapper.FindDayCountInfo("杩涘叆鍛婅",list1));
- list.add(warningMapper.FindDayCountInfo("鍑哄幓鍛婅",list1));
- list.add(warningMapper.FindDayCountInfo("鑱氶泦鍛婅",list1));
- list.add(warningMapper.FindDayCountInfo("瓒呭憳鍛婅",list1));
- return list;
- }
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴缁熻椤甸潰鍛婅鏌ヨ鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴缁熻椤甸潰鍛婅鏌ヨ鍔熻兘")
- @PostMapping("FindDayWarningCount")
- public Map FindDayWarningCount(@RequestBody TbWarning warning){
- Map map = new HashMap<>();
- map.put("SOS",warningMapper.FindDayDateCountInfo("SOS",UserInfoUtil.getUserCompany(), Integer.valueOf(warning.getTime())));
- map.put("杩涘叆鍛婅",warningMapper.FindDayDateCountInfo("杩涘叆鍛婅",UserInfoUtil.getUserCompany(), Integer.valueOf(warning.getTime())));
- map.put("鍑哄幓鍛婅",warningMapper.FindDayDateCountInfo("鍑哄幓鍛婅",UserInfoUtil.getUserCompany(), Integer.valueOf(warning.getTime())));
- map.put("鑱氶泦鍛婅",warningMapper.FindDayDateCountInfo("鑱氶泦鍛婅",UserInfoUtil.getUserCompany(), Integer.valueOf(warning.getTime())));
- map.put("瓒呭憳鍛婅",warningMapper.FindDayDateCountInfo("瓒呭憳鍛婅",UserInfoUtil.getUserCompany(), Integer.valueOf(warning.getTime())));
- return map;
- }
- @SaCheckLogin
- @ApiOperation(value = "寮曟搸鏇存柊鏃堕棿鏌ヨ", notes = "璇ユ帴鍙f彁渚涗簡寮曟搸鏇存柊鏃堕棿鏌ヨ鍔熻兘")
- @PostMapping("FindCSDATE")
- public String FindCSDATE(){
- return warningMapper.FindCSDATE();
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Warning/Result/WarningResult.java b/src/main/java/com/hxzk/gps/controller/Warning/Result/WarningResult.java
deleted file mode 100644
index 4f694c9..0000000
--- a/src/main/java/com/hxzk/gps/controller/Warning/Result/WarningResult.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.hxzk.gps.controller.Warning.Result;
-
-import com.hxzk.gps.util.Result.TableDto;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class WarningResult {
- private Integer code;
- private String msg;
- private TableDto data;
- private Integer pageNum;
- private Integer pageSize;
- private Long total;
-
- public WarningResult() {
-
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Warning/TbWarningController.java b/src/main/java/com/hxzk/gps/controller/Warning/TbWarningController.java
deleted file mode 100644
index 3fa0928..0000000
--- a/src/main/java/com/hxzk/gps/controller/Warning/TbWarningController.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.hxzk.gps.controller.Warning;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Warning.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.entity.Warning.TbWarning;
-import com.hxzk.gps.mapper.Warning.TbWarningMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Person.TbPersonService;
-import com.hxzk.gps.service.Warning.TbWarningService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@RestController
-@RequestMapping("/Warning")
-@Api("鍛婅绠$悊")
-public class TbWarningController {
- @Autowired
- TbWarningService warningService;
-
- @Autowired
- TbWarningMapper warningMapper;
-
- @Autowired
- TbPersonService personService;
-
- @Autowired
- TbCompanyService companyService;
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鍛婅鍒楄〃鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍛婅鍒楄〃鐨勪俊鎭煡璇㈠姛鑳�")
- @PostMapping("FindWarningInfo")
- public ResultTable FindWarningInfo(@RequestBody TableSearchResult TableSearchResult){
- return warningService.FindWarningInfo(TableSearchResult);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鍏徃鏈鐞嗗憡璀﹀垪琛ㄦ帴鍙�", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍏徃鏈鐞嗗憡璀﹀垪琛ㄧ殑淇℃伅鏌ヨ鍔熻兘")
- @PostMapping("FindWarningUntreated")
- public ResultTable FindWarningUntreated(@RequestBody TableSearchResult TableSearchResult){
- return warningService.FindWarningUntreated(TableSearchResult);
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鍛婅鍏ㄩ儴澶勭悊鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍛婅鍏ㄩ儴澶勭悊鍔熻兘")
- @PostMapping("AllHandle")
- public ReturnMessage AllHandle(){
- return warningService.AllHandle();
- }
-
- @SaCheckLogin
- @ApiOperation(value = "鍛婅澶勭悊鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鍛婅澶勭悊鍔熻兘")
- @PostMapping("Handle")
- public ReturnMessage Handle(@RequestBody TbWarning warning){
- return warningService.Handle(warning);
- }
-
-
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴缁熻鍒嗘瀽鍛婅鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴缁熻鍒嗘瀽鍛婅鍔熻兘")
- @PostMapping("FindWarningAll")
- public List<TbWarning> FindWarningAll(){
- return warningMapper.FindWarningAll(UserInfoUtil.getUserCompany());
- }
- @SaCheckLogin
- @ApiOperation(value = "骞冲彴鏍规嵁鍛婅绫诲瀷鏌ヨ鎺ュ彛", notes = "璇ユ帴鍙f彁渚涗簡骞冲彴鏍规嵁鍛婅绫诲瀷鏌ヨ鍔熻兘")
- @PostMapping("FindWarningInfoType")
- public ResultTable FindWarningInfoType(@RequestBody TableSearchResult TableSearchResult){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbPerson> infoNoPerson = new PageInfo<>();
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- switch (TableSearchResult.getWarning().getType()){
- case "SOS鎶ヨ":
- PageInfo<TbWarning> infoNoWarningSOS = new PageInfo<>(warningMapper.FindWarningInfoType(list,"SOS"));
- table<TbWarning> infoWarningSOS = new table<>(infoNoWarningSOS.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),infoNoPerson.getTotal());
- return ListDataResult.resultTableSuccess(infoWarningSOS, MessageUtils.getMessage("Success"));
- case "鑱氶泦鎶ヨ":
- PageInfo<TbWarning> infoNoWarningJuJi = new PageInfo<>(warningMapper.FindWarningInfoType(list,"鑱氶泦鍛婅"));
- table<TbWarning> infoWarningJuJi = new table<>(infoNoWarningJuJi.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),infoNoPerson.getTotal());
- return ListDataResult.resultTableSuccess(infoWarningJuJi, MessageUtils.getMessage("Success"));
- case "瓒婄晫鎶ヨ":
- PageInfo<TbWarning> infoNoWarningChuQu = new PageInfo<>(warningMapper.FindWarningInfoType(list,"鍑哄幓鍛婅"));
- table<TbWarning> infoWarningChuQu = new table<>(infoNoWarningChuQu.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),infoNoPerson.getTotal());
- return ListDataResult.resultTableSuccess(infoWarningChuQu, MessageUtils.getMessage("Success"));
-
- case "杩涘叆鎶ヨ":
- PageInfo<TbWarning> infoNoWarningJinRu = new PageInfo<>(warningMapper.FindWarningInfoType(list,"杩涘叆鍛婅"));
- table<TbWarning> infoWarningJinRu = new table<>(infoNoWarningJinRu.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),infoNoPerson.getTotal());
- return ListDataResult.resultTableSuccess(infoWarningJinRu, MessageUtils.getMessage("Success"));
-
- case "绂荤嚎浜哄憳":
- queryWrapper.eq("p_online","0");
- queryWrapper.in("companyid", list);
- infoNoPerson = new PageInfo<>(personService.getBaseMapper().selectList(queryWrapper));
- table<TbPerson> infoPersons = new table<>(infoNoPerson.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),infoNoPerson.getTotal());
- return ListDataResult.resultTableSuccess(infoPersons, MessageUtils.getMessage("Success"));
- case "鍦ㄧ嚎浜哄憳":
- queryWrapper.eq("p_online","1");
- queryWrapper.in("companyid", list);
- infoNoPerson = new PageInfo<>(personService.getBaseMapper().selectList(queryWrapper));
- table<TbPerson> achortable = new table<>(infoNoPerson.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),infoNoPerson.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
- return null;
- }
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Warning/dto/TableList.java b/src/main/java/com/hxzk/gps/controller/Warning/dto/TableList.java
deleted file mode 100644
index 1cbfa4a..0000000
--- a/src/main/java/com/hxzk/gps/controller/Warning/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.controller.Warning.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/controller/Warning/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/controller/Warning/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 045e45c..0000000
--- a/src/main/java/com/hxzk/gps/controller/Warning/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hxzk.gps.controller.Warning.dto.TableSearchResult;
-
-import com.hxzk.gps.controller.Warning.dto.TableList;
-import com.hxzk.gps.entity.Warning.TbWarning;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private TbWarning warning;
-
-}
diff --git a/src/main/java/com/hxzk/gps/dto/TableList.java b/src/main/java/com/hxzk/gps/dto/TableList.java
deleted file mode 100644
index 6e43a61..0000000
--- a/src/main/java/com/hxzk/gps/dto/TableList.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class TableList {
- private int pageNum;
- private int pageSize;
-}
diff --git a/src/main/java/com/hxzk/gps/dto/TableSearchResult/TableSearchResult.java b/src/main/java/com/hxzk/gps/dto/TableSearchResult/TableSearchResult.java
deleted file mode 100644
index 4fc28c4..0000000
--- a/src/main/java/com/hxzk/gps/dto/TableSearchResult/TableSearchResult.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.hxzk.gps.dto.TableSearchResult;
-
-import com.hxzk.gps.dto.TableList;
-import lombok.Data;
-
-@Data
-public class TableSearchResult<T> {
- private TableList tableList;
- private T data;
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Anchor/TbAchor.java b/src/main/java/com/hxzk/gps/entity/Anchor/TbAchor.java
deleted file mode 100644
index a486a64..0000000
--- a/src/main/java/com/hxzk/gps/entity/Anchor/TbAchor.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package com.hxzk.gps.entity.Anchor;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 鍩虹珯
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@Data
-@TableName("tb_achor")
-public class TbAchor implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 鍩虹珯搴忓彿
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鍩虹珯ID
- */
- private String anchorid;
-
- /**
- * 鍩虹珯X鍧愭爣
- */
- private String posx;
-
- /**
- * 鍩虹珯Y鍧愭爣
- */
- private String posy;
-
- /**
- * 鍩虹珯鐨刏鍧愭爣
- */
- private String posz;
-
- /**
- * 鍩虹珯鎵�鍦ㄧ殑灞�
- */
- private String layer;
-
- /**
- * 鍩虹珯鎵�鍦ㄧ殑鍒嗙粍
- */
- private String zu;
-
- /**
- * 鍩虹珯鐨勯噺绋嬶紝榛樿鏃犻檺鍒�
- */
- private String liangcheng;
-
- /**
- * 鍩虹珯鐨勭姸鎬佸湪绾�1绂荤嚎0
- */
- private String anchormode;
-
- /**
- * 鍩虹珯鐨処P鍦板潃
- */
- private String anchorip;
-
- /**
- * 鍩虹珯鐗堟湰
- */
- private String version;
-
- /**
- * 鍩虹珯鍔熺巼
- */
- private String gonglv;
-
- /**
- * 鍩虹珯鏍″噯鍊�
- */
- private String jiaozhundistance;
-
- /**
- * 鍩虹珯鏇存柊鏃堕棿
- */
- private String greatetime;
-
- /**
- * 鍩虹珯鍚屾鐘舵��
- */
- private String tongbu;
-
- /**
- * 鍩虹珯鏄惁鏄笁缁村弬鑰冨熀鍑�
- */
- private String baoliu1;
-
- /**
- * 鍩虹珯鏂扮殑楂樺害
- */
- private String baoliu2;
-
- /**
- * 鏂伴珮搴︽墍鍦ㄧ殑缁�
- */
- private String baoliu3;
-
- /**
- * 鍩虹珯蹇呯粡璺濈
- */
- private String baoliu4;
-
- /**
- * 閫氳繃璺濈鍒ゆ柇鏍囩鏄惁鍦ㄥ鍐�
- */
- private String baoliu5;
-
- /**
- * 鍙樼數绔欐ā寮忎笅鍩虹珯鐨勭粡搴�
- */
- private String baoliu6;
-
- /**
- * 鍙樼數绔欐ā寮忎笅鍩虹珯鐨勭含搴�
- */
- private String baoliu7;
-
- /**
- * 鍏嶅竷绾挎ā寮忎笅鍩虹珯鐨勭數閲�
- */
- private String baoliu8;
-
- private String baoliu9;
-
- private String baoliu10;
-
- /**
- * 鍩虹珯X鍧愭爣杞负缁忓害搴︽牸寮�
- */
- private String baoliu11;
-
- /**
- * 鍩虹珯Y鍧愭爣杞负绾害搴︽牸寮�
- */
- private String baoliu12;
-
- /**
- * 鍩虹珯鎵�澶勭殑娴锋嫈楂樺害鍗曚綅绫�
- */
- private String baoliu13;
-
- /**
- * 鍩虹珯瀵瑰簲鐨刲ora缃戝叧
- */
- private String baoliu14;
-
- /**
- * lora鍩虹珯鐨勪俊鍙峰彂閫佹椂闂�
- */
- private String baoliu15;
-
- /**
- * 閫氶亾2鍩虹珯ID
- */
- private String baoliu16;
-
- /**
- * 澶╃嚎鏈濆悜
- */
- private String baoliu17;
-
- private String baoliu18;
-
- /**
- * 鍩虹珯鍒囧眰璺濈
- */
- private String baoliu19;
-
- /**
- * 鍩虹珯涓夌淮閲忕▼
- */
- private String baoliu20;
-
- /**
- * 鍩虹珯鏄摑鐗欒繕鏄疷WB
- */
- private String baoliu21;
-
- /**
- * 鎵�灞炲叕鍙�
- */
- private String company;
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Attendance/TbKaoqing.java b/src/main/java/com/hxzk/gps/entity/Attendance/TbKaoqing.java
deleted file mode 100644
index 137c7a8..0000000
--- a/src/main/java/com/hxzk/gps/entity/Attendance/TbKaoqing.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.hxzk.gps.entity.Attendance;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@Data
-@TableName("tb_kaoqing")
-public class TbKaoqing implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 鍘嗗彶鑰冨嫟璁板綍琛�
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鍖哄煙鍚嶇О:
- */
- private String area;
-
- private String name;
-
- /**
- * 閮ㄩ棬
- */
- private String bumen;
-
- /**
- * 鏍囩ID
- */
- private String tagid;
-
- /**
- * 杩涘叆鏃堕棿
- */
- private String intime;
-
- /**
- * 鍑烘潵鏃堕棿
- */
- private String outtime;
-
- /**
- * 鍋滅暀鏃堕棿
- */
- private String alltime;
-
- /**
- * 澶囨敞
- */
- private String beizhu;
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Attendance/TbRealkaoqing.java b/src/main/java/com/hxzk/gps/entity/Attendance/TbRealkaoqing.java
deleted file mode 100644
index 0c8ef84..0000000
--- a/src/main/java/com/hxzk/gps/entity/Attendance/TbRealkaoqing.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.hxzk.gps.entity.Attendance;
-
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-@TableName("tb_realkaoqing")
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@Setter
-@Getter
-public class TbRealkaoqing {
- @TableId
- private Long id;
- private String area;
- private String name;
- private String bumen;
- private String tagid;
- private String intime;
- private String beizhu;
- private String juli;
- private String baoliu1;
- private String baoliu2;
- private String baoliu3;
- private String baoliu4;
- private String baoliu5;
- private String baoliu6;
- private String baoliu7;
- private String baoliu8;
- private String baoliu9;
- private String baoliu10;
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Cabinet/TbCabinet.java b/src/main/java/com/hxzk/gps/entity/Cabinet/TbCabinet.java
deleted file mode 100644
index 7805646..0000000
--- a/src/main/java/com/hxzk/gps/entity/Cabinet/TbCabinet.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.hxzk.gps.entity.Cabinet;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-03
- */
-@TableName("tb_cabinet")
-@Data
-public class TbCabinet implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鏌滃瓙鍙�
- */
- private String cabinetnum;
-
- /**
- * 鏌滃瓙鍚嶇О
- */
- private String cabinetname;
-
- private String guizistate;
- private String company;
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Cabinet/TbFakahuanlog.java b/src/main/java/com/hxzk/gps/entity/Cabinet/TbFakahuanlog.java
deleted file mode 100644
index 8867512..0000000
--- a/src/main/java/com/hxzk/gps/entity/Cabinet/TbFakahuanlog.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.hxzk.gps.entity.Cabinet;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-15
- */
-@TableName("tb_fakahuanlog")
-@Data
-public class TbFakahuanlog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- private String guiziname;
-
- private String guiziid;
-
- private String kacaoid;
-
- private String tagid;
-
- private String time;
- private String personname;
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Cabinet/TbFakalog.java b/src/main/java/com/hxzk/gps/entity/Cabinet/TbFakalog.java
deleted file mode 100644
index fc8e4fb..0000000
--- a/src/main/java/com/hxzk/gps/entity/Cabinet/TbFakalog.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.hxzk.gps.entity.Cabinet;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 鍙戝崱鏃ュ織瀹炰綋绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-01-XX
- */
-@TableName("fakalog")
-@Data
-public class TbFakalog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鏌滃瓙鍚嶇О
- */
- private String guiziname;
-
- /**
- * 鏌滃瓙缂栧彿
- */
- private String guiziid;
-
- /**
- * 鍙栧崱鍗℃Ы
- */
- private String takekacao;
-
- /**
- * 鍙栧崱鏃堕棿
- */
- private String taketime;
-
- /**
- * 鍙栧崱浜哄悕绉�
- */
- private String takename;
-
- /**
- * 鍙栧崱鐨勭紪鍙�
- */
- private String taketagid;
-
- /**
- * 杩樺崱鍗℃Ы
- */
- private String savekacao;
-
- /**
- * 杩樺崱鏃堕棿
- */
- private String savetime;
-
- /**
- * 杩樺崱鐨勭紪鍙�
- */
- private String savetagid;
-
- /**
- * 杩樺崱浜哄悕绉�
- */
- private String savename;
-
- /**
- * 鍙栧崱鐢ㄦ埛ID
- */
- private String takeuserid;
-
-}
-
diff --git a/src/main/java/com/hxzk/gps/entity/Cabinet/TbFakaqulog.java b/src/main/java/com/hxzk/gps/entity/Cabinet/TbFakaqulog.java
deleted file mode 100644
index f758258..0000000
--- a/src/main/java/com/hxzk/gps/entity/Cabinet/TbFakaqulog.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.hxzk.gps.entity.Cabinet;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-15
- */
-@TableName("tb_fakaqulog")
-public class TbFakaqulog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- private String guiziname;
-
- /**
- * 鏌滃瓙鍙�
- */
- private String guiziid;
-
- /**
- * 鍗℃Ыid
- */
- private String kacaoid;
-
- /**
- * tagid
- */
- private String tagid;
-
- /**
- * 棰嗗彇浜�
- */
- private String personname;
-
- /**
- * 棰嗗彇鏃堕棿
- */
- private String time;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getGuiziname() {
- return guiziname;
- }
-
- public void setGuiziname(String guiziname) {
- this.guiziname = guiziname;
- }
-
- public String getGuiziid() {
- return guiziid;
- }
-
- public void setGuiziid(String guiziid) {
- this.guiziid = guiziid;
- }
-
- public String getKacaoid() {
- return kacaoid;
- }
-
- public void setKacaoid(String kacaoid) {
- this.kacaoid = kacaoid;
- }
-
- public String getTagid() {
- return tagid;
- }
-
- public void setTagid(String tagid) {
- this.tagid = tagid;
- }
-
- public String getPersonname() {
- return personname;
- }
-
- public void setPersonname(String personname) {
- this.personname = personname;
- }
-
- public String getTime() {
- return time;
- }
-
- public void setTime(String time) {
- this.time = time;
- }
-
- @Override
- public String toString() {
- return "TbFakaqulog{" +
- "id = " + id +
- ", guiziname = " + guiziname +
- ", guiziid = " + guiziid +
- ", kacaoid = " + kacaoid +
- ", tagid = " + tagid +
- ", personname = " + personname +
- ", time = " + time +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Company/TbCompany.java b/src/main/java/com/hxzk/gps/entity/Company/TbCompany.java
deleted file mode 100644
index 5e81f45..0000000
--- a/src/main/java/com/hxzk/gps/entity/Company/TbCompany.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.hxzk.gps.entity.Company;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-04-17
- */
-@TableName("tb_company")
-@Data
-public class TbCompany implements Serializable {
- private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鍏徃鍚嶇О
- */
- private String companyname;
-
- /**
- * 鎵�灞濱D
- */
- private Integer parentid;
-
- /**
- * LOGO
- */
- private String logo;
-
- /**
- * 绯荤粺鍚嶇О
- */
- private String systemname;
- /**
- * 鍒涘缓浜�
- */
- private String addusername;
- /**
- * 娣诲姞鏃堕棿
- */
- private String addtime;
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Department/TbDepartMentIcon.java b/src/main/java/com/hxzk/gps/entity/Department/TbDepartMentIcon.java
deleted file mode 100644
index b09c4c2..0000000
--- a/src/main/java/com/hxzk/gps/entity/Department/TbDepartMentIcon.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.hxzk.gps.entity.Department;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * <p>
- * 閮ㄩ棬鍥炬爣
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-18
- */
-@TableName("tb_department_icon")
-@Data
-public class TbDepartMentIcon {
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- private String iconname;
- private String iconadress;
- private String company;
- private String companyid;
- private String username;
- private String addtime;
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Department/TbDepartment.java b/src/main/java/com/hxzk/gps/entity/Department/TbDepartment.java
deleted file mode 100644
index e2710b5..0000000
--- a/src/main/java/com/hxzk/gps/entity/Department/TbDepartment.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.hxzk.gps.entity.Department;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-18
- */
-@TableName("tb_department")
-@Data
-public class TbDepartment implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 搴忓彿
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 閮ㄩ棬鍚嶇О
- */
- private String departmentname;
-
- /**
- * 鍥炬爣鍦板潃
- */
- private String iconadress;
-
- /**
- * 娣诲姞鏃堕棿
- */
- private String addtime;
-
- private String baoliu1;
-
- private String baoliu2;
-
- private String baoliu3;
-
- private String baoliu4;
-
- private String baoliu5;
-
- private String baoliu6;
-
- private String baoliu7;
-
- private String baoliu8;
-
- private String baoliu9;
-
- /**
- * 鎵�灞炲叕鍙�
- */
- private String company;
-
-
- /**
- * 鎵�灞炲叕鍙窱D
- */
- private String companyid;
-}
diff --git a/src/main/java/com/hxzk/gps/entity/FaKaJi/TbFakaji.java b/src/main/java/com/hxzk/gps/entity/FaKaJi/TbFakaji.java
deleted file mode 100644
index e172055..0000000
--- a/src/main/java/com/hxzk/gps/entity/FaKaJi/TbFakaji.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.hxzk.gps.entity.FaKaJi;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-03
- */
-@TableName("tb_fakaji")
-@Data
-@Component
-public class TbFakaji implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- private String slotnumber;
-
- private String deviceid;
-
-
- private String tagname;
-
- private String status;
-
- private String userid;
-
- private String tagid;
-
- private String faceid;
- private String company;
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Fence/TbFence.java b/src/main/java/com/hxzk/gps/entity/Fence/TbFence.java
deleted file mode 100644
index 4705e89..0000000
--- a/src/main/java/com/hxzk/gps/entity/Fence/TbFence.java
+++ /dev/null
@@ -1,447 +0,0 @@
-package com.hxzk.gps.entity.Fence;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.time.LocalTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@TableName("tb_fence")
-@Data
-public class TbFence implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 搴忓彿
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鍥存爮鎵�鍦ㄥ浘灞�
- */
- private String floor;
-
- /**
- * 鍥存爮绫诲瀷锛岃�冨嫟鍖哄煙锛屽嵄闄╁尯鍩�
- */
- @Schema(description = "鍥存爮绫诲瀷", required = true)
- @NotNull(message = "鍥存爮绫诲瀷涓嶈兘涓虹┖")
- private String type;
-
- /**
- * 鍏宠仈閮ㄩ棬
- */
- private String bumen;
-
- /**
- * 鍥存爮鍚嶇О
- */
- @Schema(description = "鍥存爮鍚嶇О", required = true)
- @NotBlank(message = "鍥存爮鍚嶇О涓嶈兘涓虹┖")
- private String name;
-
- /**
- * 鍥存爮鍧愭爣
- */
- private String zuobiao;
-
- /**
- * 鍥存爮褰㈢姸锛屽杈瑰舰鎴栭暱鏂瑰舰
- */
- private String shape;
-
- /**
- * 鍥存爮鐢熸晥寮�濮嬫椂闂�
- */
- private LocalTime start;
-
- /**
- * 鍥存爮鐢熸晥缁撴潫鏃堕棿
- */
- private LocalTime stop;
-
- /**
- * 娣诲姞鍥存爮鏃堕棿
- */
- private String addtime;
-
- /**
- * 鍥存爮棰滆壊
- */
- private String color;
-
- /**
- * 鍥存爮楂樺害
- */
- private String baoliu1;
-
- /**
- * 鍥存爮闄愬埗鐨勪汉鏁�
- */
- private String baoliu2;
-
- private String baoliu3;
-
- private String baoliu4;
-
- private String baoliu5;
-
- /**
- * 鍙樼數绔欐ā寮忓垵濮嬫捣鎷旈珮搴�
- */
- private String baoliu6;
-
- /**
- * 鍥存爮鏄惁鍚敤1鍚敤0鏈惎鐢�
- */
- private String baoliu7;
-
- /**
- * 鍥存爮缁忕含搴︽牸寮�
- */
- private String baoliu8;
-
- /**
- * 鍥存爮鏄惁鍚敤鍚婇珮
- */
- private String baoliu9;
-
- /**
- * 鍥存爮鏄惁瀵瑰灞傜敓鏁堬紙1鐢熸晥锛�
- */
- private String baoliu10;
-
- private String baoliu11;
-
- private String baoliu12;
-
- private String baoliu13;
-
- private String baoliu14;
-
- private String baoliu15;
-
- private String baoliu16;
-
- private String baoliu17;
-
- private String baoliu18;
-
- private String baoliu19;
-
- private String baoliu20;
-
- /**
- * 鍏徃
- */
- private String company;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getFloor() {
- return floor;
- }
-
- public void setFloor(String floor) {
- this.floor = floor;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getBumen() {
- return bumen;
- }
-
- public void setBumen(String bumen) {
- this.bumen = bumen;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getZuobiao() {
- return zuobiao;
- }
-
- public void setZuobiao(String zuobiao) {
- this.zuobiao = zuobiao;
- }
-
- public String getShape() {
- return shape;
- }
-
- public void setShape(String shape) {
- this.shape = shape;
- }
-
- public LocalTime getStart() {
- return start;
- }
-
- public void setStart(LocalTime start) {
- this.start = start;
- }
-
- public LocalTime getStop() {
- return stop;
- }
-
- public void setStop(LocalTime stop) {
- this.stop = stop;
- }
-
- public String getAddtime() {
- return addtime;
- }
-
- public void setAddtime(String addtime) {
- this.addtime = addtime;
- }
-
- public String getColor() {
- return color;
- }
-
- public void setColor(String color) {
- this.color = color;
- }
-
- public String getBaoliu1() {
- return baoliu1;
- }
-
- public void setBaoliu1(String baoliu1) {
- this.baoliu1 = baoliu1;
- }
-
- public String getBaoliu2() {
- return baoliu2;
- }
-
- public void setBaoliu2(String baoliu2) {
- this.baoliu2 = baoliu2;
- }
-
- public String getBaoliu3() {
- return baoliu3;
- }
-
- public void setBaoliu3(String baoliu3) {
- this.baoliu3 = baoliu3;
- }
-
- public String getBaoliu4() {
- return baoliu4;
- }
-
- public void setBaoliu4(String baoliu4) {
- this.baoliu4 = baoliu4;
- }
-
- public String getBaoliu5() {
- return baoliu5;
- }
-
- public void setBaoliu5(String baoliu5) {
- this.baoliu5 = baoliu5;
- }
-
- public String getBaoliu6() {
- return baoliu6;
- }
-
- public void setBaoliu6(String baoliu6) {
- this.baoliu6 = baoliu6;
- }
-
- public String getBaoliu7() {
- return baoliu7;
- }
-
- public void setBaoliu7(String baoliu7) {
- this.baoliu7 = baoliu7;
- }
-
- public String getBaoliu8() {
- return baoliu8;
- }
-
- public void setBaoliu8(String baoliu8) {
- this.baoliu8 = baoliu8;
- }
-
- public String getBaoliu9() {
- return baoliu9;
- }
-
- public void setBaoliu9(String baoliu9) {
- this.baoliu9 = baoliu9;
- }
-
- public String getBaoliu10() {
- return baoliu10;
- }
-
- public void setBaoliu10(String baoliu10) {
- this.baoliu10 = baoliu10;
- }
-
- public String getBaoliu11() {
- return baoliu11;
- }
-
- public void setBaoliu11(String baoliu11) {
- this.baoliu11 = baoliu11;
- }
-
- public String getBaoliu12() {
- return baoliu12;
- }
-
- public void setBaoliu12(String baoliu12) {
- this.baoliu12 = baoliu12;
- }
-
- public String getBaoliu13() {
- return baoliu13;
- }
-
- public void setBaoliu13(String baoliu13) {
- this.baoliu13 = baoliu13;
- }
-
- public String getBaoliu14() {
- return baoliu14;
- }
-
- public void setBaoliu14(String baoliu14) {
- this.baoliu14 = baoliu14;
- }
-
- public String getBaoliu15() {
- return baoliu15;
- }
-
- public void setBaoliu15(String baoliu15) {
- this.baoliu15 = baoliu15;
- }
-
- public String getBaoliu16() {
- return baoliu16;
- }
-
- public void setBaoliu16(String baoliu16) {
- this.baoliu16 = baoliu16;
- }
-
- public String getBaoliu17() {
- return baoliu17;
- }
-
- public void setBaoliu17(String baoliu17) {
- this.baoliu17 = baoliu17;
- }
-
- public String getBaoliu18() {
- return baoliu18;
- }
-
- public void setBaoliu18(String baoliu18) {
- this.baoliu18 = baoliu18;
- }
-
- public String getBaoliu19() {
- return baoliu19;
- }
-
- public void setBaoliu19(String baoliu19) {
- this.baoliu19 = baoliu19;
- }
-
- public String getBaoliu20() {
- return baoliu20;
- }
-
- public void setBaoliu20(String baoliu20) {
- this.baoliu20 = baoliu20;
- }
-
- public String getCompany() {
- return company;
- }
-
- public void setCompany(String company) {
- this.company = company;
- }
-
- @Override
- public String toString() {
- return "TbFence{" +
- "id = " + id +
- ", floor = " + floor +
- ", type = " + type +
- ", bumen = " + bumen +
- ", name = " + name +
- ", zuobiao = " + zuobiao +
- ", shape = " + shape +
- ", start = " + start +
- ", stop = " + stop +
- ", addtime = " + addtime +
- ", color = " + color +
- ", baoliu1 = " + baoliu1 +
- ", baoliu2 = " + baoliu2 +
- ", baoliu3 = " + baoliu3 +
- ", baoliu4 = " + baoliu4 +
- ", baoliu5 = " + baoliu5 +
- ", baoliu6 = " + baoliu6 +
- ", baoliu7 = " + baoliu7 +
- ", baoliu8 = " + baoliu8 +
- ", baoliu9 = " + baoliu9 +
- ", baoliu10 = " + baoliu10 +
- ", baoliu11 = " + baoliu11 +
- ", baoliu12 = " + baoliu12 +
- ", baoliu13 = " + baoliu13 +
- ", baoliu14 = " + baoliu14 +
- ", baoliu15 = " + baoliu15 +
- ", baoliu16 = " + baoliu16 +
- ", baoliu17 = " + baoliu17 +
- ", baoliu18 = " + baoliu18 +
- ", baoliu19 = " + baoliu19 +
- ", baoliu20 = " + baoliu20 +
- ", company = " + company +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/FzRadar/TbFzanchor.java b/src/main/java/com/hxzk/gps/entity/FzRadar/TbFzanchor.java
deleted file mode 100644
index 4a8b413..0000000
--- a/src/main/java/com/hxzk/gps/entity/FzRadar/TbFzanchor.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.hxzk.gps.entity.FzRadar;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@TableName("tb_fzanchor")
-@Data
-public class TbFzanchor implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 搴忓彿
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 闃叉挒鍩虹珯鍚嶇О
- */
- private String name;
-
- /**
- * 闃叉挒鍩虹珯Id
- */
- private String achorid;
-
- /**
- * 闃叉挒璺濈
- */
- private String fzdis;
-
- /**
- * 娴侀噺鍗″彿
- */
- private String ccid;
-
- /**
- * 鐗堟湰鍙�
- */
- private String version;
-
- /**
- * 鏇存柊鏃堕棿
- */
- private String addtime;
-
- /**
- * 淇濈暀浣�
- */
- private String baoliu1;
-
- /**
- * 淇濈暀浣�
- */
- private String baoliu2;
-
- /**
- * 淇濈暀浣�
- */
- private String baoliu3;
-
- /**
- * 淇濈暀浣�
- */
- private String baoliu4;
-
- /**
- * 淇濈暀浣�
- */
- private String baoliu5;
-
- /**
- * 鎵�灞炲叕鍙�
- */
- private String company;
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Gather/TbPergather.java b/src/main/java/com/hxzk/gps/entity/Gather/TbPergather.java
deleted file mode 100644
index 6b6540a..0000000
--- a/src/main/java/com/hxzk/gps/entity/Gather/TbPergather.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.hxzk.gps.entity.Gather;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@TableName("tb_pergather")
-public class TbPergather implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 浜哄憳涓婇檺
- */
- private String pernum;
-
- /**
- * 鏄惁涓洪潤榛樺尯鍩�0涓嶆槸1鏄�
- */
- private String typec2;
-
- /**
- * 鍥存爮鍚嶇О
- */
- private String name;
-
- /**
- * 鑱氶泦鍗婂緞
- */
- private String redius;
-
- /**
- * 鑱氶泦鏃堕暱
- */
- private String shichang;
-
- /**
- * 鍗遍櫓鍝佸悕绉�
- */
- private String weixianpin;
-
- private String baoliu1;
-
- private String baoliu2;
-
- private String baoliu3;
-
- private String baoliu4;
-
- private String baoliu5;
-
- /**
- * 鎵�灞炲叕鍙�
- */
- private String company;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getPernum() {
- return pernum;
- }
-
- public void setPernum(String pernum) {
- this.pernum = pernum;
- }
-
- public String getTypec2() {
- return typec2;
- }
-
- public void setTypec2(String typec2) {
- this.typec2 = typec2;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getRedius() {
- return redius;
- }
-
- public void setRedius(String redius) {
- this.redius = redius;
- }
-
- public String getShichang() {
- return shichang;
- }
-
- public void setShichang(String shichang) {
- this.shichang = shichang;
- }
-
- public String getWeixianpin() {
- return weixianpin;
- }
-
- public void setWeixianpin(String weixianpin) {
- this.weixianpin = weixianpin;
- }
-
- public String getBaoliu1() {
- return baoliu1;
- }
-
- public void setBaoliu1(String baoliu1) {
- this.baoliu1 = baoliu1;
- }
-
- public String getBaoliu2() {
- return baoliu2;
- }
-
- public void setBaoliu2(String baoliu2) {
- this.baoliu2 = baoliu2;
- }
-
- public String getBaoliu3() {
- return baoliu3;
- }
-
- public void setBaoliu3(String baoliu3) {
- this.baoliu3 = baoliu3;
- }
-
- public String getBaoliu4() {
- return baoliu4;
- }
-
- public void setBaoliu4(String baoliu4) {
- this.baoliu4 = baoliu4;
- }
-
- public String getBaoliu5() {
- return baoliu5;
- }
-
- public void setBaoliu5(String baoliu5) {
- this.baoliu5 = baoliu5;
- }
-
- public String getCompany() {
- return company;
- }
-
- public void setCompany(String company) {
- this.company = company;
- }
-
- @Override
- public String toString() {
- return "TbPergather{" +
- "id = " + id +
- ", pernum = " + pernum +
- ", typec2 = " + typec2 +
- ", name = " + name +
- ", redius = " + redius +
- ", shichang = " + shichang +
- ", weixianpin = " + weixianpin +
- ", baoliu1 = " + baoliu1 +
- ", baoliu2 = " + baoliu2 +
- ", baoliu3 = " + baoliu3 +
- ", baoliu4 = " + baoliu4 +
- ", baoliu5 = " + baoliu5 +
- ", company = " + company +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Heart/TbHeartRecord.java b/src/main/java/com/hxzk/gps/entity/Heart/TbHeartRecord.java
deleted file mode 100644
index a95b871..0000000
--- a/src/main/java/com/hxzk/gps/entity/Heart/TbHeartRecord.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.hxzk.gps.entity.Heart;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@TableName("tb_heart_record")
-public class TbHeartRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鏍囩ID
- */
- private String tagid;
-
- /**
- * 濮撳悕
- */
- private String name;
-
- /**
- * 蹇冭烦
- */
- private String heart;
-
- /**
- * 姝e父蹇冪巼鍊�
- */
- private String okheart;
-
- /**
- * 蹇冪巼鐘舵��
- */
- private String state;
-
- /**
- * 璁板綍鏃堕棿
- */
- private String time;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getTagid() {
- return tagid;
- }
-
- public void setTagid(String tagid) {
- this.tagid = tagid;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getHeart() {
- return heart;
- }
-
- public void setHeart(String heart) {
- this.heart = heart;
- }
-
- public String getOkheart() {
- return okheart;
- }
-
- public void setOkheart(String okheart) {
- this.okheart = okheart;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getTime() {
- return time;
- }
-
- public void setTime(String time) {
- this.time = time;
- }
-
- @Override
- public String toString() {
- return "TbHeartRecord{" +
- "id = " + id +
- ", tagid = " + tagid +
- ", name = " + name +
- ", heart = " + heart +
- ", okheart = " + okheart +
- ", state = " + state +
- ", time = " + time +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/HistoryPower/TbAcHistoryPower.java b/src/main/java/com/hxzk/gps/entity/HistoryPower/TbAcHistoryPower.java
deleted file mode 100644
index a736a3f..0000000
--- a/src/main/java/com/hxzk/gps/entity/HistoryPower/TbAcHistoryPower.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.hxzk.gps.entity.HistoryPower;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@TableName("tb_ac_history_power")
-public class TbAcHistoryPower implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鍩虹珯ID
- */
- private String anchorId;
-
- /**
- * 鐢甸噺
- */
- private String power;
-
- /**
- * 娣诲姞鏃堕棿
- */
- private String addtime;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getAnchorId() {
- return anchorId;
- }
-
- public void setAnchorId(String anchorId) {
- this.anchorId = anchorId;
- }
-
- public String getPower() {
- return power;
- }
-
- public void setPower(String power) {
- this.power = power;
- }
-
- public String getAddtime() {
- return addtime;
- }
-
- public void setAddtime(String addtime) {
- this.addtime = addtime;
- }
-
- @Override
- public String toString() {
- return "TbAcHistoryPower{" +
- "id = " + id +
- ", anchorId = " + anchorId +
- ", power = " + power +
- ", addtime = " + addtime +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/HistoryPower/TbHistoryPower.java b/src/main/java/com/hxzk/gps/entity/HistoryPower/TbHistoryPower.java
deleted file mode 100644
index 3e408a4..0000000
--- a/src/main/java/com/hxzk/gps/entity/HistoryPower/TbHistoryPower.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.hxzk.gps.entity.HistoryPower;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@TableName("tb_history_power")
-@Data
-public class TbHistoryPower implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 鏍囩鍘嗗彶鐢甸噺琛�
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鏍囩id
- */
- private String tagid;
-
- /**
- * 鐢甸噺
- */
- private String power;
-
- /**
- * 娣诲姞鏃堕棿
- */
- private String time;
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Inspection/TbNewtask.java b/src/main/java/com/hxzk/gps/entity/Inspection/TbNewtask.java
deleted file mode 100644
index c5e4da6..0000000
--- a/src/main/java/com/hxzk/gps/entity/Inspection/TbNewtask.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.hxzk.gps.entity.Inspection;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@TableName("tb_newtask")
-public class TbNewtask implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 浠诲姟鍚嶇О
- */
- private String taskname;
-
- /**
- * 宸℃鍖哄煙
- */
- private String inspectionarea;
-
- /**
- * 浜哄憳
- */
- private String personnel;
-
- /**
- * 娆℃暟
- */
- private String number;
-
- /**
- * 鍋滅暀鏃堕棿
- */
- private String staytime;
-
- /**
- * 寮�濮嬫椂闂�
- */
- private String starttime;
-
- /**
- * 缁撴潫鏃堕棿
- */
- private String endtime;
-
- /**
- * 鎵�灞炲叕鍙�
- */
- private String company;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getTaskname() {
- return taskname;
- }
-
- public void setTaskname(String taskname) {
- this.taskname = taskname;
- }
-
- public String getInspectionarea() {
- return inspectionarea;
- }
-
- public void setInspectionarea(String inspectionarea) {
- this.inspectionarea = inspectionarea;
- }
-
- public String getPersonnel() {
- return personnel;
- }
-
- public void setPersonnel(String personnel) {
- this.personnel = personnel;
- }
-
- public String getNumber() {
- return number;
- }
-
- public void setNumber(String number) {
- this.number = number;
- }
-
- public String getStaytime() {
- return staytime;
- }
-
- public void setStaytime(String staytime) {
- this.staytime = staytime;
- }
-
- public String getStarttime() {
- return starttime;
- }
-
- public void setStarttime(String starttime) {
- this.starttime = starttime;
- }
-
- public String getEndtime() {
- return endtime;
- }
-
- public void setEndtime(String endtime) {
- this.endtime = endtime;
- }
-
- public String getCompany() {
- return company;
- }
-
- public void setCompany(String company) {
- this.company = company;
- }
-
- @Override
- public String toString() {
- return "TbNewtask{" +
- "id = " + id +
- ", taskname = " + taskname +
- ", inspectionarea = " + inspectionarea +
- ", personnel = " + personnel +
- ", number = " + number +
- ", staytime = " + staytime +
- ", starttime = " + starttime +
- ", endtime = " + endtime +
- ", company = " + company +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Inspection/TbXunjianbaobiao.java b/src/main/java/com/hxzk/gps/entity/Inspection/TbXunjianbaobiao.java
deleted file mode 100644
index 62d95a0..0000000
--- a/src/main/java/com/hxzk/gps/entity/Inspection/TbXunjianbaobiao.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.hxzk.gps.entity.Inspection;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@TableName("tb_xunjianbaobiao")
-public class TbXunjianbaobiao implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 搴忓彿
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 宸℃浜哄憳濮撳悕
- */
- private String name;
-
- /**
- * 宸℃璁惧id
- */
- private String tagid;
-
- /**
- * 鍖哄煙鍚嶇О
- */
- private String quyu;
-
- /**
- * 宸℃鍖哄煙搴忓彿
- */
- private String bianhao;
-
- /**
- * 杩涘叆宸℃鍖哄煙鏃堕棿
- */
- private String intime;
-
- /**
- * 鍑哄贰妫�鍖哄煙鏃堕棿
- */
- private String outtime;
-
- /**
- * 鍋滅暀鏃堕棿
- */
- private String alltime;
-
- /**
- * 鏄惁瀹屾垚宸℃瀹屾垚1
- */
- private String succ;
-
- /**
- * 鏇存柊鏃堕棿
- */
- private String addtime;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getTagid() {
- return tagid;
- }
-
- public void setTagid(String tagid) {
- this.tagid = tagid;
- }
-
- public String getQuyu() {
- return quyu;
- }
-
- public void setQuyu(String quyu) {
- this.quyu = quyu;
- }
-
- public String getBianhao() {
- return bianhao;
- }
-
- public void setBianhao(String bianhao) {
- this.bianhao = bianhao;
- }
-
- public String getIntime() {
- return intime;
- }
-
- public void setIntime(String intime) {
- this.intime = intime;
- }
-
- public String getOuttime() {
- return outtime;
- }
-
- public void setOuttime(String outtime) {
- this.outtime = outtime;
- }
-
- public String getAlltime() {
- return alltime;
- }
-
- public void setAlltime(String alltime) {
- this.alltime = alltime;
- }
-
- public String getSucc() {
- return succ;
- }
-
- public void setSucc(String succ) {
- this.succ = succ;
- }
-
- public String getAddtime() {
- return addtime;
- }
-
- public void setAddtime(String addtime) {
- this.addtime = addtime;
- }
-
- @Override
- public String toString() {
- return "TbXunjianbaobiao{" +
- "id = " + id +
- ", name = " + name +
- ", tagid = " + tagid +
- ", quyu = " + quyu +
- ", bianhao = " + bianhao +
- ", intime = " + intime +
- ", outtime = " + outtime +
- ", alltime = " + alltime +
- ", succ = " + succ +
- ", addtime = " + addtime +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Log/TbFzlog.java b/src/main/java/com/hxzk/gps/entity/Log/TbFzlog.java
deleted file mode 100644
index 4efaac2..0000000
--- a/src/main/java/com/hxzk/gps/entity/Log/TbFzlog.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.hxzk.gps.entity.Log;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@TableName("tb_fzlog")
-public class TbFzlog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 闆疯揪缂栧彿-缁戝畾瀵硅薄
- */
- private String nameandid;
-
- /**
- * 鏍囩Id
- */
- private String tagId;
-
- /**
- * 鏍囩鍚嶇О
- */
- private String tagName;
-
- /**
- * 瑙﹀彂璺濈
- */
- private String sosdis;
-
- /**
- * 鍧愭爣
- */
- private String ponit;
-
- /**
- * 鏃堕棿
- */
- private String addtime;
-
- /**
- * 鎵�灞炲叕鍙�
- */
- private String company;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getNameandid() {
- return nameandid;
- }
-
- public void setNameandid(String nameandid) {
- this.nameandid = nameandid;
- }
-
- public String getTagId() {
- return tagId;
- }
-
- public void setTagId(String tagId) {
- this.tagId = tagId;
- }
-
- public String getTagName() {
- return tagName;
- }
-
- public void setTagName(String tagName) {
- this.tagName = tagName;
- }
-
- public String getSosdis() {
- return sosdis;
- }
-
- public void setSosdis(String sosdis) {
- this.sosdis = sosdis;
- }
-
- public String getPonit() {
- return ponit;
- }
-
- public void setPonit(String ponit) {
- this.ponit = ponit;
- }
-
- public String getAddtime() {
- return addtime;
- }
-
- public void setAddtime(String addtime) {
- this.addtime = addtime;
- }
-
- public String getCompany() {
- return company;
- }
-
- public void setCompany(String company) {
- this.company = company;
- }
-
- @Override
- public String toString() {
- return "TbFzlog{" +
- "id = " + id +
- ", nameandid = " + nameandid +
- ", tagId = " + tagId +
- ", tagName = " + tagName +
- ", sosdis = " + sosdis +
- ", ponit = " + ponit +
- ", addtime = " + addtime +
- ", company = " + company +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Log/TbLixianrecord0829.java b/src/main/java/com/hxzk/gps/entity/Log/TbLixianrecord0829.java
deleted file mode 100644
index 0c78e06..0000000
--- a/src/main/java/com/hxzk/gps/entity/Log/TbLixianrecord0829.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.hxzk.gps.entity.Log;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@TableName("tb_lixianrecord_0829")
-public class TbLixianrecord0829 implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鏍囩ID
- */
- private String tagid;
-
- /**
- * 濮撳悕
- */
- private String name;
-
- /**
- * 閮ㄩ棬
- */
- private String bumen;
-
- /**
- * 鐢佃瘽
- */
- private String phone;
-
- /**
- * 绂荤嚎鏃堕棿
- */
- private String time;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getTagid() {
- return tagid;
- }
-
- public void setTagid(String tagid) {
- this.tagid = tagid;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getBumen() {
- return bumen;
- }
-
- public void setBumen(String bumen) {
- this.bumen = bumen;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getTime() {
- return time;
- }
-
- public void setTime(String time) {
- this.time = time;
- }
-
- @Override
- public String toString() {
- return "TbLixianrecord0829{" +
- "id = " + id +
- ", tagid = " + tagid +
- ", name = " + name +
- ", bumen = " + bumen +
- ", phone = " + phone +
- ", time = " + time +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Log/TbLoginLog.java b/src/main/java/com/hxzk/gps/entity/Log/TbLoginLog.java
deleted file mode 100644
index 2c4bb9f..0000000
--- a/src/main/java/com/hxzk/gps/entity/Log/TbLoginLog.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.hxzk.gps.entity.Log;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-06-09
- */
-@Data
-@TableName("tb_login_log")
-public class TbLoginLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- private String name;
-
- private String loginfs;
-
- private String ip;
-
- private String addtime;
-
- private String company;
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Loragateway/TbLoragateway.java b/src/main/java/com/hxzk/gps/entity/Loragateway/TbLoragateway.java
deleted file mode 100644
index 50436f2..0000000
--- a/src/main/java/com/hxzk/gps/entity/Loragateway/TbLoragateway.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.hxzk.gps.entity.Loragateway;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@TableName("tb_loragateway")
-@Data
-public class TbLoragateway implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private Integer id;
-
- /**
- * 缃戝叧Id
- */
- private String loragwid;
-
- /**
- * 鍦ㄧ嚎鐘舵��
- */
- private String status;
-
- /**
- * 缃戝叧Ip
- */
- private String gwip;
-
- /**
- * 缃戝叧绔彛
- */
- private String gwport;
-
- /**
- * 涓�閫氶亾棰戠偣
- */
- private String pindian1;
-
- /**
- * 浜岄�氶亾棰戠偣
- */
- private String pindian2;
-
- /**
- * 涓夐�氶亾棰戠偣
- */
- private String pindian3;
-
- /**
- * 鍥涢�氶亾棰戠偣
- */
- private String pindian4;
-
- /**
- * 浜旈�氶亾棰戠偣
- */
- private String pindian5;
-
- /**
- * 鍔熺巼
- */
- private String gonglv;
-
- /**
- * 缁忓害
- */
- private String lon;
-
- /**
- * 绾害
- */
- private String lat;
-
- /**
- * 鐗堟湰
- */
- private String version;
-
- /**
- * 鏇存柊鏃堕棿
- */
- private String addtime;
-
- private String baoliu1;
-
- private String baoliu2;
-
- private String baoliu3;
-
- private String baoliu4;
-
- private String baoliu5;
-
- private String baoliu6;
-
- /**
- * 鎵�灞炲叕鍙�
- */
- private String company;
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Mac/TbMac.java b/src/main/java/com/hxzk/gps/entity/Mac/TbMac.java
deleted file mode 100644
index b04be06..0000000
--- a/src/main/java/com/hxzk/gps/entity/Mac/TbMac.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.hxzk.gps.entity.Mac;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-01
- */
-@TableName("tb_mac")
-@Data
-public class TbMac implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- private String mac;
-
- private String passmac;
-
- private String useday;
-
- private String addtime;
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Map/TbMap.java b/src/main/java/com/hxzk/gps/entity/Map/TbMap.java
deleted file mode 100644
index a5d37c9..0000000
--- a/src/main/java/com/hxzk/gps/entity/Map/TbMap.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.hxzk.gps.entity.Map;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@Data
-@TableName("tb_map")
-public class TbMap implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 搴忓彿
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 灞�
- */
- private String floor;
-
- /**
- * 鍦板浘鍚嶇О
- */
- private String mapname;
-
- /**
- * 鍦板浘x瀹為暱鍘樼背
- */
- private String xTruelength;
-
- /**
- * 鍦板浘y瀹為暱鍘樼背
- */
- private String yTruewidth;
-
- /**
- * x0鍘熺偣X鍧愭爣
- */
- private String x0Length;
-
- /**
- * y0鍘熺偣Y鍧愭爣
- */
- private String y0Width;
-
- /**
- * 鍥剧墖瀹為檯闀垮儚绱�
- */
- private String xPixel;
-
- /**
- * 鍥剧墖瀹為檯瀹藉儚绱�
- */
- private String yPixel;
-
- /**
- * 娣诲姞鏃堕棿
- */
- private String addtime;
-
- /**
- * 鍘熺偣缁忓害
- */
- private String jingdu;
-
- /**
- * 鍘熺偣绾害
- */
- private String weidu;
-
- /**
- * 鍘熺偣澶硅
- */
- private String jiajiao;
-
- /**
- * A鐐圭粡绾害XY
- */
- private String baoliu1;
-
- /**
- * B鐐圭粡绾害XY
- */
- private String baoliu2;
-
- private String baoliu3;
-
- private String baoliu4;
-
- private String baoliu5;
-
- private String baoliu6;
-
- private String baoliu7;
-
- private String baoliu8;
-
- private String baoliu9;
-
- private String baoliu10;
-
- private String company;
- private String companyid;
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Map/TbMarsHomeset.java b/src/main/java/com/hxzk/gps/entity/Map/TbMarsHomeset.java
deleted file mode 100644
index 32d2615..0000000
--- a/src/main/java/com/hxzk/gps/entity/Map/TbMarsHomeset.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.hxzk.gps.entity.Map;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@Data
-@TableName("tb_mars_homeset")
-public class TbMarsHomeset implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 璇︾粏淇℃伅
- */
- private String detail;
-
- /**
- * 绂荤嚎娑堝け
- */
- private String offlinehide;
-
- /**
- * 寮�鍚闊�
- */
- private String voice;
-
- /**
- * 鏄剧ず鍥存爮
- */
- private String showfence;
-
- /**
- * 鏄剧ず鍩虹珯
- */
- private String showanchor;
-
- /**
- * 鏄剧ず缃戝叧
- */
- private String showgateway;
-
- /**
- * 鍦板浘鍒濆浣嶇疆
- */
- private String mapposition;
-
- /**
- * 鍦板浘楂樺害
- */
- private String alt;
-
- /**
- * 鍦板浘鏃嬭浆瑙掑害
- */
- private String heading;
-
- /**
- * 鍦板浘淇瑙掑害
- */
- private String pitch;
-
- /**
- * 寮�鍚棤鍦板舰
- */
- private String noterrain;
-
- /**
- * 鍔犺浇鐡︾墖鍥�
- */
- private String layer;
-
- /**
- * 鍔犺浇鏈湴鍥剧墖
- */
- private String image;
-
- /**
- * 璁剧疆鏃犲簳鍥�
- */
- private String basemap;
-
- /**
- * 寮�鍚笁缁存ā鍨�
- */
- private String threemap;
-
- /**
- * 閫熷害
- */
- private String sudu;
-
- /**
- * 璺濈杩囨护
- */
- private String distance;
-
- /**
- * 鏃堕棿杩囨护
- */
- private String time;
-
- /**
- * 杞ㄨ抗绫诲瀷
- */
- private String tracktype;
-
- /**
- * 鎵�灞炲叕鍙�
- */
- private String company;
- /*
- * 鍥哄畾楂樺害鏄惁寮�鍚�
- * */
- private String gudinggao;
- /*
- 鍥哄畾楂樺害鍊�
- * */
- private String gudingzhi;
- /*
- * 棰戠巼
- * */
- private String pinlv;
- /*
- * 鐢ㄦ埛鍚�
- * */
- private String username;
- /*
- * 鎵�灞炲叕鍙竔d
- * */
- private String companyid;
- /*
- * 鍦板浘棰滆壊
- * */
- private String mapcolor;
- /*
- * 鏄剧ず鍦扮悆
- * */
- private String showmap;
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Menu/Menu.java b/src/main/java/com/hxzk/gps/entity/Menu/Menu.java
deleted file mode 100644
index a1b6776..0000000
--- a/src/main/java/com/hxzk/gps/entity/Menu/Menu.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.hxzk.gps.entity.Menu;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-23
- */
-@Data
-public class Menu implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- private String path;
-
- private String name;
-
- private String component;
-
- private String redirect;
-
- private Integer parentId;
-
- private String meta;
- private Integer parent_id;
-
- private String rolename;
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Menu/Meta.java b/src/main/java/com/hxzk/gps/entity/Menu/Meta.java
deleted file mode 100644
index 525bd42..0000000
--- a/src/main/java/com/hxzk/gps/entity/Menu/Meta.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.hxzk.gps.entity.Menu;
-
-import lombok.Data;
-
-@Data
-public class Meta {
- private String title;
- private String icon;
- private String isFull;
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Message/TbSendMessageHistory.java b/src/main/java/com/hxzk/gps/entity/Message/TbSendMessageHistory.java
deleted file mode 100644
index 64614e3..0000000
--- a/src/main/java/com/hxzk/gps/entity/Message/TbSendMessageHistory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.hxzk.gps.entity.Message;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@Data
-@TableName("tb_send_message_history")
-public class TbSendMessageHistory implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- private String user;
-
- private String tagid;
-
- private String time;
- private Integer radio;
-
- private String neirong;
- private String company;
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Person/TbPerson.java b/src/main/java/com/hxzk/gps/entity/Person/TbPerson.java
deleted file mode 100644
index c67d8c8..0000000
--- a/src/main/java/com/hxzk/gps/entity/Person/TbPerson.java
+++ /dev/null
@@ -1,357 +0,0 @@
-package com.hxzk.gps.entity.Person;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-16
- */
-@Data
-@TableName("tb_person")
-public class TbPerson implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 浜哄憳濮撳悕
- */
- private String pName;
-
- /**
- * 缁戝畾鐨則agid
- */
- private String pTagid;
-
- /**
- * 鎬у埆
- */
- private String pSex;
-
- /**
- * 姘戞棌
- */
- private String pMinzu;
-
- /**
- * 鐢佃瘽
- */
- private String pPhone;
-
- /**
- * 閮ㄩ棬
- */
- private String pDepartment;
-
- /**
- * 鐝�
- */
- private String pBan;
-
- /**
- * 缁�
- */
- private String pZu;
-
- /**
- * 韬唤璇佸彿
- */
- private String pIdcardnum;
-
- /**
- * 韬唤璇佸湴鍧�
- */
- private String pAdress;
-
- /**
- * 鍙揪鍖哄煙
- */
- private String pCanin;
-
- /**
- * x鍧愭爣
- */
- private String pX;
-
- /**
- * y鍧愭爣
- */
- private String pY;
-
- /**
- * 鎵�鍦ㄥ眰
- */
- private String pFloor;
-
- /**
- * SOS鐘舵��1鎶ヨ锛�0鏈姤璀�
- */
- private String pSos;
-
- /**
- * 鏄惁鍦ㄧ嚎0绂荤嚎锛�1鍦ㄧ嚎
- */
- private String pOnline;
-
- /**
- * 鐢甸噺
- */
- private String pPower;
-
- /**
- * 鏄惁杩涘叆鑰冨嫟鍖哄煙0娌℃湁杩涘叆1杩涘叆
- */
- private String pKaoqing;
-
- /**
- * 鏄惁杩涘叆鍥存爮鍖哄煙0涓嶅湪锛�1鍦�
- */
- private String pFence;
-
- /**
- * 鎵�鍦ㄥ洿鏍忓尯鍩熷悕绉�
- */
- private String pFencename;
-
- /**
- * 鎵�鍦ㄨ�冨嫟鍖哄煙鍚嶇О
- */
- private String pKaoqqingname;
-
- /**
- * 鍥炬爣鍦板潃
- */
- private String pImage;
-
- /**
- * 娣诲姞鏃堕棿
- */
- private String pAddtiem;
-
- /**
- * 鏍囩浣庣數閲忓憡璀︾姸鎬佸憡璀︿负1娌℃湁鍛婅涓�0
- */
- private String pPowerWanig;
-
- /**
- * 榛樿0鏈悳绱㈢姸鎬侊紝1鎼滅储鐘舵��
- */
- private String pSousuo;
-
- /**
- * 鏄惁杩涘叆瑙嗛鍖哄煙
- */
- private String pShipin;
-
- /**
- * 瑙嗛鍖哄煙鍚嶇О
- */
- private String pShipingname;
-
- /**
- * 瀛樻斁璁垮ID
- */
- private String baoliu1;
-
- /**
- * 鏍囩鐨勭粡搴�
- */
- private String baoliu2;
-
- /**
- * 鏍囩鐨勭含搴�
- */
- private String baoliu3;
-
- /**
- * 鏍囩鐨勯珮绋�
- */
- private String baoliu4;
-
- /**
- * 鏍囩鏄粈涔堢被鍨嬫爣绛撅紝铻嶅悎鏍囩2锛岀函UWB鏍囩1
- */
- private String baoliu5;
-
- /**
- * 鏍囩鏄惁琚媶闄わ紝闃叉媶鏍囩
- */
- private String baoliu6;
-
- private String baoliu7;
-
- /**
- * 鏍囩鐨勫湴鍧�IP鍦板潃铻嶅悎鏍囩鐢�
- */
- private String baoliu8;
-
- /**
- * 鏍囩鐨勭鍙h瀺鍚堟爣绛剧敤
- */
- private String baoliu9;
-
- /**
- * 鐩稿娴锋嫈楂樺害
- */
- private String baoliu10;
-
- /**
- * RTCM鐨勬簮
- */
- private String baoliu11;
-
- /**
- * 缁戝畾鐨勫洿鏍�
- */
- private String baoliu12;
-
- /**
- * GPS鐨勭姸鎬�
- */
- private String baoliu13;
-
- private String baoliu14;
-
- private String baoliu15;
-
- private String baoliu16;
-
- private String baoliu17;
-
- private String baoliu18;
-
- /**
- * 鏍囩绫诲瀷
- */
- private String baoliu19;
-
- private String baoliu20;
-
- private String baoliu21;
-
- /**
- * XY瑙g殑鏉ユ簮1琛ㄧず瀹ゅ唴0琛ㄧず瀹ゅ
- */
- private String baoliu22;
-
- /**
- * 鏍囩鐨勯�熷害
- */
- private String baoliu23;
-
- /**
- * 涓夌淮楂樺害
- */
- private String baoliu24;
-
- /**
- * 纰版挒鎶ヨsmash
- */
- private String baoliu25;
-
- /**
- * 闈欓粯鎶ヨstopmoving
- */
- private String baoliu26;
-
- /**
- * 鐧婚珮鎶ヨhigh
- */
- private String baoliu27;
-
- /**
- * 杩戠數鎶ヨnearele
- */
- private String baoliu28;
-
- /**
- * 鑴卞附鎶ヨoffhat
- */
- private String baoliu29;
-
- /**
- * 瑙嗛鍒ゆ柇浣�
- */
- private String baoliu30;
-
- /**
- * 闊抽鍒ゆ柇浣�
- */
- private String baoliu31;
-
- /**
- * 澶勪簬璀﹀憡璺濈 榛樿-1 璀﹀憡1
- */
- private String baoliu32;
-
- /**
- * 灏忎簬鎶ヨ璺濈 榛樿-1 鎶ヨ1
- */
- private String baoliu33;
-
- /**
- * 鍥剧墖鍒ゆ柇浣�
- */
- private String baoliu34;
-
- /**
- * 浜哄憳鑱氶泦鍖哄煙浜烘暟
- */
- private String baoliu35;
-
- /**
- * 鑱氶泦鏃堕棿
- */
- private String baoliu36;
-
- /**
- * 淇濈暀浣�
- */
- private String baoliu37;
-
- /**
- * 淇濈暀浣�
- */
- private String baoliu38;
-
- /**
- * 淇濈暀浣�
- */
- private String baoliu39;
-
- /**
- * 淇濈暀浣�
- */
- private String baoliu40;
-
- /**
- * 鍙栧崱鐘舵��
- */
- private String baoliu41;
-
- /**
- * 淇濈暀浣�
- */
- private String baoliu42;
-
- /**
- * 鍏徃
- */
- private String company;
- /**
- * 鍏徃ID
- */
- private String companyid;
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Role/Role.java b/src/main/java/com/hxzk/gps/entity/Role/Role.java
deleted file mode 100644
index 63a44aa..0000000
--- a/src/main/java/com/hxzk/gps/entity/Role/Role.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.hxzk.gps.entity.Role;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-08
- */
-@Data
-public class Role implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 瑙掕壊ID
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 瑙掕壊鍚嶇О
- */
- private String name;
-
- /**
- * 娣诲姞浜�
- */
- private String username;
-
- /**
- * 鎵�灞炲叕鍙窱D
- */
- private String companyid;
- /**
- * 鎵�灞炲叕鍙稿悕绉�
- */
- private String companyname;
- /**
- * 娣诲姞鏉冮檺
- */
- private boolean addrole;
- /**
- * 淇敼鏉冮檺
- */
- private boolean editrole;
- /**
- * 鍒犻櫎鏉冮檺
- */
- private boolean deleterole;
- /**
- * 鏇存柊鏃堕棿
- */
- private String addtime;
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Role/Rolemenu.java b/src/main/java/com/hxzk/gps/entity/Role/Rolemenu.java
deleted file mode 100644
index c29fa04..0000000
--- a/src/main/java/com/hxzk/gps/entity/Role/Rolemenu.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps.entity.Role;
-
-import lombok.Data;
-
-@Data
-public class Rolemenu {
-
- private Integer id;
- private Integer roleId;
- private Integer menuId;
- private Integer isall;
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/RtkAnchor/TbRtkanchor.java b/src/main/java/com/hxzk/gps/entity/RtkAnchor/TbRtkanchor.java
deleted file mode 100644
index 99c4213..0000000
--- a/src/main/java/com/hxzk/gps/entity/RtkAnchor/TbRtkanchor.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.hxzk.gps.entity.RtkAnchor;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-22
- */
-@TableName("tb_rtkanchor")
-@Data
-public class TbRtkanchor implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 宸垎鍩哄噯绔欑紪鍙�
- */
- private String acid;
-
- /**
- * 鐘舵��
- */
- private String state;
-
- /**
- * 缁忓害
- */
- private String jingdu;
-
- /**
- * 绾害
- */
- private String weidu;
-
- /**
- * 楂樼▼
- */
- private String gaodu;
-
- /**
- * X鍧愭爣
- */
- private String posx;
-
- /**
- * Y鍧愭爣
- */
- private String posy;
-
- /**
- * 灞�
- */
- private String floor;
-
- /**
- * 瑕嗙洊璺濈
- */
- private String distance;
-
- /**
- * 鎺ユ敹鍩虹珯鏁版嵁鐨勬湇鍔″櫒绔彛
- */
- private String port;
-
- /**
- * 鍩虹珯4G鍗″湴鍧�
- */
- private String baoliu1;
-
- /**
- * 鍩虹珯4G鍗$鍙�
- */
- private String baoliu2;
-
- private String baoliu3;
-
- private String baoliu4;
-
- private String baoliu5;
-
- private String baoliu6;
-
- private String baoliu7;
-
- private String baoliu8;
-
- private String baoliu9;
-
- private String baoliu10;
-
- private String baoliu11;
-
- /**
- * 鏇存柊鏃堕棿
- */
- private String addtime;
- private String company;
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Sms/TbSmsLog.java b/src/main/java/com/hxzk/gps/entity/Sms/TbSmsLog.java
deleted file mode 100644
index 1436c6f..0000000
--- a/src/main/java/com/hxzk/gps/entity/Sms/TbSmsLog.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.hxzk.gps.entity.Sms;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@TableName("tb_sms_log")
-public class TbSmsLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- private String type;
-
- private String name;
-
- private String bumen;
-
- private String phone;
-
- private String msg;
-
- private String addtime;
-
- /**
- * 鎵�灞炲叕鍙�
- */
- private String company;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getBumen() {
- return bumen;
- }
-
- public void setBumen(String bumen) {
- this.bumen = bumen;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- public String getAddtime() {
- return addtime;
- }
-
- public void setAddtime(String addtime) {
- this.addtime = addtime;
- }
-
- public String getCompany() {
- return company;
- }
-
- public void setCompany(String company) {
- this.company = company;
- }
-
- @Override
- public String toString() {
- return "TbSmsLog{" +
- "id = " + id +
- ", type = " + type +
- ", name = " + name +
- ", bumen = " + bumen +
- ", phone = " + phone +
- ", msg = " + msg +
- ", addtime = " + addtime +
- ", company = " + company +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Sms/TbSmsReminder.java b/src/main/java/com/hxzk/gps/entity/Sms/TbSmsReminder.java
deleted file mode 100644
index 28c3bc7..0000000
--- a/src/main/java/com/hxzk/gps/entity/Sms/TbSmsReminder.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.hxzk.gps.entity.Sms;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@TableName("tb_sms_reminder")
-public class TbSmsReminder implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- private String smstype;
-
- private String name;
-
- private String bumen;
-
- private String phone;
-
- private String msg;
-
- private String addtime;
-
- /**
- * 鎵�灞炲叕鍙�
- */
- private String company;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getSmstype() {
- return smstype;
- }
-
- public void setSmstype(String smstype) {
- this.smstype = smstype;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getBumen() {
- return bumen;
- }
-
- public void setBumen(String bumen) {
- this.bumen = bumen;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- public String getAddtime() {
- return addtime;
- }
-
- public void setAddtime(String addtime) {
- this.addtime = addtime;
- }
-
- public String getCompany() {
- return company;
- }
-
- public void setCompany(String company) {
- this.company = company;
- }
-
- @Override
- public String toString() {
- return "TbSmsReminder{" +
- "id = " + id +
- ", smstype = " + smstype +
- ", name = " + name +
- ", bumen = " + bumen +
- ", phone = " + phone +
- ", msg = " + msg +
- ", addtime = " + addtime +
- ", company = " + company +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Sms/TbVoicetip.java b/src/main/java/com/hxzk/gps/entity/Sms/TbVoicetip.java
deleted file mode 100644
index e11e632..0000000
--- a/src/main/java/com/hxzk/gps/entity/Sms/TbVoicetip.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.hxzk.gps.entity.Sms;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@TableName("tb_voicetip")
-public class TbVoicetip implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鍛婅绫诲瀷
- */
- private String warningtype;
-
- /**
- * 鎻愮ず鏂囧瓧
- */
- private String remindertext;
-
- /**
- * 鎿嶄綔浜�
- */
- private String username;
-
- /**
- * 娣诲姞鏃ユ湡
- */
- private String addtime;
-
- private String company;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getWarningtype() {
- return warningtype;
- }
-
- public void setWarningtype(String warningtype) {
- this.warningtype = warningtype;
- }
-
- public String getRemindertext() {
- return remindertext;
- }
-
- public void setRemindertext(String remindertext) {
- this.remindertext = remindertext;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getAddtime() {
- return addtime;
- }
-
- public void setAddtime(String addtime) {
- this.addtime = addtime;
- }
-
- public String getCompany() {
- return company;
- }
-
- public void setCompany(String company) {
- this.company = company;
- }
-
- @Override
- public String toString() {
- return "TbVoicetip{" +
- "id = " + id +
- ", warningtype = " + warningtype +
- ", remindertext = " + remindertext +
- ", username = " + username +
- ", addtime = " + addtime +
- ", company = " + company +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/System/TbSystemOperationLog.java b/src/main/java/com/hxzk/gps/entity/System/TbSystemOperationLog.java
deleted file mode 100644
index ca615e4..0000000
--- a/src/main/java/com/hxzk/gps/entity/System/TbSystemOperationLog.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.hxzk.gps.entity.System;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-12
- */
-@Data
-@TableName("tb_system_operation_log")
-@AllArgsConstructor
-@NoArgsConstructor
-public class TbSystemOperationLog implements Serializable {
-
-
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鎿嶄綔浜�
- */
- private String name;
-
- /**
- * 鎿嶄綔鍐呭
- */
- private String content;
-
- /**
- * 鎿嶄綔鏃堕棿
- */
- private String time;
-
- /**
- * 绫诲瀷
- */
- private String type;
-
- /**
- * ip
- */
- private String ip;
-
- /**
- * 鎵�灞炲叕鍙�
- */
- private String company;
-
- /**
- * 鏍囪瘑
- */
- private String sign;
- /*
- * 鐘舵��
- * */
- private String status;
-
- public TbSystemOperationLog(String name, String content, String time, String type, String ip, String company,String sign,String status) {
- this.name = name;
- this.content = content;
- this.time = time;
- this.type = type;
- this.ip = ip;
- this.company = company;
- this.sign = sign;
- this.status = status;
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Tag/TbTag.java b/src/main/java/com/hxzk/gps/entity/Tag/TbTag.java
deleted file mode 100644
index 11851b0..0000000
--- a/src/main/java/com/hxzk/gps/entity/Tag/TbTag.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.hxzk.gps.entity.Tag;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 鏍囩绠$悊
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@TableName("tb_tag")
-@Data
-public class TbTag implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 鏍囩搴忓彿
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鏍囩ID
- */
- private String tagId;
-
- /**
- * 鏍囩缁戝畾鐨勫璞″悕绉�
- */
- private String state;
-
- /**
- * 鏍囩鐢甸噺
- */
- private String power;
-
- /**
- * 鏍囩鐘舵�侊紝鍦ㄧ嚎1绂荤嚎0
- */
- private String status;
-
- /**
- * 鏍囩浣╂埓楂樺害
- */
- private String gaodu;
-
- /**
- * 鏍囩閫熷害涓婇檺
- */
- private String sudu;
-
- /**
- * 鏍囩棰戠巼
- */
- private String pinglv;
-
- /**
- * 浼戠湢鐘舵��1鏄紑鍚�0鏄叧闂�
- */
- private String sleepSatus;
-
- /**
- * 浼戠湢鏃堕棿
- */
- private String sleepTime;
-
- /**
- * 鏍囩鍔熺巼
- */
- private String gongfang;
-
- /**
- * 寮�鍚尟鍔�1鏄紑鍚�0鏄叧闂�
- */
- private String dongStatus;
-
- /**
- * 鏍囩鐗堟湰
- */
- private String version;
-
- /**
- * 娣诲姞鏃堕棿
- */
- private String addtime;
-
- /**
- * 鍔犻�熷害闃堝��
- */
- private String imu;
-
- /**
- * GPS寮�鍚负1鍏抽棴涓�0
- */
- private String gpsState;
-
- /**
- * 鏍囩瀹炴椂楂樺害
- */
- private String tagZ;
-
- /**
- * 浣滀负涓夌淮鍙傝�冨熀绔欎娇鐢�
- */
- private String baoliu1;
-
- private String baoliu2;
-
- private String baoliu3;
-
- private String baoliu4;
-
- private String baoliu5;
-
- private String baoliu6;
-
- private String baoliu7;
-
- private String baoliu8;
-
- private String baoliu9;
-
- private String baoliu10;
-
- /**
- * 鏍囩绫诲瀷
- */
- private String type;
-
- /**
- * 鎵�灞炲叕鍙�
- */
- private String company;
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/ThreeModel/TbThreemodel.java b/src/main/java/com/hxzk/gps/entity/ThreeModel/TbThreemodel.java
deleted file mode 100644
index 82db1ab..0000000
--- a/src/main/java/com/hxzk/gps/entity/ThreeModel/TbThreemodel.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.hxzk.gps.entity.ThreeModel;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-09-03
- */
-@TableName("tb_threemodel")
-@Data
-public class TbThreemodel implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鍏徃鍚嶇О
- */
- private String company;
-
- /**
- * 鍏徃ID
- */
- private String companyid;
-
- /**
- * 妯″瀷鏂囦欢澶瑰悕绉�
- */
- private String filename;
-
- /**
- * 缁忓害
- */
- private String lng;
-
- /**
- * 绾害
- */
- private String lat;
- private String addtime;
-
- /**
- * 楂樺害
- */
- private String alt;
-
-
-
- @Override
- public String toString() {
- return "TbThreemodel{" +
- "id = " + id +
- ", company = " + company +
- ", companyid = " + companyid +
- ", filename = " + filename +
- ", lng = " + lng +
- ", lat = " + lat +
- ", alt = " + alt +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Track/TbGpsTrack.java b/src/main/java/com/hxzk/gps/entity/Track/TbGpsTrack.java
deleted file mode 100644
index 665a7c0..0000000
--- a/src/main/java/com/hxzk/gps/entity/Track/TbGpsTrack.java
+++ /dev/null
@@ -1,290 +0,0 @@
-package com.hxzk.gps.entity.Track;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-26
- */
-@TableName("tb_gps_track")
-public class TbGpsTrack implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 搴忓彿鑷
- */
- private Integer id;
-
- /**
- * UTC鏃堕棿hhmmss.sss锛屾椂鍒嗙鏍煎紡
- */
- private String gpsUtcTime;
-
- /**
- * 绾害ddmm.mmmm锛屽害鍒嗘牸寮忥紙鍓嶅浣嶆暟涓嶈冻鍒欒ˉ0锛�
- */
- private String gpsWeidu;
-
- /**
- * 绾害N锛堝寳绾級鎴朣锛堝崡绾級
- */
- private String gpsNs;
-
- /**
- * 缁忓害dddmm.mmmm锛屽害鍒嗘牸寮忥紙鍓嶅浣嶆暟涓嶈冻鍒欒ˉ0锛�
- */
- private String gspJingdu;
-
- /**
- * 缁忓害E锛堜笢缁忥級鎴朩锛堣タ缁忥級
- */
- private String gpsEw;
-
- /**
- * GPS鐘舵�侊紝0=鏈畾浣嶏紝1=闈炲樊鍒嗗畾浣嶏紝2=宸垎瀹氫綅锛�3=鏃犳晥PPS锛�6=姝e湪浼扮畻
- */
- private String gpsState;
-
- /**
- * 姝e湪浣跨敤鐨勫崼鏄熸暟閲忥紙00 - 12锛夛紙鍓嶅浣嶆暟涓嶈冻鍒欒ˉ0锛�
- */
- private String gpsNum;
-
- /**
- * HDOP姘村钩绮惧害鍥犲瓙锛�0.5 - 99.9锛�
- */
- private String gpsHdop;
-
- /**
- * 娴锋嫈楂樺害锛�-9999.9 - 99999.9锛�
- */
- private String gpsHaibaGao;
-
- /**
- * 鍦扮悆妞悆闈㈢浉瀵瑰ぇ鍦版按鍑嗛潰鐨勯珮搴�
- */
- private String gpsTuoqiu;
-
- /**
- * 宸垎鏃堕棿锛堜粠鏈�杩戜竴娆℃帴鏀跺埌宸垎淇″彿寮�濮嬬殑绉掓暟锛屽鏋滀笉鏄樊鍒嗗畾浣嶅皢涓虹┖锛�
- */
- private String gpsChafenTime;
-
- /**
- * 宸垎绔橧D鍙�0000 - 1023
- */
- private String gpsChafenId;
-
- /**
- * 鏍¢獙鍊�
- */
- private String gpsJiaoyan;
-
- /**
- * 璁惧id
- */
- private String tagid;
-
- /**
- * 璁惧鐗╄仈缃戝崱鍙�
- */
- private String gpsKahao;
-
- /**
- * 璁惧鐢甸噺
- */
- private String gpsPower;
-
- /**
- * SOS鐘舵��1浠h〃鍛婅0浠h〃姝e父
- */
- private String gpsSos;
-
- /**
- * 娣诲姞鏃堕棿
- */
- private String addtime;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getGpsUtcTime() {
- return gpsUtcTime;
- }
-
- public void setGpsUtcTime(String gpsUtcTime) {
- this.gpsUtcTime = gpsUtcTime;
- }
-
- public String getGpsWeidu() {
- return gpsWeidu;
- }
-
- public void setGpsWeidu(String gpsWeidu) {
- this.gpsWeidu = gpsWeidu;
- }
-
- public String getGpsNs() {
- return gpsNs;
- }
-
- public void setGpsNs(String gpsNs) {
- this.gpsNs = gpsNs;
- }
-
- public String getGspJingdu() {
- return gspJingdu;
- }
-
- public void setGspJingdu(String gspJingdu) {
- this.gspJingdu = gspJingdu;
- }
-
- public String getGpsEw() {
- return gpsEw;
- }
-
- public void setGpsEw(String gpsEw) {
- this.gpsEw = gpsEw;
- }
-
- public String getGpsState() {
- return gpsState;
- }
-
- public void setGpsState(String gpsState) {
- this.gpsState = gpsState;
- }
-
- public String getGpsNum() {
- return gpsNum;
- }
-
- public void setGpsNum(String gpsNum) {
- this.gpsNum = gpsNum;
- }
-
- public String getGpsHdop() {
- return gpsHdop;
- }
-
- public void setGpsHdop(String gpsHdop) {
- this.gpsHdop = gpsHdop;
- }
-
- public String getGpsHaibaGao() {
- return gpsHaibaGao;
- }
-
- public void setGpsHaibaGao(String gpsHaibaGao) {
- this.gpsHaibaGao = gpsHaibaGao;
- }
-
- public String getGpsTuoqiu() {
- return gpsTuoqiu;
- }
-
- public void setGpsTuoqiu(String gpsTuoqiu) {
- this.gpsTuoqiu = gpsTuoqiu;
- }
-
- public String getGpsChafenTime() {
- return gpsChafenTime;
- }
-
- public void setGpsChafenTime(String gpsChafenTime) {
- this.gpsChafenTime = gpsChafenTime;
- }
-
- public String getGpsChafenId() {
- return gpsChafenId;
- }
-
- public void setGpsChafenId(String gpsChafenId) {
- this.gpsChafenId = gpsChafenId;
- }
-
- public String getGpsJiaoyan() {
- return gpsJiaoyan;
- }
-
- public void setGpsJiaoyan(String gpsJiaoyan) {
- this.gpsJiaoyan = gpsJiaoyan;
- }
-
- public String getTagid() {
- return tagid;
- }
-
- public void setTagid(String tagid) {
- this.tagid = tagid;
- }
-
- public String getGpsKahao() {
- return gpsKahao;
- }
-
- public void setGpsKahao(String gpsKahao) {
- this.gpsKahao = gpsKahao;
- }
-
- public String getGpsPower() {
- return gpsPower;
- }
-
- public void setGpsPower(String gpsPower) {
- this.gpsPower = gpsPower;
- }
-
- public String getGpsSos() {
- return gpsSos;
- }
-
- public void setGpsSos(String gpsSos) {
- this.gpsSos = gpsSos;
- }
-
- public String getAddtime() {
- return addtime;
- }
-
- public void setAddtime(String addtime) {
- this.addtime = addtime;
- }
-
- @Override
- public String toString() {
- return "TbGpsTrack{" +
- "id = " + id +
- ", gpsUtcTime = " + gpsUtcTime +
- ", gpsWeidu = " + gpsWeidu +
- ", gpsNs = " + gpsNs +
- ", gspJingdu = " + gspJingdu +
- ", gpsEw = " + gpsEw +
- ", gpsState = " + gpsState +
- ", gpsNum = " + gpsNum +
- ", gpsHdop = " + gpsHdop +
- ", gpsHaibaGao = " + gpsHaibaGao +
- ", gpsTuoqiu = " + gpsTuoqiu +
- ", gpsChafenTime = " + gpsChafenTime +
- ", gpsChafenId = " + gpsChafenId +
- ", gpsJiaoyan = " + gpsJiaoyan +
- ", tagid = " + tagid +
- ", gpsKahao = " + gpsKahao +
- ", gpsPower = " + gpsPower +
- ", gpsSos = " + gpsSos +
- ", addtime = " + addtime +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Track/TbTrack.java b/src/main/java/com/hxzk/gps/entity/Track/TbTrack.java
deleted file mode 100644
index 4a21185..0000000
--- a/src/main/java/com/hxzk/gps/entity/Track/TbTrack.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.hxzk.gps.entity.Track;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-26
- */
-@TableName("tb_track")
-@Data
-public class TbTrack implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- private String tagid;
-
- private String x;
-
- private String y;
-
- private String z;
-
- private String layer;
-
- private String time;
-
- private String baoliu1;
-
- private String baoliu2;
-
- private String baoliu3;
-
- private String baoliu4;
-
- private String baoliu5;
-
- private String baoliu6;
-
- private String baoliu7;
-
- private String baoliu8;
-
- private String baoliu9;
-
- private String baoliu10;
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/User/TbUser.java b/src/main/java/com/hxzk/gps/entity/User/TbUser.java
deleted file mode 100644
index c2b3b92..0000000
--- a/src/main/java/com/hxzk/gps/entity/User/TbUser.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.hxzk.gps.entity.User;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-04-17
- */
-@TableName("tb_user")
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class TbUser implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 涓婚敭
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鐢ㄦ埛鍚�
- */
- private String username;
-
- /**
- * 瀵嗙爜
- */
- private String password;
-
- /**
- * 鐢佃瘽
- */
- private String phone;
-
- /**
- * 瑙掕壊ID
- */
- private String jueseid;
- /**
- * 瑙掕壊鍚嶇О
- */
- private String juesename;
-
- /**
- * 鎵�灞炲叕鍙窱D
- */
- private String companyid;
- /**
- * 鎵�灞炲叕鍙稿悕绉�
- */
- private String companyname;
- /**
- * 鏇存柊鏃堕棿
- */
- private String time;
- /**
- * 鐘舵��
- */
- private String status;
- private String avatar;
-
- public TbUser(int i, String john) {
- this.id = i;
- this.username = john;
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/User/dto/LoginResult.java b/src/main/java/com/hxzk/gps/entity/User/dto/LoginResult.java
deleted file mode 100644
index 5bff0b2..0000000
--- a/src/main/java/com/hxzk/gps/entity/User/dto/LoginResult.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hxzk.gps.entity.User.dto;
-
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-
-@Data
-public class LoginResult {
- public Integer code;
- public String msg;
- public String access_token;
-
- //username = 000 琛ㄧず鐧诲綍鐢ㄦ埛涓嶅瓨鍦�
- //username = 555 琛ㄧず鐧诲綍寮傚父
- public LoginResult(Integer code, String msg, String access_token) {
- this.code = code;
- this.msg = msg;
- this.access_token = access_token;
-
- }
- public LoginResult(Integer code, String msg) {
- this.code = code;
- this.msg = msg;
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Video/TbHksxt.java b/src/main/java/com/hxzk/gps/entity/Video/TbHksxt.java
deleted file mode 100644
index 57ba8a0..0000000
--- a/src/main/java/com/hxzk/gps/entity/Video/TbHksxt.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.hxzk.gps.entity.Video;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-01
- */
-@TableName("tb_hksxt")
-@Data
-public class TbHksxt implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private Integer id;
-
- /**
- * ip鍦板潃
- */
- private String ip;
-
- /**
- * 绔彛
- */
- private String port;
-
- /**
- * 鐢ㄦ埛鍚�
- */
- private String username;
-
- /**
- * 瀵嗙爜
- */
- private String password;
-
- /**
- * 璁惧绔彛
- */
- private String shebeiport;
-
- /**
- * 缁戝畾鍖哄煙
- */
- private String bindregion;
-
- /**
- * 褰曞叆鏃ユ湡
- */
- private String enterdate;
-
- /**
- * 瑙嗛瀹夎X鍧愭爣
- */
- private String posx;
-
- /**
- * 瑙嗛瀹夎Y鍧愭爣
- */
- private String posy;
-
- /**
- * 瑙嗛鍚嶇О
- */
- private String name;
-
- private String baoliu1;
-
- private String baoliu2;
-
- private String baoliu3;
-
- private String baoliu4;
-
- private String baoliu5;
-
- private String baoliu6;
- private String company;
-
-}
diff --git a/src/main/java/com/hxzk/gps/entity/WarnTongJi/WarnTongjiCompany.java b/src/main/java/com/hxzk/gps/entity/WarnTongJi/WarnTongjiCompany.java
deleted file mode 100644
index 9fad349..0000000
--- a/src/main/java/com/hxzk/gps/entity/WarnTongJi/WarnTongjiCompany.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.hxzk.gps.entity.WarnTongJi;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-06-09
- */
-@TableName("warn_tongji_company")
-public class WarnTongjiCompany implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鏍囬
- */
- private String title;
-
- /**
- * 鏉℃暟
- */
- private Integer num;
-
- /**
- * 鏄惁鏄剧ず 1锛氭樉绀� 0 涓嶆樉绀�
- */
- private Integer isshow;
-
- /**
- * 鍗曚綅
- */
- private String danwei;
-
- /**
- * 鎵�灞炲叕鍙�
- */
- private String company;
-
- /**
- * 鍥炬爣
- */
- private String icon;
-
- /**
- * 鏇存柊鏃堕棿
- */
- private String addtime;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public Integer getNum() {
- return num;
- }
-
- public void setNum(Integer num) {
- this.num = num;
- }
-
- public Integer getIsshow() {
- return isshow;
- }
-
- public void setIsshow(Integer isshow) {
- this.isshow = isshow;
- }
-
- public String getDanwei() {
- return danwei;
- }
-
- public void setDanwei(String danwei) {
- this.danwei = danwei;
- }
-
- public String getCompany() {
- return company;
- }
-
- public void setCompany(String company) {
- this.company = company;
- }
-
- public String getIcon() {
- return icon;
- }
-
- public void setIcon(String icon) {
- this.icon = icon;
- }
-
- public String getAddtime() {
- return addtime;
- }
-
- public void setAddtime(String addtime) {
- this.addtime = addtime;
- }
-
- @Override
- public String toString() {
- return "WarnTongjiCompany{" +
- "id = " + id +
- ", title = " + title +
- ", num = " + num +
- ", isshow = " + isshow +
- ", danwei = " + danwei +
- ", company = " + company +
- ", icon = " + icon +
- ", addtime = " + addtime +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/entity/Warning/TbWarning.java b/src/main/java/com/hxzk/gps/entity/Warning/TbWarning.java
deleted file mode 100644
index 902ed3d..0000000
--- a/src/main/java/com/hxzk/gps/entity/Warning/TbWarning.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package com.hxzk.gps.entity.Warning;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@TableName("tb_warning")
-public class TbWarning implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鍛婅绫诲瀷
- */
- private String type;
-
- /**
- * 璁惧ID
- */
- private String objectid;
-
- /**
- * 鐘舵��
- */
- private String status;
-
- /**
- * 娣诲姞鏃堕棿
- */
- private String time;
-
- /**
- * 鍧愭爣
- */
- private String baoliu1;
-
- /**
- * 鍥存爮鍚嶇О
- */
- private String baoliu2;
-
- /**
- * 鍏宠仈閮ㄩ棬
- */
- private String baoliu3;
-
- /**
- * 浜哄憳鍚嶇О
- */
- private String baoliu4;
-
- private String baoliu5;
-
- private String baoliu6;
-
- private String baoliu7;
-
- private String baoliu8;
-
- private String baoliu9;
-
- private String baoliu10;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getObjectid() {
- return objectid;
- }
-
- public void setObjectid(String objectid) {
- this.objectid = objectid;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getTime() {
- return time;
- }
-
- public void setTime(String time) {
- this.time = time;
- }
-
- public String getBaoliu1() {
- return baoliu1;
- }
-
- public void setBaoliu1(String baoliu1) {
- this.baoliu1 = baoliu1;
- }
-
- public String getBaoliu2() {
- return baoliu2;
- }
-
- public void setBaoliu2(String baoliu2) {
- this.baoliu2 = baoliu2;
- }
-
- public String getBaoliu3() {
- return baoliu3;
- }
-
- public void setBaoliu3(String baoliu3) {
- this.baoliu3 = baoliu3;
- }
-
- public String getBaoliu4() {
- return baoliu4;
- }
-
- public void setBaoliu4(String baoliu4) {
- this.baoliu4 = baoliu4;
- }
-
- public String getBaoliu5() {
- return baoliu5;
- }
-
- public void setBaoliu5(String baoliu5) {
- this.baoliu5 = baoliu5;
- }
-
- public String getBaoliu6() {
- return baoliu6;
- }
-
- public void setBaoliu6(String baoliu6) {
- this.baoliu6 = baoliu6;
- }
-
- public String getBaoliu7() {
- return baoliu7;
- }
-
- public void setBaoliu7(String baoliu7) {
- this.baoliu7 = baoliu7;
- }
-
- public String getBaoliu8() {
- return baoliu8;
- }
-
- public void setBaoliu8(String baoliu8) {
- this.baoliu8 = baoliu8;
- }
-
- public String getBaoliu9() {
- return baoliu9;
- }
-
- public void setBaoliu9(String baoliu9) {
- this.baoliu9 = baoliu9;
- }
-
- public String getBaoliu10() {
- return baoliu10;
- }
-
- public void setBaoliu10(String baoliu10) {
- this.baoliu10 = baoliu10;
- }
-
- @Override
- public String toString() {
- return "TbWarning{" +
- "id = " + id +
- ", type = " + type +
- ", objectid = " + objectid +
- ", status = " + status +
- ", time = " + time +
- ", baoliu1 = " + baoliu1 +
- ", baoliu2 = " + baoliu2 +
- ", baoliu3 = " + baoliu3 +
- ", baoliu4 = " + baoliu4 +
- ", baoliu5 = " + baoliu5 +
- ", baoliu6 = " + baoliu6 +
- ", baoliu7 = " + baoliu7 +
- ", baoliu8 = " + baoliu8 +
- ", baoliu9 = " + baoliu9 +
- ", baoliu10 = " + baoliu10 +
- "}";
- }
-}
diff --git a/src/main/java/com/hxzk/gps/filter/WebConfig.java b/src/main/java/com/hxzk/gps/filter/WebConfig.java
deleted file mode 100644
index dd0c76d..0000000
--- a/src/main/java/com/hxzk/gps/filter/WebConfig.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.hxzk.gps.filter;
-
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.ResourceBundleMessageSource;
-import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
-
-import java.util.Locale;
-
-@Configuration
-public class WebConfig implements WebMvcConfigurer {
-
- // 閰嶇疆娑堟伅婧愶紝鐢ㄤ簬鍔犺浇璧勬簮鏂囦欢
- @Bean
- public MessageSource messageSource() {
- ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
- messageSource.setBasename("messages"); // 鎸囧畾璧勬簮鏂囦欢鐨勫熀鏈悕绉�
- messageSource.setCacheSeconds(0);
- messageSource.setDefaultEncoding("UTF-8"); // 璁剧疆瀛楃缂栫爜
- return messageSource;
- }
-
- // 閰嶇疆 LocaleResolver锛岀敤浜庤В鏋愮敤鎴风殑 Locale
- @Bean
- public LocaleResolver localeResolver() {
- SessionLocaleResolver slr = new SessionLocaleResolver();
- slr.setDefaultLocale(Locale.SIMPLIFIED_CHINESE); // 璁剧疆榛樿 Locale
- return slr;
- }
-
- // 閰嶇疆 LocaleChangeInterceptor锛岀敤浜庢牴鎹姹傚弬鏁板垏鎹� Locale
- @Bean
- public LocaleChangeInterceptor localeChangeInterceptor() {
- LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
- lci.setParamName("lang"); // 鎸囧畾鍒囨崲璇█鐨勮姹傚弬鏁板悕
- return lci;
- }
-
- // 灏� LocaleChangeInterceptor 娣诲姞鍒版嫤鎴櫒閾句腑
- // 娉ㄦ剰锛歀ocaleChangeInterceptor鐜板湪鍦⊿aTokenConfigure涓敞鍐岋紝浠ラ伩鍏嶆嫤鎴櫒鎵ц椤哄簭闂
- // @Override
- // public void addInterceptors(InterceptorRegistry registry) {
- // registry.addInterceptor(localeChangeInterceptor());
- // }
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/mapper/Anchor/TbAchorMapper.java b/src/main/java/com/hxzk/gps/mapper/Anchor/TbAchorMapper.java
deleted file mode 100644
index 7572d99..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Anchor/TbAchorMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Anchor;
-
-import com.hxzk.gps.entity.Anchor.TbAchor;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbAchorMapper extends BaseMapper<TbAchor> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Attendance/TbKaoqingMapper.java b/src/main/java/com/hxzk/gps/mapper/Attendance/TbKaoqingMapper.java
deleted file mode 100644
index 580bdee..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Attendance/TbKaoqingMapper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.hxzk.gps.mapper.Attendance;
-
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hxzk.gps.entity.Attendance.TbRealkaoqing;
-import com.hxzk.gps.entity.Track.TbGpsTrack;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbKaoqingMapper extends BaseMapper<TbKaoqing> {
- /**
- * 鑰冨嫟淇℃伅鏌ヨ鎺ュ彛
- * @param companyName
- * @param time
- * @return List<TbKaoqing>
- * */
- List<TbKaoqing> FindAttendanceInfo(@Param("company") String companyName, @Param("time")String time,@Param("name") String name, @Param("tagid")String tagid);
-
-
- @Select("select count(*)AS tagid,area,now()AS name from tb_realkaoqing GROUP BY area")
- List<TbRealkaoqing> findKaoQinQuYu();
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Cabinet/TbCabinetMapper.java b/src/main/java/com/hxzk/gps/mapper/Cabinet/TbCabinetMapper.java
deleted file mode 100644
index d52d242..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Cabinet/TbCabinetMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Cabinet;
-
-import com.hxzk.gps.entity.Cabinet.TbCabinet;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-03
- */
-public interface TbCabinetMapper extends BaseMapper<TbCabinet> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakahuanlogMapper.java b/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakahuanlogMapper.java
deleted file mode 100644
index 04aff3a..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakahuanlogMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.hxzk.gps.mapper.Cabinet;
-
-import com.hxzk.gps.entity.Cabinet.TbFakahuanlog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hxzk.gps.entity.Cabinet.TbFakaqulog;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-15
- */
-public interface TbFakahuanlogMapper extends BaseMapper<TbFakahuanlog> {
- @Select("select * from tb_fakahuanlog f inner join tb_cabinet c on c.cabinetname = f.guiziname where c.company = #{company} order by f.time desc")
- List<TbFakahuanlog> FindFaKaHuanInfo(String company);
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakajiMapper.java b/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakajiMapper.java
deleted file mode 100644
index f276b87..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakajiMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Cabinet;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hxzk.gps.entity.FaKaJi.TbFakaji;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-03
- */
-public interface TbFakajiMapper extends BaseMapper<TbFakaji> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakalogMapper.java b/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakalogMapper.java
deleted file mode 100644
index e051d3b..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakalogMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hxzk.gps.mapper.Cabinet;
-
-import com.hxzk.gps.entity.Cabinet.TbFakalog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 鍙戝崱鏃ュ織 Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-01-XX
- */
-public interface TbFakalogMapper extends BaseMapper<TbFakalog> {
-
-}
-
diff --git a/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakaqulogMapper.java b/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakaqulogMapper.java
deleted file mode 100644
index 4a1f073..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakaqulogMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.hxzk.gps.mapper.Cabinet;
-
-import com.hxzk.gps.entity.Cabinet.TbFakaqulog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-15
- */
-public interface TbFakaqulogMapper extends BaseMapper<TbFakaqulog> {
- @Select("select * from tb_fakaqulog f inner join tb_cabinet c on c.cabinetname = f.guiziname where c.company = #{company} order by f.time desc")
- List<TbFakaqulog> FindFaKaQuInfo(String company);
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Company/TbCompanyMapper.java b/src/main/java/com/hxzk/gps/mapper/Company/TbCompanyMapper.java
deleted file mode 100644
index 6b1d615..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Company/TbCompanyMapper.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package com.hxzk.gps.mapper.Company;
-
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.entity.Company.TbCompany;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hxzk.gps.entity.WarnTongJi.WarnTongjiCompany;
-import com.hxzk.gps.entity.Warning.TbWarning;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-04-17
- */
-public interface TbCompanyMapper extends BaseMapper<TbCompany> {
-
- //鍦ㄧ嚎浜哄憳
- @Select({
- "<script>",
- "SELECT COUNT(*) FROM tb_person",
- "WHERE p_online = 1",
- "AND companyid IN",
- " <foreach item='comp' collection='companyids' open='(' separator=',' close=')'>",
- " #{comp}",
- " </foreach>",
- "</script>"
- })
- Integer FindCompanyOnlineCount(@Param("companyids")List companyids);
-
- //绂荤嚎浜哄憳
- @Select({
- "<script>",
- "SELECT COUNT(*) FROM tb_person",
- "WHERE p_online = 0",
- "AND companyid IN",
- " <foreach item='comp' collection='companyids' open='(' separator=',' close=')'>",
- " #{comp}",
- " </foreach>",
- "</script>"
- })
- Integer FindCompanyNoOnlineCount(@Param("companyids")List companyids);
-
- //鍦ㄧ嚎杞﹁締
- @Select({
- "<script>",
- "SELECT COUNT(*) FROM tb_person",
- "WHERE p_online = 1",
- "AND (",
- " (baoliu19 = '杞﹁浇鏍囩' AND companyid IN",
- " <foreach item='comp' collection='companyids' open='(' separator=',' close=')'>",
- " #{comp}",
- " </foreach>)",
- " OR (baoliu19 = '铻嶅悎杞﹁浇' AND companyid IN",
- " <foreach item='comp' collection='companyids' open='(' separator=',' close=')'>",
- " #{comp}",
- " </foreach>)",
- " OR (baoliu19 = '杞﹁浇缁堢' AND companyid IN",
- " <foreach item='comp' collection='companyids' open='(' separator=',' close=')'>",
- " #{comp}",
- " </foreach>)",
- ")",
- "</script>"
- })
- Integer FindCompanyOnlineCarCount(@Param("companyids")List companyids);
-
- //绂荤嚎杞﹁締
- @Select({
- "<script>",
- "SELECT COUNT(*) FROM tb_person",
- "WHERE p_online = 0",
- "AND (",
- " (baoliu19 = '杞﹁浇鏍囩' AND companyid IN",
- " <foreach item='comp' collection='companyids' open='(' separator=',' close=')'>",
- " #{comp}",
- " </foreach>)",
- " OR (baoliu19 = '铻嶅悎杞﹁浇' AND companyid IN",
- " <foreach item='comp' collection='companyids' open='(' separator=',' close=')'>",
- " #{comp}",
- " </foreach>)",
- " OR (baoliu19 = '杞﹁浇缁堢' AND companyid IN",
- " <foreach item='comp' collection='companyids' open='(' separator=',' close=')'>",
- " #{comp}",
- " </foreach>)",
- ")",
- "</script>"
- })
- Integer FindCompanyNoOnlineCarCount(@Param("companyids")List companyids);
-
- //鍦ㄧ嚎鍩虹珯
- @Select("select count(*) from tb_achor where anchormode = '1' and company = #{company} ")
- Integer FindCompanyOnlineAchorCount(String company);
-
- //绂荤嚎鍩虹珯
- @Select("select count(*) from tb_achor where anchormode = '0' and company = #{company} ")
- Integer FindCompanyNoOnlineAchorCount(String company);
-
-
- @Select({
- "<script>",
- "SELECT COUNT(*) FROM tb_warning w",
- "INNER JOIN tb_person p ON p.p_tagid = w.objectid",
- "WHERE p.companyid IN",
- " <foreach item='comp' collection='companyids' open='(' separator=',' close=')'>",
- " #{comp}",
- " </foreach>",
- "AND w.type = '闈欐鍛婅'",
- "</script>"
- })
- Integer FindCompanyWarningCount1(@Param("companyids")List companyids);
-
- @Select({
- "<script>",
- "SELECT COUNT(*) FROM tb_warning w",
- "INNER JOIN tb_person p ON p.p_tagid = w.objectid",
- "WHERE p.companyid IN",
- " <foreach item='item' collection='companyids' open='(' separator=',' close=')'>",
- " #{item}",
- " </foreach>",
- "AND w.type = 'SOS'",
- "AND w.status = '鏈鐞�'",
- "</script>"
- })
- Integer FindCompanyWarningCount2(@Param("companyids")List companyids);
-
-
- @Select({
- "<script>",
- "SELECT COUNT(*) FROM tb_warning w",
- "INNER JOIN tb_person p ON p.p_tagid = w.objectid",
- "WHERE p.companyid IN",
- " <foreach item='item' collection='companyids' open='(' separator=',' close=')'>",
- " #{item}",
- " </foreach>",
- "AND w.type = '璺岃惤鍛婅'",
- "AND w.status = '鏈鐞�'",
- "</script>"
- })
- Integer FindCompanyWarningCount3(@Param("companyids")List companyids);
-
-
- @Select({
- "<script>",
- "SELECT COUNT(*) FROM tb_warning w",
- "INNER JOIN tb_person p ON p.p_tagid = w.objectid",
- "WHERE p.companyid IN",
- " <foreach item='item' collection='companyids' open='(' separator=',' close=')'>",
- " #{item}",
- " </foreach>",
- "AND w.type = '缂哄憳鍛婅'",
- "AND w.status = '鏈鐞�'",
- "</script>"
- })
- Integer FindCompanyWarningCount4(@Param("companyids")List companyids);
-
- @Select({
- "<script>",
- "SELECT COUNT(*) FROM tb_warning w",
- "INNER JOIN tb_person p ON p.p_tagid = w.objectid",
- "WHERE p.companyid IN",
- " <foreach item='item' collection='companyids' open='(' separator=',' close=')'>",
- " #{item}",
- " </foreach>",
- "AND w.type = '瓒呭憳鍛婅'",
- "AND w.status = '鏈鐞�'",
- "</script>"
- })
- Integer FindCompanyWarningCount5(@Param("companyids")List companyids);
-
-
- @Select({
- "<script>",
- "SELECT COUNT(*) FROM tb_warning w",
- "INNER JOIN tb_person p ON p.p_tagid = w.objectid",
- "WHERE p.companyid IN",
- " <foreach item='item' collection='companyids' open='(' separator=',' close=')'>",
- " #{item}",
- " </foreach>",
- "AND w.type = '鑱氶泦鍛婅'",
- "AND w.status = '鏈鐞�'",
- "</script>"
- })
- Integer FindCompanyWarningCount6(@Param("companyids")List companyids);
-
- @Select({
- "<script>",
- "SELECT COUNT(*) FROM tb_warning w",
- "INNER JOIN tb_person p ON p.p_tagid = w.objectid",
- "WHERE p.companyid IN",
- " <foreach item='item' collection='companyids' open='(' separator=',' close=')'>",
- " #{item}",
- " </foreach>",
- "AND w.type = '鍑哄幓鍛婅'",
- "AND w.status = '鏈鐞�'",
- "</script>"
- })
- Integer FindCompanyWarningCount7(@Param("companyids")List companyids);
-
- @Select({
- "<script>",
- "SELECT COUNT(*) FROM tb_warning w",
- "INNER JOIN tb_person p ON p.p_tagid = w.objectid",
- "WHERE p.companyid IN",
- " <foreach item='item' collection='companyids' open='(' separator=',' close=')'>",
- " #{item}",
- " </foreach>",
- "AND w.type = '杩涘叆鍛婅'",
- "AND w.status = '鏈鐞�'",
- "</script>"
- })
- Integer FindCompanyWarningCount8(@Param("companyids")List companyids);
-
- @Select({
- "<script>",
- "SELECT COUNT(*) FROM tb_warning w",
- "INNER JOIN tb_person p ON p.p_tagid = w.objectid",
- "WHERE p.companyid IN",
- " <foreach item='item' collection='companyids' open='(' separator=',' close=')'>",
- " #{item}",
- " </foreach>",
- "AND w.type = '浣庣數閲�'",
- "AND w.status = '鏈鐞�'",
- "</script>"
- })
- Integer FindCompanyWarningCount9(@Param("companyids")List companyids);
-
- @Select("select * from warn_tongji_company where company = #{company} ")
- List<WarnTongjiCompany> findCompanyWarn(String company);
-
- @Update("update warn_tongji_company set num = #{count} where title = #{title} and company = #{company} ")
- Integer UpCompanyWarnCount(@Param("company") String company, @Param("count")Integer count, @Param("title")String title);
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Department/TbDepartmentIconMapper.java b/src/main/java/com/hxzk/gps/mapper/Department/TbDepartmentIconMapper.java
deleted file mode 100644
index 57cf947..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Department/TbDepartmentIconMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.hxzk.gps.mapper.Department;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hxzk.gps.entity.Department.TbDepartMentIcon;
-import com.hxzk.gps.entity.Department.TbDepartment;
-
-/**
- * <p>
- * 閮ㄩ棬鍥炬爣
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-18
- */
-public interface TbDepartmentIconMapper extends BaseMapper<TbDepartMentIcon> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Department/TbDepartmentMapper.java b/src/main/java/com/hxzk/gps/mapper/Department/TbDepartmentMapper.java
deleted file mode 100644
index c7a4874..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Department/TbDepartmentMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Department;
-
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-18
- */
-public interface TbDepartmentMapper extends BaseMapper<TbDepartment> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Fence/TbFenceMapper.java b/src/main/java/com/hxzk/gps/mapper/Fence/TbFenceMapper.java
deleted file mode 100644
index 18ba030..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Fence/TbFenceMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Fence;
-
-import com.hxzk.gps.entity.Fence.TbFence;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbFenceMapper extends BaseMapper<TbFence> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/FzRadar/TbFzanchorMapper.java b/src/main/java/com/hxzk/gps/mapper/FzRadar/TbFzanchorMapper.java
deleted file mode 100644
index b7938f0..0000000
--- a/src/main/java/com/hxzk/gps/mapper/FzRadar/TbFzanchorMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.FzRadar;
-
-import com.hxzk.gps.entity.FzRadar.TbFzanchor;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbFzanchorMapper extends BaseMapper<TbFzanchor> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Gather/TbPergatherMapper.java b/src/main/java/com/hxzk/gps/mapper/Gather/TbPergatherMapper.java
deleted file mode 100644
index 0ba0e85..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Gather/TbPergatherMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Gather;
-
-import com.hxzk.gps.entity.Gather.TbPergather;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbPergatherMapper extends BaseMapper<TbPergather> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Heart/TbHeartRecordMapper.java b/src/main/java/com/hxzk/gps/mapper/Heart/TbHeartRecordMapper.java
deleted file mode 100644
index 2410c2b..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Heart/TbHeartRecordMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.hxzk.gps.mapper.Heart;
-
-import com.hxzk.gps.entity.Heart.TbHeartRecord;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hxzk.gps.entity.Track.TbGpsTrack;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbHeartRecordMapper extends BaseMapper<TbHeartRecord> {
-
- List<TbHeartRecord> FindHeartInfo(@Param("company") String companyName,@Param("name") String name,@Param("tagid") String tagid);
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/HistoryPower/TbAcHistoryPowerMapper.java b/src/main/java/com/hxzk/gps/mapper/HistoryPower/TbAcHistoryPowerMapper.java
deleted file mode 100644
index ddcbcba..0000000
--- a/src/main/java/com/hxzk/gps/mapper/HistoryPower/TbAcHistoryPowerMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.hxzk.gps.mapper.HistoryPower;
-
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.hxzk.gps.entity.HistoryPower.TbAcHistoryPower;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbAcHistoryPowerMapper extends BaseMapper<TbAcHistoryPower> {
-
- /**
- * 鍩虹珯鍘嗗彶鐢甸噺鏌ヨ鎺ュ彛
- * @param companyName
- * @param time
- * @return List<TbAcHistoryPower>
- * */
- List<TbAcHistoryPower> FindAcHistoryPowerInfo(@Param("company") String companyName, @Param("time")String time,@Param("anchorId")String anchorId);
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/HistoryPower/TbHistoryPowerMapper.java b/src/main/java/com/hxzk/gps/mapper/HistoryPower/TbHistoryPowerMapper.java
deleted file mode 100644
index 8073537..0000000
--- a/src/main/java/com/hxzk/gps/mapper/HistoryPower/TbHistoryPowerMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.hxzk.gps.mapper.HistoryPower;
-
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.hxzk.gps.entity.HistoryPower.TbHistoryPower;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbHistoryPowerMapper extends BaseMapper<TbHistoryPower> {
-
- /**
- * 鍘嗗彶鐢甸噺淇℃伅鏌ヨ鎺ュ彛
- * @param companyName
- * @param time
- * @return List<TbHistoryPower>
- * */
-
- List<TbHistoryPower> FindTagHistoryPowerInfo(@Param("company") String companyName, @Param("time")String time,@Param("tagid")String tagid);
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Inspection/TbNewtaskMapper.java b/src/main/java/com/hxzk/gps/mapper/Inspection/TbNewtaskMapper.java
deleted file mode 100644
index 705b245..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Inspection/TbNewtaskMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Inspection;
-
-import com.hxzk.gps.entity.Inspection.TbNewtask;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbNewtaskMapper extends BaseMapper<TbNewtask> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Inspection/TbXunjianbaobiaoMapper.java b/src/main/java/com/hxzk/gps/mapper/Inspection/TbXunjianbaobiaoMapper.java
deleted file mode 100644
index d8dc0c9..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Inspection/TbXunjianbaobiaoMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.hxzk.gps.mapper.Inspection;
-
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.hxzk.gps.entity.Inspection.TbXunjianbaobiao;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbXunjianbaobiaoMapper extends BaseMapper<TbXunjianbaobiao> {
-
- List<TbXunjianbaobiao> FindAXunJianBaoBiaoInfo(@Param("company") String companyName, @Param("name") String name, @Param("tagid")String tagid);
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Log/TbFzlogMapper.java b/src/main/java/com/hxzk/gps/mapper/Log/TbFzlogMapper.java
deleted file mode 100644
index ede5372..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Log/TbFzlogMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.hxzk.gps.mapper.Log;
-
-import com.hxzk.gps.entity.Log.TbFzlog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hxzk.gps.entity.Log.TbLixianrecord0829;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbFzlogMapper extends BaseMapper<TbFzlog> {
- List<TbFzlog> FindFzLogInfo(@Param("company") String companyName,@Param("tagId") String tagId,@Param("tagName") String tagName);
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Log/TbLixianrecord0829Mapper.java b/src/main/java/com/hxzk/gps/mapper/Log/TbLixianrecord0829Mapper.java
deleted file mode 100644
index 68edbb5..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Log/TbLixianrecord0829Mapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.hxzk.gps.mapper.Log;
-
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.hxzk.gps.entity.Log.TbLixianrecord0829;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbLixianrecord0829Mapper extends BaseMapper<TbLixianrecord0829> {
- /**
- * 绂荤嚎鏃ュ織淇℃伅鏌ヨ鎺ュ彛
- * @param companyName
- * @return List<TbLixianrecord0829>
- * */
- List<TbLixianrecord0829> FindLixianLogInfo(@Param("company") String companyName,@Param("name") String name,@Param("tagid") String tagid);
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Log/TbLoginLogMapper.java b/src/main/java/com/hxzk/gps/mapper/Log/TbLoginLogMapper.java
deleted file mode 100644
index f970e91..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Log/TbLoginLogMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Log;
-
-import com.hxzk.gps.entity.Log.TbLoginLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-06-09
- */
-public interface TbLoginLogMapper extends BaseMapper<TbLoginLog> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Loragateway/TbLoragatewayMapper.java b/src/main/java/com/hxzk/gps/mapper/Loragateway/TbLoragatewayMapper.java
deleted file mode 100644
index f603cc2..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Loragateway/TbLoragatewayMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Loragateway;
-
-import com.hxzk.gps.entity.Loragateway.TbLoragateway;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbLoragatewayMapper extends BaseMapper<TbLoragateway> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Mac/TbMacMapper.java b/src/main/java/com/hxzk/gps/mapper/Mac/TbMacMapper.java
deleted file mode 100644
index 54394ee..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Mac/TbMacMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Mac;
-
-import com.hxzk.gps.entity.Mac.TbMac;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-01
- */
-public interface TbMacMapper extends BaseMapper<TbMac> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Map/TbMapMapper.java b/src/main/java/com/hxzk/gps/mapper/Map/TbMapMapper.java
deleted file mode 100644
index d93dd5b..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Map/TbMapMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Map;
-
-import com.hxzk.gps.entity.Map.TbMap;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-public interface TbMapMapper extends BaseMapper<TbMap> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Map/TbMarsHomesetMapper.java b/src/main/java/com/hxzk/gps/mapper/Map/TbMarsHomesetMapper.java
deleted file mode 100644
index 15bea0a..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Map/TbMarsHomesetMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Map;
-
-import com.hxzk.gps.entity.Map.TbMarsHomeset;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbMarsHomesetMapper extends BaseMapper<TbMarsHomeset> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Menu/MenuMapper.java b/src/main/java/com/hxzk/gps/mapper/Menu/MenuMapper.java
deleted file mode 100644
index dfcfce0..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Menu/MenuMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Menu;
-
-import com.hxzk.gps.entity.Menu.Menu;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-23
- */
-public interface MenuMapper extends BaseMapper<Menu> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Message/TbSendMessageHistoryMapper.java b/src/main/java/com/hxzk/gps/mapper/Message/TbSendMessageHistoryMapper.java
deleted file mode 100644
index e3ccfa9..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Message/TbSendMessageHistoryMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.hxzk.gps.mapper.Message;
-
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.hxzk.gps.entity.Message.TbSendMessageHistory;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbSendMessageHistoryMapper extends BaseMapper<TbSendMessageHistory> {
-
- List<TbSendMessageHistory> FindMessageInfo(@Param("company") String companyName,@Param("tagid") String tagid,@Param("user") String user);
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Person/TbPersonMapper.java b/src/main/java/com/hxzk/gps/mapper/Person/TbPersonMapper.java
deleted file mode 100644
index 188dad5..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Person/TbPersonMapper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.hxzk.gps.mapper.Person;
-
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hxzk.gps.result.ResultList;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-06-12
- */
-public interface TbPersonMapper extends BaseMapper<TbPerson> {
-
-
- /*
- * 娣诲姞浜哄憳瀹氫綅
- * */
- List<TbPerson> PersonPosition(List<Long> list);
-
-
- /*
- * 瀹炴椂浜哄憳浣嶇疆淇℃伅
- * */
- List<TbPerson> RealPosition(List<Long> list);
-
- /*
- * 瀹炴椂浜哄憳浣嶇疆淇℃伅
- * */
- List<TbPerson> RealPosition2D(List<Long> list);
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Role/RoleMapper.java b/src/main/java/com/hxzk/gps/mapper/Role/RoleMapper.java
deleted file mode 100644
index 1b8e596..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Role/RoleMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Role;
-
-import com.hxzk.gps.entity.Role.Role;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-08
- */
-public interface RoleMapper extends BaseMapper<Role> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Role/RoleMenuMapper.java b/src/main/java/com/hxzk/gps/mapper/Role/RoleMenuMapper.java
deleted file mode 100644
index 2a8da0b..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Role/RoleMenuMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.hxzk.gps.mapper.Role;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hxzk.gps.entity.Role.Rolemenu;
-
-public interface RoleMenuMapper extends BaseMapper<Rolemenu> {
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/RtkAnchor/TbRtkanchorMapper.java b/src/main/java/com/hxzk/gps/mapper/RtkAnchor/TbRtkanchorMapper.java
deleted file mode 100644
index 6b17bdc..0000000
--- a/src/main/java/com/hxzk/gps/mapper/RtkAnchor/TbRtkanchorMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.RtkAnchor;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hxzk.gps.entity.RtkAnchor.TbRtkanchor;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-22
- */
-public interface TbRtkanchorMapper extends BaseMapper<TbRtkanchor> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Sms/TbSmsLogMapper.java b/src/main/java/com/hxzk/gps/mapper/Sms/TbSmsLogMapper.java
deleted file mode 100644
index b7aa20b..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Sms/TbSmsLogMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Sms;
-
-import com.hxzk.gps.entity.Sms.TbSmsLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-public interface TbSmsLogMapper extends BaseMapper<TbSmsLog> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Sms/TbSmsReminderMapper.java b/src/main/java/com/hxzk/gps/mapper/Sms/TbSmsReminderMapper.java
deleted file mode 100644
index 8db6bcf..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Sms/TbSmsReminderMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Sms;
-
-import com.hxzk.gps.entity.Sms.TbSmsReminder;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-public interface TbSmsReminderMapper extends BaseMapper<TbSmsReminder> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Sms/TbVoicetipMapper.java b/src/main/java/com/hxzk/gps/mapper/Sms/TbVoicetipMapper.java
deleted file mode 100644
index e6071c8..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Sms/TbVoicetipMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Sms;
-
-import com.hxzk.gps.entity.Sms.TbVoicetip;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-public interface TbVoicetipMapper extends BaseMapper<TbVoicetip> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/System/TbSystemOperationLogMapper.java b/src/main/java/com/hxzk/gps/mapper/System/TbSystemOperationLogMapper.java
deleted file mode 100644
index cd0d97f..0000000
--- a/src/main/java/com/hxzk/gps/mapper/System/TbSystemOperationLogMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.System;
-
-import com.hxzk.gps.entity.System.TbSystemOperationLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-12
- */
-public interface TbSystemOperationLogMapper extends BaseMapper<TbSystemOperationLog> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Tag/TbTagMapper.java b/src/main/java/com/hxzk/gps/mapper/Tag/TbTagMapper.java
deleted file mode 100644
index f2348d5..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Tag/TbTagMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Tag;
-
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbTagMapper extends BaseMapper<TbTag> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/ThreeModel/TbThreemodelMapper.java b/src/main/java/com/hxzk/gps/mapper/ThreeModel/TbThreemodelMapper.java
deleted file mode 100644
index 6fa4619..0000000
--- a/src/main/java/com/hxzk/gps/mapper/ThreeModel/TbThreemodelMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.ThreeModel;
-
-import com.hxzk.gps.entity.ThreeModel.TbThreemodel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-09-03
- */
-public interface TbThreemodelMapper extends BaseMapper<TbThreemodel> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Track/TbGpsTrackMapper.java b/src/main/java/com/hxzk/gps/mapper/Track/TbGpsTrackMapper.java
deleted file mode 100644
index 18814af..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Track/TbGpsTrackMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.hxzk.gps.mapper.Track;
-
-import com.hxzk.gps.entity.Track.TbGpsTrack;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hxzk.gps.entity.Track.TbTrack;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-26
- */
-public interface TbGpsTrackMapper extends BaseMapper<TbGpsTrack> {
-
- List<TbGpsTrack> FindGpsTrackInfo(@Param("company") String companyName, @Param("time")String time,@Param("tagid")String tagid);
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Track/TbTrackMapper.java b/src/main/java/com/hxzk/gps/mapper/Track/TbTrackMapper.java
deleted file mode 100644
index ed5e171..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Track/TbTrackMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.hxzk.gps.mapper.Track;
-
-import com.hxzk.gps.entity.Track.TbTrack;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-26
- */
-public interface TbTrackMapper extends BaseMapper<TbTrack> {
- List<TbTrack> FindTrackInfo(@Param("company") String companyName, @Param("time")String time,@Param("tagid")String tagid);
-
- @Select("SELECT t.baoliu2,t.baoliu3,t.tagid,t.time,t.baoliu8,t.baoliu9,p.p_department as baoliu10,t.baoliu4,t.x,t.y FROM tb_track_${time} t INNER JOIN tb_person p on p.p_tagid = t.tagid where t.time >= #{baoliu1} and t.time <= #{baoliu2} and t.tagid = #{tagid} or t.time >= #{baoliu1} and t.time <= #{baoliu2} and t.baoliu8 = #{tagid} order by t.time asc ")
- List<TbTrack> FindTrackView(TbTrack tbTrack);
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/User/TbUserMapper.java b/src/main/java/com/hxzk/gps/mapper/User/TbUserMapper.java
deleted file mode 100644
index 0eb551b..0000000
--- a/src/main/java/com/hxzk/gps/mapper/User/TbUserMapper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.hxzk.gps.mapper.User;
-
-import com.hxzk.gps.controller.User.Results.MenuList;
-import com.hxzk.gps.controller.User.Results.MenuListDtoAll;
-import com.hxzk.gps.entity.User.TbUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-04-17
- */
-public interface TbUserMapper extends BaseMapper<TbUser> {
- /*
- * 鐢ㄦ埛鎵�灞炲鑸彍鍗�
- * */
- @Select("SELECT m.id,m.path,m.name,m.component,m.redirect,m.parent_id,m.meta from tb_user u join rolemenu r on r.`role_id` = u.`jueseid` join menu m on m.id = r.`menu_id` where u.username = #{username}")
- public List<MenuList> FindUserRoleList(String username);
-
- /*
- * 瀵艰埅鑿滃崟淇℃伅
- * */
- @Select("SELECT DISTINCT m.id, m.name as label,meta, m.parent_id FROM menu m")
- public List<MenuListDtoAll> FindUserRoleListAll();
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Video/TbHksxtMapper.java b/src/main/java/com/hxzk/gps/mapper/Video/TbHksxtMapper.java
deleted file mode 100644
index 0c02eb7..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Video/TbHksxtMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.Video;
-
-import com.hxzk.gps.entity.Video.TbHksxt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-01
- */
-public interface TbHksxtMapper extends BaseMapper<TbHksxt> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/WarnTongJi/WarnTongjiCompanyMapper.java b/src/main/java/com/hxzk/gps/mapper/WarnTongJi/WarnTongjiCompanyMapper.java
deleted file mode 100644
index af9a701..0000000
--- a/src/main/java/com/hxzk/gps/mapper/WarnTongJi/WarnTongjiCompanyMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.mapper.WarnTongJi;
-
-import com.hxzk.gps.entity.WarnTongJi.WarnTongjiCompany;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-06-09
- */
-public interface WarnTongjiCompanyMapper extends BaseMapper<WarnTongjiCompany> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/mapper/Warning/TbWarningMapper.java b/src/main/java/com/hxzk/gps/mapper/Warning/TbWarningMapper.java
deleted file mode 100644
index c392c3b..0000000
--- a/src/main/java/com/hxzk/gps/mapper/Warning/TbWarningMapper.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.hxzk.gps.mapper.Warning;
-
-import com.hxzk.gps.entity.Warning.TbWarning;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-public interface TbWarningMapper extends BaseMapper<TbWarning> {
- //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鍏徃涓嬬殑鍛婅鍒楄〃淇℃伅
-
- List<TbWarning> FindWarningInfo(@Param("CompanyName") String CompanyName, @Param("objectid")String objectid, @Param("baoliu10")String baoliu10,@Param("type")String type);
-
- List<TbWarning> FindWarningUntreated(@Param("companyIds") List companyIds,@Param("status")String status);
-
-
- /*
- * 鑾峰彇缁熻椤甸潰鍛婅鏁版嵁
- * */
- @Select("<script>"
- + "select count(*) from tb_warning w "
- + "inner join tb_person p on p.p_tagid = w.`objectid` "
- + "where w.type = #{type} "
- + "and p.companyid in "
- + "<foreach item='item' collection='companyids' open='(' separator=',' close=')'>"
- + "#{item}"
- + "</foreach>"
- + "</script>")
- Integer FindDayCountInfo(@Param("type")String type,@Param("companyids")List companyids);
-
- /*
- * 鑾峰彇缁熻椤甸潰鍛婅鏁版嵁(鏃ユ湡绛涢��)
- * */
- @Select({
- "<script>",
- "SELECT count(*) FROM tb_warning w ",
- "INNER JOIN tb_person p ON p.p_tagid = w.objectid ",
- "WHERE w.type = #{type} AND p.company = #{company} ",
- "<if test='timeRange != null'>",
- " AND w.time >= ",
- " <choose>",
- " <when test='timeRange == 1'>DATE_SUB(NOW(), INTERVAL 1 DAY)</when>",
- " <when test='timeRange == 2'>DATE_SUB(NOW(), INTERVAL 30 DAY)</when>",
- " <when test='timeRange == 3'>DATE_SUB(NOW(), INTERVAL 3 MONTH)</when>",
- " <when test='timeRange == 4'>DATE_SUB(NOW(), INTERVAL 6 MONTH)</when>",
- " <when test='timeRange == 5'>DATE_SUB(NOW(), INTERVAL 1 YEAR)</when>",
- " </choose>",
- "</if>",
- "</script>"
- })
- Integer FindDayDateCountInfo(
- @Param("type") String type,
- @Param("company") String company,
- @Param("timeRange") Integer timeRange
- );
-
-
-
- /*
- * 缁熻鍒嗘瀽鎵�鏈夊憡璀﹀姛鑳�
- * */
- @Select(" SELECT w.id, w.type, w.objectid, w.status, w.time, w.baoliu1, w.baoliu2, w.baoliu3, w.baoliu4, w.baoliu5, w.baoliu6,w.baoliu7, p.p_name as baoliu10\n" +
- " FROM tb_warning w" +
- " INNER JOIN tb_person p on p.p_tagid = w.objectid" +
- " WHERE p.company = #{CompanyName}")
- public List<TbWarning> FindWarningAll(@Param("CompanyName") String CompanyName);
-
- @Select("<script>" +
- "SELECT w.id, w.type, w.objectid, w.status, w.time, w.baoliu1, w.baoliu2, w.baoliu3, w.baoliu4, w.baoliu5, w.baoliu6, w.baoliu7, p.p_name as baoliu10 " +
- "FROM tb_warning w " +
- "INNER JOIN tb_person p ON p.p_tagid = w.objectid " +
- "WHERE w.status = '鏈鐞�' and p.companyid IN " +
- "<foreach item='company' collection='Companyids' open='(' separator=',' close=')'>" +
- " #{company}" +
- "</foreach>" +
- " AND w.type = #{type}" +
- "</script>")
- public List<TbWarning> FindWarningInfoType(@Param("Companyids") List Companyids,@Param("type") String type);
-
- /*
- * 鑾峰彇寮曟搸鏇存柊鏃堕棿
- * */
- @Select("select addtime from warn_tongji limit 0,1")
- String FindCSDATE();
-}
diff --git a/src/main/java/com/hxzk/gps/result/ListDataResult.java b/src/main/java/com/hxzk/gps/result/ListDataResult.java
deleted file mode 100644
index f8507eb..0000000
--- a/src/main/java/com/hxzk/gps/result/ListDataResult.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.hxzk.gps.result;
-
-
-import java.util.List;
-
-public class ListDataResult<T> {
-
- /*
- * 鎴愬姛杩斿洖琛ㄦ牸鏁版嵁
- * */
- public static <T> ResultTable resultTableSuccess(table tableList,String msg) {
- return new ResultTable(tableList,msg);
- }
-
- /*
- * 鎴愬姛杩斿洖琛ㄦ牸杞ㄨ抗鏁版嵁
- * */
- public static <T> TrackResultTable resultTrackTableSuccess(Tracktable tableList,String msg) {
- return new TrackResultTable(tableList,msg);
- }
-
- /*
- * 杩斿洖琛ㄦ牸杞ㄨ抗鏁版嵁寮傚父鐘舵��
- * */
-
- public static <T> TrackResultTable resultTrackTableerror(String msg) {
- return new TrackResultTable(msg);
- }
-
- /*
- * 杩斿洖琛ㄦ牸鏁版嵁寮傚父鐘舵��
- * */
- public static <T> ResultTable resultTableError(String msg) {
- return new ResultTable(msg);
- }
-
-
- /*
- * 鎴愬姛杩斿洖鍒楄〃鏁版嵁
- * */
- public static <T> ResultList resultListSuccess(List list,String msg) {
- return new ResultList(list,msg);
- }
-}
-
diff --git a/src/main/java/com/hxzk/gps/result/ResultList.java b/src/main/java/com/hxzk/gps/result/ResultList.java
deleted file mode 100644
index c1f0a84..0000000
--- a/src/main/java/com/hxzk/gps/result/ResultList.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.hxzk.gps.result;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-public class ResultList {
- private Integer code;
- private List data;
- private String msg;
-
-
-
- // ------
- // 琛ㄦ牸鏁版嵁杩斿洖鎴愬姛
- public ResultList(List data, String msg){
- this.code=200;
- this.msg=msg;
- this.data = data;
- }
-
- // ------
- // 琛ㄦ牸鏁版嵁杩斿洖澶辫触
- public ResultList(String msg){
- this.code=501;
- this.msg=msg;
- this.data = data;
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/result/ResultTable.java b/src/main/java/com/hxzk/gps/result/ResultTable.java
deleted file mode 100644
index 84e2473..0000000
--- a/src/main/java/com/hxzk/gps/result/ResultTable.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.hxzk.gps.result;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class ResultTable {
- private Integer code;
- private table data;
- private String msg;
-
-
-
- // ------
- // 琛ㄦ牸鏁版嵁杩斿洖鎴愬姛
- public ResultTable(table data,String msg){
- this.code=200;
- this.msg=msg;
- this.data = data;
- }
-
- // ------
- // 琛ㄦ牸鏁版嵁杩斿洖澶辫触
- public ResultTable(String msg){
- this.code=501;
- this.msg=msg;
- this.data = data;
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/result/TrackResultTable.java b/src/main/java/com/hxzk/gps/result/TrackResultTable.java
deleted file mode 100644
index 270ec6c..0000000
--- a/src/main/java/com/hxzk/gps/result/TrackResultTable.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.hxzk.gps.result;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-@Data
-@NoArgsConstructor
-public class TrackResultTable implements Serializable {
- private Integer code;
- private Tracktable data;
- private String msg;
-
-
-
- // ------
- // 琛ㄦ牸鏁版嵁杩斿洖鎴愬姛
- public TrackResultTable(Tracktable data, String msg){
- this.code=200;
- this.msg=msg;
- this.data = data;
- }
-
- // ------
- // 琛ㄦ牸鏁版嵁杩斿洖澶辫触
- public TrackResultTable(String msg){
- this.code=501;
- this.msg=msg;
- this.data = data;
- }
- public TrackResultTable(String msg,String code){
- this.code=501;
- this.msg=msg;
- this.data = data;
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/result/Tracktable.java b/src/main/java/com/hxzk/gps/result/Tracktable.java
deleted file mode 100644
index f644aee..0000000
--- a/src/main/java/com/hxzk/gps/result/Tracktable.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.hxzk.gps.result;
-
-import com.hxzk.gps.entity.Track.TbTrack;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-public class Tracktable<T> implements Serializable {
- private Map<Integer, List<TbTrack>> list;
- private Integer pageNum;
- private Integer pageSize;
- private Long total;
-}
diff --git a/src/main/java/com/hxzk/gps/result/table.java b/src/main/java/com/hxzk/gps/result/table.java
deleted file mode 100644
index 74d5a7c..0000000
--- a/src/main/java/com/hxzk/gps/result/table.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hxzk.gps.result;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-public class table<T> {
- private List<T> list;
- private Integer pageNum;
- private Integer pageSize;
- private Long total;
-}
diff --git a/src/main/java/com/hxzk/gps/service/Anchor/TbAchorService.java b/src/main/java/com/hxzk/gps/service/Anchor/TbAchorService.java
deleted file mode 100644
index bf12348..0000000
--- a/src/main/java/com/hxzk/gps/service/Anchor/TbAchorService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.hxzk.gps.service.Anchor;
-
-import com.hxzk.gps.controller.Anchor.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Anchor.TbAchor;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbAchorService extends IService<TbAchor> {
-
- /*
- * 鍩虹珯鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindAnchorInfo(@RequestBody TableSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Attendance/TbKaoqingService.java b/src/main/java/com/hxzk/gps/service/Attendance/TbKaoqingService.java
deleted file mode 100644
index 8399214..0000000
--- a/src/main/java/com/hxzk/gps/service/Attendance/TbKaoqingService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.hxzk.gps.service.Attendance;
-
-import com.hxzk.gps.controller.Attendance.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.entity.Attendance.TbRealkaoqing;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbKaoqingService extends IService<TbKaoqing> {
-
- /*
- * 鍘嗗彶鑰冨嫟鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindAttendanceInfo(@RequestBody TableSearchResult TableSearchResult);
-
- /*
- * 骞冲彴瀹炴椂鑰冨嫟鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- List<TbRealkaoqing> FindRealAttendanceInfo(@RequestBody TableSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Cabinet/TbCabinetService.java b/src/main/java/com/hxzk/gps/service/Cabinet/TbCabinetService.java
deleted file mode 100644
index 2f1a9e9..0000000
--- a/src/main/java/com/hxzk/gps/service/Cabinet/TbCabinetService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.hxzk.gps.service.Cabinet;
-
-import com.hxzk.gps.controller.Cabinet.deo.TableSearchResultCabinet;
-import com.hxzk.gps.controller.Cabinet.deo.TableSearchResultQu;
-import com.hxzk.gps.entity.Cabinet.TbCabinet;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-03
- */
-public interface TbCabinetService extends IService<TbCabinet> {
-
- /*
- * 鍏呯數鏌滃垪琛ㄦ煡璇㈡帴鍙�
- * @param tableSearchResultQu
- * @return ResultTable
- * */
- ResultTable FindCabinetInfo(@RequestBody TableSearchResultCabinet tableSearchResultCabinet);
-
- /*
- * 鏂板鍙戝崱鏈鸿澶�
- * @param Person 鍙戝崱鏈鸿澶囦俊鎭�
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage add(TbCabinet cabinet);
-
- /*
- * 淇敼鍙戝崱鏈鸿澶�
- * @param Person 鍙戝崱鏈鸿澶囦俊鎭�
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(TbCabinet cabinet);
-
- /*
- * 鍒犻櫎鍙戝崱鏈鸿澶�
- * @param Person 鍙戝崱鏈鸿澶囦俊鎭�
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage delete(TbCabinet cabinet);
-
- /*
- * 鎵归噺鍒犻櫎鍙戝崱鏈鸿澶�
- * @param ids 璁惧ID鍒楄〃
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage batchDelete(List<Integer> ids);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Cabinet/TbFakajiService.java b/src/main/java/com/hxzk/gps/service/Cabinet/TbFakajiService.java
deleted file mode 100644
index cb477db..0000000
--- a/src/main/java/com/hxzk/gps/service/Cabinet/TbFakajiService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.service.Cabinet;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.entity.FaKaJi.TbFakaji;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-03
- */
-public interface TbFakajiService extends IService<TbFakaji> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Cabinet/TbFakalogService.java b/src/main/java/com/hxzk/gps/service/Cabinet/TbFakalogService.java
deleted file mode 100644
index df97fc3..0000000
--- a/src/main/java/com/hxzk/gps/service/Cabinet/TbFakalogService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.hxzk.gps.service.Cabinet;
-
-import com.hxzk.gps.controller.Cabinet.deo.TableSearchResultFakalog;
-import com.hxzk.gps.entity.Cabinet.TbFakalog;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鍙戝崱鏃ュ織鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-01-XX
- */
-public interface TbFakalogService extends IService<TbFakalog> {
-
- /*
- * 鍙戝崱鏃ュ織鍒楄〃鏌ヨ鎺ュ彛
- * @param tableSearchResultFakalog
- * @return ResultTable
- * */
- ResultTable FindFaKaLogInfo(@RequestBody TableSearchResultFakalog tableSearchResultFakalog);
-
-}
-
diff --git a/src/main/java/com/hxzk/gps/service/Company/TbCompanyService.java b/src/main/java/com/hxzk/gps/service/Company/TbCompanyService.java
deleted file mode 100644
index 9e2638b..0000000
--- a/src/main/java/com/hxzk/gps/service/Company/TbCompanyService.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.hxzk.gps.service.Company;
-
-import com.hxzk.gps.controller.Company.Results.CompanyDepartmentResult;
-import com.hxzk.gps.controller.Company.Results.CompanyResult;
-import com.hxzk.gps.controller.Company.Results.CompanyTreeTableDto;
-import com.hxzk.gps.entity.Company.TbCompany;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.controller.User.Results.UserTreeTableDto;
-import com.hxzk.gps.entity.WarnTongJi.WarnTongjiCompany;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍏徃鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-04-17
- */
-public interface TbCompanyService extends IService<TbCompany> {
-
-
- /*
- * 鍏徃鍒楄〃淇℃伅
- * @param companyTreeTableDto 鍏徃鍙傛暟淇℃伅
- * @return 鍏徃淇℃伅
- * */
- CompanyResult FindCompanyInfo(@RequestBody CompanyTreeTableDto companyTreeTableDto);
-
- /*
- * 鏍规嵁褰撳墠鐢ㄦ埛鐨勬墍灞炲叕鍙窱D鏌ヨ鍏徃閮ㄩ棬鍒楄〃
- * @return CompanyDepartmentResult 鍏徃閮ㄩ棬鍒楄〃
- * @author YuZhiTong
- * @since 2025-05-19
- * */
- CompanyDepartmentResult FindUserDepartmentCompany();
-
- /*
- * 鏍规嵁褰撳墠鐢ㄦ埛鐨勬墍灞炲叕鍙窱D鏌ヨ瀛愬叕鍙窱D鍒楄〃
- * @return List 瀛愬叕鍙窱D鍒楄〃
- * @author YuZhiTong
- * @since 2025-05-19
- * */
- List getChildCompanyIds(String companyid);
- /*
- * 鏍规嵁褰撳墠鐢ㄦ埛鐨勬墍灞炲叕鍙稿悕绉版煡璇㈠瓙鍏徃鍚嶇О鍒楄〃
- * @return List 瀛愬叕鍙稿悕绉板垪琛�
- * @author YuZhiTong
- * @since 2025-05-19
- * */
- List getChildCompanyNames(String companyname);
- /*
- * 鏍规嵁鍙傛暟ID鏌ヨ鍏徃鍚嶇О
- * @return 杩斿洖鍏徃鍚嶇О
- * @author YuZhiTong
- * @since 2025-05-19
- * */
- String getChildCompanyName(String id);
-
-
- /*
- * 鍏徃涓嬫媺鍒楄〃
- * @param company 鍏徃淇℃伅
- * @return 杩斿洖鍏徃涓嬫媺鍒楄〃
- * @author YuZhiTong
- * @since 2025-05-19
- * */
- List<AuToComplete> CompanyAutocomplete(TbCompany company);
- List<AuToComplete> FenceCompanyAutocomplete();
- /*
- * 鏂板鍏徃淇℃伅
- * @param company 鍏徃淇℃伅
- * @return 杩斿洖鏂板缁撴灉
- * @author YuZhiTong
- * @since 2025-05-19
- * */
- ReturnMessage add(TbCompany company);
-
- /*
- * 淇敼鍏徃淇℃伅
- * @param company 鍏徃淇℃伅
- * @return 杩斿洖淇敼缁撴灉
- * @author YuZhiTong
- * @since 2025-05-19
- * */
- ReturnMessage update(TbCompany company);
-
- /*
- * 鍒犻櫎鍏徃淇℃伅
- * @param company 鍏徃淇℃伅
- * @return 杩斿洖鍒犻櫎缁撴灉
- * @author YuZhiTong
- * @since 2025-05-19
- * */
- ReturnMessage delete(TbCompany company);
-
- /*
- * 妫�鏌ュ叕鍙告槸鍚﹀彲浠ュ垹闄わ紙妫�鏌ユ槸鍚﹀瓨鍦ㄧ粦瀹氭暟鎹級
- * @param companyId 鍏徃ID
- * @return 杩斿洖妫�鏌ョ粨鏋滃拰璇︾粏鐨勭粦瀹氭暟鎹俊鎭�
- * @author YuZhiTong
- * @since 2025-01-XX
- * */
- ReturnMessage checkCompanyCanDelete(Integer companyId);
-
-
-
-
-
-
-
- //鏌ヨ&&鏇存柊鍚勪釜鍏徃鐨勭粺璁�
- Integer FindCompanyOnlineCount(List companyid); //鏌ヨ鍦ㄧ嚎浜哄憳鏉℃暟
- Integer FindCompanyNoOnlineCount(List companyid); //鏌ヨ绂荤嚎浜哄憳鏉℃暟
-
- Integer FindCompanyOnlineCarCount(List companyid); //鏌ヨ鍦ㄧ嚎杞﹁締鏉℃暟
- Integer FindCompanyNoOnlineCarCount(List companyid); //鏌ヨ绂荤嚎杞﹁締鏉℃暟
-
- Integer FindCompanyOnlineAchorCount(String company); //鏌ヨ鍦ㄧ嚎鍩虹珯鏁伴噺
- Integer FindCompanyNoOnlineAchorCount(String company); //鏌ヨ绂荤嚎鍩虹珯鏁伴噺
-
-
- Integer FindCompanyWarningCount1(List companyid); //闈欐鎶ヨ
- Integer FindCompanyWarningCount2(List companyid); //SOS鎶ヨ
- Integer FindCompanyWarningCount3(List companyid); //璺岃惤鎶ヨ
- Integer FindCompanyWarningCount4(List companyid); //缂哄憳鎶ヨ
- Integer FindCompanyWarningCount5(List companyid); //瓒呭憳鎶ヨ
- Integer FindCompanyWarningCount6(List companyid); //鑱氶泦鎶ヨ
- Integer FindCompanyWarningCount7(List companyid); //瓒婄晫鎶ヨ
- Integer FindCompanyWarningCount8(List companyid); //杩涘叆鎶ヨ
- Integer FindCompanyWarningCount9(List companyid); //浣庣數鎶ヨ
-
- List<WarnTongjiCompany> findCompanyWarn(String company);
- //鏇�
- Integer UpCompanyWarnCount(String company,Integer count,String title); //鏌ヨ鍦ㄧ嚎浜哄憳鏉℃暟
-}
diff --git a/src/main/java/com/hxzk/gps/service/Department/ITbDepartmentIconService.java b/src/main/java/com/hxzk/gps/service/Department/ITbDepartmentIconService.java
deleted file mode 100644
index 6f87d02..0000000
--- a/src/main/java/com/hxzk/gps/service/Department/ITbDepartmentIconService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.service.Department;
-
-import com.hxzk.gps.entity.Department.TbDepartMentIcon;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-20
- */
-public interface ITbDepartmentIconService extends IService<TbDepartMentIcon> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Department/TbDepartMentIconService.java b/src/main/java/com/hxzk/gps/service/Department/TbDepartMentIconService.java
deleted file mode 100644
index 1f9ed36..0000000
--- a/src/main/java/com/hxzk/gps/service/Department/TbDepartMentIconService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.hxzk.gps.service.Department;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.controller.DepartMent.Results.DepartMentIconResult;
-import com.hxzk.gps.controller.DepartMent.dto.DpeartMentIconTreeTableDto;
-import com.hxzk.gps.entity.Department.TbDepartMentIcon;
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-public interface TbDepartMentIconService extends IService<TbDepartMentIcon> {
-
- /*
- * 閮ㄩ棬鍥炬爣绠$悊
- * @param departmentIconTreeTableDto 閮ㄩ棬鍥炬爣绠$悊
- * @return 閮ㄩ棬鍥炬爣绠$悊
- * */
- DepartMentIconResult FindDepartmentIconInfo(DpeartMentIconTreeTableDto departmentIconTreeTableDto);
-
-
- /*
- * 鏂板閮ㄩ棬鍥炬爣
- * @param TbDepartMentIcon 閮ㄩ棬鍥炬爣淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage add(TbDepartMentIcon departMentIcon);
-
- /*
- * 淇敼閮ㄩ棬鍥炬爣
- * @param TbDepartMentIcon 閮ㄩ棬鍥炬爣淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(TbDepartMentIcon departMentIcon);
-
- /*
- * 鍒犻櫎閮ㄩ棬鍥炬爣
- * @param TbDepartMentIcon 閮ㄩ棬鍥炬爣淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage delete(TbDepartMentIcon departMentIcon);
-
-
- List<AuToComplete> DepartmentIconAutocomplete(@RequestBody TbDepartMentIcon departMentIcon);
-}
diff --git a/src/main/java/com/hxzk/gps/service/Department/TbDepartmentService.java b/src/main/java/com/hxzk/gps/service/Department/TbDepartmentService.java
deleted file mode 100644
index e1051c9..0000000
--- a/src/main/java/com/hxzk/gps/service/Department/TbDepartmentService.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.hxzk.gps.service.Department;
-
-import com.hxzk.gps.controller.DepartMent.Results.DepartMentResult;
-import com.hxzk.gps.controller.DepartMent.dto.DpeartMentTreeTableDto;
-import com.hxzk.gps.controller.Person.Results.PersonResult;
-import com.hxzk.gps.controller.Person.dto.PersonTreeTableDto;
-import com.hxzk.gps.entity.Department.TbDepartMentIcon;
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- *
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-18
- */
-public interface TbDepartmentService extends IService<TbDepartment> {
- /*
- * 閮ㄩ棬鍒楄〃淇℃伅
- * @param PersonTreeTableDto 閮ㄩ棬鍙傛暟淇℃伅
- * @return 閮ㄩ棬淇℃伅
- * */
- DepartMentResult FindDepartmentInfo(@RequestBody DpeartMentTreeTableDto departmentTreeTableDto);
-
- /*
- * 閮ㄩ棬涓嬫媺鍒楄〃
- * @param department 閮ㄩ棬淇℃伅
- * @return 杩斿洖閮ㄩ棬淇℃伅
- * @author YuZhiTong
- * @since 2025-05-19
- * */
- List<AuToComplete> DepartmentAutocomplete(@RequestBody TbDepartment department);
-
-
- /*
- * 閮ㄩ棬璇︽儏淇℃伅
- * @param 閮ㄩ棬鍚嶇О-鎵�灞炲叕鍙稿悕绉�
- * @return 缁撴灉淇℃伅
- * */
-
- TbDepartment FindOneDepartMent(@RequestBody TbPerson person);
-
- /*
- * 鏂板閮ㄩ棬
- * @param TbDepartMent 閮ㄩ棬淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage add(TbDepartment department);
-
- /*
- * 淇敼閮ㄩ棬
- * @param TbDepartMent 閮ㄩ棬鍥炬爣淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(TbDepartment department);
-
- /*
- * 鍒犻櫎閮ㄩ棬
- * @param TbDepartMent 閮ㄩ棬淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage delete(TbDepartment department);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Fence/TbFenceService.java b/src/main/java/com/hxzk/gps/service/Fence/TbFenceService.java
deleted file mode 100644
index e3011b9..0000000
--- a/src/main/java/com/hxzk/gps/service/Fence/TbFenceService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.hxzk.gps.service.Fence;
-
-import com.hxzk.gps.controller.Fence.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Fence.TbFence;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbFenceService extends IService<TbFence> {
-
- /*
- * 鍥存爮鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindFenceInfo(@RequestBody TableSearchResult TableSearchResult);
-
-
- /*
- * 鏂板鍥存爮
- * @param Person 鍥存爮淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage add(TbFence fence);
-
-
-
- /*
- * 鍒犻櫎鍥存爮
- * @param Person 鍥存爮淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage delete(TbFence fence);
-}
diff --git a/src/main/java/com/hxzk/gps/service/FzRadar/TbFzanchorService.java b/src/main/java/com/hxzk/gps/service/FzRadar/TbFzanchorService.java
deleted file mode 100644
index 7e6bc30..0000000
--- a/src/main/java/com/hxzk/gps/service/FzRadar/TbFzanchorService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.hxzk.gps.service.FzRadar;
-
-import com.hxzk.gps.controller.Radar.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.FzRadar.TbFzanchor;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbFzanchorService extends IService<TbFzanchor> {
-
- /*
- * 闃叉挒闆疯揪鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindRadarInfo(@RequestBody TableSearchResult TableSearchResult);
-
-
- /*
- * 鏂板闃叉挒闆疯揪
- * @param Person 闃叉挒闆疯揪淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage add(TbFzanchor fzanchor);
-
- /*
- * 淇敼闃叉挒闆疯揪
- * @param Person 闃叉挒闆疯揪淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(TbFzanchor fzanchor);
-
- /*
- * 鍒犻櫎闃叉挒闆疯揪
- * @param Person 闃叉挒闆疯揪淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage delete(TbFzanchor fzanchor);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Gather/TbPergatherService.java b/src/main/java/com/hxzk/gps/service/Gather/TbPergatherService.java
deleted file mode 100644
index 3a3e0ec..0000000
--- a/src/main/java/com/hxzk/gps/service/Gather/TbPergatherService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.hxzk.gps.service.Gather;
-
-import com.hxzk.gps.controller.Gather.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Gather.TbPergather;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbPergatherService extends IService<TbPergather> {
-
- /*
- * 浜哄憳鑱氶泦鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindGatherInfo(@RequestBody TableSearchResult TableSearchResult);
-
-
- /*
- * 淇敼鑱氶泦鍥存爮
- * @param pergather 鑱氶泦鍥存爮淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(TbPergather pergather);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Heart/TbHeartRecordService.java b/src/main/java/com/hxzk/gps/service/Heart/TbHeartRecordService.java
deleted file mode 100644
index edc6005..0000000
--- a/src/main/java/com/hxzk/gps/service/Heart/TbHeartRecordService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.hxzk.gps.service.Heart;
-
-import com.hxzk.gps.controller.Heart.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Heart.TbHeartRecord;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbHeartRecordService extends IService<TbHeartRecord> {
-
- /*
- * 蹇冪巼璁板綍鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindHeartInfo(@RequestBody TableSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/HistoryPower/TbAcHistoryPowerService.java b/src/main/java/com/hxzk/gps/service/HistoryPower/TbAcHistoryPowerService.java
deleted file mode 100644
index 19e0cf2..0000000
--- a/src/main/java/com/hxzk/gps/service/HistoryPower/TbAcHistoryPowerService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.hxzk.gps.service.HistoryPower;
-
-import com.hxzk.gps.controller.HistoryPower.dto.TableSearchResult.TableAcPowerSearchResult;
-import com.hxzk.gps.entity.HistoryPower.TbAcHistoryPower;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbAcHistoryPowerService extends IService<TbAcHistoryPower> {
-
- /*
- * 鍩虹珯鐢甸噺鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindAcHistoryPowerInfo(@RequestBody TableAcPowerSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/HistoryPower/TbHistoryPowerService.java b/src/main/java/com/hxzk/gps/service/HistoryPower/TbHistoryPowerService.java
deleted file mode 100644
index a378934..0000000
--- a/src/main/java/com/hxzk/gps/service/HistoryPower/TbHistoryPowerService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hxzk.gps.service.HistoryPower;
-
-import com.hxzk.gps.controller.HistoryPower.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.HistoryPower.TbHistoryPower;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbHistoryPowerService extends IService<TbHistoryPower> {
- /*
- * 鏍囩鐢甸噺鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindTagHistoryPowerInfo(@RequestBody TableSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Inspection/TbNewtaskService.java b/src/main/java/com/hxzk/gps/service/Inspection/TbNewtaskService.java
deleted file mode 100644
index 7156e45..0000000
--- a/src/main/java/com/hxzk/gps/service/Inspection/TbNewtaskService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hxzk.gps.service.Inspection;
-
-import com.hxzk.gps.controller.Inspection.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Inspection.TbNewtask;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbNewtaskService extends IService<TbNewtask> {
- /*
- * 宸℃浠诲姟鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindNewTaskInfo(@RequestBody TableSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Inspection/TbXunjianbaobiaoService.java b/src/main/java/com/hxzk/gps/service/Inspection/TbXunjianbaobiaoService.java
deleted file mode 100644
index 1f4fc00..0000000
--- a/src/main/java/com/hxzk/gps/service/Inspection/TbXunjianbaobiaoService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hxzk.gps.service.Inspection;
-
-import com.hxzk.gps.controller.Inspection.dto.TableSearchResult.TableBaoBiaoSearchResult;
-import com.hxzk.gps.entity.Inspection.TbXunjianbaobiao;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbXunjianbaobiaoService extends IService<TbXunjianbaobiao> {
- /*
- * 宸℃鎶ヨ〃鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindInspectionInfo(@RequestBody TableBaoBiaoSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Log/TbFzlogService.java b/src/main/java/com/hxzk/gps/service/Log/TbFzlogService.java
deleted file mode 100644
index 6c4a587..0000000
--- a/src/main/java/com/hxzk/gps/service/Log/TbFzlogService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.hxzk.gps.service.Log;
-
-import com.hxzk.gps.controller.Log.dto.TableSearchResult.TableFzLogSearchResult;
-import com.hxzk.gps.entity.Log.TbFzlog;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbFzlogService extends IService<TbFzlog> {
-
- /*
- * 闃叉挒鏃ュ織鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindFzLogInfo(@RequestBody TableFzLogSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Log/TbLixianrecord0829Service.java b/src/main/java/com/hxzk/gps/service/Log/TbLixianrecord0829Service.java
deleted file mode 100644
index 40d751e..0000000
--- a/src/main/java/com/hxzk/gps/service/Log/TbLixianrecord0829Service.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hxzk.gps.service.Log;
-
-import com.hxzk.gps.controller.Log.dto.TableSearchResult.TableliXianSearchResult;
-import com.hxzk.gps.entity.Log.TbLixianrecord0829;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbLixianrecord0829Service extends IService<TbLixianrecord0829> {
- /*
- * 绂荤嚎鏃ュ織鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindLixianLogInfo(@RequestBody TableliXianSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Log/TbLoginLogService.java b/src/main/java/com/hxzk/gps/service/Log/TbLoginLogService.java
deleted file mode 100644
index 8c85589..0000000
--- a/src/main/java/com/hxzk/gps/service/Log/TbLoginLogService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-
-package com.hxzk.gps.service.Log;
-
-
-import com.hxzk.gps.controller.Log.dto.TableSearchResult.TableLoginLogSearchResult;
-import com.hxzk.gps.controller.Tag.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Log.TbLoginLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.entity.System.TbSystemOperationLog;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-06-09
- */
-public interface TbLoginLogService extends IService<TbLoginLog> {
-
- /*
- * 鐧诲綍鏃ュ織鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindLoginLogInfo(@RequestBody TableLoginLogSearchResult tableLoginLogSearchResult);
-
-
-
- /*
- * 娣诲姞鐧诲綍鏃ュ織
- * */
- Integer add(String name,String ip,String addtime,String company);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Loragateway/TbLoragatewayService.java b/src/main/java/com/hxzk/gps/service/Loragateway/TbLoragatewayService.java
deleted file mode 100644
index e834af0..0000000
--- a/src/main/java/com/hxzk/gps/service/Loragateway/TbLoragatewayService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hxzk.gps.service.Loragateway;
-
-import com.hxzk.gps.controller.Loragateway.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Loragateway.TbLoragateway;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbLoragatewayService extends IService<TbLoragateway> {
- /*
- * 缃戝叧鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindLoragatewayInfo(@RequestBody TableSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Mac/TbMacService.java b/src/main/java/com/hxzk/gps/service/Mac/TbMacService.java
deleted file mode 100644
index 90a8fd2..0000000
--- a/src/main/java/com/hxzk/gps/service/Mac/TbMacService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.service.Mac;
-
-import com.hxzk.gps.entity.Mac.TbMac;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-01
- */
-public interface TbMacService extends IService<TbMac> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Map/TbMapService.java b/src/main/java/com/hxzk/gps/service/Map/TbMapService.java
deleted file mode 100644
index c52f8e8..0000000
--- a/src/main/java/com/hxzk/gps/service/Map/TbMapService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.hxzk.gps.service.Map;
-
-import com.hxzk.gps.controller.Map.Results.MapResult;
-import com.hxzk.gps.controller.Map.Results.MarsResult;
-import com.hxzk.gps.controller.Map.dto.MapTreeTableDto;
-import com.hxzk.gps.controller.Map.dto.MarsTreeTableDto;
-import com.hxzk.gps.entity.Map.TbMap;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.util.AuToComplete;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-public interface TbMapService extends IService<TbMap> {
-
- /*
- * 浜岀淮鍦板浘绠$悊
- * @param departmentIconTreeTableDto 浜岀淮鍦板浘鍙傛暟
- * @return 浜岀淮鍦板浘缁撴灉
- * */
- MapResult FindMapInfo(MapTreeTableDto mapTreeTableDto);
-
- /*
- 涓嬫媺
- * 鐧诲綍鐢ㄦ埛鎵�灞炰簩缁村湴鍥炬煡璇�
- * @return 缁撴灉淇℃伅
- * */
- List<AuToComplete> FindUserCompanyMap();
- Map<String, String> FindUserCompanyMapSelect();
-
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Map/TbMarsHomesetService.java b/src/main/java/com/hxzk/gps/service/Map/TbMarsHomesetService.java
deleted file mode 100644
index 5ed4141..0000000
--- a/src/main/java/com/hxzk/gps/service/Map/TbMarsHomesetService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.hxzk.gps.service.Map;
-
-import com.hxzk.gps.controller.DepartMent.Results.DepartMentIconResult;
-import com.hxzk.gps.controller.DepartMent.dto.DpeartMentIconTreeTableDto;
-import com.hxzk.gps.controller.Map.Results.MarsResult;
-import com.hxzk.gps.controller.Map.dto.MarsTreeTableDto;
-import com.hxzk.gps.entity.Map.TbMarsHomeset;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.entity.User.TbUser;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbMarsHomesetService extends IService<TbMarsHomeset> {
- /*
- * 涓夌淮鍦板浘绠$悊
- * @param departmentIconTreeTableDto 涓夌淮鍦板浘鍙傛暟
- * @return 涓夌淮鍦板浘缁撴灉
- * */
- MarsResult FindMarsInfo(MarsTreeTableDto marsTreeTableDto);
-
- /*
- * 淇敼涓夌淮鍦板浘閰嶇疆
- * @param marsHomeset 涓夌淮鍦板浘閰嶇疆淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(@RequestBody TbMarsHomeset marsHomeset);
-
-
-
-
-
- /*
- * 鑷姩褰曞叆涓夌淮鍦板浘鍏徃
- * */
- void InsertMarsHomeSet(String companyname,String companyId);
-
- void DeleteMarsHomeSet(String companyname);
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Menu/MenuService.java b/src/main/java/com/hxzk/gps/service/Menu/MenuService.java
deleted file mode 100644
index 2bb7a41..0000000
--- a/src/main/java/com/hxzk/gps/service/Menu/MenuService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.service.Menu;
-
-import com.hxzk.gps.entity.Menu.Menu;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-23
- */
-public interface MenuService extends IService<Menu> {
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Message/TbSendMessageHistoryService.java b/src/main/java/com/hxzk/gps/service/Message/TbSendMessageHistoryService.java
deleted file mode 100644
index 8c4d25e..0000000
--- a/src/main/java/com/hxzk/gps/service/Message/TbSendMessageHistoryService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hxzk.gps.service.Message;
-
-import com.hxzk.gps.controller.Message.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Message.TbSendMessageHistory;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-public interface TbSendMessageHistoryService extends IService<TbSendMessageHistory> {
- /*
- * 淇℃伅璁板綍鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindMessageInfo(@RequestBody TableSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Person/TbPersonService.java b/src/main/java/com/hxzk/gps/service/Person/TbPersonService.java
deleted file mode 100644
index 3455ef7..0000000
--- a/src/main/java/com/hxzk/gps/service/Person/TbPersonService.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.hxzk.gps.service.Person;
-
-
-import com.hxzk.gps.controller.Person.Results.PersonResult;
-import com.hxzk.gps.controller.Person.dto.PersonTreeTableDto;
-import com.hxzk.gps.controller.Role.Results.AddRoleDto;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultList;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-16
- */
-public interface TbPersonService extends IService<TbPerson> {
-
- /*
- * 浜哄憳鍒楄〃淇℃伅
- * @param PersonTreeTableDto 浜哄憳鍙傛暟淇℃伅
- * @return 浜哄憳淇℃伅
- * */
- PersonResult FindPersonInfo(@RequestBody PersonTreeTableDto personTreeTableDto);
- /*
- * 杞﹁締鍒楄〃淇℃伅
- * @param PersonTreeTableDto 杞﹁締鍙傛暟淇℃伅
- * @return 杞﹁締淇℃伅
- * */
- PersonResult FindCarInfo(@RequestBody PersonTreeTableDto personTreeTableDto);
- /*
- * 鐗╄祫鍒楄〃淇℃伅
- * @param PersonTreeTableDto 鐗╄祫鍙傛暟淇℃伅
- * @return 鐗╄祫淇℃伅
- * */
- PersonResult FindMaterialsInfo(@RequestBody PersonTreeTableDto personTreeTableDto);
-
- /*
- * 浜哄憳浣嶇疆淇℃伅
- * @param PersonTreeTableDto 浜哄憳浣嶇疆淇℃伅
- * @return 浜哄憳淇℃伅
- * */
- ResultList PersonPosition();
-
- /*
- * 瀹炴椂浜哄憳浣嶇疆淇℃伅
- * @param PersonTreeTableDto 瀹炴椂浜哄憳浣嶇疆淇℃伅
- * @return 浜哄憳淇℃伅
- * */
- ResultList RealPosition();
-
- /*
- * 瀹炴椂骞抽潰浜哄憳浣嶇疆淇℃伅
- * @param PersonTreeTableDto 瀹炴椂浜哄憳浣嶇疆淇℃伅
- * @return 浜哄憳淇℃伅
- * */
- ResultList RealPosition2D();
- /*
- * 鏂板缁堢
- * @param Person 缁堢淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage add(TbPerson person);
-
- /*
- * 淇敼缁堢
- * @param Person 缁堢淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(TbPerson person);
-
- /*
- * 鍒犻櫎缁堢
- * @param Person 缁堢淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage delete(TbPerson person);
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Role/IRoleService.java b/src/main/java/com/hxzk/gps/service/Role/IRoleService.java
deleted file mode 100644
index 4c17874..0000000
--- a/src/main/java/com/hxzk/gps/service/Role/IRoleService.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.hxzk.gps.service.Role;
-
-import com.hxzk.gps.controller.Role.Results.AddRoleDto;
-import com.hxzk.gps.controller.Role.Results.RoleCompanyList;
-import com.hxzk.gps.controller.Role.Results.RoleResult;
-import com.hxzk.gps.controller.Role.Results.RoleTreeTableDto;
-import com.hxzk.gps.controller.User.Results.UserTreeTableDto;
-import com.hxzk.gps.entity.Role.Role;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-08
- */
-public interface IRoleService extends IService<Role> {
-
-
-
-
- /*
- * 瑙掕壊鍒楄〃淇℃伅
- * @param RoleTreeTableDto 瑙掕壊鍙傛暟淇℃伅
- * @return 瑙掕壊淇℃伅
- * */
- RoleResult FindRoleInfo(@RequestBody RoleTreeTableDto roleTreeTableDto);
-
-
- /*
- * 鐧诲綍鐢ㄦ埛鍏徃瑙掕壊鍒楄〃淇℃伅
- * @return 鐧诲綍鐢ㄦ埛鍏徃瑙掕壊淇℃伅
- * */
- List<RoleCompanyList> FindCompanyRole(String companyid);
-
- /*
- * 鏍规嵁ID鑾峰彇瑙掕壊鍚嶇О
- * @return鑾峰彇瑙掕壊鍚嶇О
- * */
- String FindRoleName(String id);
-
- /*
- * 鏂板瑙掕壊
- * @param Role 瑙掕壊淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage add(@RequestBody AddRoleDto role);
-
- /*
- * 淇敼瑙掕壊
- * @param Role 瑙掕壊淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(@RequestBody AddRoleDto role);
-
- /*
- * 鍒犻櫎瑙掕壊
- * @param Role 瑙掕壊淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage delete(@RequestBody AddRoleDto role);
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Role/RoleMenuService.java b/src/main/java/com/hxzk/gps/service/Role/RoleMenuService.java
deleted file mode 100644
index 6ee7e33..0000000
--- a/src/main/java/com/hxzk/gps/service/Role/RoleMenuService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.hxzk.gps.service.Role;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.entity.Role.Rolemenu;
-
-import java.util.List;
-
-public interface RoleMenuService extends IService<Rolemenu> {
- /*
- * 鏍规嵁瑙掕壊ID鑾峰彇瑙掕壊鑿滃崟淇℃伅
- * @param roleId 瑙掕壊ID
- * @return 瑙掕壊鑿滃崟淇℃伅
- * */
- List<Rolemenu> FindRoleMenu(Integer roleId);
-
- /*
- * 鍒犻櫎瑙掕壊鑿滃崟
- * */
- void deleteRoleMenu(Integer roleId);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/RtkAnchor/TbRtkanchorService.java b/src/main/java/com/hxzk/gps/service/RtkAnchor/TbRtkanchorService.java
deleted file mode 100644
index 6fdd142..0000000
--- a/src/main/java/com/hxzk/gps/service/RtkAnchor/TbRtkanchorService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.hxzk.gps.service.RtkAnchor;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.controller.RtkAnchor.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.RtkAnchor.TbRtkanchor;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-22
- */
-public interface TbRtkanchorService extends IService<TbRtkanchor> {
-
- /*
- * 宸垎鍩虹珯鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindRtkAnchorInfo(@RequestBody TableSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Sms/TbSmsLogService.java b/src/main/java/com/hxzk/gps/service/Sms/TbSmsLogService.java
deleted file mode 100644
index 2bd2762..0000000
--- a/src/main/java/com/hxzk/gps/service/Sms/TbSmsLogService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.hxzk.gps.service.Sms;
-
-import com.hxzk.gps.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Sms.TbSmsLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鐭俊鏃ュ織
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-public interface TbSmsLogService extends IService<TbSmsLog> {
-
- /*
- * 鐭俊鏃ュ織鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindSMSLogInfo(@RequestBody TableSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Sms/TbSmsReminderService.java b/src/main/java/com/hxzk/gps/service/Sms/TbSmsReminderService.java
deleted file mode 100644
index b0e93a7..0000000
--- a/src/main/java/com/hxzk/gps/service/Sms/TbSmsReminderService.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.hxzk.gps.service.Sms;
-
-import com.hxzk.gps.controller.SMS.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.entity.Sms.TbSmsReminder;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鐭俊鎻愮ず
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-public interface TbSmsReminderService extends IService<TbSmsReminder> {
-
-
- /*
- * 鐭俊鎻愮ず鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindSMSreminderInfo(@RequestBody TableSearchResult TableSearchResult);
-
-
- /*
- * 鏂板鐭俊鎻愮ず
- * @param Person 鐭俊鎻愮ず淇℃伅
- * @return 缁撴灉鐭俊鎻愮ず
- * */
- ReturnMessage add(TbSmsReminder smsReminder);
-
- /*
- * 淇敼鐭俊鎻愮ず
- * @param Person 鐭俊鎻愮ず淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(TbSmsReminder smsReminder);
-
- /*
- * 鍒犻櫎鐭俊鎻愮ず
- * @param Person 鐭俊鎻愮ず淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage delete(TbSmsReminder smsReminder);
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Sms/TbVoicetipService.java b/src/main/java/com/hxzk/gps/service/Sms/TbVoicetipService.java
deleted file mode 100644
index 4c13538..0000000
--- a/src/main/java/com/hxzk/gps/service/Sms/TbVoicetipService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hxzk.gps.service.Sms;
-
-import com.hxzk.gps.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Sms.TbVoicetip;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 淇℃伅鎻愮ず
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-public interface TbVoicetipService extends IService<TbVoicetip> {
- /*
- * 鐭俊鎻愮ず鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindMsgReminderInfo(@RequestBody TableSearchResult TableSearchResult);
-}
diff --git a/src/main/java/com/hxzk/gps/service/System/TbSystemOperationLogService.java b/src/main/java/com/hxzk/gps/service/System/TbSystemOperationLogService.java
deleted file mode 100644
index 0103768..0000000
--- a/src/main/java/com/hxzk/gps/service/System/TbSystemOperationLogService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.hxzk.gps.service.System;
-
-
-import com.hxzk.gps.controller.System.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.System.TbSystemOperationLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-12
- */
-public interface TbSystemOperationLogService extends IService<TbSystemOperationLog> {
- /*
- * 娣诲姞鎿嶄綔鏃ュ織
- * */
- public Integer add(TbSystemOperationLog systemOperationLog);
-
- /*
- * 鎿嶄綔鏃ュ織鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindSystemLogInfo(@RequestBody TableSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Tag/TbTagService.java b/src/main/java/com/hxzk/gps/service/Tag/TbTagService.java
deleted file mode 100644
index 524d156..0000000
--- a/src/main/java/com/hxzk/gps/service/Tag/TbTagService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.hxzk.gps.service.Tag;
-
-import com.hxzk.gps.controller.Tag.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-public interface TbTagService extends IService<TbTag> {
-
- /*
- * 鏍囩鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindTagInfo(@RequestBody TableSearchResult TableSearchResult);
-
-
- /*
- * 鏂板璁惧
- * @param Person 璁惧淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage add(TbTag tag);
-
- /*
- * 淇敼璁惧
- * @param Person 璁惧淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(TbTag tag);
-
- /*
- * 鍒犻櫎璁惧
- * @param Person 璁惧淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage delete(TbTag tag);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/ThreeModel/TbThreemodelService.java b/src/main/java/com/hxzk/gps/service/ThreeModel/TbThreemodelService.java
deleted file mode 100644
index f82703f..0000000
--- a/src/main/java/com/hxzk/gps/service/ThreeModel/TbThreemodelService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.hxzk.gps.service.ThreeModel;
-
-import com.hxzk.gps.controller.Map.Results.MarsResult;
-import com.hxzk.gps.controller.Map.dto.MarsTreeTableDto;
-import com.hxzk.gps.controller.ThreeModel.Results.ThreeModelResult;
-import com.hxzk.gps.controller.ThreeModel.deo.ThreeModelDeo;
-import com.hxzk.gps.entity.Map.TbMarsHomeset;
-import com.hxzk.gps.entity.ThreeModel.TbThreemodel;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-09-03
- */
-public interface TbThreemodelService extends IService<TbThreemodel> {
-
- /*
- * 涓夌淮鍦板浘绠$悊
- * @param departmentIconTreeTableDto 涓夌淮鍦板浘鍙傛暟
- * @return 涓夌淮鍦板浘缁撴灉
- * */
- ThreeModelResult FindThreemodel(ThreeModelDeo threeModelDeo);
-
-
-
- /*
- * 鏂板涓夌淮妯″瀷閰嶇疆淇℃伅
- * @param marsHomeset 涓夌淮妯″瀷閰嶇疆淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage add(@RequestBody TbThreemodel tbThreemodel);
-
- /*
- * 淇敼涓夌淮妯″瀷閰嶇疆淇℃伅
- * @param marsHomeset 涓夌淮妯″瀷閰嶇疆淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(@RequestBody TbThreemodel tbThreemodel);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Track/TbGpsTrackService.java b/src/main/java/com/hxzk/gps/service/Track/TbGpsTrackService.java
deleted file mode 100644
index 9b77d1a..0000000
--- a/src/main/java/com/hxzk/gps/service/Track/TbGpsTrackService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.hxzk.gps.service.Track;
-
-import com.hxzk.gps.controller.Track.dto.TableSearchResult.TableGpsTrackSearchResult;
-import com.hxzk.gps.entity.Track.TbGpsTrack;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-26
- */
-public interface TbGpsTrackService extends IService<TbGpsTrack> {
-
- /*
- * 缁忕含杞ㄨ抗鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindGpsTrackInfo(@RequestBody TableGpsTrackSearchResult TableSearchResult);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/Track/TbTrackService.java b/src/main/java/com/hxzk/gps/service/Track/TbTrackService.java
deleted file mode 100644
index 0b9d4f4..0000000
--- a/src/main/java/com/hxzk/gps/service/Track/TbTrackService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.hxzk.gps.service.Track;
-
-import com.hxzk.gps.controller.Track.dto.TrackView;
-import com.hxzk.gps.controller.Track.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Track.TbTrack;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.TrackResultTable;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.text.ParseException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-26
- */
-public interface TbTrackService extends IService<TbTrack> {
-
- /*
- * 杞ㄨ抗鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindTrackInfo(@RequestBody TableSearchResult TableSearchResult);
-
- /*
- * 杞ㄨ抗鍥炴斁
- * */
- TrackResultTable FindTrackView(@RequestBody TrackView trackView) throws ParseException;
-}
diff --git a/src/main/java/com/hxzk/gps/service/User/TbUserService.java b/src/main/java/com/hxzk/gps/service/User/TbUserService.java
deleted file mode 100644
index 733377b..0000000
--- a/src/main/java/com/hxzk/gps/service/User/TbUserService.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.hxzk.gps.service.User;
-
-import com.hxzk.gps.controller.User.Results.MenuListResult;
-import com.hxzk.gps.controller.User.Results.UserTreeTableDto;
-import com.hxzk.gps.controller.User.Results.UserResult;
-import com.hxzk.gps.entity.User.TbUser;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.entity.User.dto.LoginResult;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-04-17
- */
-public interface TbUserService extends IService<TbUser> {
- /*
- * 鐢ㄦ埛鐧诲綍
- * @param username 鐢ㄦ埛鍚�
- * @param password 瀵嗙爜
- * @return 鐧诲綍缁撴灉
- * */
- LoginResult Login(String username, String password,String status,String clientIp);
-
- LoginResult phoneLogin(String phone,String clientIp);
-
- /*
- * 鐢ㄦ埛瀵艰埅鑿滃崟
- * @param username 鐢ㄦ埛鍚�
- * */
- MenuListResult UserMenu();
-
- /*
- * 鐢ㄦ埛鍒楄〃淇℃伅
- * @param userDto 鐢ㄦ埛淇℃伅
- * @return 鐢ㄦ埛淇℃伅
- * */
- UserResult FindUserInfo(@RequestBody UserTreeTableDto userTreeTableDto);
-
- /*
- * 鑿滃崟鍒楄〃淇℃伅
- * @return 鑿滃崟鍒楄〃淇℃伅
- * */
- MenuListResult MenuAll();
-
- /*
- * 娣诲姞鐢ㄦ埛
- * @param user 鐢ㄦ埛淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage add(@RequestBody TbUser user);
-
- /*
- * 淇敼鐢ㄦ埛
- * @param user 鐢ㄦ埛淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(@RequestBody TbUser user);
-
- /*
- * 鍒犻櫎鐢ㄦ埛
- * @param user 鐢ㄦ埛淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage delete(@RequestBody TbUser user);
-}
diff --git a/src/main/java/com/hxzk/gps/service/Video/TbHksxtService.java b/src/main/java/com/hxzk/gps/service/Video/TbHksxtService.java
deleted file mode 100644
index 84f7b04..0000000
--- a/src/main/java/com/hxzk/gps/service/Video/TbHksxtService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.hxzk.gps.service.Video;
-
-import com.hxzk.gps.controller.Video.dto.TableSearchResult.TableVideoSearchResult;
-import com.hxzk.gps.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.entity.Video.TbHksxt;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-01
- */
-public interface TbHksxtService extends IService<TbHksxt> {
-
- /*
- * 鎿嶄綔鏃ュ織鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- ResultTable FindVideoInfo(@RequestBody TableVideoSearchResult tableVideoSearchResult);
-
- /*
- * 鏂板鐩戞帶
- * @param TbHksxt 鐩戞帶淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage add(TbHksxt hksxt);
-
- /*
- * 淇敼鐩戞帶
- * @param TbHksxt 鐩戞帶淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(TbHksxt hksxt);
-
- /*
- * 鍒犻櫎鐩戞帶
- * @param TbHksxt 鐩戞帶淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage delete(TbHksxt hksxt);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/WarnTongJi/WarnTongjiCompanyService.java b/src/main/java/com/hxzk/gps/service/WarnTongJi/WarnTongjiCompanyService.java
deleted file mode 100644
index 8896de8..0000000
--- a/src/main/java/com/hxzk/gps/service/WarnTongJi/WarnTongjiCompanyService.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.hxzk.gps.service.WarnTongJi;
-
-import com.hxzk.gps.controller.Warning.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.User.TbUser;
-import com.hxzk.gps.entity.WarnTongJi.WarnTongjiCompany;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-06-09
- */
-public interface WarnTongjiCompanyService extends IService<WarnTongjiCompany> {
-
- /*
- * 浼佷笟鍛婅鍒楄〃鏌ヨ
- * @param departmentIconTreeTableDto 浼佷笟鍛婅鍛婅鍒楄〃鍙傛暟
- * @return 浼佷笟鍛婅鍛婅鍒楄〃缁撴灉
- * */
- ResultTable FindWarningTongJiInfo(TableSearchResult TableSearchResult);
-
- /*
- * 鑷姩鐢熸垚浼佷笟鍛婅缁熻
- * @param company 浼佷笟鍚嶇О
- * @return 鎻掑叆鐨勮鏁�
- * */
- Integer InsertWarnTongJi(String company);
-
-
-
- /*
- * 淇敼鍛婅缁熻
- * @param user 鍛婅缁熻淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage update(@RequestBody WarnTongjiCompany warnTongjiCompany);
-
-
- /*
- * 瀹炴椂浠婃棩缁熻
- * @param user 瀹炴椂浠婃棩缁熻淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- List<WarnTongjiCompany> FindDayCountInfo();
-}
diff --git a/src/main/java/com/hxzk/gps/service/Warning/TbWarningService.java b/src/main/java/com/hxzk/gps/service/Warning/TbWarningService.java
deleted file mode 100644
index 59bc118..0000000
--- a/src/main/java/com/hxzk/gps/service/Warning/TbWarningService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.hxzk.gps.service.Warning;
-
-
-import com.hxzk.gps.controller.Warning.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.entity.Warning.TbWarning;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.util.Result.ReturnMessage;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-public interface TbWarningService extends IService<TbWarning> {
-
- /*
- * 鍛婅鍒楄〃鏌ヨ
- * @param departmentIconTreeTableDto 鍛婅鍒楄〃鍙傛暟
- * @return 鍛婅鍒楄〃缁撴灉
- * */
- ResultTable FindWarningInfo(TableSearchResult TableSearchResult);
- /*
- * 骞冲彴鏈鐞嗗憡璀﹀垪琛ㄦ煡璇�
- * @param departmentIconTreeTableDto 鍛婅鍒楄〃鍙傛暟
- * @return 鍛婅鍒楄〃缁撴灉
- * */
- ResultTable FindWarningUntreated(TableSearchResult TableSearchResult);
-
- /*
- * 鍏ㄩ儴澶勭悊
- * @param Warning 澶勭悊淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage AllHandle();
-
- /*
- * 澶勭悊
- * @param Warning 澶勭悊淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- ReturnMessage Handle(TbWarning warning);
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Anchor/TbAchorServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Anchor/TbAchorServiceImpl.java
deleted file mode 100644
index 4cca5c2..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Anchor/TbAchorServiceImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.hxzk.gps.service.impl.Anchor;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Anchor.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Anchor.TbAchor;
-import com.hxzk.gps.mapper.Anchor.TbAchorMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Anchor.TbAchorService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@Service
-public class TbAchorServiceImpl extends ServiceImpl<TbAchorMapper, TbAchor> implements TbAchorService {
- @Autowired
- TbCompanyService companyService;
- @Override
- public ResultTable FindAnchorInfo(TableSearchResult TableSearchResult) {
- List<Long> companyname = companyService.getChildCompanyNames(UserInfoUtil.getUserCompany());
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.in("company", companyname);
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- Optional.ofNullable(TableSearchResult.getAchor().getAnchorid()).ifPresent(anchorid -> queryWrapper.like("anchorid", anchorid));
- PageInfo<TbAchor> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbAchor> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Attendance/TbKaoqingServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Attendance/TbKaoqingServiceImpl.java
deleted file mode 100644
index 1030080..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Attendance/TbKaoqingServiceImpl.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.hxzk.gps.service.impl.Attendance;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Attendance.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-
-import com.hxzk.gps.entity.Attendance.TbRealkaoqing;
-import com.hxzk.gps.entity.Fence.TbFence;
-import com.hxzk.gps.mapper.Attendance.TbKaoqingMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Attendance.TbKaoqingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Fence.TbFenceService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@Service
-public class TbKaoqingServiceImpl extends ServiceImpl<TbKaoqingMapper, TbKaoqing> implements TbKaoqingService {
- @Autowired
- TbKaoqingMapper KaoqingMapper;
- @Autowired
- TbFenceService fenceService;
- @Autowired
- TbCompanyService companyService;
-
-
- @Override
- public ResultTable FindAttendanceInfo(TableSearchResult TableSearchResult) {
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- if (TableSearchResult.getKaoqing().getIntime() == null){
- TableSearchResult.getKaoqing().setIntime(TimeUtil.GetYearMonthDay());
- }else{
- TableSearchResult.getKaoqing().setIntime(TimeUtil.ZhuanDate(TableSearchResult.getKaoqing().getIntime()));
- }
- PageInfo<TbKaoqing> info = new PageInfo<>(KaoqingMapper.FindAttendanceInfo(UserInfoUtil.getUserCompany(), TableSearchResult.getKaoqing().getIntime(),TableSearchResult.getKaoqing().getName(),TableSearchResult.getKaoqing().getTagid()));
- table<TbKaoqing> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-
- @Override
- public List<TbRealkaoqing> FindRealAttendanceInfo(TableSearchResult TableSearchResult) {
- List<Long> companyname = companyService.getChildCompanyNames(UserInfoUtil.getUserCompany());
- QueryWrapper queryWrapperFence = new QueryWrapper<>();
- queryWrapperFence.in("company",companyname);
- queryWrapperFence.eq("type",MessageUtils.getMessage("Attendance"));
- List<TbFence> fenceList = fenceService.getBaseMapper().selectList(queryWrapperFence);
- List<TbRealkaoqing> kaoqin = KaoqingMapper.findKaoQinQuYu();
- List<TbRealkaoqing> filteredKaoqin = new ArrayList<>();
- // 閬嶅巻 fences 鍒楄〃
- for (TbFence fence : fenceList) {
- String fenceName = fence.getName(); // 鍋囪 TbFence 绫讳腑鏈変竴涓� getFenceName 鏂规硶
- int totalPeople = 0;
- // 鍦� kaoqin 鍒楄〃涓煡鎵惧綋鍓嶅洿鏍忕殑瀹炴椂鑰冨嫟淇℃伅
- for (TbRealkaoqing kq : kaoqin) {
- if (kq.getArea().equals(fenceName)) { // 鍋囪 TbRealkaoqing 绫讳腑鏈変竴涓� getFenceName 鏂规硶
- totalPeople = Integer.parseInt(kq.getTagid()); // 鍋囪 TbRealkaoqing 绫讳腑鏈変竴涓� getTotalPeople 鏂规硶
- break;
- }
- }
- // 鍒涘缓涓�涓柊鐨� TbRealkaoqing 瀵硅薄骞舵坊鍔犲埌 filteredKaoqin 鍒楄〃涓�
- TbRealkaoqing newKq = new TbRealkaoqing();
- newKq.setName(fenceName);
- newKq.setTagid(String.valueOf(totalPeople));
- newKq.setIntime(TimeUtil.GetTime());
- filteredKaoqin.add(newKq);
- }
-
- return filteredKaoqin;
-
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Cabinet/TbCabinetServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Cabinet/TbCabinetServiceImpl.java
deleted file mode 100644
index 31942ed..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Cabinet/TbCabinetServiceImpl.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.hxzk.gps.service.impl.Cabinet;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Cabinet.deo.TableSearchResultCabinet;
-import com.hxzk.gps.entity.Cabinet.TbCabinet;
-import com.hxzk.gps.entity.FaKaJi.TbFakaji;
-import com.hxzk.gps.mapper.Cabinet.TbCabinetMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Cabinet.TbCabinetService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.service.Cabinet.TbFakajiService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-03
- */
-@Service
-public class TbCabinetServiceImpl extends ServiceImpl<TbCabinetMapper, TbCabinet> implements TbCabinetService {
-
- @Autowired
- TbFakajiService fakajiService;
- @Override
- public ResultTable FindCabinetInfo(TableSearchResultCabinet tableSearchResultCabinet) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company",UserInfoUtil.getUserCompany());
- PageHelper.startPage(tableSearchResultCabinet.getTableList().getPageNum(),tableSearchResultCabinet.getTableList().getPageSize());
- PageInfo<TbCabinet> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbCabinet> achortable = new table<>(info.getList(),tableSearchResultCabinet.getTableList().getPageNum(),tableSearchResultCabinet.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-
- @Override
- public ReturnMessage add(TbCabinet cabinet) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("cabinetnum",cabinet.getCabinetnum());
- Integer count = Math.toIntExact(baseMapper.selectCount(queryWrapper));
- if (count > 0){
- return ReturnMessage.ReturnMessageError("CabinetRepeat");
- }
- try {
- for (int i = 0; i < 60; i++){
- TbFakaji fakaji = new TbFakaji();
- fakaji.setSlotnumber(String.valueOf(i+1));
- fakaji.setDeviceid(cabinet.getCabinetnum());
- fakaji.setStatus("0");
- fakaji.setCompany(UserInfoUtil.getUserCompany());
- fakajiService.getBaseMapper().insert(fakaji);
- }
- isSuccess = true;
- cabinet.setCompany(UserInfoUtil.getUserCompany());
- baseMapper.insert(cabinet);
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleAddResult(isSuccess,"CardAdd",cabinet.getCabinetnum());
- }
-
- @Override
- public ReturnMessage update(TbCabinet cabinet) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- // 浣跨敤ID杩涜鏇存柊锛岀‘淇濇洿鏂扮殑鏄纭殑璁板綍
- if (cabinet.getId() != null) {
- baseMapper.updateById(cabinet);
- isSuccess = true;
- } else {
- // 濡傛灉娌℃湁ID锛屽垯浣跨敤鍘熸潵鐨勬柟寮�
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("cabinetnum",cabinet.getCabinetnum());
- baseMapper.update(cabinet,queryWrapper);
- isSuccess = true;
- }
- }catch (Exception e){
- System.out.println("鏇存柊澶辫触: " + e.getMessage());
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"CardUpdate",cabinet.getCabinetnum());
- }
-
- @Override
- public ReturnMessage delete(TbCabinet cabinet) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("cabinetnum",cabinet.getCabinetnum());
- baseMapper.delete(queryWrapper);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleDeleteResult(isSuccess,"CardDelete",cabinet.getCabinetnum());
- }
-
- @Override
- public ReturnMessage batchDelete(List<Integer> ids) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- // 鎵归噺鍒犻櫎
- baseMapper.deleteBatchIds(ids);
- isSuccess = true;
- }catch (Exception e){
- System.out.println("鎵归噺鍒犻櫎澶辫触: " + e.getMessage());
- }
- return SystemLogUtil.handleDeleteResult(isSuccess,"CardBatchDelete",ids.toString());
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Cabinet/TbFakajiServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Cabinet/TbFakajiServiceImpl.java
deleted file mode 100644
index 313c9eb..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Cabinet/TbFakajiServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.hxzk.gps.service.impl.Cabinet;
-
-import com.hxzk.gps.entity.FaKaJi.TbFakaji;
-import com.hxzk.gps.mapper.Cabinet.TbFakajiMapper;
-import com.hxzk.gps.service.Cabinet.TbFakajiService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-03
- */
-@Service
-public class TbFakajiServiceImpl extends ServiceImpl<TbFakajiMapper, TbFakaji> implements TbFakajiService {
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Cabinet/TbFakalogServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Cabinet/TbFakalogServiceImpl.java
deleted file mode 100644
index fde1440..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Cabinet/TbFakalogServiceImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.hxzk.gps.service.impl.Cabinet;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Cabinet.deo.TableSearchResultFakalog;
-import com.hxzk.gps.entity.Cabinet.TbFakalog;
-import com.hxzk.gps.mapper.Cabinet.TbFakalogMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Cabinet.TbFakalogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鍙戝崱鏃ュ織鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-01-XX
- */
-@Service
-public class TbFakalogServiceImpl extends ServiceImpl<TbFakalogMapper, TbFakalog> implements TbFakalogService {
-
- @Override
- public ResultTable FindFaKaLogInfo(TableSearchResultFakalog tableSearchResultFakalog) {
- QueryWrapper<TbFakalog> queryWrapper = new QueryWrapper<>();
-
- // 鏍规嵁鏌滃瓙鍚嶇О鏌ヨ锛堥�氳繃鍏宠仈鏌ヨ锛�
- if (tableSearchResultFakalog.getGuiziname() != null && !tableSearchResultFakalog.getGuiziname().isEmpty()) {
- queryWrapper.like("guiziname", tableSearchResultFakalog.getGuiziname());
- }
-
- // 鏍规嵁鏌滃瓙缂栧彿鏌ヨ
- if (tableSearchResultFakalog.getGuiziid() != null && !tableSearchResultFakalog.getGuiziid().isEmpty()) {
- queryWrapper.like("guiziid", tableSearchResultFakalog.getGuiziid());
- }
-
- // 鏍规嵁鍙栧崱鍗℃Ы鏌ヨ
- if (tableSearchResultFakalog.getTakekacao() != null && !tableSearchResultFakalog.getTakekacao().isEmpty()) {
- queryWrapper.like("takekacao", tableSearchResultFakalog.getTakekacao());
- }
-
- // 鏍规嵁鍙栧崱浜哄悕绉版煡璇�
- if (tableSearchResultFakalog.getTakename() != null && !tableSearchResultFakalog.getTakename().isEmpty()) {
- queryWrapper.like("takename", tableSearchResultFakalog.getTakename());
- }
-
- // 鏍规嵁鍙栧崱缂栧彿鏌ヨ
- if (tableSearchResultFakalog.getTaketagid() != null && !tableSearchResultFakalog.getTaketagid().isEmpty()) {
- queryWrapper.like("taketagid", tableSearchResultFakalog.getTaketagid());
- }
-
- // 鏍规嵁鍙栧崱鐢ㄦ埛ID鏌ヨ
- if (tableSearchResultFakalog.getTakeuserid() != null && !tableSearchResultFakalog.getTakeuserid().isEmpty()) {
- queryWrapper.like("takeuserid", tableSearchResultFakalog.getTakeuserid());
- }
-
- // 鏍规嵁杩樺崱鍗℃Ы鏌ヨ
- if (tableSearchResultFakalog.getSavekacao() != null && !tableSearchResultFakalog.getSavekacao().isEmpty()) {
- queryWrapper.like("savekacao", tableSearchResultFakalog.getSavekacao());
- }
-
- // 鏍规嵁杩樺崱浜哄悕绉版煡璇�
- if (tableSearchResultFakalog.getSavename() != null && !tableSearchResultFakalog.getSavename().isEmpty()) {
- queryWrapper.like("savename", tableSearchResultFakalog.getSavename());
- }
-
- // 鏍规嵁杩樺崱缂栧彿鏌ヨ
- if (tableSearchResultFakalog.getSavetagid() != null && !tableSearchResultFakalog.getSavetagid().isEmpty()) {
- queryWrapper.like("savetagid", tableSearchResultFakalog.getSavetagid());
- }
-
- // 鏍规嵁鍙栧崱鏃堕棿鑼冨洿鏌ヨ
- if (tableSearchResultFakalog.getStartTime() != null && !tableSearchResultFakalog.getStartTime().isEmpty()) {
- queryWrapper.ge("taketime", tableSearchResultFakalog.getStartTime());
- }
- if (tableSearchResultFakalog.getEndTime() != null && !tableSearchResultFakalog.getEndTime().isEmpty()) {
- queryWrapper.le("taketime", tableSearchResultFakalog.getEndTime());
- }
-
- // 鏍规嵁杩樺崱鏃堕棿鑼冨洿鏌ヨ
- if (tableSearchResultFakalog.getStartSaveTime() != null && !tableSearchResultFakalog.getStartSaveTime().isEmpty()) {
- queryWrapper.ge("savetime", tableSearchResultFakalog.getStartSaveTime());
- }
- if (tableSearchResultFakalog.getEndSaveTime() != null && !tableSearchResultFakalog.getEndSaveTime().isEmpty()) {
- queryWrapper.le("savetime", tableSearchResultFakalog.getEndSaveTime());
- }
-
- // 鎸塈D闄嶅簭鎺掑垪锛堟渶鏂扮殑鍦ㄥ墠闈級
- queryWrapper.orderByDesc("id");
-
- PageHelper.startPage(tableSearchResultFakalog.getTableList().getPageNum(), tableSearchResultFakalog.getTableList().getPageSize());
- PageInfo<TbFakalog> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbFakalog> achortable = new table<>(info.getList(), tableSearchResultFakalog.getTableList().getPageNum(), tableSearchResultFakalog.getTableList().getPageSize(), info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-}
-
diff --git a/src/main/java/com/hxzk/gps/service/impl/Company/TbCompanyServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Company/TbCompanyServiceImpl.java
deleted file mode 100644
index 2707e65..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Company/TbCompanyServiceImpl.java
+++ /dev/null
@@ -1,720 +0,0 @@
-package com.hxzk.gps.service.impl.Company;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Company.Results.*;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.entity.Company.TbCompany;
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.hxzk.gps.entity.Department.TbDepartMentIcon;
-import com.hxzk.gps.entity.Map.TbMarsHomeset;
-import com.hxzk.gps.entity.Menu.Menu;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.entity.Role.Rolemenu;
-import com.hxzk.gps.entity.ThreeModel.TbThreemodel;
-import com.hxzk.gps.entity.User.TbUser;
-import com.hxzk.gps.entity.Role.Role;
-import com.hxzk.gps.entity.WarnTongJi.WarnTongjiCompany;
-import com.hxzk.gps.mapper.Company.TbCompanyMapper;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Department.TbDepartmentService;
-import com.hxzk.gps.service.Department.TbDepartMentIconService;
-import com.hxzk.gps.service.Map.TbMarsHomesetService;
-import com.hxzk.gps.service.Menu.MenuService;
-import com.hxzk.gps.service.Person.TbPersonService;
-import com.hxzk.gps.service.Role.RoleMenuService;
-import com.hxzk.gps.service.ThreeModel.TbThreemodelService;
-import com.hxzk.gps.service.User.TbUserService;
-import com.hxzk.gps.service.Role.IRoleService;
-import com.hxzk.gps.service.WarnTongJi.WarnTongjiCompanyService;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.util.Result.TableDto;
-import com.hxzk.gps.util.Time.TimeUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 鍏徃鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-04-17
- */
-@Service
-@Slf4j
-public class TbCompanyServiceImpl extends ServiceImpl<TbCompanyMapper, TbCompany> implements TbCompanyService {
-//
- @Autowired
- TbCompanyMapper companyMapper;
- @Autowired
- TbDepartMentIconService tbDepartMentIconService;
- @Autowired
- TbDepartmentService departmentService;
- @Autowired
- TbPersonService personService;
- @Autowired
- TbUserService userService;
- @Autowired
- IRoleService roleService;
- @Autowired
- MenuService menuService;
- @Autowired
- RoleMenuService roleMenuService;
- @Autowired
- TbMarsHomesetService marsHomesetService;
- @Autowired
- WarnTongjiCompanyService warnTongjiCompanyService;
- @Autowired
- TbThreemodelService tbThreemodelService;
- @Value("${upload.dir-IP}")
- private String uploadIp;
- @Value("${upload.dir-Map-Three}")
- private String dirMapThree;
- /*
- * 鍏徃鍒楄〃淇℃伅
- * */
- @Override
- public CompanyResult FindCompanyInfo(CompanyTreeTableDto companyTreeTableDto) {
- // 鍒涘缓鏌ヨ鍖呰鍣�
- QueryWrapper<TbCompany> queryWrapper = new QueryWrapper<>();
-
- // 澶勭悊閮ㄩ棬 ID 涓虹┖鐨勬儏鍐�
- if (StringUtils.isEmpty(companyTreeTableDto.getDepartmentId())) {
- List<Long> list = getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- queryWrapper.in("parentid", list);
- } else {
- queryWrapper.eq("parentid", companyTreeTableDto.getDepartmentId());
- }
-
- // 澶勭悊鍏徃鍚嶇О鏌ヨ鏉′欢
- Optional.ofNullable(companyTreeTableDto.getCompanyname()).ifPresent(companyname ->
- queryWrapper.like("companyname", companyname));
-
- // 浣跨敤PageHelper杩涜鍒嗛〉鏌ヨ
- Page<TbCompany> page = PageHelper.startPage(companyTreeTableDto.getPageNum(), companyTreeTableDto.getPageSize())
- .doSelectPage(() -> baseMapper.selectList(queryWrapper));
-
- // 灏佽鍏徃鍒楄〃
- TableDto tableDto = new TableDto(page.getResult(), page.getPageNum(), page.getPageSize(), page.getTotal());
-
- // 鑾峰彇鎴愬姛娑堟伅
- String message = MessageUtils.getMessage("Success");
-
- // 杩斿洖缁撴灉 - 闇�瑕佹牴鎹瓹ompanyResult鐨勬瀯閫犲嚱鏁拌皟鏁村弬鏁�
- return new CompanyResult(200, message, tableDto);
- }
-
- @Override
- public CompanyDepartmentResult FindUserDepartmentCompany() {
- // 鑾峰彇褰撳墠鐧诲綍鍏徃
- TbCompany currentCompany = getCurrentCompany();
- if (currentCompany == null) {
- return new CompanyDepartmentResult(404, new ArrayList<>(), "鏈壘鍒板叕鍙�");
- }
-
- // 鑾峰彇鎵�鏈夌浉鍏冲叕鍙�
- List<TbCompany> allCompanies = getAllRelatedCompanies(currentCompany);
- // 鏋勫缓瀛愰」鍒楄〃
- List<ChildItem> childItems = buildChildItems(allCompanies, currentCompany.getId());
- // 鏋勫缓鏁版嵁椤�
- DataItem dataItem = buildDataItem(currentCompany, childItems);
- // 鏋勫缓鏈�缁堢粨鏋�
- List<DataItem> dataItems = new ArrayList<>();
- dataItems.add(dataItem);
- return new CompanyDepartmentResult(200, dataItems, "鏌ヨ鎴愬姛");
- }
- private List<ChildItem> buildChildItems(List<TbCompany> allCompanies, int parentId) {
- List<ChildItem> childItems = new ArrayList<>();
- for (TbCompany company : allCompanies) {
- if (company.getParentid() == parentId) {
- // 閫掑綊鑾峰彇瀛愬叕鍙稿垪琛�
- List<ChildItem> children = buildChildItems(allCompanies, company.getId());
- // 鍒涘缓 ChildItem 瀵硅薄骞舵纭祴鍊煎瓙鍒楄〃
- childItems.add(new ChildItem(String.valueOf(company.getId()), company.getCompanyname(),company.getLogo(),children));
- }
- }
- return childItems;
- }
- private DataItem buildDataItem(TbCompany currentCompany, List<ChildItem> childItems) {
- return new DataItem(String.valueOf(currentCompany.getId()), UserInfoUtil.getUserCompany(),currentCompany.getLogo(), childItems);
- }
- //鑾峰彇閫掑綊瀛愬叕鍙哥殑ID
- @Override
- public List getChildCompanyIds(String companyid) {
- QueryWrapper<TbCompany> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", companyid);
- TbCompany company = baseMapper.selectOne(queryWrapper);
- List<TbCompany> allCompanies = getAllRelatedCompanies(company);
- List list = new ArrayList<>();
- for (TbCompany tbCompany : allCompanies) {
- list.add(tbCompany.getId());
- }
- return list;
- }
- @Override
- public List getChildCompanyNames(String companyname) {
- QueryWrapper<TbCompany> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("companyname", companyname);
- TbCompany company = baseMapper.selectOne(queryWrapper);
- List<TbCompany> allCompanies = getAllRelatedCompanies(company);
- List list = new ArrayList<>();
- for (TbCompany tbCompany : allCompanies) {
- list.add(tbCompany.getCompanyname());
- }
- return list;
- }
- /*
- * 鏍规嵁鍙傛暟ID鏌ヨ鍏徃鍚嶇О
- * @return 杩斿洖鍏徃鍚嶇О
- * @author YuZhiTong
- * @since 2025-05-19
- * */
- @Override
- public String getChildCompanyName(String id) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",id);
- return baseMapper.selectOne(queryWrapper).getCompanyname();
- }
-
-
- /*
- * 鍏徃涓嬫媺鍒楄〃
- * @param company 鍏徃淇℃伅
- * @return 鍏徃涓嬫媺鍒楄〃
- * @author YuZhiTong
- * @since 2025-05-19
- * */
- @Override
- public List<AuToComplete> CompanyAutocomplete(TbCompany company) {
- List<Long> list = getChildCompanyIds(String.valueOf(Optional.ofNullable(company.getId()).orElse(Integer.valueOf(UserInfoUtil.getUserCompanyId()))));
- QueryWrapper<TbCompany> queryWrapper = new QueryWrapper<>();
-
- queryWrapper.in("parentid", list).or().eq("id",Optional.ofNullable(company.getId()).orElse(Integer.valueOf(UserInfoUtil.getUserCompanyId())));
-
- List<TbCompany> companyList = baseMapper.selectList(queryWrapper);
- List<AuToComplete> addCustomerList = companyList.stream()
- .map(companys -> {
- AuToComplete addCustomer = new AuToComplete();
- addCustomer.setValue(companys.getCompanyname());
- addCustomer.setLink(String.valueOf(companys.getId()));
- return addCustomer;
- })
- .collect(Collectors.toList());
-
- return addCustomerList;
- }
-
- @Override
- public List<AuToComplete> FenceCompanyAutocomplete() {
- List<Long> list = getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- QueryWrapper<TbCompany> queryWrapper = new QueryWrapper<>();
-
- queryWrapper.in("parentid", list).or().eq("id",UserInfoUtil.getUserCompanyId());
-
- List<TbCompany> companyList = baseMapper.selectList(queryWrapper);
- List<AuToComplete> addCustomerList = companyList.stream()
- .map(companys -> {
- AuToComplete addCustomer = new AuToComplete();
- addCustomer.setValue(companys.getCompanyname());
- addCustomer.setLink(String.valueOf(companys.getId()));
- return addCustomer;
- })
- .collect(Collectors.toList());
-
- return addCustomerList;
- }
-
- @Override
- @Transactional
- public ReturnMessage add(TbCompany company) {
- boolean isSuccess = false;
- try {
- // 妫�鏌ュ叕鍙告槸鍚﹀凡瀛樺湪
- if (isCompanyExist(company)) {
- return ReturnMessage.ReturnMessageError("CompanyRepeat");
- }
-
- // 璁剧疆鍏徃鍩烘湰淇℃伅
- setCompanyBasicInfo(company);
- baseMapper.insert(company);
-
- // 鑾峰彇鏂板垱寤虹殑鍏徃淇℃伅
- TbCompany companyMars = getNewCreatedCompany(company.getCompanyname());
-
- // 鍒濆鍖栫浉鍏抽厤缃�
- initCompanyConfigurations(company, companyMars);
- // 鍒濆鍖栭粯璁よ鑹�
- initCompanyRoles(companyMars);
- // 鍒濆鍖栭儴闂ㄥ拰鍥炬爣
- initDepartmentsAndIcons(company, companyMars);
-// initThreeModel(companyMars);
-
- isSuccess = true;
- } catch (Exception e) {
- log.error("鏂板鍏徃澶辫触: {}", e);
- throw new RuntimeException("鏂板鍏徃澶辫触", e);
- }
- return SystemLogUtil.handleAddResult(isSuccess, "CompanyAdd", company.getCompanyname());
- }
-
- @Override
- public ReturnMessage update(TbCompany company) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",company.getId());
- try {
- company.setAddtime(TimeUtil.GetTime());
- baseMapper.update(company,queryWrapper);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"CompanyUpdate",company.getCompanyname());
- }
-
- @Override
- @Transactional
- public ReturnMessage delete(TbCompany company) {
- try {
- // 鍏堟鏌ュ叕鍙告槸鍚﹀彲浠ュ垹闄�
- ReturnMessage checkResult = checkCompanyCanDelete(company.getId());
- if (!checkResult.getCode().equals(200)) {
- return checkResult;
- }
-
- // 鎵ц鍒犻櫎鎿嶄綔
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", company.getId());
- boolean isSuccess = baseMapper.delete(queryWrapper) > 0;
-
- if (isSuccess) {
- // 鍒犻櫎鎴愬姛锛岃褰曟棩蹇�
- return SystemLogUtil.handleDeleteResult(true, "CompanyDelete", company.getCompanyname());
- } else {
- return ReturnMessage.ReturnMessageError("CompanyDeleteFailed");
- }
- } catch (Exception e) {
- log.error("鍒犻櫎鍏徃澶辫触: {}", e.getMessage(), e);
- return ReturnMessage.ReturnMessageError("CompanyDeleteException");
- }
- }
-
- @Override
- public ReturnMessage checkCompanyCanDelete(Integer companyId) {
- try {
- // 鍒涘缓缁戝畾鏁版嵁姹囨�诲璞�
- CompanyDeleteCheckResult.BindingDataSummary bindingData = new CompanyDeleteCheckResult.BindingDataSummary();
-
- // 妫�鏌ユ槸鍚﹀瓨鍦ㄥ瓙閮ㄩ棬
- QueryWrapper<TbDepartment> deptQuery = new QueryWrapper<>();
- deptQuery.eq("companyid", companyId);
- Long deptCount = departmentService.getBaseMapper().selectCount(deptQuery);
- bindingData.setDepartmentCount(deptCount);
-
- // 妫�鏌ユ槸鍚﹀瓨鍦ㄤ汉鍛�
- QueryWrapper<TbPerson> personQuery = new QueryWrapper<>();
- personQuery.eq("companyid", companyId);
- Long personCount = personService.getBaseMapper().selectCount(personQuery);
- bindingData.setPersonCount(personCount);
-
- // 妫�鏌ユ槸鍚﹀瓨鍦ㄧ敤鎴�
- QueryWrapper<TbUser> userQuery = new QueryWrapper<>();
- userQuery.eq("companyid", companyId);
- Long userCount = userService.getBaseMapper().selectCount(userQuery);
- bindingData.setUserCount(userCount);
-
- // 妫�鏌ユ槸鍚﹀瓨鍦ㄨ鑹�
- QueryWrapper<Role> roleQuery = new QueryWrapper<>();
- roleQuery.eq("companyid", companyId);
- Long roleCount = roleService.getBaseMapper().selectCount(roleQuery);
- bindingData.setRoleCount(roleCount);
-
- // 妫�鏌ユ槸鍚﹀瓨鍦ㄩ儴闂ㄥ浘鏍�
- QueryWrapper<TbDepartMentIcon> iconQuery = new QueryWrapper<>();
- iconQuery.eq("companyid", companyId);
- Long iconCount = tbDepartMentIconService.getBaseMapper().selectCount(iconQuery);
- bindingData.setIconCount(iconCount);
-
- // 妫�鏌ユ槸鍚﹀瓨鍦ㄨ溅杈嗭紙濡傛灉鏈夎溅杈嗘湇鍔★級
- try {
- QueryWrapper<Object> carQuery = new QueryWrapper<>();
- carQuery.eq("companyid", companyId);
- // 杩欓噷闇�瑕佹牴鎹疄闄呯殑杞﹁締瀹炰綋绫绘潵鏌ヨ
- bindingData.setCarCount(0L);
- } catch (Exception e) {
- bindingData.setCarCount(0L);
- }
-
- // 妫�鏌ユ槸鍚﹀瓨鍦ㄧ墿璧勶紙濡傛灉鏈夌墿璧勬湇鍔★級
- try {
- QueryWrapper<Object> materialQuery = new QueryWrapper<>();
- materialQuery.eq("companyid", companyId);
- // 杩欓噷闇�瑕佹牴鎹疄闄呯殑鐗╄祫瀹炰綋绫绘潵鏌ヨ
- bindingData.setMaterialCount(0L);
- } catch (Exception e) {
- bindingData.setMaterialCount(0L);
- }
-
- // 妫�鏌ユ槸鍚﹀瓨鍦ㄥ湴鍥�
- try {
- QueryWrapper<Object> mapQuery = new QueryWrapper<>();
- mapQuery.eq("companyid", companyId);
- // 杩欓噷闇�瑕佹牴鎹疄闄呯殑鍦板浘瀹炰綋绫绘潵鏌ヨ
- bindingData.setMapCount(0L);
- } catch (Exception e) {
- bindingData.setMapCount(0L);
- }
-
- // 妫�鏌ユ槸鍚﹀瓨鍦ㄨ鍛婄粺璁�
- try {
- QueryWrapper<Object> warningQuery = new QueryWrapper<>();
- warningQuery.eq("companyid", companyId);
- // 杩欓噷闇�瑕佹牴鎹疄闄呯殑璀﹀憡缁熻瀹炰綋绫绘潵鏌ヨ
- bindingData.setWarningCount(0L);
- } catch (Exception e) {
- bindingData.setWarningCount(0L);
- }
-
- // 鍒ゆ柇鏄惁鍙互鍒犻櫎
- if (bindingData.hasAnyBindingData()) {
- // 鏈夌粦瀹氭暟鎹紝鏃犳硶鍒犻櫎
- // 灏嗙粦瀹氭暟鎹俊鎭斁鍦╠ata瀛楁涓紝浣跨敤鏍囧噯鐨勯敊璇秷鎭爜
- CompanyDeleteCheckResult result = new CompanyDeleteCheckResult(false, "CompanyHasBindingData", bindingData);
- // 鍒涘缓涓�涓嚜瀹氫箟鐨凴eturnMessage锛屽寘鍚粦瀹氭暟鎹�
- ReturnMessage returnMessage = new ReturnMessage(500, MessageUtils.getMessage("CompanyHasBindingData"));
- // 杩欓噷鎴戜滑闇�瑕佹墿灞昍eturnMessage鏉ユ敮鎸乨ata瀛楁锛屾垨鑰呬娇鐢ㄥ叾浠栨柟寮�
- // 鏆傛椂浣跨敤瀛楃涓叉嫾鎺ョ殑鏂瑰紡锛屼絾閬垮厤浣滀负娑堟伅鐮�
- String bindingInfo = String.format("閮ㄩ棬(%d),浜哄憳(%d),鐢ㄦ埛(%d),瑙掕壊(%d),鍥炬爣(%d),杞﹁締(%d),鐗╄祫(%d),鍦板浘(%d),璀﹀憡(%d)",
- bindingData.getDepartmentCount(), bindingData.getPersonCount(), bindingData.getUserCount(),
- bindingData.getRoleCount(), bindingData.getIconCount(), bindingData.getCarCount(),
- bindingData.getMaterialCount(), bindingData.getMapCount(), bindingData.getWarningCount());
-
- // 浣跨敤鑷畾涔夌殑杩斿洖鏂瑰紡锛岄伩鍏嶅浗闄呭寲娑堟伅鏌ユ壘閿欒
- return new ReturnMessage(200, "CompanyHasBindingData:" + bindingInfo);
- } else {
- // 娌℃湁缁戝畾鏁版嵁锛屽彲浠ュ垹闄�
- return ReturnMessage.ReturnMessageSuccess("CompanyCanDelete");
- }
-
- } catch (Exception e) {
- log.error("妫�鏌ュ叕鍙稿垹闄ゆ潯浠跺け璐ワ紝鍏徃ID: {}, 閿欒: {}", companyId, e.getMessage(), e);
- return ReturnMessage.ReturnMessageError("CheckCompanyDeleteFailed");
- }
- }
-
- @Override
- public Integer FindCompanyOnlineCount(List companyid) {
- return companyMapper.FindCompanyOnlineCount(companyid);
- }
-
- @Override
- public Integer FindCompanyNoOnlineCount(List companyid) {
- return companyMapper.FindCompanyNoOnlineCount(companyid);
- }
-
- @Override
- public Integer FindCompanyOnlineCarCount(List companyid) {
- return companyMapper.FindCompanyOnlineCarCount(companyid);
- }
-
- @Override
- public Integer FindCompanyNoOnlineCarCount(List companyid) {
- return companyMapper.FindCompanyNoOnlineCarCount(companyid);
- }
-
- @Override
- public Integer FindCompanyOnlineAchorCount(String company) {
- return companyMapper.FindCompanyOnlineAchorCount(company);
- }
-
- @Override
- public Integer FindCompanyNoOnlineAchorCount(String company) {
- return companyMapper.FindCompanyNoOnlineAchorCount(company);
- }
-
- @Override
- public Integer FindCompanyWarningCount1(List companyid) {
- return companyMapper.FindCompanyWarningCount1(companyid);
- }
-
- @Override
- public Integer FindCompanyWarningCount2(List companyids) {
- return companyMapper.FindCompanyWarningCount2(companyids);
- }
-
- @Override
- public Integer FindCompanyWarningCount3(List companyids) {
- return companyMapper.FindCompanyWarningCount3(companyids);
- }
-
- @Override
- public Integer FindCompanyWarningCount4(List companyids) {
- return companyMapper.FindCompanyWarningCount4(companyids);
- }
-
- @Override
- public Integer FindCompanyWarningCount5(List companyids) {
- return companyMapper.FindCompanyWarningCount5(companyids);
- }
-
- @Override
- public Integer FindCompanyWarningCount6(List companyids) {
- return companyMapper.FindCompanyWarningCount6(companyids);
- }
-
- @Override
- public Integer FindCompanyWarningCount7(List companyids) {
- return companyMapper.FindCompanyWarningCount7(companyids);
- }
-
- @Override
- public Integer FindCompanyWarningCount8(List companyids) {
- return companyMapper.FindCompanyWarningCount8(companyids);
- }
-
- @Override
- public Integer FindCompanyWarningCount9(List companyids) {
- return companyMapper.FindCompanyWarningCount9(companyids);
- }
-
-
- @Override
- public List<WarnTongjiCompany> findCompanyWarn(String company) {
- return companyMapper.findCompanyWarn(company);
- }
-
- @Override
- public Integer UpCompanyWarnCount(String company, Integer count, String title) {
- return companyMapper.UpCompanyWarnCount(company, count, title);
- }
-
-
- // 鑾峰彇褰撳墠鍏徃
- private TbCompany getCurrentCompany() {
- try {
- String companyId = UserInfoUtil.getUserCompanyId();
- if (companyId == null || companyId.isEmpty()) {
- return null;
- }
- return baseMapper.selectById(companyId);
- } catch (Exception e) {
- log.error("鑾峰彇褰撳墠鍏徃澶辫触: {}", e.getMessage(), e);
- return null;
- }
- }
-
- // 鑾峰彇鎵�鏈夌浉鍏冲叕鍙�
- private List<TbCompany> getAllRelatedCompanies(TbCompany company) {
- if (company == null) {
- return new ArrayList<>();
- }
-
- List<TbCompany> allCompanies = new ArrayList<>();
- allCompanies.add(company);
-
- // 閫掑綊鑾峰彇瀛愬叕鍙�
- getAllChildCompanies(company.getId(), allCompanies);
-
- return allCompanies;
- }
-
- // 閫掑綊鑾峰彇瀛愬叕鍙�
- private void getAllChildCompanies(Integer parentId, List<TbCompany> allCompanies) {
- try {
- QueryWrapper<TbCompany> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("parentid", parentId);
- List<TbCompany> childCompanies = baseMapper.selectList(queryWrapper);
-
- for (TbCompany childCompany : childCompanies) {
- allCompanies.add(childCompany);
- // 閫掑綊鑾峰彇瀛愬叕鍙哥殑瀛愬叕鍙�
- getAllChildCompanies(childCompany.getId(), allCompanies);
- }
- } catch (Exception e) {
- log.error("鑾峰彇瀛愬叕鍙稿け璐�: {}", e.getMessage(), e);
- }
- }
-
- private boolean isCompanyExist(TbCompany company) {
- QueryWrapper<TbCompany> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("companyname", company.getCompanyname())
- .eq("parentid", UserInfoUtil.getUserCompanyId());
- return baseMapper.selectCount(queryWrapper) > 0;
- }
-
- private void setCompanyBasicInfo(TbCompany company) {
- company.setParentid(Integer.parseInt(UserInfoUtil.getUserCompanyId()));
- company.setAddusername(UserInfoUtil.getUserName());
- company.setAddtime(TimeUtil.GetTime());
- }
-
- private TbCompany getNewCreatedCompany(String companyName) {
- QueryWrapper<TbCompany> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("companyname", companyName);
- return baseMapper.selectOne(queryWrapper);
- }
-
- private void initCompanyConfigurations(TbCompany company, TbCompany companyMars) {
- marsHomesetService.InsertMarsHomeSet(company.getCompanyname(), String.valueOf(companyMars.getId()));
- warnTongjiCompanyService.InsertWarnTongJi(companyMars.getCompanyname());
- }
-
- private void initDepartmentsAndIcons(TbCompany company, TbCompany companyMars) {
- String[] departmentNames = new String[] {
- MessageUtils.getMessage("AllDepartments"),
- MessageUtils.getMessage("TechnicalDepartment"),
- MessageUtils.getMessage("ProductionDepartment"),
- MessageUtils.getMessage("SecurityDepartment"),
- MessageUtils.getMessage("MaintenanceDepartment"),
- MessageUtils.getMessage("RnDDepartment")
- };
-
- for (int i = 0; i < departmentNames.length; i++) {
- createDepartmentIcon(company, companyMars, i);
- createDepartment(company, companyMars, departmentNames[i],i);
- }
- }
-
- private void initThreeModel(TbCompany companyMars) {
- TbThreemodel tbThreemodel = new TbThreemodel();
- tbThreemodel.setCompanyid(String.valueOf(companyMars.getId()));
- tbThreemodel.setCompany(companyMars.getCompanyname());
- tbThreemodel.setAddtime(TimeUtil.GetTime());
- tbThreemodel.setLat("0");
- tbThreemodel.setLng("0");
- tbThreemodel.setAlt("0");
- tbThreemodel.setFilename(companyMars.getCompanyname()+"_"+MessageUtils.getMessage("XiTongMoRen"));
- String FileAdress = dirMapThree+tbThreemodel.getFilename();
-
- // 鍒涘缓鏂囦欢澶�
- File folder = new File(FileAdress);
- if (!folder.exists()) {
- folder.mkdirs();
- }
-
- tbThreemodelService.getBaseMapper().insert(tbThreemodel);
- }
-
- private void createDepartmentIcon(TbCompany company, TbCompany companyMars, int index) {
- TbDepartMentIcon icon = new TbDepartMentIcon();
- icon.setCompanyid(String.valueOf(companyMars.getId()));
- icon.setCompany(company.getCompanyname());
- icon.setUsername(UserInfoUtil.getUserName());
- icon.setAddtime(TimeUtil.GetTime());
- icon.setIconname(MessageUtils.getMessage("Icon") + (index + 1));
- icon.setIconadress(uploadIp + "Department/department" + (index + 1) + ".png");
- tbDepartMentIconService.getBaseMapper().insert(icon);
- }
-
- private void createDepartment(TbCompany company, TbCompany companyMars, String departmentName,int index) {
- TbDepartment department = new TbDepartment();
- department.setCompanyid(String.valueOf(companyMars.getId()));
- department.setCompany(company.getCompanyname());
- department.setDepartmentname(departmentName);
- department.setAddtime(TimeUtil.GetTime());
- department.setBaoliu3(uploadIp + "Department/department" + (index + 1) + ".png");
- departmentService.getBaseMapper().insert(department);
- }
-
- /**
- * 鍒濆鍖栧叕鍙稿熀纭�瑙掕壊
- * @param company 鍏徃淇℃伅
- */
- private void initCompanyRoles(TbCompany company) {
- try {
- // 1. 鍒涘缓瓒呯骇绠$悊鍛樿鑹�
- Role superAdminRole = new Role();
- superAdminRole.setName(MessageUtils.getMessage("Admin"));
- superAdminRole.setAddrole(true);
- superAdminRole.setEditrole(true);
- superAdminRole.setDeleterole(true);
- superAdminRole.setUsername(MessageUtils.getMessage("XiTongMoRen"));
- superAdminRole.setAddtime(TimeUtil.GetTime());
- superAdminRole.setCompanyname(company.getCompanyname());
- superAdminRole.setCompanyid(String.valueOf(company.getId()));
- roleService.save(superAdminRole);
- initCompanyUserRoleMenu(company.getCompanyname(),MessageUtils.getMessage("Admin"));
- // 2. 鍒涘缓鏅�氱鐞嗗憳瑙掕壊
- Role staffRole = new Role();
- staffRole.setName(MessageUtils.getMessage("PuAdmin"));
- staffRole.setAddrole(true);
- staffRole.setEditrole(true);
- staffRole.setDeleterole(false);
- staffRole.setUsername(MessageUtils.getMessage("XiTongMoRen"));
- staffRole.setAddtime(TimeUtil.GetTime());
- staffRole.setCompanyname(company.getCompanyname());
- staffRole.setCompanyid(String.valueOf(company.getId()));
- roleService.save(staffRole);
- initCompanyUserRoleMenu(company.getCompanyname(),MessageUtils.getMessage("PuAdmin"));
- // 3. 鍒涘缓璁垮瑙掕壊
- Role guestRole = new Role();
- guestRole.setName(MessageUtils.getMessage("FangKe"));
- guestRole.setAddrole(false);
- guestRole.setEditrole(false);
- guestRole.setDeleterole(false);
- guestRole.setUsername(MessageUtils.getMessage("XiTongMoRen"));
- guestRole.setAddtime(TimeUtil.GetTime());
- guestRole.setCompanyname(company.getCompanyname());
- guestRole.setCompanyid(String.valueOf(company.getId()));
- roleService.save(guestRole);
- initCompanyUserRoleMenu(company.getCompanyname(),MessageUtils.getMessage("FangKe"));
- log.info("鍏徃[{}]鍩虹瑙掕壊鍒濆鍖栨垚鍔�", company.getCompanyname());
- } catch (Exception e) {
- log.error("鍒濆鍖栧叕鍙歌鑹插け璐�: {}", e.getMessage(), e);
- throw new RuntimeException("鍒濆鍖栧叕鍙歌鑹插け璐�", e);
- }
- }
- /**
- * 鍒濆鍖栧叕鍙歌鑹插熀纭�瀵艰埅鏉冮檺
- * @param company 鍏徃瑙掕壊鍩虹瀵艰埅鏉冮檺
- */
- private void initCompanyUserRoleMenu(String companyName,String roleName) {
- try {
- Role role = roleService.getBaseMapper().selectOne(new QueryWrapper<Role>().eq("name", roleName).eq("companyname",companyName));
- List<Menu> menus = new ArrayList<>();
- if (roleName.equals(MessageUtils.getMessage("Admin"))){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- menus = menuService.getBaseMapper().selectList(queryWrapper);
- }
- if (roleName.equals(MessageUtils.getMessage("PuAdmin"))){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.ne("rolename","瓒呯骇绠$悊鍛�");
- menus = menuService.getBaseMapper().selectList(queryWrapper);
- }
- if (roleName.equals(MessageUtils.getMessage("FangKe"))){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.ne("rolename","瓒呯骇绠$悊鍛�");
- menus = menuService.getBaseMapper().selectList(queryWrapper);
- }
- for (Menu menu : menus) {
- Rolemenu rolemenu = new Rolemenu();
- rolemenu.setRoleId(role.getId());
- rolemenu.setMenuId(menu.getId());
- roleMenuService.save(rolemenu);
- }
- } catch (Exception e) {
- log.error("鍒濆鍖栧叕鍙歌鑹插熀纭�瀵艰埅鏉冮檺澶辫触: {}", e.getMessage(), e);
- throw new RuntimeException("鍒濆鍖栧叕鍙歌鑹插熀纭�瀵艰埅鏉冮檺澶辫触", e);
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/service/impl/Department/TbDepartmentIconServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Department/TbDepartmentIconServiceImpl.java
deleted file mode 100644
index 74c779f..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Department/TbDepartmentIconServiceImpl.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.hxzk.gps.service.impl.Department;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.DepartMent.Results.DepartMentIconResult;
-import com.hxzk.gps.controller.DepartMent.Results.DepartMentResult;
-import com.hxzk.gps.controller.DepartMent.dto.DpeartMentIconTreeTableDto;
-import com.hxzk.gps.controller.Person.Results.PersonResult;
-import com.hxzk.gps.entity.Department.TbDepartMentIcon;
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.hxzk.gps.entity.System.TbSystemOperationLog;
-import com.hxzk.gps.mapper.Department.TbDepartmentIconMapper;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Department.TbDepartMentIconService;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.util.Result.TableDto;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.util.Time.TimeUtil;
-import com.hxzk.gps.util.UDP.UDP_Person;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-@Service
-public class TbDepartmentIconServiceImpl extends ServiceImpl<TbDepartmentIconMapper, TbDepartMentIcon> implements TbDepartMentIconService {
- @Autowired
- TbCompanyService companyService;
- @Autowired
- private TbSystemOperationLogService systemOperationLogService;
- @Override
- public DepartMentIconResult FindDepartmentIconInfo(DpeartMentIconTreeTableDto departmentIconTreeTableDto) {
- // 鍒涘缓鏌ヨ鍖呰鍣�
- QueryWrapper<TbDepartMentIcon> queryWrapper = new QueryWrapper<>();
-
- // 澶勭悊閮ㄩ棬 ID 涓虹┖鐨勬儏鍐�
- if (StringUtils.isEmpty(departmentIconTreeTableDto.getDepartmentId())) {
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- queryWrapper.in("companyid", list);
- } else {
- queryWrapper.eq("companyid", departmentIconTreeTableDto.getDepartmentId());
- }
-
- // 澶勭悊鍥炬爣鍚嶇О鏌ヨ鏉′欢
- Optional.ofNullable(departmentIconTreeTableDto.getIconname()).ifPresent(iconname ->
- queryWrapper.like("iconname", iconname));
-
- // 浣跨敤PageHelper杩涜鍒嗛〉鏌ヨ
- Page<TbDepartMentIcon> page = PageHelper.startPage(departmentIconTreeTableDto.getPageNum(), departmentIconTreeTableDto.getPageSize())
- .doSelectPage(() -> baseMapper.selectList(queryWrapper));
-
- // 灏佽鍥炬爣鍒楄〃
- TableDto tableDto = new TableDto(page.getResult(), page.getPageNum(), page.getPageSize(), page.getTotal());
-
- // 鑾峰彇鎴愬姛娑堟伅
- String message = MessageUtils.getMessage("Success");
-
- // 杩斿洖缁撴灉 - 鏍规嵁DepartMentIconResult鐨勬瀯閫犲嚱鏁拌皟鏁村弬鏁�
- return new DepartMentIconResult(200, message, tableDto);
- }
-
- @Override
- public ReturnMessage add(TbDepartMentIcon departMentIcon) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("iconname",departMentIcon.getIconname());
- queryWrapper.eq("company",departMentIcon.getCompany());
- Integer count = Math.toIntExact(baseMapper.selectCount(queryWrapper));
- if (count > 0){
- return ReturnMessage.ReturnMessageError("IconRepeat");
- }else{
- try {
- departMentIcon.setUsername(UserInfoUtil.getUserName());
- departMentIcon.setAddtime(TimeUtil.GetTime());
- departMentIcon.setCompanyid(UserInfoUtil.isNullGetCompanyId(departMentIcon.getCompanyid()));
- baseMapper.insert(departMentIcon);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleAddResult(isSuccess,"IconAdd",departMentIcon.getIconname());
- }
-
- }
-
- @Override
- public ReturnMessage update(TbDepartMentIcon departMentIcon) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",departMentIcon.getId());
- try {
- departMentIcon.setUsername(UserInfoUtil.getUserName());
- departMentIcon.setAddtime(TimeUtil.GetTime());
- baseMapper.update(departMentIcon,queryWrapper);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"IconUpdate",departMentIcon.getIconname());
- }
-
- @Override
- public ReturnMessage delete(TbDepartMentIcon departMentIcon) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",departMentIcon.getId());
- try {
- baseMapper.delete(queryWrapper);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleDeleteResult(isSuccess,"IconDelete",departMentIcon.getIconname());
- }
-
- @Override
- public List<AuToComplete> DepartmentIconAutocomplete(TbDepartMentIcon departMentIcon) {
- QueryWrapper<TbDepartMentIcon> queryWrapper = new QueryWrapper<>();
- String id = Optional.ofNullable(departMentIcon.getCompanyid())
- .filter(s -> !s.isEmpty())
- .orElse(UserInfoUtil.getUserCompanyId());
- queryWrapper.eq("companyid",id);
- List<TbDepartMentIcon> departmentList = baseMapper.selectList(queryWrapper);
- List<AuToComplete> addCustomerList = departmentList.stream()
- .map(departmenticons -> {
- AuToComplete addCustomer = new AuToComplete();
- addCustomer.setValue(departmenticons.getIconadress());
- addCustomer.setLabel(departmenticons.getIconname());
- return addCustomer;
- })
- .collect(Collectors.toList());
-
- return addCustomerList;
- }
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Department/TbDepartmentServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Department/TbDepartmentServiceImpl.java
deleted file mode 100644
index c006232..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Department/TbDepartmentServiceImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package com.hxzk.gps.service.impl.Department;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.DepartMent.Results.DepartMentResult;
-import com.hxzk.gps.controller.DepartMent.dto.DpeartMentTreeTableDto;
-import com.hxzk.gps.controller.Person.Results.PersonResult;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.entity.System.TbSystemOperationLog;
-import com.hxzk.gps.mapper.Department.TbDepartmentMapper;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Department.TbDepartmentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.util.Result.TableDto;
-
-import com.hxzk.gps.util.Time.TimeUtil;
-import com.hxzk.gps.util.UDP.UDP_Department;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-18
- */
-@Service
-public class TbDepartmentServiceImpl extends ServiceImpl<TbDepartmentMapper, TbDepartment> implements TbDepartmentService {
-
- @Autowired
- TbCompanyService companyService;
- @Autowired
- TbSystemOperationLogService systemOperationLogService;
- @Override
- public DepartMentResult FindDepartmentInfo(DpeartMentTreeTableDto departmentTreeTableDto) {
- // 鍒涘缓鏌ヨ鍖呰鍣�
- QueryWrapper<TbDepartment> queryWrapper = new QueryWrapper<>();
-
- // 澶勭悊閮ㄩ棬 ID 涓虹┖鐨勬儏鍐�
- if (StringUtils.isEmpty(departmentTreeTableDto.getDepartmentId())) {
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- queryWrapper.in("companyid", list);
- } else {
- queryWrapper.eq("companyid", departmentTreeTableDto.getDepartmentId());
- }
-
- // 澶勭悊閮ㄩ棬鍚嶇О鏌ヨ鏉′欢
- Optional.ofNullable(departmentTreeTableDto.getDepartmentname()).ifPresent(departmentname ->
- queryWrapper.like("departmentname", departmentname));
-
- // 浣跨敤PageHelper杩涜鍒嗛〉鏌ヨ
- Page<TbDepartment> page = PageHelper.startPage(departmentTreeTableDto.getPageNum(), departmentTreeTableDto.getPageSize())
- .doSelectPage(() -> baseMapper.selectList(queryWrapper));
-
- // 灏佽閮ㄩ棬鍒楄〃
- TableDto tableDto = new TableDto(page.getResult(), page.getPageNum(), page.getPageSize(), page.getTotal());
-
- // 鑾峰彇鎴愬姛娑堟伅
- String message = MessageUtils.getMessage("Success");
-
- // 杩斿洖缁撴灉
- return new DepartMentResult(200, message, tableDto);
- }
-
- @Override
- public List<AuToComplete> DepartmentAutocomplete(TbDepartment department) {
- if (department.getCompanyid().equals("")){
- department.setCompanyid(UserInfoUtil.getUserCompanyId());
- }
- List<Long> companyids = companyService.getChildCompanyIds(department.getCompanyid());
- QueryWrapper<TbDepartment> queryWrapper = new QueryWrapper<>();
- String id = Optional.ofNullable(department.getCompanyid())
- .filter(s -> !s.isEmpty())
- .orElse(UserInfoUtil.getUserCompanyId());
- queryWrapper.in("companyid",companyids);
- List<TbDepartment> departmentList = baseMapper.selectList(queryWrapper);
- List<AuToComplete> addCustomerList = departmentList.stream()
- .map(departments -> {
- AuToComplete addCustomer = new AuToComplete();
- addCustomer.setValue(departments.getDepartmentname());
- addCustomer.setLink(String.valueOf(departments.getId()));
- return addCustomer;
- })
- .collect(Collectors.toList());
-
- return addCustomerList;
- }
-
- @Override
- public TbDepartment FindOneDepartMent(TbPerson person) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("departmentname",person.getPDepartment());
- queryWrapper.eq("company",Optional.ofNullable(person.getCompany()).orElse(UserInfoUtil.getUserCompany()));
- return baseMapper.selectOne(queryWrapper);
- }
-
- /*
- * 鏂板閮ㄩ棬
- * @param department 閮ㄩ棬淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- @Override
- public ReturnMessage add(TbDepartment department) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- department.setCompanyid(UserInfoUtil.isNullGetCompanyId(department.getCompanyid()));
- // 妫�鏌ラ儴闂ㄦ槸鍚﹂噸澶�
- if (isDepartmentRepeat(department)) {
- return ReturnMessage.ReturnMessageError("DepartmentRepeat");
- }
- try {
- department.setBaoliu5(UserInfoUtil.getUserName());
- department.setAddtime(TimeUtil.GetTime());
- baseMapper.insert(department);
- /*
- * 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_Department.AddDepartment(department);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleAddResult(isSuccess,"DepartmentAdd",department.getDepartmentname());
-
- }
- /*
- * 淇敼閮ㄩ棬
- * @param department 閮ㄩ棬鍥炬爣淇℃伅
- * @return 缁撴灉淇℃伅
- * */
-
- @Override
- public ReturnMessage update(TbDepartment department) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- // 璁剧疆鍏徃 ID
- department.setCompanyid(UserInfoUtil.isNullGetCompanyId(department.getCompanyid()));
- // 妫�鏌ラ儴闂ㄦ槸鍚﹂噸澶�
- if (isUpDepartmentRepeat(department)) {
- return ReturnMessage.ReturnMessageError("DepartmentRepeat");
- }
- try {
- // 鏇存柊閮ㄩ棬淇℃伅
- QueryWrapper<TbDepartment> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", department.getId());
- department.setAddtime(TimeUtil.GetTime());
- baseMapper.update(department, queryWrapper);
- /*
- * 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_Department.UpDepartment(department);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"DepartmentUpdate",department.getDepartmentname());
- }
- /*
- * 鍒犻櫎閮ㄩ棬
- * @param department 閮ㄩ棬淇℃伅
- * @return 缁撴灉淇℃伅
- * */
- @Override
- public ReturnMessage delete(TbDepartment department) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",department.getId());
- try {
- baseMapper.delete(queryWrapper);
- UDP_Department.DeDepartment(department);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleDeleteResult(isSuccess,"DepartmentDelete",department.getDepartmentname());
- }
-
-
-
- /**
- * 妫�鏌ラ儴闂ㄦ槸鍚﹂噸澶�
- * @param department 閮ㄩ棬淇℃伅
- * @return 濡傛灉閮ㄩ棬閲嶅杩斿洖 true锛屽惁鍒欒繑鍥� false
- */
- private boolean isDepartmentRepeat(TbDepartment department) {
- QueryWrapper<TbDepartment> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", department.getCompany())
- .eq("departmentname", department.getDepartmentname());
- return baseMapper.selectCount(queryWrapper) > 0;
- }
- private boolean isUpDepartmentRepeat(TbDepartment department) {
- QueryWrapper<TbDepartment> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", department.getCompany())
- .eq("departmentname", department.getDepartmentname());
- return baseMapper.selectCount(queryWrapper) > 1;
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Fence/TbFenceServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Fence/TbFenceServiceImpl.java
deleted file mode 100644
index f6df2d6..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Fence/TbFenceServiceImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.hxzk.gps.service.impl.Fence;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Fence.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.entity.Fence.TbFence;
-import com.hxzk.gps.entity.FzRadar.TbFzanchor;
-import com.hxzk.gps.mapper.Fence.TbFenceMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Fence.TbFenceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-
-import com.hxzk.gps.util.UDP.UDP_Fence;
-import com.hxzk.gps.util.UDP.UDP_FzAnchor;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@Service
-public class TbFenceServiceImpl extends ServiceImpl<TbFenceMapper, TbFence> implements TbFenceService {
-
- @Override
- public ResultTable FindFenceInfo(TableSearchResult TableSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- Optional.ofNullable(TableSearchResult.getFence().getName()).ifPresent(name -> queryWrapper.like("name", name));
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbFence> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbFence> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-
- @Override
- public ReturnMessage add(TbFence fence) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("name",fence.getName());
- if (baseMapper.selectCount(queryWrapper) > 0){
- return ReturnMessage.ReturnMessageError("FenceNameRepeat");
- }
- boolean isSuccess = false;
- try {
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
-
- UDP_Fence.AddFence(fence);
- isSuccess = true;
- //鍗曠嫭淇敼鍥存爮棰滆壊
- Thread.sleep(1000);
- TbFence fenceColor = new TbFence();
- fenceColor.setBaoliu14(fence.getBaoliu14());
- baseMapper.update(fenceColor,queryWrapper);
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleAddResult(isSuccess,"FenceAdd",fence.getName());
- }
-
- @Override
- public ReturnMessage delete(TbFence fence) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_Fence.DeFence(fence);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleDeleteResult(isSuccess,"FenceDelete",fence.getName());
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/FzRadar/TbFzanchorServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/FzRadar/TbFzanchorServiceImpl.java
deleted file mode 100644
index b89d63f..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/FzRadar/TbFzanchorServiceImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.hxzk.gps.service.impl.FzRadar;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Radar.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.entity.FzRadar.TbFzanchor;
-import com.hxzk.gps.mapper.FzRadar.TbFzanchorMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.FzRadar.TbFzanchorService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-
-import com.hxzk.gps.util.UDP.UDP_FzAnchor;
-import com.hxzk.gps.util.UDP.UDP_Person;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@Service
-public class TbFzanchorServiceImpl extends ServiceImpl<TbFzanchorMapper, TbFzanchor> implements TbFzanchorService {
-
- @Override
- public ResultTable FindRadarInfo(TableSearchResult TableSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- Optional.ofNullable(TableSearchResult.getFzanchor().getAchorid()).ifPresent(achorid -> queryWrapper.like("achorid", achorid));
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbFzanchor> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbFzanchor> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-
- @Override
- public ReturnMessage add(TbFzanchor fzanchor) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_FzAnchor.AddFzAnchor(fzanchor);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleAddResult(isSuccess,"RadarAdd",fzanchor.getAchorid());
- }
-
- @Override
- public ReturnMessage update(TbFzanchor fzanchor) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_FzAnchor.UpFzAnchor(fzanchor);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"RadarUpdate",fzanchor.getAchorid());
- }
-
- @Override
- public ReturnMessage delete(TbFzanchor fzanchor) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_FzAnchor.DeFzAnchor(fzanchor);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleDeleteResult(isSuccess,"RadarDelete",fzanchor.getAchorid());
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Gather/TbPergatherServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Gather/TbPergatherServiceImpl.java
deleted file mode 100644
index 5fe782f..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Gather/TbPergatherServiceImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.hxzk.gps.service.impl.Gather;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Gather.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.entity.Fence.TbFence;
-import com.hxzk.gps.entity.Gather.TbPergather;
-import com.hxzk.gps.mapper.Gather.TbPergatherMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Gather.TbPergatherService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.util.UDP.UDP_Fence;
-import com.hxzk.gps.util.UDP.UDP_Gather;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@Service
-public class TbPergatherServiceImpl extends ServiceImpl<TbPergatherMapper, TbPergather> implements TbPergatherService {
-
- @Override
- public ResultTable FindGatherInfo(TableSearchResult TableSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- Optional.ofNullable(TableSearchResult.getGather().getName()).ifPresent(name -> queryWrapper.like("name", name));
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbPergather> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbPergather> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-
- @Override
- public ReturnMessage update(TbPergather pergather) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_Gather.UpGather(pergather);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"ClusterFenceUpdate",pergather.getName());
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Heart/TbHeartRecordServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Heart/TbHeartRecordServiceImpl.java
deleted file mode 100644
index 7758ed7..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Heart/TbHeartRecordServiceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.hxzk.gps.service.impl.Heart;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Heart.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Heart.TbHeartRecord;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.mapper.Heart.TbHeartRecordMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Heart.TbHeartRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@Service
-public class TbHeartRecordServiceImpl extends ServiceImpl<TbHeartRecordMapper, TbHeartRecord> implements TbHeartRecordService {
- @Autowired
- TbHeartRecordMapper heartRecordMapper;
- @Override
- public ResultTable FindHeartInfo(TableSearchResult TableSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbHeartRecord> info = new PageInfo<>(heartRecordMapper.FindHeartInfo(UserInfoUtil.getUserCompany(),TableSearchResult.getHeartRecord().getName(),TableSearchResult.getHeartRecord().getTagid()));
- table<TbHeartRecord> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/HistoryPower/TbAcHistoryPowerServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/HistoryPower/TbAcHistoryPowerServiceImpl.java
deleted file mode 100644
index 5ea08e3..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/HistoryPower/TbAcHistoryPowerServiceImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.hxzk.gps.service.impl.HistoryPower;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.HistoryPower.dto.TableSearchResult.TableAcPowerSearchResult;
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.hxzk.gps.entity.HistoryPower.TbAcHistoryPower;
-import com.hxzk.gps.mapper.HistoryPower.TbAcHistoryPowerMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.HistoryPower.TbAcHistoryPowerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@Service
-public class TbAcHistoryPowerServiceImpl extends ServiceImpl<TbAcHistoryPowerMapper, TbAcHistoryPower> implements TbAcHistoryPowerService {
- @Autowired
- TbAcHistoryPowerMapper acHistoryPowerMapper;
-
- /**
- * 鍩虹珯鐢甸噺鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- @Override
- public ResultTable FindAcHistoryPowerInfo(TableAcPowerSearchResult TableSearchResult) {
- if (TableSearchResult.getAcHistoryPower().getAddtime() == null){
- TableSearchResult.getAcHistoryPower().setAddtime(TimeUtil.GetYearMonthDay());
- }else{
- TableSearchResult.getAcHistoryPower().setAddtime(TimeUtil.ZhuanDate(TableSearchResult.getAcHistoryPower().getAddtime()));
- }
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(), TableSearchResult.getTableList().getPageSize());
- PageInfo<TbAcHistoryPower> info = new PageInfo<>(acHistoryPowerMapper.FindAcHistoryPowerInfo(UserInfoUtil.getUserCompany(), TableSearchResult.getAcHistoryPower().getAddtime(),TableSearchResult.getAcHistoryPower().getAnchorId()));
- table<TbAcHistoryPower> achortable = new table<>(info.getList(), TableSearchResult.getTableList().getPageNum(), TableSearchResult.getTableList().getPageSize(), info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/HistoryPower/TbHistoryPowerServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/HistoryPower/TbHistoryPowerServiceImpl.java
deleted file mode 100644
index aa8b130..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/HistoryPower/TbHistoryPowerServiceImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.hxzk.gps.service.impl.HistoryPower;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.HistoryPower.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.hxzk.gps.entity.HistoryPower.TbHistoryPower;
-import com.hxzk.gps.mapper.HistoryPower.TbHistoryPowerMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.HistoryPower.TbHistoryPowerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@Service
-public class TbHistoryPowerServiceImpl extends ServiceImpl<TbHistoryPowerMapper, TbHistoryPower> implements TbHistoryPowerService {
- @Autowired
- TbHistoryPowerMapper historyPowerMapper;
- /**
- * 鏍囩鐢甸噺鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- @Override
- public ResultTable FindTagHistoryPowerInfo(TableSearchResult TableSearchResult) {
- if (TableSearchResult.getHistoryPower().getTime() == null){
- TableSearchResult.getHistoryPower().setTime(TimeUtil.GetYearMonthDay());
- }else{
- TableSearchResult.getHistoryPower().setTime(TimeUtil.ZhuanDate(TableSearchResult.getHistoryPower().getTime()));
- }
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(), TableSearchResult.getTableList().getPageSize());
- PageInfo<TbHistoryPower> info = new PageInfo<>(historyPowerMapper.FindTagHistoryPowerInfo(UserInfoUtil.getUserCompany(), TableSearchResult.getHistoryPower().getTime(),TableSearchResult.getHistoryPower().getTagid()));
- table<TbHistoryPower> achortable = new table<>(info.getList(), TableSearchResult.getTableList().getPageNum(), TableSearchResult.getTableList().getPageSize(), info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Inspection/TbNewtaskServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Inspection/TbNewtaskServiceImpl.java
deleted file mode 100644
index a33d0bd..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Inspection/TbNewtaskServiceImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.hxzk.gps.service.impl.Inspection;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Inspection.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Inspection.TbNewtask;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.mapper.Inspection.TbNewtaskMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Inspection.TbNewtaskService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@Service
-public class TbNewtaskServiceImpl extends ServiceImpl<TbNewtaskMapper, TbNewtask> implements TbNewtaskService {
-
- @Override
- public ResultTable FindNewTaskInfo(TableSearchResult TableSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- Optional.ofNullable(TableSearchResult.getNewtask().getTaskname()).ifPresent(taskname -> queryWrapper.like("taskname", taskname));
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbNewtask> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbNewtask> table = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(table, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Inspection/TbXunjianbaobiaoServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Inspection/TbXunjianbaobiaoServiceImpl.java
deleted file mode 100644
index 8288da1..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Inspection/TbXunjianbaobiaoServiceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.hxzk.gps.service.impl.Inspection;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Inspection.dto.TableSearchResult.TableBaoBiaoSearchResult;
-import com.hxzk.gps.entity.Inspection.TbNewtask;
-import com.hxzk.gps.entity.Inspection.TbXunjianbaobiao;
-import com.hxzk.gps.mapper.Inspection.TbXunjianbaobiaoMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Inspection.TbXunjianbaobiaoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@Service
-public class TbXunjianbaobiaoServiceImpl extends ServiceImpl<TbXunjianbaobiaoMapper, TbXunjianbaobiao> implements TbXunjianbaobiaoService {
- @Autowired
- TbXunjianbaobiaoMapper xunjianbaobiaoMapper;
-
- @Override
- public ResultTable FindInspectionInfo(TableBaoBiaoSearchResult TableSearchResult) {
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbXunjianbaobiao> info = new PageInfo<>(xunjianbaobiaoMapper.FindAXunJianBaoBiaoInfo(UserInfoUtil.getUserCompany(),TableSearchResult.getXunjianbaobiao().getName(),TableSearchResult.getXunjianbaobiao().getTagid()));
- table<TbXunjianbaobiao> table = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(table, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Log/TbFzlogServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Log/TbFzlogServiceImpl.java
deleted file mode 100644
index de9d8f2..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Log/TbFzlogServiceImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.hxzk.gps.service.impl.Log;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Log.dto.TableSearchResult.TableFzLogSearchResult;
-import com.hxzk.gps.entity.Log.TbFzlog;
-import com.hxzk.gps.entity.Log.TbLixianrecord0829;
-import com.hxzk.gps.mapper.Log.TbFzlogMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Log.TbFzlogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@Service
-public class TbFzlogServiceImpl extends ServiceImpl<TbFzlogMapper, TbFzlog> implements TbFzlogService {
- @Autowired
- TbFzlogMapper fzlogMapper;
- /*
- * 骞冲彴闃叉挒鏃ュ織鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- @Override
- public ResultTable FindFzLogInfo(TableFzLogSearchResult TableSearchResult) {
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbFzlog> info = new PageInfo<>(fzlogMapper.FindFzLogInfo(UserInfoUtil.getUserCompany(),TableSearchResult.getFzlog().getTagId(),TableSearchResult.getFzlog().getTagName()));
- table<TbFzlog> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Log/TbLixianrecord0829ServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Log/TbLixianrecord0829ServiceImpl.java
deleted file mode 100644
index 9df9ce5..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Log/TbLixianrecord0829ServiceImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.hxzk.gps.service.impl.Log;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Log.dto.TableSearchResult.TableliXianSearchResult;
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.hxzk.gps.entity.Log.TbLixianrecord0829;
-import com.hxzk.gps.mapper.Log.TbLixianrecord0829Mapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Log.TbLixianrecord0829Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@Service
-public class TbLixianrecord0829ServiceImpl extends ServiceImpl<TbLixianrecord0829Mapper, TbLixianrecord0829> implements TbLixianrecord0829Service {
- @Autowired
- TbLixianrecord0829Mapper lixianrecord0829Mapper;
-
- /*
- * 绂荤嚎鏃ュ織鍒楄〃鏌ヨ鎺ュ彛
- * @param TableSearchResult
- * @return ResultTable
- * */
- @Override
- public ResultTable FindLixianLogInfo(TableliXianSearchResult TableSearchResult) {
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbLixianrecord0829> info = new PageInfo<>(lixianrecord0829Mapper.FindLixianLogInfo(UserInfoUtil.getUserCompany(),TableSearchResult.getLixianrecord0829().getName(),TableSearchResult.getLixianrecord0829().getTagid()));
- table<TbLixianrecord0829> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Log/TbLoginLogServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Log/TbLoginLogServiceImpl.java
deleted file mode 100644
index 6088b32..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Log/TbLoginLogServiceImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.hxzk.gps.service.impl.Log;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Log.dto.TableSearchResult.TableLoginLogSearchResult;
-import com.hxzk.gps.controller.Tag.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Inspection.TbNewtask;
-import com.hxzk.gps.entity.Log.TbLoginLog;
-import com.hxzk.gps.entity.System.TbSystemOperationLog;
-import com.hxzk.gps.mapper.Log.TbLoginLogMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Log.TbLoginLogService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-06-09
- */
-@Service
-public class TbLoginLogServiceImpl extends ServiceImpl<TbLoginLogMapper, TbLoginLog> implements TbLoginLogService {
-
- @Override
- public ResultTable FindLoginLogInfo(TableLoginLogSearchResult tableLoginLogSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- Optional.ofNullable(tableLoginLogSearchResult.getLoginLog().getName()).ifPresent(name -> queryWrapper.like("name", name));
- queryWrapper.orderByDesc("addtime");
- PageHelper.startPage(tableLoginLogSearchResult.getTableList().getPageNum(),tableLoginLogSearchResult.getTableList().getPageSize());
- PageInfo<TbLoginLog> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbLoginLog> table = new table<>(info.getList(),tableLoginLogSearchResult.getTableList().getPageNum(),tableLoginLogSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(table, MessageUtils.getMessage("Success"));
- }
-
- @Override
- public Integer add(String name, String ip, String addtime, String company) {
- TbLoginLog loginLog = new TbLoginLog();
- loginLog.setName(name);
- loginLog.setIp(ip);
- loginLog.setAddtime(addtime);
- loginLog.setCompany(company);
- return baseMapper.insert(loginLog);
- }
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Loragateway/TbLoragatewayServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Loragateway/TbLoragatewayServiceImpl.java
deleted file mode 100644
index 613c47e..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Loragateway/TbLoragatewayServiceImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.hxzk.gps.service.impl.Loragateway;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Loragateway.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Anchor.TbAchor;
-import com.hxzk.gps.entity.Loragateway.TbLoragateway;
-import com.hxzk.gps.mapper.Loragateway.TbLoragatewayMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Loragateway.TbLoragatewayService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@Service
-public class TbLoragatewayServiceImpl extends ServiceImpl<TbLoragatewayMapper, TbLoragateway> implements TbLoragatewayService {
-
- @Override
- public ResultTable FindLoragatewayInfo(TableSearchResult TableSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- Optional.ofNullable(TableSearchResult.getLoragateway().getLoragwid()).ifPresent(loragwid -> queryWrapper.like("loragwid", loragwid));
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbLoragateway> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbLoragateway> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Mac/TbMacServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Mac/TbMacServiceImpl.java
deleted file mode 100644
index aa21d8d..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Mac/TbMacServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.hxzk.gps.service.impl.Mac;
-
-import com.hxzk.gps.entity.Mac.TbMac;
-import com.hxzk.gps.mapper.Mac.TbMacMapper;
-import com.hxzk.gps.service.Mac.TbMacService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-01
- */
-@Service
-public class TbMacServiceImpl extends ServiceImpl<TbMacMapper, TbMac> implements TbMacService {
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Map/TbMapServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Map/TbMapServiceImpl.java
deleted file mode 100644
index 13d8263..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Map/TbMapServiceImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.hxzk.gps.service.impl.Map;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Map.Results.MapResult;
-import com.hxzk.gps.controller.Map.Results.MarsResult;
-import com.hxzk.gps.controller.Map.dto.MapTreeTableDto;
-import com.hxzk.gps.entity.Department.TbDepartMentIcon;
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.hxzk.gps.entity.Map.TbMap;
-import com.hxzk.gps.mapper.Map.TbMapMapper;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Map.TbMapService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.AuToComplete;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.TableDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@Service
-public class TbMapServiceImpl extends ServiceImpl<TbMapMapper, TbMap> implements TbMapService {
- @Autowired
- TbCompanyService companyService;
- @Value("${upload.dir-IP}")
- private String uploadIp;
- @Override
- public MapResult FindMapInfo(MapTreeTableDto mapTreeTableDto) {
- // 寮�鍚垎椤�
- PageHelper.startPage(mapTreeTableDto.getPageNum(), mapTreeTableDto.getPageSize());
- // 鍒涘缓鏌ヨ鍖呰鍣�
- QueryWrapper queryWrapperCompany = new QueryWrapper<>();
- // 澶勭悊閮ㄩ棬 ID 涓虹┖鐨勬儏鍐�
- if ("".equals(mapTreeTableDto.getDepartmentId())) {
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- queryWrapperCompany.in("companyid", list);
- } else {
- queryWrapperCompany.eq("companyid", mapTreeTableDto.getDepartmentId());
- }
- // 鏌ヨ浜岀淮鍦板浘鍒楄〃
- List<TbMap> maps = baseMapper.selectList(queryWrapperCompany);
- PageInfo<TbMap> info = new PageInfo<>(maps);
- // 灏佽瑙掕壊鍒楄〃
- TableDto tableDto = new TableDto(info.getList(), info.getPageNum(), info.getPageSize(), info.getTotal());
- // 鑾峰彇鎴愬姛娑堟伅
- String message = MessageUtils.getMessage("Success");
- // 杩斿洖缁撴灉
- return new MapResult(200, message, tableDto, mapTreeTableDto.getPageNum(), mapTreeTableDto.getPageSize(), info.getTotal());
- }
-
- @Override
- public List<AuToComplete> FindUserCompanyMap() {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- List<TbMap> mapList = baseMapper.selectList(queryWrapper);
- List<AuToComplete> addCustomerList = mapList.stream()
- .map(map -> {
- String[] mapname = map.getMapname().split("\\.");
- AuToComplete addCustomer = new AuToComplete();
- addCustomer.setLabel(mapname[0]);
- addCustomer.setValue(mapname[0]);
- return addCustomer;
- })
- .collect(Collectors.toList());
- return addCustomerList;
- }
-
- @Override
- public Map<String, String> FindUserCompanyMapSelect() {
- QueryWrapper<TbMap> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- List<TbMap> mapList = baseMapper.selectList(queryWrapper);
-
- // 鍒涘缓Map锛宬ey涓哄湴鍥惧悕绉帮紝value涓哄浘鐗嘦RL
- Map<String, String> resultMap = new HashMap<>();
- for (TbMap map : mapList) {
- String[] mapname = map.getMapname().split("\\.");
- resultMap.put(mapname[0], uploadIp+"Map/"+mapname[0]+"."+mapname[1]); // 鍋囪TbMap鏈塯etMapUrl鏂规硶
- }
-
- return resultMap;
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Map/TbMarsHomesetServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Map/TbMarsHomesetServiceImpl.java
deleted file mode 100644
index 63d5236..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Map/TbMarsHomesetServiceImpl.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.hxzk.gps.service.impl.Map;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.DepartMent.Results.DepartMentIconResult;
-import com.hxzk.gps.controller.Map.Results.MarsResult;
-import com.hxzk.gps.controller.Map.dto.MarsTreeTableDto;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.entity.Department.TbDepartMentIcon;
-import com.hxzk.gps.entity.Map.TbMarsHomeset;
-import com.hxzk.gps.mapper.Map.TbMarsHomesetMapper;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Map.TbMarsHomesetService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.util.Result.TableDto;
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@Service
-public class TbMarsHomesetServiceImpl extends ServiceImpl<TbMarsHomesetMapper, TbMarsHomeset> implements TbMarsHomesetService {
- @Autowired
- TbCompanyService companyService;
-
- @Override
- public MarsResult FindMarsInfo(MarsTreeTableDto marsTreeTableDto) {
- // 寮�鍚垎椤�
- PageHelper.startPage(marsTreeTableDto.getPageNum(), marsTreeTableDto.getPageSize());
- // 鍒涘缓鏌ヨ鍖呰鍣�
- QueryWrapper queryWrapperCompany = new QueryWrapper<>();
- // 澶勭悊閮ㄩ棬 ID 涓虹┖鐨勬儏鍐�
- if ("".equals(marsTreeTableDto.getDepartmentId())) {
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- queryWrapperCompany.in("companyid", list);
- } else {
- queryWrapperCompany.eq("companyid", marsTreeTableDto.getDepartmentId());
- }
- // 鏌ヨ涓夌淮鍦板浘鍒楄〃
- List<TbMarsHomeset> marsHomesets = baseMapper.selectList(queryWrapperCompany);
- PageInfo<TbMarsHomeset> info = new PageInfo<>(marsHomesets);
- // 灏佽瑙掕壊鍒楄〃
- TableDto tableDto = new TableDto(info.getList(), info.getPageNum(), info.getPageSize(), info.getTotal());
- // 鑾峰彇鎴愬姛娑堟伅
- String message = MessageUtils.getMessage("Success");
- // 杩斿洖缁撴灉
- return new MarsResult(200, message, tableDto, marsTreeTableDto.getPageNum(), marsTreeTableDto.getPageSize(), info.getTotal());
- }
-
- @Override
- public ReturnMessage update(TbMarsHomeset marsHomeset) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
-
- QueryWrapper queryWrapper = new QueryWrapper<>();
- if (marsHomeset.getId() != null){
- queryWrapper.eq("id",marsHomeset.getId());
- }
- if (marsHomeset.getCompany() ==null || marsHomeset.getCompany().equals("")){
- queryWrapper.eq("company",UserInfoUtil.getUserCompany());
- }else{
- queryWrapper.eq("company",marsHomeset.getCompany());
- }
- try {
- isSuccess= true;
- baseMapper.update(marsHomeset,queryWrapper);
- if (marsHomeset.getCompany() == null){
- marsHomeset.setCompany(String.valueOf(marsHomeset.getId()));
- }
- }catch (Exception e){
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"MapUpdate",marsHomeset.getCompany());
- }
-
- @Override
- public void InsertMarsHomeSet(String companyname,String companyId) {
- TbMarsHomeset tbMarsHomeset = new TbMarsHomeset();
- tbMarsHomeset.setDetail("1");
- tbMarsHomeset.setOfflinehide("1");
- tbMarsHomeset.setVoice("0");
- tbMarsHomeset.setShowfence("1");
- tbMarsHomeset.setShowanchor("1");
- tbMarsHomeset.setShowgateway("0");
- tbMarsHomeset.setMapposition("117.198409,39.83285");
- tbMarsHomeset.setAlt("20630804.5");
- tbMarsHomeset.setHeading("360");
- tbMarsHomeset.setPitch("-90");
- tbMarsHomeset.setNoterrain("0");
- tbMarsHomeset.setLayer("0");
- tbMarsHomeset.setImage("0");
- tbMarsHomeset.setBasemap("0");
- tbMarsHomeset.setThreemap("1");
- tbMarsHomeset.setSudu("0");
- tbMarsHomeset.setDistance("50");
- tbMarsHomeset.setTime("600");
- tbMarsHomeset.setMapcolor("#0896e2");
- tbMarsHomeset.setTracktype("鍗槦");
- tbMarsHomeset.setCompanyid(companyId);
- tbMarsHomeset.setUsername(UserInfoUtil.getUserName());
- tbMarsHomeset.setCompany(companyname);
- tbMarsHomeset.setShowmap("1");
- baseMapper.insert(tbMarsHomeset);
- }
-
- @Override
- public void DeleteMarsHomeSet(String companyname) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company",companyname);
- baseMapper.delete(queryWrapper);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Menu/MenuServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Menu/MenuServiceImpl.java
deleted file mode 100644
index a56ee58..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Menu/MenuServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.hxzk.gps.service.impl.Menu;
-
-import com.hxzk.gps.entity.Menu.Menu;
-import com.hxzk.gps.mapper.Menu.MenuMapper;
-import com.hxzk.gps.service.Menu.MenuService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-23
- */
-@Service
-public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Message/TbSendMessageHistoryServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Message/TbSendMessageHistoryServiceImpl.java
deleted file mode 100644
index 312ec89..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Message/TbSendMessageHistoryServiceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.hxzk.gps.service.impl.Message;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Message.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Attendance.TbKaoqing;
-import com.hxzk.gps.entity.Message.TbSendMessageHistory;
-import com.hxzk.gps.mapper.Message.TbSendMessageHistoryMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Message.TbSendMessageHistoryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-27
- */
-@Service
-public class TbSendMessageHistoryServiceImpl extends ServiceImpl<TbSendMessageHistoryMapper, TbSendMessageHistory> implements TbSendMessageHistoryService {
- @Autowired
- TbSendMessageHistoryMapper sendMessageHistoryMapper;
-
- @Override
- public ResultTable FindMessageInfo(TableSearchResult TableSearchResult) {
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbSendMessageHistory> info = new PageInfo<>(sendMessageHistoryMapper.FindMessageInfo(UserInfoUtil.getUserCompany(),TableSearchResult.getSendMessageHistory().getTagid(),TableSearchResult.getSendMessageHistory().getUser()));
- table<TbSendMessageHistory> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Person/TbPersonServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Person/TbPersonServiceImpl.java
deleted file mode 100644
index 645b09f..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Person/TbPersonServiceImpl.java
+++ /dev/null
@@ -1,319 +0,0 @@
-package com.hxzk.gps.service.impl.Person;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Person.Results.PersonResult;
-import com.hxzk.gps.controller.Person.dto.PersonTreeTableDto;
-import com.hxzk.gps.controller.Role.Results.RoleResult;
-import com.hxzk.gps.entity.Log.TbLoginLog;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.entity.Role.Role;
-import com.hxzk.gps.entity.System.TbSystemOperationLog;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.mapper.Person.TbPersonMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultList;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Person.TbPersonService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import com.hxzk.gps.service.Tag.TbTagService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.util.Result.TableDto;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.util.Time.TimeUtil;
-import com.hxzk.gps.util.UDP.UDP_Person;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-16
- */
-@Service
-public class TbPersonServiceImpl extends ServiceImpl<TbPersonMapper, TbPerson> implements TbPersonService {
-
- @Autowired
- TbCompanyService companyService;
- @Autowired
- public TbSystemOperationLogService systemOperationLogService;
- @Autowired
- TbPersonMapper personMapper;
- @Autowired
- TbTagService tagService;
-
-
- /*@
- * 浜哄憳鍒楄〃淇℃伅
- * @param PersonTreeTableDto 浜哄憳鍙傛暟淇℃伅
- * @return 浜哄憳淇℃伅
- */
- @Override
- public PersonResult FindPersonInfo(PersonTreeTableDto personTreeTableDto) {
- // 鍒涘缓鏌ヨ鍖呰鍣�
- QueryWrapper<TbPerson> queryWrapper = new QueryWrapper<>();
-
- // 澶勭悊閮ㄩ棬 ID 涓虹┖鐨勬儏鍐�
- if (StringUtils.isEmpty(personTreeTableDto.getDepartmentId())) {
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- queryWrapper.in("companyid", list);
- } else {
- List<Long> list = companyService.getChildCompanyIds(personTreeTableDto.getDepartmentId());
- queryWrapper.in("companyid", list);
- }
-
- // 澶勭悊妯$硦鏌ヨ鏉′欢 - 浣跨敤宓屽鏉′欢
- if (StringUtils.isNotEmpty(personTreeTableDto.getPTagid())) {
- queryWrapper.and(wrapper -> wrapper
- .like("p_tagid", personTreeTableDto.getPTagid())
- .or()
- .like("p_name", personTreeTableDto.getPTagid()));
- }
-
- Optional.ofNullable(personTreeTableDto.getPdepartment()).ifPresent(department ->
- queryWrapper.like("p_department", department));
- Optional.ofNullable(personTreeTableDto.getPonline()).ifPresent(online ->
- queryWrapper.like("p_online", online));
-
- // 鎺掑簭
- queryWrapper.orderByDesc("p_tagid");
-
- // 鏂瑰紡1锛氫娇鐢≒ageHelper鐨勫垎椤垫煡璇�
- Page<TbPerson> page = PageHelper.startPage(personTreeTableDto.getPageNum(), personTreeTableDto.getPageSize())
- .doSelectPage(() -> baseMapper.selectList(queryWrapper));
-
- // 鏂瑰紡2锛氭垨鑰呬娇鐢╯electPage鏂规硶锛堝鏋滀綘鐨刡aseMapper缁ф壙鑷狿ageMapper锛�
- // Page<TbPerson> page = new Page<>(personTreeTableDto.getPageNum(), personTreeTableDto.getPageSize());
- // baseMapper.selectPage(page, queryWrapper);
-
- // 灏佽瑙掕壊鍒楄〃
- TableDto tableDto = new TableDto(page.getResult(), page.getPageNum(), page.getPageSize(), page.getTotal());
-
- // 鑾峰彇鎴愬姛娑堟伅
- String message = MessageUtils.getMessage("Success");
-
- // 杩斿洖缁撴灉
- return new PersonResult(200, message, tableDto);
- }
-
- @Override
- public PersonResult FindCarInfo(PersonTreeTableDto personTreeTableDto) {
- // 鍒涘缓鏌ヨ鍖呰鍣�
- QueryWrapper<TbPerson> queryWrapper = new QueryWrapper<>();
-
- // 澶勭悊閮ㄩ棬 ID 涓虹┖鐨勬儏鍐�
- if (StringUtils.isEmpty(personTreeTableDto.getDepartmentId())) {
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- queryWrapper.in("companyid", list);
- } else {
- List<Long> list = companyService.getChildCompanyIds(personTreeTableDto.getDepartmentId());
- queryWrapper.in("companyid", list);
- }
-
- // 澶勭悊妯$硦鏌ヨ鏉′欢
- Optional.ofNullable(personTreeTableDto.getPName()).ifPresent(pname ->
- queryWrapper.like("p_name", pname));
- Optional.ofNullable(personTreeTableDto.getPTagid()).ifPresent(ptagid ->
- queryWrapper.like("p_tagid", ptagid));
-
- // 娣诲姞杞﹁締鏍囩鏉′欢
- queryWrapper.and(wrapper ->
- wrapper.eq("baoliu19", MessageUtils.getMessage("CarTag"))
- .or()
- .eq("baoliu19", MessageUtils.getMessage("CarTag1")));
-
- // 浣跨敤PageHelper杩涜鍒嗛〉鏌ヨ
- Page<TbPerson> page = PageHelper.startPage(personTreeTableDto.getPageNum(), personTreeTableDto.getPageSize())
- .doSelectPage(() -> baseMapper.selectList(queryWrapper));
-
- // 灏佽瑙掕壊鍒楄〃
- TableDto tableDto = new TableDto(page.getResult(), page.getPageNum(), page.getPageSize(), page.getTotal());
-
- // 鑾峰彇鎴愬姛娑堟伅
- String message = MessageUtils.getMessage("Success");
-
- // 杩斿洖缁撴灉 - 淇鏋勯�犲嚱鏁板弬鏁�
- return new PersonResult(200, message, tableDto);
- }
-
- @Override
- public PersonResult FindMaterialsInfo(PersonTreeTableDto personTreeTableDto) {
- // 鍒涘缓鏌ヨ鍖呰鍣�
- QueryWrapper<TbPerson> queryWrapper = new QueryWrapper<>();
-
- // 澶勭悊閮ㄩ棬 ID 涓虹┖鐨勬儏鍐�
- if (StringUtils.isEmpty(personTreeTableDto.getDepartmentId())) {
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- queryWrapper.in("companyid", list);
- } else {
- List<Long> list = companyService.getChildCompanyIds(personTreeTableDto.getDepartmentId());
- queryWrapper.in("companyid", list);
- }
-
- // 澶勭悊妯$硦鏌ヨ鏉′欢
- Optional.ofNullable(personTreeTableDto.getPName()).ifPresent(pname ->
- queryWrapper.like("p_name", pname));
- Optional.ofNullable(personTreeTableDto.getPTagid()).ifPresent(ptagid ->
- queryWrapper.like("p_tagid", ptagid));
-
- // 娣诲姞鐗╄祫鏍囩鏉′欢
- queryWrapper.eq("baoliu19", MessageUtils.getMessage("MaterialsTag"));
-
- // 浣跨敤PageHelper杩涜鍒嗛〉鏌ヨ
- Page<TbPerson> page = PageHelper.startPage(personTreeTableDto.getPageNum(), personTreeTableDto.getPageSize())
- .doSelectPage(() -> baseMapper.selectList(queryWrapper));
-
- // 灏佽瑙掕壊鍒楄〃
- TableDto tableDto = new TableDto(page.getResult(), page.getPageNum(), page.getPageSize(), page.getTotal());
-
- // 鑾峰彇鎴愬姛娑堟伅
- String message = MessageUtils.getMessage("Success");
-
- // 杩斿洖缁撴灉 - 淇鏋勯�犲嚱鏁板弬鏁�
- return new PersonResult(200, message, tableDto);
- }
- @Override
- public ResultList PersonPosition() {
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- list.add(Long.valueOf(UserInfoUtil.getUserCompanyId()));
- List<TbPerson> info = personMapper.PersonPosition(list);
- return ListDataResult.resultListSuccess(info,MessageUtils.getMessage("Success"));
- }
-
- @Override
- public ResultList RealPosition() {
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- list.add(Long.valueOf(UserInfoUtil.getUserCompanyId()));
- List<TbPerson> info = personMapper.RealPosition(list);
- return ListDataResult.resultListSuccess(info,MessageUtils.getMessage("Success"));
- }
-
- @Override
- public ResultList RealPosition2D() {
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- list.add(Long.valueOf(UserInfoUtil.getUserCompanyId()));
- List<TbPerson> info = personMapper.RealPosition2D(list);
- return ListDataResult.resultListSuccess(info,MessageUtils.getMessage("Success"));
- }
-
- @Override
- public ReturnMessage add(TbPerson person) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("p_tagid",person.getPTagid());
- try {
- person.setPAddtiem(TimeUtil.GetTime());
- baseMapper.update(person,queryWrapper);
- UpdateTagCompany(person);
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_Person.UpPersonToCs(person);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"PersonAdd",person.getPTagid());
- }
-
-
-
- @Override
- public ReturnMessage update(TbPerson person) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
-
- if(person.getPTagid().contains(",")){
- String TagList =person.getPTagid();
- for (int i = 0; i <TagList.split(",").length; i++){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("p_tagid",TagList.split(",")[i]);
- try {
- person.setPTagid(TagList.split(",")[i]);
- person.setPAddtiem(TimeUtil.GetTime());
- baseMapper.update(person,queryWrapper);
- UpdateTagCompany(person);
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_Person.UpPersonToCs(person);
- isSuccess = true;
- }catch (Exception e){
-
- }
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"PersonUpdate",TagList);
- }else{
- //
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("p_tagid",person.getPTagid());
- try {
- person.setPAddtiem(TimeUtil.GetTime());
- baseMapper.update(person,queryWrapper);
- UpdateTagCompany(person);
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_Person.UpPersonToCs(person);
- isSuccess = true;
- }catch (Exception e){
-
- }
- }
-
- return SystemLogUtil.handleUpdateResult(isSuccess,"PersonUpdate",person.getPTagid());
-
- }
-
- @Override
- public ReturnMessage delete(TbPerson person) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("p_tagid",person.getPTagid());
- try {
- baseMapper.delete(queryWrapper);
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_Person.DePersonToCs(person);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleDeleteResult(isSuccess,"PersonDelete",person.getPTagid());
- }
-
- /*
- * 淇敼璁惧鎵�灞炲叕鍙�
- * */
- private void UpdateTagCompany(TbPerson person) {
- QueryWrapper queryWrapperTag = new QueryWrapper<>();
- queryWrapperTag.eq("tag_id", person.getPTagid());
- TbTag tag = new TbTag();
- tag.setCompany(person.getCompany());
- tag.setTagId(person.getPTagid());
- tagService.getBaseMapper().update(tag, queryWrapperTag);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Role/RoleMenuServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Role/RoleMenuServiceImpl.java
deleted file mode 100644
index 1e5c718..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Role/RoleMenuServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.hxzk.gps.service.impl.Role;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.entity.Role.Rolemenu;
-import com.hxzk.gps.mapper.Role.RoleMenuMapper;
-import com.hxzk.gps.service.Role.RoleMenuService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class RoleMenuServiceImpl extends ServiceImpl<RoleMenuMapper, Rolemenu> implements RoleMenuService {
- @Override
- public List<Rolemenu> FindRoleMenu(Integer roleId) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("role_id", roleId);
- queryWrapper.ne("isall",0);
- return baseMapper.selectList(queryWrapper);
- }
-
- @Override
- public void deleteRoleMenu(Integer roleId) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("role_id", roleId);
- baseMapper.delete(queryWrapper);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Role/RoleServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Role/RoleServiceImpl.java
deleted file mode 100644
index f92b031..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Role/RoleServiceImpl.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package com.hxzk.gps.service.impl.Role;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Role.Results.AddRoleDto;
-import com.hxzk.gps.controller.Role.Results.RoleCompanyList;
-import com.hxzk.gps.controller.Role.Results.RoleResult;
-import com.hxzk.gps.controller.Role.Results.RoleTreeTableDto;
-import com.hxzk.gps.entity.Role.Rolemenu;
-import com.hxzk.gps.entity.System.TbSystemOperationLog;
-import com.hxzk.gps.mapper.Role.RoleMenuMapper;
-import com.hxzk.gps.service.Role.RoleMenuService;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.util.Result.TableDto;
-import com.hxzk.gps.entity.Role.Role;
-import com.hxzk.gps.mapper.Role.RoleMapper;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Role.IRoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.controller.User.Results.UserTreeTableDto;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.util.Time.TimeUtil;
-import com.sun.org.apache.bcel.internal.generic.PUSH;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.sql.Time;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-08
- */
-@Service
-public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IRoleService {
- /*
- * Service娉ㄥ叆
- * */
- @Autowired
- private TbCompanyService companyService;
- @Autowired
- private RoleMenuService roleMenuService;
- @Autowired
- public TbSystemOperationLogService systemOperationLogService;
-
-
- /*
- * 瑙掕壊鍒楄〃淇℃伅
- * */
- @Override
- public RoleResult FindRoleInfo(RoleTreeTableDto roleTreeTableDto) {
- // 鍒涘缓鏌ヨ鍖呰鍣�
- QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
-
- // 澶勭悊閮ㄩ棬 ID 涓虹┖鐨勬儏鍐�
- if (StringUtils.isEmpty(roleTreeTableDto.getDepartmentId())) {
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- queryWrapper.in("companyid", list);
- } else {
- queryWrapper.eq("companyid", roleTreeTableDto.getDepartmentId());
- }
-
- // 澶勭悊瑙掕壊鍚嶇О鏌ヨ鏉′欢
- Optional.ofNullable(roleTreeTableDto.getName()).ifPresent(name ->
- queryWrapper.like("name", name));
-
- // 浣跨敤PageHelper杩涜鍒嗛〉鏌ヨ
- Page<Role> page = PageHelper.startPage(roleTreeTableDto.getPageNum(), roleTreeTableDto.getPageSize())
- .doSelectPage(() -> baseMapper.selectList(queryWrapper));
-
- // 灏佽瑙掕壊鍒楄〃
- TableDto tableDto = new TableDto(page.getResult(), page.getPageNum(), page.getPageSize(), page.getTotal());
-
- // 鑾峰彇鎴愬姛娑堟伅
- String message = MessageUtils.getMessage("Success");
-
- // 杩斿洖缁撴灉 - 鏍规嵁RoleResult鐨勬瀯閫犲嚱鏁拌皟鏁村弬鏁�
- return new RoleResult(200, message, tableDto);
- }
-
-
- /*
- * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鍏徃鎵�灞炶鑹蹭俊鎭垪琛�
- * @return 鐧诲綍鐢ㄦ埛鍏徃瑙掕壊淇℃伅鍒楄〃 lable -- value
- * */
- @Override
- public List<RoleCompanyList> FindCompanyRole(String companyid) {
- // 浣跨敤娉涘瀷鎸囧畾 QueryWrapper 鐨勭被鍨�
- if (companyid.isEmpty()){
- companyid = UserInfoUtil.getUserCompanyId();
- }
- QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("companyid", companyid);
- // 鏌ヨ瑙掕壊鍒楄〃
- List<Role> roleList = baseMapper.selectList(queryWrapper);
- // 浣跨敤 Stream API 绠�鍖栧惊鐜搷浣�
- return roleList.stream()
- .map(role -> {
- RoleCompanyList roleLists = new RoleCompanyList();
- roleLists.setLabel(role.getName());
- roleLists.setValue(String.valueOf(role.getId()));
- return roleLists;
- })
- .collect(Collectors.toList());
- }
-
- /*
- * 鑾峰彇瑙掕壊鍚嶇О
- * @return 瑙掕壊鍚嶇О
- * @param id 瑙掕壊ID
- * */
- @Override
- public String FindRoleName(String id) {
- QueryWrapper<Role> queryWrapper = new QueryWrapper();
- queryWrapper.eq("id", id).or().eq("name", id);
- return baseMapper.selectOne(queryWrapper).getName();
-
- }
-
- @Override
- public ReturnMessage add(AddRoleDto addRoleDto) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("name", addRoleDto.getName());
- queryWrapper.eq("companyid", addRoleDto.getCompanyid());
- //鏌ラ噸
- Integer count = Math.toIntExact(baseMapper.selectCount(queryWrapper));
- if (count > 0) {
- //瀛樺湪
- return ReturnMessage.ReturnMessageError("RoleRepeat");
- } else {
- Role role = new Role();
- role.setName(addRoleDto.getName());
- if (addRoleDto.getCompanyid().equals("")){
- addRoleDto.setCompanyid(UserInfoUtil.getUserCompanyId());
- }
- role.setCompanyname(companyService.getChildCompanyName(addRoleDto.getCompanyid()));
- role.setUsername(UserInfoUtil.getUserName());
- role.setCompanyid(addRoleDto.getCompanyid());
- role.setAddtime(TimeUtil.GetTime());
- if (addRoleDto.isAddrole()){
- role.setAddrole(true);
- }
- if (addRoleDto.isEditrole()){
- role.setEditrole(true);
- }
- if (addRoleDto.isDeleterole()){
- role.setDeleterole(true);
- }
- baseMapper.insert(role);
- isSuccess = true;
- //娣诲姞瑙掕壊鎴愬姛
- QueryWrapper queryWrapperselect = new QueryWrapper<>();
- queryWrapperselect.eq("name", role.getName());
- queryWrapperselect.eq("companyname", role.getCompanyname());
- //鏌ヨ瑙掕壊ID
- Role role1 = baseMapper.selectOne(queryWrapperselect);
- Integer roleId = role1.getId();
- Map<Integer,Integer> map = new HashMap<>();
- for (int k = 0; k < addRoleDto.getRolist().size();k++){
- map.put(addRoleDto.getRolist().get(k).getId(),addRoleDto.getRolist().get(k).getId());
- }
- for (int i = 0; i < addRoleDto.getRolist().size();i++){
- if (addRoleDto.getRolist().get(i).getParentId() != null){
- if (!map.containsKey(addRoleDto.getRolist().get(i).getParentId())) {
- //涓嶅寘鍚�
- Rolemenu rolemenu = new Rolemenu();
- rolemenu.setRoleId(roleId);
- rolemenu.setMenuId(addRoleDto.getRolist().get(i).getParentId());
- rolemenu.setIsall(0);
- roleMenuService.save(rolemenu);
- map.put(addRoleDto.getRolist().get(i).getParentId(),addRoleDto.getRolist().get(i).getParentId());
- }
- }
- Rolemenu rolemenu = new Rolemenu();
- rolemenu.setRoleId(roleId);
- rolemenu.setMenuId(addRoleDto.getRolist().get(i).getId());
- roleMenuService.save(rolemenu);
- }
- return SystemLogUtil.handleAddResult(isSuccess,"RoleAdd",role.getName());
-
- }
- }
-
- @Override
- public ReturnMessage update(AddRoleDto role) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- Role role1 = new Role();
- role1.setId(role.getId());
- role1.setName(role.getName());
- role1.setAddtime(TimeUtil.GetTime());
- role1.setAddrole(role.isAddrole());
- role1.setEditrole(role.isEditrole());
- role1.setDeleterole(role.isDeleterole());
- role1.setCompanyname(role.getCompanyname());
- role1.setUsername(UserInfoUtil.getUserName());
- role1.setCompanyid(role.getCompanyid());
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", role.getId());
- try {
- baseMapper.update(role1, queryWrapper);
- roleMenuService.deleteRoleMenu(role.getId());
- Integer roleId = role1.getId();
- Map<Integer,Integer> map = new HashMap<>();
- for (int k = 0; k < role.getRolist().size();k++){
- map.put(role.getRolist().get(k).getId(),role.getRolist().get(k).getId());
- }
- for (int i = 0; i < role.getRolist().size();i++){
- if (role.getRolist().get(i).getParentId() != null){
- if (!map.containsKey(role.getRolist().get(i).getParentId())) {
- //涓嶅寘鍚�
- Rolemenu rolemenu = new Rolemenu();
- rolemenu.setRoleId(roleId);
- rolemenu.setMenuId(role.getRolist().get(i).getParentId());
- rolemenu.setIsall(0);
- roleMenuService.save(rolemenu);
- map.put(role.getRolist().get(i).getParentId(),role.getRolist().get(i).getParentId());
- }
- }
- Rolemenu rolemenu = new Rolemenu();
- rolemenu.setRoleId(roleId);
- rolemenu.setMenuId(role.getRolist().get(i).getId());
- roleMenuService.save(rolemenu);
- }
- isSuccess = true;
- }catch (Exception e){
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"RoleUpdate",role.getName());
-
- }
-
- @Override
- public ReturnMessage delete(AddRoleDto role) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", role.getId());
- roleMenuService.deleteRoleMenu(role.getId());
- try {
- baseMapper.delete(queryWrapper);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleDeleteResult(isSuccess,"RoleDelete",role.getName());
-
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/RtkAnchor/TbRtkanchorServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/RtkAnchor/TbRtkanchorServiceImpl.java
deleted file mode 100644
index 60d3a9c..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/RtkAnchor/TbRtkanchorServiceImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.hxzk.gps.service.impl.RtkAnchor;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.RtkAnchor.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Anchor.TbAchor;
-import com.hxzk.gps.entity.RtkAnchor.TbRtkanchor;
-import com.hxzk.gps.mapper.RtkAnchor.TbRtkanchorMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.RtkAnchor.TbRtkanchorService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-22
- */
-@Service
-public class TbRtkanchorServiceImpl extends ServiceImpl<TbRtkanchorMapper, TbRtkanchor> implements TbRtkanchorService {
-
- @Override
- public ResultTable FindRtkAnchorInfo(TableSearchResult TableSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- Optional.ofNullable(TableSearchResult.getRtkanchor().getAcid()).ifPresent(acid -> queryWrapper.like("acid", acid));
- PageInfo<TbAchor> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbAchor> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Sms/TbSmsLogServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Sms/TbSmsLogServiceImpl.java
deleted file mode 100644
index 36f4691..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Sms/TbSmsLogServiceImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.hxzk.gps.service.impl.Sms;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Sms.TbSmsLog;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.mapper.Sms.TbSmsLogMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Sms.TbSmsLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@Service
-public class TbSmsLogServiceImpl extends ServiceImpl<TbSmsLogMapper, TbSmsLog> implements TbSmsLogService {
-
- @Override
- public ResultTable FindSMSLogInfo(TableSearchResult TableSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbSmsLog> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbSmsLog> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Sms/TbSmsReminderServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Sms/TbSmsReminderServiceImpl.java
deleted file mode 100644
index 0bd46fc..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Sms/TbSmsReminderServiceImpl.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.hxzk.gps.service.impl.Sms;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.SMS.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Sms.TbSmsReminder;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.mapper.Sms.TbSmsReminderMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Sms.TbSmsReminderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.util.Time.TimeUtil;
-import com.hxzk.gps.util.UDP.UDP_Person;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@Service
-public class TbSmsReminderServiceImpl extends ServiceImpl<TbSmsReminderMapper, TbSmsReminder> implements TbSmsReminderService {
-
- @Override
- public ResultTable FindSMSreminderInfo(TableSearchResult TableSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- Optional.ofNullable(TableSearchResult.getSmsReminder().getName()).ifPresent(name -> queryWrapper.like("name", name));
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbSmsReminder> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbSmsReminder> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-
- @Override
- public ReturnMessage add(TbSmsReminder smsReminder) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- smsReminder.setAddtime(TimeUtil.GetTime());
- smsReminder.setCompany(UserInfoUtil.getUserCompany());
- baseMapper.insert(smsReminder);
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleAddResult(isSuccess,"SMSAdd",smsReminder.getSmstype());
- }
-
- @Override
- public ReturnMessage update(TbSmsReminder smsReminder) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",smsReminder.getId());
- try {
- smsReminder.setAddtime(TimeUtil.GetTime());
- baseMapper.update(smsReminder,queryWrapper);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"SMSUpdate",smsReminder.getSmstype());
- }
-
- @Override
- public ReturnMessage delete(TbSmsReminder smsReminder) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",smsReminder.getId());
- try {
- baseMapper.delete(queryWrapper);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleDeleteResult(isSuccess,"SMSDelete",smsReminder.getSmstype());
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Sms/TbVoicetipServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Sms/TbVoicetipServiceImpl.java
deleted file mode 100644
index d025d19..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Sms/TbVoicetipServiceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.hxzk.gps.service.impl.Sms;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Sms.TbVoicetip;
-import com.hxzk.gps.mapper.Sms.TbVoicetipMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Sms.TbVoicetipService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@Service
-public class TbVoicetipServiceImpl extends ServiceImpl<TbVoicetipMapper, TbVoicetip> implements TbVoicetipService {
-
- @Override
- public ResultTable FindMsgReminderInfo(TableSearchResult TableSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbVoicetip> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbVoicetip> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/System/TbSystemOperationLogServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/System/TbSystemOperationLogServiceImpl.java
deleted file mode 100644
index 048829d..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/System/TbSystemOperationLogServiceImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.hxzk.gps.service.impl.System;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-
-import com.hxzk.gps.controller.System.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.System.TbSystemOperationLog;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.mapper.System.TbSystemOperationLogMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-12
- */
-@Service
-public class TbSystemOperationLogServiceImpl extends ServiceImpl<TbSystemOperationLogMapper, TbSystemOperationLog> implements TbSystemOperationLogService {
- private static final Logger log = LoggerFactory.getLogger(TbSystemOperationLogService.class);
- /*
- * 娣诲姞鎿嶄綔鏃ュ織
- * */
- @Override
- public Integer add(TbSystemOperationLog systemOperationLog) {
- log.info("娣诲姞绯荤粺鎿嶄綔鏃ュ織锛屽弬鏁帮細鎿嶄綔浜哄悕绉帮細{}, 鎿嶄綔鍐呭锛歿}, 鎿嶄綔鏃堕棿锛歿}, 鎿嶄綔绫诲瀷锛歿}, IP锛歿}, 鎵�灞炲叕鍙革細{},鏁版嵁鏍囪瘑锛歿}", systemOperationLog.getName(), systemOperationLog.getContent(), systemOperationLog.getTime(), systemOperationLog.getType(), systemOperationLog.getIp(), systemOperationLog.getCompany(),systemOperationLog.getSign());
- return baseMapper.insert(systemOperationLog);
- }
-
- @Override
- public ResultTable FindSystemLogInfo(TableSearchResult TableSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- Optional.ofNullable(TableSearchResult.getSystemlog().getName()).ifPresent(data -> {
- queryWrapper.like("name", TableSearchResult.getSystemlog().getName());
- });
- Optional.ofNullable(TableSearchResult.getSystemlog().getSign()).ifPresent(data -> {
- queryWrapper.like("sign", TableSearchResult.getSystemlog().getSign());
- });
- queryWrapper.orderByDesc("time");
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbSystemOperationLog> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbSystemOperationLog> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
-
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Tag/TbTagServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Tag/TbTagServiceImpl.java
deleted file mode 100644
index d70374a..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Tag/TbTagServiceImpl.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.hxzk.gps.service.impl.Tag;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Tag.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Anchor.TbAchor;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.mapper.Tag.TbTagMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Tag.TbTagService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.util.Time.TimeUtil;
-import com.hxzk.gps.util.UDP.TagSetting.UDP_TAG;
-import com.hxzk.gps.util.UDP.UDP_Person;
-import com.hxzk.gps.util.UDP.UDP_Tag;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-22
- */
-@Service
-public class TbTagServiceImpl extends ServiceImpl<TbTagMapper, TbTag> implements TbTagService {
- @Autowired
- TbCompanyService companyService;
- @Override
- public ResultTable FindTagInfo(TableSearchResult TableSearchResult) {
- //鑾峰彇瀛愮骇鍏徃鍚嶇О
- List<Long> companyname = companyService.getChildCompanyNames(UserInfoUtil.getUserCompany());
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.in("company", companyname);
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- Optional.ofNullable(TableSearchResult.getTag().getTagId()).ifPresent(tagid -> queryWrapper.like("tag_id", tagid));
- Optional.ofNullable(TableSearchResult.getTag().getType()).ifPresent(type -> queryWrapper.like("type", type));
- PageInfo<TbTag> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbTag> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-
- @Override
- public ReturnMessage add(TbTag tag) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_Tag.AddTagToCs(tag);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleAddResult(isSuccess,"DeviceAdd",tag.getTagId());
- }
-
- @Override
- public ReturnMessage update(TbTag tag) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_Tag.UpTagToCs(tag);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"DeviceUpdate",tag.getTagId());
- }
-
- @Override
- public ReturnMessage delete(TbTag tag) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_Tag.DeTagToCs(tag);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleDeleteResult(isSuccess,"DeviceDelete",tag.getTagId());
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/ThreeModel/TbThreemodelServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/ThreeModel/TbThreemodelServiceImpl.java
deleted file mode 100644
index a8fb971..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/ThreeModel/TbThreemodelServiceImpl.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.hxzk.gps.service.impl.ThreeModel;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Map.Results.MarsResult;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.controller.ThreeModel.Results.ThreeModelResult;
-import com.hxzk.gps.controller.ThreeModel.deo.ThreeModelDeo;
-import com.hxzk.gps.entity.Company.TbCompany;
-import com.hxzk.gps.entity.Map.TbMarsHomeset;
-import com.hxzk.gps.entity.ThreeModel.TbThreemodel;
-import com.hxzk.gps.mapper.ThreeModel.TbThreemodelMapper;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.ThreeModel.TbThreemodelService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.util.Result.TableDto;
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-09-03
- */
-@Service
-public class TbThreemodelServiceImpl extends ServiceImpl<TbThreemodelMapper, TbThreemodel> implements TbThreemodelService {
- @Autowired
- TbCompanyService companyService;
- @Value("${upload.dir-Map-Three}")
- private String dirMapThree;
- @Override
- public ThreeModelResult FindThreemodel(ThreeModelDeo threeModelDeo) {
- // 寮�鍚垎椤�
- PageHelper.startPage(threeModelDeo.getPageNum(), threeModelDeo.getPageSize());
- // 鍒涘缓鏌ヨ鍖呰鍣�
- QueryWrapper queryWrapperCompany = new QueryWrapper<>();
- // 澶勭悊閮ㄩ棬 ID 涓虹┖鐨勬儏鍐�
- if ("".equals(threeModelDeo.getDepartmentId())) {
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- queryWrapperCompany.in("companyid", list);
- } else {
- List<Long> list = companyService.getChildCompanyIds(threeModelDeo.getDepartmentId());
- queryWrapperCompany.in("companyid", list);
- }
- // 鏌ヨ涓夌淮鍦板浘鍒楄〃
- List<TbThreemodel> Threemodel = baseMapper.selectList(queryWrapperCompany);
- PageInfo<TbThreemodel> info = new PageInfo<>(Threemodel);
- // 灏佽瑙掕壊鍒楄〃
- TableDto tableDto = new TableDto(info.getList(), info.getPageNum(), info.getPageSize(), info.getTotal());
- // 鑾峰彇鎴愬姛娑堟伅
- String message = MessageUtils.getMessage("Success");
- // 杩斿洖缁撴灉
- return new ThreeModelResult(200, message, tableDto);
- }
-
- @Override
- public ReturnMessage add(TbThreemodel tbThreemodel) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
-
- try {
- // 妫�鏌ユ槸鍚﹀凡瀛樺湪鐩稿悓鍏徃ID鐨勮褰�
- QueryWrapper<TbThreemodel> checkWrapper = new QueryWrapper<>();
- checkWrapper.eq("filename", tbThreemodel.getFilename());
- if (baseMapper.selectCount(checkWrapper) > 0) {
- return ReturnMessage.ReturnMessageError("ThreeModelExist");
- }
- if(tbThreemodel.getCompanyid() == null){
- tbThreemodel.setCompanyid(UserInfoUtil.getUserCompanyId());
- }
- TbCompany company = companyService.getBaseMapper().selectOne(new QueryWrapper<TbCompany>().eq("id",tbThreemodel.getCompanyid()));
- tbThreemodel.setCompany(company.getSystemname());
- tbThreemodel.setAddtime(TimeUtil.GetTime());
- isSuccess = true;
- baseMapper.insert(tbThreemodel);
- String fileAdress = dirMapThree+tbThreemodel.getCompany()+"_"+tbThreemodel.getFilename();
- // 鍒涘缓鏂囦欢澶�
- File folder = new File(fileAdress);
- if (!folder.exists()) {
- folder.mkdirs();
- }
- } catch (Exception e) {
- log.error("娣诲姞涓夌淮妯″瀷澶辫触");
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"MapModelAdd",tbThreemodel.getCompany());
- }
-
- @Override
- public ReturnMessage update(TbThreemodel tbThreemodel) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
-
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",tbThreemodel.getId());
- try {
- isSuccess= true;
- baseMapper.update(tbThreemodel,queryWrapper);
- }catch (Exception e){
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"MapModelUpdate",tbThreemodel.getCompany());
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Track/TbGpsTrackServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Track/TbGpsTrackServiceImpl.java
deleted file mode 100644
index c32122c..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Track/TbGpsTrackServiceImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.hxzk.gps.service.impl.Track;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Track.dto.TableSearchResult.TableGpsTrackSearchResult;
-import com.hxzk.gps.entity.Track.TbGpsTrack;
-import com.hxzk.gps.entity.Track.TbTrack;
-import com.hxzk.gps.mapper.Track.TbGpsTrackMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Track.TbGpsTrackService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-26
- */
-@Service
-public class TbGpsTrackServiceImpl extends ServiceImpl<TbGpsTrackMapper, TbGpsTrack> implements TbGpsTrackService {
- @Autowired
- TbGpsTrackMapper tbTrackMapper;
- @Override
- public ResultTable FindGpsTrackInfo(TableGpsTrackSearchResult TableSearchResult) {
- if (TableSearchResult.getGpsTrack().getAddtime() == null){
- TableSearchResult.getGpsTrack().setAddtime(TimeUtil.GetYearMonthDay());
- }else{
- TableSearchResult.getGpsTrack().setAddtime(TimeUtil.ZhuanDate(TableSearchResult.getGpsTrack().getAddtime()));
- }
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbGpsTrack> info = new PageInfo<>(tbTrackMapper.FindGpsTrackInfo(UserInfoUtil.getUserCompany(), TableSearchResult.getGpsTrack().getAddtime(),TableSearchResult.getGpsTrack().getTagid()));
- table<TbGpsTrack> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Track/TbTrackServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Track/TbTrackServiceImpl.java
deleted file mode 100644
index 3992744..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Track/TbTrackServiceImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.hxzk.gps.service.impl.Track;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.Track.dto.TrackView;
-import com.hxzk.gps.controller.Track.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.Loragateway.TbLoragateway;
-import com.hxzk.gps.entity.Map.TbMarsHomeset;
-import com.hxzk.gps.entity.Track.TbGpsTrack;
-import com.hxzk.gps.entity.Track.TbTrack;
-import com.hxzk.gps.mapper.Track.TbTrackMapper;
-import com.hxzk.gps.result.*;
-import com.hxzk.gps.service.Map.TbMarsHomesetService;
-import com.hxzk.gps.service.Track.TbTrackService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.GnssToXY;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Service;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-26
- */
-@Service
-public class TbTrackServiceImpl extends ServiceImpl<TbTrackMapper, TbTrack> implements TbTrackService {
- @Autowired
- TbTrackMapper tbTrackMapper;
- @Autowired
- TbMarsHomesetService marsHomesetService;
-
- @Override
- public ResultTable FindTrackInfo(TableSearchResult TableSearchResult) {
- if (TableSearchResult.getTrack().getTime() == null){
- TableSearchResult.getTrack().setTime(TimeUtil.GetYearMonthDay());
- }else{
- TableSearchResult.getTrack().setTime(TimeUtil.ZhuanDate(TableSearchResult.getTrack().getTime()));
- }
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbTrack> info = new PageInfo<>(tbTrackMapper.FindTrackInfo(UserInfoUtil.getUserCompany(), TableSearchResult.getTrack().getTime(),TableSearchResult.getTrack().getTagid()));
- table<TbTrack> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-
- @Override
- public TrackResultTable FindTrackView(TrackView trackView) throws ParseException {
- SimpleDateFormat outputFormat = new SimpleDateFormat("yyyyMMdd");
- String trackTime = TimeUtil.ZhuanDate(trackView.time[0]);
- Date date2 = outputFormat.parse(trackTime);
- String trackTimes = outputFormat.format(date2);
- String startTime = TimeUtil.ZhuanTime(trackView.time[0]);
- String stopTime = TimeUtil.ZhuanTime(trackView.time[1]);
- TbTrack track = new TbTrack();
- track.setTime(trackTimes);
- track.setBaoliu1(startTime);
- track.setBaoliu2(stopTime);
- track.setTagid(trackView.getTagid());
- List<TbTrack> tbTracks = tbTrackMapper.FindTrackView(track);
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company",UserInfoUtil.getUserCompany());
- TbMarsHomeset marsHomeset = marsHomesetService.getBaseMapper().selectOne(queryWrapper);
- Integer distance = Integer.valueOf(marsHomeset.getDistance());
- if (tbTracks.size() > 0){
- Tracktable table =new Tracktable(addHashMap(tbTracks,distance*100, Integer.parseInt(marsHomeset.getTime())),1,tbTracks.size(),Long.valueOf(tbTracks.size()));
- return ListDataResult.resultTrackTableSuccess(table, MessageUtils.getMessage("Success"));
- }else {
- return ListDataResult.resultTrackTableerror(MessageUtils.getMessage("TrackNull"));
- }
- }
-
-
- private Map<Integer, List<TbTrack>> addHashMap(List<TbTrack> list, int pointDis, int timeC) {
- String latPast = "";
- String lonPast = "";
- String timePast = "";
- Map<Integer, List<TbTrack>> map = new HashMap<>();
- List<TbTrack> vector = null; // 鐢ㄤ簬瀛樺偍褰撳墠缁勭殑鏁版嵁
- int key = 0;
- // 閬嶅巻鎵�鏈夌殑鐐规暟鎹�
-
- for (TbTrack info : list) {
- String lat = info.getBaoliu2(); // 绾害
- String lon = info.getBaoliu3(); // 缁忓害
- String time = info.getTime(); // 鏃堕棿
- // 濡傛灉褰撳墠鐐逛笌鍓嶄竴涓偣鍦ㄩ槇鍊艰寖鍥村唴锛岀户缁坊鍔犲埌褰撳墠缁�
- if (latPast.length()>0 && timePast.length()>0) {
- int distance = GnssToXY.distance(lon, lat, lonPast, latPast); // 璁$畻璺濈
- long cha = calculateTimeDifferenceInSeconds(timePast, time); // 璁$畻鏃堕棿宸�
- if (distance < pointDis && cha < timeC) {
- vector.add(info); // 娣诲姞褰撳墠鐐瑰埌褰撳墠缁�
- } else if (cha > timeC){
- // 濡傛灉褰撳墠鐐硅秴鍑烘椂闂撮槇鍊硷紝瀛樺偍褰撳墠缁勶紝骞跺紑濮嬫柊鐨勭粍
- vector = new ArrayList<>(); // 鍒涘缓鏂扮殑缁�
- map.put(key, vector);
- vector.add(info); // 娣诲姞褰撳墠鐐瑰埌鏂扮粍
- key++;
- }else if (distance > pointDis && cha < timeC){
- vector = new ArrayList<>(); // 鍒涘缓鏂扮殑缁�
- map.put(key, vector);
- vector.add(info); // 娣诲姞褰撳墠鐐瑰埌鏂扮粍
- key++;
-// System.out.println(lat+"----"+lon+"|"+latPast+"----"+lonPast+"--"+i++);
-
- }
- } else {
- // 绗竴涓偣锛屽垵濮嬪寲涓�涓柊缁�
- vector = new ArrayList<>();
- vector.add(info);
- map.put(key, vector);
- key++;
-
- }
- latPast = lat;
- lonPast = lon;
- timePast = time;
- }
- return map;
- }
-
- // 灏佽鎴愪竴涓柟娉曪紝璁$畻鏃堕棿宸紙浠ョ涓哄崟浣嶏級
- public static long calculateTimeDifferenceInSeconds(String timeStr1, String timeStr2) {
- // 瀹氫箟鏃ユ湡鏃堕棿鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
-
- // 灏嗗瓧绗︿覆杞崲涓� LocalDateTime 瀵硅薄
- LocalDateTime time1 = LocalDateTime.parse(timeStr1, formatter);
- LocalDateTime time2 = LocalDateTime.parse(timeStr2, formatter);
-
- // 璁$畻鏃堕棿宸�
- Duration duration = Duration.between(time1, time2);
-
- // 杩斿洖鏃堕棿宸殑绉掓暟
- return duration.getSeconds();
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/User/TbUserServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/User/TbUserServiceImpl.java
deleted file mode 100644
index d8f16e0..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/User/TbUserServiceImpl.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package com.hxzk.gps.service.impl.User;
-
-import cn.dev33.satoken.stp.StpUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.User.Results.*;
-import com.hxzk.gps.entity.Fence.TbFence;
-import com.hxzk.gps.entity.Role.Role;
-import com.hxzk.gps.entity.System.TbSystemOperationLog;
-import com.hxzk.gps.entity.User.TbUser;
-import com.hxzk.gps.entity.User.dto.LoginResult;
-import com.hxzk.gps.mapper.User.TbUserMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Log.TbLoginLogService;
-import com.hxzk.gps.service.Role.IRoleService;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import com.hxzk.gps.service.User.TbUserService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import com.hxzk.gps.util.Result.TableDto;
-import com.hxzk.gps.controller.User.Results.UserTreeTableDto;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.util.*;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-04-17
- */
-@Service
-public class TbUserServiceImpl extends ServiceImpl<TbUserMapper, TbUser> implements TbUserService {
- /*
- * Service娉ㄥ叆
- * */
- @Autowired
- private TbUserMapper userMapper;
- @Autowired
- private TbCompanyService companyService;
- @Autowired
- private IRoleService roleService;
- @Autowired
- private TbSystemOperationLogService systemOperationLogService;
- @Autowired
- TbLoginLogService loginLogService;
-
- /*
- * 鐢ㄦ埛鐧诲綍
- * */
- @Override
-
- public LoginResult Login(String username, String password,String status,String clientIp) {
-
- String message = "";
- if (status.equals("3")){
- message = MessageUtils.getMessage("Loginfreeze");
- return new LoginResult(201, message, "000");
- }
- try {
- QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("username", username);
- queryWrapper.eq("password", password);
- TbUser tbUser = baseMapper.selectOne(queryWrapper);
-
- if (tbUser == null) {
- message = MessageUtils.getMessage("LoginNull");
- return new LoginResult(201, message, "000");
- } else {
- if (tbUser.getStatus().equals("1")){
- message = MessageUtils.getMessage("Loginfreeze");
- return new LoginResult(201, message, "000");
- }
- message = MessageUtils.getMessage("LoginSuccess");
- StpUtil.login(tbUser.getUsername()+"-"+tbUser.getJuesename()+"-"+tbUser.getCompanyname()+"-"+tbUser.getCompanyid());
- TbUser user = new TbUser();
- user.setId(tbUser.getId());
- user.setStatus(StpUtil.getTokenValue());
- userMapper.updateById(user);
- loginLogService.add(tbUser.getUsername(),clientIp,TimeUtil.GetTime(),tbUser.getCompanyname());
- return new LoginResult(200, message, StpUtil.getTokenInfo().getTokenValue());
- }
- } catch (Exception e) {
- message = MessageUtils.getMessage("LoginError");
- return new LoginResult(201, message, "555");
- }
- }
-
- @Override
- public LoginResult phoneLogin(String phone, String clientIp) {
- QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("phone", phone);
- TbUser tbUser = baseMapper.selectOne(queryWrapper);
- StpUtil.login(tbUser.getUsername()+"-"+tbUser.getJuesename()+"-"+tbUser.getCompanyname()+"-"+tbUser.getCompanyid());
- loginLogService.add(tbUser.getUsername(),clientIp,TimeUtil.GetTime(),tbUser.getCompanyname());
- return new LoginResult(200, MessageUtils.getMessage("LoginSuccess"), StpUtil.getTokenInfo().getTokenValue());
- }
-
-
- /*
- * 鐢ㄦ埛鑿滃崟瀵艰埅
- * */
- @Override
- public MenuListResult UserMenu() {
- String username = UserInfoUtil.getUserName();
- List<MenuList> menus = userMapper.FindUserRoleList(username);
- Map<Integer, MenuList> menuMap = new HashMap<>();
- for (MenuList menu : menus) {
- menuMap.put(menu.getId(), menu);
- }
- MenuList root = new MenuList(); // Dummy root to collect all top-level menus
- for (MenuList menu : menus) {
- if (menu.getParentId() == null) {
- root.getChildren().add(menu);
- } else {
- menuMap.get(menu.getParentId()).getChildren().add(menu);
- }
- }
- String message = MessageUtils.getMessage("Success");
- return new MenuListResult(200,message,root.getChildren());
- }
-
-
- /*
- * 鐢ㄦ埛鍒楄〃淇℃伅
- * */
-
- @Override
- public UserResult FindUserInfo(UserTreeTableDto userTreeTableDto) {
- // 鍒涘缓鏌ヨ鍖呰鍣�
- QueryWrapper<TbUser> queryWrapper = new QueryWrapper<>();
-
- // 澶勭悊閮ㄩ棬 ID 涓虹┖鐨勬儏鍐�
- if (StringUtils.isEmpty(userTreeTableDto.getDepartmentId())) {
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- queryWrapper.in("companyid", list);
- } else {
- queryWrapper.eq("companyid", userTreeTableDto.getDepartmentId());
- }
-
- // 澶勭悊鐢ㄦ埛鍚嶆煡璇㈡潯浠�
- Optional.ofNullable(userTreeTableDto.getUsername())
- .ifPresent(username -> queryWrapper.like("username", username));
-
- // 鐩存帴浣跨敤鍒嗛〉鏌ヨ
- Page<TbUser> page = PageHelper.startPage(userTreeTableDto.getPageNum(), userTreeTableDto.getPageSize())
- .doSelectPage(() -> baseMapper.selectList(queryWrapper));
-
- // 灏佽缁撴灉
- TableDto tableDto = new TableDto(page.getResult(), page.getPageNum(), page.getPageSize(), page.getTotal());
- String message = MessageUtils.getMessage("Success");
-
- return new UserResult(200, message, tableDto);
- }
- /*
- * 鑿滃崟鍒楄〃淇℃伅
- * */
- @Override
- public MenuListResult MenuAll() {
- List<MenuListDtoAll> menus = userMapper.FindUserRoleListAll();
- Map<Integer, MenuListDtoAll> menuMap = new HashMap<>();
- for (MenuListDtoAll menu : menus) {
- menuMap.put(menu.getId(), menu);
- }
- MenuListDtoAll root = new MenuListDtoAll(); // Dummy root to collect all top-level menus
- for (MenuListDtoAll menu : menus) {
- if (menu.getParentId() == null) {
- root.getChildren().add(menu);
- } else {
- menuMap.get(menu.getParentId()).getChildren().add(menu);
- }
- }
- return new MenuListResult(200,"鎴愬姛",root.getChildren());
- }
-
- /*
- * 娣诲姞鐢ㄦ埛
- * */
- @Override
- public ReturnMessage add(TbUser user){
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- /*
- * 鍏徃ID濡傛灉涓虹┖榛樿浣跨敤褰撳墠鐧诲綍鐢ㄦ埛鍏徃鍗冲彲
- * */
- if (user.getCompanyid().equals("")){
- user.setCompanyname(companyService.getChildCompanyName(UserInfoUtil.getUserCompanyId()));
- user.setCompanyid(UserInfoUtil.getUserCompanyId());
- }else{
- user.setCompanyname(companyService.getChildCompanyName(user.getCompanyid()));
- user.setCompanyid(user.getCompanyid());
- }
- user.setJueseid(user.getJuesename());
- user.setJuesename(roleService.FindRoleName(user.getJuesename()));
- /*
- * 鏍¢獙鐢ㄦ埛鏄惁閲嶅
- * */
- if (baseMapper.selectCount(new QueryWrapper<TbUser>()
- .eq("username", user.getUsername())
- .eq("companyname", user.getCompanyname())) > 0) {
- return ReturnMessage.ReturnMessageError("UserRepeat");
- }
- try {
- // 鑻ョ敤鎴蜂笉閲嶅锛屾彃鍏ョ敤鎴峰苟杩斿洖鎴愬姛娑堟伅
- user.setTime(TimeUtil.GetTime());
- baseMapper.insert(user);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleAddResult(isSuccess,"UserAdd",user.getUsername());
-
- }
-
- @Override
- public ReturnMessage update(TbUser user) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",user.getId());
- try {
- if (user.getCompanyid().equals("")){
- user.setCompanyid(UserInfoUtil.getUserCompanyId());
- }
-
- /*
- * 鏇存柊鏃堕棿瑕嗙洊
- * */
- user.setTime(TimeUtil.GetTime());
- user.setJuesename(roleService.FindRoleName(user.getJuesename()));
- isSuccess= true;
- baseMapper.update(user,queryWrapper);
- }catch (Exception e){
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"UserUpdate",user.getUsername());
- }
-
- @Override
- public ReturnMessage delete(TbUser user) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- baseMapper.delete(new QueryWrapper<TbUser>().eq("id", user.getId()));
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleDeleteResult(isSuccess,"UserDelete",user.getUsername());
-
- }
-
-
-
- /*
- * 娣诲姞鎿嶄綔鏃ュ織
- * */
-
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Video/TbHksxtServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Video/TbHksxtServiceImpl.java
deleted file mode 100644
index fc2dd69..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Video/TbHksxtServiceImpl.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.hxzk.gps.service.impl.Video;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.controller.Video.dto.TableSearchResult.TableVideoSearchResult;
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.hxzk.gps.entity.System.TbSystemOperationLog;
-import com.hxzk.gps.entity.Video.TbHksxt;
-import com.hxzk.gps.mapper.Video.TbHksxtMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Video.TbHksxtService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-07-01
- */
-@Service
-public class TbHksxtServiceImpl extends ServiceImpl<TbHksxtMapper, TbHksxt> implements TbHksxtService {
-
- @Override
- public ResultTable FindVideoInfo(TableVideoSearchResult tableVideoSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany());
- PageHelper.startPage(tableVideoSearchResult.getTableList().getPageNum(),tableVideoSearchResult.getTableList().getPageSize());
- PageInfo<TbHksxt> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbHksxt> achortable = new table<>(info.getList(),tableVideoSearchResult.getTableList().getPageNum(),tableVideoSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
-
- }
-
- @Override
- public ReturnMessage add(TbHksxt hksxt) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- if (isHksxtRepeat(hksxt)) {
- return ReturnMessage.ReturnMessageError("HksxtRepeat");
- }
- try {
- hksxt.setCompany(UserInfoUtil.getUserCompany());
- baseMapper.insert(hksxt);
- isSuccess = true;
- }catch (Exception e){
- System.out.println(e.getMessage());
- }
- return SystemLogUtil.handleAddResult(isSuccess,"HksxtAdd",hksxt.getName());
- }
-
- @Override
- public ReturnMessage update(TbHksxt hksxt) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- if (isUpHksxtRepeat(hksxt)) {
- return ReturnMessage.ReturnMessageError("HksxtRepeat");
- }
- try {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",hksxt.getId());
- baseMapper.update(hksxt,queryWrapper);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"HksxtUpdate",hksxt.getName());
- }
-
- @Override
- public ReturnMessage delete(TbHksxt hksxt) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",hksxt.getId());
- baseMapper.delete(queryWrapper);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleDeleteResult(isSuccess,"HksxtDelete",hksxt.getName());
- }
-
-
- private boolean isHksxtRepeat(TbHksxt hksxt) {
- QueryWrapper<TbHksxt> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany())
- .eq("name", hksxt.getName());
- return baseMapper.selectCount(queryWrapper) > 0;
- }
- private boolean isUpHksxtRepeat(TbHksxt hksxt) {
- QueryWrapper<TbHksxt> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company", UserInfoUtil.getUserCompany())
- .eq("name", hksxt.getName());
-
- return baseMapper.selectCount(queryWrapper) > 1;
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/WarnTongJi/WarnTongjiCompanyServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/WarnTongJi/WarnTongjiCompanyServiceImpl.java
deleted file mode 100644
index 2273b73..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/WarnTongJi/WarnTongjiCompanyServiceImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.hxzk.gps.service.impl.WarnTongJi;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.controller.Warning.dto.TableSearchResult.TableSearchResult;
-import com.hxzk.gps.entity.WarnTongJi.WarnTongjiCompany;
-import com.hxzk.gps.entity.Warning.TbWarning;
-import com.hxzk.gps.mapper.WarnTongJi.WarnTongjiCompanyMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.WarnTongJi.WarnTongjiCompanyService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-06-09
- */
-@Service
-public class WarnTongjiCompanyServiceImpl extends ServiceImpl<WarnTongjiCompanyMapper, WarnTongjiCompany> implements WarnTongjiCompanyService {
-
- @Override
- public ResultTable FindWarningTongJiInfo(TableSearchResult TableSearchResult) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company",UserInfoUtil.getUserCompany());
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbWarning> info = new PageInfo<>(baseMapper.selectList(queryWrapper));
- table<TbWarning> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-
- @Override
- public Integer InsertWarnTongJi(String company) {
- Integer count = 0;
- for (WarnType warnType : WarnType.values()) {
- WarnTongjiCompany warnTongjiCompany = new WarnTongjiCompany();
- warnTongjiCompany.setCompany(company);
- warnTongjiCompany.setTitle(warnType.getTitle());
- switch (warnType.getTitle()){
- case "SOS鎶ヨ":
- warnTongjiCompany.setIsshow(1);
- break;
- case "鑱氶泦鎶ヨ":
- warnTongjiCompany.setIsshow(1);
- break;
- case "瓒婄晫鎶ヨ":
- warnTongjiCompany.setIsshow(1);
- break;
- case "杩涘叆鎶ヨ":
- warnTongjiCompany.setIsshow(1);
- break;
- case "绂荤嚎浜哄憳":
- warnTongjiCompany.setIsshow(1);
- break;
- case "鍦ㄧ嚎浜哄憳":
- warnTongjiCompany.setIsshow(1);
- break;
- case "鍦ㄧ嚎杞﹁締":
- warnTongjiCompany.setIsshow(1);
- break;
- }
- warnTongjiCompany.setDanwei(warnType.getDanwei());
- warnTongjiCompany.setAddtime(warnType.getAddtime());
- warnTongjiCompany.setIcon(warnType.getIcon());
- baseMapper.insert(warnTongjiCompany);
- count++;
- }
- return count;
- }
-
- @Override
- public ReturnMessage update(WarnTongjiCompany warnTongjiCompany) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",warnTongjiCompany.getId());
- try {
- isSuccess= true;
- baseMapper.update(warnTongjiCompany,queryWrapper);
- }catch (Exception e){
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"WarnTongJiUpdate",warnTongjiCompany.getTitle());
- }
-
- @Override
- public List<WarnTongjiCompany> FindDayCountInfo() {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company",UserInfoUtil.getUserCompany());
- queryWrapper.eq("isshow",1);
- List<WarnTongjiCompany> warnTongjis = baseMapper.selectList(queryWrapper);
- return warnTongjis;
- }
-
-
- enum WarnType {
- STATIC_ALARM("闈欐鎶ヨ", "鏉�", TimeUtil.GetTime(),"jingzhibudong.png"),
- SOS_ALARM("SOS鎶ヨ", "浜�",TimeUtil.GetTime(),"sosimage.png"),
- FALL_ALARM("璺岃惤鎶ヨ", "涓�",TimeUtil.GetTime(),"dieluo.png"),
- PERSONNEL_SHORTAGE_ALARM("缂哄憳鎶ヨ", "鏉�",TimeUtil.GetTime(),"queyuan.png"),
- OVERCROWDED_ALARM("瓒呭憳鎶ヨ", "鏉�",TimeUtil.GetTime(),"chaoyuan.png"),
- GATHERING_ALARM("鑱氶泦鎶ヨ", "鏉�",TimeUtil.GetTime(),"jujiimage.png"),
- BOUNDARY_ALARM("瓒婄晫鎶ヨ", "鏉�",TimeUtil.GetTime(),"yujie.png"),
- ENTER_ALARM("杩涘叆鎶ヨ", "鏉�",TimeUtil.GetTime(),"jinruimage.png"),
- LOW_BATTERY_ALARM("浣庣數鎶ヨ", "鏉�",TimeUtil.GetTime(),"lowpoer.png"),
- OFFLINE_BASE_STATION("绂荤嚎鍩虹珯", "鏉�",TimeUtil.GetTime(),"lixianjizhan.png"),
- OFFLINE_PERSONNEL("绂荤嚎浜哄憳", "浜�",TimeUtil.GetTime(),"lixianimage.png"),
- OFFLINE_SUPPLIES("绂荤嚎鐗╄祫", "涓�",TimeUtil.GetTime(),"wuzilixian.png"),
- OFFLINE_VEHICLE("绂荤嚎杞﹁締", "杈�",TimeUtil.GetTime(),"lixiancheliang.png"),
- ONLINE_PERSONNEL("鍦ㄧ嚎浜哄憳", "浜�",TimeUtil.GetTime(),"zaixian.png"),
- ONLINE_BASE_STATION("鍦ㄧ嚎鍩虹珯", "鏉�",TimeUtil.GetTime(),"zaixianjizhan.png"),
- MESSAGE_STATISTICS("鎶ユ枃缁熻", "鏉�",TimeUtil.GetTime(),"baowentongji.png"),
- ONLINE_VEHICLE("鍦ㄧ嚎杞﹁締", "杈�",TimeUtil.GetTime(),"zaixiancar.png");
-
- private final String title;
- private final String danwei;
- private final String addtime;
- private final String icon;
-
- WarnType(String title, String danwei, String addtime, String icon) {
- this.title = title;
- this.danwei = danwei;
- this.addtime = addtime;
- this.icon = icon;
- }
-
- public String getTitle() {
- return title;
- }
-
- public String getDanwei() {
- return danwei;
- }
- public String getAddtime() {
- return addtime;
- }
- public String getIcon() {
- return icon;
- }
-
- }
-}
diff --git a/src/main/java/com/hxzk/gps/service/impl/Warning/TbWarningServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Warning/TbWarningServiceImpl.java
deleted file mode 100644
index b0e5759..0000000
--- a/src/main/java/com/hxzk/gps/service/impl/Warning/TbWarningServiceImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.hxzk.gps.service.impl.Warning;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.controller.Warning.dto.TableSearchResult.TableSearchResult;
-
-import com.hxzk.gps.entity.Warning.TbWarning;
-import com.hxzk.gps.mapper.Company.TbCompanyMapper;
-import com.hxzk.gps.mapper.Warning.TbWarningMapper;
-import com.hxzk.gps.result.ListDataResult;
-import com.hxzk.gps.result.ResultTable;
-import com.hxzk.gps.result.table;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.service.Warning.TbWarningService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Result.ReturnMessage;
-
-
-
-import com.hxzk.gps.util.Time.TimeUtil;
-import com.hxzk.gps.util.UDP.UDP_Warning;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * 鍛婅绠$悊
- * </p>
- *
- * @author YuZhiTong
- * @since 2025-05-23
- */
-@Service
-public class TbWarningServiceImpl extends ServiceImpl<TbWarningMapper, TbWarning> implements TbWarningService {
-
- @Autowired
- TbCompanyService companyService;
- @Autowired
- TbWarningMapper warningMapper;
-
- @Override
- public ResultTable FindWarningInfo(TableSearchResult TableSearchResult) {
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- PageInfo<TbWarning> info = new PageInfo<>(warningMapper.FindWarningInfo(UserInfoUtil.getUserCompany(),TableSearchResult.getWarning().getObjectid(),TableSearchResult.getWarning().getBaoliu10(),TableSearchResult.getWarning().getType()));
- table<TbWarning> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-
- @Override
- public ResultTable FindWarningUntreated(TableSearchResult TableSearchResult) {
- PageHelper.startPage(TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize());
- List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
- PageInfo<TbWarning> info = new PageInfo<>(warningMapper.FindWarningUntreated(list,MessageUtils.getMessage("UnHandle")));
- table<TbWarning> achortable = new table<>(info.getList(),TableSearchResult.getTableList().getPageNum(),TableSearchResult.getTableList().getPageSize(),info.getTotal());
- return ListDataResult.resultTableSuccess(achortable, MessageUtils.getMessage("Success"));
- }
-
- @Override
- public ReturnMessage AllHandle() {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- QueryWrapper queryWrapper = new QueryWrapper<>();
- try {
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_Warning.AllHandle();
- TbWarning tbWarning = new TbWarning();
- tbWarning.setStatus(MessageUtils.getMessage("Handle"));
- baseMapper.update(tbWarning,queryWrapper);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"HandleWarning",MessageUtils.getMessage("ALL"));
- }
-
- @Override
- public ReturnMessage Handle(TbWarning warning) {
- /*
- 澹版槑鎿嶄綔鐘舵��
- * */
- boolean isSuccess = false;
- try {
- /*
- 鍙戦�佹寚浠ゅ埌CS
- * */
- UDP_Warning.Handle(warning);
- QueryWrapper queryWrapper =new QueryWrapper<>();
- queryWrapper.eq("id",warning.getId());
- warning.setStatus(MessageUtils.getMessage("Handle"));
- warning.setBaoliu6(TimeUtil.GetTime());
- warning.setBaoliu5(UserInfoUtil.getUserName());
- baseMapper.update(warning,queryWrapper);
- isSuccess = true;
- }catch (Exception e){
-
- }
- return SystemLogUtil.handleUpdateResult(isSuccess,"HandleWarning",warning.getObjectid());
- }
-}
diff --git a/src/main/java/com/hxzk/gps/util/AES/AES.java b/src/main/java/com/hxzk/gps/util/AES/AES.java
deleted file mode 100644
index 75f67e7..0000000
--- a/src/main/java/com/hxzk/gps/util/AES/AES.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.hxzk.gps.util.AES;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-import java.nio.charset.StandardCharsets;
-import java.security.SecureRandom;
-import java.util.Base64;
-
-public class AES {
-
- private static final String ALGORITHM = "AES";
- private static final String TRANSFORMATION = "AES/CBC/PKCS5Padding";
- private static final String PUBLIC_KEY = "KTbVslm2mvQLoD3p";
- private static final int IV_SIZE = 16; // AES 鐨� IV 闀垮害涓� 16 瀛楄妭
-
- /**
- * 鍔犲瘑鏂规硶
- *
- * @param plainText 鏄庢枃
- * @return 鍔犲瘑鍚庣殑 Base64 缂栫爜瀛楃涓诧紝鍖呭惈 IV 鍜屽瘑鏂�
- * @throws Exception 寮傚父
- */
- public static String encrypt(String plainText) throws Exception {
- // 鐢熸垚闅忔満鐨� IV
- byte[] ivBytes = new byte[IV_SIZE];
- SecureRandom secureRandom = new SecureRandom();
- secureRandom.nextBytes(ivBytes);
- IvParameterSpec iv = new IvParameterSpec(ivBytes);
-
- byte[] keyBytes = PUBLIC_KEY.getBytes(StandardCharsets.UTF_8);
- SecretKeySpec secretKeySpec = new SecretKeySpec(keyBytes, ALGORITHM);
-
- Cipher cipher = Cipher.getInstance(TRANSFORMATION);
- cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, iv);
-
- byte[] encryptedBytes = cipher.doFinal(plainText.getBytes(StandardCharsets.UTF_8));
-
- // 灏� IV 鍜屽瘑鏂囨嫾鎺ュ湪涓�璧�
- byte[] combined = new byte[IV_SIZE + encryptedBytes.length];
- System.arraycopy(ivBytes, 0, combined, 0, IV_SIZE);
- System.arraycopy(encryptedBytes, 0, combined, IV_SIZE, encryptedBytes.length);
-
- return Base64.getEncoder().encodeToString(combined);
- }
-
- /**
- * 瑙e瘑鏂规硶
- *
- * @param encryptedText 鍔犲瘑鍚庣殑 Base64 缂栫爜瀛楃涓诧紝鍖呭惈 IV 鍜屽瘑鏂�
- * @return 瑙e瘑鍚庣殑鏄庢枃
- * @throws Exception 寮傚父
- */
- public static String decrypt(String encryptedText) throws Exception {
- // 灏嗙┖鏍兼浛鎹㈡垚 = 鍙�
- String replacedText = encryptedText.replace(" ", "+");
-
- byte[] combined = Base64.getDecoder().decode(replacedText);
-
- // 鎻愬彇 IV
- byte[] ivBytes = new byte[IV_SIZE];
- System.arraycopy(combined, 0, ivBytes, 0, IV_SIZE);
- IvParameterSpec iv = new IvParameterSpec(ivBytes);
-
- // 鎻愬彇瀵嗘枃
- byte[] encryptedBytes = new byte[combined.length - IV_SIZE];
- System.arraycopy(combined, IV_SIZE, encryptedBytes, 0, encryptedBytes.length);
-
- byte[] keyBytes = PUBLIC_KEY.getBytes(StandardCharsets.UTF_8);
- SecretKeySpec secretKeySpec = new SecretKeySpec(keyBytes, ALGORITHM);
-
- Cipher cipher = Cipher.getInstance(TRANSFORMATION);
- cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, iv);
-
- byte[] decryptedBytes = cipher.doFinal(encryptedBytes);
- return new String(decryptedBytes, StandardCharsets.UTF_8);
- }
-
- public static void main(String[] args) {
- try {
- // 妯℃嫙浠庤姹備腑鑾峰彇鐨勫弬鏁�
- String param1 = "szhang";
- String param2 = "SZhang13439350593";
-
- // 澶氭鍔犲瘑鐩稿悓鐨勫弬鏁�
-
- String encryptedParam1 = encrypt(param1);
- String encryptedParam2 = encrypt(param2);
- System.out.println("鍔犲瘑鍚庣殑 username: " + encryptedParam1);
- System.out.println("鍔犲瘑鍚庣殑 password: " + encryptedParam2);
-
- // 瑙e瘑鍙傛暟
- String decryptedParam1 = decrypt(encryptedParam1);
- String decryptedParam2 = decrypt(encryptedParam2);
- System.out.println("瑙e瘑鍚庣殑 username: " + decryptedParam1);
- System.out.println("瑙e瘑鍚庣殑 password: " + decryptedParam2);
-
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/util/AuToComplete.java b/src/main/java/com/hxzk/gps/util/AuToComplete.java
deleted file mode 100644
index e1c933b..0000000
--- a/src/main/java/com/hxzk/gps/util/AuToComplete.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.hxzk.gps.util;
-
-import lombok.Data;
-
-@Data
-public class AuToComplete {
- private String value;
- private String link;
- private String label;
-}
diff --git a/src/main/java/com/hxzk/gps/util/CodeGenerator/CodeGenerator.java b/src/main/java/com/hxzk/gps/util/CodeGenerator/CodeGenerator.java
deleted file mode 100644
index c87709e..0000000
--- a/src/main/java/com/hxzk/gps/util/CodeGenerator/CodeGenerator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.hxzk.gps.util.CodeGenerator;
-
-import com.baomidou.mybatisplus.generator.FastAutoGenerator;
-import com.baomidou.mybatisplus.generator.config.OutputFile;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-public class CodeGenerator {
- public static void main(String[] args) {
- // 鏁版嵁搴撹繛鎺ヤ俊鎭�
- String url = "jdbc:mysql://localhost:3306/hxzkuwb?useSSL=false&serverTimezone=Asia/Shanghai";
- String username = "root";
- String password = "hxzk20151102";
-
- // 鑷畾涔� mapper.xml 鐨勮緭鍑鸿矾寰�
- Map<OutputFile, String> pathInfo = new HashMap<>();
- pathInfo.put(OutputFile.xml, "src/main/resources/mapper/ThreeModel");
-
- FastAutoGenerator.create(url, username, password)
- .globalConfig(builder -> {
- // 璁剧疆浣滆��
- builder.author("YuZhiTong")
- // 绂佹瑕嗙洊宸插瓨鍦ㄧ殑鏂囦欢
- .fileOverride()
- // 杈撳嚭鐩綍锛岃繖閲岃缃负椤圭洰鏍圭洰褰曚笅鐨� temp 鐩綍锛屽叾浠栨枃浠朵細鐢熸垚鍒拌鐩綍涓嬶紝mapper.xml 浼氭寜鐓ц嚜瀹氫箟璺緞鐢熸垚
- .outputDir("src\\main\\java");
- })
- .packageConfig(builder -> {
- // 璁剧疆鐖跺寘鍚�
- builder.parent("com.hxzk")
- // 璁剧疆妯″潡鍚�
- .moduleName("gps")
- .entity("entity.ThreeModel")
- .service("service.ThreeModel")
- .serviceImpl("service.impl.ThreeModel")
- .mapper("mapper.ThreeModel")
- // 鑷畾涔夎矾寰勪俊鎭�
- .pathInfo(pathInfo);
- })
- .strategyConfig(builder -> {
- // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- builder.addInclude(Collections.singletonList("tb_threemodel"))
- // 璁剧疆杩囨护琛ㄥ墠缂�
- .addTablePrefix("t_", "c_");
- })
- .templateEngine(new FreemarkerTemplateEngine())
- .execute();
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/util/GetUser/UserInfoUtil.java b/src/main/java/com/hxzk/gps/util/GetUser/UserInfoUtil.java
deleted file mode 100644
index fbdd78d..0000000
--- a/src/main/java/com/hxzk/gps/util/GetUser/UserInfoUtil.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.hxzk.gps.util.GetUser;
-
-import cn.dev33.satoken.stp.StpUtil;
-
-import java.util.Optional;
-
-// 瀹氫箟涓�涓叕鍏辩殑宸ュ叿绫�
-public class UserInfoUtil {
-
- // 绉佹湁鍖栨瀯閫犲嚱鏁帮紝闃叉瀹炰緥鍖栬宸ュ叿绫�
- private UserInfoUtil() {
- }
-
- // 鍏叡闈欐�佹柟娉曪紝鐢ㄤ簬鑾峰彇鐢ㄦ埛鍚�
- public static String getUserName() {
- String loginId = StpUtil.getLoginIdAsString();
- return splitLoginId(loginId, 0);
- }
-
- // 鍏叡闈欐�佹柟娉曪紝鐢ㄤ簬鑾峰彇鐢ㄦ埛瑙掕壊
- public static String getUserRole() {
- String loginId = StpUtil.getLoginIdAsString();
- return splitLoginId(loginId, 1);
- }
-
- // 鍏叡闈欐�佹柟娉曪紝鐢ㄤ簬鑾峰彇鐢ㄦ埛鎵�鍦ㄥ叕鍙�
- public static String getUserCompany() {
- String loginId = StpUtil.getLoginIdAsString();
- return splitLoginId(loginId, 2);
- }
-
- // 鍏叡闈欐�佹柟娉曪紝鐢ㄤ簬鑾峰彇鐢ㄦ埛鎵�鍦ㄥ叕鍙窱D
- public static String getUserCompanyId() {
- String loginId = StpUtil.getLoginIdAsString();
- return splitLoginId(loginId, 3);
- }
-
- // 灏佽涓�涓緟鍔╂柟娉曪紝鐢ㄤ簬鍒嗗壊鐧诲綍 ID 骞惰幏鍙栨寚瀹氶儴鍒�
- private static String splitLoginId(String loginId, int index) {
- String[] parts = loginId.split("-");
- return parts[index];
- }
- public static String isNullGetCompanyId(String companyid){
- return Optional.ofNullable(companyid)
- .orElse(UserInfoUtil.getUserCompanyId());
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/util/GlobalException/GlobalException.java b/src/main/java/com/hxzk/gps/util/GlobalException/GlobalException.java
deleted file mode 100644
index e23c439..0000000
--- a/src/main/java/com/hxzk/gps/util/GlobalException/GlobalException.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.hxzk.gps.util.GlobalException;
-
-import cn.dev33.satoken.exception.*;
-import cn.dev33.satoken.util.SaResult;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-
-/**
- * 鍏ㄥ眬寮傚父澶勭悊
- */
-@RestControllerAdvice
-public class GlobalException {
-
- // 鎷︽埅锛氭湭鐧诲綍寮傚父
- @ExceptionHandler(NotLoginException.class)
- public SaResult handlerException(NotLoginException e) {
-
- // 鎵撳嵃鍫嗘爤锛屼互渚涜皟璇�
-// e.printStackTrace();
- // 杩斿洖缁欏墠绔�
- return SaResult.error("鐧诲綍淇℃伅杩囨湡");
- }
-
- // 鎷︽埅锛氱己灏戞潈闄愬紓甯�
- @ExceptionHandler(NotPermissionException.class)
- public SaResult handlerException(NotPermissionException e) {
- e.printStackTrace();
- return SaResult.error("缂哄皯鏉冮檺锛�" + e.getPermission());
- }
-
- // 鎷︽埅锛氱己灏戣鑹插紓甯�
- @ExceptionHandler(NotRoleException.class)
- public SaResult handlerException(NotRoleException e) {
- e.printStackTrace();
- return SaResult.error("缂哄皯瑙掕壊锛�" + e.getRole());
- }
-
- // 鎷︽埅锛氫簩绾ц璇佹牎楠屽け璐ュ紓甯�
- @ExceptionHandler(NotSafeException.class)
- public SaResult handlerException(NotSafeException e) {
- e.printStackTrace();
- return SaResult.error("浜岀骇璁よ瘉鏍¢獙澶辫触锛�" + e.getService());
- }
-
- // 鎷︽埅锛氭湇鍔″皝绂佸紓甯�
- @ExceptionHandler(DisableServiceException.class)
- public SaResult handlerException(DisableServiceException e) {
- e.printStackTrace();
- return SaResult.error("褰撳墠璐﹀彿 " + e.getService() + " 鏈嶅姟宸茶灏佺 (level=" + e.getLevel() + ")锛�" + e.getDisableTime() + "绉掑悗瑙e皝");
- }
-
- // 鎷︽埅锛欻ttp Basic 鏍¢獙澶辫触寮傚父
- @ExceptionHandler(NotHttpBasicAuthException.class)
- public SaResult handlerException(NotHttpBasicAuthException e) {
- e.printStackTrace();
- return SaResult.error(e.getMessage());
- }
- // 鎷︽埅锛氱┖鎸囬拡寮傚父
- @ExceptionHandler(NullPointerException.class)
- public SaResult handlerException(NullPointerException e) {
- e.printStackTrace();
- return SaResult.error("绌烘暟鎹紓甯革細璇疯仈绯诲紑鍙戜汉鍛�");
- }
- // 鎷︽埅锛氬叾瀹冩墍鏈夊紓甯�
- @ExceptionHandler(Exception.class)
- public SaResult handlerException(Exception e) {
- e.printStackTrace();
- return SaResult.error("绯荤粺寮傚父锛氳鑱旂郴寮�鍙戜汉鍛�");
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/util/GnssToXY.java b/src/main/java/com/hxzk/gps/util/GnssToXY.java
deleted file mode 100644
index ce52126..0000000
--- a/src/main/java/com/hxzk/gps/util/GnssToXY.java
+++ /dev/null
@@ -1,569 +0,0 @@
-package com.hxzk.gps.util;
-
-import java.text.DecimalFormat;
-
-import static java.util.Locale.US;
-
-
-public class GnssToXY {
-
- static double a=6378.137;//鍦扮悆鍗婂緞
- static double e=0.0818192;//鍦扮悆鏇茬巼
- static double k0=0.9996;
- static double e2=e*e;//e鐨勫钩鏂�
- static double e4=e2*e2;//e鐨�4娆℃柟
- static double e6=e4*e2;//e鐨�6娆℃柟
- static double E0=500;
- static double N0=0;
- // static String floor="0";
- static double lat_a =0;//鍘熺偣鐨勭含搴�
- static double lon_a =0;//鍘熺偣鐨勭粡搴�
- static double lon_b=0;//B鐐圭粡搴�
- static double lat_b=0;//B鐐圭含搴�
- static double xa=0; //A鐐筙鍧愭爣
- static double ya=0;//A鐐筜鍧愭爣
- static double xb=0;//B鐐筙鍧愭爣
- static double yb=0;//B鐐筜鍧愭爣
- static int k=0;
- static int sizes=2;
- // static double[] xycs=null;
- // static double utme0;
- // static double utmn0;
- // static double c;
- // static double s;
- // static double t;
- // static double f;
- static DecimalFormat df = new DecimalFormat("0.0000000");
- static int baoxu=1;
-
- static {
- //Map_Dell.get_foor_xycs();
- // String ya1=Map_Dell.getAjwxy();
- // String yb1=Map_Dell.getBjwxy();
- // if(ya1 !=null && yb1 !=null) {
- // String[] A=ya1.split(";");
- // String[] B=yb1.split(";");
- // lon_a=Double.parseDouble(A[0]);//缁忓害
- // lat_a=Double.parseDouble(A[1]);//绾害
- // sizes=A.length;
- // if(A.length==4) {
- // xa=Double.parseDouble(A[2]);
- // ya=Double.parseDouble(A[3]);
- // }else if(A.length==2){
- // xa=0;
- // ya=0;
- // }
- //
- // if(B.length==4) {
- // lon_b=Double.parseDouble(B[0]);//缁忓害
- // lat_b=Double.parseDouble(B[1]);//绾害
- // xb=Double.parseDouble(B[2]);
- // yb=Double.parseDouble(B[3]);
- // xycs=initiize_ublox_AB(lat_a, lon_a,lat_b, lon_b,xb,yb);
- // if(sizes==4) {
- // xycs=initiize_ublox_AB2(lat_a, lon_a,lat_b, lon_b,xa,ya,xb,yb);
- // utme0=xycs[0];
- // utmn0=xycs[1];
- // c=xycs[2];
- // s=xycs[3];
- // t=xycs[4];
- // f=xycs[5];
- // }
- //
- // }else {
- // ShowMessage.zidingyi_24("B鐐圭粡绾害姝g‘");
- // }
- // }else {
- // ShowMessage.zidingyi_24("tb_mab瀛楁baoliu1鍜宐oaliu2涓嶈兘涓簄ull");
- // }
- //
- }
-
-
- /**閫氳繃缁忕含搴﹁幏鍙朮Y鍧愭爣*/
- public static double[] utm(double lat,double lon) {
- double[] dxy=new double[3];
-
- double zonenum1=lon/6;
- //floor鏄湴鏉跨殑鎰忔�濓紝琛ㄧず鍚戜笅鍙栨暣
- if(zonenum1>0) {
- zonenum1=Math.floor(zonenum1);
- }else {//鍚戜笂鍙栨暣
- zonenum1=Math.ceil(zonenum1);//鍚戜笂鍙栨暣
- }
-
- double Zonenum=zonenum1+31;
-
- double lambda0=((Zonenum-1)*6-180+3)*(Math.PI)/180;
-
- double phi=lat*(Math.PI)/180;
-
- double lambda=lon*(Math.PI)/180;
-
- double v=1/Math.sqrt((1-e2*Math.pow(Math.sin(phi),2)));
-
- double A=(lambda-lambda0)* Math.cos(phi);
- double A2=A*A;
- double A3=A2*A;
- double A4=A3*A;
- double A5=A4*A;
- double A6=A5*A;
-
- double T=Math.tan(phi)* Math.tan(phi);
- double T2=T*T;
-
- double C=e2* Math.cos(phi)* Math.cos(phi)/(1-e2);
- double C2=C*C;
-
- double s=(1-e2/4-3*e4/64-5*e6/256)* phi-
- (3*e2/8+3*e4/32+45*e6/1024)* Math.sin(2*phi)+
- (15*e4/256+45*e6/1024)* Math.sin(4* phi)-35*e6/3072* Math.sin(6*phi);
-
- dxy[0]=E0+k0*a*v*(A+(1-T+C)*A3/6+(5-18*T+T2)*A5/120);
-
- dxy[1]=N0+k0*a*(s+v* Math.tan(phi)*(A2/2+(5-T+9*C+4*C2)*A4/24+(61-58*T+T2)*A6/720));
- dxy[2]=Zonenum;
- return dxy;
- }
-
-
- /**
- * 灏嗗害鍒嗘牸寮忔暟鎹浆涓哄害鏍煎紡杈撳嚭
- * @param ddmm_dot_m 搴﹀垎鏍煎紡缁忕含搴︽暟鎹�
- * @return 搴︽牸寮忔暟鎹�
- */
- public static double ublox_dm2d(double ddmm_dot_m) {
- double d0=Math.floor(ddmm_dot_m/100);//鍙栨暣
- double d=d0+(ddmm_dot_m-d0*100)/60;
- return d;
- }
-
-
-
- /**灏嗗害鍒嗘牸寮忔暟鎹浆涓哄害鏍煎紡杈撳嚭*/
- public static String ublox_dm2dstr(double ddmm_dot_m) {
- double d0=Math.floor(ddmm_dot_m/100);
- double d=d0+(ddmm_dot_m-d0*100)/60;
- String a=df.format(d);
- return a;
- }
-
- /**鍒濆鍖栧師鐐逛綅缃拰鏂瑰悜
- * 杈撳嚭鍘熺偣浠ョ背涓哄崟浣嶇殑xy鍧愭爣, cos鍊�, sin鍊�*/
- public static double[] initiize_ublox_zeropoint(double lat, double lon, double th){
- double[] xycs=new double[4];
- xycs[0]=ubloxraw2xy(lat,lon)[0];
- xycs[1]=ubloxraw2xy(lat,lon)[1];
- double th1=th*Math.PI/180;//x杞翠笌姝e寳鏂瑰悜澶硅th(鍗曚綅鏄害)
- xycs[2]=Math.cos(th1);
- xycs[3]=Math.sin(th1);
- return xycs;
- }
-
- public static double[] initiize_ublox_AB(
- double lat0,
- double lon0,
- double latB,
- double lonB,
- double xB,
- double yB){
- double[] xycstf=new double[6];
- double[] a = ubloxraw2xy(lat0, lon0);
- double[] b = ubloxraw2xy(latB, lonB);
-
- double[] ab=new double[2];
- ab[0] = b[0] - a[0];
- ab[1] = b[1] - a[1];
-
- double the=Math.atan2(ab[0], ab[1]);
- double thp=Math.atan2(yB, xB);
-
- double th=the-thp;
-
- double c=Math.cos(th);
- double s=Math.sin(th);
- double th_deg=th*180/Math.PI;
-
- xycstf[0]=a[0];
- xycstf[1]=a[1];
- xycstf[2]=c;
- xycstf[3]=s;
- xycstf[4]=th_deg;
- xycstf[5]=a[2];
-
- return xycstf;
- }
-
- public static double[] initiize_ublox_AB2(
- double lat0,
- double lon0,
- double latB,
- double lonB,
- double xA1,
- double yA1,
- double xB1,
- double yB1){
- double xA=xA1/100;
- double yA=yA1/100;
- double xB=xB1/100;
- double yB=yB1/100;
-
- double[] xycstf=new double[6];
- double[] a = ubloxraw2xy(lat0, lon0);
- double[] b = ubloxraw2xy(latB, lonB);
-
- double[] ab=new double[2];
- ab[0] = b[0] - a[0];
- ab[1] = b[1] - a[1];
-
-
- double[] AB=new double[2];
- AB[0] = xB -xA;
- AB[1] = yB- yA;
-
- double the=Math.atan2(ab[0], ab[1]);
- double thp=Math.atan2(AB[1], AB[0]);
-
- double th=the-thp;
-
- double c=Math.cos(th);
- double s=Math.sin(th);
- double th_deg=th*180/Math.PI;
-
- double xap= c*yA + s*xA;
- double yap=-s*yA + c*xA;
-
- xycstf[0]=a[0]-xap;
- xycstf[1]=a[1]-yap;
- xycstf[2]=c;
- xycstf[3]=s;
- xycstf[4]=th_deg;
- xycstf[5]=a[2];
-
- return xycstf;
- }
-
-
-
-
- /**杈撳叆ublox鐨勫害鍒嗙粡绾害锛岃緭鍑簒y,鍗曚綅绫�*/
- public static double[] ubloxraw2xy(double lat, double lon) {
- double[] xy=new double[3];
- double[] dxy = utm(lat, lon);
- xy[0]= dxy[0]* 1000;
- xy[1]= dxy[1]* 1000;
- xy[2]= dxy[2];
- return xy;
-
- }
-
-
-
-
-
-
- public static double stringToDouble(String a){
- double b = Double.valueOf(a);
- DecimalFormat df = new DecimalFormat("#.0");//姝や负淇濈暀1浣嶅皬鏁帮紝鑻ユ兂淇濈暀2浣嶅皬鏁帮紝鍒欏~鍐�#.00 锛屼互姝ょ被鎺�
- String temp = df.format(b);
- b = Double.valueOf(temp);
- return b;
- }
-
-
-
- /**
- * 缁忕含搴﹁浆XY鍧愭爣
- * @param A A[0]缁忓害锛孉[1]绾害锛孉[2]x锛孉[3]y
- * @param B B[0]缁忓害锛孊[1]绾害锛孊[2]x锛孊[3]y
- * @param jd1 缁忓害
- * @param wd1 缁村害
- * @return
- */
- public static int[] gps_xy(
- String[] A,
- String[] B,
- String jd1,
- String wd1) {
-
-
- double lon_a1=Double.parseDouble(A[0]);//缁忓害
- double lat_a1=Double.parseDouble(A[1]);//绾害
- double xa1=0;
- double ya1=0;
- int size2=A.length;
- if(size2==4) {
- xa1=Double.parseDouble(A[2]);
- ya1=Double.parseDouble(A[3]);
- }
-
- double lon_b1=Double.parseDouble(B[0]);//缁忓害
- double lat_b1=Double.parseDouble(B[1]);//绾害
- double xb1=Double.parseDouble(B[2]);
- double yb1=Double.parseDouble(B[3]);
-
-
-
- double lat=Double.parseDouble(wd1);
- double lon=Double.parseDouble(jd1);
-
- int[] realxy=new int[2];
- double[] xycs=initiize_ublox_AB(lat_a1, lon_a1,lat_b1, lon_b1,xb1,yb1);
- if(size2==4) {
- xycs=initiize_ublox_AB2(lat_a1, lon_a1,lat_b1, lon_b1,xa1,ya1,xb1,yb1);
- }
-
- double x0=xycs[0];
- double y0=xycs[1];
- double c=xycs[2];
- double s=xycs[3];
-
- double[] xy=new double[2];
- double x= ubloxraw2xy(lat,lon)[0]-x0;
- double y=ubloxraw2xy(lat,lon)[1]-y0;
- xy[0] =c*x - s*y;
- xy[1] =s*x + c*y;
-
- double x1=xy[1]*100;
- double y1=xy[0]*100;
-
- realxy[0]=(int)x1;
- realxy[1]=(int)y1;
- return realxy;
-
- }
-
- /**璁$畻2涓粡绾害涔嬮棿鐨勮窛绂�*/
- public static int distance(String jd0,String wd0,String jd1,String wd1) {
- int dis=0;
- double lat_x0 =Double.parseDouble(wd0);
- //鍘熺偣鐨勭粡搴�
- double lon_y0 =Double.parseDouble(jd0);
-
- if (jd1==null||wd1==null){
-
- return 999999999;
- }
- double lat=Double.parseDouble(wd1);
- double lon=Double.parseDouble(jd1);
- double[] xycs=initiize_ublox_zeropoint(lat_x0, lon_y0,0);
-
- double x0=xycs[0];
- double y0=xycs[1];
- double c=xycs[2];
- double s=xycs[3];
-
- double[] xy=new double[2];
- double x= ubloxraw2xy(lat,lon)[0]-x0;
- double y=ubloxraw2xy(lat,lon)[1]-y0;
- xy[0] =c*x - s*y;
- xy[1] =s*x + c*y;
-
- double disd=Math.sqrt(xy[0]*xy[0]+xy[1]*xy[1])*100;
- dis=(int)disd;
- return dis;
- }
-
-
-
- /**璁$畻2涓粡绾害涔嬮棿鐨勮窛绂�*/
- public static int distance2(double lon_y0,double lat_x0,double lon,double lat) {
- int dis=0;
- double[] xycs=initiize_ublox_zeropoint(lat_x0, lon_y0,0);
-
- double x0=xycs[0];
- double y0=xycs[1];
- double c=xycs[2];
- double s=xycs[3];
-
- double[] xy=new double[2];
- double x= ubloxraw2xy(lat,lon)[0]-x0;
- double y=ubloxraw2xy(lat,lon)[1]-y0;
- xy[0] =c*x - s*y;
- xy[1] =s*x + c*y;
-
- double disd=Math.sqrt(xy[0]*xy[0]+xy[1]*xy[1])*100;
- dis=(int)disd;
- return dis;
- }
-
-
- /**URT妯″紡涓嬬粡绾害杞琗Y*/
-
- public static int[] run_gps2xyurt(
- double lat0,
- double lon0,
- double lat,
- double lon) {
- int[] realxy=new int[2];
- double[] xycs=initiize_ublox_zeropoint(lat0, lon0,0);
- double x0=xycs[0];
- double y0=xycs[1];
- double c=xycs[2];
- double s=xycs[3];
-
- double[] xy=new double[2];
- double x= ubloxraw2xy(lat,lon)[0]-x0;
- double y=ubloxraw2xy(lat,lon)[1]-y0;
- xy[0] =c*x - s*y;
- xy[1] =s*x + c*y;
-
- double x1=xy[1]*100;
- double y1=xy[0]*100;
-
- realxy[0]=(int)x1;
- realxy[1]=(int)y1;
- return realxy;
- }
-
-
-
- /**璁$畻2涓粡绾害鐨勮窛绂�*/
- public static double disab(String jwd) {
- String[] bb=jwd.split(";");
- double jd0=Double.parseDouble(bb[1]);
- double wd0=Double.parseDouble(bb[0]);
- double jd1=Double.parseDouble(bb[3]);
- double wd1=Double.parseDouble(bb[2]);
- int[] a=run_gps2xyurt(wd0,jd0,wd1,jd1);
- double disa=a[0]*a[0]+a[1]*a[1];
- double dis=Math.sqrt(disa);
-// System.out.println(jwd+"鐨勮窛绂绘槸锛�"+dis);
- return dis;
-
- }
-
- /**灏嗗害鍒嗙鏍煎紡杞负搴︽牸寮�*/
- public static String todufen(String Du,String Fen,String Miao){
- Float strDu = Float.valueOf(Du);
- Float strFen = Float.valueOf(Fen) / 60;
- Float strMiao = Float.valueOf(Miao) / 60;
- Float dufenmiao = strDu+strFen+strMiao;
- String format = String .format(US,"%.6f", dufenmiao);
- return format;
- }
-
-
-
- /**鍙樼數绔欐ā寮忎笅缁忕含搴﹁浆XY锛岀粯鍒跺洿鏍忕涓�涓偣鍋氫负鍧愭爣鍘熺偣
- *String weidu缁忓害
- *String jingdu,
- *String gps_state 缁忓害鐘舵��*/
-
-
- /**鍙樼數绔欐ā寮忎笅纭畾鍘熺偣缁忕含搴�
- * gao 鍥存爮寮�濮嬬粯鍒舵椂鍊欑殑楂樺害*/
-
-
- public static double getLat_a() {
- return lat_a;
- }
-
-
- public static void setLat_a(double lat_a) {
- GnssToXY.lat_a = lat_a;
- }
-
-
- public static double getLon_a() {
- return lon_a;
- }
-
-
- public static void setLon_a(double lon_a) {
- GnssToXY.lon_a = lon_a;
- }
-
-
- public static double getLon_b() {
- return lon_b;
- }
-
-
- public static void setLon_b(double lon_b) {
- GnssToXY.lon_b = lon_b;
- }
-
-
- public static double getLat_b() {
- return lat_b;
- }
-
-
- public static void setLat_b(double lat_b) {
- GnssToXY.lat_b = lat_b;
- }
-
-
- public static double getXa() {
- return xa;
- }
-
-
- public static void setXa(double xa) {
- GnssToXY.xa = xa;
- }
-
-
- public static double getYa() {
- return ya;
- }
-
-
- public static void setYa(double ya) {
- GnssToXY.ya = ya;
- }
-
-
- public static double getXb() {
- return xb;
- }
-
-
- public static void setXb(double xb) {
- GnssToXY.xb = xb;
- }
-
-
- public static double getYb() {
- return yb;
- }
-
-
- public static void setYb(double yb) {
- GnssToXY.yb = yb;
- }
-
-
- // public static double getUtme0() {
- // return utme0;
- // }
- //
- //
- // public static double getC() {
- // return c;
- // }
- //
- //
- // public static double getS() {
- // return s;
- // }
- //
- //
- // public static double getT() {
- // return t;
- // }
- //
- //
- // public static double getF() {
- // return f;
- // }
- //
- //
- // public static double getUtmn0() {
- // return utmn0;
- // }
-
-
-
-}
diff --git a/src/main/java/com/hxzk/gps/util/Initializer.java b/src/main/java/com/hxzk/gps/util/Initializer.java
deleted file mode 100644
index f9d3312..0000000
--- a/src/main/java/com/hxzk/gps/util/Initializer.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.hxzk.gps.util;
-
-import com.hxzk.gps.controller.System.SystemLogUtil;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.stereotype.Component;
-
-@Component
-public class Initializer implements ApplicationListener<ContextRefreshedEvent> {
- @Autowired
- private TbSystemOperationLogService systemOperationLogService;
- @Override
- public void onApplicationEvent(ContextRefreshedEvent event) {
- SystemLogUtil.setSystemOperationLogService(systemOperationLogService);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/util/LocaleContextHolder/LocaleConfig.java b/src/main/java/com/hxzk/gps/util/LocaleContextHolder/LocaleConfig.java
deleted file mode 100644
index 216975d..0000000
--- a/src/main/java/com/hxzk/gps/util/LocaleContextHolder/LocaleConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.util.LocaleContextHolder;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
-
-import java.util.Locale;
-
-@Configuration
-public class LocaleConfig {
- private static final Logger logger = LoggerFactory.getLogger(LocaleConfig.class);
-
- // 绉婚櫎閲嶅鐨� LocaleResolver Bean 瀹氫箟锛屼娇鐢� WebConfig 涓殑瀹氫箟
- // 杩欓噷鍙互娣诲姞鍏朵粬鍥介檯鍖栫浉鍏崇殑閰嶇疆
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/util/MessageUtils/MessageUtils.java b/src/main/java/com/hxzk/gps/util/MessageUtils/MessageUtils.java
deleted file mode 100644
index 93e63f0..0000000
--- a/src/main/java/com/hxzk/gps/util/MessageUtils/MessageUtils.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.hxzk.gps.util.MessageUtils;
-
-import cn.dev33.satoken.stp.StpUtil;
-import org.springframework.context.MessageSource;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.Locale;
-
-@Component
-public class MessageUtils {
-
- private static MessageSource messageSource;
-
- // 閫氳繃鏋勯�犲嚱鏁版敞鍏� MessageSource
- public MessageUtils(MessageSource messageSource) {
- MessageUtils.messageSource = messageSource;
- }
-
- /**
- * 鑾峰彇鍥介檯鍖栨秷鎭�
- * @param code 娑堟伅浠g爜
- * @param args 娑堟伅鍙傛暟
- * @return 鍥介檯鍖栨秷鎭�
- */
- public static String getMessage(String code) {
- try {
- String saTokenLanguage = (String) StpUtil.getSession().get("user_language");
- Locale locale;
- if (saTokenLanguage.equals("zh")){
- locale = Locale.CHINA;
- }else{
- locale = Locale.US;
- }
-
- return messageSource.getMessage(code, null, locale);
- }catch (Exception e){
- return messageSource.getMessage(code, null, LocaleContextHolder.getLocale());
- }
-
-
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/util/MyBatisPlusConfig/MyBatisPlusConfig.java b/src/main/java/com/hxzk/gps/util/MyBatisPlusConfig/MyBatisPlusConfig.java
deleted file mode 100644
index 8803f42..0000000
--- a/src/main/java/com/hxzk/gps/util/MyBatisPlusConfig/MyBatisPlusConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hxzk.gps.util.MyBatisPlusConfig;
-
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class MyBatisPlusConfig {
- @Bean
- public MybatisPlusInterceptor mybatisPlusInterceptor() {
- MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
- interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
- return interceptor;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/hxzk/gps/util/Result/ReturnMessage.java b/src/main/java/com/hxzk/gps/util/Result/ReturnMessage.java
deleted file mode 100644
index 7457641..0000000
--- a/src/main/java/com/hxzk/gps/util/Result/ReturnMessage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.hxzk.gps.util.Result;
-
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ReturnMessage {
- private Integer code;
- private String msg;
-
-
-
- public ReturnMessage(int code, String msg) {
- this.msg = msg;
- this.code = code;
- }
-
- // 瀹氫箟涓�涓潤鎬佹柟娉� ReturnMessageSuccess锛岀敤浜庤繑鍥炴垚鍔熺殑娑堟伅
- public static ReturnMessage ReturnMessageSuccess(String msg) {
- // 鍒涘缓涓�涓� ReturnMessage 瀵硅薄锛岀姸鎬佺爜涓� 200 琛ㄧず鎴愬姛锛屾秷鎭�氳繃 MessageUtils 鑾峰彇
- return new ReturnMessage(200,MessageUtils.getMessage(msg));
- }
-
- // 瀹氫箟涓�涓潤鎬佹柟娉� ReturnMessageError锛岀敤浜庤繑鍥為敊璇殑娑堟伅
- public static ReturnMessage ReturnMessageError(String msg) {
- // 鍒涘缓涓�涓� ReturnMessage 瀵硅薄锛岀姸鎬佺爜涓� 500 琛ㄧず閿欒锛屾秷鎭�氳繃 MessageUtils 鑾峰彇
- return new ReturnMessage(500, MessageUtils.getMessage(msg));
- }
-}
diff --git a/src/main/java/com/hxzk/gps/util/Result/TableDto.java b/src/main/java/com/hxzk/gps/util/Result/TableDto.java
deleted file mode 100644
index ae692e2..0000000
--- a/src/main/java/com/hxzk/gps/util/Result/TableDto.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.hxzk.gps.util.Result;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import java.util.List;
-@Data
-@AllArgsConstructor
-public class TableDto {
- private List list;
- private Integer pageNum;
- private Integer pageSize;
- private Long total;
-}
diff --git a/src/main/java/com/hxzk/gps/util/SMS/TenSMS.java b/src/main/java/com/hxzk/gps/util/SMS/TenSMS.java
deleted file mode 100644
index c9d793f..0000000
--- a/src/main/java/com/hxzk/gps/util/SMS/TenSMS.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.hxzk.gps.util.SMS;
-
-import com.tencentcloudapi.common.Credential;
-import com.tencentcloudapi.common.exception.TencentCloudSDKException;
-import com.tencentcloudapi.common.profile.ClientProfile;
-import com.tencentcloudapi.common.profile.HttpProfile;
-import com.tencentcloudapi.sms.v20210111.SmsClient;
-import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest;
-import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
-
-public class TenSMS {
- private String SecretId ="AKIDrjZOI4e6KLZu9FAsSRN8eOwSt52lbMBz";
- private String SecretKey = "xnRtHUL3YqdMyOLVSBjKkz1pQoxujS4d";
-
- public String sms(String phone,String randomNumber) throws TencentCloudSDKException {
- try {
-
- // 瀹炰緥鍖栦竴涓璇佸璞★紝鍏ュ弬闇�瑕佷紶鍏ヨ吘璁簯璐︽埛 SecretId 鍜� SecretKey锛屾澶勮繕闇�娉ㄦ剰瀵嗛挜瀵圭殑淇濆瘑
- // 浠g爜娉勯湶鍙兘浼氬鑷� SecretId 鍜� SecretKey 娉勯湶锛屽苟濞佽儊璐﹀彿涓嬫墍鏈夎祫婧愮殑瀹夊叏鎬с�備互涓嬩唬鐮佺ず渚嬩粎渚涘弬鑰冿紝寤鸿閲囩敤鏇村畨鍏ㄧ殑鏂瑰紡鏉ヤ娇鐢ㄥ瘑閽ワ紝璇峰弬瑙侊細https://cloud.tencent.com/document/product/1278/85305
- // 瀵嗛挜鍙墠寰�瀹樼綉鎺у埗鍙� https://console.cloud.tencent.com/cam/capi 杩涜鑾峰彇
- Credential cred = new Credential(SecretId, SecretKey);
- // 瀹炰緥鍖栦竴涓猦ttp閫夐」锛屽彲閫夌殑锛屾病鏈夌壒娈婇渶姹傚彲浠ヨ烦杩�
- HttpProfile httpProfile = new HttpProfile();
- httpProfile.setEndpoint("sms.tencentcloudapi.com");
- // 瀹炰緥鍖栦竴涓猚lient閫夐」锛屽彲閫夌殑锛屾病鏈夌壒娈婇渶姹傚彲浠ヨ烦杩�
- ClientProfile clientProfile = new ClientProfile();
- clientProfile.setHttpProfile(httpProfile);
- // 瀹炰緥鍖栬璇锋眰浜у搧鐨刢lient瀵硅薄,clientProfile鏄彲閫夌殑
- SmsClient client = new SmsClient(cred, "ap-beijing", clientProfile);
- // 瀹炰緥鍖栦竴涓姹傚璞�,姣忎釜鎺ュ彛閮戒細瀵瑰簲涓�涓猺equest瀵硅薄
- SendSmsRequest req = new SendSmsRequest();
- String[] phoneNumberSet1 = {phone};
- req.setPhoneNumberSet(phoneNumberSet1);
-
- req.setSmsSdkAppId("1400838975");
- req.setSignName("绋嬪簭");
- req.setTemplateId("1878379");
-
- String[] templateParamSet1 = {String.valueOf(randomNumber)};
- req.setTemplateParamSet(templateParamSet1);
-
- // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
- SendSmsResponse resp = client.SendSms(req);
- // 杈撳嚭json鏍煎紡鐨勫瓧绗︿覆鍥炲寘
- System.out.println("鎵嬫満鍙凤細"+phone+"楠岃瘉鐮侊細"+randomNumber);
- } catch (TencentCloudSDKException e) {
- System.out.println(e.toString());
- }
- return randomNumber;
- }
-
-
-
- public String smsWarning(String phone,String content) throws TencentCloudSDKException {
- try {
-
- // 瀹炰緥鍖栦竴涓璇佸璞★紝鍏ュ弬闇�瑕佷紶鍏ヨ吘璁簯璐︽埛 SecretId 鍜� SecretKey锛屾澶勮繕闇�娉ㄦ剰瀵嗛挜瀵圭殑淇濆瘑
- // 浠g爜娉勯湶鍙兘浼氬鑷� SecretId 鍜� SecretKey 娉勯湶锛屽苟濞佽儊璐﹀彿涓嬫墍鏈夎祫婧愮殑瀹夊叏鎬с�備互涓嬩唬鐮佺ず渚嬩粎渚涘弬鑰冿紝寤鸿閲囩敤鏇村畨鍏ㄧ殑鏂瑰紡鏉ヤ娇鐢ㄥ瘑閽ワ紝璇峰弬瑙侊細https://cloud.tencent.com/document/product/1278/85305
- // 瀵嗛挜鍙墠寰�瀹樼綉鎺у埗鍙� https://console.cloud.tencent.com/cam/capi 杩涜鑾峰彇
- Credential cred = new Credential(SecretId, SecretKey);
- // 瀹炰緥鍖栦竴涓猦ttp閫夐」锛屽彲閫夌殑锛屾病鏈夌壒娈婇渶姹傚彲浠ヨ烦杩�
- HttpProfile httpProfile = new HttpProfile();
- httpProfile.setEndpoint("sms.tencentcloudapi.com");
- // 瀹炰緥鍖栦竴涓猚lient閫夐」锛屽彲閫夌殑锛屾病鏈夌壒娈婇渶姹傚彲浠ヨ烦杩�
- ClientProfile clientProfile = new ClientProfile();
- clientProfile.setHttpProfile(httpProfile);
- // 瀹炰緥鍖栬璇锋眰浜у搧鐨刢lient瀵硅薄,clientProfile鏄彲閫夌殑
- SmsClient client = new SmsClient(cred, "ap-beijing", clientProfile);
- // 瀹炰緥鍖栦竴涓姹傚璞�,姣忎釜鎺ュ彛閮戒細瀵瑰簲涓�涓猺equest瀵硅薄
- SendSmsRequest req = new SendSmsRequest();
- String[] phoneNumberSet1 = {phone};
- req.setPhoneNumberSet(phoneNumberSet1);
-
- req.setSmsSdkAppId("1400838975");
- req.setSignName("鍖椾含鍗庢槦鍖楁枟鏅烘帶");
- req.setTemplateId("2082020");
-
- String[] templateParamSet1 = {String.valueOf(content)};
- req.setTemplateParamSet(templateParamSet1);
-
- // 杩斿洖鐨剅esp鏄竴涓猄endSmsResponse鐨勫疄渚嬶紝涓庤姹傚璞″搴�
- SendSmsResponse resp = client.SendSms(req);
- } catch (TencentCloudSDKException e) {
- System.out.println(e.toString());
- }
- return content;
- }
-}
diff --git a/src/main/java/com/hxzk/gps/util/SaTokenConfigure/SaTokenConfigure.java b/src/main/java/com/hxzk/gps/util/SaTokenConfigure/SaTokenConfigure.java
deleted file mode 100644
index 76156b8..0000000
--- a/src/main/java/com/hxzk/gps/util/SaTokenConfigure/SaTokenConfigure.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.hxzk.gps.util.SaTokenConfigure;
-
-import cn.dev33.satoken.interceptor.SaInterceptor;
-import cn.dev33.satoken.stp.StpUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Locale;
-
-@Configuration
-public class SaTokenConfigure implements WebMvcConfigurer {
- // 娉ㄥ唽鎷︽埅鍣�
- @Value("${upload.dir}")
- private String uploadDir;
-
- @Autowired
- private LocaleChangeInterceptor localeChangeInterceptor;
-
- @Override
- public void addResourceHandlers(ResourceHandlerRegistry registry) {
- // 鑾峰彇涓婁紶鏂囦欢鐩綍鐨勭粷瀵硅矾寰�
- // 灏嗗閮ㄧ洰褰曟槧灏勫埌涓�涓櫄鎷熻矾寰勶紝濡�/images/**
- registry.addResourceHandler("/uploads/**")
- .addResourceLocations("file:" + uploadDir + "/");
- }
-
- @Override
- public void addInterceptors(InterceptorRegistry registry) {
- // 娉ㄥ唽 Sa-Token 鎷︽埅鍣紝鏍¢獙瑙勫垯涓� StpUtil.checkLogin() 鐧诲綍鏍¢獙銆�
- registry.addInterceptor(new SaInterceptor())
- .addPathPatterns("/**")
- .excludePathPatterns("/User/Login","/uploads/**","/uploads/**");
-
- // 娉ㄥ唽 LocaleChangeInterceptor锛岀‘淇濆湪SaInterceptor涔嬪悗鎵ц
- registry.addInterceptor(localeChangeInterceptor)
- .addPathPatterns("/**");
- }
- // 娣诲姞璺ㄥ煙閰嶇疆
- @Override
- public void addCorsMappings(CorsRegistry registry) {
- registry.addMapping("/**")
- .allowedOriginPatterns("*") // 浣跨敤 allowedOriginPatterns 浠f浛 allowedOrigins
- .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
- .allowedHeaders("*")
- .allowCredentials(true)
- .maxAge(3600);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/util/SaTokenConfigure/StpInterFaceImpl.java b/src/main/java/com/hxzk/gps/util/SaTokenConfigure/StpInterFaceImpl.java
deleted file mode 100644
index f77eb33..0000000
--- a/src/main/java/com/hxzk/gps/util/SaTokenConfigure/StpInterFaceImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.hxzk.gps.util.SaTokenConfigure;
-
-import cn.dev33.satoken.stp.StpInterface;
-import cn.dev33.satoken.stp.StpUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hxzk.gps.entity.User.TbUser;
-import com.hxzk.gps.service.User.TbUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-@Component
-public class StpInterFaceImpl implements StpInterface {
- @Autowired
- private TbUserService tbUserService;
- /**
- * 杩斿洖涓�涓处鍙锋墍鎷ユ湁鐨勬潈闄愮爜闆嗗悎
- */
- @Override
- public List<String> getPermissionList(Object loginId, String loginType) {
- List<String> list = new ArrayList<String>();
- list.add("101");
- list.add("user.find");
- list.add("user.update");
- list.add("user.get");
- list.add("art.*");
- return list;
- }
-
- /**
- * 杩斿洖涓�涓处鍙锋墍鎷ユ湁鐨勮鑹叉爣璇嗛泦鍚� (鏉冮檺涓庤鑹插彲鍒嗗紑鏍¢獙)
- */
- @Override
- public List<String> getRoleList(Object loginId, String loginType) {
- List<String> UserList = new ArrayList<>();
- String username = loginId.toString();
- UserList.add(username.split("-")[0]);
- UserList.add(username.split("-")[1]);
- UserList.add(username.split("-")[2]);
- return UserList;
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/util/Time/TimeUtil.java b/src/main/java/com/hxzk/gps/util/Time/TimeUtil.java
deleted file mode 100644
index 39663a8..0000000
--- a/src/main/java/com/hxzk/gps/util/Time/TimeUtil.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.hxzk.gps.util.Time;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Calendar;
-
-public class TimeUtil {
-
- public static String ZhuanTime(String inputTime){
- ZonedDateTime YingShouDate = ZonedDateTime.parse(inputTime).withZoneSameInstant(ZoneId.of("Asia/Shanghai"));
- // 瀹氫箟鏃ユ湡鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- // 鏍煎紡鍖栨棩鏈�
- String formattedDate = YingShouDate.format(formatter);
- return formattedDate;
- }
- public static String ZhuanDate(String inputTime){
- ZonedDateTime YingShouDate = ZonedDateTime.parse(inputTime).withZoneSameInstant(ZoneId.of("Asia/Shanghai"));
- // 瀹氫箟鏃ユ湡鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
- // 鏍煎紡鍖栨棩鏈�
- String formattedDate = YingShouDate.format(formatter);
- return formattedDate;
- }
-
- public static String GetTime () {
- // 鑾峰彇褰撳墠鐨勬湰鍦版棩鏈熷拰鏃堕棿
- LocalDateTime currentTime = LocalDateTime.now();
- // 瀹氫箟鏃ユ湡鏃堕棿鏍煎紡鍖栨ā寮�
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- // 浣跨敤鏍煎紡鍖栧櫒灏� LocalDateTime 瀵硅薄鏍煎紡鍖栦负瀛楃涓�
- String formattedTime = currentTime.format(formatter);
- return formattedTime;
- }
-
- public static Integer GetYear(){
- // 鍒涘缓涓�涓� Calendar 瀹炰緥
- Calendar calendar = Calendar.getInstance();
- // 浣跨敤 get 鏂规硶鑾峰彇褰撳墠骞翠唤
- int currentYear = calendar.get(Calendar.YEAR);
- return currentYear;
- }
-
- public static Integer GetMonth(){
- // 鍒涘缓涓�涓� Calendar 瀹炰緥
- Calendar calendar = Calendar.getInstance();
- // 浣跨敤 get 鏂规硶鑾峰彇褰撳墠骞翠唤
- int currentMonth = calendar.get(Calendar.MONTH);
- return currentMonth;
- }
- public static String GetYearMonthDay(){
- // 鑾峰彇褰撳墠鏃ユ湡
- LocalDate currentDate = LocalDate.now();
- // 瀹氫箟鏃ユ湡鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
- // 鏍煎紡鍖栨棩鏈�
- return currentDate.format(formatter);
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/util/TongJiCompany.java b/src/main/java/com/hxzk/gps/util/TongJiCompany.java
deleted file mode 100644
index 827dc3c..0000000
--- a/src/main/java/com/hxzk/gps/util/TongJiCompany.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.hxzk.gps.util;
-
-import com.hxzk.gps.entity.Company.TbCompany;
-import com.hxzk.gps.entity.WarnTongJi.WarnTongjiCompany;
-import com.hxzk.gps.service.Company.TbCompanyService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.util.List;
-
-@Component
-public class TongJiCompany implements Runnable {
- private TbCompanyService companyService;
-
- public TongJiCompany(TbCompanyService companyService) {
- this.companyService = companyService;
- }
- private static final int SLEEP_TIME = 10000; // 绾跨▼浼戠湢鏃堕棿锛屽崟浣嶏細姣
-
-
-
- @PostConstruct
- public void init() {
- new Thread(this).start();
- }
- @Override
- public void run() {
- while (true) {
- try {
- List<TbCompany> companyList = companyService.getBaseMapper().selectList(null);
- for (int i = 0 ; i <companyList.size();i++){
- String companys = companyList.get(i).getCompanyname();
- Integer companyid = companyList.get(i).getId();
- List<Long> list = companyService.getChildCompanyIds(String.valueOf(companyid));
- List<WarnTongjiCompany> warnTongjiCompanyList = companyService.findCompanyWarn(companys);
- for (WarnTongjiCompany company : warnTongjiCompanyList) {
- if (company.getIsshow() == 1) {
- switch (company.getTitle()) {
- case "闈欐鎶ヨ":
- Integer count = companyService.FindCompanyWarningCount1(list); // 闈欐鎶ヨ鏉℃暟
- if (count > 0 || count == 0){
- String title = "闈欐鎶ヨ";
- companyService.UpCompanyWarnCount(companys,count,title);
- }
- break;
- case "SOS鎶ヨ":
- Integer count1 = companyService.FindCompanyWarningCount2(list); // SOS鎶ヨ鏉℃暟
- if (count1 > 0 || count1== 0){
- String title = "SOS鎶ヨ";
- companyService.UpCompanyWarnCount(companys,count1,title);
- }
- break;
- case "璺岃惤鎶ヨ":
- Integer count2 = companyService.FindCompanyWarningCount3(list); // 璺岃惤鎶ヨ鏉℃暟
- if (count2 > 0 || count2 == 0){
- String title = "璺岃惤鎶ヨ";
- companyService.UpCompanyWarnCount(companys,count2,title);
- }
- break;
- case "缂哄憳鎶ヨ":
- Integer count3 = companyService.FindCompanyWarningCount4(list); // 缂哄憳鎶ヨ鏉℃暟
- if (count3 > 0 || count3 == 0){
- String title = "缂哄憳鎶ヨ";
- companyService.UpCompanyWarnCount(companys,count3,title);
- }
- break;
- case "瓒呭憳鎶ヨ":
- Integer count4 = companyService.FindCompanyWarningCount5(list); // 瓒呭憳鎶ヨ鏉℃暟
- if (count4 > 0 || count4 == 0){
- String title = "瓒呭憳鎶ヨ";
- companyService.UpCompanyWarnCount(companys,count4,title);
- }
- break;
- case "鑱氶泦鎶ヨ":
- Integer count5 = companyService.FindCompanyWarningCount6(list); // 鑱氶泦鎶ヨ鏉℃暟
- if (count5 > 0 || count5 == 0){
- String title = "鑱氶泦鎶ヨ";
- companyService.UpCompanyWarnCount(companys,count5,title);
- }
- break;
- case "瓒婄晫鎶ヨ":
- Integer count6 = companyService.FindCompanyWarningCount7(list); // 瓒婄晫鎶ヨ鏉℃暟
- if (count6 > 0 || count6 == 0){
- String title = "瓒婄晫鎶ヨ";
- companyService.UpCompanyWarnCount(companys,count6,title);
- }
- break;
- case "杩涘叆鎶ヨ":
- Integer count7 = companyService.FindCompanyWarningCount8(list); // 杩涘叆鎶ヨ鏉℃暟
- if (count7 > 0 || count7 == 0){
- String title = "杩涘叆鎶ヨ";
- companyService.UpCompanyWarnCount(companys,count7,title);
- }
- break;
- case "浣庣數鎶ヨ":
- Integer count8 = companyService.FindCompanyWarningCount9(list); // 浣庣數閲忔姤璀︽潯鏁�
- if (count8 > 0 || count8 == 0){
- String title = "浣庣數鎶ヨ";
- companyService.UpCompanyWarnCount(companys,count8,title);
- }
- break;
- case "绂荤嚎鍩虹珯":
- Integer count9 = companyService.FindCompanyNoOnlineAchorCount(companys); // 绂荤嚎鍩虹珯鏉℃暟
- if (count9 > 0 || count9 == 0){
- String title = "绂荤嚎鍩虹珯";
- companyService.UpCompanyWarnCount(companys,count9,title);
- }
- break;
- case "绂荤嚎浜哄憳":
- Integer count10 = companyService.FindCompanyNoOnlineCount(list); // 绂荤嚎浜哄憳鏉℃暟
- if (count10 > 0 || count10 == 0) {
- String title = "绂荤嚎浜哄憳";
- companyService.UpCompanyWarnCount(companys,count10,title);
- }
-
- break;
- case "绂荤嚎杞﹁締":
- Integer count11 = companyService.FindCompanyNoOnlineCarCount(list); // 绂荤嚎杞﹁締鏉℃暟
- if (count11 > 0 || count11 == 0){
- String title = "绂荤嚎杞﹁締";
- companyService.UpCompanyWarnCount(companys,count11,title);
- }
- break;
- case "鍦ㄧ嚎浜哄憳":
- Integer count12 = companyService.FindCompanyOnlineCount(list); // 鍦ㄧ嚎浜哄憳鏉℃暟
- if (count12 > 0 || count12 == 0){
- String title = "鍦ㄧ嚎浜哄憳";
- companyService.UpCompanyWarnCount(companys,count12,title);
- }
- break;
- case "鍦ㄧ嚎鍩虹珯":
- Integer count13 = companyService.FindCompanyOnlineAchorCount(companys); // 鍦ㄧ嚎鍩虹珯鏉℃暟
- if (count13 > 0 || count13 == 0){
- String title = "鍦ㄧ嚎鍩虹珯";
- companyService.UpCompanyWarnCount(companys,count13,title);
- }
- break;
- case "鍦ㄧ嚎杞﹁締":
- Integer count14 = companyService.FindCompanyOnlineCarCount(list); // 鍦ㄧ嚎杞﹁締鏉℃暟
- if (count14 > 0 || count14 == 0){
- String title = "鍦ㄧ嚎杞﹁締";
- companyService.UpCompanyWarnCount(companys,count14,title);
- }
- break;
- }
- }
- }
- }
-
- Thread.sleep(SLEEP_TIME); // 绾跨▼浼戠湢5绉�
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- }
- }
-}
diff --git a/src/main/java/com/hxzk/gps/util/UDP/TagSetting/UDP_TAG.java b/src/main/java/com/hxzk/gps/util/UDP/TagSetting/UDP_TAG.java
deleted file mode 100644
index 8233f6e..0000000
--- a/src/main/java/com/hxzk/gps/util/UDP/TagSetting/UDP_TAG.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.hxzk.gps.util.UDP.TagSetting;
-
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import com.hxzk.gps.util.UDP.Udp_Out;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class UDP_TAG {
- private static final Logger log = LoggerFactory.getLogger(TbSystemOperationLogService.class);
-
- /*
- * 淇敼璁惧鏁版嵁鍙戦�佸湴鍧�
- * */
- public static String SendDataAdress(TbTag tag) {
- String xieyi = "BSTOCS,CONTROLLERMESSAGE,"+tag.getTagId()+",[$set_tcp_server_address,"+tag.getTagId()+","+tag.getBaoliu1()+","+tag.getBaoliu2()+"],END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- return xieyi;
- }
- /*
- * 淇敼璁惧闈欐浼戠湢
- * */
- public static String SettingTaghibernate(TbTag tag) {
- String xieyi = "BSTOCS,CONTROLLERMESSAGE,"+tag.getTagId()+",[$set_sleep_enable,"+tag.getTagId()+","+tag.getBaoliu1()+"],END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- return xieyi;
- }
-
- /*
- * 淇敼璁惧寮�鍚垨鍏抽棴UWB鍔熻兘
- * */
- public static String SettingTagUWB(TbTag tag) {
- String xieyi = "BSTOCS,CONTROLLERMESSAGE,"+tag.getTagId()+",[$set_uwb_work,"+tag.getTagId()+","+tag.getBaoliu1()+"],END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- return xieyi;
- }
-
- /*
- * 淇敼璁惧寮�鍚垨鍏抽棴鍏呯數宸ヤ綔
- * */
- public static String SettingTagcharge(TbTag tag) {
- String xieyi = "BSTOCS,CONTROLLERMESSAGE,"+tag.getTagId()+",[$set_charge_work_mode,"+tag.getTagId()+","+tag.getBaoliu1()+"],END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- return xieyi;
- }
-
- /*
- * 淇敼璁惧宸垎鏁版嵁鍦板潃
- * */
- public static String SettingTagDifferential(TbTag tag) {
- String xieyi = "BSTOCS,CONTROLLERMESSAGE,"+tag.getTagId()+",[$set_tcp_get_rtcm,"+tag.getTagId()+","+tag.getBaoliu1()+","+tag.getBaoliu2()+"],END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- return xieyi;
- }
-
- /*
- * 淇敼璁惧Ntrip鍦板潃
- * */
- public static String SettingTagNTIRP(TbTag tag) {
- String xieyi = "BSTOCS,CONTROLLERMESSAGE,"+tag.getTagId()+",[$set_ntrip,"+tag.getTagId()+","+tag.getBaoliu1()+","+tag.getBaoliu2()+","+tag.getBaoliu3()+","+tag.getBaoliu4()+","+tag.getBaoliu5()+"],END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- return xieyi;
- }
-}
diff --git a/src/main/java/com/hxzk/gps/util/UDP/UDP_Department.java b/src/main/java/com/hxzk/gps/util/UDP/UDP_Department.java
deleted file mode 100644
index 92dba06..0000000
--- a/src/main/java/com/hxzk/gps/util/UDP/UDP_Department.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.hxzk.gps.util.UDP;
-
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class UDP_Department {
-
- private static final Logger log = LoggerFactory.getLogger(TbSystemOperationLogService.class);
-
-
-
- /*
- * 淇敼缁堢
- * */
- public static void AddDepartment(TbDepartment department) {
- String xieyi = "BSTOCS1,ADDBUMEN," + department.getDepartmentname() + "," + department.getIconadress() + ","+department.getBaoliu1()+","+department.getBaoliu2()+","+department.getBaoliu3()+","+department.getBaoliu4()+","+department.getBaoliu5()+",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
-
- /*
- * 淇敼缁堢
- * */
- public static void UpDepartment(TbDepartment department) {
- String xieyi = "BSTOCS1,ALTERBUMEN," + department.getDepartmentname() + "," + department.getIconadress() + ","+department.getBaoliu1()+","+department.getBaoliu2()+","+department.getBaoliu3()+","+department.getBaoliu4()+","+department.getBaoliu5()+",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
- /*
- * 鍒犻櫎缁堢
- * */
- public static void DeDepartment(TbDepartment department) {
- String xieyi = "BSTOCS1,DELETEBUMEN," + department.getDepartmentname() + ",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/util/UDP/UDP_Fence.java b/src/main/java/com/hxzk/gps/util/UDP/UDP_Fence.java
deleted file mode 100644
index 69a1f12..0000000
--- a/src/main/java/com/hxzk/gps/util/UDP/UDP_Fence.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.hxzk.gps.util.UDP;
-
-import com.hxzk.gps.entity.Fence.TbFence;
-import com.hxzk.gps.entity.FzRadar.TbFzanchor;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class UDP_Fence {
-
- private static final Logger log = LoggerFactory.getLogger(TbSystemOperationLogService.class);
-
-
-
- /*
- * 鏂板鍥存爮
- * BSTOCS1,ADDFENCE,妤煎眰,绫诲瀷,閮ㄩ棬,鍚嶇О,鍧愭爣,澶氳竟褰�,寮�濮嬫椂闂�,缁撴潫鏃堕棿,鍒涘缓鏃ユ湡锛岄鑹�,楂樺害,END
- * */
- public static void AddFence(TbFence fence) {
- String xieyi = "BSTOCS1,ADDFENCE," + fence.getFloor() + "," + fence.getType() + "," + fence.getBumen()+";"+ fence.getCompany() + ","+fence.getName() + "," + fence.getBaoliu8() + "," + "澶氳竟褰�" + ",00:00:00,23:59:59," + TimeUtil.GetTime() + "," + fence.getColor() + ","+fence.getBaoliu11()+",END";
- Udp_Out.udp_to_cs(xieyi);
- //鎻愮ず璇�
- if (fence.getBaoliu13().equals("鏃�")){
- fence.setBaoliu13("");
- }
- String tishiyu = "BSTOCS1,ALTERFENCE," +fence.getName()+","+fence.getBumen()+","+fence.getCompany()+","+fence.getBaoliu13()+","+fence.getColor()+",END";
- Udp_Out.udp_to_cs(tishiyu);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + tishiyu);
- }
-
- /*
- * 鍒犻櫎鍥存爮
- * */
- public static void DeFence(TbFence fence) {
- String xieyi = "BSTOCS1,DELETEFENCE," + fence.getName() + ",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/util/UDP/UDP_FzAnchor.java b/src/main/java/com/hxzk/gps/util/UDP/UDP_FzAnchor.java
deleted file mode 100644
index 3ab06bc..0000000
--- a/src/main/java/com/hxzk/gps/util/UDP/UDP_FzAnchor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.hxzk.gps.util.UDP;
-
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.hxzk.gps.entity.FzRadar.TbFzanchor;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class UDP_FzAnchor {
-
- private static final Logger log = LoggerFactory.getLogger(TbSystemOperationLogService.class);
-
-
-
- /*
- * 淇敼缁堢
- * */
- public static void AddFzAnchor(TbFzanchor fzanchor) {
- String xieyi = "BSTOCS1,ADDFZANC," + fzanchor.getName() + "," + fzanchor.getAchorid() + ","+fzanchor.getFzdis()+",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
-
- /*
- * 淇敼缁堢
- * */
- public static void UpFzAnchor(TbFzanchor fzanchor) {
- String xieyi = "BSTOCS1,ALTERFZANC," + fzanchor.getName() + "," + fzanchor.getAchorid() + ","+fzanchor.getFzdis()+",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
- /*
- * 鍒犻櫎缁堢
- * */
- public static void DeFzAnchor(TbFzanchor fzanchor) {
- String xieyi = "BSTOCS1,DELETEFZANC," + fzanchor.getAchorid() + ",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/util/UDP/UDP_Gather.java b/src/main/java/com/hxzk/gps/util/UDP/UDP_Gather.java
deleted file mode 100644
index c212303..0000000
--- a/src/main/java/com/hxzk/gps/util/UDP/UDP_Gather.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.hxzk.gps.util.UDP;
-
-import com.hxzk.gps.entity.Department.TbDepartment;
-import com.hxzk.gps.entity.Gather.TbPergather;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class UDP_Gather {
- private static final Logger log = LoggerFactory.getLogger(TbSystemOperationLogService.class);
-
- /*
- * 淇敼鑱氶泦鍥存爮
- * */
- public static void UpGather(TbPergather pergather) {
- String xieyi = "BSTOCS1,ALTERGATHER," + pergather.getName() + "," + pergather.getPernum() + ","+pergather.getTypec2() + ","+pergather.getRedius()+","+pergather.getShichang()+","+pergather.getWeixianpin()+",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/util/UDP/UDP_Person.java b/src/main/java/com/hxzk/gps/util/UDP/UDP_Person.java
deleted file mode 100644
index f8df822..0000000
--- a/src/main/java/com/hxzk/gps/util/UDP/UDP_Person.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.hxzk.gps.util.UDP;
-
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class UDP_Person {
- private static final Logger log = LoggerFactory.getLogger(TbSystemOperationLogService.class);
-
- /*
- * 淇敼缁堢
- * */
- public static void UpPersonToCs(TbPerson person) {
- String xieyi = "BSTOCS1,PERSONALTER," + person.getPTagid() + "," + person.getPName() + ",鐢�," + person.getPDepartment()+";"+person.getCompany() + ",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
- /*
- * 鍒犻櫎缁堢
- * */
- public static void DePersonToCs(TbPerson person) {
- String xieyi = "BSTOCS1,DELETETAG," + person.getPTagid() + ",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/util/UDP/UDP_Tag.java b/src/main/java/com/hxzk/gps/util/UDP/UDP_Tag.java
deleted file mode 100644
index 5fec35c..0000000
--- a/src/main/java/com/hxzk/gps/util/UDP/UDP_Tag.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.hxzk.gps.util.UDP;
-
-import com.hxzk.gps.entity.Person.TbPerson;
-import com.hxzk.gps.entity.Tag.TbTag;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class UDP_Tag {
- private static final Logger log = LoggerFactory.getLogger(TbSystemOperationLogService.class);
-
-
- /*
- * 鏂板璁惧
- * */
- public static void AddTagToCs(TbTag tag) {
- String xieyi = "BSTOCS1,ADDTAG," + tag.getTagId() + ",鏈粦瀹�,150,10000,1,"+tag.getType()+",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
-
- /*
- * 淇敼璁惧
- * */
- public static void UpTagToCs(TbTag tag) {
- String xieyi = "BSTOCS1,ALTERTAG," + tag.getTagId() + ",鏈粦瀹�,150,10000,1,"+tag.getType()+",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
- /*
- * 鍒犻櫎璁惧
- * */
- public static void DeTagToCs(TbTag tag) {
- String xieyi = "BSTOCS1,DELETETAG," + tag.getTagId() + ",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/util/UDP/UDP_Warning.java b/src/main/java/com/hxzk/gps/util/UDP/UDP_Warning.java
deleted file mode 100644
index 53f0469..0000000
--- a/src/main/java/com/hxzk/gps/util/UDP/UDP_Warning.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.hxzk.gps.util.UDP;
-
-import com.hxzk.gps.entity.Fence.TbFence;
-import com.hxzk.gps.entity.Warning.TbWarning;
-import com.hxzk.gps.service.System.TbSystemOperationLogService;
-import com.hxzk.gps.util.GetUser.UserInfoUtil;
-import com.hxzk.gps.util.MessageUtils.MessageUtils;
-import com.hxzk.gps.util.Time.TimeUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class UDP_Warning {
-
- private static final Logger log = LoggerFactory.getLogger(TbSystemOperationLogService.class);
-
-
-
- /*
- * 鍛婅鍏ㄩ儴澶勭悊
- * */
- public static void AllHandle() {
- String xieyi = "BSTOCS1,DELLWARNALL,"+ MessageUtils.getMessage("ALL")+",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
-
- /*
- * 鍛婅澶勭悊
- * */
- public static void Handle(TbWarning warning) {
- String xieyi = "BSTOCS1,DELLWARN," +warning.getObjectid()+","+warning.getType()+",END";
- Udp_Out.udp_to_cs(xieyi);
- log.info("鍙戦�乁DP娑堟伅鍒癈S绔細" + xieyi);
- }
-}
diff --git a/src/main/java/com/hxzk/gps/util/UDP/Udp_Out.java b/src/main/java/com/hxzk/gps/util/UDP/Udp_Out.java
deleted file mode 100644
index ae50333..0000000
--- a/src/main/java/com/hxzk/gps/util/UDP/Udp_Out.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.hxzk.gps.util.UDP;
-
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.io.IOException;
-import java.net.*;
-import java.nio.charset.StandardCharsets;
-
-
-/** 璇ョ被鐢ㄤ簬UDP杞彂鏁版嵁鍒版寚瀹氱鍙e湴鍧� */
-@Component
-public class Udp_Out {
- public static Udp_Out udpout;
-
- @PostConstruct //鍏抽敭鍥涳細閫氳繃@PostConstruct娉ㄨВ瀹炵幇娉ㄥ叆
- public void init() {
- udpout = this;
- }
- /**
- * 瀹炵幇UDP杞彂
- *
- * @param data
- * 闇�瑕佽浆鍙戠殑鏁版嵁
- * @param lenth闇�瑕佽浆鍙戠殑鏁版嵁闀垮害
- * @param type闇�瑕佽浆鍙戠殑鏁伴噺绫诲瀷
- * @throws IOException
- */
-
- /**灏嗘暟鎹彂閫乧s绔�*/
- public static void udp_to_cs(String message) {
- DatagramPacket packet=null;
- DatagramSocket socket =null;
- InetAddress address=null;
- int port = 7000;
- String ip = "127.0.0.1";
- byte[] data = null;
- try {
- data = message.getBytes(StandardCharsets.UTF_8);
- } catch (Exception e1) {
- // TODO 鑷姩鐢熸垚鐨� catch 鍧�
- e1.printStackTrace();
- }
- int length=data.length;
-
- try {
- address=InetAddress.getByName(ip);
- } catch (UnknownHostException e) {
- e.printStackTrace();
- }
- //濡傛灉鏁版嵁绫诲瀷鐩稿悓
- try {
- socket = new DatagramSocket();
- } catch (SocketException e) {
- e.printStackTrace();
- }
- packet=new DatagramPacket(data, length, address, port);
-
-
- try {
- socket.send(packet);
- } catch (IOException e) {
- e.printStackTrace();
- }
- socket.close();
- }
-
-}
diff --git a/src/main/java/com/hxzk/gps/util/redis/RedisConfig.java b/src/main/java/com/hxzk/gps/util/redis/RedisConfig.java
deleted file mode 100644
index 7c1b4cb..0000000
--- a/src/main/java/com/hxzk/gps/util/redis/RedisConfig.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.hxzk.gps.util.redis;
-
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-@Configuration
-@EnableCaching
-public class RedisConfig {
-
- @Bean
- public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
- // 1. 鍒涘缓 RedisTemplate 瀵硅薄
- RedisTemplate<String, Object> template = new RedisTemplate<>();
- template.setConnectionFactory(connectionFactory);
-
- // 2. 鍒涘缓 JSON 搴忓垪鍖栧伐鍏�
- GenericJackson2JsonRedisSerializer jsonSerializer = new GenericJackson2JsonRedisSerializer();
-
- // 3. 璁剧疆 Key 鍜� HashKey 鐨勫簭鍒楀寲浣跨敤 StringRedisSerializer
- template.setKeySerializer(RedisSerializer.string());
- template.setHashKeySerializer(RedisSerializer.string());
-
- // 4. 璁剧疆 Value 鍜� HashValue 鐨勫簭鍒楀寲浣跨敤 JSON 搴忓垪鍖栧櫒
- template.setValueSerializer(jsonSerializer);
- template.setHashValueSerializer(jsonSerializer);
-
- // 5. 浣块厤缃敓鏁�
- template.afterPropertiesSet();
-
- return template;
- }
-}
\ No newline at end of file
diff --git a/src/main/main.iml b/src/main/main.iml
deleted file mode 100644
index 908ad4f..0000000
--- a/src/main/main.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
deleted file mode 100644
index 019eeec..0000000
--- a/src/main/resources/application.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-server:
- port: 9002
-spring:
- servlet:
- multipart:
- enabled: true
- max-file-size: 500MB
- max-request-size: 500MB
- file-size-threshold: 2MB
- main:
- allow-circular-references: true
- application:
- name: Gps_Admin
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/hxzkuwb
- username: root
- password: hxzk20151102
- web:
- resources:
- resources:
- static-locations: classpath:/META-INF/resources/,classpath:/resources/
-# mybatisPlus
-mybatis-plus:
- global-config:
- db-config:
- id-type: auto
- configuration:
- map-underscore-to-camel-case: true
- logging:
- level:
- root: ERROR
- com.baomidou.mybatisplus: ERROR
-
-pagehelper:
- helper-dialect: mysql
- reasonable: true
- support-methods-arguments: true
- params: count=countSql
-
-
-sa-token:
- # token 鍚嶇О锛堝悓鏃朵篃鏄� cookie 鍚嶇О锛�
- token-name: satoken
- # token 鏈夋晥鏈燂紙鍗曚綅锛氱锛� 榛樿30澶╋紝-1 浠h〃姘镐箙鏈夋晥
- timeout: 2592000
- # token 鏈�浣庢椿璺冮鐜囷紙鍗曚綅锛氱锛夛紝濡傛灉 token 瓒呰繃姝ゆ椂闂存病鏈夎闂郴缁熷氨浼氳鍐荤粨锛岄粯璁�-1 浠h〃涓嶉檺鍒讹紝姘镐笉鍐荤粨
- active-timeout: -1
- # 鏄惁鍏佽鍚屼竴璐﹀彿澶氬湴鍚屾椂鐧诲綍 锛堜负 true 鏃跺厑璁镐竴璧风櫥褰�, 涓� false 鏃舵柊鐧诲綍鎸ゆ帀鏃х櫥褰曪級
- is-concurrent: true
- # 鍦ㄥ浜虹櫥褰曞悓涓�璐﹀彿鏃讹紝鏄惁鍏辩敤涓�涓� token 锛堜负 true 鏃舵墍鏈夌櫥褰曞叡鐢ㄤ竴涓� token, 涓� false 鏃舵瘡娆$櫥褰曟柊寤轰竴涓� token锛�
- is-share: false
- # token 椋庢牸锛堥粯璁ゅ彲鍙栧�硷細uuid銆乻imple-uuid銆乺andom-32銆乺andom-64銆乺andom-128銆乼ik锛�
- token-style: simple-uuid
- # 鏄惁杈撳嚭鎿嶄綔鏃ュ織
- is-log: true
-
-
-upload:
-# 涓婁紶鏂囦欢鐨勫瓨鏀捐矾寰�
- dir: D:Bs/uploads/
-# 涓婁紶鏂囦欢鐨処P鍦板潃
- dir-IP: http://103.155.76.198:9002/uploads/
-# 鐢ㄦ埛澶村儚瀛樻斁璺緞
- dir-UserImg: D:Bs/uploads/User/
-# 浜哄憳澶村儚瀛樻斁璺緞
- dir-Person: D:Bs/uploads/Person/
-# 閮ㄩ棬鍥炬爣瀛樻斁璺緞
- dir-DepartMent: D:Bs/uploads/DepartMent/
-# 鍏徃LOGO瀛樻斁璺緞
- dir-CompanyLogo: D:Bs/uploads/CompanyLogo/
-# 鎽勫儚澶村浘鏍囧瓨鏀捐矾寰�
- dir-Hksxt: D:Bs/uploads/Hksxt/
-# 骞抽潰/鐡︾墖鍦板浘瀛樻斁璺緞
- dir-Map: D:Bs/uploads/Map/
- dir-Bin: D:Bs/uploads/bin
-# 涓夌淮妯″瀷鍦板浘瀛樻斁璺緞
- dir-Map-Three: D:Bs/uploads/Map/Three/
- dir-Map-ThreeJS: D:/Bs/uploads/Map/Three/
diff --git a/src/main/resources/mapper/Anchor/TbAchorMapper.xml b/src/main/resources/mapper/Anchor/TbAchorMapper.xml
deleted file mode 100644
index ba69618..0000000
--- a/src/main/resources/mapper/Anchor/TbAchorMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Anchor.TbAchorMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Attendance/TbKaoqingMapper.xml b/src/main/resources/mapper/Attendance/TbKaoqingMapper.xml
deleted file mode 100644
index 214e5fc..0000000
--- a/src/main/resources/mapper/Attendance/TbKaoqingMapper.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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.hxzk.gps.mapper.Attendance.TbKaoqingMapper">
- <select id="FindAttendanceInfo" resultType="com.hxzk.gps.entity.Attendance.TbKaoqing">
- SELECT t.area,t.name,t.bumen,t.tagid,t.intime,t.outtime,t.alltime FROM tb_kaoqing_${time} t INNER JOIN tb_person p on p.p_tagid = t.tagid where p.company = #{company}
- <if test="name!= null and name!= ''">
- AND t.name LIKE CONCAT('%', #{name}, '%')
- </if>
- <if test="tagid!= null and tagid!= ''">
- AND t.tagid LIKE CONCAT('%', #{tagid}, '%')
- </if>
-
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/Cabinet/TbCabinetMapper.xml b/src/main/resources/mapper/Cabinet/TbCabinetMapper.xml
deleted file mode 100644
index f99c022..0000000
--- a/src/main/resources/mapper/Cabinet/TbCabinetMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Cabinet.TbCabinetMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Company/TbCompanyMapper.xml b/src/main/resources/mapper/Company/TbCompanyMapper.xml
deleted file mode 100644
index 8b63f13..0000000
--- a/src/main/resources/mapper/Company/TbCompanyMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps_admin.mapper.Company.TbCompanyMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Department/TbDepartmentIconMapper.xml b/src/main/resources/mapper/Department/TbDepartmentIconMapper.xml
deleted file mode 100644
index d317ac6..0000000
--- a/src/main/resources/mapper/Department/TbDepartmentIconMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Department.TbDepartmentIconMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Department/TbDepartmentMapper.xml b/src/main/resources/mapper/Department/TbDepartmentMapper.xml
deleted file mode 100644
index 985a36a..0000000
--- a/src/main/resources/mapper/Department/TbDepartmentMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Department.TbDepartmentMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/FaKaHuanLog/TbFakahuanlogMapper.xml b/src/main/resources/mapper/FaKaHuanLog/TbFakahuanlogMapper.xml
deleted file mode 100644
index 1bce9c0..0000000
--- a/src/main/resources/mapper/FaKaHuanLog/TbFakahuanlogMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Cabinet.TbFakahuanlogMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/FaKaJi/TbFakajiMapper.xml b/src/main/resources/mapper/FaKaJi/TbFakajiMapper.xml
deleted file mode 100644
index 81bc74e..0000000
--- a/src/main/resources/mapper/FaKaJi/TbFakajiMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Cabinet.TbFakajiMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/FaKaQuLog/TbFakaqulogMapper.xml b/src/main/resources/mapper/FaKaQuLog/TbFakaqulogMapper.xml
deleted file mode 100644
index b035f99..0000000
--- a/src/main/resources/mapper/FaKaQuLog/TbFakaqulogMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Cabinet.TbFakaqulogMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Fence/TbFenceMapper.xml b/src/main/resources/mapper/Fence/TbFenceMapper.xml
deleted file mode 100644
index da759b1..0000000
--- a/src/main/resources/mapper/Fence/TbFenceMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Fence.TbFenceMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/FzRadar/TbFzanchorMapper.xml b/src/main/resources/mapper/FzRadar/TbFzanchorMapper.xml
deleted file mode 100644
index a055ed4..0000000
--- a/src/main/resources/mapper/FzRadar/TbFzanchorMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.FzRadar.TbFzanchorMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Gather/TbPergatherMapper.xml b/src/main/resources/mapper/Gather/TbPergatherMapper.xml
deleted file mode 100644
index 25c0a7e..0000000
--- a/src/main/resources/mapper/Gather/TbPergatherMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Gather.TbPergatherMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Heart/TbHeartRecordMapper.xml b/src/main/resources/mapper/Heart/TbHeartRecordMapper.xml
deleted file mode 100644
index aae53f1..0000000
--- a/src/main/resources/mapper/Heart/TbHeartRecordMapper.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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.hxzk.gps.mapper.Heart.TbHeartRecordMapper">
- <select id="FindHeartInfo" resultType="com.hxzk.gps.entity.Heart.TbHeartRecord">
- SELECT t.tagid,t.name,t.heart,t.okheart,t.state,t.time FROM tb_heart_record t INNER JOIN tb_person p on p.p_tagid = t.tagid where p.company = #{company}
- <if test="name!= null and name != ''">
- AND t.name LIKE CONCAT('%', #{name}, '%')
- </if>
- <if test="tagid != null and tagid != ''">
- AND t.tagid LIKE CONCAT('%', #{tagid}, '%')
- </if>
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/HistoryPower/TbAcHistoryPowerMapper.xml b/src/main/resources/mapper/HistoryPower/TbAcHistoryPowerMapper.xml
deleted file mode 100644
index 602e2ff..0000000
--- a/src/main/resources/mapper/HistoryPower/TbAcHistoryPowerMapper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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.hxzk.gps.mapper.HistoryPower.TbAcHistoryPowerMapper">
- <select id="FindAcHistoryPowerInfo" resultType="com.hxzk.gps.entity.HistoryPower.TbAcHistoryPower">
- SELECT t.anchorId,t.power,t.addtime FROM tb_ac_history_power_${time} t INNER JOIN tb_achor a on a.anchorid = t.anchorId where a.company = #{company}
- <if test="anchorId!= null and anchorId!= ''">
- AND t.anchorId LIKE CONCAT('%', #{anchorId}, '%')
- </if>
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/HistoryPower/TbHistoryPowerMapper.xml b/src/main/resources/mapper/HistoryPower/TbHistoryPowerMapper.xml
deleted file mode 100644
index 8ea4baa..0000000
--- a/src/main/resources/mapper/HistoryPower/TbHistoryPowerMapper.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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.hxzk.gps.mapper.HistoryPower.TbHistoryPowerMapper">
- <select id="FindTagHistoryPowerInfo" resultType="com.hxzk.gps.entity.HistoryPower.TbHistoryPower">
- SELECT t.tagid,t.power,t.time FROM tb_history_power_${time} t INNER JOIN tb_person p on p.p_tagid = t.tagid where p.company = #{company}
-
- <if test="tagid!= null and tagid!= ''">
- AND t.tagid LIKE CONCAT('%', #{tagid}, '%')
- </if>
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/Inspection/TbNewtaskMapper.xml b/src/main/resources/mapper/Inspection/TbNewtaskMapper.xml
deleted file mode 100644
index 54fdff6..0000000
--- a/src/main/resources/mapper/Inspection/TbNewtaskMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Inspection.TbNewtaskMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Inspection/TbXunjianbaobiaoMapper.xml b/src/main/resources/mapper/Inspection/TbXunjianbaobiaoMapper.xml
deleted file mode 100644
index f5c9a42..0000000
--- a/src/main/resources/mapper/Inspection/TbXunjianbaobiaoMapper.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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.hxzk.gps.mapper.Inspection.TbXunjianbaobiaoMapper">
- <select id="FindAXunJianBaoBiaoInfo" resultType="com.hxzk.gps.entity.Inspection.TbXunjianbaobiao">
- SELECT t.name,t.tagid,t.quyu,t.bianhao,t.intime,t.outtime,t.alltime,t.succ,t.addtime FROM tb_xunjianbaobiao t INNER JOIN tb_person p on p.p_tagid = t.tagid where p.company = #{company}
- <if test="name!= null and name!= ''">
- AND t.name LIKE CONCAT('%', #{name}, '%')
- </if>
- <if test="tagid!= null and tagid!= ''">
- AND t.tagid LIKE CONCAT('%', #{tagid}, '%')
- </if>
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/Log/TbFzlogMapper.xml b/src/main/resources/mapper/Log/TbFzlogMapper.xml
deleted file mode 100644
index 8c69bb1..0000000
--- a/src/main/resources/mapper/Log/TbFzlogMapper.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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.hxzk.gps.mapper.Log.TbFzlogMapper">
- <select id="FindFzLogInfo" resultType="com.hxzk.gps.entity.Log.TbFzlog">
- SELECT t.nameandid,t.tagId,t.tagName,t.sosdis,t.ponit,t.addtime FROM tb_fzlog t INNER JOIN tb_person p on p.p_tagid = t.tagId where p.company = #{company}
- <if test="tagId!= null and tagId!= ''">
- AND t.tagId LIKE CONCAT('%', #{tagId}, '%')
- </if>
- <if test="tagName!= null and tagName!= ''">
- AND t.tagName LIKE CONCAT('%', #{tagName}, '%')
- </if>
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/Log/TbLixianrecord0829Mapper.xml b/src/main/resources/mapper/Log/TbLixianrecord0829Mapper.xml
deleted file mode 100644
index 002bc5c..0000000
--- a/src/main/resources/mapper/Log/TbLixianrecord0829Mapper.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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.hxzk.gps.mapper.Log.TbLixianrecord0829Mapper">
- <select id="FindLixianLogInfo" resultType="com.hxzk.gps.entity.Log.TbLixianrecord0829">
- SELECT t.tagid,t.name,t.bumen,t.phone,t.time FROM tb_lixianrecord_0829 t INNER JOIN tb_person p on p.p_tagid = t.tagid where p.company = #{company}
- <if test="name!= null and name!= ''">
- AND t.name LIKE CONCAT('%', #{name}, '%')
- </if>
- <if test="tagid!= null and tagid!= ''">
- AND t.tagid LIKE CONCAT('%', #{tagid}, '%')
- </if>
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/Log/TbLoginLogMapper.xml b/src/main/resources/mapper/Log/TbLoginLogMapper.xml
deleted file mode 100644
index 7aef180..0000000
--- a/src/main/resources/mapper/Log/TbLoginLogMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Log.TbLoginLogMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Loragateway/TbLoragatewayMapper.xml b/src/main/resources/mapper/Loragateway/TbLoragatewayMapper.xml
deleted file mode 100644
index 9e06400..0000000
--- a/src/main/resources/mapper/Loragateway/TbLoragatewayMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Loragateway.TbLoragatewayMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Mac/TbMacMapper.xml b/src/main/resources/mapper/Mac/TbMacMapper.xml
deleted file mode 100644
index 7471b9e..0000000
--- a/src/main/resources/mapper/Mac/TbMacMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Mac.TbMacMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Map/TbMapMapper.xml b/src/main/resources/mapper/Map/TbMapMapper.xml
deleted file mode 100644
index 8ec7bd9..0000000
--- a/src/main/resources/mapper/Map/TbMapMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Map.TbMapMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Map/TbMarsHomesetMapper.xml b/src/main/resources/mapper/Map/TbMarsHomesetMapper.xml
deleted file mode 100644
index 1f7100b..0000000
--- a/src/main/resources/mapper/Map/TbMarsHomesetMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Map.TbMarsHomesetMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Menu/MenuMapper.xml b/src/main/resources/mapper/Menu/MenuMapper.xml
deleted file mode 100644
index 0bb4580..0000000
--- a/src/main/resources/mapper/Menu/MenuMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Menu.MenuMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Message/TbSendMessageHistoryMapper.xml b/src/main/resources/mapper/Message/TbSendMessageHistoryMapper.xml
deleted file mode 100644
index bcc3bdb..0000000
--- a/src/main/resources/mapper/Message/TbSendMessageHistoryMapper.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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.hxzk.gps.mapper.Message.TbSendMessageHistoryMapper">
- <select id="FindMessageInfo" resultType="com.hxzk.gps.entity.Message.TbSendMessageHistory">
- SELECT t.user,t.tagid,t.time,t.neirong FROM tb_send_message_history t INNER JOIN tb_person p on p.p_tagid = t.tagid where p.company = #{company}
- <if test="user != null and user != ''">
- AND t.user LIKE CONCAT('%', #{user}, '%')
- </if>
- <if test="tagid != null and tagid != ''">
- AND t.tagid LIKE CONCAT('%', #{tagid}, '%')
- </if>
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/Person/TbPersonMapper.xml b/src/main/resources/mapper/Person/TbPersonMapper.xml
deleted file mode 100644
index b6c6de5..0000000
--- a/src/main/resources/mapper/Person/TbPersonMapper.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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.hxzk.gps.mapper.Person.TbPersonMapper">
- <!--娣诲姞浜哄憳瀹氫綅-->
- <select id="PersonPosition" resultType="com.hxzk.gps.entity.Person.TbPerson">
- SELECT p.p_tagid,p.p_name,p.p_online,d.baoliu3 as p_image,d.baoliu4 as baoliu1,d.baoliu8 as baoliu8 FROM tb_person p
- inner join tb_department d on d.departmentName = p.p_department
- WHERE (p.companyid IN
- <foreach item="item" index="index" collection="list"
- open="(" separator="," close=")">
- #{item}
- </foreach>
- )
- </select>
-
- <!--瀹炴椂浜哄憳浣嶇疆-->
- <select id="RealPosition" resultType="com.hxzk.gps.entity.Person.TbPerson">
- SELECT p.p_tagid,p.baoliu2,p.baoliu3,p.p_addtiem,p.baoliu4,p.company FROM tb_person p
- WHERE (p.companyid IN
- <foreach item="item" index="index" collection="list"
- open="(" separator="," close=")">
- #{item}
- </foreach>
- )
- </select>
-
- <!--瀹炴椂骞抽潰浜岀淮浜哄憳浣嶇疆-->
- <select id="RealPosition2D" resultType="com.hxzk.gps.entity.Person.TbPerson">
- SELECT p.p_tagid,p.p_x,p.p_y,p.p_addtiem,p.baoliu4,p.p_name,d.baoliu3 as p_image,d.baoliu8 as baoliu8 FROM tb_person p
- inner join tb_department d on d.departmentName = p.p_department
- WHERE (p.companyid IN
- <foreach item="item" index="index" collection="list"
- open="(" separator="," close=")">
- #{item}
- </foreach>
- and p.p_online = 1)
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/Role/RoleMapper.xml b/src/main/resources/mapper/Role/RoleMapper.xml
deleted file mode 100644
index 51fc356..0000000
--- a/src/main/resources/mapper/Role/RoleMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps_admin.mapper.Role.RoleMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Sms/TbSmsLogMapper.xml b/src/main/resources/mapper/Sms/TbSmsLogMapper.xml
deleted file mode 100644
index 992469f..0000000
--- a/src/main/resources/mapper/Sms/TbSmsLogMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Sms.TbSmsLogMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Sms/TbSmsReminderMapper.xml b/src/main/resources/mapper/Sms/TbSmsReminderMapper.xml
deleted file mode 100644
index 86271f8..0000000
--- a/src/main/resources/mapper/Sms/TbSmsReminderMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Sms.TbSmsReminderMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Sms/TbVoicetipMapper.xml b/src/main/resources/mapper/Sms/TbVoicetipMapper.xml
deleted file mode 100644
index b9b2827..0000000
--- a/src/main/resources/mapper/Sms/TbVoicetipMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Sms.TbVoicetipMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/System/TbSystemOperationLogMapper.xml b/src/main/resources/mapper/System/TbSystemOperationLogMapper.xml
deleted file mode 100644
index 65ac22c..0000000
--- a/src/main/resources/mapper/System/TbSystemOperationLogMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.System.TbSystemOperationLogMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Tag/TbTagMapper.xml b/src/main/resources/mapper/Tag/TbTagMapper.xml
deleted file mode 100644
index b9f2273..0000000
--- a/src/main/resources/mapper/Tag/TbTagMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Tag.TbTagMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/ThreeModel/TbThreemodelMapper.xml b/src/main/resources/mapper/ThreeModel/TbThreemodelMapper.xml
deleted file mode 100644
index 1a57c47..0000000
--- a/src/main/resources/mapper/ThreeModel/TbThreemodelMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.ThreeModel.gps.mapper.ThreeModel.TbThreemodelMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Track/TbGpsTrackMapper.xml b/src/main/resources/mapper/Track/TbGpsTrackMapper.xml
deleted file mode 100644
index aa49a40..0000000
--- a/src/main/resources/mapper/Track/TbGpsTrackMapper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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.hxzk.gps.mapper.Track.TbGpsTrackMapper">
- <select id="FindGpsTrackInfo" resultType="com.hxzk.gps.entity.Track.TbGpsTrack">
- SELECT t.gps_utc_time,t.gps_weidu,t.gsp_jingdu,t.gps_state,t.gps_haiba_gao,t.tagid,t.addtime FROM tb_gps_track_${time} t INNER JOIN tb_person p on p.p_tagid = t.tagid where p.company = #{company}
- <if test="tagid != null and tagid != ''">
- AND t.tagid LIKE CONCAT('%', #{tagid}, '%')
- </if>
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/Track/TbTrackMapper.xml b/src/main/resources/mapper/Track/TbTrackMapper.xml
deleted file mode 100644
index dc869f8..0000000
--- a/src/main/resources/mapper/Track/TbTrackMapper.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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.hxzk.gps.mapper.Track.TbTrackMapper">
- <select id="FindTrackInfo" resultType="com.hxzk.gps.entity.Track.TbTrack">
- SELECT t.tagid,t.x,t.y,t.z,t.layer,t.time FROM tb_track_${time} t INNER JOIN tb_person p on p.p_tagid = t.tagid where p.company = #{company}
- <if test="tagid != null and tagid != ''">
- AND t.tagid LIKE CONCAT('%', #{tagid}, '%')
- </if>
-
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/User/TbUserMapper.xml b/src/main/resources/mapper/User/TbUserMapper.xml
deleted file mode 100644
index 96090d1..0000000
--- a/src/main/resources/mapper/User/TbUserMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps_admin.mapper.User.TbUserMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Video/TbHksxtMapper.xml b/src/main/resources/mapper/Video/TbHksxtMapper.xml
deleted file mode 100644
index 0f9b389..0000000
--- a/src/main/resources/mapper/Video/TbHksxtMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.Video.TbHksxtMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/WarnTongJi/WarnTongjiCompanyMapper.xml b/src/main/resources/mapper/WarnTongJi/WarnTongjiCompanyMapper.xml
deleted file mode 100644
index fbfb0db..0000000
--- a/src/main/resources/mapper/WarnTongJi/WarnTongjiCompanyMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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.hxzk.gps.mapper.WarnTongJi.WarnTongjiCompanyMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/Warning/TbWarningMapper.xml b/src/main/resources/mapper/Warning/TbWarningMapper.xml
deleted file mode 100644
index fcd2ae9..0000000
--- a/src/main/resources/mapper/Warning/TbWarningMapper.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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.hxzk.gps.mapper.Warning.TbWarningMapper">
-
- <select id="FindWarningInfo" resultType="com.hxzk.gps.entity.Warning.TbWarning">
- SELECT w.id, w.type, w.objectid, w.status, w.time, w.baoliu1, w.baoliu2, w.baoliu3, w.baoliu4, w.baoliu5, w.baoliu6,w.baoliu7, p.p_name as baoliu10
- FROM tb_warning w
- INNER JOIN tb_person p on p.p_tagid = w.objectid
- WHERE p.company = #{CompanyName}
- <if test="objectid != null and objectid != ''">
- AND w.objectid LIKE CONCAT('%', #{objectid}, '%')
- </if>
- <if test="baoliu10 != null and baoliu10 != ''">
- AND w.baoliu10 LIKE CONCAT('%', #{baoliu10}, '%')
- </if>
- <if test="type != null and type != ''">
- AND w.type LIKE CONCAT('%', #{type}, '%')
- </if>
- </select>
-
- <select id="FindWarningUntreated" resultType="com.hxzk.gps.entity.Warning.TbWarning">
- SELECT w.id, w.type, w.objectid, w.status, w.time, w.baoliu1, w.baoliu2, w.baoliu3, w.baoliu4, w.baoliu5, w.baoliu6,w.baoliu7, p.p_name as baoliu10
- FROM tb_warning w
- INNER JOIN tb_person p on p.p_tagid = w.objectid
- WHERE p.companyid IN
- <foreach item="item" index="index" collection="companyIds" open="(" separator="," close=")">
- #{item}
- </foreach>
- and w.status = #{status}
- </select>
-</mapper>
diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties
deleted file mode 100644
index 45cfe57..0000000
--- a/src/main/resources/messages_en_US.properties
+++ /dev/null
@@ -1,141 +0,0 @@
-#Common
-Add = Add
-Update = Edit
-Delete = Delete
-Save = Save
-
-#Login
-LoginSuccess = Login Success
-LoginError = [Login Exception: Please contact administrator]
-LoginNull = [Login Failed: Username or password is incorrect]
-Loginfreeze = [Login Failed: User has been frozen]
-LoginSmSError = [Login Failed: Verification code error]
-Success = Success
-Error = Error
-NULLCompany = No current login company found
-
-#Public
-DeleteSuccess = Delete Success
-DeleteError = Delete Failed
-AddSuccess = Add Success
-AddError = Add Failed
-UpdateSuccess = Edit Success
-UpdateError = Edit Failed
-
-#User Management Messages
-UserAdd = Add User
-UserUpdate = Edit User
-UserDelete = Delete User
-UserRepeat = User already exists!
-PhoneError = Phone number format error or does not exist!
-SmsSuccess = SMS sent successfully
-
-#Role Management Messages
-Admin = Super Administrator
-PuAdmin = Normal Administrator
-FangKe = Visitor
-RoleAdd = Add Role
-RoleUpdate = Edit Role
-RoleDelete = Delete Role
-RoleRepeat = Role already exists!
-
-#Company Management Messages
-CompanyAdd = Add Company
-CompanyUpdate = Edit Company
-CompanyDelete = Delete Company
-CompanyRepeat = Company already exists!
-CompanyDeleteFailed = Delete company failed
-CompanyDeleteException = Delete company exception
-CompanyCanDelete = Company can be deleted
-CheckCompanyDeleteFailed = Check company deletion conditions failed
-CompanyHasDepartments = Company has department data, cannot delete
-CompanyHasPersons = Company has personnel data, cannot delete
-CompanyHasUsers = Company has user data, cannot delete
-CompanyHasRoles = Company has role data, cannot delete
-CompanyHasIcons = Company has department icon data, cannot delete
-CompanyHasBindingData = Company has binding data, cannot delete
-
-#Image Management Messages
-ErrorPicture = Image upload failed
-SuccessPicture = Image upload successful
-ErrorFolder = Folder creation failed
-
-#Terminal Management Messages
-PersonAdd = Add Terminal
-PersonUpdate = Edit Terminal
-PersonDelete = Delete Terminal
-
-#Device Management Messages
-DeviceAdd = Add Device
-DeviceUpdate = Edit Device
-DeviceDelete = Delete Device
-XiTongMoRen = System Default
-RongHeZhongDuan = Integrated Terminal
-CarTag = Vehicle Tag
-CarTag1 = Integrated Vehicle
-MaterialsTag = Material Tag
-
-#Department Management Messages
-AllDepartments = All Departments
-TechnicalDepartment = Technical Department
-ProductionDepartment = Production Department
-SecurityDepartment = Security Department
-MaintenanceDepartment = Maintenance Department
-RnDDepartment = R&D Department
-DepartmentAdd = Add Department
-DepartmentUpdate = Edit Department
-DepartmentDelete = Delete Department
-DepartmentRepeat = Department already exists!
-
-#Department Icon Management Messages
-Icon = Icon
-IconAdd = Add Department Icon
-IconUpdate = Edit Department Icon
-IconDelete = Delete Department Icon
-IconRepeat = Department icon already exists!
-
-#Anti-collision Radar Management Messages
-RadarAdd = Add Anti-collision Radar
-RadarUpdate = Edit Anti-collision Radar
-RadarDelete = Delete Anti-collision Radar
-
-#Fence Management Messages
-FenceNameRepeat = Fence name already exists!
-FenceAdd = Add Fence
-FenceDelete = Delete Fence
-Attendance = Attendance Area
-
-#Cluster Fence Messages
-ClusterFenceUpdate = Edit Cluster Fence
-
-#Alarm Messages
-ALL = All
-Handle = Handled
-UnHandle = Unhandled
-HandleWarning = Handle Alarm
-
-#SMS Messages
-SMSAdd = Add SMS Information
-SMSUpdate = Edit SMS Information
-SMSDelete = Delete SMS Information
-
-#Camera Information
-HksxtAdd = Add Monitoring Configuration
-HksxtUpdate = Edit Monitoring Configuration
-HksxtDelete = Delete Monitoring Configuration
-HksxtRepeat = Monitoring configuration already exists!
-
-#Track Information
-TrackNull = "No track information found"
-
-#3D Map Configuration Messages
-MapUpdate = Edit 3D Map Configuration
-
-#Alarm Statistics Configuration Messages
-WarnTongJiUpdate = Edit Alarm Statistics Configuration
-
-#Card Issuer Messages
-CardAdd = Add Card Issuer
-CardUpdate = Edit Card Issuer
-CardDelete = Delete Card Issuer
-CabinetRepeat = Card issuer already exists!
\ No newline at end of file
diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties
deleted file mode 100644
index fc0c52a..0000000
--- a/src/main/resources/messages_zh_CN.properties
+++ /dev/null
@@ -1,151 +0,0 @@
-#閫氱敤
-Add = 鏂板
-Update = 缂栬緫
-Delete = 鍒犻櫎
-Save = 淇濆瓨
-
-#鐧诲綍
-LoginSuccess = 鐧诲綍鎴愬姛
-LoginError = 銆愮櫥褰曞紓甯革細璇疯仈绯荤鐞嗗憳銆�
-LoginNull = 銆愮櫥褰曞け璐ワ細鐢ㄦ埛鍚嶆垨瀵嗙爜涓嶆纭��
-Loginfreeze = 銆愮櫥褰曞け璐ワ細鐢ㄦ埛宸茬粡琚喕缁撱��
-LoginSmSError = 銆愮櫥褰曞け璐ワ細楠岃瘉鐮侀敊璇��
-Success = 鎴愬姛
-Error = 澶辫触
-NULLCompany = 鏈壘鍒板綋鍓嶇櫥褰曞叕鍙�
-
-
-#鍏叡
-DeleteSuccess = 鍒犻櫎鎴愬姛
-DeleteError = 鍒犻櫎澶辫触
-AddSuccess = 娣诲姞鎴愬姛
-AddError = 娣诲姞澶辫触
-UpdateSuccess = 缂栬緫鎴愬姛
-UpdateError = 缂栬緫澶辫触
-
-
-#鐢ㄦ埛绠$悊娑堟伅
-UserAdd= 鏂板鐢ㄦ埛
-UserUpdate= 缂栬緫鐢ㄦ埛
-UserDelete= 鍒犻櫎鐢ㄦ埛
-UserRepeat = 鐢ㄦ埛宸插瓨鍦�!
-PhoneError = 鎵嬫満鍙风爜鏍煎紡閿欒鎴栦笉瀛樺湪!
-SmsSuccess = 鐭俊鍙戦�佹垚鍔�
-
-
-#瑙掕壊绠$悊娑堟伅
-Admin = 瓒呯骇绠$悊鍛�
-PuAdmin = 鏅�氱鐞嗗憳
-FangKe = 璁垮
-RoleAdd= 鏂板瑙掕壊
-RoleUpdate= 缂栬緫瑙掕壊
-RoleDelete= 鍒犻櫎瑙掕壊
-RoleRepeat = 瑙掕壊宸插瓨鍦�!
-
-
-#鍏徃绠$悊娑堟伅
-CompanyAdd= 鏂板鍏徃
-CompanyUpdate= 缂栬緫鍏徃
-CompanyDelete= 鍒犻櫎鍏徃
-CompanyRepeat = 鍏徃宸插瓨鍦�!
-CompanyDeleteFailed = 鍒犻櫎鍏徃澶辫触
-CompanyDeleteException = 鍒犻櫎鍏徃寮傚父
-CompanyCanDelete = 鍏徃鍙互鍒犻櫎
-CheckCompanyDeleteFailed = 妫�鏌ュ叕鍙稿垹闄ゆ潯浠跺け璐�
-CompanyHasDepartments = 鍏徃瀛樺湪閮ㄩ棬鏁版嵁锛屾棤娉曞垹闄�
-CompanyHasPersons = 鍏徃瀛樺湪浜哄憳鏁版嵁锛屾棤娉曞垹闄�
-CompanyHasUsers = 鍏徃瀛樺湪鐢ㄦ埛鏁版嵁锛屾棤娉曞垹闄�
-CompanyHasRoles = 鍏徃瀛樺湪瑙掕壊鏁版嵁锛屾棤娉曞垹闄�
-CompanyHasIcons = 鍏徃瀛樺湪閮ㄩ棬鍥炬爣鏁版嵁锛屾棤娉曞垹闄�
-CompanyHasBindingData = 鍏徃瀛樺湪缁戝畾鏁版嵁锛屾棤娉曞垹闄�
-
-
-#鍥剧墖绠$悊娑堟伅
-ErrorPicture = 鍥剧墖涓婁紶澶辫触
-SuccessPicture = 鍥剧墖涓婁紶鎴愬姛
-ErrorFolder = 鏂囦欢澶瑰垱寤哄け璐�
-
-#缁堢绠$悊娑堟伅
-PersonAdd= 鏂板缁堢
-PersonUpdate= 缂栬緫缁堢
-PersonDelete= 鍒犻櫎缁堢
-
-#璁惧绠$悊娑堟伅
-DeviceAdd= 鏂板璁惧
-DeviceUpdate= 缂栬緫璁惧
-DeviceDelete= 鍒犻櫎璁惧
-XiTongMoRen = 绯荤粺榛樿
-RongHeZhongDuan = 铻嶅悎缁堢
-CarTag = 杞﹁浇鏍囩
-CarTag1 = 铻嶅悎杞﹁浇
-MaterialsTag = 鐗╄祫鏍囩
-
-
-#閮ㄩ棬绠$悊娑堟伅
-AllDepartments = 鎵�鏈夐儴闂�
-TechnicalDepartment = 鎶�鏈儴
-ProductionDepartment = 鐢熶骇閮�
-SecurityDepartment = 瀹夊叏閮�
-MaintenanceDepartment = 缁翠慨閮�
-RnDDepartment = 鐮斿彂閮�
-DepartmentAdd= 鏂板閮ㄩ棬
-DepartmentUpdate= 缂栬緫閮ㄩ棬
-DepartmentDelete= 鍒犻櫎閮ㄩ棬
-DepartmentRepeat = 閮ㄩ棬宸插瓨鍦�!
-
-#閮ㄩ棬鍥炬爣绠$悊娑堟伅
-Icon = 鍥炬爣
-IconAdd= 鏂板閮ㄩ棬鍥炬爣
-IconUpdate= 缂栬緫閮ㄩ棬鍥炬爣
-IconDelete= 鍒犻櫎閮ㄩ棬鍥炬爣
-IconRepeat = 閮ㄩ棬鍥炬爣宸插瓨鍦�!
-
-#闃叉挒闆疯揪绠$悊娑堟伅
-RadarAdd= 鏂板闃叉挒闆疯揪
-RadarUpdate= 缂栬緫闃叉挒闆疯揪
-RadarDelete= 鍒犻櫎闃叉挒闆疯揪
-
-#鍥存爮绠$悊娑堟伅
-FenceNameRepeat = 鍥存爮鍚嶇О宸插瓨鍦�!
-FenceAdd= 鏂板鍥存爮
-FenceDelete= 鍒犻櫎鍥存爮
-Attendance = 鑰冨嫟鍖哄煙
-
-#鑱氶泦鍥存爮娑堟伅
-ClusterFenceUpdate= 缂栬緫鑱氶泦鍥存爮
-
-#鍛婅娑堟伅
-ALL = 鍏ㄩ儴
-Handle = 宸插鐞�
-UnHandle = 鏈鐞�
-HandleWarning = 澶勭悊鍛婅
-
-#鐭俊淇℃伅
-SMSAdd = 鏂板鐭俊淇℃伅
-SMSUpdate = 缂栬緫鐭俊淇℃伅
-SMSDelete = 鍒犻櫎鐭俊淇℃伅
-
-#鎽勫儚澶翠俊鎭�
-HksxtAdd = 鏂板鐩戞帶閰嶇疆
-HksxtUpdate = 缂栬緫鐩戞帶閰嶇疆
-HksxtDelete = 鍒犻櫎鐩戞帶閰嶇疆
-HksxtRepeat = 鐩戞帶閰嶇疆宸插瓨鍦�!
-
-#杞ㄨ抗淇℃伅
-TrackNull = "鏈煡璇㈠埌杞ㄨ抗淇℃伅"
-
-#涓夌淮鍦板浘閰嶇疆娑堟伅
-MapUpdate = 缂栬緫涓夌淮鍦板浘閰嶇疆
-#涓夌淮鍦板浘閰嶇疆娑堟伅
-MapModelAdd = 涓夌淮妯″瀷閰嶇疆
-MapModelUpdate = 缂栬緫涓夌淮妯″瀷閰嶇疆
-ThreeModelExist = 涓夌淮妯″瀷鏂囦欢澶瑰凡瀛樺湪
-
-#鍛婅缁熻閰嶇疆娑堟伅
-WarnTongJiUpdate = 缂栬緫鍛婅缁熻閰嶇疆
-
-#鍙戝崱鏈烘秷鎭�
-CardAdd = 鏂板鍙戝崱鏈�
-CardUpdate = 缂栬緫鍙戝崱鏈�
-CardDelete = 鍒犻櫎鍙戝崱鏈�
-CabinetRepeat = 鍙戝崱鏈哄凡瀛樺湪!
diff --git a/src/test/java/com/hxzk/gps/GpsAdminApplicationTests.java b/src/test/java/com/hxzk/gps/GpsAdminApplicationTests.java
deleted file mode 100644
index 0d97f52..0000000
--- a/src/test/java/com/hxzk/gps/GpsAdminApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hxzk.gps;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class GpsAdminApplicationTests {
-
- @Test
- void contextLoads() {
- }
-
-}
diff --git a/src/test/test.iml b/src/test/test.iml
deleted file mode 100644
index a0e49a3..0000000
--- a/src/test/test.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="true" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
--
Gitblit v1.9.3