From e016ff99f98cef6f607671cb656f9ebf0de0ea24 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 01 十一月 2022 17:01:09 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/MarkController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 0094e8e..cd42d22 100644
--- a/src/main/java/com/lf/server/controller/show/MarkController.java
+++ b/src/main/java/com/lf/server/controller/show/MarkController.java
@@ -4,13 +4,16 @@
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.HttpStatus;
import com.lf.server.entity.all.ResponseMsg;
+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.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.data.DownloadService;
+import com.lf.server.service.data.UploaderService;
import com.lf.server.service.show.MarkService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
@@ -37,6 +40,9 @@
@Autowired
TokenService tokenService;
+
+ @Autowired
+ UploaderService uploaderService;
@Autowired
DownloadService downloadService;
@@ -219,7 +225,17 @@
@PostMapping(value = "/uploadShp", produces = "application/json; charset=UTF-8")
public ResponseMsg<List<MarkJsonEntity>> uploadShp(HttpServletRequest req, HttpServletResponse res) {
try {
- List<MarkJsonEntity> list = null;
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
+
+ List<MetaFileEntity> meList = uploaderService.uploadData(null, ue, req, res);
+ if (meList == null || meList.size() < StaticData.FOUR) {
+ return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
+ }
+
+ List<MarkJsonEntity> list = markService.readShpForMarks(meList);
return success(list);
} catch (Exception ex) {
--
Gitblit v1.9.3