From 79454ce9fbb025d35b7b28144bc9306cf9e546e3 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 25 二月 2023 15:24:33 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/ExportController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/ExportController.java b/src/main/java/com/lf/server/controller/show/ExportController.java
index 46fec9c..38340bc 100644
--- a/src/main/java/com/lf/server/controller/show/ExportController.java
+++ b/src/main/java/com/lf/server/controller/show/ExportController.java
@@ -11,6 +11,7 @@
import com.lf.server.helper.WebHelper;
import com.lf.server.service.data.DownloadService;
import com.lf.server.service.show.ExportService;
+import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -38,17 +39,20 @@
ExportService exportService;
@Autowired
+ DownlogService downlogService;
+
+ @Autowired
DownloadService downloadService;
@SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ")
+ @ApiOperation(value = "鍒嗛〉鏌ヨ涓嬭浇鏂囦欢")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPage")
- public ResponseMsg<List<DownloadEntity>> selectByPage(String name, Integer pageSize, Integer pageIndex, HttpServletRequest req) {
+ public ResponseMsg<List<DownloadEntity>> selectPageCountForDownload(String name, Integer pageSize, Integer pageIndex, HttpServletRequest req) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
@@ -59,11 +63,11 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- int count = downloadService.selectCountForUser(ue.getCreateUser(), 2, name);
+ int count = downloadService.selectCountForUser(ue.getId(), 2, name);
if (count == 0) {
return success(0, null);
}
- List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getCreateUser(), 2, name, pageSize, pageSize * (pageIndex - 1));
+ List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), 2, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -117,16 +121,14 @@
return;
}
- UserEntity ue = tokenService.getCurrentUser(req);
DownloadEntity de = downloadService.selectByGuid(guid);
if (null == de) {
WebHelper.writeInfo(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�", res);
return;
}
- de.setDcount(de.getDcount() + 1);
- de.setDownloadUser(ue.getId());
- int rows = downloadService.update(de);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ downlogService.updateInfos(ue, de, req);
String filePath = downloadService.getDownloadFilePath(de);
WebHelper.download(filePath, de.getName(), res);
--
Gitblit v1.9.3