From 014639637a80b0549cc0aee00b9a9670fb57827c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 10 二月 2023 17:26:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/MetaController.java | 55 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 17 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 bd79283..56dab7e 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -13,7 +13,7 @@
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.data.VerEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.ClassHelper;
import com.lf.server.helper.Md5Helper;
@@ -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.data.VerService;
import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.*;
@@ -59,30 +60,57 @@
@Autowired
DownloadService downloadService;
+ @Autowired
+ VerService verService;
+
@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 = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "verid", value = "鐗堟湰ID", dataType = "Integer", paramType = "query", example = "0"),
@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 depid, Integer dirid, String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<MetaEntity>> selectByPageAndCount(Integer depid, Integer dirid, Integer verid, String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = metaService.selectCount(depid, dirid, name);
+ int count = metaService.selectCount(depid, dirid, verid, name);
if (count == 0) {
return success(0, null);
}
- List<MetaEntity> rs = metaService.selectByPage(depid, dirid, name, pageSize, pageSize * (pageIndex - 1));
+ List<MetaEntity> rs = metaService.selectByPage(depid, dirid, verid, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁鐩綍ID鏌ヨ鐗堟湰鍒楄〃")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query")
+ })
+ @GetMapping(value = "/selectVerByDirid")
+ public ResponseMsg<List<VerEntity>> selectVerByDirid(Integer dirid) {
+ try {
+ if (null == dirid || dirid < 0) {
+ dirid = 0;
+ }
+
+ List<VerEntity> list = verService.selectByDirid(dirid);
+ if (null == list || list.isEmpty()) {
+ list = verService.selectByDirid(0);
+ }
+
+ return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
@@ -144,11 +172,7 @@
}
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"));
@@ -234,8 +258,7 @@
@GetMapping(value = "/delete")
public ResponseMsg<Integer> delete(int id) {
try {
- // int count = metaService.delete(id)
- int count = metaService.deleteCascade(String.valueOf(id));
+ int count = metaService.delete(id);
return success(count);
} catch (Exception ex) {
@@ -255,9 +278,7 @@
return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
}
- // int count = metaService.deletes(ids)
- String idStr = StringHelper.join(ids, ",");
- int count = metaService.deleteCascade(idStr);
+ int count = metaService.deletes(ids);
return success(count);
} catch (Exception ex) {
@@ -361,11 +382,11 @@
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("娌℃湁鎵惧埌鍏冩暟鎹�");
}
--
Gitblit v1.9.3