From 43863b3aa96e223fa3835245ad0d2c932bf63559 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 23 十二月 2022 16:21:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/MarkController.java | 8 ++-
src/main/java/com/lf/server/controller/data/MetaController.java | 8 ++-
data/db_fn.sql | 4 -
src/main/java/com/lf/server/service/sys/DownlogService.java | 24 ++++++++++++
src/main/java/com/lf/server/controller/show/ExportController.java | 10 +++--
src/main/java/com/lf/server/controller/show/DataLibController.java | 9 ++--
6 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/data/db_fn.sql b/data/db_fn.sql
index 1c4ac3b..291d22c 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -354,9 +354,7 @@
relnamespace in (29258) group by type;
select count(*) from lf.sys_downlog a inner join lf.sys_user b on a.create_user = b.id inner join lf.sys_download c on a.downid = c.id
-WHERE 1 = 1 and b.uname like '%绠＄悊鍛�%' and c.type = ? and a.create_time >= ? and a.create_time <= ?
-
-
+WHERE 1 = 1 and b.uname like '%绠＄悊鍛�%' and c.type = 3 and a.create_time >= ? and a.create_time <= ?
select * from lf.sys_download
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index 793b1f4..0508b12 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -23,6 +23,7 @@
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.data.DownloadService;
import com.lf.server.service.data.MetaService;
+import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +52,9 @@
@Autowired
BaseQueryService baseQueryService;
+
+ @Autowired
+ DownlogService downlogService;
@Autowired
DownloadService downloadService;
@@ -445,9 +449,7 @@
}
UserEntity ue = tokenService.getCurrentUser(req);
- de.setDcount(de.getDcount() + 1);
- de.setDownloadUser(ue.getId());
- int rows = downloadService.update(de);
+ downlogService.updateInfos(ue, de, req);
String filePath = downloadService.getDownloadFilePath(de);
WebHelper.download(filePath, de.getName(), res);
diff --git a/src/main/java/com/lf/server/controller/show/DataLibController.java b/src/main/java/com/lf/server/controller/show/DataLibController.java
index 5146b2f..8551801 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -10,7 +10,6 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.DownloadReqEntity;
-import com.lf.server.entity.data.DictEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.MetaFileEntity;
@@ -21,6 +20,7 @@
import com.lf.server.service.data.DownloadService;
import com.lf.server.service.data.MetaService;
import com.lf.server.service.show.DataLibService;
+import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -52,6 +52,9 @@
@Autowired
DataLibService dataLibService;
+
+ @Autowired
+ DownlogService downlogService;
@Autowired
DownloadService downloadService;
@@ -237,9 +240,7 @@
}
UserEntity ue = tokenService.getCurrentUser(req);
- de.setDcount(de.getDcount() + 1);
- de.setDownloadUser(ue.getId());
- int rows = downloadService.update(de);
+ downlogService.updateInfos(ue, de, req);
String filePath = downloadService.getDownloadFilePath(de);
WebHelper.download(filePath, de.getName(), res);
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..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;
@@ -36,6 +37,9 @@
@Autowired
ExportService exportService;
+
+ @Autowired
+ DownlogService downlogService;
@Autowired
DownloadService downloadService;
@@ -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);
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 15ff3d4..c5826b9 100644
--- a/src/main/java/com/lf/server/controller/show/MarkController.java
+++ b/src/main/java/com/lf/server/controller/show/MarkController.java
@@ -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;
@@ -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);
diff --git a/src/main/java/com/lf/server/service/sys/DownlogService.java b/src/main/java/com/lf/server/service/sys/DownlogService.java
index 741952b..d131b71 100644
--- a/src/main/java/com/lf/server/service/sys/DownlogService.java
+++ b/src/main/java/com/lf/server/service/sys/DownlogService.java
@@ -1,11 +1,16 @@
package com.lf.server.service.sys;
+import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.sys.DownlogEntity;
+import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
+import com.lf.server.helper.WebHelper;
import com.lf.server.mapper.sys.DownlogMapper;
+import com.lf.server.service.data.DownloadService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.servlet.http.HttpServletRequest;
import java.sql.Timestamp;
import java.util.List;
@@ -17,6 +22,9 @@
public class DownlogService implements DownlogMapper {
@Autowired
DownlogMapper downlogMapper;
+
+ @Autowired
+ DownloadService downloadService;
@Override
public Integer selectCount(String uname, Integer type, Timestamp start, Timestamp end) {
@@ -71,4 +79,20 @@
public Integer updates(List<DownlogEntity> list) {
return downlogMapper.updates(list);
}
+
+ /**
+ * 鏇存柊涓嬭浇淇℃伅
+ */
+ public void updateInfos(UserEntity ue, DownloadEntity de, HttpServletRequest req) {
+ de.setDcount(de.getDcount() + 1);
+ de.setDownloadUser(ue.getId());
+ int rows = downloadService.update(de);
+
+ DownlogEntity entity = new DownlogEntity();
+ entity.setDownid(de.getId());
+ entity.setCreateUser(ue.getId());
+ entity.setIp(WebHelper.getIpAddress(req));
+
+ rows = downlogMapper.insert(entity);
+ }
}
--
Gitblit v1.9.3