destinationClass) {
+ if (sourceList == null || sourceList.isEmpty() || destinationClass == null) {
+ return Collections.emptyList();
+ }
+ return sourceList.parallelStream()
+ .filter(Objects::nonNull)
+ .map(source -> toBean(source, destinationClass)).collect(Collectors.toList());
+ }
}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/bean/BeanValidators.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/bean/BeanValidators.java
index 9d67f77..f5bf375 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/bean/BeanValidators.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/bean/BeanValidators.java
@@ -1,9 +1,9 @@
package com.tcctyn.common.core.utils.bean;
-import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import javax.validation.Validator;
+import java.util.Set;
/**
* bean对象属性验证
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/FileTypeUtils.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/FileTypeUtils.java
index 24291b4..e77a6c3 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/FileTypeUtils.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/FileTypeUtils.java
@@ -1,11 +1,12 @@
package com.tcctyn.common.core.utils.file;
-import java.io.File;
-import java.util.Objects;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
+import java.util.Objects;
+
/**
* 文件类型工具类
*
@@ -17,7 +18,7 @@ public class FileTypeUtils
* 获取文件类型
*
* 例如: tcctyn.txt, 返回: txt
- *
+ *
* @param file 文件名
* @return 后缀（不含".")
*/
@@ -50,7 +51,7 @@ public class FileTypeUtils
/**
* 获取文件名的后缀
- *
+ *
* @param file 表单文件
* @return 后缀名
*/
@@ -66,7 +67,7 @@ public class FileTypeUtils
/**
* 获取文件类型
- *
+ *
* @param photoByte 文件字节码
* @return 后缀（不含".")
*/
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/FileUploadUtils.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/FileUploadUtils.java
new file mode 100644
index 0000000..cc98007
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/FileUploadUtils.java
@@ -0,0 +1,233 @@
+package com.tcctyn.common.core.utils.file;
+
+import com.tcctyn.common.core.config.TcctynConfig;
+import com.tcctyn.common.core.constant.Constants;
+import com.tcctyn.common.core.exception.file.FileNameLengthLimitExceededException;
+import com.tcctyn.common.core.exception.file.FileSizeLimitExceededException;
+import com.tcctyn.common.core.exception.file.InvalidExtensionException;
+import com.tcctyn.common.core.utils.DateUtils;
+import com.tcctyn.common.core.utils.StringUtils;
+import com.tcctyn.common.core.utils.uuid.Seq;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.Objects;
+
+/**
+ * 文件上传工具类
+ *
+ * @author tcctyn
+ */
+public class FileUploadUtils
+{
+ /**
+ * 默认大小 50M
+ */
+ public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024L;
+
+ /**
+ * 默认的文件名最大长度 100
+ */
+ public static final int DEFAULT_FILE_NAME_LENGTH = 100;
+
+ /**
+ * 默认上传的地址
+ */
+ private static String defaultBaseDir = TcctynConfig.getProfile();
+
+ public static void setDefaultBaseDir(String defaultBaseDir)
+ {
+ FileUploadUtils.defaultBaseDir = defaultBaseDir;
+ }
+
+ public static String getDefaultBaseDir()
+ {
+ return defaultBaseDir;
+ }
+
+ /**
+ * 以默认配置进行文件上传
+ *
+ * @param file 上传的文件
+ * @return 文件名称
+ * @throws Exception
+ */
+ public static final String upload(MultipartFile file) throws IOException
+ {
+ try
+ {
+ return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ }
+ catch (Exception e)
+ {
+ throw new IOException(e.getMessage(), e);
+ }
+ }
+
+ /**
+ * 根据文件路径上传
+ *
+ * @param baseDir 相对应用的基目录
+ * @param file 上传的文件
+ * @return 文件名称
+ * @throws IOException
+ */
+ public static final String upload(String baseDir, MultipartFile file) throws IOException
+ {
+ try
+ {
+ return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+ }
+ catch (Exception e)
+ {
+ throw new IOException(e.getMessage(), e);
+ }
+ }
+
+ /**
+ * 文件上传
+ *
+ * @param baseDir 相对应用的基目录
+ * @param file 上传的文件
+ * @param allowedExtension 上传文件类型
+ * @return 返回上传成功的文件名
+ * @throws FileSizeLimitExceededException 如果超出最大大小
+ * @throws FileNameLengthLimitExceededException 文件名太长
+ * @throws IOException 比如读写文件出错时
+ * @throws InvalidExtensionException 文件校验异常
+ */
+ public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
+ throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
+ InvalidExtensionException
+ {
+ int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
+ if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
+ {
+ throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
+ }
+
+ assertAllowed(file, allowedExtension);
+
+ String fileName = extractFilename(file);
+
+ String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
+ file.transferTo(Paths.get(absPath));
+ return getPathFileName(baseDir, fileName);
+ }
+
+ /**
+ * 编码文件名
+ */
+ public static final String extractFilename(MultipartFile file)
+ {
+ return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
+ FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
+ }
+
+ public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
+ {
+ File desc = new File(uploadDir + File.separator + fileName);
+
+ if (!desc.exists())
+ {
+ if (!desc.getParentFile().exists())
+ {
+ desc.getParentFile().mkdirs();
+ }
+ }
+ return desc;
+ }
+
+ public static final String getPathFileName(String uploadDir, String fileName) throws IOException
+ {
+ int dirLastIndex = TcctynConfig.getProfile().length() + 1;
+ String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
+ return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
+ }
+
+ /**
+ * 文件大小校验
+ *
+ * @param file 上传的文件
+ * @return
+ * @throws FileSizeLimitExceededException 如果超出最大大小
+ * @throws InvalidExtensionException
+ */
+ public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
+ throws FileSizeLimitExceededException, InvalidExtensionException
+ {
+ long size = file.getSize();
+ if (size > DEFAULT_MAX_SIZE)
+ {
+ throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
+ }
+
+ String fileName = file.getOriginalFilename();
+ String extension = getExtension(file);
+ if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension))
+ {
+ if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION)
+ {
+ throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
+ fileName);
+ }
+ else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION)
+ {
+ throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
+ fileName);
+ }
+ else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION)
+ {
+ throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
+ fileName);
+ }
+ else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION)
+ {
+ throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
+ fileName);
+ }
+ else
+ {
+ throw new InvalidExtensionException(allowedExtension, extension, fileName);
+ }
+ }
+ }
+
+ /**
+ * 判断MIME类型是否是允许的MIME类型
+ *
+ * @param extension
+ * @param allowedExtension
+ * @return
+ */
+ public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
+ {
+ for (String str : allowedExtension)
+ {
+ if (str.equalsIgnoreCase(extension))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 获取文件名的后缀
+ *
+ * @param file 表单文件
+ * @return 后缀名
+ */
+ public static final String getExtension(MultipartFile file)
+ {
+ String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+ if (StringUtils.isEmpty(extension))
+ {
+ extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType()));
+ }
+ return extension;
+ }
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/FileUtils.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/FileUtils.java
index 6680230..f73ce16 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/FileUtils.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/FileUtils.java
@@ -1,17 +1,18 @@
package com.tcctyn.common.core.utils.file;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
+import com.tcctyn.common.core.config.TcctynConfig;
+import com.tcctyn.common.core.utils.DateUtils;
+import com.tcctyn.common.core.utils.StringUtils;
+import com.tcctyn.common.core.utils.uuid.IdUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.ArrayUtils;
-import com.tcctyn.common.core.utils.StringUtils;
+import java.io.*;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
/**
* 文件处理工具类
@@ -20,12 +21,6 @@ import com.tcctyn.common.core.utils.StringUtils;
*/
public class FileUtils
{
- /** 字符常量：斜杠 {@code '/'} */
- public static final char SLASH = '/';
-
- /** 字符常量：反斜杠 {@code '\\'} */
- public static final char BACKSLASH = '\\';
-
public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
/**
@@ -59,31 +54,50 @@ public class FileUtils
}
finally
{
- if (os != null)
- {
- try
- {
- os.close();
- }
- catch (IOException e1)
- {
- e1.printStackTrace();
- }
- }
- if (fis != null)
- {
- try
- {
- fis.close();
- }
- catch (IOException e1)
- {
- e1.printStackTrace();
- }
- }
+ IOUtils.close(os);
+ IOUtils.close(fis);
}
}
+ /**
+ * 写数据到文件中
+ *
+ * @param data 数据
+ * @return 目标文件
+ * @throws IOException IO异常
+ */
+ public static String writeImportBytes(byte[] data) throws IOException
+ {
+ return writeBytes(data, TcctynConfig.getImportPath());
+ }
+
+ /**
+ * 写数据到文件中
+ *
+ * @param data 数据
+ * @param uploadDir 目标文件
+ * @return 目标文件
+ * @throws IOException IO异常
+ */
+ public static String writeBytes(byte[] data, String uploadDir) throws IOException
+ {
+ FileOutputStream fos = null;
+ String pathName = "";
+ try
+ {
+ String extension = getFileExtendName(data);
+ pathName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
+ File file = FileUploadUtils.getAbsoluteFile(uploadDir, pathName);
+ fos = new FileOutputStream(file);
+ fos.write(data);
+ }
+ finally
+ {
+ IOUtils.close(fos);
+ }
+ return FileUploadUtils.getPathFileName(uploadDir, pathName);
+ }
+
/**
* 删除文件
*
@@ -126,8 +140,15 @@ public class FileUtils
{
return false;
}
- // 判断是否在允许下载的文件规则内
- return ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource));
+
+ // 检查允许下载的文件规则
+ if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource)))
+ {
+ return true;
+ }
+
+ // 不在允许下载的文件规则
+ return false;
}
/**
@@ -165,63 +186,11 @@ public class FileUtils
return filename;
}
- /**
- * 返回文件名
- *
- * @param filePath 文件
- * @return 文件名
- */
- public static String getName(String filePath)
- {
- if (null == filePath)
- {
- return null;
- }
- int len = filePath.length();
- if (0 == len)
- {
- return filePath;
- }
- if (isFileSeparator(filePath.charAt(len - 1)))
- {
- // 以分隔符结尾的去掉结尾分隔符
- len--;
- }
-
- int begin = 0;
- char c;
- for (int i = len - 1; i > -1; i--)
- {
- c = filePath.charAt(i);
- if (isFileSeparator(c))
- {
- // 查找最后一个路径分隔符（/或者\）
- begin = i + 1;
- break;
- }
- }
-
- return filePath.substring(begin, len);
- }
-
- /**
- * 是否为Windows或者Linux（Unix）文件分隔符
- * Windows平台下分隔符为\，Linux（Unix）为/
- *
- * @param c 字符
- * @return 是否为Windows或者Linux（Unix）文件分隔符
- */
- public static boolean isFileSeparator(char c)
- {
- return SLASH == c || BACKSLASH == c;
- }
-
/**
* 下载文件名重新编码
*
* @param response 响应对象
* @param realFileName 真实文件名
- * @return
*/
public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException
{
@@ -235,6 +204,7 @@ public class FileUtils
.append("utf-8''")
.append(percentEncodedFileName);
+ response.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename");
response.setHeader("Content-disposition", contentDispositionValue.toString());
response.setHeader("download-filename", percentEncodedFileName);
}
@@ -250,4 +220,67 @@ public class FileUtils
String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString());
return encode.replaceAll("\\+", "%20");
}
+
+ /**
+ * 获取图像后缀
+ *
+ * @param photoByte 图像数据
+ * @return 后缀名
+ */
+ public static String getFileExtendName(byte[] photoByte)
+ {
+ String strFileExtendName = "jpg";
+ if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56)
+ && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97))
+ {
+ strFileExtendName = "gif";
+ }
+ else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70))
+ {
+ strFileExtendName = "jpg";
+ }
+ else if ((photoByte[0] == 66) && (photoByte[1] == 77))
+ {
+ strFileExtendName = "bmp";
+ }
+ else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
+ {
+ strFileExtendName = "png";
+ }
+ return strFileExtendName;
+ }
+
+ /**
+ * 获取文件名称 /profile/upload/2022/04/16/tcctyn.png -- tcctyn.png
+ *
+ * @param fileName 路径名称
+ * @return 没有文件路径的名称
+ */
+ public static String getName(String fileName)
+ {
+ if (fileName == null)
+ {
+ return null;
+ }
+ int lastUnixPos = fileName.lastIndexOf('/');
+ int lastWindowsPos = fileName.lastIndexOf('\\');
+ int index = Math.max(lastUnixPos, lastWindowsPos);
+ return fileName.substring(index + 1);
+ }
+
+ /**
+ * 获取不带后缀文件名称 /profile/upload/2022/04/16/tcctyn.png -- tcctyn
+ *
+ * @param fileName 路径名称
+ * @return 没有文件路径和后缀的名称
+ */
+ public static String getNameNotSuffix(String fileName)
+ {
+ if (fileName == null)
+ {
+ return null;
+ }
+ String baseName = FilenameUtils.getBaseName(fileName);
+ return baseName;
+ }
}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/ImageUtils.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/ImageUtils.java
index 3a76190..dd573e3 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/ImageUtils.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/ImageUtils.java
@@ -1,13 +1,18 @@
package com.tcctyn.common.core.utils.file;
+import com.tcctyn.common.core.config.TcctynConfig;
+import com.tcctyn.common.core.constant.Constants;
+import com.tcctyn.common.core.utils.StringUtils;
+import org.apache.poi.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.util.Arrays;
-import org.apache.poi.util.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* 图片处理工具类
@@ -62,18 +67,28 @@ public class ImageUtils
InputStream in = null;
try
{
- // 网络地址
- URL urlObj = new URL(url);
- URLConnection urlConnection = urlObj.openConnection();
- urlConnection.setConnectTimeout(30 * 1000);
- urlConnection.setReadTimeout(60 * 1000);
- urlConnection.setDoInput(true);
- in = urlConnection.getInputStream();
+ if (url.startsWith("http"))
+ {
+ // 网络地址
+ URL urlObj = new URL(url);
+ URLConnection urlConnection = urlObj.openConnection();
+ urlConnection.setConnectTimeout(30 * 1000);
+ urlConnection.setReadTimeout(60 * 1000);
+ urlConnection.setDoInput(true);
+ in = urlConnection.getInputStream();
+ }
+ else
+ {
+ // 本机地址
+ String localPath = TcctynConfig.getProfile();
+ String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX);
+ in = new FileInputStream(downloadPath);
+ }
return IOUtils.toByteArray(in);
}
catch (Exception e)
{
- log.error("访问文件异常 {}", e);
+ log.error("获取文件路径异常 {}", e);
return null;
}
finally
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/MimeTypeUtils.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/MimeTypeUtils.java
index 1d8ee8b..2fbc30c 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/MimeTypeUtils.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/file/MimeTypeUtils.java
@@ -16,7 +16,7 @@ public class MimeTypeUtils
public static final String IMAGE_BMP = "image/bmp";
public static final String IMAGE_GIF = "image/gif";
-
+
public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
public static final String[] FLASH_EXTENSION = { "swf", "flv" };
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/html/HTMLFilter.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/html/HTMLFilter.java
index 8bc8cd9..b732b85 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/html/HTMLFilter.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/html/HTMLFilter.java
@@ -1,10 +1,6 @@
package com.tcctyn.common.core.utils.html;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.regex.Matcher;
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/http/HttpHelper.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/http/HttpHelper.java
new file mode 100644
index 0000000..52645a3
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/http/HttpHelper.java
@@ -0,0 +1,56 @@
+package com.tcctyn.common.core.utils.http;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.ServletRequest;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 通用http工具封装
+ *
+ * @author tcctyn
+ */
+public class HttpHelper
+{
+ private static final Logger LOGGER = LoggerFactory.getLogger(HttpHelper.class);
+
+ public static String getBodyString(ServletRequest request)
+ {
+ StringBuilder sb = new StringBuilder();
+ BufferedReader reader = null;
+ try (InputStream inputStream = request.getInputStream())
+ {
+ reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+ String line = "";
+ while ((line = reader.readLine()) != null)
+ {
+ sb.append(line);
+ }
+ }
+ catch (IOException e)
+ {
+ LOGGER.warn("getBodyString出现问题！");
+ }
+ finally
+ {
+ if (reader != null)
+ {
+ try
+ {
+ reader.close();
+ }
+ catch (IOException e)
+ {
+ LOGGER.error(ExceptionUtils.getMessage(e));
+ }
+ }
+ }
+ return sb.toString();
+ }
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/http/HttpUtils.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/http/HttpUtils.java
new file mode 100644
index 0000000..be8a3e1
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/http/HttpUtils.java
@@ -0,0 +1,266 @@
+package com.tcctyn.common.core.utils.http;
+
+import com.tcctyn.common.core.constant.Constants;
+import com.tcctyn.common.core.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.*;
+import java.io.*;
+import java.net.ConnectException;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.X509Certificate;
+
+/**
+ * 通用http发送方法
+ *
+ * @author tcctyn
+ */
+public class HttpUtils
+{
+ private static final Logger log = LoggerFactory.getLogger(HttpUtils.class);
+
+ /**
+ * 向指定 URL 发送GET方法的请求
+ *
+ * @param url 发送请求的 URL
+ * @return 所代表远程资源的响应结果
+ */
+ public static String sendGet(String url)
+ {
+ return sendGet(url, StringUtils.EMPTY);
+ }
+
+ /**
+ * 向指定 URL 发送GET方法的请求
+ *
+ * @param url 发送请求的 URL
+ * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+ * @return 所代表远程资源的响应结果
+ */
+ public static String sendGet(String url, String param)
+ {
+ return sendGet(url, param, Constants.UTF8);
+ }
+
+ /**
+ * 向指定 URL 发送GET方法的请求
+ *
+ * @param url 发送请求的 URL
+ * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+ * @param contentType 编码类型
+ * @return 所代表远程资源的响应结果
+ */
+ public static String sendGet(String url, String param, String contentType)
+ {
+ StringBuilder result = new StringBuilder();
+ BufferedReader in = null;
+ try
+ {
+ String urlNameString = StringUtils.isNotBlank(param) ? url + "?" + param : url;
+ log.info("sendGet - {}", urlNameString);
+ URL realUrl = new URL(urlNameString);
+ URLConnection connection = realUrl.openConnection();
+ connection.setRequestProperty("accept", "*/*");
+ connection.setRequestProperty("connection", "Keep-Alive");
+ connection.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)");
+ connection.connect();
+ in = new BufferedReader(new InputStreamReader(connection.getInputStream(), contentType));
+ String line;
+ while ((line = in.readLine()) != null)
+ {
+ result.append(line);
+ }
+ log.info("recv - {}", result);
+ }
+ catch (ConnectException e)
+ {
+ log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e);
+ }
+ catch (SocketTimeoutException e)
+ {
+ log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e);
+ }
+ catch (IOException e)
+ {
+ log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e);
+ }
+ catch (Exception e)
+ {
+ log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e);
+ }
+ finally
+ {
+ try
+ {
+ if (in != null)
+ {
+ in.close();
+ }
+ }
+ catch (Exception ex)
+ {
+ log.error("调用in.close Exception, url=" + url + ",param=" + param, ex);
+ }
+ }
+ return result.toString();
+ }
+
+ /**
+ * 向指定 URL 发送POST方法的请求
+ *
+ * @param url 发送请求的 URL
+ * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+ * @return 所代表远程资源的响应结果
+ */
+ public static String sendPost(String url, String param)
+ {
+ PrintWriter out = null;
+ BufferedReader in = null;
+ StringBuilder result = new StringBuilder();
+ try
+ {
+ log.info("sendPost - {}", url);
+ URL realUrl = new URL(url);
+ URLConnection conn = realUrl.openConnection();
+ conn.setRequestProperty("accept", "*/*");
+ conn.setRequestProperty("connection", "Keep-Alive");
+ conn.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)");
+ conn.setRequestProperty("Accept-Charset", "utf-8");
+ conn.setRequestProperty("contentType", "utf-8");
+ conn.setDoOutput(true);
+ conn.setDoInput(true);
+ out = new PrintWriter(conn.getOutputStream());
+ out.print(param);
+ out.flush();
+ in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
+ String line;
+ while ((line = in.readLine()) != null)
+ {
+ result.append(line);
+ }
+ log.info("recv - {}", result);
+ }
+ catch (ConnectException e)
+ {
+ log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e);
+ }
+ catch (SocketTimeoutException e)
+ {
+ log.error("调用HttpUtils.sendPost SocketTimeoutException, url=" + url + ",param=" + param, e);
+ }
+ catch (IOException e)
+ {
+ log.error("调用HttpUtils.sendPost IOException, url=" + url + ",param=" + param, e);
+ }
+ catch (Exception e)
+ {
+ log.error("调用HttpsUtil.sendPost Exception, url=" + url + ",param=" + param, e);
+ }
+ finally
+ {
+ try
+ {
+ if (out != null)
+ {
+ out.close();
+ }
+ if (in != null)
+ {
+ in.close();
+ }
+ }
+ catch (IOException ex)
+ {
+ log.error("调用in.close Exception, url=" + url + ",param=" + param, ex);
+ }
+ }
+ return result.toString();
+ }
+
+ public static String sendSSLPost(String url, String param)
+ {
+ StringBuilder result = new StringBuilder();
+ String urlNameString = url + "?" + param;
+ try
+ {
+ log.info("sendSSLPost - {}", urlNameString);
+ SSLContext sc = SSLContext.getInstance("SSL");
+ sc.init(null, new TrustManager[] { new TrustAnyTrustManager() }, new java.security.SecureRandom());
+ URL console = new URL(urlNameString);
+ HttpsURLConnection conn = (HttpsURLConnection) console.openConnection();
+ conn.setRequestProperty("accept", "*/*");
+ conn.setRequestProperty("connection", "Keep-Alive");
+ conn.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)");
+ conn.setRequestProperty("Accept-Charset", "utf-8");
+ conn.setRequestProperty("contentType", "utf-8");
+ conn.setDoOutput(true);
+ conn.setDoInput(true);
+
+ conn.setSSLSocketFactory(sc.getSocketFactory());
+ conn.setHostnameVerifier(new TrustAnyHostnameVerifier());
+ conn.connect();
+ InputStream is = conn.getInputStream();
+ BufferedReader br = new BufferedReader(new InputStreamReader(is));
+ String ret = "";
+ while ((ret = br.readLine()) != null)
+ {
+ if (ret != null && !"".equals(ret.trim()))
+ {
+ result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8));
+ }
+ }
+ log.info("recv - {}", result);
+ conn.disconnect();
+ br.close();
+ }
+ catch (ConnectException e)
+ {
+ log.error("调用HttpUtils.sendSSLPost ConnectException, url=" + url + ",param=" + param, e);
+ }
+ catch (SocketTimeoutException e)
+ {
+ log.error("调用HttpUtils.sendSSLPost SocketTimeoutException, url=" + url + ",param=" + param, e);
+ }
+ catch (IOException e)
+ {
+ log.error("调用HttpUtils.sendSSLPost IOException, url=" + url + ",param=" + param, e);
+ }
+ catch (Exception e)
+ {
+ log.error("调用HttpsUtil.sendSSLPost Exception, url=" + url + ",param=" + param, e);
+ }
+ return result.toString();
+ }
+
+ private static class TrustAnyTrustManager implements X509TrustManager
+ {
+ @Override
+ public void checkClientTrusted(X509Certificate[] chain, String authType)
+ {
+ }
+
+ @Override
+ public void checkServerTrusted(X509Certificate[] chain, String authType)
+ {
+ }
+
+ @Override
+ public X509Certificate[] getAcceptedIssuers()
+ {
+ return new X509Certificate[] {};
+ }
+ }
+
+ private static class TrustAnyHostnameVerifier implements HostnameVerifier
+ {
+ @Override
+ public boolean verify(String hostname, SSLSession session)
+ {
+ return true;
+ }
+ }
+}
\ No newline at end of file
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/ip/AddressUtils.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/ip/AddressUtils.java
new file mode 100644
index 0000000..5b08036
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/ip/AddressUtils.java
@@ -0,0 +1,56 @@
+package com.tcctyn.common.core.utils.ip;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.tcctyn.common.core.config.TcctynConfig;
+import com.tcctyn.common.core.constant.Constants;
+import com.tcctyn.common.core.utils.StringUtils;
+import com.tcctyn.common.core.utils.http.HttpUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 获取地址类
+ *
+ * @author tcctyn
+ */
+public class AddressUtils
+{
+ private static final Logger log = LoggerFactory.getLogger(AddressUtils.class);
+
+ // IP地址查询
+ public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp";
+
+ // 未知地址
+ public static final String UNKNOWN = "XX XX";
+
+ public static String getRealAddressByIP(String ip)
+ {
+ // 内网不查询
+ if (IpUtils.internalIp(ip))
+ {
+ return "内网IP";
+ }
+ if (TcctynConfig.isAddressEnabled())
+ {
+ try
+ {
+ String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true", Constants.GBK);
+ if (StringUtils.isEmpty(rspStr))
+ {
+ log.error("获取地理位置异常 {}", ip);
+ return UNKNOWN;
+ }
+ JSONObject obj = JSON.parseObject(rspStr);
+ String region = obj.getString("pro");
+ String city = obj.getString("city");
+ return String.format("%s %s", region, city);
+ }
+ catch (Exception e)
+ {
+ log.error("获取地理位置异常 {}", ip);
+ }
+ }
+ return UNKNOWN;
+ }
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/ip/IpUtils.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/ip/IpUtils.java
index 74a31ca..4fcfdfc 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/ip/IpUtils.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/ip/IpUtils.java
@@ -1,11 +1,12 @@
package com.tcctyn.common.core.utils.ip;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import javax.servlet.http.HttpServletRequest;
import com.tcctyn.common.core.utils.ServletUtils;
import com.tcctyn.common.core.utils.StringUtils;
+import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
/**
* 获取IP方法
*
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/mqtt/JavaDemoMQTTV3.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/mqtt/JavaDemoMQTTV3.java
new file mode 100644
index 0000000..7d313eb
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/mqtt/JavaDemoMQTTV3.java
@@ -0,0 +1,51 @@
+package com.tcctyn.common.core.utils.mqtt;
+
+public class JavaDemoMQTTV3 {
+
+ public static void main(String[] args) {
+ String broker = "tcp://47.109.202.121:1883";
+ String clientId = "hqyjDemo";
+ String topic = "topic/hqyj";
+ int subQos = 1;
+ int pubQos = 1;
+ String msg = "Hello MQTT";
+
+
+
+// try {
+// MqttClient client = new MqttClient(broker, clientId);
+// MqttConnectOptions options = new MqttConnectOptions();
+// client.connect(options);
+//
+// if (client.isConnected()) {
+// client.setCallback(new MqttCallback() {
+// public void messageArrived(String topic, MqttMessage message) throws Exception {
+// System.out.println("topic: " + topic);
+// System.out.println("qos: " + message.getQos());
+// System.out.println("message content: " + new String(message.getPayload()));
+// }
+//
+// public void connectionLost(Throwable cause) {
+// System.out.println("connectionLost: " + cause.getMessage());
+// }
+//
+// public void deliveryComplete(IMqttDeliveryToken token) {
+// System.out.println("deliveryComplete: " + token.isComplete());
+// }
+// });
+//
+// client.subscribe(topic, subQos);
+//
+// MqttMessage message = new MqttMessage(msg.getBytes());
+// message.setQos(pubQos);
+// client.publish(topic, message);
+// }
+//
+// client.disconnect();
+// client.close();
+//
+// } catch (MqttException e) {
+// e.printStackTrace();
+// }
+ }
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/mqtt/MqttConfig.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/mqtt/MqttConfig.java
new file mode 100644
index 0000000..14c6b4e
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/mqtt/MqttConfig.java
@@ -0,0 +1,63 @@
+package com.tcctyn.common.core.utils.mqtt;
+
+import com.tcctyn.common.core.utils.StringUtils;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties("spring.mqtt")
+@Data
+public class MqttConfig {
+
+ @Autowired
+ private MqttPushClient mqttPushClient;
+
+ /**
+ * 用户名
+ */
+ private String username;
+ /**
+ * 密码
+ */
+ private String password;
+ /**
+ * 连接地址
+ */
+ private String hostUrl;
+ /**
+ * 客户Id
+ */
+ private String clientId;
+ /**
+ * 默认连接话题
+ */
+ private String defaultTopic;
+ /**
+ * 超时时间
+ */
+ private int timeout;
+ /**
+ * 保持连接数
+ */
+ private int keepalive;
+ /**
+ * mqtt功能使能
+ */
+ private boolean enabled;
+
+ @Bean
+ public MqttPushClient getMqttPushClient() {
+ if(enabled == true){
+ String mqtt_topic[] = StringUtils.split(defaultTopic, ",");
+ mqttPushClient.connect(hostUrl, clientId, username, password, timeout, keepalive);//连接
+ for(int i=0; i
@@ -77,6 +55,11 @@ public class ExcelUtil
public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
+ /**
+ * 用于dictType属性数据存储，避免重复查缓存
+ */
+ public Map sysDictMap = new HashMap();
+
/**
* Excel sheet最大行数，默认65536
*/
@@ -167,11 +150,6 @@ public class ExcelUtil
*/
public Class clazz;
- /**
- * 需要显示列属性
- */
- public String[] includeFields;
-
/**
* 需要排除列属性
*/
@@ -182,20 +160,11 @@ public class ExcelUtil
this.clazz = clazz;
}
- /**
- * 仅在Excel中显示列属性
- *
- * @param fields 列属性名 示例[单个"name"/多个"id","name"]
- */
- public void showColumn(String... fields)
- {
- this.includeFields = fields;
- }
-
/**
* 隐藏Excel中列属性
*
* @param fields 列属性名 示例[单个"name"/多个"id","name"]
+ * @throws Exception
*/
public void hideColumn(String... fields)
{
@@ -225,6 +194,8 @@ public class ExcelUtil
{
if (StringUtils.isNotEmpty(title))
{
+ subMergedFirstRowNum++;
+ subMergedLastRowNum++;
int titleLastCol = this.fields.size() - 1;
if (isSubList())
{
@@ -235,7 +206,7 @@ public class ExcelUtil
Cell titleCell = titleRow.createCell(0);
titleCell.setCellStyle(styles.get("title"));
titleCell.setCellValue(title);
- sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), 0, titleLastCol));
+ sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(), titleLastCol));
}
}
@@ -246,31 +217,23 @@ public class ExcelUtil
{
if (isSubList())
{
+ subMergedFirstRowNum++;
+ subMergedLastRowNum++;
Row subRow = sheet.createRow(rownum);
- int column = 0;
- int subFieldSize = subFields != null ? subFields.size() : 0;
+ int excelNum = 0;
for (Object[] objects : fields)
{
- Field field = (Field) objects[0];
Excel attr = (Excel) objects[1];
- if (Collection.class.isAssignableFrom(field.getType()))
- {
- Cell cell = subRow.createCell(column);
- cell.setCellValue(attr.name());
- cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
- if (subFieldSize > 1)
- {
- CellRangeAddress cellAddress = new CellRangeAddress(rownum, rownum, column, column + subFieldSize - 1);
- sheet.addMergedRegion(cellAddress);
- }
- column += subFieldSize;
- }
- else
- {
- Cell cell = subRow.createCell(column++);
- cell.setCellValue(attr.name());
- cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
- }
+ Cell headCell1 = subRow.createCell(excelNum);
+ headCell1.setCellValue(attr.name());
+ headCell1.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
+ excelNum++;
+ }
+ int headFirstRow = excelNum - 1;
+ int headLastRow = headFirstRow + subFields.size() - 1;
+ if (headLastRow > headFirstRow)
+ {
+ sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow));
}
rownum++;
}
@@ -283,23 +246,11 @@ public class ExcelUtil
* @return 转换后集合
*/
public List importExcel(InputStream is)
- {
- return importExcel(is, 0);
- }
-
- /**
- * 对excel表单默认第一个索引名转换成list
- *
- * @param is 输入流
- * @param titleNum 标题占用行数
- * @return 转换后集合
- */
- public List importExcel(InputStream is, int titleNum)
{
List list = null;
try
{
- list = importExcel(StringUtils.EMPTY, is, titleNum);
+ list = importExcel(is, 0);
}
catch (Exception e)
{
@@ -313,6 +264,18 @@ public class ExcelUtil
return list;
}
+ /**
+ * 对excel表单默认第一个索引名转换成list
+ *
+ * @param is 输入流
+ * @param titleNum 标题占用行数
+ * @return 转换后集合
+ */
+ public List importExcel(InputStream is, int titleNum) throws Exception
+ {
+ return importExcel(StringUtils.EMPTY, is, titleNum);
+ }
+
/**
* 对excel表单指定表格索引名转换成list
*
@@ -332,7 +295,16 @@ public class ExcelUtil
{
throw new IOException("文件sheet不存在");
}
-
+ boolean isXSSFWorkbook = !(wb instanceof HSSFWorkbook);
+ Map pictures;
+ if (isXSSFWorkbook)
+ {
+ pictures = getSheetPictures07((XSSFSheet) sheet, (XSSFWorkbook) wb);
+ }
+ else
+ {
+ pictures = getSheetPictures03((HSSFSheet) sheet, (HSSFWorkbook) wb);
+ }
// 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1
int rows = sheet.getLastRowNum();
if (rows > 0)
@@ -390,7 +362,7 @@ public class ExcelUtil
if (String.class == fieldType)
{
String s = Convert.toStr(val);
- if (s.matches("^\\d+\\.0$"))
+ if (StringUtils.endsWith(s, ".0"))
{
val = StringUtils.substringBefore(s, ".0");
}
@@ -453,10 +425,32 @@ public class ExcelUtil
{
val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
}
+ else if (StringUtils.isNotEmpty(attr.dictType()))
+ {
+ if (!sysDictMap.containsKey(attr.dictType() + val))
+ {
+ String dictValue = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());
+ sysDictMap.put(attr.dictType() + val, dictValue);
+ }
+ val = sysDictMap.get(attr.dictType() + val);
+ }
else if (!attr.handler().equals(ExcelHandlerAdapter.class))
{
val = dataFormatHandlerAdapter(val, attr, null);
}
+ else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures))
+ {
+ PictureData image = pictures.get(row.getRowNum() + "_" + entry.getKey());
+ if (image == null)
+ {
+ val = "";
+ }
+ else
+ {
+ byte[] data = image.getData();
+ val = FileUtils.writeImportBytes(data);
+ }
+ }
ReflectUtils.invokeSetter(entity, propertyName, val);
}
}
@@ -468,7 +462,33 @@ public class ExcelUtil
/**
* 对list数据源将其里面的数据导入到excel表单
- *
+ *
+ * @param list 导出数据集合
+ * @param sheetName 工作表的名称
+ * @return 结果
+ */
+ public AjaxResult exportExcel(List list, String sheetName)
+ {
+ return exportExcel(list, sheetName, StringUtils.EMPTY);
+ }
+
+ /**
+ * 对list数据源将其里面的数据导入到excel表单
+ *
+ * @param list 导出数据集合
+ * @param sheetName 工作表的名称
+ * @param title 标题
+ * @return 结果
+ */
+ public AjaxResult exportExcel(List list, String sheetName, String title)
+ {
+ this.init(list, sheetName, title, Type.EXPORT);
+ return exportExcel();
+ }
+
+ /**
+ * 对list数据源将其里面的数据导入到excel表单
+ *
* @param response 返回数据
* @param list 导出数据集合
* @param sheetName 工作表的名称
@@ -481,7 +501,7 @@ public class ExcelUtil
/**
* 对list数据源将其里面的数据导入到excel表单
- *
+ *
* @param response 返回数据
* @param list 导出数据集合
* @param sheetName 工作表的名称
@@ -498,7 +518,31 @@ public class ExcelUtil
/**
* 对list数据源将其里面的数据导入到excel表单
- *
+ *
+ * @param sheetName 工作表的名称
+ * @return 结果
+ */
+ public AjaxResult importTemplateExcel(String sheetName)
+ {
+ return importTemplateExcel(sheetName, StringUtils.EMPTY);
+ }
+
+ /**
+ * 对list数据源将其里面的数据导入到excel表单
+ *
+ * @param sheetName 工作表的名称
+ * @param title 标题
+ * @return 结果
+ */
+ public AjaxResult importTemplateExcel(String sheetName, String title)
+ {
+ this.init(null, sheetName, title, Type.IMPORT);
+ return exportExcel();
+ }
+
+ /**
+ * 对list数据源将其里面的数据导入到excel表单
+ *
* @param sheetName 工作表的名称
* @return 结果
*/
@@ -509,7 +553,7 @@ public class ExcelUtil
/**
* 对list数据源将其里面的数据导入到excel表单
- *
+ *
* @param sheetName 工作表的名称
* @param title 标题
* @return 结果
@@ -544,6 +588,34 @@ public class ExcelUtil
}
}
+ /**
+ * 对list数据源将其里面的数据导入到excel表单
+ *
+ * @return 结果
+ */
+ public AjaxResult exportExcel()
+ {
+ OutputStream out = null;
+ try
+ {
+ writeSheet();
+ String filename = encodingFilename(sheetName);
+ out = new FileOutputStream(getAbsoluteFile(filename));
+ wb.write(out);
+ return AjaxResult.success(filename);
+ }
+ catch (Exception e)
+ {
+ log.error("导出Excel异常{}", e.getMessage());
+ throw new UtilException("导出Excel失败，请联系网站管理员！");
+ }
+ finally
+ {
+ IOUtils.closeQuietly(wb);
+ IOUtils.closeQuietly(out);
+ }
+ }
+
/**
* 创建写入数据到Sheet
*/
@@ -595,91 +667,64 @@ public class ExcelUtil
{
int startNo = index * sheetSize;
int endNo = Math.min(startNo + sheetSize, list.size());
- int currentRowNum = rownum + 1; // 从标题行后开始
-
+ int rowNo = (1 + rownum) - startNo;
for (int i = startNo; i < endNo; i++)
{
- row = sheet.createRow(currentRowNum);
+ rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;
+ row = sheet.createRow(rowNo);
+ // 得到导出对象.
T vo = (T) list.get(i);
+ Collection subList = null;
+ if (isSubList())
+ {
+ if (isSubListValue(vo))
+ {
+ subList = getListCellValue(vo);
+ subMergedLastRowNum = subMergedLastRowNum + subList.size();
+ }
+ else
+ {
+ subMergedFirstRowNum++;
+ subMergedLastRowNum++;
+ }
+ }
int column = 0;
- int maxSubListSize = getCurrentMaxSubListSize(vo);
for (Object[] os : fields)
{
Field field = (Field) os[0];
Excel excel = (Excel) os[1];
- if (Collection.class.isAssignableFrom(field.getType()))
+ if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList))
{
- try
+ boolean subFirst = false;
+ for (Object obj : subList)
{
- Collection subList = (Collection) getTargetValue(vo, field, excel);
- if (subList != null && !subList.isEmpty())
+ if (subFirst)
{
- int subIndex = 0;
- for (Object subVo : subList)
- {
- Row subRow = sheet.getRow(currentRowNum + subIndex);
- if (subRow == null)
- {
- subRow = sheet.createRow(currentRowNum + subIndex);
- }
-
- int subColumn = column;
- for (Field subField : subFields)
- {
- Excel subExcel = subField.getAnnotation(Excel.class);
- addCell(subExcel, subRow, (T) subVo, subField, subColumn++);
- }
- subIndex++;
- }
- column += subFields.size();
+ rowNo++;
+ row = sheet.createRow(rowNo);
}
+ List subFields = FieldUtils.getFieldsListWithAnnotation(obj.getClass(), Excel.class);
+ int subIndex = 0;
+ for (Field subField : subFields)
+ {
+ if (subField.isAnnotationPresent(Excel.class))
+ {
+ subField.setAccessible(true);
+ Excel attr = subField.getAnnotation(Excel.class);
+ this.addCell(attr, row, (T) obj, subField, column + subIndex);
+ }
+ subIndex++;
+ }
+ subFirst = true;
}
- catch (Exception e)
- {
- log.error("填充集合数据失败", e);
- }
+ this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size();
}
else
{
- // 创建单元格并设置值
- addCell(excel, row, vo, field, column);
- if (maxSubListSize > 1 && excel.needMerge())
- {
- sheet.addMergedRegion(new CellRangeAddress(currentRowNum, currentRowNum + maxSubListSize - 1, column, column));
- }
- column++;
- }
- }
- currentRowNum += maxSubListSize;
- }
- }
-
- /**
- * 获取子列表最大数
- */
- private int getCurrentMaxSubListSize(T vo)
- {
- int maxSubListSize = 1;
- for (Object[] os : fields)
- {
- Field field = (Field) os[0];
- if (Collection.class.isAssignableFrom(field.getType()))
- {
- try
- {
- Collection subList = (Collection) getTargetValue(vo, field, (Excel) os[1]);
- if (subList != null && !subList.isEmpty())
- {
- maxSubListSize = Math.max(maxSubListSize, subList.size());
- }
- }
- catch (Exception e)
- {
- log.error("获取集合大小失败", e);
+ this.addCell(excel, row, vo, field, column++);
}
}
}
- return maxSubListSize;
}
/**
@@ -814,7 +859,7 @@ public class ExcelUtil
*/
public void annotationDataStyles(Map styles, Field field, Excel excel)
{
- String key = StringUtils.format("data_{}_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType(), excel.wrapText());
+ String key = StringUtils.format("data_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType());
if (!styles.containsKey(key))
{
CellStyle style = wb.createCellStyle();
@@ -830,7 +875,6 @@ public class ExcelUtil
style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
style.setFillForegroundColor(excel.backgroundColor().getIndex());
- style.setWrapText(excel.wrapText());
Font dataFont = wb.createFont();
dataFont.setFontName("Arial");
dataFont.setFontHeightInPoints((short) 10);
@@ -859,7 +903,7 @@ public class ExcelUtil
if (isSubList())
{
// 填充默认样式，防止合并单元格样式失效
- sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType(), attr.wrapText())));
+ sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType())));
if (attr.needMerge())
{
sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column));
@@ -954,17 +998,28 @@ public class ExcelUtil
// 设置列宽
sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
}
- if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0)
+ if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0 || attr.comboReadDict())
{
- if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255)
+ String[] comboArray = attr.combo();
+ if (attr.comboReadDict())
+ {
+ if (!sysDictMap.containsKey("combo_" + attr.dictType()))
+ {
+ String labels = DictUtils.getDictLabels(attr.dictType());
+ sysDictMap.put("combo_" + attr.dictType(), labels);
+ }
+ String val = sysDictMap.get("combo_" + attr.dictType());
+ comboArray = StringUtils.split(val, DictUtils.SEPARATOR);
+ }
+ if (comboArray.length > 15 || StringUtils.join(comboArray).length() > 255)
{
// 如果下拉数大于15或字符串长度大于255，则使用一个新sheet存储，避免生成的模板下拉值获取不到
- setXSSFValidationWithHidden(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
+ setXSSFValidationWithHidden(sheet, comboArray, attr.prompt(), 1, 100, column, column);
}
else
{
// 提示信息或只能选择不能输入的列内容.
- setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
+ setPromptOrValidation(sheet, comboArray, attr.prompt(), 1, 100, column, column);
}
}
}
@@ -986,27 +1041,34 @@ public class ExcelUtil
cell = row.createCell(column);
if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
{
- if (subMergedLastRowNum >= subMergedFirstRowNum)
- {
- sheet.addMergedRegion(new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column));
- }
+ CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);
+ sheet.addMergedRegion(cellAddress);
}
- cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType(), attr.wrapText())));
+ cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType())));
// 用于读取对象中的属性
Object value = getTargetValue(vo, field, attr);
String dateFormat = attr.dateFormat();
String readConverterExp = attr.readConverterExp();
String separator = attr.separator();
+ String dictType = attr.dictType();
if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
{
- cell.getCellStyle().setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat));
cell.setCellValue(parseDateToStr(dateFormat, value));
}
else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
{
cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
}
+ else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value))
+ {
+ if (!sysDictMap.containsKey(dictType + value))
+ {
+ String lable = convertDictByExp(Convert.toStr(value), dictType, separator);
+ sysDictMap.put(dictType + value, lable);
+ }
+ cell.setCellValue(sysDictMap.get(dictType + value));
+ }
else if (value instanceof BigDecimal && -1 != attr.scale())
{
cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).doubleValue());
@@ -1193,9 +1255,35 @@ public class ExcelUtil
return StringUtils.stripEnd(propertyString.toString(), separator);
}
+ /**
+ * 解析字典值
+ *
+ * @param dictValue 字典值
+ * @param dictType 字典类型
+ * @param separator 分隔符
+ * @return 字典标签
+ */
+ public static String convertDictByExp(String dictValue, String dictType, String separator)
+ {
+ return DictUtils.getDictLabel(dictType, dictValue, separator);
+ }
+
+ /**
+ * 反向解析值字典值
+ *
+ * @param dictLabel 字典标签
+ * @param dictType 字典类型
+ * @param separator 分隔符
+ * @return 字典值
+ */
+ public static String reverseDictByExp(String dictLabel, String dictType, String separator)
+ {
+ return DictUtils.getDictValue(dictType, dictLabel, separator);
+ }
+
/**
* 数据处理器
- *
+ *
* @param value 数据值
* @param excel 数据注解
* @return
@@ -1261,9 +1349,34 @@ public class ExcelUtil
}
}
+ /**
+ * 编码文件名
+ */
+ public String encodingFilename(String filename)
+ {
+ filename = UUID.randomUUID() + "_" + filename + ".xlsx";
+ return filename;
+ }
+
+ /**
+ * 获取下载路径
+ *
+ * @param filename 文件名称
+ */
+ public String getAbsoluteFile(String filename)
+ {
+ String downloadPath = TcctynConfig.getDownloadPath() + filename;
+ File desc = new File(downloadPath);
+ if (!desc.getParentFile().exists())
+ {
+ desc.getParentFile().mkdirs();
+ }
+ return downloadPath;
+ }
+
/**
* 获取bean中的属性值
- *
+ *
* @param vo 实体对象
* @param field 字段
* @param excel 注解
@@ -1272,7 +1385,6 @@ public class ExcelUtil
*/
private Object getTargetValue(T vo, Field field, Excel excel) throws Exception
{
- field.setAccessible(true);
Object o = field.get(vo);
if (StringUtils.isNotEmpty(excel.targetAttr()))
{
@@ -1295,7 +1407,7 @@ public class ExcelUtil
/**
* 以类的属性的get方法方法形式获取值
- *
+ *
* @param o
* @param name
* @return value
@@ -1332,85 +1444,48 @@ public class ExcelUtil
List tempFields = new ArrayList<>();
tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
- if (StringUtils.isNotEmpty(includeFields))
+ for (Field field : tempFields)
{
- for (Field field : tempFields)
+ if (!ArrayUtils.contains(this.excludeFields, field.getName()))
{
- if (ArrayUtils.contains(this.includeFields, field.getName()) || field.isAnnotationPresent(Excels.class))
+ // 单注解
+ if (field.isAnnotationPresent(Excel.class))
{
- addField(fields, field);
+ Excel attr = field.getAnnotation(Excel.class);
+ if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
+ {
+ field.setAccessible(true);
+ fields.add(new Object[] { field, attr });
+ }
+ if (Collection.class.isAssignableFrom(field.getType()))
+ {
+ subMethod = getSubMethod(field.getName(), clazz);
+ ParameterizedType pt = (ParameterizedType) field.getGenericType();
+ Class subClass = (Class) pt.getActualTypeArguments()[0];
+ this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
+ }
}
- }
- }
- else if (StringUtils.isNotEmpty(excludeFields))
- {
- for (Field field : tempFields)
- {
- if (!ArrayUtils.contains(this.excludeFields, field.getName()))
+
+ // 多注解
+ if (field.isAnnotationPresent(Excels.class))
{
- addField(fields, field);
+ Excels attrs = field.getAnnotation(Excels.class);
+ Excel[] excels = attrs.value();
+ for (Excel attr : excels)
+ {
+ if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())
+ && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
+ {
+ field.setAccessible(true);
+ fields.add(new Object[] { field, attr });
+ }
+ }
}
}
}
- else
- {
- for (Field field : tempFields)
- {
- addField(fields, field);
- }
- }
return fields;
}
- /**
- * 添加字段信息
- */
- public void addField(List fields, Field field)
- {
- // 单注解
- if (field.isAnnotationPresent(Excel.class))
- {
- Excel attr = field.getAnnotation(Excel.class);
- if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
- {
- fields.add(new Object[] { field, attr });
- }
- if (Collection.class.isAssignableFrom(field.getType()))
- {
- subMethod = getSubMethod(field.getName(), clazz);
- ParameterizedType pt = (ParameterizedType) field.getGenericType();
- Class subClass = (Class) pt.getActualTypeArguments()[0];
- this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
- }
- }
-
- // 多注解
- if (field.isAnnotationPresent(Excels.class))
- {
- Excels attrs = field.getAnnotation(Excels.class);
- Excel[] excels = attrs.value();
- for (Excel attr : excels)
- {
- if (StringUtils.isNotEmpty(includeFields))
- {
- if (ArrayUtils.contains(this.includeFields, field.getName() + "." + attr.targetAttr())
- && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
- {
- fields.add(new Object[] { field, attr });
- }
- }
- else
- {
- if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())
- && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
- {
- fields.add(new Object[] { field, attr });
- }
- }
- }
- }
- }
-
/**
* 根据注解获取最大行高
*/
@@ -1536,6 +1611,71 @@ public class ExcelUtil
return true;
}
+ /**
+ * 获取Excel2003图片
+ *
+ * @param sheet 当前sheet对象
+ * @param workbook 工作簿对象
+ * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData
+ */
+ public static Map getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook)
+ {
+ Map sheetIndexPicMap = new HashMap();
+ List pictures = workbook.getAllPictures();
+ if (!pictures.isEmpty())
+ {
+ for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren())
+ {
+ HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor();
+ if (shape instanceof HSSFPicture)
+ {
+ HSSFPicture pic = (HSSFPicture) shape;
+ int pictureIndex = pic.getPictureIndex() - 1;
+ HSSFPictureData picData = pictures.get(pictureIndex);
+ String picIndex = anchor.getRow1() + "_" + anchor.getCol1();
+ sheetIndexPicMap.put(picIndex, picData);
+ }
+ }
+ return sheetIndexPicMap;
+ }
+ else
+ {
+ return sheetIndexPicMap;
+ }
+ }
+
+ /**
+ * 获取Excel2007图片
+ *
+ * @param sheet 当前sheet对象
+ * @param workbook 工作簿对象
+ * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData
+ */
+ public static Map getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook)
+ {
+ Map sheetIndexPicMap = new HashMap();
+ for (POIXMLDocumentPart dr : sheet.getRelations())
+ {
+ if (dr instanceof XSSFDrawing)
+ {
+ XSSFDrawing drawing = (XSSFDrawing) dr;
+ List shapes = drawing.getShapes();
+ for (XSSFShape shape : shapes)
+ {
+ if (shape instanceof XSSFPicture)
+ {
+ XSSFPicture pic = (XSSFPicture) shape;
+ XSSFClientAnchor anchor = pic.getPreferredSize();
+ CTMarker ctMarker = anchor.getFrom();
+ String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol();
+ sheetIndexPicMap.put(picIndex, pic.getPictureData());
+ }
+ }
+ }
+ }
+ return sheetIndexPicMap;
+ }
+
/**
* 格式化不同类型的日期对象
*
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/reflect/ReflectUtils.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/reflect/ReflectUtils.java
index e700209..4026509 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/reflect/ReflectUtils.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/reflect/ReflectUtils.java
@@ -1,19 +1,15 @@
package com.tcctyn.common.core.utils.reflect;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Date;
+import com.tcctyn.common.core.text.Convert;
+import com.tcctyn.common.core.utils.DateUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import org.apache.poi.ss.usermodel.DateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.tcctyn.common.core.text.Convert;
-import com.tcctyn.common.core.utils.DateUtils;
+
+import java.lang.reflect.*;
+import java.util.Date;
/**
* 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/sign/Md5Utils.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/sign/Md5Utils.java
new file mode 100644
index 0000000..3513115
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/sign/Md5Utils.java
@@ -0,0 +1,68 @@
+package com.tcctyn.common.core.utils.sign;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+
+/**
+ * Md5加密方法
+ *
+ * @author tcctyn
+ */
+public class Md5Utils
+{
+ private static final Logger log = LoggerFactory.getLogger(Md5Utils.class);
+
+ private static byte[] md5(String s)
+ {
+ MessageDigest algorithm;
+ try
+ {
+ algorithm = MessageDigest.getInstance("MD5");
+ algorithm.reset();
+ algorithm.update(s.getBytes("UTF-8"));
+ byte[] messageDigest = algorithm.digest();
+ return messageDigest;
+ }
+ catch (Exception e)
+ {
+ log.error("MD5 Error...", e);
+ }
+ return null;
+ }
+
+ private static final String toHex(byte hash[])
+ {
+ if (hash == null)
+ {
+ return null;
+ }
+ StringBuffer buf = new StringBuffer(hash.length * 2);
+ int i;
+
+ for (i = 0; i < hash.length; i++)
+ {
+ if ((hash[i] & 0xff) < 0x10)
+ {
+ buf.append("0");
+ }
+ buf.append(Long.toString(hash[i] & 0xff, 16));
+ }
+ return buf.toString();
+ }
+
+ public static String hash(String s)
+ {
+ try
+ {
+ return new String(toHex(md5(s)).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
+ }
+ catch (Exception e)
+ {
+ log.error("not supported charset...{}", e);
+ return s;
+ }
+ }
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/sql/SqlUtil.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/sql/SqlUtil.java
index 4bd609c..15b7a8b 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/sql/SqlUtil.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/sql/SqlUtil.java
@@ -13,7 +13,7 @@ public class SqlUtil
/**
* 定义常用的 sql关键字
*/
- public static String SQL_REGEX = "\u000B|and |extractvalue|updatexml|sleep|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |union |like |+|/*|user()";
+ public static String SQL_REGEX = "and |extractvalue|updatexml|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |+|user()";
/**
* 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/uuid/Seq.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/uuid/Seq.java
index d2c4ded..2dfff8e 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/uuid/Seq.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/uuid/Seq.java
@@ -1,9 +1,10 @@
package com.tcctyn.common.core.utils.uuid;
-import java.util.concurrent.atomic.AtomicInteger;
import com.tcctyn.common.core.utils.DateUtils;
import com.tcctyn.common.core.utils.StringUtils;
+import java.util.concurrent.atomic.AtomicInteger;
+
/**
* @author tcctyn 序列生成类
*/
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/uuid/UUID.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/uuid/UUID.java
index 649e7ef..7fb0200 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/uuid/UUID.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/utils/uuid/UUID.java
@@ -1,11 +1,12 @@
package com.tcctyn.common.core.utils.uuid;
+import com.tcctyn.common.core.exception.UtilException;
+
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
-import com.tcctyn.common.core.exception.UtilException;
/**
* 提供通用唯一识别码（universally unique identifier）（UUID）实现
@@ -66,7 +67,7 @@ public final class UUID implements java.io.Serializable, Comparable
}
/**
- * 获取类型 4（伪随机生成的）UUID 的静态工厂。
+ * 获取类型 4（伪随机生成的）UUID 的静态工厂。
*
* @return 随机生成的 {@code UUID}
*/
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/controller/BaseController.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/controller/BaseController.java
index e3c33a0..c47388e 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/controller/BaseController.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/controller/BaseController.java
@@ -1,45 +1,44 @@
package com.tcctyn.common.core.web.controller;
-import java.beans.PropertyEditorSupport;
-import java.util.Date;
-import java.util.List;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tcctyn.common.core.constant.HttpStatus;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.common.core.web.domain.model.LoginUser;
+import com.tcctyn.common.core.web.page.PageDomain;
+import com.tcctyn.common.core.web.page.TableDataInfo;
+import com.tcctyn.common.core.web.page.TableSupport;
+import com.tcctyn.common.core.utils.DateUtils;
+import com.tcctyn.common.core.utils.PageUtils;
+import com.tcctyn.common.core.utils.SecurityUtils;
+import com.tcctyn.common.core.utils.StringUtils;
+import com.tcctyn.common.core.utils.sql.SqlUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.tcctyn.common.core.constant.HttpStatus;
-import com.tcctyn.common.core.utils.DateUtils;
-import com.tcctyn.common.core.utils.PageUtils;
-import com.tcctyn.common.core.utils.StringUtils;
-import com.tcctyn.common.core.utils.sql.SqlUtil;
-import com.tcctyn.common.core.web.domain.AjaxResult;
-import com.tcctyn.common.core.web.page.PageDomain;
-import com.tcctyn.common.core.web.page.TableDataInfo;
-import com.tcctyn.common.core.web.page.TableSupport;
+
+import java.beans.PropertyEditorSupport;
+import java.util.Date;
+import java.util.List;
/**
* web层通用数据处理
- *
+ *
* @author tcctyn
*/
-public class BaseController
-{
+public class BaseController {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
/**
* 将前台传递过来的日期格式的字符串，自动转化为Date类型
*/
@InitBinder
- public void initBinder(WebDataBinder binder)
- {
+ public void initBinder(WebDataBinder binder) {
// Date 类型转换
- binder.registerCustomEditor(Date.class, new PropertyEditorSupport()
- {
+ binder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
@Override
- public void setAsText(String text)
- {
+ public void setAsText(String text) {
setValue(DateUtils.parseDate(text));
}
});
@@ -48,19 +47,16 @@ public class BaseController
/**
* 设置请求分页数据
*/
- protected void startPage()
- {
+ protected void startPage() {
PageUtils.startPage();
}
/**
* 设置请求排序数据
*/
- protected void startOrderBy()
- {
+ protected void startOrderBy() {
PageDomain pageDomain = TableSupport.buildPageRequest();
- if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
- {
+ if (StringUtils.isNotEmpty(pageDomain.getOrderBy())) {
String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
PageHelper.orderBy(orderBy);
}
@@ -69,92 +65,132 @@ public class BaseController
/**
* 清理分页的线程变量
*/
- protected void clearPage()
- {
+ protected void clearPage() {
PageUtils.clearPage();
}
/**
* 响应请求分页数据
*/
- @SuppressWarnings({ "rawtypes", "unchecked" })
- protected TableDataInfo getDataTable(List list)
- {
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ protected TableDataInfo getDataTable(List list) {
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS);
- rspData.setRows(list);
rspData.setMsg("查询成功");
+ rspData.setRows(list);
rspData.setTotal(new PageInfo(list).getTotal());
return rspData;
}
+ /**
+ * 涉及到DO转VO的使用下面这个方法
+ * @Param dolist 数据库查询出来的list
+ * @Param volist 前台展示的list
+ */
+ protected TableDataInfo getDataTable(List dolist, List voList) {
+ TableDataInfo rspData = new TableDataInfo();
+ rspData.setCode(HttpStatus.SUCCESS);
+ rspData.setMsg("查询成功");
+ rspData.setRows(voList);
+ rspData.setTotal(new PageInfo(dolist).getTotal());
+ return rspData;
+ }
+
+
/**
* 返回成功
*/
- public AjaxResult success()
- {
+ public AjaxResult success() {
return AjaxResult.success();
}
+ /**
+ * 返回失败消息
+ */
+ public AjaxResult error() {
+ return AjaxResult.error();
+ }
+
/**
* 返回成功消息
*/
- public AjaxResult success(String message)
- {
+ public AjaxResult success(String message) {
return AjaxResult.success(message);
}
/**
* 返回成功消息
*/
- public AjaxResult success(Object data)
- {
+ public AjaxResult success(Object data) {
return AjaxResult.success(data);
}
/**
* 返回失败消息
*/
- public AjaxResult error()
- {
- return AjaxResult.error();
- }
-
- /**
- * 返回失败消息
- */
- public AjaxResult error(String message)
- {
+ public AjaxResult error(String message) {
return AjaxResult.error(message);
}
/**
* 返回警告消息
*/
- public AjaxResult warn(String message)
- {
+ public AjaxResult warn(String message) {
return AjaxResult.warn(message);
}
/**
* 响应返回结果
- *
+ *
* @param rows 影响行数
* @return 操作结果
*/
- protected AjaxResult toAjax(int rows)
- {
+ protected AjaxResult toAjax(int rows) {
return rows > 0 ? AjaxResult.success() : AjaxResult.error();
}
/**
* 响应返回结果
- *
+ *
* @param result 结果
* @return 操作结果
*/
- protected AjaxResult toAjax(boolean result)
- {
+ protected AjaxResult toAjax(boolean result) {
return result ? success() : error();
}
+
+ /**
+ * 页面跳转
+ */
+ public String redirect(String url) {
+ return StringUtils.format("redirect:{}", url);
+ }
+
+ /**
+ * 获取用户缓存信息
+ */
+ public LoginUser getLoginUser() {
+ return SecurityUtils.getLoginUser();
+ }
+
+ /**
+ * 获取登录用户id
+ */
+ public Long getUserId() {
+ return getLoginUser().getUserId();
+ }
+
+ /**
+ * 获取登录部门id
+ */
+ public Long getDeptId() {
+ return getLoginUser().getDeptId();
+ }
+
+ /**
+ * 获取登录用户名
+ */
+ public String getUsername() {
+ return getLoginUser().getUsername();
+ }
}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/AjaxResult.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/AjaxResult.java
index 82e03f6..8354ea4 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/AjaxResult.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/AjaxResult.java
@@ -1,9 +1,10 @@
package com.tcctyn.common.core.web.domain;
+import com.tcctyn.common.core.constant.HttpStatus;
+import com.tcctyn.common.core.utils.StringUtils;
+
import java.util.HashMap;
import java.util.Objects;
-import com.tcctyn.common.core.constant.HttpStatus;
-import com.tcctyn.common.core.utils.StringUtils;
/**
* 操作消息提醒
@@ -203,9 +204,9 @@ public class AjaxResult extends HashMap
/**
* 方便链式调用
*
- * @param key
- * @param value
- * @return
+ * @param key 键
+ * @param value 值
+ * @return 数据对象
*/
@Override
public AjaxResult put(String key, Object value)
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/BaseEntity.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/BaseEntity.java
index f797f97..14ef07d 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/BaseEntity.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/BaseEntity.java
@@ -1,12 +1,14 @@
package com.tcctyn.common.core.web.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
/**
* Entity基类
@@ -19,6 +21,7 @@ public class BaseEntity implements Serializable
/** 搜索值 */
@JsonIgnore
+ @TableField(exist = false)
private String searchValue;
/** 创建者 */
@@ -36,10 +39,12 @@ public class BaseEntity implements Serializable
private Date updateTime;
/** 备注 */
+ @TableField(exist = false)
private String remark;
/** 请求参数 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
+ @TableField(exist = false)
private Map params;
public String getSearchValue()
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/domain/R.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/R.java
similarity index 80%
rename from tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/domain/R.java
rename to tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/R.java
index 8d2f934..3ebdc62 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/domain/R.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/R.java
@@ -1,7 +1,8 @@
-package com.tcctyn.common.core.domain;
+package com.tcctyn.common.core.web.domain;
+
+import com.tcctyn.common.core.constant.HttpStatus;
import java.io.Serializable;
-import com.tcctyn.common.core.constant.Constants;
/**
* 响应信息主体
@@ -13,10 +14,10 @@ public class R implements Serializable
private static final long serialVersionUID = 1L;
/** 成功 */
- public static final int SUCCESS = Constants.SUCCESS;
+ public static final int SUCCESS = HttpStatus.SUCCESS;
/** 失败 */
- public static final int FAIL = Constants.FAIL;
+ public static final int FAIL = HttpStatus.ERROR;
private int code;
@@ -26,12 +27,12 @@ public class R implements Serializable
public static R ok()
{
- return restResult(null, SUCCESS, null);
+ return restResult(null, SUCCESS, "操作成功");
}
public static R ok(T data)
{
- return restResult(data, SUCCESS, null);
+ return restResult(data, SUCCESS, "操作成功");
}
public static R ok(T data, String msg)
@@ -41,7 +42,7 @@ public class R implements Serializable
public static R fail()
{
- return restResult(null, FAIL, null);
+ return restResult(null, FAIL, "操作失败");
}
public static R fail(String msg)
@@ -51,7 +52,7 @@ public class R implements Serializable
public static R fail(T data)
{
- return restResult(data, FAIL, null);
+ return restResult(data, FAIL, "操作失败");
}
public static R fail(T data, String msg)
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/TreeSelect.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/TreeSelect.java
new file mode 100644
index 0000000..a62163d
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/TreeSelect.java
@@ -0,0 +1,85 @@
+package com.tcctyn.common.core.web.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.tcctyn.common.core.web.domain.entity.RegionInfo;
+import com.tcctyn.common.core.web.domain.entity.SysDept;
+import com.tcctyn.common.core.web.domain.entity.SysMenu;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Treeselect树结构实体类
+ *
+ * @author tcctyn
+ */
+public class TreeSelect implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 节点ID */
+ private Long id;
+
+ /** 节点名称 */
+ private String label;
+
+ /** 子节点 */
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private List children;
+
+ public TreeSelect()
+ {
+
+ }
+
+ public TreeSelect(SysDept dept)
+ {
+ this.id = dept.getDeptId();
+ this.label = dept.getDeptName();
+ this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+ }
+
+ public TreeSelect(SysMenu menu)
+ {
+ this.id = menu.getMenuId();
+ this.label = menu.getMenuName();
+ this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+ }
+
+ public TreeSelect(RegionInfo regionInfo){
+ this.id = regionInfo.getId();
+ this.label = regionInfo.getAreaName();
+ this.children = regionInfo.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public String getLabel()
+ {
+ return label;
+ }
+
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
+
+ public List getChildren()
+ {
+ return children;
+ }
+
+ public void setChildren(List children)
+ {
+ this.children = children;
+ }
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/RegionInfo.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/RegionInfo.java
new file mode 100644
index 0000000..8cee7e7
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/RegionInfo.java
@@ -0,0 +1,196 @@
+package com.tcctyn.common.core.web.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * 区域信息表
+ *
+ *
+ * @author 代超
+ * @since 2024-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("region_info")
+public class RegionInfo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 父id
+ */
+ @NotNull(message = "父级id不能为空")
+ private Long parentId;
+
+ /**
+ * 全路径 父id为0的数据，默认传0
+ */
+ private String ancestors;
+
+ /**
+ * 地区编号
+ */
+ @NotBlank(message = "地区编号不能为空")
+ private String areaNo;
+
+ /**
+ * 地区名称
+ */
+ @NotBlank(message = "地区名称不能为空")
+ private String areaName;
+
+ /**
+ * 地区类型：林区、林场、电子围栏、切片
+ */
+ @NotBlank(message = "地区类型不能为空")
+ private String areaType;
+
+ /**
+ * 植被类型
+ */
+ private String vegetationType;
+
+ /**
+ * 土质类型
+ */
+ private String soilType;
+
+ /**
+ * 地区运营状态
+ */
+ private String operationStatus;
+
+ /**
+ * 地区排序
+ */
+ private Integer sortNo;
+
+ /**
+ * 归属行政区划
+ */
+ private String administrativeDivision;
+
+ /**
+ * 详细地址
+ */
+ private String address;
+
+ /**
+ * 地区负责单位
+ */
+ private String belongingUnit;
+
+ /**
+ * 负责单位联系方式
+ */
+ private String unitTel;
+
+ /**
+ * 地区简介
+ */
+ private String areaIntroduction;
+
+ /**
+ * 地区图片，多张以英文逗号分隔
+ */
+ private String areaPicture;
+
+ /**
+ * 边框颜色
+ */
+ private String borderColor;
+
+ /**
+ * 边框宽度
+ */
+ private String borderWidth;
+
+ /**
+ * 边框透明度
+ */
+ private String borderTransparency;
+
+ /**
+ * 填充色
+ */
+ private String fillColor;
+
+ /**
+ * 填充色透明度
+ */
+ private String fillColorTransparency;
+
+ /**
+ * 边框样式
+ */
+ private String borderStyle;
+
+ /**
+ * 地区面积（平方米）
+ */
+ private String regionArea;
+
+ /**
+ * 经纬度信息
+ */
+ private String coordinateInfo;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 该条记录是否被删除，1-已删除，0-未删除
+ */
+ @TableLogic
+ private Integer delFlag;
+
+ /**
+ * 创建人员姓名
+ */
+ private String createdBy;
+
+ /**
+ * 记录创建时间，默认用服务器时间
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Date createdTime;
+
+ /**
+ * 修改人员姓名
+ */
+ private String updatedBy;
+
+ /**
+ * 记录修改时间，默认用服务器时间
+ */
+ @TableField(fill = FieldFill.UPDATE)
+ private Date updatedTime;
+
+ /**
+ * 子节点列表
+ */
+ @TableField(exist = false)
+ private List children = new ArrayList<>();
+
+ @TableField(exist = false)
+ private boolean hasChildren;
+
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysDept.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysDept.java
new file mode 100644
index 0000000..4532ffb
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysDept.java
@@ -0,0 +1,207 @@
+package com.tcctyn.common.core.web.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.tcctyn.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 部门表 sys_dept
+ *
+ * @author tcctyn
+ */
+public class SysDept extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 部门ID */
+ private Long deptId;
+
+ /** 父部门ID */
+ private Long parentId;
+
+ /** 祖级列表 */
+ private String ancestors;
+
+ /** 部门名称 */
+ private String deptName;
+
+ /** 显示顺序 */
+ private Integer orderNum;
+
+ /** 负责人 */
+ private String leader;
+
+ /** 联系电话 */
+ private String phone;
+
+ /** 邮箱 */
+ private String email;
+
+ /** 部门状态:0正常,1停用 */
+ private String status;
+
+ /** 删除标志（0代表存在 2代表删除） */
+ private String delFlag;
+
+ /** 父部门名称 */
+ @TableField(exist = false)
+ private String parentName;
+
+ /** 子部门 */
+ @TableField(exist = false)
+ private List children = new ArrayList();
+
+ public Long getDeptId()
+ {
+ return deptId;
+ }
+
+ public void setDeptId(Long deptId)
+ {
+ this.deptId = deptId;
+ }
+
+ public Long getParentId()
+ {
+ return parentId;
+ }
+
+ public void setParentId(Long parentId)
+ {
+ this.parentId = parentId;
+ }
+
+ public String getAncestors()
+ {
+ return ancestors;
+ }
+
+ public void setAncestors(String ancestors)
+ {
+ this.ancestors = ancestors;
+ }
+
+ @NotBlank(message = "部门名称不能为空")
+ @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
+ public String getDeptName()
+ {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName)
+ {
+ this.deptName = deptName;
+ }
+
+ @NotNull(message = "显示顺序不能为空")
+ public Integer getOrderNum()
+ {
+ return orderNum;
+ }
+
+ public void setOrderNum(Integer orderNum)
+ {
+ this.orderNum = orderNum;
+ }
+
+ public String getLeader()
+ {
+ return leader;
+ }
+
+ public void setLeader(String leader)
+ {
+ this.leader = leader;
+ }
+
+ @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
+ public String getPhone()
+ {
+ return phone;
+ }
+
+ public void setPhone(String phone)
+ {
+ this.phone = phone;
+ }
+
+ @Email(message = "邮箱格式不正确")
+ @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+ public String getEmail()
+ {
+ return email;
+ }
+
+ public void setEmail(String email)
+ {
+ this.email = email;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+
+ public void setStatus(String status)
+ {
+ this.status = status;
+ }
+
+ public String getDelFlag()
+ {
+ return delFlag;
+ }
+
+ public void setDelFlag(String delFlag)
+ {
+ this.delFlag = delFlag;
+ }
+
+ public String getParentName()
+ {
+ return parentName;
+ }
+
+ public void setParentName(String parentName)
+ {
+ this.parentName = parentName;
+ }
+
+ public List getChildren()
+ {
+ return children;
+ }
+
+ public void setChildren(List children)
+ {
+ this.children = children;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("deptId", getDeptId())
+ .append("parentId", getParentId())
+ .append("ancestors", getAncestors())
+ .append("deptName", getDeptName())
+ .append("orderNum", getOrderNum())
+ .append("leader", getLeader())
+ .append("phone", getPhone())
+ .append("email", getEmail())
+ .append("status", getStatus())
+ .append("delFlag", getDelFlag())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .toString();
+ }
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysDictData.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysDictData.java
new file mode 100644
index 0000000..df01627
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysDictData.java
@@ -0,0 +1,177 @@
+package com.tcctyn.common.core.web.domain.entity;
+
+import com.tcctyn.common.core.annotation.Excel;
+import com.tcctyn.common.core.annotation.Excel.ColumnType;
+import com.tcctyn.common.core.constant.UserConstants;
+import com.tcctyn.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 字典数据表 sys_dict_data
+ *
+ * @author tcctyn
+ */
+public class SysDictData extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 字典编码 */
+ @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
+ private Long dictCode;
+
+ /** 字典排序 */
+ @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
+ private Long dictSort;
+
+ /** 字典标签 */
+ @Excel(name = "字典标签")
+ private String dictLabel;
+
+ /** 字典键值 */
+ @Excel(name = "字典键值")
+ private String dictValue;
+
+ /** 字典类型 */
+ @Excel(name = "字典类型")
+ private String dictType;
+
+ /** 样式属性（其他样式扩展） */
+ private String cssClass;
+
+ /** 表格字典样式 */
+ private String listClass;
+
+ /** 是否默认（Y是 N否） */
+ @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
+ private String isDefault;
+
+ /** 状态（0正常 1停用） */
+ @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+ private String status;
+
+ public Long getDictCode()
+ {
+ return dictCode;
+ }
+
+ public void setDictCode(Long dictCode)
+ {
+ this.dictCode = dictCode;
+ }
+
+ public Long getDictSort()
+ {
+ return dictSort;
+ }
+
+ public void setDictSort(Long dictSort)
+ {
+ this.dictSort = dictSort;
+ }
+
+ @NotBlank(message = "字典标签不能为空")
+ @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
+ public String getDictLabel()
+ {
+ return dictLabel;
+ }
+
+ public void setDictLabel(String dictLabel)
+ {
+ this.dictLabel = dictLabel;
+ }
+
+ @NotBlank(message = "字典键值不能为空")
+ @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
+ public String getDictValue()
+ {
+ return dictValue;
+ }
+
+ public void setDictValue(String dictValue)
+ {
+ this.dictValue = dictValue;
+ }
+
+ @NotBlank(message = "字典类型不能为空")
+ @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
+ public String getDictType()
+ {
+ return dictType;
+ }
+
+ public void setDictType(String dictType)
+ {
+ this.dictType = dictType;
+ }
+
+ @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
+ public String getCssClass()
+ {
+ return cssClass;
+ }
+
+ public void setCssClass(String cssClass)
+ {
+ this.cssClass = cssClass;
+ }
+
+ public String getListClass()
+ {
+ return listClass;
+ }
+
+ public void setListClass(String listClass)
+ {
+ this.listClass = listClass;
+ }
+
+ public boolean getDefault()
+ {
+ return UserConstants.YES.equals(this.isDefault);
+ }
+
+ public String getIsDefault()
+ {
+ return isDefault;
+ }
+
+ public void setIsDefault(String isDefault)
+ {
+ this.isDefault = isDefault;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+
+ public void setStatus(String status)
+ {
+ this.status = status;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("dictCode", getDictCode())
+ .append("dictSort", getDictSort())
+ .append("dictLabel", getDictLabel())
+ .append("dictValue", getDictValue())
+ .append("dictType", getDictType())
+ .append("cssClass", getCssClass())
+ .append("listClass", getListClass())
+ .append("isDefault", getIsDefault())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
+ }
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysDictType.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysDictType.java
new file mode 100644
index 0000000..b0bc07c
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysDictType.java
@@ -0,0 +1,97 @@
+package com.tcctyn.common.core.web.domain.entity;
+
+import com.tcctyn.common.core.annotation.Excel;
+import com.tcctyn.common.core.annotation.Excel.ColumnType;
+import com.tcctyn.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * 字典类型表 sys_dict_type
+ *
+ * @author tcctyn
+ */
+public class SysDictType extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 字典主键 */
+ @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
+ private Long dictId;
+
+ /** 字典名称 */
+ @Excel(name = "字典名称")
+ private String dictName;
+
+ /** 字典类型 */
+ @Excel(name = "字典类型")
+ private String dictType;
+
+ /** 状态（0正常 1停用） */
+ @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+ private String status;
+
+ public Long getDictId()
+ {
+ return dictId;
+ }
+
+ public void setDictId(Long dictId)
+ {
+ this.dictId = dictId;
+ }
+
+ @NotBlank(message = "字典名称不能为空")
+ @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
+ public String getDictName()
+ {
+ return dictName;
+ }
+
+ public void setDictName(String dictName)
+ {
+ this.dictName = dictName;
+ }
+
+ @NotBlank(message = "字典类型不能为空")
+ @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
+ @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
+ public String getDictType()
+ {
+ return dictType;
+ }
+
+ public void setDictType(String dictType)
+ {
+ this.dictType = dictType;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+
+ public void setStatus(String status)
+ {
+ this.status = status;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("dictId", getDictId())
+ .append("dictName", getDictName())
+ .append("dictType", getDictType())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
+ }
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysMenu.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysMenu.java
new file mode 100644
index 0000000..fcd2ddb
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysMenu.java
@@ -0,0 +1,275 @@
+package com.tcctyn.common.core.web.domain.entity;
+
+import com.tcctyn.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 菜单权限表 sys_menu
+ *
+ * @author tcctyn
+ */
+public class SysMenu extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 菜单ID */
+ private Long menuId;
+
+ /** 菜单名称 */
+ private String menuName;
+
+ /** 父菜单名称 */
+ private String parentName;
+
+ /** 父菜单ID */
+ private Long parentId;
+
+ /** 显示顺序 */
+ private Integer orderNum;
+
+ /** 路由地址 */
+ private String path;
+
+ /** 组件路径 */
+ private String component;
+
+ /** 路由参数 */
+ private String query;
+
+ /** 路由名称，默认和路由地址相同的驼峰格式（注意：因为vue3版本的router会删除名称相同路由，为避免名字的冲突，特殊情况可以自定义） */
+ private String routeName;
+
+ /** 是否为外链（0是 1否） */
+ private String isFrame;
+
+ /** 是否缓存（0缓存 1不缓存） */
+ private String isCache;
+
+ /** 类型（M目录 C菜单 F按钮） */
+ private String menuType;
+
+ /** 显示状态（0显示 1隐藏） */
+ private String visible;
+
+ /** 菜单状态（0正常 1停用） */
+ private String status;
+
+ /** 权限字符串 */
+ private String perms;
+
+ /** 菜单图标 */
+ private String icon;
+
+ /** 子菜单 */
+ private List children = new ArrayList();
+
+ public Long getMenuId()
+ {
+ return menuId;
+ }
+
+ public void setMenuId(Long menuId)
+ {
+ this.menuId = menuId;
+ }
+
+ @NotBlank(message = "菜单名称不能为空")
+ @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
+ public String getMenuName()
+ {
+ return menuName;
+ }
+
+ public void setMenuName(String menuName)
+ {
+ this.menuName = menuName;
+ }
+
+ public String getParentName()
+ {
+ return parentName;
+ }
+
+ public void setParentName(String parentName)
+ {
+ this.parentName = parentName;
+ }
+
+ public Long getParentId()
+ {
+ return parentId;
+ }
+
+ public void setParentId(Long parentId)
+ {
+ this.parentId = parentId;
+ }
+
+ @NotNull(message = "显示顺序不能为空")
+ public Integer getOrderNum()
+ {
+ return orderNum;
+ }
+
+ public void setOrderNum(Integer orderNum)
+ {
+ this.orderNum = orderNum;
+ }
+
+ @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
+ public String getPath()
+ {
+ return path;
+ }
+
+ public void setPath(String path)
+ {
+ this.path = path;
+ }
+
+ @Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
+ public String getComponent()
+ {
+ return component;
+ }
+
+ public void setComponent(String component)
+ {
+ this.component = component;
+ }
+
+ public String getQuery()
+ {
+ return query;
+ }
+
+ public void setQuery(String query)
+ {
+ this.query = query;
+ }
+
+ public String getRouteName()
+ {
+ return routeName;
+ }
+
+ public void setRouteName(String routeName)
+ {
+ this.routeName = routeName;
+ }
+
+ public String getIsFrame()
+ {
+ return isFrame;
+ }
+
+ public void setIsFrame(String isFrame)
+ {
+ this.isFrame = isFrame;
+ }
+
+ public String getIsCache()
+ {
+ return isCache;
+ }
+
+ public void setIsCache(String isCache)
+ {
+ this.isCache = isCache;
+ }
+
+ @NotBlank(message = "菜单类型不能为空")
+ public String getMenuType()
+ {
+ return menuType;
+ }
+
+ public void setMenuType(String menuType)
+ {
+ this.menuType = menuType;
+ }
+
+ public String getVisible()
+ {
+ return visible;
+ }
+
+ public void setVisible(String visible)
+ {
+ this.visible = visible;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+
+ public void setStatus(String status)
+ {
+ this.status = status;
+ }
+
+ @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
+ public String getPerms()
+ {
+ return perms;
+ }
+
+ public void setPerms(String perms)
+ {
+ this.perms = perms;
+ }
+
+ public String getIcon()
+ {
+ return icon;
+ }
+
+ public void setIcon(String icon)
+ {
+ this.icon = icon;
+ }
+
+ public List getChildren()
+ {
+ return children;
+ }
+
+ public void setChildren(List children)
+ {
+ this.children = children;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("menuId", getMenuId())
+ .append("menuName", getMenuName())
+ .append("parentId", getParentId())
+ .append("orderNum", getOrderNum())
+ .append("path", getPath())
+ .append("component", getComponent())
+ .append("query", getQuery())
+ .append("routeName", getRouteName())
+ .append("isFrame", getIsFrame())
+ .append("IsCache", getIsCache())
+ .append("menuType", getMenuType())
+ .append("visible", getVisible())
+ .append("status ", getStatus())
+ .append("perms", getPerms())
+ .append("icon", getIcon())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
+ }
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysRole.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysRole.java
new file mode 100644
index 0000000..27c26df
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysRole.java
@@ -0,0 +1,242 @@
+package com.tcctyn.common.core.web.domain.entity;
+
+import com.tcctyn.common.core.annotation.Excel;
+import com.tcctyn.common.core.annotation.Excel.ColumnType;
+import com.tcctyn.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Set;
+
+/**
+ * 角色表 sys_role
+ *
+ * @author tcctyn
+ */
+public class SysRole extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 角色ID */
+ @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
+ private Long roleId;
+
+ /** 角色名称 */
+ @Excel(name = "角色名称")
+ private String roleName;
+
+ /** 角色权限 */
+ @Excel(name = "角色权限")
+ private String roleKey;
+
+ /** 角色排序 */
+ @Excel(name = "角色排序")
+ private Integer roleSort;
+
+ /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
+ @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
+ private String dataScope;
+
+ /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
+ private boolean menuCheckStrictly;
+
+ /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
+ private boolean deptCheckStrictly;
+
+ /** 角色状态（0正常 1停用） */
+ @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
+ private String status;
+
+ /** 删除标志（0代表存在 2代表删除） */
+ private String delFlag;
+
+ /** 用户是否存在此角色标识 默认不存在 */
+ private boolean flag = false;
+
+ /** 菜单组 */
+ private Long[] menuIds;
+
+ /** 部门组（数据权限） */
+ private Long[] deptIds;
+
+ /** 角色菜单权限 */
+ private Set permissions;
+
+ public SysRole()
+ {
+
+ }
+
+ public SysRole(Long roleId)
+ {
+ this.roleId = roleId;
+ }
+
+ public Long getRoleId()
+ {
+ return roleId;
+ }
+
+ public void setRoleId(Long roleId)
+ {
+ this.roleId = roleId;
+ }
+
+ public boolean isAdmin()
+ {
+ return isAdmin(this.roleId);
+ }
+
+ public static boolean isAdmin(Long roleId)
+ {
+ return roleId != null && 1L == roleId;
+ }
+
+ @NotBlank(message = "角色名称不能为空")
+ @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
+ public String getRoleName()
+ {
+ return roleName;
+ }
+
+ public void setRoleName(String roleName)
+ {
+ this.roleName = roleName;
+ }
+
+ @NotBlank(message = "权限字符不能为空")
+ @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
+ public String getRoleKey()
+ {
+ return roleKey;
+ }
+
+ public void setRoleKey(String roleKey)
+ {
+ this.roleKey = roleKey;
+ }
+
+ @NotNull(message = "显示顺序不能为空")
+ public Integer getRoleSort()
+ {
+ return roleSort;
+ }
+
+ public void setRoleSort(Integer roleSort)
+ {
+ this.roleSort = roleSort;
+ }
+
+ public String getDataScope()
+ {
+ return dataScope;
+ }
+
+ public void setDataScope(String dataScope)
+ {
+ this.dataScope = dataScope;
+ }
+
+ public boolean isMenuCheckStrictly()
+ {
+ return menuCheckStrictly;
+ }
+
+ public void setMenuCheckStrictly(boolean menuCheckStrictly)
+ {
+ this.menuCheckStrictly = menuCheckStrictly;
+ }
+
+ public boolean isDeptCheckStrictly()
+ {
+ return deptCheckStrictly;
+ }
+
+ public void setDeptCheckStrictly(boolean deptCheckStrictly)
+ {
+ this.deptCheckStrictly = deptCheckStrictly;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+
+ public void setStatus(String status)
+ {
+ this.status = status;
+ }
+
+ public String getDelFlag()
+ {
+ return delFlag;
+ }
+
+ public void setDelFlag(String delFlag)
+ {
+ this.delFlag = delFlag;
+ }
+
+ public boolean isFlag()
+ {
+ return flag;
+ }
+
+ public void setFlag(boolean flag)
+ {
+ this.flag = flag;
+ }
+
+ public Long[] getMenuIds()
+ {
+ return menuIds;
+ }
+
+ public void setMenuIds(Long[] menuIds)
+ {
+ this.menuIds = menuIds;
+ }
+
+ public Long[] getDeptIds()
+ {
+ return deptIds;
+ }
+
+ public void setDeptIds(Long[] deptIds)
+ {
+ this.deptIds = deptIds;
+ }
+
+ public Set getPermissions()
+ {
+ return permissions;
+ }
+
+ public void setPermissions(Set permissions)
+ {
+ this.permissions = permissions;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("roleId", getRoleId())
+ .append("roleName", getRoleName())
+ .append("roleKey", getRoleKey())
+ .append("roleSort", getRoleSort())
+ .append("dataScope", getDataScope())
+ .append("menuCheckStrictly", isMenuCheckStrictly())
+ .append("deptCheckStrictly", isDeptCheckStrictly())
+ .append("status", getStatus())
+ .append("delFlag", getDelFlag())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
+ }
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysUser.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysUser.java
new file mode 100644
index 0000000..ba85652
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/entity/SysUser.java
@@ -0,0 +1,389 @@
+package com.tcctyn.common.core.web.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.tcctyn.common.core.annotation.Excel;
+import com.tcctyn.common.core.annotation.Excel.ColumnType;
+import com.tcctyn.common.core.annotation.Excel.Type;
+import com.tcctyn.common.core.annotation.Excels;
+import com.tcctyn.common.core.web.domain.BaseEntity;
+import com.tcctyn.common.core.xss.Xss;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 用户对象 sys_user
+ *
+ * @author tcctyn
+ */
+public class SysUser extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 用户ID */
+ @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
+ private Long userId;
+
+ /** 部门ID */
+ @Excel(name = "部门编号", type = Type.IMPORT)
+ private Long deptId;
+
+ /** 归属区域id */
+ private Long regionId;
+
+ /** 林区id */
+ private Long forestId;
+
+ /** 林场id */
+ private Long farmId;
+
+ /** 电子围栏id */
+ private Long fenceId;
+
+ /** 用户账号 */
+ @Excel(name = "登录名称")
+ private String userName;
+
+ /** 用户昵称 */
+ @Excel(name = "用户名称")
+ private String nickName;
+
+ /** 用户邮箱 */
+ @Excel(name = "用户邮箱")
+ private String email;
+
+ /** 手机号码 */
+ @Excel(name = "手机号码", cellType = ColumnType.TEXT)
+ private String phonenumber;
+
+ /** 用户性别 */
+ @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+ private String sex;
+
+ /** 用户头像 */
+ private String avatar;
+
+ /** 密码 */
+ private String password;
+
+ /** 帐号状态（0正常 1停用） */
+ @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+ private String status;
+
+ /** 删除标志（0代表存在 2代表删除） */
+ private String delFlag;
+
+ /** 最后登录IP */
+ @Excel(name = "最后登录IP", type = Type.EXPORT)
+ private String loginIp;
+
+ /** 最后登录时间 */
+ @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+ private Date loginDate;
+
+ /** 部门对象 */
+ @Excels({
+ @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
+ @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+ })
+ @TableField(exist = false)
+ private SysDept dept;
+
+ @TableField(exist = false)
+ /** 归属林区 */
+ private RegionInfo region;
+
+ @TableField(exist = false)
+ /** 角色对象 */
+ private List roles;
+
+ @TableField(exist = false)
+ /** 角色组 */
+ private Long[] roleIds;
+
+ @TableField(exist = false)
+ /** 岗位组 */
+ private Long[] postIds;
+
+ @TableField(exist = false)
+ /** 角色ID */
+ private Long roleId;
+
+ public SysUser()
+ {
+
+ }
+
+ public SysUser(Long userId)
+ {
+ this.userId = userId;
+ }
+
+ public Long getUserId()
+ {
+ return userId;
+ }
+
+ public void setUserId(Long userId)
+ {
+ this.userId = userId;
+ }
+
+ public boolean isAdmin()
+ {
+ return isAdmin(this.userId);
+ }
+
+ public static boolean isAdmin(Long userId)
+ {
+ return userId != null && 1L == userId;
+ }
+
+ public Long getDeptId()
+ {
+ return deptId;
+ }
+
+ public void setDeptId(Long deptId)
+ {
+ this.deptId = deptId;
+ }
+
+ @Xss(message = "用户昵称不能包含脚本字符")
+ @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+ public String getNickName()
+ {
+ return nickName;
+ }
+
+ public void setNickName(String nickName)
+ {
+ this.nickName = nickName;
+ }
+
+ @Xss(message = "用户账号不能包含脚本字符")
+ @NotBlank(message = "用户账号不能为空")
+ @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
+ public String getUserName()
+ {
+ return userName;
+ }
+
+ public void setUserName(String userName)
+ {
+ this.userName = userName;
+ }
+
+ @Email(message = "邮箱格式不正确")
+ @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+ public String getEmail()
+ {
+ return email;
+ }
+
+ public void setEmail(String email)
+ {
+ this.email = email;
+ }
+
+ @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
+ public String getPhonenumber()
+ {
+ return phonenumber;
+ }
+
+ public void setPhonenumber(String phonenumber)
+ {
+ this.phonenumber = phonenumber;
+ }
+
+ public String getSex()
+ {
+ return sex;
+ }
+
+ public void setSex(String sex)
+ {
+ this.sex = sex;
+ }
+
+ public String getAvatar()
+ {
+ return avatar;
+ }
+
+ public void setAvatar(String avatar)
+ {
+ this.avatar = avatar;
+ }
+
+ public String getPassword()
+ {
+ return password;
+ }
+
+ public void setPassword(String password)
+ {
+ this.password = password;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+
+ public void setStatus(String status)
+ {
+ this.status = status;
+ }
+
+ public String getDelFlag()
+ {
+ return delFlag;
+ }
+
+ public void setDelFlag(String delFlag)
+ {
+ this.delFlag = delFlag;
+ }
+
+ public String getLoginIp()
+ {
+ return loginIp;
+ }
+
+ public void setLoginIp(String loginIp)
+ {
+ this.loginIp = loginIp;
+ }
+
+ public Date getLoginDate()
+ {
+ return loginDate;
+ }
+
+ public void setLoginDate(Date loginDate)
+ {
+ this.loginDate = loginDate;
+ }
+
+ public SysDept getDept()
+ {
+ return dept;
+ }
+
+ public void setDept(SysDept dept)
+ {
+ this.dept = dept;
+ }
+
+ public List getRoles()
+ {
+ return roles;
+ }
+
+ public void setRoles(List roles)
+ {
+ this.roles = roles;
+ }
+
+ public Long[] getRoleIds()
+ {
+ return roleIds;
+ }
+
+ public void setRoleIds(Long[] roleIds)
+ {
+ this.roleIds = roleIds;
+ }
+
+ public Long[] getPostIds()
+ {
+ return postIds;
+ }
+
+ public void setPostIds(Long[] postIds)
+ {
+ this.postIds = postIds;
+ }
+
+ public Long getRoleId()
+ {
+ return roleId;
+ }
+
+ public void setFenceId(Long fenceId) {
+ this.fenceId = fenceId;
+ }
+
+ public void setRoleId(Long roleId)
+ {
+ this.roleId = roleId;
+ }
+
+ public Long getForestId() {
+ return forestId;
+ }
+
+ public void setForestId(Long forestId) {
+ this.forestId = forestId;
+ }
+
+ public Long getRegionId() {
+ return regionId;
+ }
+
+ public void setRegionId(Long regionId) {
+ this.regionId = regionId;
+ }
+
+ public Long getFarmId() {
+ return farmId;
+ }
+
+ public void setFarmId(Long farmId) {
+ this.farmId = farmId;
+ }
+
+ public Long getFenceId() {
+ return fenceId;
+ }
+
+ public RegionInfo getRegion() {
+ return region;
+ }
+
+ public void setRegion(RegionInfo region) {
+ this.region = region;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("userId", getUserId())
+ .append("deptId", getDeptId())
+ .append("userName", getUserName())
+ .append("nickName", getNickName())
+ .append("email", getEmail())
+ .append("phonenumber", getPhonenumber())
+ .append("sex", getSex())
+ .append("avatar", getAvatar())
+ .append("password", getPassword())
+ .append("status", getStatus())
+ .append("delFlag", getDelFlag())
+ .append("loginIp", getLoginIp())
+ .append("loginDate", getLoginDate())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .append("dept", getDept())
+ .toString();
+ }
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/model/DictDataVO.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/model/DictDataVO.java
new file mode 100644
index 0000000..d7d994e
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/model/DictDataVO.java
@@ -0,0 +1,36 @@
+package com.tcctyn.common.core.web.domain.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 数据字典展示实体类
+ */
+@Data
+public class DictDataVO implements Serializable {
+
+ private static final long serialVersionUID = -9073442421377041774L;
+
+ public DictDataVO(Long dictSort, String dictLabel, String dictValue) {
+ this.dictSort = dictSort;
+ this.dictLabel = dictLabel;
+ this.dictValue = dictValue;
+ }
+
+ /**
+ * 字典排序
+ */
+ private Long dictSort;
+
+ /**
+ * 字典标签
+ */
+ private String dictLabel;
+
+ /**
+ * 字典键值
+ */
+ private String dictValue;
+
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/model/LoginBody.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/model/LoginBody.java
new file mode 100644
index 0000000..4a79a94
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/model/LoginBody.java
@@ -0,0 +1,69 @@
+package com.tcctyn.common.core.web.domain.model;
+
+/**
+ * 用户登录对象
+ *
+ * @author tcctyn
+ */
+public class LoginBody
+{
+ /**
+ * 用户名
+ */
+ private String username;
+
+ /**
+ * 用户密码
+ */
+ private String password;
+
+ /**
+ * 验证码
+ */
+ private String code;
+
+ /**
+ * 唯一标识
+ */
+ private String uuid;
+
+ public String getUsername()
+ {
+ return username;
+ }
+
+ public void setUsername(String username)
+ {
+ this.username = username;
+ }
+
+ public String getPassword()
+ {
+ return password;
+ }
+
+ public void setPassword(String password)
+ {
+ this.password = password;
+ }
+
+ public String getCode()
+ {
+ return code;
+ }
+
+ public void setCode(String code)
+ {
+ this.code = code;
+ }
+
+ public String getUuid()
+ {
+ return uuid;
+ }
+
+ public void setUuid(String uuid)
+ {
+ this.uuid = uuid;
+ }
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/model/LoginUser.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/model/LoginUser.java
new file mode 100644
index 0000000..9feaaab
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/model/LoginUser.java
@@ -0,0 +1,268 @@
+package com.tcctyn.common.core.web.domain.model;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.tcctyn.common.core.web.domain.entity.SysUser;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.Collection;
+import java.util.Set;
+
+/**
+ * 登录用户身份权限
+ *
+ * @author tcctyn
+ */
+public class LoginUser implements UserDetails
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 用户ID
+ */
+ private Long userId;
+
+ /**
+ * 部门ID
+ */
+ private Long deptId;
+
+ /**
+ * 用户唯一标识
+ */
+ private String token;
+
+ /**
+ * 登录时间
+ */
+ private Long loginTime;
+
+ /**
+ * 过期时间
+ */
+ private Long expireTime;
+
+ /**
+ * 登录IP地址
+ */
+ private String ipaddr;
+
+ /**
+ * 登录地点
+ */
+ private String loginLocation;
+
+ /**
+ * 浏览器类型
+ */
+ private String browser;
+
+ /**
+ * 操作系统
+ */
+ private String os;
+
+ /**
+ * 权限列表
+ */
+ private Set permissions;
+
+ /**
+ * 用户信息
+ */
+ private SysUser user;
+
+ public LoginUser()
+ {
+ }
+
+ public LoginUser(SysUser user, Set permissions)
+ {
+ this.user = user;
+ this.permissions = permissions;
+ }
+
+ public LoginUser(Long userId, Long deptId, SysUser user, Set permissions)
+ {
+ this.userId = userId;
+ this.deptId = deptId;
+ this.user = user;
+ this.permissions = permissions;
+ }
+
+ public Long getUserId()
+ {
+ return userId;
+ }
+
+ public void setUserId(Long userId)
+ {
+ this.userId = userId;
+ }
+
+ public Long getDeptId()
+ {
+ return deptId;
+ }
+
+ public void setDeptId(Long deptId)
+ {
+ this.deptId = deptId;
+ }
+
+ public String getToken()
+ {
+ return token;
+ }
+
+ public void setToken(String token)
+ {
+ this.token = token;
+ }
+
+ @JSONField(serialize = false)
+ @Override
+ public String getPassword()
+ {
+ return user.getPassword();
+ }
+
+ @Override
+ public String getUsername()
+ {
+ return user.getUserName();
+ }
+
+ /**
+ * 账户是否未过期,过期无法验证
+ */
+ @JSONField(serialize = false)
+ @Override
+ public boolean isAccountNonExpired()
+ {
+ return true;
+ }
+
+ /**
+ * 指定用户是否解锁,锁定的用户无法进行身份验证
+ *
+ * @return
+ */
+ @JSONField(serialize = false)
+ @Override
+ public boolean isAccountNonLocked()
+ {
+ return true;
+ }
+
+ /**
+ * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
+ *
+ * @return
+ */
+ @JSONField(serialize = false)
+ @Override
+ public boolean isCredentialsNonExpired()
+ {
+ return true;
+ }
+
+ /**
+ * 是否可用 ,禁用的用户不能身份验证
+ *
+ * @return
+ */
+ @JSONField(serialize = false)
+ @Override
+ public boolean isEnabled()
+ {
+ return true;
+ }
+
+ public Long getLoginTime()
+ {
+ return loginTime;
+ }
+
+ public void setLoginTime(Long loginTime)
+ {
+ this.loginTime = loginTime;
+ }
+
+ public String getIpaddr()
+ {
+ return ipaddr;
+ }
+
+ public void setIpaddr(String ipaddr)
+ {
+ this.ipaddr = ipaddr;
+ }
+
+ public String getLoginLocation()
+ {
+ return loginLocation;
+ }
+
+ public void setLoginLocation(String loginLocation)
+ {
+ this.loginLocation = loginLocation;
+ }
+
+ public String getBrowser()
+ {
+ return browser;
+ }
+
+ public void setBrowser(String browser)
+ {
+ this.browser = browser;
+ }
+
+ public String getOs()
+ {
+ return os;
+ }
+
+ public void setOs(String os)
+ {
+ this.os = os;
+ }
+
+ public Long getExpireTime()
+ {
+ return expireTime;
+ }
+
+ public void setExpireTime(Long expireTime)
+ {
+ this.expireTime = expireTime;
+ }
+
+ public Set getPermissions()
+ {
+ return permissions;
+ }
+
+ public void setPermissions(Set permissions)
+ {
+ this.permissions = permissions;
+ }
+
+ public SysUser getUser()
+ {
+ return user;
+ }
+
+ public void setUser(SysUser user)
+ {
+ this.user = user;
+ }
+
+ @Override
+ public Collection getAuthorities()
+ {
+ return null;
+ }
+
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/model/RegisterBody.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/model/RegisterBody.java
new file mode 100644
index 0000000..23fe135
--- /dev/null
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/domain/model/RegisterBody.java
@@ -0,0 +1,11 @@
+package com.tcctyn.common.core.web.domain.model;
+
+/**
+ * 用户注册对象
+ *
+ * @author tcctyn
+ */
+public class RegisterBody extends LoginBody
+{
+
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/page/TableDataInfo.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/page/TableDataInfo.java
index a118618..0279c0d 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/page/TableDataInfo.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/web/page/TableDataInfo.java
@@ -37,7 +37,7 @@ public class TableDataInfo implements Serializable
* @param list 列表数据
* @param total 总记录数
*/
- public TableDataInfo(List list, long total)
+ public TableDataInfo(List list, int total)
{
this.rows = list;
this.total = total;
@@ -82,4 +82,4 @@ public class TableDataInfo implements Serializable
{
this.msg = msg;
}
-}
\ No newline at end of file
+}
diff --git a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/xss/XssValidator.java b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/xss/XssValidator.java
index 72c42d2..2dc7ca0 100644
--- a/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/xss/XssValidator.java
+++ b/tcctyn-common/tcctyn-common-core/src/main/java/com/tcctyn/common/core/xss/XssValidator.java
@@ -1,10 +1,11 @@
package com.tcctyn.common.core.xss;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import com.tcctyn.common.core.utils.StringUtils;
+
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
-import com.tcctyn.common.core.utils.StringUtils;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* 自定义xss校验注解实现
diff --git a/tcctyn-modules/pom.xml b/tcctyn-modules/pom.xml
index 55037f6..8ed4a4c 100644
--- a/tcctyn-modules/pom.xml
+++ b/tcctyn-modules/pom.xml
@@ -11,6 +11,7 @@
tcctyn-system
tcctyn-gen
+ tcctyn-iot
tcctyn-modules
diff --git a/tcctyn-modules/tcctyn-iot/pom.xml b/tcctyn-modules/tcctyn-iot/pom.xml
new file mode 100644
index 0000000..4bef560
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/pom.xml
@@ -0,0 +1,124 @@
+
+
+ 4.0.0
+
+ com.tcctyn
+ tcctyn-modules
+ 1.0.0
+
+ tcctyn-iot
+
+
+ tcctyn-iot物联网模块
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
+ org.apache.velocity
+ velocity-engine-core
+
+
+
+
+ com.mysql
+ mysql-connector-j
+
+
+
+
+ com.tcctyn
+ tcctyn-common-datasource
+
+
+
+
+ com.tcctyn
+ tcctyn-common-datascope
+
+
+
+
+
+ com.tcctyn
+ tcctyn-common-log
+
+
+
+
+ com.tcctyn
+ tcctyn-common-swagger
+
+
+
+ com.tcctyn
+ tcctyn-common-core
+
+
+
+
+ com.hikvision.ga
+ artemis-http-client
+ ${artemis-http-client.version}
+
+
+
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ ${mybatis-plus-boot-starter.version}
+
+
+
+ com.github.yulichang
+ mybatis-plus-join-boot-starter
+ ${mybatis-plus-join-boot-starter.version}
+
+
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ repackage
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/TcctynIotApplication.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/TcctynIotApplication.java
new file mode 100644
index 0000000..f2d773a
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/TcctynIotApplication.java
@@ -0,0 +1,20 @@
+package com.tcctyn.iot;
+
+import com.tcctyn.common.security.annotation.EnableCustomConfig;
+import com.tcctyn.common.security.annotation.EnableRyFeignClients;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+@EnableCustomConfig
+@EnableRyFeignClients
+@SpringBootApplication
+@ComponentScan(basePackages = {"com.tcctyn.iot.**", "com.tcctyn.common.**"})
+public class TcctynIotApplication {
+
+ public static void main(String[] args)
+ {
+ SpringApplication.run(TcctynIotApplication.class, args);
+ System.out.println("(♥◠‿◠)ﾉﾞ 物联网模块启动成功 ლ(´ڡ`ლ)ﾞ");
+ }
+}
\ No newline at end of file
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/FireWarningMQTTBO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/FireWarningMQTTBO.java
new file mode 100644
index 0000000..aecd8a4
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/FireWarningMQTTBO.java
@@ -0,0 +1,134 @@
+package com.tcctyn.iot.forestfire.BO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class FireWarningMQTTBO implements Serializable {
+
+ private static final long serialVersionUID = 184298993802545138L;
+
+ /** 火情预警id */
+ private Long id;
+
+ /**
+ * 发现火情设备编号
+ */
+ private String deviceNo;
+
+ /**
+ * 设备类型
+ */
+ private String deviceType;
+
+ /**
+ * 地址
+ */
+ private String address;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 高度
+ */
+ private String height;
+
+ /**
+ * 所属区域id
+ */
+ private Long regionId;
+
+ /**
+ * 火情标题
+ */
+ private String fireTitle;
+
+ /**
+ * 火情级别
+ */
+ private String fireLevel;
+
+ /**
+ * 起火原因
+ */
+ private String fireCause;
+
+ /**
+ * 处置状态：未处理、已研判、已上报、已归档
+ */
+ private String disposalStatus;
+
+ /**
+ * 火情图片
+ */
+ private String firePicture;
+
+ /**
+ * 火情预警数据来源
+ */
+ private String dataSource;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 记录创建时间，默认用服务器时间
+ */
+ private Date createdTime;
+
+ /**
+ * 归属点位id
+ */
+ private Long pointId;
+
+ /**
+ * 归属点位编号
+ */
+ private String pointNo;
+
+ /**
+ * 归属点位名称
+ */
+ private String pointName;
+
+ /**
+ * 归属点位地址
+ */
+ private String pointAddress;
+
+ /**
+ * 归属点位经度
+ */
+ private String pointLongitude;
+
+ /**
+ * 归属点位纬度
+ */
+ private String pointLatitude;
+
+ /**
+ * 归属点位高度
+ */
+ private String pointHeight;
+
+ /**
+ * 归属点位类型
+ */
+ private String pointType;
+
+ /** 归属区域名称 */
+ private String regionName;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/FireWarningMisjudgeBO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/FireWarningMisjudgeBO.java
new file mode 100644
index 0000000..13396cd
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/FireWarningMisjudgeBO.java
@@ -0,0 +1,35 @@
+package com.tcctyn.iot.forestfire.BO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 火情预警信息误判后消息推送
+ */
+
+@Data
+public class FireWarningMisjudgeBO implements Serializable {
+
+ private static final long serialVersionUID = -1954870764499170410L;
+
+ /**
+ * 火情预警id
+ */
+ private Long id;
+
+ /**
+ * 火情预警处理状态
+ */
+ private String disposalStatus;
+
+ /**
+ * 误判标识
+ */
+ private Integer misjudgeFlag;
+
+ /**
+ * 处理消息
+ */
+ private String disposalMsg;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/PointInfoBO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/PointInfoBO.java
new file mode 100644
index 0000000..19f0697
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/PointInfoBO.java
@@ -0,0 +1,83 @@
+package com.tcctyn.iot.forestfire.BO;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 打卡点、巡护点业务对象
+ */
+@Data
+public class PointInfoBO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 点位记录id
+ */
+ private Long id;
+
+ /**
+ * 归属地区id 可能是林区、林场、电子围栏、巡护路径id
+ */
+ private Long belongingRegionId;
+
+ @JsonIgnore
+ /**
+ * 林区id
+ */
+ private Long forestId;
+ /**
+ * 林场id
+ */
+ @JsonIgnore
+ private Long farmId;
+
+ /**
+ * 电子围栏id
+ */
+ @JsonIgnore
+ private Long fenceId;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 高度
+ */
+ private String height;
+
+ /**
+ * 点位类型：云台、卡口、打卡点、巡护点
+ */
+ private String pointType;
+
+ /**
+ * 点位顺序
+ */
+ private Integer sortNo;
+
+ /**
+ * 打卡半径，单位：米
+ */
+ private String checkInRadius;
+
+ /**
+ * 是否打卡
+ */
+ private boolean checkInFlag;
+
+ /**
+ * 打卡时间
+ */
+ private Date checkInTime;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/PositionBO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/PositionBO.java
new file mode 100644
index 0000000..4c02260
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/PositionBO.java
@@ -0,0 +1,28 @@
+package com.tcctyn.iot.forestfire.BO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 位置信息BO
+ */
+@Data
+public class PositionBO implements Serializable {
+
+ private static final long serialVersionUID = 5127358619357602320L;
+
+ public PositionBO(String longitude, String latitude, String height) {
+ }
+
+ /** 经度 */
+ private String longitude;
+
+ /** 纬度 */
+ private String latitude;
+
+ /** 高度 */
+ private String height;
+
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/ScopeSimulationBO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/ScopeSimulationBO.java
new file mode 100644
index 0000000..bf1eb0b
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/ScopeSimulationBO.java
@@ -0,0 +1,36 @@
+package com.tcctyn.iot.forestfire.BO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 卫星热点数据模拟，地图取点范围BO
+ */
+@Data
+public class ScopeSimulationBO implements Serializable {
+
+ private static final long serialVersionUID = -4916623718291474020L;
+
+ public ScopeSimulationBO() {}
+
+ public ScopeSimulationBO(double minLongitude, double maxLongitude, double minLatitude, double maxLatitude) {
+ this.minLongitude = minLongitude;
+ this.maxLongitude = maxLongitude;
+ this.minLatitude = minLatitude;
+ this.maxLatitude = maxLatitude;
+ }
+
+ /** 最小经度 */
+ private double minLongitude;
+
+ /** 最大经度 */
+ private double maxLongitude;
+
+ /** 最小纬度 */
+ private double minLatitude;
+
+ /** 最大纬度 */
+ private double maxLatitude;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/SysUserBO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/SysUserBO.java
new file mode 100644
index 0000000..ec2a15d
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/BO/SysUserBO.java
@@ -0,0 +1,45 @@
+package com.tcctyn.iot.forestfire.BO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户信息业务对象
+ */
+@Data
+public class SysUserBO implements Serializable {
+
+ private static final long serialVersionUID = 6464645141599651914L;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 用户账号
+ */
+ private String userName;
+
+ /**
+ * 用户昵称
+ */
+ private String nickName;
+
+ /**
+ * 用户邮箱
+ */
+ private String email;
+
+ /**
+ * 手机号码
+ */
+ private String phonenumber;
+
+ /**
+ * 用户性别
+ */
+ private String sex;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/AggregationStatisticsVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/AggregationStatisticsVO.java
new file mode 100644
index 0000000..5c006f6
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/AggregationStatisticsVO.java
@@ -0,0 +1,39 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * APP 端聚合统计接口返回值
+ */
+@Data
+public class AggregationStatisticsVO implements Serializable {
+
+ private static final long serialVersionUID = -7851077263822626129L;
+
+ /**
+ * 未处理的火情预警数
+ */
+ private Long unhandledFireWarningNum = 0L;
+
+ /**
+ * 未处理的火情上报数
+ */
+ private Long unhandledFireReportNum = 0L;
+
+ /**
+ * 我未接受的任务数
+ */
+ private Long unacceptedTaskNum = 0L;
+
+ /**
+ * 未审批的记录数
+ */
+ private Long unapprovedNum = 0L;
+
+ /**
+ * 林区下未接受的任务数
+ */
+ private Long unacceptedTaskNumByRegion = 0L;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/AirportVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/AirportVO.java
new file mode 100644
index 0000000..467ad8b
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/AirportVO.java
@@ -0,0 +1,100 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 查询火情风险点附近最近的机场VO
+ */
+@Data
+public class AirportVO implements Serializable {
+
+ private static final long serialVersionUID = -1759830973473090526L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 设备编号
+ */
+ private String deviceNo;
+
+ /**
+ * 设备名称
+ */
+ private String deviceName;
+
+ /**
+ * 设备型号
+ */
+ private String deviceModel;
+
+ /**
+ * 设备厂商
+ */
+ private String deviceManufacturer;
+
+ /**
+ * 设备协议
+ */
+ private String deviceProtocol;
+
+ /**
+ * 接入方式
+ */
+ private String accessMethod;
+
+ /**
+ * 设备类型
+ */
+ private String deviceType;
+
+ /**
+ * 设备状态：在线/离线
+ */
+ private String deviceStatus;
+
+ /**
+ * 归属区域id,机场需要挂在地区下面
+ */
+ private Long regionId;
+
+ /**
+ * 地址
+ */
+ private String address;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 高度
+ */
+ private String height;
+
+ /**
+ * 设备启用状态：0-停用/1-启用
+ */
+ private Integer enableFlag;
+
+ /**
+ * 归属地区名称
+ */
+ private String regionName;
+
+
+ /** 机场下的无人机列表 */
+ private List droneList;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ApprovalRecordVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ApprovalRecordVO.java
new file mode 100644
index 0000000..b34d418
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ApprovalRecordVO.java
@@ -0,0 +1,78 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 审批记录返回给前端VO
+ */
+@Data
+public class ApprovalRecordVO implements Serializable {
+
+ private static final long serialVersionUID = -2678024258066273556L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 业务类型
+ */
+ private String businessType;
+
+ /**
+ * 业务数据id
+ */
+ private Long businessDataId;
+
+ /**
+ * 业务数据内容
+ */
+ private Object businessContent;
+
+ /**
+ * 审批标识，0-未审批，1-已审批
+ */
+ private Integer approvalFlag;
+
+ /**
+ * 审批状态，0-驳回，1-通过
+ */
+ private Integer approvalStatus;
+
+ /**
+ * 驳回说明
+ */
+ private String rejectionStatement;
+
+ /**
+ * 审核人id
+ */
+ private Long reviewerId;
+
+ /**
+ * 审核时间
+ */
+ private Date reviewTime;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 记录创建时间，默认用服务器时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createdTime;
+
+ /**
+ * 审批人姓名
+ */
+ private String reviewerName;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/CameraVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/CameraVO.java
new file mode 100644
index 0000000..2765c6f
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/CameraVO.java
@@ -0,0 +1,59 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 摄像头设备VO
+ */
+@Data
+public class CameraVO implements Serializable {
+
+ private static final long serialVersionUID = 4975876865936973836L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 设备编号
+ */
+ private String deviceNo;
+
+ /**
+ * 设备名称
+ */
+ private String deviceName;
+
+ /**
+ * 设备型号
+ */
+ private String deviceModel;
+
+ /**
+ * 设备厂商
+ */
+ private String deviceManufacturer;
+
+ /**
+ * 设备类型
+ */
+ private String deviceType;
+
+ /**
+ * 设备在线/离线状态
+ */
+ private String deviceStatus;
+
+ /**
+ * 归属区域id
+ */
+ private Long regionId;
+
+ /**
+ * 归属区域名称
+ */
+ private String regionName;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/CarouselImageConfigVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/CarouselImageConfigVO.java
new file mode 100644
index 0000000..8445a69
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/CarouselImageConfigVO.java
@@ -0,0 +1,47 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 轮播图VO
+ */
+@Data
+public class CarouselImageConfigVO implements Serializable {
+
+ private static final long serialVersionUID = -5616770476661134447L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 图片主题
+ */
+ private String imageTheme;
+
+ /**
+ * 图片
+ */
+ private String image;
+
+ /**
+ * 序号
+ */
+ private Integer sortNo;
+
+ /**
+ * 是否启用：0-停用，1-启用
+ */
+ private Integer enableFlag;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/CheckInRecordVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/CheckInRecordVO.java
new file mode 100644
index 0000000..d66bb1f
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/CheckInRecordVO.java
@@ -0,0 +1,95 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 打卡记录VO
+ */
+@Data
+public class CheckInRecordVO implements Serializable {
+
+ private static final long serialVersionUID = 8171630821682560531L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 排班id
+ */
+ private Long scheduleId;
+
+ /**
+ * 点位id
+ */
+ private Long pointId;
+
+ /**
+ * 林区id
+ */
+ private Long forestId;
+
+ /**
+ * 林场id
+ */
+ private Long farmId;
+
+ /**
+ * 电子围栏id
+ */
+ private Long fenceId;
+
+ /**
+ * 巡护路径id
+ */
+ private Long pathId;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 打卡时间
+ */
+ private Date checkInTime;
+
+ /**
+ * 打卡地点
+ */
+ private String location;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 高度
+ */
+ private String height;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 打卡拍照
+ */
+ private String checkPicture;
+
+ /**
+ * 护林员姓名
+ */
+ private String userName;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceAndPointInfoVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceAndPointInfoVO.java
new file mode 100644
index 0000000..9d4ba75
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceAndPointInfoVO.java
@@ -0,0 +1,85 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 设备信息及归属点位信息
+ */
+@Data
+public class DeviceAndPointInfoVO implements Serializable {
+
+ private static final long serialVersionUID = 7032345348538117946L;
+
+ //设备信息
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 设备编号
+ */
+ private String deviceNo;
+
+ /**
+ * 设备型号
+ */
+ private String deviceModel;
+
+ /**
+ * 设备厂商
+ */
+ private String deviceManufacturer;
+
+ /**
+ * 设备类型
+ */
+ private String deviceType;
+
+ //点位信息
+
+ /**
+ * 归属云台/卡口id
+ */
+ private Long pointId;
+
+ /**
+ * 点位编号
+ */
+ private String pointNo;
+
+ /**
+ * 点位名称
+ */
+ private String pointName;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 点位类型：云台、卡口、打卡点、巡护点
+ */
+ private String pointType;
+
+ /**
+ * 点位描述信息
+ */
+ private String pointDescription;
+
+ /**
+ * 点位图片，多张以英文逗号分隔
+ */
+ private String pointPicture;
+
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceChanelsVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceChanelsVO.java
new file mode 100644
index 0000000..9b6ca41
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceChanelsVO.java
@@ -0,0 +1,59 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 设备通道返回给前端的VO
+ */
+@Data
+public class DeviceChanelsVO {
+
+ //private static final long serialVersionUID = L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 设备编号
+ */
+ private String deviceNo;
+
+ /**
+ * 通道号
+ */
+ private String chanelNo;
+
+ /**
+ * 名称
+ */
+ private String name;
+
+ /**
+ * 流地址
+ */
+ private String streamUrl;
+
+ /**
+ * 创建人员姓名
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间，默认用服务器时间
+ */
+ private Date createdTime;
+
+ /**
+ * 修改人员姓名
+ */
+ private String updatedBy;
+
+ /**
+ * 修改时间，默认用服务器时间
+ */
+ private Date updatedTime;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceConfigVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceConfigVO.java
new file mode 100644
index 0000000..3ce6541
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceConfigVO.java
@@ -0,0 +1,46 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+
+/**
+ * 设备配置返回给前端的VO
+ */
+@Data
+public class DeviceConfigVO {
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 设备编号
+ */
+ private String deviceNo;
+
+ /**
+ * 用户账户
+ */
+ private String username;
+
+ /**
+ * 密码
+ */
+ private String password;
+
+ /**
+ * IP地址
+ */
+ private String ip;
+
+ /**
+ * 端口号
+ */
+ private String port;
+
+ /**
+ * 备注
+ */
+ private String remark;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceInfoSimpleVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceInfoSimpleVO.java
new file mode 100644
index 0000000..ed41573
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceInfoSimpleVO.java
@@ -0,0 +1,91 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 简单的设备信息
+ * 云台、卡口下的设备信息
+ */
+@Data
+public class DeviceInfoSimpleVO implements Serializable {
+
+ private static final long serialVersionUID = -5550394669879020905L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 设备编号
+ */
+ private String deviceNo;
+
+ /**
+ * 设备名称
+ */
+ private String deviceName;
+
+ /**
+ * 设备型号
+ */
+ private String deviceModel;
+
+ /**
+ * 设备厂商
+ */
+ private String deviceManufacturer;
+
+ /**
+ * 设备协议
+ */
+ private String deviceProtocol;
+
+ /**
+ * 接入方式
+ */
+ private String accessMethod;
+
+ /**
+ * 设备类型
+ */
+ private String deviceType;
+
+ /**
+ * 设备状态：在线/离线
+ */
+ private String deviceStatus;
+
+ /**
+ * 归属区域id,机场需要挂在地区下面
+ */
+ private Long regionId;
+
+ /**
+ * 归属云台/卡口id
+ */
+ private Long pointId;
+
+ /**
+ * 设备启用状态：0-停用/1-启用
+ */
+ private Integer enableFlag;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 归属地区名称
+ */
+ private String regionName;
+
+ /**
+ * 归属点位名称
+ */
+ private String pointName;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceInfoVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceInfoVO.java
new file mode 100644
index 0000000..182ad21
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceInfoVO.java
@@ -0,0 +1,179 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import com.tcctyn.iot.forestfire.domain.DeviceConfig;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 设备信息返回给前端的VO
+ */
+@Data
+public class DeviceInfoVO implements Serializable {
+
+ private static final long serialVersionUID = 3428836874966786844L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 设备编号
+ */
+ private String deviceNo;
+
+ /**
+ * 设备名称
+ */
+ private String deviceName;
+
+ /**
+ * 设备型号
+ */
+ private String deviceModel;
+
+ /**
+ * 设备厂商
+ */
+ private String deviceManufacturer;
+
+ /**
+ * 设备协议
+ */
+ private String deviceProtocol;
+
+ /**
+ * 接入方式
+ */
+ private String accessMethod;
+
+ /**
+ * 设备类型
+ */
+ private String deviceType;
+
+ /**
+ * 设备状态：在线/离线
+ */
+ private String deviceStatus;
+
+ /**
+ * 归属区域id,机场需要挂在地区下面
+ */
+ private Long regionId;
+
+ /**
+ * 归属云台/卡口id
+ */
+ private Long pointId;
+
+ /**
+ * 林区id
+ */
+ private Long forestId;
+
+ /**
+ * 林场id
+ */
+ private Long farmId;
+
+ /**
+ * 电子围栏id
+ */
+ private Long fenceId;
+
+ /**
+ * 机场id
+ */
+ private Long airportId;
+
+ /**
+ * 地址
+ */
+ private String address;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 高度
+ */
+ private String height;
+
+ /**
+ * 设备启用状态：0-停用/1-启用
+ */
+ private Integer enableFlag;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 该条记录是否被删除，1-已删除，0-未删除
+ */
+ private Integer delFlag;
+
+ /**
+ * 创建人员姓名
+ */
+ private String createdBy;
+
+ /**
+ * 记录创建时间，默认用服务器时间
+ */
+ private Date createdTime;
+
+ /**
+ * 修改人员姓名
+ */
+ private String updatedBy;
+
+ /**
+ * 记录修改时间，默认用服务器时间
+ */
+ private Date updatedTime;
+
+ //以下是包装给前端的名称字段
+ /**
+ * 归属地区名称
+ */
+ private String regionName;
+
+ /**
+ * 归属点位名称
+ */
+ private String pointName;
+
+ /**
+ * 归属机场名称
+ */
+ private String airportName;
+
+ /**
+ * 归属名称：统一点位名称与机场名称，方便前端列表页面展示
+ */
+ private String pointOrAirportName;
+
+ /**
+ * 设备配置信息表
+ */
+ private DeviceConfig deviceConfig;
+
+ /**
+ * 设备通道信息表
+ */
+ private List deviceChanelsVOList;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceOwnerVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceOwnerVO.java
new file mode 100644
index 0000000..d9a39d9
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceOwnerVO.java
@@ -0,0 +1,35 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 设备归属VO
+ */
+@Data
+public class DeviceOwnerVO implements Serializable {
+
+ private static final long serialVersionUID = 8007964042205003964L;
+
+ public DeviceOwnerVO() {
+ }
+
+ public DeviceOwnerVO(Long id, String name) {
+ this.id = id;
+ this.name = name;
+ }
+
+
+ /**
+ * id
+ */
+ private Long id;
+
+
+ /**
+ * 名称
+ */
+ private String name;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceStatisticsByPointVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceStatisticsByPointVO.java
new file mode 100644
index 0000000..958ab70
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceStatisticsByPointVO.java
@@ -0,0 +1,39 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 统计云台、卡口下的设备数量
+ */
+@Data
+public class DeviceStatisticsByPointVO implements Serializable {
+
+ private static final long serialVersionUID = -6173268737974058330L;
+
+ /**
+ * 设备总数
+ */
+ private Integer totalNum;
+
+ /**
+ * 云台设备数量
+ */
+ private Integer ptzNum;
+
+ /**
+ * 卡口设备数量
+ */
+ private Integer bayonetNum;
+
+ /**
+ * 总的在线设备
+ */
+ private Integer onlineNum;
+
+ /**
+ * 总的设备在线率
+ */
+ private String onlineRate;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceStatisticsByStatusVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceStatisticsByStatusVO.java
new file mode 100644
index 0000000..b8fc337
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceStatisticsByStatusVO.java
@@ -0,0 +1,34 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 设备列表上方的统计信息
+ */
+@Data
+public class DeviceStatisticsByStatusVO implements Serializable {
+
+ private static final long serialVersionUID = 8173577365152550543L;
+
+ /**
+ * 设备总数量
+ */
+ private Integer totalNum;
+
+ /**
+ * 在线设备数量
+ */
+ private Integer onlineNum;
+
+ /**
+ * 离线设备数量
+ */
+ private Integer offlineNum;
+
+ /**
+ * 未启用的设备数量
+ */
+ private Integer disableNum;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceStatisticsSubVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceStatisticsSubVO.java
new file mode 100644
index 0000000..6e8bf6d
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceStatisticsSubVO.java
@@ -0,0 +1,39 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 大屏设备统计子类
+ */
+@Data
+public class DeviceStatisticsSubVO implements Serializable {
+
+ private static final long serialVersionUID = -8015476506632502263L;
+
+ /**
+ * 设备类型
+ */
+ private String type;
+
+ /**
+ * 在线数量
+ */
+ private Integer onlineNum;
+
+ /**
+ * 离线数量
+ */
+ private Integer offlineNum;
+
+ /**
+ * 总数量
+ */
+ private Integer totalNum;
+
+ /**
+ * 在线率
+ */
+ private String onlineRate;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceStatisticsVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceStatisticsVO.java
new file mode 100644
index 0000000..5d7ee83
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceStatisticsVO.java
@@ -0,0 +1,30 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 大屏设备信息统计VO
+ */
+@Data
+public class DeviceStatisticsVO implements Serializable {
+
+ private static final long serialVersionUID = -4514149323953101569L;
+
+ /**
+ * 设备总数量
+ */
+ private Integer total;
+
+ /**
+ * 总的在线率
+ */
+ private String overallOnlineRate;
+
+ /**
+ * 子对象列表
+ */
+ private List subList;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceUnderPointVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceUnderPointVO.java
new file mode 100644
index 0000000..778e907
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DeviceUnderPointVO.java
@@ -0,0 +1,29 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 资源点下的设备统计信息
+ */
+@Data
+public class DeviceUnderPointVO implements Serializable {
+
+ private static final long serialVersionUID = -3210088644519804874L;
+
+ /**
+ * 设备总数
+ */
+ private Integer totalNum = 0;
+
+ /**
+ * 在线设备数
+ */
+ private Integer onlineNum = 0;
+
+ /**
+ * 离线设备数
+ */
+ private Integer offlineNum = 0;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DroneTaskPlanVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DroneTaskPlanVO.java
new file mode 100644
index 0000000..49c56e3
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DroneTaskPlanVO.java
@@ -0,0 +1,80 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 无人机任务返回给前端的VO
+ */
+@Data
+public class DroneTaskPlanVO implements Serializable {
+
+ private static final long serialVersionUID = -4331918313693391285L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 无人机编号
+ */
+ private String droneNo;
+
+ /**
+ * 任务区域
+ */
+ private Long regionId;
+
+ /**
+ * 任务名称
+ */
+ private String taskName;
+
+ /**
+ * 任务类型：周期性任务、单次性任务
+ */
+ private String taskType;
+
+ /**
+ * 单次任务标识：0-非单次任务；1-单次任务
+ */
+ private Integer singleTaskFlag;
+
+ /**
+ * 执行周期：每多少天执行一次
+ */
+ private String executionCycle;
+
+ /**
+ * 任务状态：未执行、执行中、已完成
+ */
+ private String taskStatus;
+
+ /**
+ * 开始时间
+ */
+ private Date startTime;
+
+ /**
+ * 结束时间
+ */
+ private Date endTime;
+
+ /**
+ * 任务航线：可以暂时存放经纬度信息，给前端提供模拟的航线
+ */
+ private String taskRoute;
+
+ //下面是VO展示的字段
+
+ /**
+ * 任务区域名称
+ */
+ private String regionName;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DroneVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DroneVO.java
new file mode 100644
index 0000000..97eea95
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/DroneVO.java
@@ -0,0 +1,89 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 机场下的无人机列表
+ */
+@Data
+public class DroneVO implements Serializable {
+
+ private static final long serialVersionUID = 628168140318152935L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 设备编号
+ */
+ private String deviceNo;
+
+ /**
+ * 设备名称
+ */
+ private String deviceName;
+
+ /**
+ * 设备型号
+ */
+ private String deviceModel;
+
+ /**
+ * 设备厂商
+ */
+ private String deviceManufacturer;
+
+ /**
+ * 设备协议
+ */
+ private String deviceProtocol;
+
+ /**
+ * 接入方式
+ */
+ private String accessMethod;
+
+ /**
+ * 设备类型
+ */
+ private String deviceType;
+
+ /**
+ * 设备状态：在线/离线
+ */
+ private String deviceStatus;
+
+ /**
+ * 归属区域id,机场需要挂在地区下面
+ */
+ private Long regionId;
+
+ /**
+ * 机场id
+ */
+ private Long airportId;
+
+ /**
+ * 设备启用状态：0-停用/1-启用
+ */
+ private Integer enableFlag;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 归属地区名称
+ */
+ private String regionName;
+
+ /**
+ * 归属机场名称
+ */
+ private String airportName;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireReportStatisticsVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireReportStatisticsVO.java
new file mode 100644
index 0000000..07476c1
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireReportStatisticsVO.java
@@ -0,0 +1,39 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 历史火情统计信息VO
+ */
+@Data
+public class FireReportStatisticsVO implements Serializable {
+
+ private static final long serialVersionUID = -5474081569984902993L;
+
+ /**
+ * 总的火灾数量
+ */
+ private Integer totalNum;
+
+ /**
+ * 一般火灾数量
+ */
+ private Integer generalFireNum;
+
+ /**
+ * 较大火灾
+ */
+ private Integer majorFireNum;
+
+ /**
+ * 重大火灾
+ */
+ private Integer seriousFireNum;
+
+ /**
+ * 特别重大火灾
+ */
+ private Integer especiallySeriousFireNum;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireReportVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireReportVO.java
new file mode 100644
index 0000000..23ba51a
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireReportVO.java
@@ -0,0 +1,200 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 火情上报VO
+ */
+@Data
+public class FireReportVO implements Serializable {
+
+ private static final long serialVersionUID = 7460119250284631833L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 火情标题
+ */
+ private String fireTitle;
+
+ /**
+ * 上报方式：卫星上报、无人机上报、人工上报、监测点（云台/卡口）上报
+ */
+ private String reportMethod;
+
+ /**
+ * 来源火情预警id
+ */
+ private Long fireWarningId;
+
+ /**
+ * 上报设备编号
+ */
+ private String deviceNo;
+
+ /**
+ * 上报设备类型
+ */
+ private String deviceType;
+
+ /**
+ * 上报人员id
+ */
+ private Long reporterId;
+
+ /**
+ * 地址
+ */
+
+ private String address;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 高度
+ */
+ private String height;
+
+ /**
+ * 归属区域id
+ */
+ private Long regionId;
+
+ /**
+ * 林区id
+ */
+ private Long forestId;
+
+ /**
+ * 林场id
+ */
+ private Long farmId;
+
+ /**
+ * 电子围栏id
+ */
+ private Long fenceId;
+
+ /**
+ * 火险等级，有别于火情预警等级
+ */
+ private String fireHazardLevel;
+
+ /**
+ * 起火原因
+ */
+ private String fireCause;
+
+ /**
+ * 失火面积
+ */
+ private String fireArea;
+
+ /**
+ * 预计损失金额
+ */
+ private String amountLoss;
+
+ /**
+ * 火情图片
+ */
+ private String firePicture;
+
+ /**
+ * 火情描述
+ */
+ private String fireDescription;
+
+ /**
+ * 处置状态：未处理、已处理
+ */
+ private Integer disposalStatus;
+
+ /**
+ * 处置说明
+ */
+ private String disposalInstruction;
+
+ /**
+ * 扑救情况
+ */
+ private String firefightingSituation;
+
+ /**
+ * 灾后情况说明
+ */
+ private String disasterSituation;
+
+ /**
+ * 扑救单位
+ */
+ private String firefightingUnit;
+
+ /**
+ * 主要负责人
+ */
+ private String personInCharge;
+
+ /**
+ * 归档状态
+ */
+ private Integer archiveStatus;
+
+ /**
+ * 归档时间
+ */
+ private Date archiveTime;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 该条记录是否被删除，1-已删除，0-未删除
+ */
+ private Integer delFlag;
+
+ /**
+ * 创建人员姓名
+ */
+ private String createdBy;
+
+ /**
+ * 记录创建时间，默认用服务器时间
+ */
+ private Date createdTime;
+
+ /**
+ * 修改人员姓名
+ */
+ private String updatedBy;
+
+ /**
+ * 记录修改时间，默认用服务器时间
+ */
+ private Date updatedTime;
+
+ // 以下为给前端展示的字段
+
+ /** 上报人姓名 */
+ private String reporterName;
+
+ /** 地区名称 */
+ private String regionName;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningCountByLevelVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningCountByLevelVO.java
new file mode 100644
index 0000000..3357ff1
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningCountByLevelVO.java
@@ -0,0 +1,24 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 根据火情等级进行统计
+ */
+@Data
+public class FireWarningCountByLevelVO implements Serializable {
+
+ private static final long serialVersionUID = 8301796932960031829L;
+
+ /**
+ * 火情等级
+ */
+ private String fireLevel;
+
+ /**
+ * 数量
+ */
+ private Integer number;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningCountByStatusVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningCountByStatusVO.java
new file mode 100644
index 0000000..739fa7c
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningCountByStatusVO.java
@@ -0,0 +1,26 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class FireWarningCountByStatusVO implements Serializable {
+
+ private static final long serialVersionUID = 97763231488523638L;
+
+
+ /**
+ * 已处理数量
+ */
+ private Integer unhandledNum;
+
+ /** 已上报数量 */
+ private Integer reportedNum;
+
+ /** 已研判数量 */
+ private Integer analyzedNum;
+
+ /** 已归档数量 */
+ private Integer archivedNum;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningInfoVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningInfoVO.java
new file mode 100644
index 0000000..138601d
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningInfoVO.java
@@ -0,0 +1,145 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 火情信息VO
+ */
+@Data
+public class FireWarningInfoVO implements Serializable {
+
+ private static final long serialVersionUID = 8848812242542233067L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 发现火情设备编号
+ */
+ private String deviceNo;
+
+ /**
+ * 设备类型
+ */
+ private String deviceType;
+
+ /**
+ * 地址
+ */
+ private String address;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 高度
+ */
+ private String height;
+
+ /**
+ * 所属区域id
+ */
+ private Long regionId;
+
+ /**
+ * 区域名称
+ */
+ private String regionName;
+
+ /**
+ * 林区id
+ */
+ private Long forestId;
+
+ /**
+ * 林场id
+ */
+ private Long farmId;
+
+ /**
+ * 电子围栏id
+ */
+ private Long fenceId;
+
+ /**
+ * 火情标题
+ */
+ private String fireTitle;
+
+ /**
+ * 火情级别
+ */
+ private String fireLevel;
+
+ /**
+ * 起火原因
+ */
+ private String fireCause;
+
+ /**
+ * 处置状态：未处理、已研判、已上报、已归档
+ */
+ private String disposalStatus;
+
+ /**
+ * 研判结果说明
+ */
+ private String analyzeInstruction;
+
+ /**
+ * 处置人
+ */
+ private Long disposalBy;
+
+ /**
+ * 处置人姓名
+ */
+ private String disposalByName;
+
+ /**
+ * 处置时间
+ */
+ private Date disposalTime;
+
+ /**
+ * 失火面积
+ */
+ private String fireArea;
+
+ /**
+ * 损失金额
+ */
+ private String amountDamage;
+
+ /**
+ * 火情图片
+ */
+ private String firePicture;
+
+ /**
+ * 火情预警数据来源
+ */
+ private String dataSource;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningStatisticsByDataSourceVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningStatisticsByDataSourceVO.java
new file mode 100644
index 0000000..e07be41
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningStatisticsByDataSourceVO.java
@@ -0,0 +1,29 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 火情预警信息来源统计
+ */
+@Data
+public class FireWarningStatisticsByDataSourceVO implements Serializable {
+
+ private static final long serialVersionUID = -2324434962571875389L;
+
+ /**
+ * 卫星热点
+ */
+ private Integer satelliteHotspotNum;
+
+ /**
+ * 视频监控
+ */
+ private Integer videoMonitorNum;
+
+ /**
+ * 巡护上报
+ */
+ private Integer patrolReportNum;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningSurroundingVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningSurroundingVO.java
new file mode 100644
index 0000000..6f2728f
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/FireWarningSurroundingVO.java
@@ -0,0 +1,42 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 火情预警周边分析VO
+ */
+
+@Data
+public class FireWarningSurroundingVO implements Serializable {
+
+ private static final long serialVersionUID = -1610177596913751767L;
+
+ /**
+ * 负责单位，可以是人，也可以是企业
+ */
+ private String belongingUnit;
+
+ /**
+ * 负责单位联系电话
+ */
+ private String unitTel;
+
+ /**
+ * 护林员信息
+ */
+ private List personVOList;
+
+ /**
+ * 仓库信息
+ */
+ private List wareHouseVOList;
+
+ /**
+ * 水源地信息
+ */
+ private List waterSourceVOList;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ForesterStatisticsVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ForesterStatisticsVO.java
new file mode 100644
index 0000000..9165c1a
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ForesterStatisticsVO.java
@@ -0,0 +1,22 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+/**
+ * 大屏页面护林员统计数据
+ */
+@Data
+public class ForesterStatisticsVO {
+
+ // 当日值班人数
+ private Integer todayDutyNum;
+
+ // 当日打卡数
+ private Integer todayCheckNum;
+
+ // 当日总共打卡数
+ private Integer totalCheckNum;
+
+ // 临时任务数
+ private Integer tempTaskNum;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/HkStoreCapturePicturesVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/HkStoreCapturePicturesVO.java
new file mode 100644
index 0000000..4d4f6e4
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/HkStoreCapturePicturesVO.java
@@ -0,0 +1,90 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 海康_硬件抓拍图片元数据表
+ * @author 13768238378
+ * @TableName hk_store_capture_pictures
+ */
+
+@Data
+public class HkStoreCapturePicturesVO implements Serializable {
+ /**
+ * 主键ID
+ */
+// @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * MinIO存储桶名称（符合MinIO命名规范）
+ */
+ private String bucket;
+
+ /**
+ * MinIO对象唯一路径（如: images/user/2023/10/photo.jpg）
+ */
+ private String objectKey;
+
+ /**
+ * 原始文件名
+ */
+ private String originalName;
+
+ /**
+ * 上传用户ID
+ */
+ private Long userId;
+
+ /**
+ * 文件大小（字节）
+ */
+ private Long fileSize;
+
+ /**
+ * 文件MIME类型（如image/jpeg）
+ */
+ private String fileType;
+
+ /**
+ * 文件MD5哈希（用于去重校验）
+ */
+ private String md5;
+
+ /**
+ * 是否公开（0-私有，1-公开）
+ */
+ private Integer isPublic;
+
+ /**
+ * 软删除标记（0-未删除，1-已删除）
+ */
+ private Integer isDeleted;
+
+ /**
+ * 上传时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createdAt;
+
+ /**
+ * 更新时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updatedAt;
+ /**
+ * 设备id
+ */
+ private String deviceId;
+ /**
+ * 访问路径
+ */
+ private String accessPath;
+
+ private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/InventoryVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/InventoryVO.java
new file mode 100644
index 0000000..b3260bf
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/InventoryVO.java
@@ -0,0 +1,87 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 库存记录
+ */
+@Data
+public class InventoryVO {
+ /**
+ * 库存id
+ */
+ private Long inventoryId;
+
+ /**
+ * 仓库id
+ */
+ private Long warehouseId;
+
+ /**
+ * 物资id
+ */
+ private Long materialId;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 入库/出库
+ */
+ private Integer inventoryType;
+
+ /**
+ * 物资名称
+ */
+ private String materialName;
+
+ /**
+ * 规格
+ */
+ private String unit;
+
+ /**
+ * 数量
+ */
+ private BigDecimal quantity;
+
+ /**
+ * 物资类型
+ */
+ private Integer materialType;
+
+ /**
+ * 备注
+ */
+ private String description;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+ /**
+ * 仓库名
+ */
+ private String warehouseName;
+
+ /**
+ * 用户名
+ */
+ private String userName;
+
+ /**
+ * 仓库林场id
+ */
+ private Long regionId;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/KeyAreaInfoVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/KeyAreaInfoVO.java
new file mode 100644
index 0000000..4c63048
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/KeyAreaInfoVO.java
@@ -0,0 +1,64 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class KeyAreaInfoVO implements Serializable {
+
+ private static final long serialVersionUID = -5540262582633590948L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 归属区域id
+ */
+ private Long regionId;
+
+ /**
+ * 开始时间,以天为单位
+ */
+ private Date startTime;
+
+ /**
+ * 结束时间，以天为单位
+ */
+ private Date endTime;
+
+ /**
+ * 重点区域类型，数据字典
+ */
+ private String keyAreaType;
+
+ /**
+ * 区域坐标信息
+ */
+ private String coordinateInfo;
+
+ /**
+ * 区域说明
+ */
+ private String regionDescription;
+
+ /**
+ * 区域图片
+ */
+ private String picture;
+
+ /**
+ * 记录创建时间，默认用服务器时间
+ */
+ private Date createdTime;
+
+ //以下是给前端显示用的字段
+
+ /**
+ * 归属区域名称
+ */
+ private String regionName;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/LeaveRecordVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/LeaveRecordVO.java
new file mode 100644
index 0000000..f68ba97
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/LeaveRecordVO.java
@@ -0,0 +1,126 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 请假记录返给前端VO
+ */
+@Data
+public class LeaveRecordVO implements Serializable {
+
+ private static final long serialVersionUID = -1916751239764842177L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 请假人id
+ */
+ private Long userId;
+
+ /**
+ * 请假人部门id
+ */
+ private Long deptId;
+
+ /**
+ * 请假类型
+ */
+ private String leaveType;
+
+ /**
+ * 开始时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startTime;
+
+ /**
+ * 结束时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endTime;
+
+ /**
+ * 请假时长，单位小时
+ */
+ private String leaveDuration;
+
+ /**
+ * 请假说明
+ */
+ private String leaveInstruction;
+
+ /**
+ * 图片
+ */
+ private String picture;
+
+ /**
+ * 撤销标识：0-未撤销，1-已撤销
+ */
+ private Integer revokeFlag;
+
+ /**
+ * 撤销时间
+ */
+ private Date revokeTime;
+
+ /**
+ * 审批标识：0-未审批，1-已审批
+ */
+ private Integer approvalFlag;
+
+ /**
+ * 审批状态：0-驳回，1-通过
+ */
+ private Integer approvalStatus;
+
+ /**
+ * 驳回说明
+ */
+ private String rejectionStatement;
+
+ /**
+ * 审核人id
+ */
+ private Long reviewerId;
+
+ /**
+ * 审核时间
+ */
+ private Date reviewTime;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 记录创建时间，默认用服务器时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createdTime;
+
+ //以下是VO 做的映射字段
+
+ /**
+ * 请假人姓名
+ */
+ private String userName;
+
+ /**
+ * 部门名称
+ */
+ private String deptName;
+
+ /**
+ * 审批人姓名
+ */
+ private String reviewerName;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/MaterialStatisticsVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/MaterialStatisticsVO.java
new file mode 100644
index 0000000..796a9e8
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/MaterialStatisticsVO.java
@@ -0,0 +1,19 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+/**
+ * 物资统计
+ */
+@Data
+public class MaterialStatisticsVO {
+
+ private Long warehouseId;
+
+ // 物资类型
+ private Integer materialType;
+
+ // 物资数量
+ private Integer materialNum;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/MaterialVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/MaterialVO.java
new file mode 100644
index 0000000..1be6f02
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/MaterialVO.java
@@ -0,0 +1,87 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 物资信息
+ */
+@Data
+public class MaterialVO {
+
+ /**
+ * 物资ID
+ */
+ private Long materialId;
+
+ /**
+ * 仓库id
+ */
+ private Long warehouseId;
+
+ /**
+ * 编号
+ */
+ private String serialNumber;
+
+ /**
+ * 物资名称
+ */
+ private String materialName;
+
+ /**
+ * 型号
+ */
+ private String model;
+
+ /**
+ * 单位
+ */
+ private String unit;
+
+ /**
+ * 库存
+ */
+ private String stock;
+
+ /**
+ * 物资类型
+ */
+ private Integer materialType;
+
+ /**
+ * 照片
+ */
+ private String photo;
+
+ /**
+ * 描述
+ */
+ private String description;
+
+ /**
+ * 删除标志
+ */
+ private Integer delFlag;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+ /**
+ * 仓库名称
+ */
+ private String warehouseName;
+
+ /**
+ * 仓库林场id
+ */
+ private Long regionId;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/NoticeInfoVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/NoticeInfoVO.java
new file mode 100644
index 0000000..0707fea
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/NoticeInfoVO.java
@@ -0,0 +1,57 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 通知公告VO
+ */
+@Data
+public class NoticeInfoVO implements Serializable {
+
+ private static final long serialVersionUID = -4931397249912148775L;
+
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 类型：通知、公告
+ */
+ private String type;
+
+ /**
+ * 标题
+ */
+ private String title;
+
+ /**
+ * 内容
+ */
+ private String content;
+
+ /**
+ * 文件
+ */
+ private String file;
+
+ /**
+ * 序号
+ */
+ private Integer sortNo;
+
+ /**
+ * 是否启用：0-停用，1-启用
+ */
+ private Integer enableFlag;
+
+ /**
+ * 记录创建时间，默认用服务器时间
+ */
+ private Date createdTime;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/PatrolPathVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/PatrolPathVO.java
new file mode 100644
index 0000000..a5f6281
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/PatrolPathVO.java
@@ -0,0 +1,70 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import com.tcctyn.iot.forestfire.BO.PointInfoBO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 巡护路径前端展示对象
+ */
+@Data
+public class PatrolPathVO implements Serializable {
+
+ private static final long serialVersionUID = -549172295504736627L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 路径编号
+ */
+// @NotBlank(message = "路径编号不能为空")
+ private String pathNo;
+
+ /**
+ * 路径名称
+ */
+ private String pathName;
+
+ /**
+ * 归属区域id,取林区、林场、电子围栏中的最下级id
+ */
+ private Long BelongingRegionId;
+
+ /**
+ * 归属区域名称，由林区、林场、电子围栏名称拼起来展示
+ */
+ private String belongingRegionName;
+
+ /**
+ * 林区id
+ */
+ private Long forestId;
+
+ /**
+ * 林场id
+ */
+ private Long farmId;
+
+ /**
+ * 电子围栏id
+ */
+ private Long fenceId;
+
+ /**
+ * 路径简介
+ */
+ private String pathIntroduction;
+
+ /**
+ * 路径坐标信息
+ */
+ private List pointList;
+
+
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/PointAndDeviceInfoVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/PointAndDeviceInfoVO.java
new file mode 100644
index 0000000..8054603
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/PointAndDeviceInfoVO.java
@@ -0,0 +1,120 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 查询云台、卡口及云台、卡口下的设备信息
+ */
+@Data
+public class PointAndDeviceInfoVO implements Serializable {
+
+ private static final long serialVersionUID = 2725406706265029262L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 点位编号
+ */
+ private String pointNo;
+
+ /**
+ * 点位名称
+ */
+ private String pointName;
+
+ /**
+ * 行政区划
+ */
+ private String administrativeDivision;
+
+ /**
+ * 归属地区id
+ */
+ private Long belongingRegionId;
+
+ /**
+ * 归属地区名称
+ */
+ private String belongingRegionName;
+
+ /**
+ * 林区id
+ */
+ private Long forestId;
+
+ /**
+ * 林场id
+ */
+ private Long farmId;
+
+ /**
+ * 电子围栏id
+ */
+ private Long fenceId;
+
+ /**
+ * 详细地址
+ */
+ private String address;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 高度
+ */
+ private String height;
+
+ /**
+ * 点位类型：云台、卡口、打卡点、巡护点
+ */
+ private String pointType;
+
+ /**
+ * 点位顺序
+ */
+ private Integer sortNo;
+
+ /**
+ * 打卡半径，单位：米
+ */
+ private String checkInRadius;
+
+ /**
+ * 点位描述信息
+ */
+ private String pointDescription;
+
+ /**
+ * 点位图片，多张以英文逗号分隔
+ */
+ private String pointPicture;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 云台、卡口下的设备
+ */
+ private List deviceInfoList;
+
+ /**
+ * 启用状态：0-停用/1-启用
+ */
+ private Integer enableFlag;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/PointInfoVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/PointInfoVO.java
new file mode 100644
index 0000000..e91948e
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/PointInfoVO.java
@@ -0,0 +1,119 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 点位信息VO
+ */
+@Data
+public class PointInfoVO implements Serializable {
+
+ private static final long serialVersionUID = -549172295504736627L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 点位编号
+ */
+ private String pointNo;
+
+ /**
+ * 点位名称
+ */
+ private String pointName;
+
+ /**
+ * 行政区划
+ */
+ private String administrativeDivision;
+
+ /**
+ * 归属地区id
+ */
+ private Long belongingRegionId;
+
+ /**
+ * 归属地区名称
+ */
+ private String belongingRegionName;
+
+ /**
+ * 林区id
+ */
+ private Long forestId;
+
+ /**
+ * 林场id
+ */
+ private Long farmId;
+
+ /**
+ * 电子围栏id
+ */
+ private Long fenceId;
+
+ /**
+ * 详细地址
+ */
+ private String address;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 高度
+ */
+ private String height;
+
+ /**
+ * 点位类型：云台、卡口、打卡点、巡护点
+ */
+ private String pointType;
+
+ /**
+ * 点位顺序
+ */
+ private Integer sortNo;
+
+ /**
+ * 打卡半径，单位：米
+ */
+ private String checkInRadius;
+
+ /**
+ * 点位描述信息
+ */
+ private String pointDescription;
+
+ /**
+ * 设备启用状态：0-停用/1-启用
+ */
+ private Integer enableFlag;//sgq2025.3.20
+
+ /**
+ * 点位图片，多张以英文逗号分隔
+ */
+ private String pointPicture;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 点位下的设备信息统计：设备总数量、在线设备数、离线设备数
+ */
+ private DeviceUnderPointVO deviceUnderPointVO;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/PointStatisticsByPointTypeVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/PointStatisticsByPointTypeVO.java
new file mode 100644
index 0000000..d2a035d
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/PointStatisticsByPointTypeVO.java
@@ -0,0 +1,35 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 资源点分类统计VO
+ * 水源地、云台、卡口
+ */
+@Data
+public class PointStatisticsByPointTypeVO implements Serializable {
+
+ private static final long serialVersionUID = -5379278903366385082L;
+
+ /**
+ * 资源点总数
+ */
+ private Integer totalNum;
+
+ /**
+ * 水源地数量
+ */
+ private Integer waterSourceNum;
+
+ /**
+ * 云台数量
+ */
+ private Integer ptzNum;
+
+ /**
+ * 卡口
+ */
+ private Integer bayonetNum;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/RangerInfoVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/RangerInfoVO.java
new file mode 100644
index 0000000..0e936b4
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/RangerInfoVO.java
@@ -0,0 +1,55 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import com.tcctyn.iot.forestfire.BO.PointInfoBO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * RangersInfoVO
+ * 大屏查询人员信息按钮
+ */
+@Data
+public class RangerInfoVO implements Serializable {
+
+ private static final long serialVersionUID = 7787371089658488280L;
+
+ /** 人员id */
+ private Long userId;
+
+ /** 人员姓名，此处的用户名用的是用户表中的nick_name */
+ private String userName;
+
+ /** 人员手机号码 */
+ private String phonenumber;
+
+ /** 当前经度 */
+ private String currentLongitude;
+
+ /** 当前纬度 */
+ private String currentLatitude;
+
+ /** 当前高度 */
+ private String currentHeight;
+
+ /** 默认经度 */
+ private String defaultLongitude;
+
+ /** 默认纬度 */
+ private String defaultLatitude;
+
+ /** 默认高度 */
+ private String defaultHeight;
+
+ /** 巡护路径id */
+ private Long pathId;
+
+ /** 巡护路径名称 */
+ private String pathName;
+
+ /**
+ * 巡护点信息集合
+ */
+ private List pointInfoList;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/RangerStatisticsVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/RangerStatisticsVO.java
new file mode 100644
index 0000000..eb2fe6b
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/RangerStatisticsVO.java
@@ -0,0 +1,34 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 护林员及巡护点统计信息
+ */
+@Data
+public class RangerStatisticsVO implements Serializable {
+
+ private static final long serialVersionUID = 7250371270471160395L;
+
+ /**
+ * 排班人员数量
+ */
+ private Integer schedulingNum = 0;
+
+ /**
+ * 打卡人员数量
+ */
+ private Integer checkInNum = 0;
+
+ /**
+ * 当日排班下的所有巡护点位数量，根据巡护路径进行统计
+ */
+ private Integer patrolPointNum = 0;
+
+ /**
+ * 已打卡点位数量
+ */
+ private Integer checkInPointNum = 0;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/RoadInfoVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/RoadInfoVO.java
new file mode 100644
index 0000000..e252056
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/RoadInfoVO.java
@@ -0,0 +1,90 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+@Data
+public class RoadInfoVO {
+ private static final long serialVersionUID = 7787371089658488280L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 详细地址
+ */
+ private String address;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 高度
+ */
+ private String height;
+
+ /**
+ * 特征类型：陡坡、急转弯等
+ */
+ private String featureType;
+
+ /**
+ * 排序
+ */
+ private Integer sortNo;
+
+ /**
+ * 特征值
+ */
+ private String featureValue;
+
+ /**
+ * 归属地区id
+ */
+ private Long belongingRegionId;
+
+ /**
+ * 归属地区名称
+ */
+ private String belongingRegionName;
+
+ /**
+ * 林区id
+ */
+ private Long forestId;
+
+ /**
+ * 林场id
+ */
+ private Long farmId;
+
+ /**
+ * 电子围栏id
+ */
+ private Long fenceId;
+
+ /**
+ * 宽度
+ */
+ private String width;
+
+ /**
+ * 点位图片，多张以英文逗号分隔
+ */
+ private String roadPicture;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/RoadVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/RoadVO.java
new file mode 100644
index 0000000..2600cef
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/RoadVO.java
@@ -0,0 +1,76 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RoadVO {
+ private static final long serialVersionUID = 7787371089658488280L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 道路编号
+ */
+ private String roadNo;
+
+ /**
+ * 道路名称
+ */
+ private String roadName;
+
+ /**
+ * 道路类型
+ */
+ private String roadType;
+
+ /**
+ * 长度
+ */
+ private String length;
+
+ /**
+ * 宽度
+ */
+ private String width;
+
+ /**
+ * 归属地区id
+ */
+ private Long belongingRegionId;
+
+ /**
+ * 归属地区名称
+ */
+ private String belongingRegionName;
+
+ /**
+ * 林区id
+ */
+ private Long forestId;
+
+ /**
+ * 林场id
+ */
+ private Long farmId;
+
+ /**
+ * 电子围栏id
+ */
+ private Long fenceId;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 道路特征信息
+ */
+ private List roadInfoList;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ScheduleDetail.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ScheduleDetail.java
new file mode 100644
index 0000000..0d37a9f
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ScheduleDetail.java
@@ -0,0 +1,27 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+@Data
+public class ScheduleDetail {
+
+ private Long scheduleId;
+
+ private Long userId;
+
+ private String userName;
+
+ private Long shiftId;
+
+ private String shiftName;
+
+ private Long pathId;
+
+ private String pathName;
+
+ private Integer dayOfWeek;
+
+ private String dateOfWeek;
+
+ private String userIds;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ScheduleDetailInfoVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ScheduleDetailInfoVO.java
new file mode 100644
index 0000000..636303e
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ScheduleDetailInfoVO.java
@@ -0,0 +1,48 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import com.tcctyn.iot.forestfire.BO.PointInfoBO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ScheduleDetailInfoVO implements Serializable {
+
+ private static final long serialVersionUID = -8695050741531564485L;
+ /**
+ * 排班id
+ */
+ private Long id;
+
+ /**
+ * 用户ID
+ */
+ private Long userId;
+
+ /**
+ * 用户名称
+ */
+ private String userName;
+
+ /**
+ * 路线ID
+ */
+ private Long pathId;
+
+ /**
+ * 路径名称
+ */
+ private String pathName;
+
+ /**
+ * 日期
+ */
+ private Date dateOfWeek;
+
+ /**
+ * 路径下的点位信息
+ */
+ private List pointInfoBOList;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SchedulePlanVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SchedulePlanVO.java
new file mode 100644
index 0000000..b8dbe00
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SchedulePlanVO.java
@@ -0,0 +1,71 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 排班计划视图
+ */
+@Data
+public class SchedulePlanVO {
+
+ private Long planId;
+
+ private Long belongingRegionId;
+
+ /**
+ * 林区ID
+ */
+ private Long forestId;
+
+ /**
+ * 林场ID
+ */
+ private Long farmId;
+
+ /**
+ * 电子围栏ID
+ */
+ private Long fenceId;
+
+ /**
+ * 区域名称
+ */
+ private String regionName;
+
+ /**
+ * 计划名称
+ */
+ private String planName;
+
+ /**
+ * 生效时期
+ */
+ private String period;
+
+ /**
+ * 开始日期
+ */
+ private Date startDate;
+
+ /**
+ * 结束日期
+ */
+ private Date endDate;
+
+ /**
+ * 描述信息
+ */
+ private String description;
+
+ /**
+ * 生成标志
+ */
+ private Integer genFlag;
+
+ /**
+ * 状态
+ */
+ private Integer status;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ScheduleTemplateVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ScheduleTemplateVO.java
new file mode 100644
index 0000000..5593177
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ScheduleTemplateVO.java
@@ -0,0 +1,58 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+/**
+ * 排班模板视图
+ */
+@Data
+public class ScheduleTemplateVO {
+ private Long templateId;
+
+ private Long planId;
+
+ /**
+ * 巡护路径id
+ */
+ private Long pathId;
+
+ /**
+ * 巡护路径名称
+ */
+ private String pathName;
+
+ /**
+ * 周一
+ */
+ private String monUsers;
+
+ /**
+ * 周二
+ */
+ private String tueUsers;
+
+ /**
+ * 周三
+ */
+ private String wedUsers;
+
+ /**
+ * 周四
+ */
+ private String thurUsers;
+
+ /**
+ * 周五
+ */
+ private String friUsers;
+
+ /**
+ * 周六
+ */
+ private String satUsers;
+
+ /**
+ * 周日
+ */
+ private String sunUsers;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ScheduleVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ScheduleVO.java
new file mode 100644
index 0000000..1561bc5
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/ScheduleVO.java
@@ -0,0 +1,65 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import com.tcctyn.iot.forestfire.BO.PointInfoBO;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 排班信息
+ */
+@Data
+public class ScheduleVO {
+
+ private Long scheduleId;
+
+ //计划id
+ private Long planId;
+
+ //计划名称
+ private String planName;
+
+ private Long userId;
+
+ private String userName;
+
+ private Long shiftId;
+
+ private String shiftName;
+
+ //路线id
+ private Long pathId;
+
+ //路线名称
+ private String pathName;
+
+ //星期几
+ private Integer dayOfWeek;
+
+ //日期
+ private Date dateOfWeek;
+
+ //状态
+ private Integer status;
+
+ //是否调班
+ private Integer swapFlag;
+
+ private String description;
+
+ //今日打卡次数
+ private Integer checkTimes;
+
+ //今日总共需要打卡次数
+ private Integer totalTimes;
+
+ /**
+ * 巡护进度
+ */
+ private String patrolRate;
+
+ /** 巡护路径下的点位信息 */
+ private List pointInfoBOList;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SchedulesMonthVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SchedulesMonthVO.java
new file mode 100644
index 0000000..7128773
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SchedulesMonthVO.java
@@ -0,0 +1,49 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * APP端按月查询排班统计信息
+ */
+@Data
+public class SchedulesMonthVO implements Serializable {
+
+ private static final long serialVersionUID = 916206382963862542L;
+
+ /**
+ * 排班id
+ */
+ private Long scheduleId;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 日期
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date dateOfWeek;
+
+ /**
+ * 有效打卡次数
+ */
+ private Integer checkTimes;
+
+ /**
+ * 应打卡次数
+ */
+ private Integer totalTimes;
+
+ /**
+ * 巡护进度（打卡率）
+ */
+ private String patrolRate;
+
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SurroundingPersonVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SurroundingPersonVO.java
new file mode 100644
index 0000000..48cde49
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SurroundingPersonVO.java
@@ -0,0 +1,38 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 周边的人员信息
+ */
+
+@Data
+public class SurroundingPersonVO implements Serializable {
+
+ private static final long serialVersionUID = -1167425127266968144L;
+
+ /**
+ * 人员id
+ */
+ private Long userId;
+
+ /**
+ * 人员姓名
+ */
+ private String userName;
+
+ /** 手机号码 */
+ private String phonenumber;
+
+ /**
+ * 经度
+ */
+ private String latitude;
+
+ /**
+ * 纬度
+ */
+ private String longitude;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SurroundingWareHouseVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SurroundingWareHouseVO.java
new file mode 100644
index 0000000..a75cdd5
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SurroundingWareHouseVO.java
@@ -0,0 +1,35 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 周边仓库信息
+ */
+
+@Data
+public class SurroundingWareHouseVO implements Serializable {
+
+ private static final long serialVersionUID = 757447018163710380L;
+
+ /**
+ * 仓库id
+ */
+ private Long wareHouseId;
+
+ /**
+ * 仓库名称
+ */
+ private String wareHouseName;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SurroundingWaterSourceVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SurroundingWaterSourceVO.java
new file mode 100644
index 0000000..d7cf959
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/SurroundingWaterSourceVO.java
@@ -0,0 +1,35 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 周边的水源地信息
+ */
+
+@Data
+public class SurroundingWaterSourceVO implements Serializable {
+
+ private static final long serialVersionUID = 1529035326670890953L;
+
+ /**
+ * 水源地id
+ */
+ private Long waterSourceId;
+
+ /**
+ * 水源地名称
+ */
+ private String waterSourceName;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/TemporaryTaskVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/TemporaryTaskVO.java
new file mode 100644
index 0000000..da83e68
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/TemporaryTaskVO.java
@@ -0,0 +1,153 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 临时任务VO
+ */
+@Data
+public class TemporaryTaskVO implements Serializable {
+
+ private static final long serialVersionUID = -3353366940206999822L;
+
+ /**
+ * 主键id
+ */
+ private Long id;
+
+ /**
+ * 任务名称
+ */
+ private String taskName;
+
+ /**
+ * 任务类型，火情勘测、物资运输、火情救援、其他，数据字典
+ */
+ private String taskType;
+
+ /**
+ * 任务紧急度：一般、重要、紧急， 枚举
+ */
+ private String taskUrgency;
+
+ /**
+ * 归属区域id
+ */
+ private Long regionId;
+
+ /**
+ * 林区id
+ */
+ private Long forestId;
+
+ /**
+ * 林场id
+ */
+ private Long farmId;
+
+ /**
+ * 电子围栏id
+ */
+ private Long fenceId;
+
+ /**
+ * 任务人
+ */
+ private Long taskPersonId;
+
+ /**
+ * 任务下发人id
+ */
+ private Long issuerId;
+
+ /**
+ * 任务下发时间
+ */
+ private Date issueTime;
+
+ /**
+ * 任务内容
+ */
+ private String taskContent;
+
+ /**
+ * 任务状态，未接受，执行中，已完成
+ */
+ private String taskStatus;
+
+ /**
+ * 任务接受人
+ */
+ private Long taskRecipientId;
+
+ /**
+ * 任务接受时间
+ */
+ private Date acceptTime;
+
+ /**
+ * 任务完成时间
+ */
+ private Date completeTime;
+
+ /**
+ * 任务归档情况：1-已归档，0-未归档
+ */
+ private Integer archiveStatus;
+
+ /**
+ * 任务归档时间
+ */
+ private Date archiveTime;
+
+ /**
+ * 备注信息
+ */
+ private String remark;
+
+ /**
+ * 该条记录是否被删除，1-已删除，0-未删除
+ */
+ private Integer delFlag;
+
+ /**
+ * 创建人员姓名
+ */
+ private String createdBy;
+
+ /**
+ * 记录创建时间，默认用服务器时间
+ */
+ private Date createdTime;
+
+ /**
+ * 修改人员姓名
+ */
+ private String updatedBy;
+
+ /**
+ * 记录修改时间，默认用服务器时间
+ */
+ private Date updatedTime;
+
+ //以下字段是VO给前端的字段
+
+ /**
+ * 归属区域名称
+ */
+ private String regionName;
+
+ /**
+ * 任务人姓名
+ */
+ private String taskPersonName;
+
+ /**
+ * 任务接受人姓名
+ */
+ private String taskRecipientName;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/UserScheduleStatusVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/UserScheduleStatusVO.java
new file mode 100644
index 0000000..961b063
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/UserScheduleStatusVO.java
@@ -0,0 +1,23 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+/**
+ * 用户值班状态
+ */
+@Data
+public class UserScheduleStatusVO {
+
+ private Long userId;
+
+ private Long regionId;
+
+ private String userName;
+
+ private String nickName;
+
+ private Long scheduleId;
+
+ private Integer scheduleStatus;
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/WarehouseSelectVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/WarehouseSelectVO.java
new file mode 100644
index 0000000..f823373
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/WarehouseSelectVO.java
@@ -0,0 +1,26 @@
+package com.tcctyn.iot.forestfire.VO;
+
+
+import lombok.Data;
+
+/**
+ * 前端选择器仓库信息
+ */
+@Data
+public class WarehouseSelectVO {
+
+ private Long warehouseId;
+
+ private String warehouseName;
+
+ // 经度
+ private String longitude;
+
+ // 纬度
+ private String latitude;
+
+ /**
+ * 高度
+ */
+ private String height;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/WarehouseVO.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/WarehouseVO.java
new file mode 100644
index 0000000..e040e32
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/VO/WarehouseVO.java
@@ -0,0 +1,102 @@
+package com.tcctyn.iot.forestfire.VO;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 仓库信息
+ */
+@Data
+public class WarehouseVO {
+
+ /**
+ * 仓库ID
+ */
+ private Long warehouseId;
+
+ /**
+ * 归属区域ID
+ */
+ private Long regionId;
+
+ /**
+ * 林区id
+ */
+ private Long forestId;
+
+ /**
+ * 林场id
+ */
+ private Long farmId;
+
+ /**
+ * 电子围栏id
+ */
+ private Long fenceId;
+
+ /**
+ * 仓库名称
+ */
+ private String warehouseName;
+
+ /**
+ * 仓库类型
+ */
+ private Integer warehouseType;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 高度
+ */
+ private String height;
+
+ /**
+ * 地址
+ */
+ private String address;
+
+ /**
+ * 所属地区
+ */
+ private String region;
+
+ /**
+ * 照片
+ */
+ private String photo;
+
+ /**
+ * 备注
+ */
+ private String remark;
+
+ /**
+ * 删除标志
+ */
+ private Integer delFlag;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+ /**
+ * 所属林区林场名称
+ */
+ private String regionName;
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/AggregationController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/AggregationController.java
new file mode 100644
index 0000000..87c2261
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/AggregationController.java
@@ -0,0 +1,39 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.iot.forestfire.VO.AggregationStatisticsVO;
+import com.tcctyn.iot.forestfire.searcher.aggregation.AggregationStatisticsSearcher;
+import com.tcctyn.iot.forestfire.service.IAggregationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 聚合类的接口统一放到这里
+ */
+
+@RestController
+@RequestMapping("/aggregation")
+public class AggregationController extends BaseController {
+
+ @Autowired
+ private IAggregationService iAggregationService;
+
+ /**
+ * APP端用户登录后的聚合统计接口：
+ * 1、未处理的火情预警数量
+ * 2、未处理的火情上报数量
+ * 3、我的任务模块 未接受的任务数量
+ * 4、未审批的记录数
+ * 5、林区任务 未接受的任务数量
+ */
+ @GetMapping("/statistics")
+ public AjaxResult statistics(AggregationStatisticsSearcher searcher) {
+ Long userId = super.getUserId();
+ AggregationStatisticsVO vo = iAggregationService.statistics(searcher, userId);
+ return AjaxResult.success(vo);
+ }
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/ApprovalRecordController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/ApprovalRecordController.java
new file mode 100644
index 0000000..bccef6c
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/ApprovalRecordController.java
@@ -0,0 +1,121 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.common.core.web.page.TableDataInfo;
+import com.tcctyn.common.core.utils.bean.BeanUtils;
+import com.tcctyn.iot.forestfire.VO.ApprovalRecordVO;
+import com.tcctyn.iot.forestfire.domain.ApprovalRecord;
+import com.tcctyn.iot.forestfire.searcher.approvalrecord.ApprovalRecordRejectRequest;
+import com.tcctyn.iot.forestfire.service.IApprovalRecordService;
+import com.tcctyn.iot.forestfire.service.ICommonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ *
+ * 审批记录表 前端控制器
+ *
+ *
+ * @author daichao
+ * @since 2024-12-09
+ */
+
+
+@RestController
+@RequestMapping("/approvalRecord")
+public class ApprovalRecordController extends BaseController {
+
+
+ @Autowired
+ private IApprovalRecordService iApprovalRecordService;
+
+ @Autowired
+ private ICommonService commonService;
+
+ @GetMapping(value = "/list")
+ public AjaxResult list(@RequestParam(required = false) Integer current, @RequestParam(required = false) Integer size) {
+ if (current == null) {
+ current = 1;
+ }
+ if (size == null) {
+ size = 10;
+ }
+ Page pageList = iApprovalRecordService.list(current, size);
+ return AjaxResult.success(pageList);
+ }
+
+
+ @GetMapping(value = "/{id}")
+ public AjaxResult getById(@PathVariable("id") Long id) {
+ ApprovalRecord approvalRecord = iApprovalRecordService.getById(id);
+ ApprovalRecordVO approvalRecordVO = new ApprovalRecordVO();
+ BeanUtils.copyBeanProp(approvalRecord, approvalRecordVO);
+ Map userIdToNameMap = commonService.userMapIdToName(approvalRecordVO.getReviewerId());
+ approvalRecordVO.setReviewerName(Optional.ofNullable(userIdToNameMap.get(approvalRecordVO.getReviewerId())).orElse(""));
+ return AjaxResult.success(approvalRecordVO);
+ }
+
+ @PostMapping(value = "/create")
+ public AjaxResult create(@RequestBody ApprovalRecord params) {
+ Integer result = iApprovalRecordService.create(params);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/delete/{id}")
+ public AjaxResult delete(@PathVariable("id") Long id) {
+ Integer result = iApprovalRecordService.delete(id);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/update")
+ public AjaxResult update(@RequestBody ApprovalRecord params) {
+ Integer result = iApprovalRecordService.update(params);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 审批记录分页查询
+ *
+ * @param approvalRecord
+ * @return
+ */
+ @GetMapping(value = "/selectList")
+ public TableDataInfo selectList(ApprovalRecord approvalRecord) {
+ startPage();
+ List list = iApprovalRecordService.selectList(approvalRecord);
+ List voList = BeanUtils.copyList(list, ApprovalRecordVO.class);
+ //映射给前端需要的审批人姓名
+ Map userIdToNameMap = commonService.userMapIdToName(null);
+ voList.forEach(item -> item.setReviewerName(Optional.ofNullable(userIdToNameMap.get(item.getReviewerId())).orElse("")));
+ return getDataTable(list, voList);
+ }
+
+ /**
+ * 审批通过接口
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping(value = "/approved/{id}")
+ public AjaxResult approved(@PathVariable("id") Long id) {
+// Long userId = 1L;
+ Long userId = super.getUserId();
+ Integer result = iApprovalRecordService.approved(id, userId);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/reject")
+ public AjaxResult reject(@Validated @RequestBody ApprovalRecordRejectRequest request) {
+// Long userId = 1L;
+ Long userId = super.getUserId();
+ Integer result = iApprovalRecordService.reject(request, userId);
+ return AjaxResult.success(result);
+ }
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/CarouselImageConfigController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/CarouselImageConfigController.java
new file mode 100644
index 0000000..a95c7e8
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/CarouselImageConfigController.java
@@ -0,0 +1,110 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.common.core.web.page.TableDataInfo;
+import com.tcctyn.common.core.utils.bean.BeanUtils;
+import com.tcctyn.iot.forestfire.VO.CarouselImageConfigVO;
+import com.tcctyn.iot.forestfire.domain.CarouselImageConfig;
+import com.tcctyn.iot.forestfire.searcher.carouselimageconfig.CarouselImageEnableFlagRequest;
+import com.tcctyn.iot.forestfire.service.ICarouselImageConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 轮播图配置表 前端控制器
+ *
+ *
+ * @author daichao
+ * @since 2024-12-17
+ */
+
+@RestController
+@RequestMapping("/carouselImageConfig")
+public class CarouselImageConfigController extends BaseController {
+
+
+ @Autowired
+ private ICarouselImageConfigService iCarouselImageConfigService;
+
+ @GetMapping(value = "/list")
+ public AjaxResult list(@RequestParam(required = false) Integer current, @RequestParam(required = false) Integer size) {
+ if (current == null) {
+ current = 1;
+ }
+ if (size == null) {
+ size = 10;
+ }
+ Page pageList = iCarouselImageConfigService.list(current, size);
+ return AjaxResult.success(pageList);
+ }
+
+
+ @GetMapping(value = "/{id}")
+ public AjaxResult getById(@PathVariable("id") Long id) {
+ CarouselImageConfig carouselImageConfig = iCarouselImageConfigService.getById(id);
+ CarouselImageConfigVO carouselImageConfigVO = new CarouselImageConfigVO();
+ BeanUtils.copyBeanProp(carouselImageConfig, carouselImageConfigVO);
+ return AjaxResult.success(carouselImageConfigVO);
+ }
+
+ @PostMapping(value = "/create")
+ public AjaxResult create(@Validated @RequestBody CarouselImageConfig params) {
+ Integer result = iCarouselImageConfigService.create(params);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/delete/{id}")
+ public AjaxResult delete(@PathVariable("id") Long id) {
+ Integer result = iCarouselImageConfigService.delete(id);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/update")
+ public AjaxResult update(@Validated @RequestBody CarouselImageConfig params) {
+ Integer result = iCarouselImageConfigService.update(params);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 分页列表查询
+ *
+ * @param carouselImageConfig
+ * @return
+ */
+ @GetMapping(value = "/selectList")
+ public TableDataInfo selectList(CarouselImageConfig carouselImageConfig) {
+ startPage();
+ List carouselImageConfigList = iCarouselImageConfigService.selectList(carouselImageConfig);
+ List voList = BeanUtils.copyList(carouselImageConfigList, CarouselImageConfigVO.class);
+ return getDataTable(carouselImageConfigList, voList);
+ }
+
+ /**
+ * 轮播图启用/禁用接口
+ */
+ @PostMapping(value = "/updateEnableFlag")
+ public AjaxResult updateEnableFlag(@Validated @RequestBody CarouselImageEnableFlagRequest request) {
+ CarouselImageConfig carouselImageConfig = new CarouselImageConfig();
+ BeanUtils.copyBeanProp(request, carouselImageConfig);
+ Integer result = iCarouselImageConfigService.update(carouselImageConfig);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * APP端给到前端所有启用状态下的轮播图
+ */
+ @GetMapping(value = "/selectEnabled")
+ public AjaxResult selectEnabled() {
+ CarouselImageConfig carouselImageConfig = new CarouselImageConfig();
+ carouselImageConfig.setEnableFlag(1);
+ List carouselImageConfigList = iCarouselImageConfigService.selectList(carouselImageConfig);
+ List voList = BeanUtils.copyList(carouselImageConfigList, CarouselImageConfigVO.class);
+ return AjaxResult.success(voList);
+ }
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/CheckInRecordController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/CheckInRecordController.java
new file mode 100644
index 0000000..024603e
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/CheckInRecordController.java
@@ -0,0 +1,78 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.common.core.web.page.TableDataInfo;
+import com.tcctyn.common.core.utils.bean.BeanUtils;
+import com.tcctyn.iot.forestfire.VO.CheckInRecordVO;
+import com.tcctyn.iot.forestfire.domain.CheckInRecord;
+import com.tcctyn.iot.forestfire.service.ICheckInRecordService;
+import com.tcctyn.iot.forestfire.service.ICommonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ *
+ * 打卡记录表 前端控制器
+ *
+ *
+ * @author liuzh
+ * @since 2024-10-12
+ */
+
+@RestController
+@RequestMapping("/checkInRecord")
+public class CheckInRecordController extends BaseController {
+
+
+ @Autowired
+ private ICheckInRecordService iCheckInRecordService;
+
+ @Autowired
+ private ICommonService commonService;
+
+ @GetMapping(value = "/list")
+ public TableDataInfo list(CheckInRecord checkInRecord) {
+ startPage();
+ List list = iCheckInRecordService.list(checkInRecord);
+ return getDataTable(list);
+ }
+
+
+ @GetMapping(value = "/{id}")
+ public AjaxResult getById(@PathVariable("id") Long id) {
+ CheckInRecord checkInRecord = iCheckInRecordService.getById(id);
+ return AjaxResult.success(checkInRecord);
+ }
+
+ /**
+ * APP端打卡，生成打卡记录
+ */
+ @PostMapping(value = "/create")
+ public AjaxResult create(@Validated @RequestBody CheckInRecord checkInRecord) {
+// Long userId = 102L;
+ Long userId = super.getUserId();
+ Integer result = iCheckInRecordService.create(checkInRecord, userId);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * PC端查看最近十条打卡上报记录
+ */
+ @GetMapping(value = "/selectLast10Items")
+ public AjaxResult selectLast10Items() {
+ List list = iCheckInRecordService.selectLast10Items();
+ //组装护林员姓名
+ List voList = BeanUtils.copyList(list, CheckInRecordVO.class);
+ Map userIdToNameMap = commonService.userMapIdToName(null);
+ voList.forEach(item -> item.setUserName(Optional.ofNullable(userIdToNameMap.get(item.getUserId())).orElse("")));
+ return AjaxResult.success(voList);
+ }
+
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/DeviceChanelsController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/DeviceChanelsController.java
new file mode 100644
index 0000000..50c61e6
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/DeviceChanelsController.java
@@ -0,0 +1,81 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.iot.forestfire.VO.DeviceChanelsVO;
+import com.tcctyn.iot.forestfire.domain.DeviceChanels;
+import com.tcctyn.iot.forestfire.service.IDeviceChanelsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@RestController
+@RequestMapping("/deviceChanels")
+public class DeviceChanelsController extends BaseController {
+
+ @Autowired
+ private IDeviceChanelsService deviceChanelsService;
+ @GetMapping("/getById")
+ public AjaxResult getById(@RequestParam Long id) {
+ DeviceChanelsVO deviceChanelsVO = deviceChanelsService.getById(id);
+ return AjaxResult.success(deviceChanelsVO);
+ }
+
+ @PostMapping("/create")
+ public AjaxResult create(@RequestBody DeviceChanels deviceChanels) {
+ Integer result = deviceChanelsService.create(deviceChanels);
+ return AjaxResult.success(result);
+ }
+
+ @DeleteMapping("/delete")
+ public AjaxResult delete(@RequestParam Long id) {
+ Integer result = deviceChanelsService.delete(id);
+ return AjaxResult.success(result);
+ }
+
+ @PutMapping("/update")
+ public AjaxResult update(@RequestBody DeviceChanels deviceChanels) {
+ Integer result = deviceChanelsService.update(deviceChanels);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 根据设备编号查询设备通道信息
+ */
+ @GetMapping("/selectByDeviceNo")
+ public AjaxResult selectByDeviceNo(@RequestParam String deviceNo) {
+ List vo = deviceChanelsService.selectByDeviceNo(deviceNo);
+ return AjaxResult.success(vo);
+ }
+
+ /**
+ * 根据设备编号和通道号查询设备通道信息
+ */
+ @GetMapping("/getStreamUrl")
+ public AjaxResult getStreamUrl(@RequestParam String deviceNo, @RequestParam String chanelNo) {
+ DeviceChanelsVO vo = deviceChanelsService.getStreamUrl(deviceNo, chanelNo);
+ String result = vo.getStreamUrl();
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 预览
+ */
+ @GetMapping("/startPreview")
+ public AjaxResult startPreview(@RequestParam String deviceNo, @RequestParam String chanelNo) {
+ DeviceChanelsVO vo = deviceChanelsService.startPreview(deviceNo, chanelNo);
+ String result = vo.getStreamUrl();
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 停止预览
+ */
+ @GetMapping("/stopPreview")
+ public AjaxResult stopPreview(@RequestParam String deviceNo, @RequestParam String chanelNo) {
+ String vo = deviceChanelsService.stopPreview(deviceNo, chanelNo);
+ return AjaxResult.success(vo);
+ }
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/DeviceConfigController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/DeviceConfigController.java
new file mode 100644
index 0000000..7b7aeb7
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/DeviceConfigController.java
@@ -0,0 +1,48 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.iot.forestfire.domain.DeviceConfig;
+import com.tcctyn.iot.forestfire.service.IDeviceConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@RequestMapping("/deviceConfig")
+public class DeviceConfigController extends BaseController {
+
+ @Autowired
+ private IDeviceConfigService deviceConfigService;
+
+ @GetMapping("/getById")
+ public AjaxResult getById(@RequestParam Long id) {
+ DeviceConfig deviceConfig = deviceConfigService.getById(id);
+ return AjaxResult.success(deviceConfig);
+ }
+
+ @PostMapping("/create")
+ public AjaxResult create(@RequestBody DeviceConfig deviceConfig) {
+ Integer result = deviceConfigService.create(deviceConfig);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping("/delete")
+ public AjaxResult delete(@RequestParam Long id) {
+ Integer result = deviceConfigService.delete(id);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping("/update")
+ public AjaxResult update(@RequestBody DeviceConfig deviceConfig) {
+ Integer result = deviceConfigService.update(deviceConfig);
+ return AjaxResult.success(result);
+ }
+
+ @GetMapping("/selectByDeviceNo")
+ public AjaxResult selectByDeviceNo(@RequestParam String deviceNo) {
+ DeviceConfig deviceConfig = deviceConfigService.selectByDeviceNo(deviceNo);
+ return AjaxResult.success(deviceConfig);
+ }
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/DeviceInfoController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/DeviceInfoController.java
new file mode 100644
index 0000000..bd463c8
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/DeviceInfoController.java
@@ -0,0 +1,244 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.common.core.web.page.TableDataInfo;
+import com.tcctyn.common.core.utils.bean.BeanUtils;
+import com.tcctyn.iot.forestfire.VO.*;
+import com.tcctyn.iot.forestfire.domain.DeviceInfo;
+import com.tcctyn.iot.forestfire.searcher.BaseIdListSearcher;
+import com.tcctyn.iot.forestfire.searcher.BaseRegionSearcher;
+import com.tcctyn.iot.forestfire.searcher.deviceinfo.DeviceOwnershipSearcher;
+import com.tcctyn.iot.forestfire.service.ICommonService;
+import com.tcctyn.iot.forestfire.service.IDeviceChanelsService;
+import com.tcctyn.iot.forestfire.service.IDeviceConfigService;
+import com.tcctyn.iot.forestfire.service.IDeviceInfoService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * 设备信息表 前端控制器
+ *
+ *
+ * @author 代超
+ * @since 2024-10-09
+ */
+
+@RestController
+@RequestMapping("/deviceInfo")
+public class DeviceInfoController extends BaseController {
+
+
+ @Autowired
+ private IDeviceInfoService iDeviceInfoService;
+
+ @Autowired
+ private ICommonService commonService;
+
+ @Autowired
+ private IDeviceConfigService deviceConfigService;
+
+ @Autowired
+ private IDeviceChanelsService deviceChanelsService;
+
+ @GetMapping(value = "/list")
+ public AjaxResult list(@RequestParam(required = false) Integer current, @RequestParam(required = false) Integer size) {
+ if (current == null) {
+ current = 1;
+ }
+ if (size == null) {
+ size = 10;
+ }
+ Page pageList = iDeviceInfoService.list(current, size);
+ return AjaxResult.success(pageList);
+ }
+
+
+ @GetMapping(value = "/{id}")
+ public AjaxResult getById(@PathVariable("id") Long id) {
+ DeviceInfoVO vo = iDeviceInfoService.getById(id);
+ vo.setDeviceConfig(deviceConfigService.selectByDeviceNo(vo.getDeviceNo()));
+ return AjaxResult.success(vo);
+ }
+
+ @PostMapping(value = "/create")
+ public AjaxResult create(@Validated @RequestBody DeviceInfo params) {
+ Integer result = iDeviceInfoService.create(params);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/delete/{id}")
+ public AjaxResult delete(@PathVariable("id") Long id) {
+ Integer result = iDeviceInfoService.delete(id);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/update")
+ public AjaxResult update(@Validated @RequestBody DeviceInfo params) {
+ Integer result = iDeviceInfoService.update(params);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 分页查询
+ *
+ * @param deviceInfo
+ * @return
+ */
+ @GetMapping(value = "/selectList")
+ public TableDataInfo selectList(@RequestBody DeviceInfo deviceInfo) {
+ startPage();
+ List list = iDeviceInfoService.selectList(deviceInfo);
+ //处理给前端的regionName,pointName,airportName;
+ List voList = BeanUtils.copyList(list, DeviceInfoVO.class);
+ Map regionIdAndNameMap = commonService.regionMapIdToName(null);
+ Map pointIdAndNameMap = commonService.pointMapIdToName(null);
+ Map airportIdAndNameMap = commonService.airportMapIdToName(null);
+ for (DeviceInfoVO deviceInfoVO : voList) {
+ String forestName = regionIdAndNameMap.get(deviceInfoVO.getForestId()) == null ? "" : regionIdAndNameMap.get(deviceInfoVO.getForestId());
+ String farmName = regionIdAndNameMap.get(deviceInfoVO.getFarmId()) == null ? "" : regionIdAndNameMap.get(deviceInfoVO.getFarmId());
+ String fenceName = regionIdAndNameMap.get(deviceInfoVO.getFenceId()) == null ? "" : regionIdAndNameMap.get(deviceInfoVO.getFenceId());
+ deviceInfoVO.setRegionName(forestName + (StringUtils.isEmpty(farmName) ? "" : "/" + farmName) + (StringUtils.isEmpty(fenceName) ? "" : "/" + fenceName));
+
+ deviceInfoVO.setPointName(pointIdAndNameMap.get(deviceInfoVO.getPointId()) == null ? "" : pointIdAndNameMap.get(deviceInfoVO.getPointId()));
+ deviceInfoVO.setAirportName(airportIdAndNameMap.get(deviceInfoVO.getAirportId()) == null ? "" : airportIdAndNameMap.get(deviceInfoVO.getAirportId()));
+ deviceInfoVO.setPointOrAirportName(StringUtils.isEmpty(deviceInfoVO.getPointName()) ? deviceInfoVO.getAirportName() : deviceInfoVO.getPointName());
+
+ //如果设备配置信息表中无该设备，则在config返回空
+ deviceInfoVO.setDeviceConfig(deviceConfigService.selectByDeviceNo(deviceInfoVO.getDeviceNo()));
+
+ //添加推流地址
+ if (deviceInfoVO.getDeviceNo() != null) {
+ List deviceChanelsVOList = deviceChanelsService.selectByDeviceNo(deviceInfoVO.getDeviceNo());
+ deviceInfoVO.setDeviceChanelsVOList(deviceChanelsVOList);
+ }
+ }
+
+ return getDataTable(list, voList);
+ }
+
+ /**
+ * 根据设备编号查询设备信息及归属点位信息
+ * 点位信息包括：经纬度，点位类型
+ */
+ @GetMapping(value = "/selectByDeviceNo/{deviceNo}")
+ public AjaxResult selectByDeviceNo(@PathVariable("deviceNo") String deviceNo) {
+ DeviceAndPointInfoVO vo = iDeviceInfoService.selectByDeviceNo(deviceNo);
+ return AjaxResult.success(vo);
+ }
+
+ /**
+ * 大屏页面设备统计信息列表
+ */
+
+ @GetMapping(value = "/deviceStatistics")
+ public AjaxResult deviceStatistics(@RequestBody DeviceInfo deviceInfo) {
+ DeviceStatisticsVO vo = iDeviceInfoService.deviceStatistics(deviceInfo);
+ return AjaxResult.success(vo);
+ }
+
+ /**
+ * 设备快捷修改启用/停用状态接口
+ */
+ @PostMapping(value = "/updateEnableFlag")
+ public AjaxResult updateEnableFlag(@RequestBody DeviceInfo params) {
+ Integer result = iDeviceInfoService.updateEnableFlag(params);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/deleteBatch")
+ public AjaxResult deleteBatch(@RequestBody BaseIdListSearcher searcher) {
+ Integer result = iDeviceInfoService.deleteBatch(searcher.getIdList());
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 提供给前端的查询设备归属接口
+ *
+ * @param searcher
+ * @return
+ */
+ @PostMapping(value = "/queryOwnership")
+ public AjaxResult queryOwnership(@RequestBody DeviceOwnershipSearcher searcher) {
+ List voList = iDeviceInfoService.queryOwnership(searcher);
+ return AjaxResult.success(voList);
+ }
+
+ /**
+ * 设备列表设备统计接口
+ *
+ * @return
+ */
+ @PostMapping(value = "/statisticsByStatus")
+ public AjaxResult statisticsByStatus() {
+ DeviceStatisticsByStatusVO vo = iDeviceInfoService.statisticsByStatus();
+ return AjaxResult.success(vo);
+ }
+
+ /**
+ * 查询云台/卡口下的设备列表
+ */
+ @GetMapping(value = "/listByPointId/{pointId}")
+ public AjaxResult listByPointId(@PathVariable("pointId") Long pointId) {
+ DeviceInfo deviceInfo = new DeviceInfo();
+ deviceInfo.setPointId(pointId);
+ List list = iDeviceInfoService.selectList(deviceInfo);
+ return AjaxResult.success(list);
+ }
+
+ /**
+ * 大屏页面3 视频监控模块，云台、卡口下的设备统计：设备总数、云台设备数量、卡口设备数量、设备在线率
+ */
+ @PostMapping(value = "/deviceStatisticsByPoint")
+ public AjaxResult deviceStatisticsByPoint(@RequestBody(required = false) BaseRegionSearcher searcher) {
+ DeviceStatisticsByPointVO vo = iDeviceInfoService.deviceStatisticsByPoint(searcher);
+ return AjaxResult.success(vo);
+ }
+
+ /**
+ * 大屏页面1，查询机场信息按钮，在页面上可以展示机场的位置、图标、名称
+ */
+ @GetMapping(value = "/selectAirport")
+ public AjaxResult selectAirport(BaseRegionSearcher searcher) {
+ List airportVOList = iDeviceInfoService.selectAirport(searcher);
+ return AjaxResult.success(airportVOList);
+ }
+
+ /**
+ * 根据机场id查询机场下的无人机信息
+ *
+ * @param airportId
+ * @return
+ */
+ @Deprecated
+ @GetMapping(value = "/selectDroneByAirportId/{airportId}")
+ public AjaxResult selectDroneByAirportId(@PathVariable("airportId") Long airportId) {
+ List deviceInfoList = iDeviceInfoService.selectDroneByAirportId(airportId);
+ List voList = BeanUtils.copyList(deviceInfoList, DeviceInfoVO.class);
+ Map regionIdAndNameMap = commonService.regionMapIdToName(null);
+ Map airportIdAndNameMap = commonService.airportMapIdToName(null);
+ voList.forEach(deviceInfoVO -> {
+ deviceInfoVO.setRegionName(regionIdAndNameMap.get(deviceInfoVO.getRegionId()) == null ? "" : regionIdAndNameMap.get(deviceInfoVO.getRegionId()));
+ deviceInfoVO.setAirportName(airportIdAndNameMap.get(deviceInfoVO.getAirportId()) == null ? "" : airportIdAndNameMap.get(deviceInfoVO.getAirportId()));
+ });
+ return AjaxResult.success(voList);
+ }
+
+ /**
+ * 查询摄像头类型的设备列表，暂时不分页，后面有需求再做分页处理
+ */
+ @GetMapping(value = "/selectCamera")
+ public AjaxResult selectCamera(BaseRegionSearcher searcher) {
+ List cameraVOList = iDeviceInfoService.selectCamera(searcher);
+ return AjaxResult.success(cameraVOList);
+ }
+
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/DroneTaskPlanController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/DroneTaskPlanController.java
new file mode 100644
index 0000000..43a4632
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/DroneTaskPlanController.java
@@ -0,0 +1,109 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.common.core.web.page.TableDataInfo;
+import com.tcctyn.common.core.utils.bean.BeanUtils;
+import com.tcctyn.iot.forestfire.VO.DroneTaskPlanVO;
+import com.tcctyn.iot.forestfire.domain.DroneTaskPlan;
+import com.tcctyn.iot.forestfire.enums.DroneTaskStatusEnum;
+import com.tcctyn.iot.forestfire.searcher.drone.DroneSearcher;
+import com.tcctyn.iot.forestfire.service.ICommonService;
+import com.tcctyn.iot.forestfire.service.IDroneTaskPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * 无人机任务计划表 前端控制器
+ *
+ *
+ * @author 代超
+ * @since 2024-11-07
+ */
+
+@RestController
+@RequestMapping("/droneTaskPlan")
+public class DroneTaskPlanController extends BaseController {
+
+
+ @Autowired
+ private IDroneTaskPlanService iDroneTaskPlanService;
+
+ @Autowired
+ private ICommonService commonService;
+
+ @GetMapping(value = "/list")
+ public AjaxResult list(@RequestParam(required = false) Integer current, @RequestParam(required = false) Integer size) {
+ if (current == null) {
+ current = 1;
+ }
+ if (size == null) {
+ size = 10;
+ }
+ Page pageList = iDroneTaskPlanService.list(current, size);
+ return AjaxResult.success(pageList);
+ }
+
+
+ @GetMapping(value = "/{id}")
+ public AjaxResult getById(@PathVariable("id") Long id) {
+ DroneTaskPlan droneTaskPlan = iDroneTaskPlanService.getById(id);
+ return AjaxResult.success(droneTaskPlan);
+ }
+
+ @PostMapping(value = "/create")
+ public AjaxResult create(@RequestBody DroneTaskPlan params) {
+ Integer result = iDroneTaskPlanService.create(params);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/delete/{id}")
+ public AjaxResult delete(@PathVariable("id") Long id) {
+ Integer result = iDroneTaskPlanService.delete(id);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/update")
+ public AjaxResult update(@RequestBody DroneTaskPlan params) {
+ Integer result = iDroneTaskPlanService.update(params);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 大屏页面查询无人机的不同状态的任务列表
+ *
+ * @param searcher
+ * @return
+ */
+ @PostMapping(value = "/selectByStatus")
+ public AjaxResult selectByStatus(@RequestBody DroneSearcher searcher) {
+ List droneTaskPlanList = iDroneTaskPlanService.selectByStatus(searcher);
+ List voList = BeanUtils.copyList(droneTaskPlanList, DroneTaskPlanVO.class);
+ Map regionIdToNameMap = commonService.regionMapIdToName(null);
+ voList.forEach(droneTaskPlanVO -> {
+ droneTaskPlanVO.setRegionName(regionIdToNameMap.get(droneTaskPlanVO.getRegionId()) == null ? "" : regionIdToNameMap.get(droneTaskPlanVO.getRegionId()));
+ });
+ return AjaxResult.success(voList);
+ }
+
+ /**
+ * 分页查询无人机的历史执飞记录
+ */
+ @GetMapping(value = "/listHistory")
+ public TableDataInfo listHistory(DroneTaskPlan droneTaskPlan) {
+ droneTaskPlan.setTaskStatus(DroneTaskStatusEnum.COMPLETED.name());
+ startPage();
+ List droneTaskPlanList = iDroneTaskPlanService.seletList(droneTaskPlan);
+ List voList = BeanUtils.copyList(droneTaskPlanList, DroneTaskPlanVO.class);
+ Map regionIdToNameMap = commonService.regionMapIdToName(null);
+ voList.forEach(droneTaskPlanVO -> {
+ droneTaskPlanVO.setRegionName(regionIdToNameMap.get(droneTaskPlanVO.getRegionId()) == null ? "" : regionIdToNameMap.get(droneTaskPlanVO.getRegionId()));
+ });
+ return getDataTable(droneTaskPlanList, voList);
+ }
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/EnumController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/EnumController.java
new file mode 100644
index 0000000..56bc2b9
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/EnumController.java
@@ -0,0 +1,64 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.iot.forestfire.enums.*;
+import com.tcctyn.iot.forestfire.searcher.EnumSearcher;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.util.CollectionUtils;
+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.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 枚举类的公共接口
+ */
+@RestController
+@RequestMapping("/enum")
+public class EnumController extends BaseController {
+
+
+ private final static Map> type2EnumName2DescMap = new LinkedHashMap<>();
+
+ /**
+ * 前端需要的枚举信息需要在此处初始化
+ */
+ static {
+ type2EnumName2DescMap.put("AreaTypeEnum", AreaTypeEnum.getName2DescMap());
+ type2EnumName2DescMap.put("PointTypeEnum", PointTypeEnum.getName2DescMap());
+ type2EnumName2DescMap.put("FireWarningDisposalStatusEnum", FireWarningDisposalStatusEnum.getName2DescMap());
+ type2EnumName2DescMap.put("DeviceStatusEnum", DeviceStatusEnum.getName2DescMap());
+ type2EnumName2DescMap.put("DataSourceEnum", DataSourceEnum.getName2DescMap());
+ type2EnumName2DescMap.put("TaskUrgencyEnum", TaskUrgencyEnum.getName2DescMap());
+ type2EnumName2DescMap.put("TaskStatusEnum", TaskStatusEnum.getName2DescMap());
+ type2EnumName2DescMap.put("ReportMethodEnum", ReportMethodEnum.getName2DescMap());
+ type2EnumName2DescMap.put("FireHazardLevelEnum", FireHazardLevelEnum.getName2DescMap());
+ type2EnumName2DescMap.put("DroneTaskStatusEnum", DroneTaskStatusEnum.getName2DescMap());
+ type2EnumName2DescMap.put("ApprovalBusinessTypeEnum", ApprovalBusinessTypeEnum.getName2DescMap());
+ }
+
+ @Tag(name = "按需查询枚举接口",description = "按需查询枚举接口")
+ @PostMapping(value = "queryEnum")
+ public AjaxResult queryEnum(@RequestBody EnumSearcher enumSearcher) {
+ //对枚举值进行校验
+ if (CollectionUtils.isEmpty(enumSearcher.getEnumNameList())) {
+ return error("查询列表为空，请检查！");
+ }
+ for (String enumName : enumSearcher.getEnumNameList()) {
+ if (!type2EnumName2DescMap.containsKey(enumName)) {
+ return error("枚举类型参数非法");
+ }
+ }
+
+ final Map> resultMap = new LinkedHashMap<>(enumSearcher.getEnumNameList().size());
+ for (String enumType : enumSearcher.getEnumNameList()) {
+ resultMap.put(enumType, type2EnumName2DescMap.get(enumType));
+ }
+
+ return AjaxResult.success(resultMap);
+ }
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/FireReportController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/FireReportController.java
new file mode 100644
index 0000000..20c4fa4
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/FireReportController.java
@@ -0,0 +1,133 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.common.core.web.page.TableDataInfo;
+import com.tcctyn.common.core.utils.bean.BeanUtils;
+import com.tcctyn.iot.forestfire.VO.FireReportStatisticsVO;
+import com.tcctyn.iot.forestfire.VO.FireReportVO;
+import com.tcctyn.iot.forestfire.domain.FireReport;
+import com.tcctyn.iot.forestfire.service.ICommonService;
+import com.tcctyn.iot.forestfire.service.IFireReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ *
+ * 火情上报表 前端控制器
+ *
+ *
+ * @author 代超
+ * @since 2024-11-01
+ */
+
+@RestController
+@RequestMapping("/fireReport")
+public class FireReportController extends BaseController {
+
+
+ @Autowired
+ private IFireReportService iFireReportService;
+
+ @Autowired
+ private ICommonService commonService;
+
+ @GetMapping(value = "/list")
+ public AjaxResult list(@RequestParam(required = false) Integer current, @RequestParam(required = false) Integer size) {
+ if (current == null) {
+ current = 1;
+ }
+ if (size == null) {
+ size = 10;
+ }
+ Page pageList = iFireReportService.list(current, size);
+ return AjaxResult.success(pageList);
+ }
+
+
+ @GetMapping(value = "/{id}")
+ public AjaxResult getById(@PathVariable("id") Long id) {
+ FireReport fireReport = iFireReportService.getById(id);
+ FireReportVO fireReportVO = new FireReportVO();
+ if (Objects.nonNull(fireReport)) {
+ BeanUtils.copyBeanProp(fireReport, fireReportVO);
+ } else {
+ return AjaxResult.success(null);
+ }
+ //给前端地区名称与处理人姓名
+ Map regionIdAndNameMap = commonService.regionMapIdToName(fireReportVO.getRegionId());
+ Map userIdAndNameMap = commonService.userMapIdToName(fireReportVO.getReporterId());
+ fireReportVO.setRegionName(regionIdAndNameMap.get(fireReportVO.getRegionId()));
+ fireReportVO.setReporterName(userIdAndNameMap.get(fireReportVO.getReporterId()));
+ return AjaxResult.success(fireReportVO);
+ }
+
+ @PostMapping(value = "/create")
+ public AjaxResult create(@Validated @RequestBody FireReport params) {
+ //火情上报人
+// params.setReporterId(getUserId());
+ Integer result = iFireReportService.create(params);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/delete/{id}")
+ public AjaxResult delete(@PathVariable("id") Long id) {
+ Integer result = iFireReportService.delete(id);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/update")
+ public AjaxResult update(@RequestBody FireReport params) {
+ Integer result = iFireReportService.update(params);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 火情上报列表分页查询
+ */
+ @GetMapping(value = "/selectList")
+ public TableDataInfo selectList(FireReport fireReport) {
+ startPage();
+ List fireReportList = iFireReportService.selectList(fireReport);
+ List voList = BeanUtils.copyList(fireReportList, FireReportVO.class);
+ //给前端地区名称与处理人姓名
+ Map regionIdAndNameMap = commonService.regionMapIdToName(null);
+ Map userIdAndNameMap = commonService.userMapIdToName(null);
+ voList.forEach(vo -> {
+ vo.setRegionName(regionIdAndNameMap.get(vo.getRegionId()));
+ vo.setReporterName(userIdAndNameMap.get(vo.getReporterId()));
+ });
+
+ return getDataTable(fireReportList, voList);
+ }
+
+ @PostMapping(value = "/archive")
+ public AjaxResult archive(@RequestBody FireReport fireReport) {
+ Integer result = iFireReportService.archive(fireReport);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/fireReportStatistics")
+ public AjaxResult fireReportStatistics() {
+ FireReportStatisticsVO vo = iFireReportService.fireReportStatistics();
+ return AjaxResult.success(vo);
+ }
+
+ /**
+ * 火情处理
+ *
+ * @param fireReport
+ * @return
+ */
+ @PostMapping(value = "/disposal")
+ public AjaxResult disposal(@RequestBody FireReport fireReport) {
+ Integer result = iFireReportService.disposal(fireReport);
+ return AjaxResult.success(result);
+ }
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/FireWarningInfoController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/FireWarningInfoController.java
new file mode 100644
index 0000000..d9ba719
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/FireWarningInfoController.java
@@ -0,0 +1,258 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.common.core.web.page.TableDataInfo;
+import com.tcctyn.common.core.utils.bean.BeanUtils;
+import com.tcctyn.iot.forestfire.VO.*;
+import com.tcctyn.iot.forestfire.domain.FireWarningInfo;
+import com.tcctyn.iot.forestfire.searcher.BaseIdListSearcher;
+import com.tcctyn.iot.forestfire.searcher.BaseTimeSearcher;
+import com.tcctyn.iot.forestfire.searcher.firewarning.FireWarningAnalyzeSearcher;
+import com.tcctyn.iot.forestfire.searcher.firewarning.FireWarningConditionSearcher;
+import com.tcctyn.iot.forestfire.service.ICommonService;
+import com.tcctyn.iot.forestfire.service.IFireWarningInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ *
+ * 火情预警信息表 前端控制器
+ *
+ *
+ * @author 代超
+ * @since 2024-10-08
+ */
+
+@RestController
+@RequestMapping("/fireWarningInfo")
+public class FireWarningInfoController extends BaseController {
+
+
+ @Autowired
+ private IFireWarningInfoService iFireWarningInfoService;
+
+ @Autowired
+ private ICommonService commonService;
+
+ @GetMapping(value = "/list")
+ public AjaxResult list(@RequestParam(required = false) Integer current, @RequestParam(required = false) Integer size) {
+ if (current == null) {
+ current = 1;
+ }
+ if (size == null) {
+ size = 10;
+ }
+ Page pageList = iFireWarningInfoService.list(current, size);
+ return AjaxResult.success(pageList);
+ }
+
+
+ @GetMapping(value = "/{id}")
+ public AjaxResult getById(@PathVariable("id") Long id) {
+ FireWarningInfo fireWarningInfo = iFireWarningInfoService.getById(id);
+ FireWarningInfoVO fireWarningInfoVO = new FireWarningInfoVO();
+ if (Objects.nonNull(fireWarningInfo)) {
+ BeanUtils.copyBeanProp(fireWarningInfo, fireWarningInfoVO);
+ } else {
+ return AjaxResult.success(null);
+ }
+ //给前端地区名称与处理人名称
+ Map regionIdAndNameMap = commonService.regionMapIdToName(null);
+ Map userIdAndNameMap = commonService.userMapIdToName(null);
+ fireWarningInfoVO.setRegionName(regionIdAndNameMap.get(fireWarningInfoVO.getRegionId()));
+ fireWarningInfoVO.setDisposalByName(userIdAndNameMap.get(fireWarningInfoVO.getDisposalBy()));
+ return AjaxResult.success(fireWarningInfoVO);
+ }
+
+ @PostMapping(value = "/create")
+ public AjaxResult create(@Validated @RequestBody FireWarningInfo params) {
+ Integer result = iFireWarningInfoService.create(params);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/delete/{id}")
+ public AjaxResult delete(@PathVariable("id") Long id) {
+ Integer result = iFireWarningInfoService.delete(id);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/update")
+ public AjaxResult update(@RequestBody FireWarningInfo params) {
+ Integer result = iFireWarningInfoService.update(params);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 火情预警信息分页查询
+ *
+ * @param fireWarningInfo
+ * @return
+ */
+ @GetMapping(value = "/selectList")
+ public TableDataInfo selectList(FireWarningInfo fireWarningInfo) {
+ startPage();
+ List fireWarningInfoList = iFireWarningInfoService.selectList(fireWarningInfo);
+ List voList = BeanUtils.copyList(fireWarningInfoList, FireWarningInfoVO.class);
+ //给前端地区名称与处理人姓名
+ Map regionIdAndNameMap = commonService.regionMapIdToName(null);
+ Map userIdAndNameMap = commonService.userMapIdToName(null);
+ voList.forEach(vo -> {
+ vo.setRegionName(regionIdAndNameMap.get(vo.getRegionId()));
+ vo.setDisposalByName(userIdAndNameMap.get(vo.getDisposalBy()));
+ });
+
+ return getDataTable(fireWarningInfoList, voList);
+ }
+
+ /**
+ * 根据处置状态统计数量
+ *
+ * @return
+ */
+ @PostMapping(value = "/countByDisposalStatus")
+ public AjaxResult countByDisposalStatus(@RequestBody(required = false) FireWarningConditionSearcher searcher) {
+ FireWarningCountByStatusVO vo = iFireWarningInfoService.countByDisposalStatus(searcher);
+ return AjaxResult.success(vo);
+ }
+
+ /**
+ * 根据火情等级统计数量
+ *
+ * @return
+ */
+ @PostMapping(value = "/countByFireLevel")
+ public AjaxResult countByFireLevel(@RequestBody(required = false) FireWarningConditionSearcher searcher) {
+ List voList = iFireWarningInfoService.countByFireLevel(searcher);
+ return AjaxResult.success(voList);
+ }
+
+ /**
+ * 根据条件查询火情信息，可以选择性带时间条件
+ *
+ * @return
+ */
+ @PostMapping(value = "/selectByCondition")
+ public AjaxResult selectByCondition(@RequestBody(required = false) FireWarningConditionSearcher searcher) {
+ List voList = iFireWarningInfoService.selectByCondition(searcher);
+ return AjaxResult.success(voList);
+ }
+
+ /**
+ * 查询最近的十条火情预警信息，以时间倒序，将未处理的火情信息置顶
+ *
+ * @return
+ */
+ @PostMapping(value = "/selectLimit")
+ public AjaxResult selectLimit(@RequestBody(required = false) FireWarningConditionSearcher searcher) {
+ List voList = iFireWarningInfoService.selectLimit(searcher);
+ return AjaxResult.success(voList);
+ }
+
+ /**
+ * 大屏页面二，按照火情数据来源进行分组统计
+ */
+ @PostMapping(value = "/statisticsByDataSource")
+ public AjaxResult statisticsByDataSource(@RequestBody(required = false) BaseTimeSearcher searcher) {
+ FireWarningStatisticsByDataSourceVO vo = iFireWarningInfoService.statisticsByDataSource(searcher);
+ return AjaxResult.success(vo);
+ }
+
+ /**
+ * 火情预警归档
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping(value = "/archive/{id}")
+ public AjaxResult archive(@PathVariable("id") Long id) {
+ Integer result = iFireWarningInfoService.archive(id);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 火情预警批量归档
+ *
+ * @param searcher
+ * @return
+ */
+ @PostMapping(value = "/archiveBatch")
+ public AjaxResult archiveBatch(@RequestBody BaseIdListSearcher searcher) {
+ Integer result = iFireWarningInfoService.archiveBatch(searcher);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * APP端火情预警查询已处理的火情预警列表（分页）
+ *
+ * @param fireWarningInfo
+ * @return
+ */
+ @GetMapping(value = "/selectDisposedList")
+ public TableDataInfo selectDisposedList(FireWarningInfo fireWarningInfo) {
+ startPage();
+ List fireWarningInfoList = iFireWarningInfoService.selectDisposedList(fireWarningInfo);
+ List voList = BeanUtils.copyList(fireWarningInfoList, FireWarningInfoVO.class);
+ //给前端地区名称与处理人姓名
+ Map regionIdAndNameMap = commonService.regionMapIdToName(null);
+ Map userIdAndNameMap = commonService.userMapIdToName(null);
+ voList.forEach(vo -> {
+ vo.setRegionName(regionIdAndNameMap.get(vo.getRegionId()));
+ vo.setDisposalByName(userIdAndNameMap.get(vo.getDisposalBy()));
+ });
+ return getDataTable(fireWarningInfoList, voList);
+ }
+
+ /**
+ * 火情预警研判接口
+ *
+ * @param searcher
+ * @return
+ */
+ @PostMapping(value = "/analyze")
+ public AjaxResult analyze(@Validated @RequestBody FireWarningAnalyzeSearcher searcher) {
+ Long userId = super.getUserId();
+ Integer result = iFireWarningInfoService.analyze(searcher, userId);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 提供一个模拟火情预警的接口
+ * 模拟云台发现火情预警，然后大屏页面上，预警系统跟监控系统可以进行联动
+ * TODO 待后续接入硬件设备后，可删除
+ * 暂时使用呼马山云台1 ，设备编号为 BC1733545
+ */
+ @PostMapping(value = "/simulate")
+ public AjaxResult simulate() {
+ iFireWarningInfoService.simulate();
+ return AjaxResult.success("模拟成功");
+ }
+
+ /**
+ * 火情预警周边查询接口
+ * 查询火情预警附近3公里内的 护林员、水源地、仓库
+ * 查询范围做成可以灵活配置的，默认为3公里
+ * 前端传火情预警id
+ */
+ @PostMapping(value = "/surroundingSearch/{id}")
+ public AjaxResult surroundingSearch(@PathVariable("id") Long id) {
+ FireWarningSurroundingVO vo = iFireWarningInfoService.surroundingSearch(id);
+ return AjaxResult.success(vo);
+ }
+
+ /**
+ * 临时接口，后续看需求进行调整或者删除
+ * 火情预警误判接口
+ */
+ @PostMapping(value = "/misjudge/{id}")
+ public AjaxResult misjudge(@PathVariable("id") Long id) {
+ Integer result = iFireWarningInfoService.misjudge(id);
+ return AjaxResult.success(result);
+ }
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/HkStoreController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/HkStoreController.java
new file mode 100644
index 0000000..16aacba
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/HkStoreController.java
@@ -0,0 +1,35 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.page.TableDataInfo;
+import com.tcctyn.iot.forestfire.VO.HkStoreCapturePicturesVO;
+import com.tcctyn.iot.forestfire.searcher.hk.HkStoreListSearcher;
+import com.tcctyn.iot.forestfire.service.IHkStoreCapturePicturesService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+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;
+
+
+@RestController
+@RequestMapping("/hk-store")
+@Tag(name = "海康存储桶-接口管理", description = "海康存储桶-接口管理")
+public class HkStoreController extends BaseController {
+
+ @Autowired
+ private IHkStoreCapturePicturesService hkStoreCapturePicturesService;
+
+ @PostMapping("/getListHkStoreCapturePictures")
+ @Operation(summary = "获取图片和视频列表", description = "获取图片和视频列表")
+ public TableDataInfo getListHkStoreCapturePictures(@RequestBody HkStoreListSearcher hkStoreListSearcher) {
+ startPage();
+ List voList = hkStoreCapturePicturesService.getListHkStoreCapturePicturesList(hkStoreListSearcher);
+ return getDataTable(voList);
+ }
+
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/InventoryController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/InventoryController.java
new file mode 100644
index 0000000..c162042
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/InventoryController.java
@@ -0,0 +1,82 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.common.core.web.page.TableDataInfo;
+import com.tcctyn.common.core.utils.bean.BeanUtils;
+import com.tcctyn.iot.forestfire.VO.InventoryVO;
+import com.tcctyn.iot.forestfire.domain.Inventory;
+import com.tcctyn.iot.forestfire.domain.Warehouse;
+import com.tcctyn.iot.forestfire.searcher.material.InventorySearcher;
+import com.tcctyn.iot.forestfire.service.IInventoryService;
+import com.tcctyn.iot.forestfire.service.IWarehouseService;
+import com.tcctyn.system.api.RemoteUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ *
+ * 物资库存 前端控制器
+ *
+ *
+ * @author liuzh
+ * @since 2024-10-29
+ */
+
+@RestController
+@RequestMapping("/inventory")
+public class InventoryController extends BaseController {
+
+
+ @Autowired
+ private IInventoryService iInventoryService;
+
+ @Autowired
+ private IWarehouseService warehouseService;
+
+ @Resource
+ private RemoteUserService remoteUserService;
+
+ @GetMapping(value = "/list")
+ public TableDataInfo list(InventorySearcher inventorySearcher) {
+ startPage();
+ List doList = iInventoryService.list(inventorySearcher);
+ List voList = BeanUtils.copyList(doList, InventoryVO.class);
+ voList.forEach(vo -> {
+ Warehouse warehouse = warehouseService.getById(vo.getWarehouseId());
+ vo.setRegionId(warehouse.getRegionId());
+ vo.setWarehouseName(warehouse.getWarehouseName());
+ vo.setUserName(remoteUserService.selectUserById(vo.getUserId()).getData().getNickName());
+ });
+
+ return getDataTable(doList, voList);
+ }
+
+
+ @GetMapping(value = "/{id}")
+ public AjaxResult getById(@PathVariable("id") Long id) {
+ Inventory inventory = iInventoryService.getById(id);
+ return AjaxResult.success(inventory);
+ }
+
+ @PostMapping(value = "/create")
+ public AjaxResult create(@RequestBody Inventory params) {
+ Integer result = iInventoryService.create(params);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/delete/{id}")
+ public AjaxResult delete(@PathVariable("id") Long id) {
+ Integer result = iInventoryService.delete(id);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/update")
+ public AjaxResult update(@RequestBody Inventory params) {
+ Integer result = iInventoryService.update(params);
+ return AjaxResult.success(result);
+ }
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/KeyAreaInfoController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/KeyAreaInfoController.java
new file mode 100644
index 0000000..60b0b3c
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/KeyAreaInfoController.java
@@ -0,0 +1,114 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.common.core.web.page.TableDataInfo;
+import com.tcctyn.common.core.utils.bean.BeanUtils;
+import com.tcctyn.iot.forestfire.VO.KeyAreaInfoVO;
+import com.tcctyn.iot.forestfire.domain.KeyAreaInfo;
+import com.tcctyn.iot.forestfire.service.ICommonService;
+import com.tcctyn.iot.forestfire.service.IKeyAreaInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ *
+ * 重点监控区域配置表 前端控制器
+ *
+ *
+ * @author daichao
+ * @since 2024-12-17
+ */
+
+@RestController
+@RequestMapping("/keyAreaInfo")
+public class KeyAreaInfoController extends BaseController {
+
+
+ @Autowired
+ private IKeyAreaInfoService iKeyAreaInfoService;
+
+ @Autowired
+ private ICommonService commonService;
+
+ @GetMapping(value = "/list")
+ public AjaxResult list(@RequestParam(required = false) Integer current, @RequestParam(required = false) Integer size) {
+ if (current == null) {
+ current = 1;
+ }
+ if (size == null) {
+ size = 10;
+ }
+ Page pageList = iKeyAreaInfoService.list(current, size);
+ return AjaxResult.success(pageList);
+ }
+
+
+ @GetMapping(value = "/{id}")
+ public AjaxResult getById(@PathVariable("id") Long id) {
+ KeyAreaInfo keyAreaInfo = iKeyAreaInfoService.getById(id);
+ KeyAreaInfoVO keyAreaInfoVO = new KeyAreaInfoVO();
+ BeanUtils.copyBeanProp(keyAreaInfo, keyAreaInfoVO);
+ Map regionIdToNameMap = commonService.regionMapIdToName(keyAreaInfoVO.getRegionId());
+ keyAreaInfoVO.setRegionName(regionIdToNameMap.get(keyAreaInfoVO.getRegionId()));
+ return AjaxResult.success(keyAreaInfoVO);
+ }
+
+ @PostMapping(value = "/create")
+ public AjaxResult create(@Validated @RequestBody KeyAreaInfo params) {
+ Integer result = iKeyAreaInfoService.create(params);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/delete/{id}")
+ public AjaxResult delete(@PathVariable("id") Long id) {
+ Integer result = iKeyAreaInfoService.delete(id);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping(value = "/update")
+ public AjaxResult update(@RequestBody KeyAreaInfo params) {
+ Integer result = iKeyAreaInfoService.update(params);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 分页列表查询
+ */
+ @GetMapping(value = "/selectList")
+ public TableDataInfo selectList(KeyAreaInfo keyAreaInfo) {
+ startPage();
+ List keyAreaInfoList = iKeyAreaInfoService.selectList(keyAreaInfo);
+ List voList = BeanUtils.copyList(keyAreaInfoList, KeyAreaInfoVO.class);
+ Map regionIdToNameMap = commonService.regionMapIdToName(null);
+ voList.forEach(keyAreaInfoVO -> {
+ keyAreaInfoVO.setRegionName(Optional.ofNullable(regionIdToNameMap.get(keyAreaInfoVO.getRegionId())).orElse(""));
+ });
+ return getDataTable(keyAreaInfoList, voList);
+ }
+
+ /**
+ * 大屏页面给到前端的所有重点区域
+ */
+ @GetMapping(value = "/selectAll")
+ public AjaxResult selectAll() {
+ KeyAreaInfo keyAreaInfo = new KeyAreaInfo();
+ List keyAreaInfoList = iKeyAreaInfoService.selectList(keyAreaInfo);
+ List voList = BeanUtils.copyList(keyAreaInfoList, KeyAreaInfoVO.class);
+ Map regionIdToNameMap = commonService.regionMapIdToName(null);
+ voList.forEach(keyAreaInfoVO -> {
+ keyAreaInfoVO.setRegionName(Optional.ofNullable(regionIdToNameMap.get(keyAreaInfoVO.getRegionId())).orElse(""));
+ });
+ // 如果存在时间范围，需要判断是否在时间范围内
+ if (keyAreaInfo.getStartTime() != null && keyAreaInfo.getEndTime() != null) {
+ voList.removeIf(item -> item.getStartTime().getTime() > System.currentTimeMillis() || item.getEndTime().getTime() < System.currentTimeMillis());
+ }
+ return AjaxResult.success(voList);
+ }
+}
diff --git a/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/LeaveRecordController.java b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/LeaveRecordController.java
new file mode 100644
index 0000000..94f1579
--- /dev/null
+++ b/tcctyn-modules/tcctyn-iot/src/main/java/com/tcctyn/iot/forestfire/controller/LeaveRecordController.java
@@ -0,0 +1,124 @@
+package com.tcctyn.iot.forestfire.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tcctyn.common.core.web.controller.BaseController;
+import com.tcctyn.common.core.web.domain.AjaxResult;
+import com.tcctyn.common.core.web.page.TableDataInfo;
+import com.tcctyn.common.core.utils.bean.BeanUtils;
+import com.tcctyn.iot.forestfire.VO.LeaveRecordVO;
+import com.tcctyn.iot.forestfire.domain.LeaveRecord;
+import com.tcctyn.iot.forestfire.service.ICommonService;
+import com.tcctyn.iot.forestfire.service.ILeaveRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ *
+ * 请假记录表 前端控制器
+ *
+ *
+ * @author daichao
+ * @since 2024-12-09
+ */
+
+@RestController
+@RequestMapping("/leaveRecord")
+public class LeaveRecordController extends BaseController {
+
+
+ @Autowired
+ private ILeaveRecordService iLeaveRecordService;
+
+ @Autowired
+ private ICommonService commonService;
+
+ @GetMapping(value = "/list")
+ public AjaxResult list(@RequestParam(required = false) Integer current, @RequestParam(required = false) Integer size) {
+ if (current == null) {
+ current = 1;
+ }
+ if (size == null) {
+ size = 10;
+ }
+ Page pageList = iLeaveRecordService.list(current, size);
+ return AjaxResult.success(pageList);
+ }
+
+
+ @GetMapping(value = "/{id}")
+ public AjaxResult getById(@PathVariable("id") Long id) {
+ LeaveRecord leaveRecord = iLeaveRecordService.getById(id);
+ LeaveRecordVO leaveRecordVO = new LeaveRecordVO();
+ BeanUtils.copyBeanProp(leaveRecord, leaveRecordVO);
+ Map