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/shareholder/controller/ShareholderController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
index 711d010..0b4f9aa 100644
--- a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
+++ b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
@@ -38,6 +38,7 @@
import org.springblade.modules.shareholder.excel.shareImporter;
import org.springblade.modules.shareholder.service.IShareholderService;
import org.springblade.modules.shareholder.vo.ShareholderVO;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -60,7 +61,7 @@
public class ShareholderController extends BladeController {
private final IShareholderService shareholderService;
-
+ private final MyAsyncService myAsyncService;
/**
* 详情
*/
@@ -113,7 +114,8 @@
"'" + shareholder.getCell() + "'" + "," +
"'" + shareholder.getCreditcode() + "'" + "," +
"'" + shareholder.getDeptId() + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
} else {
String s1 =
"insert into sys_shareholder(id,shareholder,shareholdingratio,capital,capitalTime,cardid,cell,creditCode,dept_id) " +
@@ -126,7 +128,8 @@
"'" + shareholder.getCell() + "'" + "," +
"'" + shareholder.getCreditcode() + "'" + "," +
"'" + shareholder.getDeptId() + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
return R.status(save);
}
@@ -149,7 +152,8 @@
",creditCode = " + "'" + shareholder.getCreditcode() + "'" +
",dept_id = " + "'" + shareholder.getDeptId() + "'" +
" " + "where id = " + "'" + shareholder.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
} else {
//内网同步
String s1 = "update sys_shareholder set shareholder = " + "'" + shareholder.getShareholder() + "'" +
@@ -161,7 +165,8 @@
",creditCode = " + "'" + shareholder.getCreditcode() + "'" +
",dept_id = " + "'" + shareholder.getDeptId() + "'" +
" " + "where id = " + "'" + shareholder.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
return R.status(b);
}
@@ -188,7 +193,8 @@
List<Long> list = Func.toLongList(ids);
list.forEach(id -> {
String s1 = "delete from sys_shareholder where id = " + "'" + id + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
});
return R.status(shareholderService.removeByIds(Func.toLongList(ids)));
}
--
Gitblit v1.9.3