From 1d53dd8f501a98ddcce8146443b51b357ef5f9b1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 29 十二月 2022 16:55:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/MetaController.java | 83 ++++++++++++++++++++++++++---------------
1 files changed, 52 insertions(+), 31 deletions(-)
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 ed110b9..bd79283 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -1,5 +1,9 @@
package com.lf.server.controller.data;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.HttpStatus;
@@ -11,12 +15,15 @@
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.ClassHelper;
import com.lf.server.helper.Md5Helper;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
+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.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,31 +54,33 @@
BaseQueryService baseQueryService;
@Autowired
- DownloadService downloadService;
+ DownlogService downlogService;
- private final static String EQ = "=";
+ @Autowired
+ DownloadService downloadService;
@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 = "/selectByPageAndCount")
- public ResponseMsg<List<MetaEntity>> selectByPageAndCount(Integer dirid, String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<MetaEntity>> selectByPageAndCount(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) {
@@ -109,29 +118,43 @@
}
@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")
+ @ApiImplicitParam(name = "id", value = "鍏冩暟鎹甀D", dataType = "Integer", paramType = "query", example = "115"),
+ @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10")
})
- @GetMapping(value = "/selectByPageForUpload")
- public ResponseMsg<Object> selectByPageForUpload(String name, Integer pageSize, Integer pageIndex, HttpServletRequest req) {
+ @GetMapping(value = "/selectDbData")
+ public ResponseMsg<Object> selectDbData(Integer id, Integer pageIndex, Integer pageSize) {
+ // noinspection AlibabaRemoveCommentedCode
try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ if (null == id || id < 0) {
+ return fail("鍏冩暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
}
- UserEntity ue = tokenService.getCurrentUser(req);
-
- int count = metaService.selectCountForUpload(name, ue.getId(), StaticData.FILE_TYPES);
- if (count == 0) {
- return success(0, null);
+ MetaEntity meta = metaService.selectById(id);
+ if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
+ return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
}
- List<MetaEntity> list = metaService.selectByPageForUpload(name, ue.getId(), StaticData.FILE_TYPES, pageSize, pageSize * (pageIndex - 1));
+ String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
+ BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
+ if (null == baseMapper) {
+ return null;
+ }
- return success(count, list);
+ 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());
+
+ Page<Object> page = new Page<>(pageIndex, pageSize);
+ page.addOrder(OrderItem.asc("gid"));
+ IPage<Object> paged = baseMapper.selectPage(page, wrapper);
+
+ return success(paged.getTotal(), paged.getRecords());
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
@@ -143,8 +166,8 @@
@ApiImplicitParam(name = "ns", value = "鍚嶇О绌洪棿", dataType = "String", paramType = "query", example = "bd"),
@ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg25wAanp")
})
- @GetMapping(value = "/selectFields")
- public ResponseMsg<List<DictEntity>> selectFields(String ns, String tab) {
+ @GetMapping(value = "/selectTabFields")
+ public ResponseMsg<List<DictEntity>> selectTabFields(String ns, String tab) {
try {
if (StringHelper.isEmpty(ns) || StringHelper.isEmpty(tab)) {
return fail("鍚嶇О绌洪棿鍜岃〃鍚嶄笉鑳戒负绌�", null);
@@ -289,7 +312,7 @@
}
@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"),
@@ -335,7 +358,7 @@
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())) {
@@ -368,11 +391,11 @@
if (StringHelper.isEmpty(guid) || StringHelper.isEmpty(pwd)) {
return fail("鏂囦欢ID鍜屽瘑鐮佷笉鑳戒负绌�", null);
}
- if (!pwd.endsWith(EQ)) {
+ if (!pwd.endsWith(StaticData.EQ)) {
pwd = URLDecoder.decode(pwd, StandardCharsets.UTF_8.name());
}
- String password = downloadService.decryptPwd(pwd);
+ String password = DownloadService.decryptPwd(pwd);
if (null == password) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
@@ -407,11 +430,11 @@
if (StringHelper.isEmpty(guid) || StringHelper.isEmpty(pwd)) {
WebHelper.writeInfo(HttpStatus.BAD_REQUEST, "鏂囦欢ID鍜屽瘑鐮佷笉鑳戒负绌�", res);
}
- if (!pwd.endsWith(EQ)) {
+ if (!pwd.endsWith(StaticData.EQ)) {
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);
}
@@ -426,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);
--
Gitblit v1.9.3