From 8e99321db3dfeedaf910c7a7c7f5afde60caafb7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 May 2022 15:21:08 +0800
Subject: [PATCH] 枪支，派遣单位，考试成绩保存，成绩审查，主要管理人员，出资人，用户导入，新增，许可证信息等信息修改变动
---
src/main/java/org/springblade/modules/equipage/service/impl/GunServiceImpl.java | 3
src/main/java/org/springblade/modules/member/controller/MemberController.java | 8 +-
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 3
src/main/java/org/springblade/modules/social/controller/SocialController.java | 39 ++++++++++++
src/main/java/org/springblade/modules/information/controller/InformationController.java | 10 +--
src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java | 2
src/main/java/org/springblade/modules/FTP/DataHandler.java | 4 +
src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java | 5 +
src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java | 2
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 6 +-
src/main/java/org/springblade/modules/licence/controller/LicencePaperController.java | 12 +++
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java | 26 ++++----
src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java | 28 +++++++++
src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java | 3
src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java | 12 ++-
src/main/java/org/springblade/modules/system/controller/UserController.java | 2
src/main/java/org/springblade/modules/equipage/controller/GunController.java | 6 +
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 3
18 files changed, 129 insertions(+), 45 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/DataHandler.java b/src/main/java/org/springblade/modules/FTP/DataHandler.java
index 1e11034..901ff0f 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHandler.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHandler.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +14,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* ftp 数据处理
@@ -165,7 +167,7 @@
//取出后将 redis 删除
handler.redisTemplate.delete(uuid);
//返回的user,需处理敏感数据
- User user1 = user;
+ User user1 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
//敏感数据处理
user1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(user.getCardid()));
user1.setPhone(DesensitizedUtil.desensitizedPhoneNumber(user.getPhone()));
diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
index 22d774f..da9f9e6 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
@@ -29,6 +29,7 @@
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.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
@@ -42,6 +43,7 @@
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.exam.excel.ExamScoreExcel;
import org.springblade.modules.exam.excel.ExamScoreImporter;
+import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -53,6 +55,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 控制器
@@ -133,19 +136,19 @@
@PostMapping("/submit")
public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit) {
boolean status = false;
+ //内网
+ DispatcherUnit dispatcherUnit1 = Objects.requireNonNull(BeanUtil.copy(dispatcherUnit, DispatcherUnit.class));
+ //脱敏处理
+ if (null!=dispatcherUnit.getLinkman()) {
+ dispatcherUnit1.setLinkman(DesensitizedUtil.desensitizedName(dispatcherUnit.getLinkman()));
+ }
+ if (null!=dispatcherUnit.getPhone()) {
+ dispatcherUnit1.setPhone(DesensitizedUtil.desensitizedPhoneNumber(dispatcherUnit.getPhone()));
+ }
+ dispatcherUnit1.setSecurityLinkman(DesensitizedUtil.desensitizedName(dispatcherUnit.getSecurityLinkman()));
+ dispatcherUnit1.setCell(DesensitizedUtil.desensitizedPhoneNumber(dispatcherUnit.getCell()));
if (null == dispatcherUnit.getId()) {
dispatcherUnit.setCreateTime(new Date());
- //内网
- DispatcherUnit dispatcherUnit1 = dispatcherUnit;
- //脱敏处理
- if (null!=dispatcherUnit.getLinkman()) {
- dispatcherUnit1.setLinkman(DesensitizedUtil.desensitizedName(dispatcherUnit.getLinkman()));
- }
- if (null!=dispatcherUnit.getPhone()) {
- dispatcherUnit1.setPhone(DesensitizedUtil.desensitizedPhoneNumber(dispatcherUnit.getPhone()));
- }
- dispatcherUnit1.setSecurityLinkman(DesensitizedUtil.desensitizedName(dispatcherUnit.getSecurityLinkman()));
- dispatcherUnit1.setCell(DesensitizedUtil.desensitizedPhoneNumber(dispatcherUnit.getCell()));
//新增
status = dispatcherUnitService.save(dispatcherUnit);
if (status) {
@@ -219,7 +222,6 @@
list.forEach(id -> {
//内网同步
String s1 = "delete from sys_dispatcher_unit where id = " + "'" + id + "'";
- //FtpUtil.sqlFileUpload(s1);
myAsyncService.FTP(s1);
});
return R.status(dispatcherUnitService.removeByIds(Func.toLongList(ids)));
diff --git a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
index bd45334..6c69812 100644
--- a/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
+++ b/src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.DesensitizedUtil;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.dispatcher.entity.DispatcherUnit;
@@ -38,6 +39,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -171,7 +173,7 @@
dispatcherUnit.setCreateTime(new Date());
//内网
- DispatcherUnit dispatcherUnit1 = dispatcherUnit;
+ DispatcherUnit dispatcherUnit1 = Objects.requireNonNull(BeanUtil.copy(dispatcherUnit, DispatcherUnit.class));
//脱敏处理
if (null!=dispatcherUnit.getLinkman()) {
dispatcherUnit1.setLinkman(DesensitizedUtil.desensitizedName(dispatcherUnit.getLinkman()));
@@ -200,7 +202,6 @@
"'" + dispatcherUnit1.getSecurityLinkman() + "'" + "," +
"'" + dispatcherUnit1.getCell() + "'" + "," +
"'" + dispatcherUnit.getNum() + "'" + ")";
- //FtpUtil.sqlFileUpload(s1);
myAsyncService.FTP(s1);
});
}
diff --git a/src/main/java/org/springblade/modules/equipage/controller/GunController.java b/src/main/java/org/springblade/modules/equipage/controller/GunController.java
index b21bdd5..2d5dc02 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/GunController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/GunController.java
@@ -12,6 +12,7 @@
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.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
@@ -20,6 +21,7 @@
import org.springblade.modules.equipage.excel.GunImporter;
import org.springblade.modules.equipage.service.GunService;
import org.springblade.modules.equipage.vo.GunVo;
+import org.springblade.modules.member.entity.Member;
import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -31,6 +33,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* @author zhongrj
@@ -87,7 +90,7 @@
public R submit(@RequestBody Gun gun) {
boolean status = false;
//脱敏处理
- Gun gun1 = gun;
+ Gun gun1 = Objects.requireNonNull(BeanUtil.copy(gun, Gun.class));
gun1.setCardNumber("***");
gun1.setIssueTime(null);
gun1.setValidTime(null);
@@ -158,7 +161,6 @@
list.forEach(id -> {
//内网同步
String s1 = "delete from sys_gun where id = " + "'" + id + "'";
- //FtpUtil.sqlFileUpload(s1);
myAsyncService.FTP(s1);
});
return R.status(gunService.removeByIds(Func.toLongList(ids)));
diff --git a/src/main/java/org/springblade/modules/equipage/service/impl/GunServiceImpl.java b/src/main/java/org/springblade/modules/equipage/service/impl/GunServiceImpl.java
index ada3d14..f8c586a 100644
--- a/src/main/java/org/springblade/modules/equipage/service/impl/GunServiceImpl.java
+++ b/src/main/java/org/springblade/modules/equipage/service/impl/GunServiceImpl.java
@@ -81,7 +81,7 @@
}
//脱敏处理
- Gun gun1 = gun;
+ Gun gun1 = Objects.requireNonNull(BeanUtil.copy(gun, Gun.class));
gun1.setCardNumber("***");
gun1.setIssueTime(null);
gun1.setValidTime(null);
@@ -112,7 +112,6 @@
"'" + gun.getDeptId() + "'" + "," +
"'" + gun.getPersonInCharge() + "'" + "," +
"'" +gun.getCardNo() + "'" + ")";
- //FtpUtil.sqlFileUpload(s1);
myAsyncService.FTP(s1);
});
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index f8e0ee2..b9de7d7 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -14,6 +14,7 @@
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.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
@@ -251,7 +252,7 @@
securityPaper.setSource(1);
//脱敏,内网
- SecurityPaper paper1 = securityPaper;
+ SecurityPaper paper1 = Objects.requireNonNull(BeanUtil.copy(securityPaper,SecurityPaper.class));
//新增保安员证信息
securityPaper.setIdCardNo("");
securityPaper.setNumber(DesensitizedUtil.desensitizedSecurityNumber(result));
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
index 7eb7705..164c8e8 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
@@ -7,6 +7,7 @@
import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.Monitor;
import org.springblade.modules.FTP.Result;
@@ -369,7 +370,7 @@
securityPaper.setApplyId(examScore.getApplyId());
securityPaper.setSource(1);
//内网对象
- SecurityPaper paper = securityPaper;
+ SecurityPaper paper = Objects.requireNonNull(BeanUtil.copy(securityPaper,SecurityPaper.class));
//新增保安员证信息
securityPaper.setNumber(DesensitizedUtil.desensitizedSecurityNumber(result));
securityPaper.setIdCardNo("");
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
index bcf0c02..d3778d5 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
@@ -6,6 +6,7 @@
import lombok.AllArgsConstructor;
import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.common.utils.QRCodeUtil;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.Monitor;
import org.springblade.modules.FTP.Result;
@@ -226,7 +227,7 @@
securityPaper.setApplyId(examScore.getApplyId());
securityPaper.setSource(1);
//创建内网对象
- SecurityPaper paper = securityPaper;
+ SecurityPaper paper = Objects.requireNonNull(BeanUtil.copy(securityPaper,SecurityPaper.class));
//脱敏
securityPaper.setNumber(DesensitizedUtil.desensitizedSecurityNumber(result));
securityPaper.setIdCardNo("");
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index 9842c74..c0748c4 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -35,12 +35,10 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.DigestUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.OutJson;
+import org.springblade.modules.dispatcher.entity.DispatcherUnit;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.excel.ExportInformationExcel;
import org.springblade.modules.information.excel.ExportInformationSecurityStatistics;
@@ -194,7 +192,7 @@
information.setCreateTime(new Date());
- Information information1 = information;
+ Information information1 = Objects.requireNonNull(BeanUtil.copy(information, Information.class));
//敏感数据处理
if (null!=information1.getRepresentativecell() && !information1.getRepresentativecell().equals("")) {
information1.setRepresentativecell(DesensitizedUtil.desensitizedPhoneNumber(information1.getRepresentativecell()));
@@ -297,7 +295,7 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入information")
public R update(@Valid @RequestBody Information information) throws Exception {
- Information information1 = information;
+ Information information1 = Objects.requireNonNull(BeanUtil.copy(information, Information.class));;
//敏感数据处理
if (null!=information1.getRepresentativecell() && !information1.getRepresentativecell().equals("")) {
information1.setRepresentativecell(DesensitizedUtil.desensitizedPhoneNumber(information1.getRepresentativecell()));
diff --git a/src/main/java/org/springblade/modules/licence/controller/LicencePaperController.java b/src/main/java/org/springblade/modules/licence/controller/LicencePaperController.java
index 274ca51..fa35dfb 100644
--- a/src/main/java/org/springblade/modules/licence/controller/LicencePaperController.java
+++ b/src/main/java/org/springblade/modules/licence/controller/LicencePaperController.java
@@ -6,7 +6,9 @@
import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.core.mp.support.Condition;
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.information.entity.Information;
import org.springblade.modules.licence.entity.LicencePaper;
import org.springblade.modules.licence.service.LicencePaperService;
import org.springblade.modules.licence.vo.LicencePaperVo;
@@ -16,6 +18,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* @author zhongrj
@@ -69,7 +72,7 @@
*/
@PostMapping("/submit")
public R submit(@RequestBody LicencePaper licencePaper){
- LicencePaper licencePaper1 = licencePaper;
+ LicencePaper licencePaper1 = Objects.requireNonNull(BeanUtil.copy(licencePaper, LicencePaper.class));
//脱敏处理
if (null!= licencePaper.getApprovalNumber() && !licencePaper.getApprovalNumber().equals("")){
licencePaper.setApprovalNumber(DesensitizedUtil.desensitizedSecurityNumber(licencePaper.getApprovalNumber()));
@@ -201,6 +204,13 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+ //内网删除
+ List<Long> list = Func.toLongList(ids);
+ list.forEach(id -> {
+ //内网同步
+ String s1 = "delete from sys_licence_paper where id = " + "'" + id + "'";
+ myAsyncService.FTP(s1);
+ });
return R.status(licencePaperService.removeByIds(Func.toLongList(ids)));
}
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 1a124c1..21979a4 100644
--- a/src/main/java/org/springblade/modules/member/controller/MemberController.java
+++ b/src/main/java/org/springblade/modules/member/controller/MemberController.java
@@ -29,6 +29,7 @@
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;
@@ -37,6 +38,7 @@
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;
@@ -48,6 +50,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* 控制器
@@ -104,7 +107,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入member")
public R save(@Valid @RequestBody Member member) throws Exception {
- Member member1 = member;
+ Member member1 = Objects.requireNonNull(BeanUtil.copy(member, Member.class));
if (null!=member1.getName() && !member1.getName().equals("")){
member1.setName(DesensitizedUtil.desensitizedName(member1.getName()));
}
@@ -142,7 +145,7 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入member")
public R update(@Valid @RequestBody Member member) throws Exception {
- Member member1 = member;
+ Member member1 = Objects.requireNonNull(BeanUtil.copy(member, Member.class));
if (null!=member1.getName() && !member1.getName().equals("")){
member1.setName(DesensitizedUtil.desensitizedName(member1.getName()));
}
@@ -193,7 +196,6 @@
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)));
diff --git a/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java
index d6062fe..4aac92c 100644
--- a/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java
@@ -77,7 +77,7 @@
} catch (ParseException e) {
e.printStackTrace();
}
- Member member1 = member;
+ Member member1 = Objects.requireNonNull(BeanUtil.copy(member, Member.class));
if (null!=member1.getName() && !member1.getName().equals("")){
member1.setName(DesensitizedUtil.desensitizedName(member1.getName()));
}
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 f99e66c..0638a6c 100644
--- a/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
+++ b/src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java
@@ -29,10 +29,12 @@
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.information.excel.InforExcel;
import org.springblade.modules.information.excel.InforImporter;
+import org.springblade.modules.licence.entity.LicencePaper;
import org.springblade.modules.member.excel.memberExcel;
import org.springblade.modules.shareholder.entity.Shareholder;
import org.springblade.modules.shareholder.excel.shareExcel;
@@ -48,6 +50,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* 保安公司主要出资人信息
@@ -102,8 +105,8 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入shareholder")
- public R save(@Valid @RequestBody Shareholder shareholder) throws Exception {
- Shareholder shareholder1 = shareholder;
+ public R save(@Valid @RequestBody Shareholder shareholder){
+ Shareholder shareholder1 = Objects.requireNonNull(BeanUtil.copy(shareholder, Shareholder.class));
//脱敏处理
if (null!=shareholder1.getCardid() && !shareholder1.getCardid().equals("")){
shareholder1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(shareholder1.getCardid()));
@@ -149,8 +152,8 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入shareholder")
- public R update(@Valid @RequestBody Shareholder shareholder) throws Exception {
- Shareholder shareholder1 = shareholder;
+ public R update(@Valid @RequestBody Shareholder shareholder){
+ Shareholder shareholder1 = Objects.requireNonNull(BeanUtil.copy(shareholder, Shareholder.class));
//脱敏处理
if (null!=shareholder1.getCardid() && !shareholder1.getCardid().equals("")){
shareholder1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(shareholder1.getCardid()));
@@ -210,7 +213,6 @@
List<Long> list = Func.toLongList(ids);
list.forEach(id -> {
String s1 = "delete from sys_shareholder where id = " + "'" + id + "'";
- //FtpUtil.sqlFileUpload(s1);
myAsyncService.FTP(s1);
});
return R.status(shareholderService.removeByIds(Func.toLongList(ids)));
diff --git a/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java b/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java
index a7c4e9e..bdbc588 100644
--- a/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java
+++ b/src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java
@@ -83,7 +83,7 @@
shareholder.setShareholdingratio(shareExcel.getShareholdingratio());
}
- Shareholder shareholder1 = shareholder;
+ Shareholder shareholder1 = Objects.requireNonNull(BeanUtil.copy(shareholder, Shareholder.class));
//脱敏处理
if (null!=shareholder1.getCardid() && !shareholder1.getCardid().equals("")){
shareholder1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(shareholder1.getCardid()));
diff --git a/src/main/java/org/springblade/modules/social/controller/SocialController.java b/src/main/java/org/springblade/modules/social/controller/SocialController.java
index 5506733..44ae533 100644
--- a/src/main/java/org/springblade/modules/social/controller/SocialController.java
+++ b/src/main/java/org/springblade/modules/social/controller/SocialController.java
@@ -25,11 +25,13 @@
import lombok.AllArgsConstructor;
import org.apache.commons.codec.Charsets;
import org.springblade.common.excel.RowWriteHandler;
+import org.springblade.common.utils.DesensitizedUtil;
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.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.social.entity.Social;
@@ -50,6 +52,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* 控制器
@@ -109,14 +112,40 @@
public R save(@Valid @RequestBody Social social) {
//修改为已参保
socialService.upSoil(social.getNamb());
+ Social social1 = Objects.requireNonNull(BeanUtil.copy(social, Social.class));
+ //脱敏处理
+ if (null!=social.getNation() && !social.getNation().equals("")){
+ social1.setNation("***");
+ }
+ if (null!=social.getTelephone() && !social.getTelephone().equals("")){
+ social1.setTelephone(DesensitizedUtil.desensitizedPhoneNumber(social.getTelephone()));
+ }
+ if (null!=social.getCardid() && !social.getCardid().equals("")){
+ social1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(social.getCardid()));
+ }
+ if (null!=social.getResidence() && !social.getResidence().equals("")){
+ social1.setResidence(DesensitizedUtil.desensitizedAddress(social.getResidence()));
+ }
+ if (null!=social.getAddress() && !social.getAddress().equals("")){
+ social1.setAddress(DesensitizedUtil.desensitizedAddress(social.getAddress()));
+ }
+ if (null!=social.getNature() && !social.getNature().equals("")){
+ social1.setNature("***");
+ }
+ if (null!=social.getAmount()){
+ social1.setAmount(null);
+ }
+ if (null!=social.getInsuredtime()){
+ social1.setInsuredtime(null);
+ }
//新增社保记录
- boolean save = socialService.save(social);
+ boolean save = socialService.save(social1);
if (save){
//内网同步
String s = "insert into sys_socil(" +
"id,namb,sex,nation,telephone,cardid,residence,address," +
"nature,amount,insuredtime,deptid) " +
- "values(" + "'" + social.getId() + "'" + "," +
+ "values(" + "'" + social1.getId() + "'" + "," +
"'" + social.getNamb() + "'" + "," +
"'" + social.getSex() + "'" + "," +
"'" + social.getNation() + "'" + "," +
@@ -162,6 +191,12 @@
@ApiOperationSupport(order = 8)
@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 sys_socil where id = " + "'" + id + "'";
+ myAsyncService.FTP(s1);
+ });
return R.status(socialService.removeByIds(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java b/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
index 789a62b..278fab0 100644
--- a/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
+++ b/src/main/java/org/springblade/modules/social/service/impl/SocialServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
+import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.social.entity.Social;
import org.springblade.modules.social.excel.SocialExcel;
@@ -85,6 +86,33 @@
social.setDeptid(deptid);
this.upSoil(social.getCardid());
+ Social social1 = Objects.requireNonNull(BeanUtil.copy(social, Social.class));
+ //脱敏处理
+ if (null!=social.getNation() && !social.getNation().equals("")){
+ social1.setNation("***");
+ }
+ if (null!=social.getTelephone() && !social.getTelephone().equals("")){
+ social1.setTelephone(DesensitizedUtil.desensitizedPhoneNumber(social.getTelephone()));
+ }
+ if (null!=social.getCardid() && !social.getCardid().equals("")){
+ social1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(social.getCardid()));
+ }
+ if (null!=social.getResidence() && !social.getResidence().equals("")){
+ social1.setResidence(DesensitizedUtil.desensitizedAddress(social.getResidence()));
+ }
+ if (null!=social.getAddress() && !social.getAddress().equals("")){
+ social1.setAddress(DesensitizedUtil.desensitizedAddress(social.getAddress()));
+ }
+ if (null!=social.getNature() && !social.getNature().equals("")){
+ social1.setNature("***");
+ }
+ if (null!=social.getAmount()){
+ social1.setAmount(null);
+ }
+ if (null!=social.getInsuredtime()){
+ social1.setInsuredtime(null);
+ }
+
boolean save = this.save(social);
if (save) {
//内网同步
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index b3f262a..7ce7d96 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -1406,7 +1406,7 @@
// boolean status = userService.save(user);
- User user1 = user;
+ User user1 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
//头像
if (null != user.getAvatar() && !user.getAvatar().equals("")) {
user1.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 59109f9..aeb9001 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -1349,7 +1349,7 @@
user.setExaminationType("2");
//推送内网的数据
- User user0 = user;
+ User user0 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
//生成随机数
String uuid = UUID.randomUUID().toString();
@@ -1475,7 +1475,7 @@
//取出后将 redis 删除
redisTemplate.delete(uuid);
//返回的user,需处理敏感数据
- User user1 = user;
+ User user1 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
//敏感数据处理
user1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(user.getCardid()));
user1.setPhone(DesensitizedUtil.desensitizedPhoneNumber(user.getPhone()));
@@ -1602,7 +1602,7 @@
user.setExaminationType("2");
//推送内网的数据
- User user0 = user;
+ User user0 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
//生成随机数
String uuid = UUID.randomUUID().toString();
--
Gitblit v1.9.3