From 3eceb59d2e062d3ea65972849f1ae88bc8bf497b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 06 一月 2023 21:01:45 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/MarkController.java | 14 ++++++++------
1 files changed, 8 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 e6e7b2d..b12a1cf 100644
--- a/src/main/java/com/lf/server/controller/show/MarkController.java
+++ b/src/main/java/com/lf/server/controller/show/MarkController.java
@@ -7,7 +7,7 @@
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.data.MetaEntity;
import com.lf.server.entity.show.MarkEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
@@ -15,6 +15,7 @@
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;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -43,6 +44,9 @@
@Autowired
UploaderService uploaderService;
+
+ @Autowired
+ DownlogService downlogService;
@Autowired
DownloadService downloadService;
@@ -223,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, ue, req, res);
+ List<MetaEntity> meList = uploaderService.uploadData(null, null, req, res);
if (meList == null || meList.size() < StaticData.FOUR) {
return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
}
@@ -289,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