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/dispatcher/controller/DispatcherUnitController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
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)));
--
Gitblit v1.9.3