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/member/controller/MemberController.java | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/springblade/modules/member/controller/MemberController.java b/src/main/java/org/springblade/modules/member/controller/MemberController.java
index c0b5c87..21979a4 100644
--- a/src/main/java/org/springblade/modules/member/controller/MemberController.java
+++ b/src/main/java/org/springblade/modules/member/controller/MemberController.java
@@ -22,12 +22,14 @@
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;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.equipage.excel.EquipageExcel;
@@ -36,8 +38,10 @@
import org.springblade.modules.member.excel.memberImporter;
import org.springblade.modules.member.service.IMemberService;
import org.springblade.modules.member.vo.MemberVO;
+import org.springblade.modules.shareholder.entity.Shareholder;
import org.springblade.modules.shareholder.excel.shareExcel;
import org.springblade.modules.shareholder.excel.shareImporter;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -46,6 +50,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* 控制器
@@ -60,6 +65,7 @@
public class MemberController extends BladeController {
private final IMemberService memberService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -101,16 +107,34 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入member")
public R save(@Valid @RequestBody Member member) throws Exception {
- boolean save = memberService.save(member);
- String s1 =
- "insert into sys_member(id,name,post,cardid,cell,creditCode) " +
- "values(" + "'" + member.getId() + "'" + "," +
- "'" + member.getName() + "'" + "," +
- "'" + member.getPost() + "'" + "," +
- "'" + member.getCardid() + "'" + "," +
- "'" + member.getCell() + "'"+"," +
- "'" + member.getCreditcode() + "'"+")";
- FtpUtil.sqlFileUpload(s1);
+ Member member1 = Objects.requireNonNull(BeanUtil.copy(member, Member.class));
+ if (null!=member1.getName() && !member1.getName().equals("")){
+ member1.setName(DesensitizedUtil.desensitizedName(member1.getName()));
+ }
+ if (null!=member1.getPost() && !member1.getPost().equals("")){
+ member1.setPost("***");
+ }
+ if (null!=member1.getCardid() && !member1.getCardid().equals("")){
+ member1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(member1.getCardid()));
+ }
+ if (null!=member1.getCell() && !member1.getCell().equals("")){
+ member1.setCell(DesensitizedUtil.desensitizedPhoneNumber(member1.getCell()));
+ }
+ //脱敏处理
+ boolean save = memberService.save(member1);
+ if (save) {
+ String s1 =
+ "insert into sys_member(id,name,post,cardid,cell,creditCode,dept_id) " +
+ "values(" + "'" + member1.getId() + "'" + "," +
+ "'" + member.getName() + "'" + "," +
+ "'" + member.getPost() + "'" + "," +
+ "'" + member.getCardid() + "'" + "," +
+ "'" + member.getCell() + "'" + "," +
+ "'" + member.getCreditcode() + "'" + "," +
+ "'" + member.getDeptId() + "'" + ")";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ }
return R.status(save);
}
@@ -121,15 +145,32 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入member")
public R update(@Valid @RequestBody Member member) throws Exception {
- boolean b = memberService.updateById(member);
- String s1 = "update sys_member set name = " + "'" + member.getName() + "'" +
- ",post = " + "'" + member.getPost() + "'" +
- ",cardid = " + "'" + member.getCardid() + "'" +
- ",cell = " + "'" + member.getCell() + "'" +
- ",cardid = " + "'" + member.getCardid() + "'" +
- ",creditCode = " + "'" + member.getCreditcode() + "'" +
- " " + "where id = " + "'" + member.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ Member member1 = Objects.requireNonNull(BeanUtil.copy(member, Member.class));
+ if (null!=member1.getName() && !member1.getName().equals("")){
+ member1.setName(DesensitizedUtil.desensitizedName(member1.getName()));
+ }
+ if (null!=member1.getPost() && !member1.getPost().equals("")){
+ member1.setPost("***");
+ }
+ if (null!=member1.getCardid() && !member1.getCardid().equals("")){
+ member1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(member1.getCardid()));
+ }
+ if (null!=member1.getCell() && !member1.getCell().equals("")){
+ member1.setCell(DesensitizedUtil.desensitizedPhoneNumber(member1.getCell()));
+ }
+ boolean b = memberService.updateById(member1);
+ if (b) {
+ String s1 = "update sys_member set name = " + "'" + member.getName() + "'" +
+ ",post = " + "'" + member.getPost() + "'" +
+ ",cardid = " + "'" + member.getCardid() + "'" +
+ ",cell = " + "'" + member.getCell() + "'" +
+ ",cardid = " + "'" + member.getCardid() + "'" +
+ ",creditCode = " + "'" + member.getCreditcode() + "'" +
+ ",dept_id = " + "'" + member.getDeptId() + "'" +
+ " " + "where id = " + "'" + member.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ }
return R.status(b);
}
@@ -155,7 +196,7 @@
List<Long> list = Func.toLongList(ids);
list.forEach(id -> {
String s1 = "delete from sys_member where id = " + "'" + id + "'";
- FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
});
return R.status(memberService.removeByIds(Func.toLongList(ids)));
}
@@ -194,7 +235,7 @@
public void exportMember(HttpServletResponse response) {
List<memberExcel> list = new ArrayList<>();
memberExcel member = new memberExcel();
- member.setCreditcode("xx12351214112");
+ member.setDeptId("xxx保安服务有限公司");
member.setName("张三");
member.setPost("经理");
member.setCardid("360***********0001");
--
Gitblit v1.9.3