From 10c2e86f67ef4a992e5cdd4f8d28a5893b066e4d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 24 十二月 2022 12:38:22 +0800
Subject: [PATCH] 2022-12-24

---
 src/main/java/com/lf/server/controller/show/ExportController.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 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 2dea184..b74915e 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,6 +39,9 @@
     ExportService exportService;
 
     @Autowired
+    DownlogService downlogService;
+
+    @Autowired
     DownloadService downloadService;
 
     @SysLog()
@@ -59,11 +63,11 @@
                 return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
 
-            int count = downloadService.selectCountForExport(ue.getCreateUser(), name);
+            int count = downloadService.selectCountForUser(ue.getCreateUser(), 2, name);
             if (count == 0) {
                 return success(0, null);
             }
-            List<DownloadEntity> rs = downloadService.selectByPageForExport(ue.getCreateUser(), name, pageSize, pageSize * (pageIndex - 1));
+            List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getCreateUser(), 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