From 32eb942e25aa366563b7f40b05a382c0c462213c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 22 七月 2025 10:29:38 +0800
Subject: [PATCH] 修改切面日志功能
---
se-system/src/main/java/com/terra/system/service/show/ExportService.java | 4
se-common/src/main/java/com/terra/common/helper/StringHelper.java | 6
se-common/src/main/java/com/terra/common/annotation/SysLog.java | 2
se-system/src/main/java/com/terra/system/service/all/UploadAttachService.java | 4
se-system/src/main/java/com/terra/system/service/all/CommonsFileuploadService.java | 2
se-common/src/main/java/com/terra/common/helper/FileHelper.java | 46 +---
se-system/src/main/java/com/terra/system/controller/sys/TokenController.java | 6
se-system/src/main/java/com/terra/system/controller/sys/MenuController.java | 4
se-system/src/main/java/com/terra/system/controller/show/DataLibController.java | 4
se-system/src/main/java/com/terra/system/controller/sys/ReportController.java | 2
se-system/src/main/java/com/terra/system/controller/sys/AuthController.java | 2
se-system/src/main/java/com/terra/system/helper/ExcelHelper.java | 1
se-system/src/main/java/com/terra/system/service/data/UploadService.java | 3
se-system/src/main/java/com/terra/system/service/show/CadService.java | 7
se-system/src/main/java/com/terra/system/controller/show/ExportController.java | 6
se-system/src/main/java/com/terra/system/service/data/VerService.java | 2
se-system/src/main/java/com/terra/system/controller/sys/BlacklistController.java | 2
se-system/src/main/java/com/terra/system/service/sys/OperateService.java | 2
se-system/src/main/java/com/terra/system/service/sys/BlacklistService.java | 4
se-system/src/main/java/com/terra/system/controller/sys/ResOpController.java | 2
se-system/src/main/java/com/terra/system/service/data/TaskService.java | 2
se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3
se-system/src/main/java/com/terra/system/controller/sys/RoleResController.java | 2
se-system/src/main/java/com/terra/system/service/sys/RoleLayerService.java | 2
se-system/src/main/java/com/terra/system/controller/data/DomainController.java | 4
se-system/src/main/java/com/terra/system/service/show/DataLibService.java | 7
se-system/src/main/java/com/terra/system/controller/all/BaseQueryController.java | 4
se-system/src/main/java/com/terra/system/entity/ctrl/RegisterEntity.java | 2
se-system/src/main/java/com/terra/system/service/data/DirService.java | 2
se-system/src/main/java/com/terra/system/helper/PathHelper.java | 4
se-system/src/main/java/com/terra/system/service/show/ApplyService.java | 2
se-system/src/main/java/com/terra/system/controller/show/ComprehensiveController.java | 6
se-system/src/main/java/com/terra/system/service/sys/TokenService.java | 6
se-system/src/main/java/com/terra/system/controller/show/ModelController.java | 4
se-system/src/main/java/com/terra/system/service/all/BaseUploadService.java | 5
se-system/src/main/java/com/terra/system/controller/data/DictController.java | 2
se-system/src/main/java/com/terra/system/controller/data/upload/CheckController.java | 4
se-system/src/main/java/com/terra/system/controller/sys/RoleLayerController.java | 2
se-system/src/main/java/com/terra/system/controller/sys/ArgsController.java | 2
se-system/src/main/java/com/terra/system/helper/ClassHelper.java | 1
se-system/pom.xml | 34 ---
se-system/src/main/java/com/terra/system/service/sys/LoginService.java | 4
se-common/src/main/java/com/terra/common/entity/all/SettingData.java | 2
se-system/src/main/java/com/terra/system/service/sys/ArgsService.java | 4
se-system/src/main/java/com/terra/system/controller/show/ApplyController.java | 6
se-system/src/main/java/com/terra/system/controller/data/upload/UploadController.java | 4
se-system/src/main/java/com/terra/system/service/data/MetaService.java | 3
se-system/src/main/java/com/terra/system/service/sys/LayerService.java | 4
se-system/src/main/java/com/terra/system/controller/sys/UserController.java | 4
se-system/src/main/java/com/terra/system/controller/show/MarkController.java | 2
se-system/src/main/java/com/terra/system/controller/sys/RoleController.java | 2
se-system/src/main/java/com/terra/system/service/sys/ReportService.java | 10
se-system/src/main/java/com/terra/system/service/show/MarkService.java | 10 +
se-system/src/main/java/com/terra/system/controller/sys/MenuAuthController.java | 2
se-system/src/main/java/com/terra/system/service/all/ScheduleService.java | 4
se-system/src/main/java/com/terra/system/service/show/PipelineService.java | 2
se-system/src/main/java/com/terra/system/controller/data/DataCountController.java | 4
se-system/src/main/java/com/terra/system/service/sys/ResOpService.java | 2
se-system/src/main/java/com/terra/system/service/show/InquiryService.java | 4
se-system/src/main/java/com/terra/system/service/sys/UserService.java | 2
se-system/src/main/java/com/terra/system/controller/data/MetaController.java | 4
se-system/src/main/java/com/terra/system/controller/data/ProjectController.java | 6
se-system/src/main/java/com/terra/system/service/sys/RoleService.java | 2
se-system/src/main/java/com/terra/system/controller/data/DataQueryController.java | 4
se-common/src/main/java/com/terra/common/helper/WebHelper.java | 36 ++--
se-system/src/main/java/com/terra/system/controller/data/StyleController.java | 4
se-system/src/main/java/com/terra/system/controller/data/TaskController.java | 4
se-system/src/main/java/com/terra/system/helper/HttpHelper.java | 1
se-system/src/main/java/com/terra/system/service/data/FmeService.java | 4
se-system/src/main/java/com/terra/system/helper/GdalHelper.java | 1
se-system/src/main/java/com/terra/system/service/all/PermsService.java | 2
se-system/src/main/java/com/terra/system/helper/EnumHelper.java | 1
se-system/src/main/java/com/terra/system/controller/data/upload/QueryController.java | 4
se-system/src/main/java/com/terra/system/service/data/DownloadService.java | 18 ++
se-system/src/main/java/com/terra/system/helper/GdbHelper.java | 1
se-system/src/main/java/com/terra/system/controller/show/InquiryController.java | 6
se-system/src/main/java/com/terra/system/controller/sys/ResController.java | 4
se-system/src/main/java/com/terra/system/controller/data/WmtsController.java | 6
se-system/src/main/java/com/terra/system/controller/sys/LayerController.java | 2
se-system/src/main/java/com/terra/system/helper/AesHelper.java | 2
docker/readme.md | 24 ++
se-system/src/main/java/com/terra/system/controller/sys/DownlogController.java | 2
se-system/src/main/java/com/terra/system/service/data/DataQueryService.java | 4
se-system/src/main/java/com/terra/system/service/data/StyleService.java | 2
se-system/src/main/java/com/terra/system/service/data/PublishService.java | 4
se-system/src/main/java/com/terra/system/controller/data/PublishController.java | 6
se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java | 2
se-system/src/main/java/com/terra/system/controller/sys/LoginController.java | 2
se-system/src/main/java/com/terra/system/controller/all/PermsController.java | 2
se-system/src/main/java/com/terra/system/service/sys/AttachService.java | 2
se-system/src/main/java/com/terra/system/interceptor/AuthInterceptor.java | 4
se-system/src/main/java/com/terra/system/controller/sys/RoleUserController.java | 2
se-system/src/main/java/com/terra/system/service/sys/DownlogService.java | 4
se-system/src/main/java/com/terra/system/service/all/RedisService.java | 2
se-system/src/main/java/com/terra/system/controller/data/DirController.java | 4
se-system/src/main/java/com/terra/system/controller/data/VerController.java | 2
se-system/src/main/java/com/terra/system/service/data/DomainService.java | 2
se-system/src/main/java/com/terra/system/controller/sys/OperateController.java | 2
se-system/src/main/java/com/terra/system/helper/Zip4jHelper.java | 1
se-system/src/main/java/com/terra/system/controller/sys/DepController.java | 4
se-system/src/main/java/com/terra/system/service/all/TestService.java | 3
se-system/src/main/java/com/terra/system/service/sys/ResService.java | 2
se-system/src/main/java/com/terra/system/controller/sys/RoleMenuAuthController.java | 2
se-system/src/main/java/com/terra/system/service/all/SignService.java | 2
se-common/src/main/java/com/terra/common/aspect/LogAspect.java | 21 -
se-system/src/main/java/com/terra/system/controller/sys/CtrlController.java | 2
se-system/src/main/java/com/terra/system/controller/all/SignController.java | 6
se-system/src/main/java/com/terra/system/controller/sys/ResLogController.java | 2
se-system/src/main/java/com/terra/system/service/data/RasterService.java | 4
se-system/src/main/java/com/terra/system/service/sys/ResLogService.java | 2
se-common/pom.xml | 16 +
se-system/src/main/java/com/terra/system/service/data/DictService.java | 2
112 files changed, 291 insertions(+), 248 deletions(-)
diff --git a/docker/readme.md b/docker/readme.md
index 50fc019..2e1b851 100644
--- a/docker/readme.md
+++ b/docker/readme.md
@@ -1,5 +1,6 @@
1. 杩愯
```bash
+# 鏌ョ湅瀹瑰櫒
docker images | sort -k1 # 鎺掑簭
docker images | grep -E 'kafka|zook' # 杩囨护
@@ -108,4 +109,27 @@
# 鍒犻櫎kafka鐨勫厓鏁版嵁鏂囦欢
rm -rf kafka_data/data/meta.properties
rm -rf kafka_data/data/
+
+# 瑙ｅ帇rar
+unrar-free --version
+unrar x 鏂囦欢鍚�.rar
+unrar x 鏂囦欢鍚�.rar 鐩爣璺緞/
+
+# 閲嶅惎docker鏈嶅姟
+systemctl daemon-reload
+systemctl restart docker
+netstat -nlp | grep 2375
+
+# 寮�鏀剧鍙�
+firewall-cmd --permanent --zone=public --add-port=2375/tcp
+firewall-cmd --reload
+firewall-cmd --list-ports
+
+# 杩愯pgadmin4锛宧ttp://localhost:5433/
+docker pull dpage/pgadmin4
+docker run -d -p 5433:80 --name pgadmin4 -e PGADMIN_DEFAULT_EMAIL=test@qq.com -e PGADMIN_DEFAULT_PASSWORD=123@qq.com dpage/pgadmin4
+
+# 鏌ョ湅纾佺洏绌洪棿
+df -h
+du -sh .
```
diff --git a/se-common/pom.xml b/se-common/pom.xml
index da6a420..2c849dd 100644
--- a/se-common/pom.xml
+++ b/se-common/pom.xml
@@ -31,12 +31,26 @@
<version>${springdoc.version}</version>
</dependency>
- <!-- JSON 瑙ｆ瀽鍣ㄥ拰鐢熸垚鍣� -->
+ <!-- Alibaba Fastjson -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
+ <!--servlet-->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!--aop-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/se-system/src/main/java/com/terra/system/annotation/SysLog.java b/se-common/src/main/java/com/terra/common/annotation/SysLog.java
similarity index 85%
rename from se-system/src/main/java/com/terra/system/annotation/SysLog.java
rename to se-common/src/main/java/com/terra/common/annotation/SysLog.java
index 89716ac..c589e4b 100644
--- a/se-system/src/main/java/com/terra/system/annotation/SysLog.java
+++ b/se-common/src/main/java/com/terra/common/annotation/SysLog.java
@@ -1,4 +1,4 @@
-package com.terra.system.annotation;
+package com.terra.common.annotation;
import java.lang.annotation.*;
diff --git a/se-system/src/main/java/com/terra/system/aspect/LogAspect.java b/se-common/src/main/java/com/terra/common/aspect/LogAspect.java
similarity index 86%
rename from se-system/src/main/java/com/terra/system/aspect/LogAspect.java
rename to se-common/src/main/java/com/terra/common/aspect/LogAspect.java
index 1a0be78..881bf0c 100644
--- a/se-system/src/main/java/com/terra/system/aspect/LogAspect.java
+++ b/se-common/src/main/java/com/terra/common/aspect/LogAspect.java
@@ -1,11 +1,7 @@
-package com.terra.system.aspect;
+package com.terra.common.aspect;
-import com.terra.system.annotation.SysLog;
-import com.terra.system.entity.sys.OperateEntity;
-import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.WebHelper;
-import com.terra.system.service.sys.OperateService;
-import com.terra.system.service.sys.TokenService;
+import com.terra.common.annotation.SysLog;
+import com.terra.common.helper.WebHelper;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -14,7 +10,6 @@
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
-import javax.annotation.Resource;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
@@ -27,12 +22,6 @@
@Aspect
@Component
public class LogAspect {
- @Resource
- private TokenService tokenService;
-
- @Resource
- private OperateService operateService;
-
private final static String SELECT = "select";
private final static String INSERT = "insert";
@@ -87,7 +76,7 @@
HttpServletRequest req = WebHelper.getRequest();
String url = req.getServletPath();
- OperateEntity oe = new OperateEntity();
+ /*OperateEntity oe = new OperateEntity();
oe.setIp(WebHelper.getIpAddress(req));
oe.setUrl(url);
oe.setExec(time);
@@ -115,7 +104,7 @@
oe.setUserid(ue.getId());
}
- operateService.insertOperate(oe);
+ operateService.insertOperate(oe);*/
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
diff --git a/se-system/src/main/java/com/terra/system/entity/all/SettingData.java b/se-common/src/main/java/com/terra/common/entity/all/SettingData.java
similarity index 95%
rename from se-system/src/main/java/com/terra/system/entity/all/SettingData.java
rename to se-common/src/main/java/com/terra/common/entity/all/SettingData.java
index b437482..714b198 100644
--- a/se-system/src/main/java/com/terra/system/entity/all/SettingData.java
+++ b/se-common/src/main/java/com/terra/common/entity/all/SettingData.java
@@ -1,4 +1,4 @@
-package com.terra.system.entity.all;
+package com.terra.common.entity.all;
/**
* 璁剧疆鏁版嵁绫�
diff --git a/se-system/src/main/java/com/terra/system/helper/FileHelper.java b/se-common/src/main/java/com/terra/common/helper/FileHelper.java
similarity index 92%
rename from se-system/src/main/java/com/terra/system/helper/FileHelper.java
rename to se-common/src/main/java/com/terra/common/helper/FileHelper.java
index fd36596..8279050 100644
--- a/se-system/src/main/java/com/terra/system/helper/FileHelper.java
+++ b/se-common/src/main/java/com/terra/common/helper/FileHelper.java
@@ -1,9 +1,8 @@
-package com.terra.system.helper;
+package com.terra.common.helper;
import com.terra.common.entity.all.StaticData;
-import com.terra.system.entity.data.MetaFileEntity;
//import com.twmacinta.util.MD5;
-import org.apache.commons.codec.digest.DigestUtils;
+//import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -11,6 +10,7 @@
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.security.MessageDigest;
import java.text.DecimalFormat;
import java.util.List;
@@ -236,43 +236,27 @@
/**
* 3.鑾峰彇鏂囦欢MD5鐮侊紙JDK锛�
*/
- public static String getMd5ByJdk(String filePath) throws IOException {
+ /*public static String getMd5ByJdk(String filePath) throws IOException {
FileInputStream fileStream = new FileInputStream(filePath);
String md5 = DigestUtils.md5Hex(fileStream);
fileStream.close();
return md5;
- }
+ }*/
/**
* 2.鑾峰彇蹇�� MD5 鐮�
*/
- public static String getFastMd5(String filePath) throws IOException {
- /*String hash = MD5.asHex(MD5.getHash(new File(filePath)));
+ /*public static String getFastMd5(String filePath) throws IOException {
+ String hash = MD5.asHex(MD5.getHash(new File(filePath)));
MD5 md5 = new MD5();
md5.Update(hash, null);
- return md5.asHex();*/
+ return md5.asHex();
return null;
- }
-
- /**
- * 鍒犻櫎鏂囦欢
- */
- public static void deleteFiles(List<MetaFileEntity> list) {
- try {
- for (MetaFileEntity mf : list) {
- File f = new File(mf.getPath());
- if (f.exists()) {
- f.delete();
- }
- }
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
- }
- }
+ }*/
/**
* 鍒犻櫎鏂囦欢澶�
@@ -366,7 +350,7 @@
return byteToHexString(b);
} catch (Exception ex) {
- ex.printStackTrace();
+ log.error(ex.getMessage(), ex);
return null;
} finally {
try {
@@ -374,7 +358,7 @@
fis.close();
}
} catch (IOException ex) {
- ex.printStackTrace();
+ log.error(ex.getMessage(), ex);
}
}
}
@@ -453,8 +437,8 @@
InputStream is = null;
OutputStream os = null;
try {
- is = new FileInputStream(src);
- os = new FileOutputStream(dest);
+ is = Files.newInputStream(src.toPath());
+ os = Files.newOutputStream(dest.toPath());
byte[] buffer = new byte[1024];
@@ -463,8 +447,8 @@
os.write(buffer, 0, length);
}
} finally {
- os.close();
- is.close();
+ if (os != null) os.close();
+ if (is != null) is.close();
}
}
}
diff --git a/se-system/src/main/java/com/terra/system/helper/StringHelper.java b/se-common/src/main/java/com/terra/common/helper/StringHelper.java
similarity index 97%
rename from se-system/src/main/java/com/terra/system/helper/StringHelper.java
rename to se-common/src/main/java/com/terra/common/helper/StringHelper.java
index dc024b9..6d6489a 100644
--- a/se-system/src/main/java/com/terra/system/helper/StringHelper.java
+++ b/se-common/src/main/java/com/terra/common/helper/StringHelper.java
@@ -1,4 +1,4 @@
-package com.terra.system.helper;
+package com.terra.common.helper;
import com.terra.common.entity.all.StaticData;
@@ -107,14 +107,14 @@
* 瀛楃涓诧紝鏄惁涓簄ull 鎴� ""
*/
public static boolean isNull(String str) {
- return null == str || str.length() == 0;
+ return null == str || str.isEmpty();
}
/**
* 瀛楃涓�,鏄惁涓虹┖null鍜岀┖鏍�
*/
public static boolean isEmpty(String str) {
- return null == str || "".equals(str.trim());
+ return null == str || str.trim().isEmpty();
}
/**
diff --git a/se-system/src/main/java/com/terra/system/helper/WebHelper.java b/se-common/src/main/java/com/terra/common/helper/WebHelper.java
similarity index 90%
rename from se-system/src/main/java/com/terra/system/helper/WebHelper.java
rename to se-common/src/main/java/com/terra/common/helper/WebHelper.java
index 9d10f0d..03ffc80 100644
--- a/se-system/src/main/java/com/terra/system/helper/WebHelper.java
+++ b/se-common/src/main/java/com/terra/common/helper/WebHelper.java
@@ -1,9 +1,9 @@
-package com.terra.system.helper;
+package com.terra.common.helper;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
import com.terra.common.entity.all.HttpStatus;
import com.terra.common.entity.all.ResponseMsg;
-import com.terra.system.entity.all.SettingData;
+import com.terra.common.entity.all.SettingData;
import com.terra.common.entity.all.StaticData;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -47,37 +47,37 @@
*/
public static String getIpAddress(HttpServletRequest request) {
String ip = request.getHeader("X-Forwarded-For");
- if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+ if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}
- if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+ if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("WL-Proxy-Client-IP");
}
- if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+ if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_FORWARDED_FOR");
}
- if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+ if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_FORWARDED");
}
- if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+ if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_CLUSTER_CLIENT_IP");
}
- if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+ if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_CLIENT_IP");
}
- if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+ if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_FORWARDED_FOR");
}
- if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+ if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_FORWARDED");
}
- if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+ if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_VIA");
}
- if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+ if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getHeader("REMOTE_ADDR");
}
- if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
+ if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
if (ip.contains(COMMA)) {
@@ -109,7 +109,7 @@
*/
public static String getTokenFromCookie(HttpServletRequest request) {
Cookie[] cookies = request.getCookies();
- if (cookies == null || cookies.length == 0) {
+ if (cookies == null) {
return null;
}
@@ -156,7 +156,7 @@
*/
public static void deleteCookie(String cookieKey, HttpServletRequest request, HttpServletResponse response) {
Cookie[] cookies = request.getCookies();
- if (cookies != null && cookies.length > 0) {
+ if (cookies != null) {
for (Cookie c : cookies) {
if (cookieKey.equalsIgnoreCase(c.getName())) {
c.setMaxAge(0);
@@ -172,7 +172,7 @@
*/
public static void deleteCookies(HttpServletRequest request, HttpServletResponse response) {
Cookie[] cookies = request.getCookies();
- if (cookies != null && cookies.length > 0) {
+ if (cookies != null) {
for (Cookie c : cookies) {
c.setMaxAge(0);
c.setPath("/");
@@ -186,7 +186,7 @@
*/
public static String getCookieByKey(String key, HttpServletRequest request) {
Cookie[] cookies = request.getCookies();
- if (cookies == null || cookies.length == 0) {
+ if (cookies == null) {
return null;
}
diff --git a/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index fa6570b..2ca104f 100644
--- a/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1,3 @@
com.terra.common.config.MybatisPlusConfig
-com.terra.common.config.SpringDocAutoConfiguration
\ No newline at end of file
+com.terra.common.config.SpringDocAutoConfiguration
+com.terra.common.aspect.LogAspect
\ No newline at end of file
diff --git a/se-system/pom.xml b/se-system/pom.xml
index 007da5e..8729dd0 100644
--- a/se-system/pom.xml
+++ b/se-system/pom.xml
@@ -57,13 +57,6 @@
<optional>true</optional>
</dependency>
- <!--mybatis-plus-->
-<!-- <dependency>-->
-<!-- <groupId>com.baomidou</groupId>-->
-<!-- <artifactId>mybatis-plus-boot-starter</artifactId>-->
-<!-- <version>3.5.1</version>-->
-<!-- </dependency>-->
-
<!--redis-->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -80,18 +73,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
-
- <!--aop-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-aop</artifactId>
- </dependency>
-
- <!-- Alibaba Fastjson -->
-<!-- <dependency>-->
-<!-- <groupId>com.alibaba.fastjson2</groupId>-->
-<!-- <artifactId>fastjson2</artifactId>-->
-<!-- </dependency>-->
<!--鏁村悎druid鏁版嵁婧�-->
<dependency>
@@ -111,13 +92,6 @@
<artifactId>commons-text</artifactId>
<version>1.1</version>
</dependency>
-
- <!-- SpringDoc webmvc -->
-<!-- <dependency>-->
-<!-- <groupId>org.springdoc</groupId>-->
-<!-- <artifactId>springdoc-openapi-ui</artifactId>-->
-<!-- <version>${springdoc.version}</version>-->
-<!-- </dependency>-->
<!--httpclient-->
<dependency>
@@ -181,14 +155,6 @@
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>2.2.10</version>
- </dependency>
-
- <!--servlet-->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
</dependency>
<!--apache.poi-->
diff --git a/se-system/src/main/java/com/terra/system/controller/all/BaseQueryController.java b/se-system/src/main/java/com/terra/system/controller/all/BaseQueryController.java
index e300bb3..765e476 100644
--- a/se-system/src/main/java/com/terra/system/controller/all/BaseQueryController.java
+++ b/se-system/src/main/java/com/terra/system/controller/all/BaseQueryController.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.terra.common.controller.all.BaseController;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.system.entity.all.BaseGeoEntity;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.common.entity.all.StaticData;
@@ -18,7 +18,7 @@
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.AesHelper;
import com.terra.system.helper.ClassHelper;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.all.BasicMapper;
import com.terra.system.mapper.all.GeomBaseMapper;
import com.terra.system.service.all.BaseQueryService;
diff --git a/se-system/src/main/java/com/terra/system/controller/all/PermsController.java b/se-system/src/main/java/com/terra/system/controller/all/PermsController.java
index b3535d3..38f7e38 100644
--- a/se-system/src/main/java/com/terra/system/controller/all/PermsController.java
+++ b/se-system/src/main/java/com/terra/system/controller/all/PermsController.java
@@ -3,7 +3,7 @@
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.common.entity.all.StaticData;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.system.entity.all.*;
import com.terra.system.entity.sys.LayerEntity;
import com.terra.system.entity.sys.MenuEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/all/SignController.java b/se-system/src/main/java/com/terra/system/controller/all/SignController.java
index 6050687..f89ccee 100644
--- a/se-system/src/main/java/com/terra/system/controller/all/SignController.java
+++ b/se-system/src/main/java/com/terra/system/controller/all/SignController.java
@@ -1,10 +1,12 @@
package com.terra.system.controller.all;
import com.terra.common.controller.all.BaseController;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.config.PropertiesConfig;
import com.terra.common.entity.all.ResponseMsg;
-import com.terra.system.entity.all.SettingData;
+import com.terra.common.entity.all.SettingData;
import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.sys.LoginEntity;
import com.terra.system.entity.sys.OperateEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/DataCountController.java b/se-system/src/main/java/com/terra/system/controller/data/DataCountController.java
index abf5e5e..6c64769 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/DataCountController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/DataCountController.java
@@ -1,12 +1,12 @@
package com.terra.system.controller.data;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.ctrl.CountEntity;
import com.terra.system.entity.sys.ReportEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.all.UploadAttachService;
import com.terra.system.service.sys.ReportService;
import com.terra.system.service.sys.TokenService;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/DataQueryController.java b/se-system/src/main/java/com/terra/system/controller/data/DataQueryController.java
index 391cc3f..c110a75 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/DataQueryController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/DataQueryController.java
@@ -1,10 +1,10 @@
package com.terra.system.controller.data;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.system.controller.all.BaseQueryController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.data.DataQueryService;
import com.terra.system.service.sys.TokenService;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/DictController.java b/se-system/src/main/java/com/terra/system/controller/data/DictController.java
index dd77f15..ad56524 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/DictController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/DictController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.data;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.ctrl.TabEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/DirController.java b/se-system/src/main/java/com/terra/system/controller/data/DirController.java
index 1f62d8f..c075508 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/DirController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/DirController.java
@@ -1,11 +1,11 @@
package com.terra.system.controller.data;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.data.DirEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.service.data.DirService;
import com.terra.system.service.sys.TokenService;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/DomainController.java b/se-system/src/main/java/com/terra/system/controller/data/DomainController.java
index 409be2b..7e059ce 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/DomainController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/DomainController.java
@@ -1,12 +1,12 @@
package com.terra.system.controller.data;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.ctrl.TabEntity;
import com.terra.system.entity.data.DomainEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.all.BaseQueryService;
import com.terra.system.service.data.DictService;
import com.terra.system.service.data.DomainService;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/MetaController.java b/se-system/src/main/java/com/terra/system/controller/data/MetaController.java
index fed7c8a..3d267c9 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/MetaController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/MetaController.java
@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.HttpStatus;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.common.entity.all.StaticData;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.entity.ctrl.DownloadReqEntity;
import com.terra.system.entity.ctrl.IdNameEntity;
import com.terra.system.entity.data.DictEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/ProjectController.java b/se-system/src/main/java/com/terra/system/controller/data/ProjectController.java
index 03ce595..5991867 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/ProjectController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/ProjectController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.bs.BsprojectEntity;
@@ -12,8 +12,8 @@
import com.terra.system.entity.data.DirEntity;
import com.terra.system.entity.sys.DepEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.mapper.bs.BsprojectMapper;
import com.terra.system.service.all.BaseQueryService;
import com.terra.system.service.data.DirService;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/PublishController.java b/se-system/src/main/java/com/terra/system/controller/data/PublishController.java
index b884fc6..b0dcb1c 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/PublishController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/PublishController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.data;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.common.entity.all.StaticData;
@@ -9,8 +9,8 @@
import com.terra.system.entity.data.PublishEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.PathHelper;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.service.data.MetaService;
import com.terra.system.service.data.PublishService;
import com.terra.system.service.data.RasterService;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/StyleController.java b/se-system/src/main/java/com/terra/system/controller/data/StyleController.java
index d2785d5..52b570e 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/StyleController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/StyleController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.data;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.HttpStatus;
import com.terra.common.entity.all.ResponseMsg;
@@ -8,7 +8,7 @@
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.data.StyleEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.service.all.UploadAttachService;
import com.terra.system.service.data.DownloadService;
import com.terra.system.service.data.StyleService;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/TaskController.java b/se-system/src/main/java/com/terra/system/controller/data/TaskController.java
index 20a2f19..5d75945 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/TaskController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/TaskController.java
@@ -1,12 +1,12 @@
package com.terra.system.controller.data;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.ctrl.PubEntity;
import com.terra.system.entity.data.TaskEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.service.data.PublishService;
import com.terra.system.service.data.TaskService;
import com.terra.system.service.sys.TokenService;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/VerController.java b/se-system/src/main/java/com/terra/system/controller/data/VerController.java
index 4319d43..cfafb76 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/VerController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/VerController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.data;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.data.VerEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/WmtsController.java b/se-system/src/main/java/com/terra/system/controller/data/WmtsController.java
index ed01730..981f119 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/WmtsController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/WmtsController.java
@@ -1,9 +1,9 @@
package com.terra.system.controller.data;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.system.config.PropertiesConfig;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/upload/CheckController.java b/se-system/src/main/java/com/terra/system/controller/data/upload/CheckController.java
index 51b6cb2..58235c8 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/upload/CheckController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/upload/CheckController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.data.upload;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.common.entity.all.StaticData;
@@ -8,7 +8,7 @@
import com.terra.system.entity.ctrl.RegisterEntity;
import com.terra.system.helper.HttpHelper;
import com.terra.system.helper.PathHelper;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.data.FmeService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/upload/QueryController.java b/se-system/src/main/java/com/terra/system/controller/data/upload/QueryController.java
index 553bf76..64b8d0b 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/upload/QueryController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/upload/QueryController.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.TabEntity;
@@ -12,7 +12,7 @@
import com.terra.system.entity.sys.DepEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.ClassHelper;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.all.BasicMapper;
import com.terra.system.service.all.BaseQueryService;
import com.terra.system.service.data.*;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/upload/UploadController.java b/se-system/src/main/java/com/terra/system/controller/data/upload/UploadController.java
index d808f3b..3756847 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/upload/UploadController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/upload/UploadController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.data.upload;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.ctrl.KeyValueEntity;
import com.terra.system.entity.data.DirEntity;
@@ -8,7 +8,7 @@
import com.terra.system.entity.data.MetaFileEntity;
import com.terra.system.entity.data.VerEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.all.UploadAttachService;
import com.terra.system.service.data.UploadService;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/ApplyController.java b/se-system/src/main/java/com/terra/system/controller/show/ApplyController.java
index 0e88d92..9d1dedd 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/ApplyController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/ApplyController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.show;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.HttpStatus;
import com.terra.common.entity.all.ResponseMsg;
@@ -11,8 +11,8 @@
import com.terra.system.entity.show.FlowEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.AesHelper;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.service.data.DownloadService;
import com.terra.system.service.show.ApplyService;
import com.terra.system.service.show.FlowService;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/ComprehensiveController.java b/se-system/src/main/java/com/terra/system/controller/show/ComprehensiveController.java
index e72314a..3b61e1c 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/ComprehensiveController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/ComprehensiveController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.show;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.entity.all.HttpStatus;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.common.entity.all.StaticData;
@@ -12,8 +12,8 @@
import com.terra.system.entity.show.PipelineEntity;
import com.terra.system.entity.sys.AttachEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.service.all.BaseQueryService;
import com.terra.system.service.all.BaseUploadService;
import com.terra.system.service.all.UploadAttachService;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/DataLibController.java b/se-system/src/main/java/com/terra/system/controller/show/DataLibController.java
index 4e7852a..f9183d0 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/DataLibController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/DataLibController.java
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.controller.all.BaseQueryController;
import com.terra.common.entity.all.HttpStatus;
import com.terra.common.entity.all.ResponseMsg;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/ExportController.java b/se-system/src/main/java/com/terra/system/controller/show/ExportController.java
index 9332a92..bc8547b 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/ExportController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/ExportController.java
@@ -1,14 +1,14 @@
package com.terra.system.controller.show;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.HttpStatus;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.show.ExportEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.service.data.DownloadService;
import com.terra.system.service.show.ExportService;
import com.terra.system.service.sys.DownlogService;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/InquiryController.java b/se-system/src/main/java/com/terra/system/controller/show/InquiryController.java
index dc5872b..a487792 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/InquiryController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/InquiryController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.show;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.system.controller.all.BaseQueryController;
import com.terra.common.entity.all.HttpStatus;
import com.terra.common.entity.all.ResponseMsg;
@@ -12,8 +12,8 @@
import com.terra.system.entity.data.PublishEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.AesHelper;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.service.all.BaseUploadService;
import com.terra.system.service.data.DownloadService;
import com.terra.system.service.data.PublishService;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/MarkController.java b/se-system/src/main/java/com/terra/system/controller/show/MarkController.java
index 83e160a..30935ab 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/MarkController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/MarkController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.show;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.show.MarkEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/ModelController.java b/se-system/src/main/java/com/terra/system/controller/show/ModelController.java
index 5a864b5..4abbf4a 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/ModelController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/ModelController.java
@@ -1,11 +1,11 @@
package com.terra.system.controller.show;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.show.ModelEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.show.ModelService;
import com.terra.system.service.sys.TokenService;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/ArgsController.java b/se-system/src/main/java/com/terra/system/controller/sys/ArgsController.java
index 5e0e21f..fa382e8 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/ArgsController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/ArgsController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.ArgsEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/AuthController.java b/se-system/src/main/java/com/terra/system/controller/sys/AuthController.java
index 2423f8c..50fbc6b 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/AuthController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/AuthController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.AuthEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/BlacklistController.java b/se-system/src/main/java/com/terra/system/controller/sys/BlacklistController.java
index 5709918..3d1f26b 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/BlacklistController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/BlacklistController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.BlacklistEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/CtrlController.java b/se-system/src/main/java/com/terra/system/controller/sys/CtrlController.java
index fc7ae02..c6478f7 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/CtrlController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/CtrlController.java
@@ -1,7 +1,7 @@
package com.terra.system.controller.sys;
import com.alibaba.fastjson.JSONObject;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.ResEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/DepController.java b/se-system/src/main/java/com/terra/system/controller/sys/DepController.java
index 21283bd..e9ee5be 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/DepController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/DepController.java
@@ -1,11 +1,11 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.DepEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.sys.DepService;
import com.terra.system.service.sys.TokenService;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/DownlogController.java b/se-system/src/main/java/com/terra/system/controller/sys/DownlogController.java
index 435f4c5..7e7b55c 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/DownlogController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/DownlogController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.DownlogEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/LayerController.java b/se-system/src/main/java/com/terra/system/controller/sys/LayerController.java
index 048d2b4..ba6b9e5 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/LayerController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/LayerController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.LayerEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/LoginController.java b/se-system/src/main/java/com/terra/system/controller/sys/LoginController.java
index 333acc8..5f32e2b 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/LoginController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/LoginController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.LoginEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/MenuAuthController.java b/se-system/src/main/java/com/terra/system/controller/sys/MenuAuthController.java
index f7261dd..8400b24 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/MenuAuthController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/MenuAuthController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.MenuAuthEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/MenuController.java b/se-system/src/main/java/com/terra/system/controller/sys/MenuController.java
index 3103be0..7a2e1cf 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/MenuController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/MenuController.java
@@ -1,11 +1,11 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.MenuEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.all.PermsService;
import com.terra.system.service.sys.MenuService;
import com.terra.system.service.sys.TokenService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/OperateController.java b/se-system/src/main/java/com/terra/system/controller/sys/OperateController.java
index 4985f12..5e9c073 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/OperateController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/OperateController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.OperateEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/ReportController.java b/se-system/src/main/java/com/terra/system/controller/sys/ReportController.java
index 85cc709..95b0989 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/ReportController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/ReportController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.ReportEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/ResController.java b/se-system/src/main/java/com/terra/system/controller/sys/ResController.java
index 5be6326..0b8c193 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/ResController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/ResController.java
@@ -1,11 +1,11 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.ResEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.all.PermsService;
import com.terra.system.service.all.UploadAttachService;
import com.terra.system.service.sys.ResService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/ResLogController.java b/se-system/src/main/java/com/terra/system/controller/sys/ResLogController.java
index e3cede2..7196e39 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/ResLogController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/ResLogController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.ResLogEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/ResOpController.java b/se-system/src/main/java/com/terra/system/controller/sys/ResOpController.java
index 6661b21..183af79 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/ResOpController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/ResOpController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.ResOpEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/RoleController.java b/se-system/src/main/java/com/terra/system/controller/sys/RoleController.java
index 6432291..7ac96cb 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/RoleController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/RoleController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.RoleEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/RoleLayerController.java b/se-system/src/main/java/com/terra/system/controller/sys/RoleLayerController.java
index 9ea17b5..99f79c5 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/RoleLayerController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/RoleLayerController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.RoleLayerEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/RoleMenuAuthController.java b/se-system/src/main/java/com/terra/system/controller/sys/RoleMenuAuthController.java
index b132a27..fe33a5a 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/RoleMenuAuthController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/RoleMenuAuthController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.RoleMenuAuthEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/RoleResController.java b/se-system/src/main/java/com/terra/system/controller/sys/RoleResController.java
index a2db062..40705f9 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/RoleResController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/RoleResController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.RoleResEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/RoleUserController.java b/se-system/src/main/java/com/terra/system/controller/sys/RoleUserController.java
index cfc6721..3009eb8 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/RoleUserController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/RoleUserController.java
@@ -1,6 +1,6 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.RoleUserEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/TokenController.java b/se-system/src/main/java/com/terra/system/controller/sys/TokenController.java
index 9f887cf..93f97b0 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/TokenController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/TokenController.java
@@ -1,13 +1,13 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
-import com.terra.system.entity.all.SettingData;
+import com.terra.common.entity.all.SettingData;
import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.sys.TokenEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.sys.TokenService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/UserController.java b/se-system/src/main/java/com/terra/system/controller/sys/UserController.java
index d422ed9..3075a67 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/UserController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/UserController.java
@@ -1,12 +1,12 @@
package com.terra.system.controller.sys;
-import com.terra.system.annotation.SysLog;
+import com.terra.common.annotation.SysLog;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.ctrl.UserUpdateEntity;
import com.terra.system.entity.sys.RoleEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.sys.TokenService;
import com.terra.system.service.sys.UserService;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/se-system/src/main/java/com/terra/system/entity/ctrl/RegisterEntity.java b/se-system/src/main/java/com/terra/system/entity/ctrl/RegisterEntity.java
index e774bf6..e2a6916 100644
--- a/se-system/src/main/java/com/terra/system/entity/ctrl/RegisterEntity.java
+++ b/se-system/src/main/java/com/terra/system/entity/ctrl/RegisterEntity.java
@@ -1,6 +1,6 @@
package com.terra.system.entity.ctrl;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import java.util.ArrayList;
import java.util.List;
diff --git a/se-system/src/main/java/com/terra/system/helper/AesHelper.java b/se-system/src/main/java/com/terra/system/helper/AesHelper.java
index dfd296b..3f1385f 100644
--- a/se-system/src/main/java/com/terra/system/helper/AesHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/AesHelper.java
@@ -1,5 +1,7 @@
package com.terra.system.helper;
+import com.terra.common.helper.StringHelper;
+
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
import java.util.Base64;
diff --git a/se-system/src/main/java/com/terra/system/helper/ClassHelper.java b/se-system/src/main/java/com/terra/system/helper/ClassHelper.java
index b93ea13..70a47f7 100644
--- a/se-system/src/main/java/com/terra/system/helper/ClassHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/ClassHelper.java
@@ -1,6 +1,7 @@
package com.terra.system.helper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.all.BasicMapper;
import com.terra.system.mapper.all.GeomBaseMapper;
import org.apache.commons.logging.Log;
diff --git a/se-system/src/main/java/com/terra/system/helper/EnumHelper.java b/se-system/src/main/java/com/terra/system/helper/EnumHelper.java
index 3f95bf1..ada06c6 100644
--- a/se-system/src/main/java/com/terra/system/helper/EnumHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/EnumHelper.java
@@ -1,5 +1,6 @@
package com.terra.system.helper;
+import com.terra.common.helper.StringHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/se-system/src/main/java/com/terra/system/helper/ExcelHelper.java b/se-system/src/main/java/com/terra/system/helper/ExcelHelper.java
index d57b752..729f25b 100644
--- a/se-system/src/main/java/com/terra/system/helper/ExcelHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/ExcelHelper.java
@@ -10,6 +10,7 @@
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.metadata.fill.FillConfig;
import com.alibaba.excel.write.metadata.fill.FillWrapper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.annotation.ExcelHead;
import java.util.ArrayList;
diff --git a/se-system/src/main/java/com/terra/system/helper/GdalHelper.java b/se-system/src/main/java/com/terra/system/helper/GdalHelper.java
index 0e83042..eefac02 100644
--- a/se-system/src/main/java/com/terra/system/helper/GdalHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/GdalHelper.java
@@ -1,5 +1,6 @@
package com.terra.system.helper;
+import com.terra.common.helper.StringHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.gdal.gdal.Band;
diff --git a/se-system/src/main/java/com/terra/system/helper/GdbHelper.java b/se-system/src/main/java/com/terra/system/helper/GdbHelper.java
index 66571ea..3ab56af 100644
--- a/se-system/src/main/java/com/terra/system/helper/GdbHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/GdbHelper.java
@@ -1,5 +1,6 @@
package com.terra.system.helper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.entity.all.BaseGeoEntity;
import com.terra.common.entity.all.StaticData;
import com.terra.system.mapper.all.BasicMapper;
diff --git a/se-system/src/main/java/com/terra/system/helper/HttpHelper.java b/se-system/src/main/java/com/terra/system/helper/HttpHelper.java
index b7f8802..b73f3b6 100644
--- a/se-system/src/main/java/com/terra/system/helper/HttpHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/HttpHelper.java
@@ -1,5 +1,6 @@
package com.terra.system.helper;
+import com.terra.common.helper.StringHelper;
import org.apache.http.*;
import org.apache.http.client.config.CookieSpecs;
import org.apache.http.client.config.RequestConfig;
diff --git a/se-system/src/main/java/com/terra/system/helper/PathHelper.java b/se-system/src/main/java/com/terra/system/helper/PathHelper.java
index fdef8ec..279d476 100644
--- a/se-system/src/main/java/com/terra/system/helper/PathHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/PathHelper.java
@@ -1,7 +1,9 @@
package com.terra.system.helper;
+import com.terra.common.helper.FileHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.config.PropertiesConfig;
-import com.terra.system.entity.all.SettingData;
+import com.terra.common.entity.all.SettingData;
import com.terra.common.entity.all.StaticData;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/se-system/src/main/java/com/terra/system/helper/Zip4jHelper.java b/se-system/src/main/java/com/terra/system/helper/Zip4jHelper.java
index e82be60..082c3d0 100644
--- a/se-system/src/main/java/com/terra/system/helper/Zip4jHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/Zip4jHelper.java
@@ -1,5 +1,6 @@
package com.terra.system.helper;
+import com.terra.common.helper.StringHelper;
import net.lingala.zip4j.ZipFile;
import net.lingala.zip4j.exception.ZipException;
import net.lingala.zip4j.model.ZipParameters;
diff --git a/se-system/src/main/java/com/terra/system/interceptor/AuthInterceptor.java b/se-system/src/main/java/com/terra/system/interceptor/AuthInterceptor.java
index aef7f3f..49d2e73 100644
--- a/se-system/src/main/java/com/terra/system/interceptor/AuthInterceptor.java
+++ b/se-system/src/main/java/com/terra/system/interceptor/AuthInterceptor.java
@@ -6,8 +6,8 @@
import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.sys.TokenEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.service.all.SysService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java b/se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java
index f29d754..34ad010 100644
--- a/se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java
@@ -12,7 +12,7 @@
import com.terra.system.entity.sys.AttachEntity;
import com.terra.system.helper.AesHelper;
import com.terra.system.helper.ClassHelper;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.all.BaseQueryMapper;
import com.terra.system.mapper.all.BasicMapper;
import com.terra.system.mapper.all.GeomBaseMapper;
diff --git a/se-system/src/main/java/com/terra/system/service/all/BaseUploadService.java b/se-system/src/main/java/com/terra/system/service/all/BaseUploadService.java
index e16037e..7e39aeb 100644
--- a/se-system/src/main/java/com/terra/system/service/all/BaseUploadService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/BaseUploadService.java
@@ -1,6 +1,9 @@
package com.terra.system.service.all;
import com.terra.common.entity.all.StaticData;
+import com.terra.common.helper.FileHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.entity.data.DirEntity;
import com.terra.system.entity.data.MetaFileEntity;
import com.terra.system.entity.data.VerEntity;
@@ -108,7 +111,7 @@
Iterator<String> iterator = req.getFileNames();
while (iterator.hasNext()) {
MultipartFile file = req.getFile(iterator.next());
- if (null == file || StringHelper.isEmpty(file.getOriginalFilename())) {
+ if (StringHelper.isEmpty(file.getOriginalFilename())) {
continue;
}
diff --git a/se-system/src/main/java/com/terra/system/service/all/CommonsFileuploadService.java b/se-system/src/main/java/com/terra/system/service/all/CommonsFileuploadService.java
index c83db16..ab69dc0 100644
--- a/se-system/src/main/java/com/terra/system/service/all/CommonsFileuploadService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/CommonsFileuploadService.java
@@ -2,7 +2,7 @@
import com.terra.system.entity.ctrl.FileInfoEntity;
import com.terra.system.helper.PathHelper;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
diff --git a/se-system/src/main/java/com/terra/system/service/all/PermsService.java b/se-system/src/main/java/com/terra/system/service/all/PermsService.java
index 40d8ed1..c36870d 100644
--- a/se-system/src/main/java/com/terra/system/service/all/PermsService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/PermsService.java
@@ -1,5 +1,6 @@
package com.terra.system.service.all;
+import com.terra.common.entity.all.SettingData;
import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.all.*;
import com.terra.system.entity.sys.MenuEntity;
@@ -16,6 +17,7 @@
* @author WWW
*/
@Service
+@SuppressWarnings("ALL")
public class PermsService implements PermsMapper {
@Resource
PermsMapper permsMapper;
diff --git a/se-system/src/main/java/com/terra/system/service/all/RedisService.java b/se-system/src/main/java/com/terra/system/service/all/RedisService.java
index b1646a0..5f0fd82 100644
--- a/se-system/src/main/java/com/terra/system/service/all/RedisService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/RedisService.java
@@ -1,6 +1,6 @@
package com.terra.system.service.all;
-import com.terra.system.entity.all.SettingData;
+import com.terra.common.entity.all.SettingData;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/all/ScheduleService.java b/se-system/src/main/java/com/terra/system/service/all/ScheduleService.java
index 9b42f70..5ad53f1 100644
--- a/se-system/src/main/java/com/terra/system/service/all/ScheduleService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/ScheduleService.java
@@ -6,8 +6,8 @@
import com.terra.system.entity.sys.OperateEntity;
import com.terra.system.entity.sys.ResEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.FileHelper;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.FileHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.sys.LoginService;
import com.terra.system.service.sys.OperateService;
import com.terra.system.service.sys.ResService;
diff --git a/se-system/src/main/java/com/terra/system/service/all/SignService.java b/se-system/src/main/java/com/terra/system/service/all/SignService.java
index e0ec3f9..28677e9 100644
--- a/se-system/src/main/java/com/terra/system/service/all/SignService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/SignService.java
@@ -2,7 +2,7 @@
import com.terra.system.config.PropertiesConfig;
import com.terra.common.entity.all.StaticData;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.WebHelper;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
diff --git a/se-system/src/main/java/com/terra/system/service/all/TestService.java b/se-system/src/main/java/com/terra/system/service/all/TestService.java
index 3a1eaef..25a043b 100644
--- a/se-system/src/main/java/com/terra/system/service/all/TestService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/TestService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.terra.common.helper.FileHelper;
import com.terra.system.entity.all.MenusAuthEntity;
import com.terra.system.entity.all.PermsAuthEntity;
import com.terra.system.entity.all.ResAuthEntity;
@@ -240,7 +241,7 @@
stime = System.currentTimeMillis();
// 2a0befb05146cd30213ee4b95038aca0
- String md52 = FileHelper.getMd5ByJdk(file);
+ //String md52 = FileHelper.getMd5ByJdk(file);
etime = System.currentTimeMillis();
String s2 = String.format("鎵ц鏃堕暱锛�%d 姣.", (etime - stime));
diff --git a/se-system/src/main/java/com/terra/system/service/all/UploadAttachService.java b/se-system/src/main/java/com/terra/system/service/all/UploadAttachService.java
index be06d07..7038228 100644
--- a/se-system/src/main/java/com/terra/system/service/all/UploadAttachService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/UploadAttachService.java
@@ -3,7 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.terra.common.controller.all.BaseController;
import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.SettingData;
import com.terra.common.entity.all.StaticData;
+import com.terra.common.helper.FileHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.entity.all.*;
import com.terra.system.entity.ctrl.KeyValueEntity;
import com.terra.system.entity.data.DownloadEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/data/DataQueryService.java b/se-system/src/main/java/com/terra/system/service/data/DataQueryService.java
index 5fd8dd9..c432c5b 100644
--- a/se-system/src/main/java/com/terra/system/service/data/DataQueryService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/DataQueryService.java
@@ -1,9 +1,9 @@
package com.terra.system.service.data;
-import com.terra.system.entity.all.SettingData;
+import com.terra.common.entity.all.SettingData;
import com.terra.system.entity.sys.AttachEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.FileHelper;
+import com.terra.common.helper.FileHelper;
import com.terra.system.helper.PathHelper;
import com.terra.system.service.sys.AttachService;
import javax.annotation.Resource;
diff --git a/se-system/src/main/java/com/terra/system/service/data/DictService.java b/se-system/src/main/java/com/terra/system/service/data/DictService.java
index 8c83424..075322a 100644
--- a/se-system/src/main/java/com/terra/system/service/data/DictService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/DictService.java
@@ -2,7 +2,7 @@
import com.terra.system.entity.ctrl.TabEntity;
import com.terra.system.entity.data.DictEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.data.DictMapper;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/data/DirService.java b/se-system/src/main/java/com/terra/system/service/data/DirService.java
index 329cbb0..cbc4685 100644
--- a/se-system/src/main/java/com/terra/system/service/data/DirService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/DirService.java
@@ -3,7 +3,7 @@
import com.terra.system.entity.all.RedisCacheKey;
import com.terra.system.entity.data.DirEntity;
import com.terra.system.helper.PathHelper;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.helper.Zip4jHelper;
import com.terra.system.mapper.data.DirMapper;
import com.terra.system.service.all.RedisService;
diff --git a/se-system/src/main/java/com/terra/system/service/data/DomainService.java b/se-system/src/main/java/com/terra/system/service/data/DomainService.java
index 7af502e..df5ecd8 100644
--- a/se-system/src/main/java/com/terra/system/service/data/DomainService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/DomainService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.data;
import com.terra.system.entity.data.DomainEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.data.DomainMapper;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/data/DownloadService.java b/se-system/src/main/java/com/terra/system/service/data/DownloadService.java
index dde6899..ac21770 100644
--- a/se-system/src/main/java/com/terra/system/service/data/DownloadService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/DownloadService.java
@@ -1,7 +1,9 @@
package com.terra.system.service.data;
+import com.terra.common.helper.StringHelper;
import com.terra.system.entity.all.AbstractPwdEntity;
import com.terra.system.entity.data.DownloadEntity;
+import com.terra.system.entity.data.MetaFileEntity;
import com.terra.system.entity.show.PipelineEntity;
import com.terra.system.helper.*;
import com.terra.system.mapper.data.DownloadMapper;
@@ -168,4 +170,20 @@
return null;
}
}
+
+ /**
+ * 鍒犻櫎鏂囦欢
+ */
+ public static void deleteFiles(List<MetaFileEntity> list) {
+ try {
+ for (MetaFileEntity mf : list) {
+ File f = new File(mf.getPath());
+ if (f.exists()) {
+ f.delete();
+ }
+ }
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
}
diff --git a/se-system/src/main/java/com/terra/system/service/data/FmeService.java b/se-system/src/main/java/com/terra/system/service/data/FmeService.java
index 748974c..2b248e2 100644
--- a/se-system/src/main/java/com/terra/system/service/data/FmeService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/FmeService.java
@@ -5,8 +5,8 @@
import com.terra.system.entity.ctrl.RegisterEntity;
import com.terra.system.entity.data.MetaFileEntity;
import com.terra.system.helper.RestHelper;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Value;
diff --git a/se-system/src/main/java/com/terra/system/service/data/MetaService.java b/se-system/src/main/java/com/terra/system/service/data/MetaService.java
index fcafc7d..66b6704 100644
--- a/se-system/src/main/java/com/terra/system/service/data/MetaService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/MetaService.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.terra.common.entity.all.StaticData;
+import com.terra.common.helper.FileHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.entity.ctrl.DownloadReqEntity;
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.data.MetaEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/data/PublishService.java b/se-system/src/main/java/com/terra/system/service/data/PublishService.java
index eb1d05c..4abf713 100644
--- a/se-system/src/main/java/com/terra/system/service/data/PublishService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/PublishService.java
@@ -10,8 +10,8 @@
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.PathHelper;
import com.terra.system.helper.RestHelper;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.mapper.data.PublishMapper;
import com.terra.system.service.sys.TokenService;
import org.apache.commons.logging.Log;
diff --git a/se-system/src/main/java/com/terra/system/service/data/RasterService.java b/se-system/src/main/java/com/terra/system/service/data/RasterService.java
index 51709b7..a7196e1 100644
--- a/se-system/src/main/java/com/terra/system/service/data/RasterService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/RasterService.java
@@ -1,8 +1,8 @@
package com.terra.system.service.data;
import com.terra.common.entity.all.StaticData;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.gdal.gdal.Dataset;
diff --git a/se-system/src/main/java/com/terra/system/service/data/StyleService.java b/se-system/src/main/java/com/terra/system/service/data/StyleService.java
index c73ccec..be78561 100644
--- a/se-system/src/main/java/com/terra/system/service/data/StyleService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/StyleService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.data;
import com.terra.system.entity.data.StyleEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.data.StyleMapper;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/data/TaskService.java b/se-system/src/main/java/com/terra/system/service/data/TaskService.java
index 56e4a89..adadb41 100644
--- a/se-system/src/main/java/com/terra/system/service/data/TaskService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/TaskService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.data;
import com.terra.system.entity.data.TaskEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.data.TaskMapper;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/data/UploadService.java b/se-system/src/main/java/com/terra/system/service/data/UploadService.java
index 8897c30..feb1550 100644
--- a/se-system/src/main/java/com/terra/system/service/data/UploadService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/UploadService.java
@@ -1,6 +1,9 @@
package com.terra.system.service.data;
import cn.hutool.core.collection.ListUtil;
+import com.terra.common.helper.FileHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.entity.all.BaseEntity;
import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.data.*;
diff --git a/se-system/src/main/java/com/terra/system/service/data/VerService.java b/se-system/src/main/java/com/terra/system/service/data/VerService.java
index 509e953..42c6d73 100644
--- a/se-system/src/main/java/com/terra/system/service/data/VerService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/VerService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.data;
import com.terra.system.entity.data.VerEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.data.VerMapper;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/show/ApplyService.java b/se-system/src/main/java/com/terra/system/service/show/ApplyService.java
index a4d1579..cc542a4 100644
--- a/se-system/src/main/java/com/terra/system/service/show/ApplyService.java
+++ b/se-system/src/main/java/com/terra/system/service/show/ApplyService.java
@@ -7,7 +7,7 @@
import com.terra.system.entity.show.FlowEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.AesHelper;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.show.ApplyMapper;
import com.terra.system.service.data.MetaService;
import com.terra.system.service.sys.UserService;
diff --git a/se-system/src/main/java/com/terra/system/service/show/CadService.java b/se-system/src/main/java/com/terra/system/service/show/CadService.java
index eb7d4b5..23db41c 100644
--- a/se-system/src/main/java/com/terra/system/service/show/CadService.java
+++ b/se-system/src/main/java/com/terra/system/service/show/CadService.java
@@ -4,14 +4,13 @@
import com.terra.system.entity.data.MetaEntity;
import com.terra.system.entity.sys.AttachEntity;
import com.terra.system.helper.PathHelper;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.data.MetaService;
import com.terra.system.service.sys.AttachService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.io.*;
@@ -74,7 +73,7 @@
private String getFilePath(int id, Boolean isAttach) {
if (null == isAttach || !isAttach) {
MetaEntity me = metaService.selectById(id);
- if (null == me || StringUtils.isEmpty(me.getPath()) || !StaticData.DWG.equals(me.getType())) {
+ if (null == me || StringHelper.isEmpty(me.getPath()) || !StaticData.DWG.equals(me.getType())) {
return null;
}
@@ -82,7 +81,7 @@
}
AttachEntity ae = attachService.selectById(id);
- if (null == ae || StringUtils.isEmpty(ae.getPath()) || !ae.getPath().toLowerCase().contains(StaticData.DWG)) {
+ if (null == ae || StringHelper.isEmpty(ae.getPath()) || !ae.getPath().toLowerCase().contains(StaticData.DWG)) {
return null;
}
diff --git a/se-system/src/main/java/com/terra/system/service/show/DataLibService.java b/se-system/src/main/java/com/terra/system/service/show/DataLibService.java
index a7df6b2..fe4357f 100644
--- a/se-system/src/main/java/com/terra/system/service/show/DataLibService.java
+++ b/se-system/src/main/java/com/terra/system/service/show/DataLibService.java
@@ -1,6 +1,8 @@
package com.terra.system.service.show;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.terra.common.helper.FileHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.entity.ctrl.DownloadReqEntity;
import com.terra.system.entity.ctrl.KeyValueEntity;
import com.terra.system.entity.data.DownloadEntity;
@@ -18,7 +20,6 @@
import org.apache.commons.logging.LogFactory;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
import java.io.File;
import java.util.*;
@@ -395,11 +396,11 @@
* 鏍规嵁璧勬枡绫诲埆鑾峰彇鐩綍缂栫爜
*/
public String getDirsByTypes(String types, String dirs, String field) {
- if (StringUtils.isEmpty(types) && StringUtils.isEmpty(dirs)) {
+ if (StringHelper.isEmpty(types) && StringHelper.isEmpty(dirs)) {
return null;
}
- if (!StringUtils.isEmpty(types)) {
+ if (!StringHelper.isEmpty(types)) {
List<KeyValueEntity> list = baseQueryService.selectDirsByTypes(types.split(","), copeCodes(dirs, "code"));
if (null == list || list.isEmpty()) {
return "1 = 2";
diff --git a/se-system/src/main/java/com/terra/system/service/show/ExportService.java b/se-system/src/main/java/com/terra/system/service/show/ExportService.java
index e606303..daee12f 100644
--- a/se-system/src/main/java/com/terra/system/service/show/ExportService.java
+++ b/se-system/src/main/java/com/terra/system/service/show/ExportService.java
@@ -6,10 +6,10 @@
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.show.ExportEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.FileHelper;
+import com.terra.common.helper.FileHelper;
import com.terra.system.helper.PathHelper;
import com.terra.system.helper.RestHelper;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.service.data.DownloadService;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Value;
diff --git a/se-system/src/main/java/com/terra/system/service/show/InquiryService.java b/se-system/src/main/java/com/terra/system/service/show/InquiryService.java
index dd5a947..f33e853 100644
--- a/se-system/src/main/java/com/terra/system/service/show/InquiryService.java
+++ b/se-system/src/main/java/com/terra/system/service/show/InquiryService.java
@@ -1,6 +1,8 @@
package com.terra.system.service.show;
import com.terra.common.entity.all.StaticData;
+import com.terra.common.helper.FileHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.entity.ctrl.DownloadTileEntity;
import com.terra.system.entity.ctrl.ShpRecordEntity;
import com.terra.system.entity.data.DownloadEntity;
@@ -56,7 +58,7 @@
}
ShpRecordEntity sr = ShpHelper.readShpFirstRecord(fileName);
- FileHelper.deleteFiles(list);
+ DownloadService.deleteFiles(list);
return sr;
}
diff --git a/se-system/src/main/java/com/terra/system/service/show/MarkService.java b/se-system/src/main/java/com/terra/system/service/show/MarkService.java
index 4d2fbc4..fc4750f 100644
--- a/se-system/src/main/java/com/terra/system/service/show/MarkService.java
+++ b/se-system/src/main/java/com/terra/system/service/show/MarkService.java
@@ -1,6 +1,8 @@
package com.terra.system.service.show;
import com.terra.common.entity.all.StaticData;
+import com.terra.common.helper.FileHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.entity.ctrl.MarkJsonEntity;
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.data.MetaFileEntity;
@@ -10,6 +12,10 @@
import com.terra.system.mapper.show.MarkMapper;
import com.terra.system.service.data.DownloadService;
import javax.annotation.Resource;
+
+import com.terra.system.service.sys.UserService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.springframework.stereotype.Service;
import java.io.File;
@@ -31,6 +37,8 @@
@Resource
DownloadService downloadService;
+
+ private final static Log log = LogFactory.getLog(MarkService.class);
@Override
public Integer selectCount(Integer uid) {
@@ -224,7 +232,7 @@
}
List<MarkJsonEntity> mjeList = ShpHelper.readShpForMarks(fileName);
- FileHelper.deleteFiles(list);
+ DownloadService.deleteFiles(list);
return mjeList;
}
diff --git a/se-system/src/main/java/com/terra/system/service/show/PipelineService.java b/se-system/src/main/java/com/terra/system/service/show/PipelineService.java
index 51edd4d..d63d936 100644
--- a/se-system/src/main/java/com/terra/system/service/show/PipelineService.java
+++ b/se-system/src/main/java/com/terra/system/service/show/PipelineService.java
@@ -1,6 +1,8 @@
package com.terra.system.service.show;
import com.terra.common.entity.all.StaticData;
+import com.terra.common.helper.FileHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.show.PipelineEntity;
import com.terra.system.entity.sys.UserEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/ArgsService.java b/se-system/src/main/java/com/terra/system/service/sys/ArgsService.java
index 355fa01..fed892c 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/ArgsService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/ArgsService.java
@@ -1,8 +1,8 @@
package com.terra.system.service.sys;
-import com.terra.system.entity.all.SettingData;
+import com.terra.common.entity.all.SettingData;
import com.terra.system.entity.sys.ArgsEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.sys.ArgsMapper;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/AttachService.java b/se-system/src/main/java/com/terra/system/service/sys/AttachService.java
index 799de41..27ec6df 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/AttachService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/AttachService.java
@@ -5,7 +5,7 @@
import com.terra.system.entity.data.FmeLogEntity;
import com.terra.system.entity.sys.AttachEntity;
import com.terra.system.helper.ClassHelper;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.all.BasicMapper;
import com.terra.system.mapper.sys.AttachMapper;
import com.terra.system.service.all.UploadAttachService;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/BlacklistService.java b/se-system/src/main/java/com/terra/system/service/sys/BlacklistService.java
index e02ba38..7577b40 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/BlacklistService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/BlacklistService.java
@@ -1,9 +1,9 @@
package com.terra.system.service.sys;
import com.terra.system.entity.all.RedisCacheKey;
-import com.terra.system.entity.all.SettingData;
+import com.terra.common.entity.all.SettingData;
import com.terra.system.entity.sys.BlacklistEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.sys.BlacklistMapper;
import com.terra.system.service.all.RedisService;
import javax.annotation.Resource;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/DownlogService.java b/se-system/src/main/java/com/terra/system/service/sys/DownlogService.java
index 8a9668d..af14671 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/DownlogService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/DownlogService.java
@@ -3,8 +3,8 @@
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.sys.DownlogEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.mapper.sys.DownlogMapper;
import com.terra.system.service.data.DownloadService;
import javax.annotation.Resource;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/LayerService.java b/se-system/src/main/java/com/terra/system/service/sys/LayerService.java
index 3c25a81..e927cad 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/LayerService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/LayerService.java
@@ -1,9 +1,9 @@
package com.terra.system.service.sys;
import com.terra.system.entity.all.RedisCacheKey;
-import com.terra.system.entity.all.SettingData;
+import com.terra.common.entity.all.SettingData;
import com.terra.system.entity.sys.LayerEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.sys.LayerMapper;
import com.terra.system.service.all.RedisService;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/LoginService.java b/se-system/src/main/java/com/terra/system/service/sys/LoginService.java
index 0fc1253..18a105f 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/LoginService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/LoginService.java
@@ -1,8 +1,8 @@
package com.terra.system.service.sys;
import com.terra.system.entity.sys.LoginEntity;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.mapper.sys.LoginMapper;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/OperateService.java b/se-system/src/main/java/com/terra/system/service/sys/OperateService.java
index 800c829..a3a8f1f 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/OperateService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/OperateService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.sys;
import com.terra.system.entity.sys.OperateEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.sys.OperateMapper;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/ReportService.java b/se-system/src/main/java/com/terra/system/service/sys/ReportService.java
index f7e40fc..b7ddc37 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/ReportService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/ReportService.java
@@ -1,5 +1,8 @@
package com.terra.system.service.sys;
+import com.terra.common.helper.FileHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.entity.all.RedisCacheKey;
import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.CoordinateEntity;
@@ -17,7 +20,6 @@
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -251,7 +253,7 @@
@Override
public List<CountEntity> countVariousDataByPrj(String code) {
- code = StringUtils.isEmpty(code) || "ALL".equals(code) ? null : StringHelper.getRightLike(code);
+ code = StringHelper.isEmpty(code) || "ALL".equals(code) ? null : StringHelper.getRightLike(code);
return reportMapper.countVariousDataByPrj(code);
}
@@ -434,7 +436,7 @@
Double allSize = 0d, allArea = 0d, allLen = 0d;
for (CountEntity ce : list) {
ce.setNo(rows++);
- if (StringUtils.isEmpty(ce.getM2())) {
+ if (StringHelper.isEmpty(ce.getM2())) {
ce.setM2(FileHelper.getSizes(ce.getSizes()));
}
ce.setM3(FileHelper.getSquareMeter(ce.getArea()));
@@ -448,7 +450,7 @@
ce.setNo(rows);
ce.setM1("鎬昏");
ce.setCount(allCount);
- if (StringUtils.isEmpty(list.get(0).getM2())) {
+ if (StringHelper.isEmpty(list.get(0).getM2())) {
ce.setM2(FileHelper.getSizes(allSize));
}
ce.setM3(FileHelper.getSquareMeter(allArea));
diff --git a/se-system/src/main/java/com/terra/system/service/sys/ResLogService.java b/se-system/src/main/java/com/terra/system/service/sys/ResLogService.java
index ceeb51b..f8722e7 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/ResLogService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/ResLogService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.sys;
import com.terra.system.entity.sys.ResLogEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.sys.ResLogMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/ResOpService.java b/se-system/src/main/java/com/terra/system/service/sys/ResOpService.java
index 2f7beef..ee1395f 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/ResOpService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/ResOpService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.sys;
import com.terra.system.entity.sys.ResOpEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.sys.ResOpMapper;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/ResService.java b/se-system/src/main/java/com/terra/system/service/sys/ResService.java
index e1c1a2b..98b29c9 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/ResService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/ResService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.sys;
import com.terra.system.entity.sys.ResEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.sys.ResMapper;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/RoleLayerService.java b/se-system/src/main/java/com/terra/system/service/sys/RoleLayerService.java
index f650fdd..8a8de60 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/RoleLayerService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/RoleLayerService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.sys;
import com.terra.system.entity.sys.RoleLayerEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.sys.RoleLayerMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/RoleService.java b/se-system/src/main/java/com/terra/system/service/sys/RoleService.java
index e031dd7..3bc898e 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/RoleService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/RoleService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.sys;
import com.terra.system.entity.sys.RoleEntity;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.sys.RoleMapper;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/TokenService.java b/se-system/src/main/java/com/terra/system/service/sys/TokenService.java
index 020bc3a..daeae24 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/TokenService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/TokenService.java
@@ -1,12 +1,12 @@
package com.terra.system.service.sys;
import com.terra.system.entity.all.RedisCacheKey;
-import com.terra.system.entity.all.SettingData;
+import com.terra.common.entity.all.SettingData;
import com.terra.system.entity.sys.LoginEntity;
import com.terra.system.entity.sys.TokenEntity;
import com.terra.system.entity.sys.UserEntity;
-import com.terra.system.helper.StringHelper;
-import com.terra.system.helper.WebHelper;
+import com.terra.common.helper.StringHelper;
+import com.terra.common.helper.WebHelper;
import com.terra.system.mapper.sys.TokenMapper;
import com.terra.system.mapper.sys.UserMapper;
import com.terra.system.service.all.RedisService;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/UserService.java b/se-system/src/main/java/com/terra/system/service/sys/UserService.java
index 5008b82..3d41c09 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/UserService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/UserService.java
@@ -4,7 +4,7 @@
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.Md5Helper;
import com.terra.system.helper.RsaHelper;
-import com.terra.system.helper.StringHelper;
+import com.terra.common.helper.StringHelper;
import com.terra.system.mapper.sys.UserMapper;
import com.terra.system.service.all.RedisService;
import org.apache.commons.logging.Log;
--
Gitblit v1.9.3