From 3c1126fbff1aaed94a2e16c2ef98a03e36bf49f1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 May 2022 12:01:13 +0800
Subject: [PATCH] 心理咨询，业主反馈修改，bean copy 修改
---
src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 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..f99e66c 100644
--- a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
+++ b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
@@ -22,6 +22,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
@@ -38,6 +39,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 +62,7 @@
public class ShareholderController extends BladeController {
private final IShareholderService shareholderService;
-
+ private final MyAsyncService myAsyncService;
/**
* 详情
*/
@@ -101,11 +103,19 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入shareholder")
public R save(@Valid @RequestBody Shareholder shareholder) throws Exception {
- boolean save = shareholderService.save(shareholder);
+ Shareholder shareholder1 = shareholder;
+ //脱敏处理
+ if (null!=shareholder1.getCardid() && !shareholder1.getCardid().equals("")){
+ shareholder1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(shareholder1.getCardid()));
+ }
+ if (null!=shareholder1.getCell() && !shareholder1.getCell().equals("")){
+ shareholder1.setCell(DesensitizedUtil.desensitizedPhoneNumber(shareholder1.getCell()));
+ }
+ boolean save = shareholderService.save(shareholder1);
if (shareholder.getCapitaltime() == null) {
String s1 =
"insert into sys_shareholder(id,shareholder,shareholdingratio,capital,cardid,cell,creditCode,dept_id) " +
- "values(" + "'" + shareholder.getId() + "'" + "," +
+ "values(" + "'" + shareholder1.getId() + "'" + "," +
"'" + shareholder.getShareholder() + "'" + "," +
"'" + shareholder.getShareholdingratio() + "'" + "," +
"'" + shareholder.getCapital() + "'" + "," +
@@ -113,11 +123,12 @@
"'" + 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) " +
- "values(" + "'" + shareholder.getId() + "'" + "," +
+ "values(" + "'" + shareholder1.getId() + "'" + "," +
"'" + shareholder.getShareholder() + "'" + "," +
"'" + shareholder.getShareholdingratio() + "'" + "," +
"'" + shareholder.getCapital() + "'" + "," +
@@ -126,7 +137,8 @@
"'" + shareholder.getCell() + "'" + "," +
"'" + shareholder.getCreditcode() + "'" + "," +
"'" + shareholder.getDeptId() + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
return R.status(save);
}
@@ -138,7 +150,15 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入shareholder")
public R update(@Valid @RequestBody Shareholder shareholder) throws Exception {
- boolean b = shareholderService.updateById(shareholder);
+ Shareholder shareholder1 = shareholder;
+ //脱敏处理
+ if (null!=shareholder1.getCardid() && !shareholder1.getCardid().equals("")){
+ shareholder1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(shareholder1.getCardid()));
+ }
+ if (null!=shareholder1.getCell() && !shareholder1.getCell().equals("")){
+ shareholder1.setCell(DesensitizedUtil.desensitizedPhoneNumber(shareholder1.getCell()));
+ }
+ boolean b = shareholderService.updateById(shareholder1);
if (shareholder.getCapitaltime() == null) {
//内网同步
String s1 = "update sys_shareholder set shareholder = " + "'" + shareholder.getShareholder() + "'" +
@@ -149,7 +169,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 +182,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 +210,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