From 427bee04bfacf44abe5d595e2dad976747d83dba Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 15:48:48 +0800
Subject: [PATCH] 1.8.5
---
src/main/java/com/lf/server/controller/show/DataLibController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
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 c27c7e3..0832ea0 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -10,10 +10,8 @@
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;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
import com.lf.server.mapper.all.BasicMapper;
@@ -21,6 +19,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;
@@ -54,6 +53,9 @@
DataLibService dataLibService;
@Autowired
+ DownlogService downlogService;
+
+ @Autowired
DownloadService downloadService;
@Autowired
@@ -62,24 +64,25 @@
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
@ApiImplicitParams({
+ @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "10"),
@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 = "/selectByPageForMeta")
- public ResponseMsg<List<MetaEntity>> selectByPageForMeta(Integer dirid, String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<MetaEntity>> selectByPageForMeta(Integer depid, Integer dirid, String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = metaService.selectCount(dirid, name);
+ int count = metaService.selectCount(depid, dirid, name);
if (count == 0) {
return success(0, null);
}
- List<MetaEntity> rs = metaService.selectByPage(dirid, name, pageSize, pageSize * (pageIndex - 1));
+ List<MetaEntity> rs = metaService.selectByPage(depid, dirid, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -103,11 +106,11 @@
}
MetaEntity meta = metaService.selectById(id);
- if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
+ if (null == meta || null == meta.getBstab() || !meta.getBstab().contains(StaticData.POINT)) {
return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
}
- String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
+ String entity = meta.getBstab().substring(meta.getBstab().indexOf(".") + 1).replace("_", "").toLowerCase();
BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
if (null == baseMapper) {
return null;
@@ -145,14 +148,14 @@
if (null == reqEntity.getIds() || reqEntity.getIds().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢");
}
- if (!downloadService.decryptPwd(reqEntity)) {
+ if (!DownloadService.decryptPwd(reqEntity)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
- if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
+ if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
- List<MetaFileEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
+ List<MetaEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
if (null == list || list.isEmpty()) {
return fail("娌℃湁鎵惧埌鍏冩暟鎹�");
}
@@ -182,7 +185,7 @@
pwd = URLDecoder.decode(pwd, StandardCharsets.UTF_8.name());
}
- String password = downloadService.decryptPwd(pwd);
+ String password = DownloadService.decryptPwd(pwd);
if (null == password) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
@@ -221,7 +224,7 @@
pwd = URLDecoder.decode(pwd, StandardCharsets.UTF_8.name());
}
- String password = downloadService.decryptPwd(pwd);
+ String password = DownloadService.decryptPwd(pwd);
if (null == password) {
WebHelper.writeInfo(HttpStatus.BAD_REQUEST, "瀵嗙爜瑙ｅ瘑澶辫触", res);
}
@@ -236,9 +239,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);
--
Gitblit v1.9.3