From e26af85e049516e6ce2b082bc2bc90bf71643e95 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 24 三月 2023 09:06:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/DataLibController.java | 71 +++++++++++++++++------------------
1 files changed, 34 insertions(+), 37 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 1c4ffe3..212b940 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -12,12 +12,14 @@
import com.lf.server.entity.ctrl.DownloadReqEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.data.MetaEntity;
+import com.lf.server.entity.data.VerEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
import com.lf.server.mapper.all.BasicMapper;
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.data.VerService;
import com.lf.server.service.show.DataLibService;
import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
@@ -33,7 +35,7 @@
import java.io.File;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
-import java.util.List;
+import java.util.*;
/**
* 璧勬枡棣�
@@ -61,61 +63,59 @@
@Autowired
BaseQueryService baseQueryService;
+ @Autowired
+ VerService verService;
+
@SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
+ @ApiOperation(value = "鏍规嵁鐩綍ID鏌ヨ鐗堟湰鍒楄〃")
@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")
+ @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query")
})
- @GetMapping(value = "/selectByPageForMeta")
- public ResponseMsg<List<MetaEntity>> selectByPageForMeta(Integer depid, Integer dirid, String name, Integer pageSize, Integer pageIndex) {
+ @GetMapping(value = "/selectVerByDirid")
+ public ResponseMsg<List<VerEntity>> selectVerByDirid(Integer dirid) {
try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ if (null == dirid || dirid < 0) {
+ dirid = 0;
}
- int count = metaService.selectCount(depid, dirid, name);
- if (count == 0) {
- return success(0, null);
+ List<VerEntity> list = verService.selectByDirid(dirid);
+ if (null == list || list.isEmpty()) {
+ list = verService.selectByDirid(0);
}
- List<MetaEntity> rs = metaService.selectByPage(depid, dirid, name, pageSize, pageSize * (pageIndex - 1));
-
- return success(count, rs);
+ return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
- @ApiImplicitParam(name = "dirs", value = "鐩綍ID", dataType = "String", paramType = "query", example = "1,10"),
+ @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
+ @ApiImplicitParam(name = "dirs", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00,01"),
@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 = "/selectMetasForPage")
- public ResponseMsg<Object> selectMetasForPage(Integer depid, String dirs, String name, Integer pageSize, Integer pageIndex){
+ public ResponseMsg<Object> selectMetasForPage(String depcode, String dirs, String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
+ dirs = DataLibService.copeCodes(dirs, "dircode");
- int count = metaService.selectMetasForCount(depid, dirs, name);
+ int count = metaService.selectMetasForCount(depcode, dirs, name);
if (count == 0) {
return success(0, null);
}
- List<MetaEntity> rs = metaService.selectMetasForPage(depid, dirs, name, pageSize, pageSize * (pageIndex - 1));
+ List<MetaEntity> rs = metaService.selectMetasForPage(depcode, dirs, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -146,19 +146,15 @@
}
QueryWrapper wrapper = new QueryWrapper();
- //wrapper.eq("dirid", meta.getDirid());
- //wrapper.eq("depid", meta.getDepid());
- //wrapper.eq("verid", meta.getVerid());
- wrapper.eq("createuser", meta.getCreateUser());
- wrapper.eq("createtime", meta.getCreateTime());
+ wrapper.eq("parentid", meta.getEventid());
Page<Object> page = new Page<>(pageIndex, pageSize);
- page.addOrder(OrderItem.asc("gid"));
+ page.addOrder(OrderItem.desc("gid"));
IPage<Object> paged = baseMapper.selectPage(page, wrapper);
return success(paged.getTotal(), paged.getRecords());
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -194,7 +190,7 @@
return success(guid);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -232,7 +228,7 @@
return success(file.exists());
} catch (Exception ex) {
- return fail(ex.getMessage(), false);
+ return fail(ex, false);
}
}
@@ -244,9 +240,10 @@
})
@ResponseBody
@GetMapping(value = "/downloadFile")
+ @SuppressWarnings("AlibabaRemoveCommentedCode")
public void downloadFile(String guid, String pwd, HttpServletRequest req, HttpServletResponse res) {
try {
- if (StringHelper.isEmpty(guid) || StringHelper.isEmpty(pwd)) {
+ /*if (StringHelper.isEmpty(guid) || StringHelper.isEmpty(pwd)) {
WebHelper.writeInfo(HttpStatus.BAD_REQUEST, "鏂囦欢ID鍜屽瘑鐮佷笉鑳戒负绌�", res);
}
if (!pwd.endsWith(StaticData.EQ)) {
@@ -256,16 +253,16 @@
String password = DownloadService.decryptPwd(pwd);
if (null == password) {
WebHelper.writeInfo(HttpStatus.BAD_REQUEST, "瀵嗙爜瑙ｅ瘑澶辫触", res);
- }
+ }*/
DownloadEntity de = downloadService.selectByGuid(guid);
if (null == de) {
WebHelper.writeInfo(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�", res);
return;
}
- if (!StringHelper.isNull(de.getPwd()) && !Md5Helper.validatePassword(password, de.getPwd())) {
+ /*if (!StringHelper.isNull(de.getPwd()) && !Md5Helper.validatePassword(password, de.getPwd())) {
WebHelper.writeInfo(HttpStatus.UNAUTHORIZED, "瀵嗙爜涓嶆纭�", res);
- }
+ }*/
UserEntity ue = tokenService.getCurrentUser(req);
downlogService.updateInfos(ue, de, req);
--
Gitblit v1.9.3