From 9bce48a9f30f7d80c43f43f46d40df20fcb00e15 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 03 二月 2023 09:39:59 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/MarkController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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..018c9e3 100644
--- a/src/main/java/com/lf/server/controller/show/MarkController.java
+++ b/src/main/java/com/lf/server/controller/show/MarkController.java
@@ -1,17 +1,21 @@
package com.lf.server.controller.show;
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
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.all.BaseUploadService;
import com.lf.server.service.data.DownloadService;
import com.lf.server.service.show.MarkService;
+import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -37,6 +41,12 @@
@Autowired
TokenService tokenService;
+
+ @Autowired
+ BaseUploadService baseUploadService;
+
+ @Autowired
+ DownlogService downlogService;
@Autowired
DownloadService downloadService;
@@ -217,9 +227,19 @@
@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 {
- List<MarkJsonEntity> list = null;
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
+
+ List<MetaFileEntity> meList = baseUploadService.uploadData(null, null, req, res);
+ if (meList == null || meList.size() < StaticData.FOUR) {
+ return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
+ }
+
+ List<MarkJsonEntity> list = markService.readShpForMarks(meList);
return success(list);
} catch (Exception ex) {
@@ -273,9 +293,7 @@
WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�"));
}
- de.setDcount(de.getDcount() + 1);
- de.setDownloadUser(ue.getId());
- int rows = downloadService.update(de);
+ downlogService.updateInfos(ue, de, req);
String filePath = markService.getDownloadFilePath(de);
WebHelper.download(filePath, de.getName(), res);
--
Gitblit v1.9.3