From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改
---
src/main/java/org/springblade/modules/resource/controller/AttachController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/resource/controller/AttachController.java b/src/main/java/org/springblade/modules/resource/controller/AttachController.java
index 1b95221..7458988 100644
--- a/src/main/java/org/springblade/modules/resource/controller/AttachController.java
+++ b/src/main/java/org/springblade/modules/resource/controller/AttachController.java
@@ -30,12 +30,15 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.resource.entity.Attach;
import org.springblade.modules.resource.service.IAttachService;
import org.springblade.modules.resource.vo.AttachVO;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.List;
/**
* 附件表 控制器
@@ -50,7 +53,7 @@
public class AttachController extends BladeController {
private final IAttachService attachService;
-
+ private final MyAsyncService myAsyncService;
/**
* 详情
*/
@@ -68,9 +71,10 @@
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入attach")
- public R<IPage<Attach>> list(Attach attach, Query query, String deptid, String type) {
+ public R<IPage<Attach>> list(Attach attach, Query query, String deptid, String type,String cardid) {
attach.setDeptid(deptid);
attach.setType(type);
+ attach.setCardid(cardid);
IPage<Attach> pages = attachService.page(Condition.getPage(query), Condition.getQueryWrapper(attach));
return R.data(pages);
}
@@ -81,8 +85,8 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入attach")
- public R<IPage<AttachVO>> page(AttachVO attach, Query query) {
- IPage<AttachVO> pages = attachService.selectAttachPage(Condition.getPage(query), attach);
+ public R<IPage<AttachVO>> page(AttachVO attach, Query query,String deptid, String type,String cardid) {
+ IPage<AttachVO> pages = attachService.selectAttachPage(Condition.getPage(query), attach,type,cardid);
return R.data(pages);
}
@@ -124,6 +128,14 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ //内网删除
+ List<Long> list = Func.toLongList(ids);
+ list.forEach(id ->{
+ //内网同步
+ String s1 = "delete from blade_attach where id = " + "'" + id + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ });
return R.status(attachService.deleteLogic(Func.toLongList(ids)));
}
--
Gitblit v1.9.3