From 502eb2ab0fbd44f230171021ed9d644b5fc2f585 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 15:34:55 +0800
Subject: [PATCH] 1.8.4
---
/dev/null | 13 -------------
src/main/java/com/lf/server/controller/show/MarkController.java | 7 +++----
src/main/java/com/lf/server/controller/show/InquiryController.java | 7 +++----
src/main/java/com/lf/server/controller/show/LocateController.java | 4 ++--
src/main/java/com/lf/server/entity/all/StaticData.java | 2 +-
src/main/java/com/lf/server/service/data/UploadService.java | 4 ++--
src/main/java/com/lf/server/mapper/data/UploadMapper.java | 4 ++--
src/main/resources/mapper/data/UploadMapper.xml | 4 ++--
src/main/java/com/lf/server/controller/data/upload/QueryController.java | 3 +--
9 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/QueryController.java b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
index 0d7a3ff..0c4ffdc 100644
--- a/src/main/java/com/lf/server/controller/data/upload/QueryController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
@@ -7,7 +7,6 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
-import com.lf.server.entity.ctrl.IdNameEntity;
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.*;
import com.lf.server.entity.sys.DepEntity;
@@ -124,7 +123,7 @@
@GetMapping(value = "/selectProject")
public ResponseMsg<Object> selectProject() {
try {
- List<IdNameEntity> list = uploadService.selectProject();
+ List<DirEntity> list = uploadService.selectProject();
return success(list);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/controller/show/InquiryController.java b/src/main/java/com/lf/server/controller/show/InquiryController.java
index b7992b8..470bb15 100644
--- a/src/main/java/com/lf/server/controller/show/InquiryController.java
+++ b/src/main/java/com/lf/server/controller/show/InquiryController.java
@@ -5,12 +5,11 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.ShpRecordEntity;
-import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.StringHelper;
-import com.lf.server.service.data.UploaderService;
+import com.lf.server.service.all.BaseUploadService;
import com.lf.server.service.show.InquiryService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
@@ -34,7 +33,7 @@
TokenService tokenService;
@Autowired
- UploaderService uploaderService;
+ BaseUploadService baseUploadService;
@Autowired
InquiryService inquiryService;
@@ -50,7 +49,7 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- List<MetaFileEntity> list = uploaderService.uploadData(null, null, req, res);
+ List<MetaFileEntity> list = baseUploadService.uploadData(null, null, req, res);
if (list == null || list.size() < StaticData.FOUR) {
return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
}
diff --git a/src/main/java/com/lf/server/controller/show/LocateController.java b/src/main/java/com/lf/server/controller/show/LocateController.java
index d9c7e59..a458f75 100644
--- a/src/main/java/com/lf/server/controller/show/LocateController.java
+++ b/src/main/java/com/lf/server/controller/show/LocateController.java
@@ -5,7 +5,7 @@
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.bd.DlgagnpEntity;
-import com.lf.server.service.data.UploaderService;
+import com.lf.server.service.data.UploadService;
import com.lf.server.service.show.LocateService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
@@ -29,7 +29,7 @@
TokenService tokenService;
@Autowired
- UploaderService uploaderService;
+ UploadService uploaderService;
@Autowired
LocateService locateService;
diff --git a/src/main/java/com/lf/server/controller/show/MarkController.java b/src/main/java/com/lf/server/controller/show/MarkController.java
index 64b8067..018c9e3 100644
--- a/src/main/java/com/lf/server/controller/show/MarkController.java
+++ b/src/main/java/com/lf/server/controller/show/MarkController.java
@@ -7,14 +7,13 @@
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.MarkJsonEntity;
import com.lf.server.entity.data.DownloadEntity;
-import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.show.MarkEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
+import com.lf.server.service.all.BaseUploadService;
import com.lf.server.service.data.DownloadService;
-import com.lf.server.service.data.UploaderService;
import com.lf.server.service.show.MarkService;
import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
@@ -44,7 +43,7 @@
TokenService tokenService;
@Autowired
- UploaderService uploaderService;
+ BaseUploadService baseUploadService;
@Autowired
DownlogService downlogService;
@@ -235,7 +234,7 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- List<MetaFileEntity> meList = uploaderService.uploadData(null, null, req, res);
+ List<MetaFileEntity> meList = baseUploadService.uploadData(null, null, req, res);
if (meList == null || meList.size() < StaticData.FOUR) {
return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
}
diff --git a/src/main/java/com/lf/server/entity/all/StaticData.java b/src/main/java/com/lf/server/entity/all/StaticData.java
index 2c16dd2..084d1d2 100644
--- a/src/main/java/com/lf/server/entity/all/StaticData.java
+++ b/src/main/java/com/lf/server/entity/all/StaticData.java
@@ -127,7 +127,7 @@
/**
* 鎵�鏈夋枃浠舵墿灞曞悕
*/
- public final static List<String> ALL_EXTENSION = new ArrayList<>(Arrays.asList(".txt", ".xml", ".pdf", ".xls", ".xlsx", ".doc", ".docx", ".ppt", ".pptx", ".shp", ".gdb", ".mdb", ".dwg", ".las", ".laz", ".mpt", ".fly", ".efb", ".g3d", ".fbx", ".obj", ".3dm", ".3dml", ".osgb", ".rvt", ".ifc", ".jpg", ".png", ".img", ".tif", ".bmp", ".gif", ".rmvb", ".rm", ".mp3", ".mp4", ".avi", ".wma", ".7z", ".rar", ".zip"));
+ public final static List<String> ALL_EXTENSION = new ArrayList<>(Arrays.asList(".txt", ".xml", ".pdf", ".xls", ".xlsx", ".doc", ".docx", ".ppt", ".pptx", ".shp", ".gdb", ".mdb", ".dwg", ".las", ".laz", ".cpt", ".mpt", ".fly", ".efb", ".g3d", ".fbx", ".obj", ".3dm", ".3dml", ".osgb", ".rvt", ".ifc", ".jpg", ".png", ".img", ".tif", ".bmp", ".gif", ".rmvb", ".rm", ".mp3", ".mp4", ".avi", ".wma", ".wmv", ".7z", ".rar", ".zip"));
/**
* 鎻掑叆鎺掗櫎瀛楁
diff --git a/src/main/java/com/lf/server/mapper/data/UploadMapper.java b/src/main/java/com/lf/server/mapper/data/UploadMapper.java
index 47bf330..fc85f15 100644
--- a/src/main/java/com/lf/server/mapper/data/UploadMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/UploadMapper.java
@@ -1,7 +1,7 @@
package com.lf.server.mapper.data;
-import com.lf.server.entity.ctrl.IdNameEntity;
import com.lf.server.entity.data.CoordEntity;
+import com.lf.server.entity.data.DirEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -27,5 +27,5 @@
*
* @return
*/
- public List<IdNameEntity> selectProject();
+ public List<DirEntity> selectProject();
}
diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index f4f5377..eaa8f65 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -1,7 +1,7 @@
package com.lf.server.service.data;
-import com.lf.server.entity.ctrl.IdNameEntity;
import com.lf.server.entity.data.CoordEntity;
+import com.lf.server.entity.data.DirEntity;
import com.lf.server.mapper.data.UploadMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,7 +23,7 @@
}
@Override
- public List<IdNameEntity> selectProject() {
+ public List<DirEntity> selectProject() {
return uploadMapper.selectProject();
}
}
diff --git a/src/main/java/com/lf/server/service/data/UploaderService.java b/src/main/java/com/lf/server/service/data/UploaderService.java
deleted file mode 100644
index 627df6b..0000000
--- a/src/main/java/com/lf/server/service/data/UploaderService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.lf.server.service.data;
-
-import com.lf.server.service.all.BaseUploadService;
-import org.springframework.stereotype.Service;
-
-/**
- * 涓婁紶鏈嶅姟绫�
- * @author WWW
- */
-@Service
-public class UploaderService extends BaseUploadService {
- //
-}
diff --git a/src/main/resources/mapper/data/UploadMapper.xml b/src/main/resources/mapper/data/UploadMapper.xml
index 8e24d15..2898ff8 100644
--- a/src/main/resources/mapper/data/UploadMapper.xml
+++ b/src/main/resources/mapper/data/UploadMapper.xml
@@ -12,7 +12,7 @@
order by id
</select>
- <select id="selectProject" resultType="com.lf.server.entity.ctrl.IdNameEntity">
- select id, name from lf.sys_dir where pid = 0 and id > 1
+ <select id="selectProject" resultType="com.lf.server.entity.data.DirEntity">
+ select * from lf.sys_dir where pid = 0 and id > 1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3