From 5573ab68a6bf98014e6948d0c5ab538a90ce0ada Mon Sep 17 00:00:00 2001
From: sws <15810472099@163.com>
Date: 星期六, 14 一月 2023 09:46:15 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/show/MarkController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

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 c5826b9..018c9e3 100644
--- a/src/main/java/com/lf/server/controller/show/MarkController.java
+++ b/src/main/java/com/lf/server/controller/show/MarkController.java
@@ -12,8 +12,8 @@
 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;
@@ -43,7 +43,7 @@
     TokenService tokenService;
 
     @Autowired
-    UploaderService uploaderService;
+    BaseUploadService baseUploadService;
 
     @Autowired
     DownlogService downlogService;
@@ -227,14 +227,14 @@
     @ApiOperation(value = "涓婁紶ShapeFile鏂囦欢")
     @ResponseBody
     @PostMapping(value = "/uploadShp", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<List<MarkJsonEntity>> uploadShp(HttpServletRequest req, HttpServletResponse res) {
+    public ResponseMsg<Object> uploadShp(HttpServletRequest req, HttpServletResponse res) {
         try {
             UserEntity ue = tokenService.getCurrentUser(req);
             if (ue == null) {
                 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);
             }

--
Gitblit v1.9.3