From ffb62aac389a6ac596fe8d0d44d4e242beeea0f2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 10 Mar 2022 11:46:31 +0800
Subject: [PATCH] 考勤查询接口修改，电子围栏自定义新增、修改，查询一个点是否在电子围栏内接口新增
---
src/main/java/org/springblade/modules/resource/controller/AttachController.java | 10 ++++++----
1 files changed, 6 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 e4a4d54..7458988 100644
--- a/src/main/java/org/springblade/modules/resource/controller/AttachController.java
+++ b/src/main/java/org/springblade/modules/resource/controller/AttachController.java
@@ -34,6 +34,7 @@
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;
@@ -52,7 +53,7 @@
public class AttachController extends BladeController {
private final IAttachService attachService;
-
+ private final MyAsyncService myAsyncService;
/**
* 详情
*/
@@ -84,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);
}
@@ -132,7 +133,8 @@
list.forEach(id ->{
//内网同步
String s1 = "delete from blade_attach where id = " + "'" + id + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
});
return R.status(attachService.deleteLogic(Func.toLongList(ids)));
}
--
Gitblit v1.9.3