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/system/controller/UserController.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
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 8ee27f2..7ce7d96 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -59,6 +59,7 @@
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.Monitor;
+import org.springblade.modules.FTP.Result;
import org.springblade.modules.accreditation.entity.AccreditationRecords;
import org.springblade.modules.accreditation.service.AccreditationRecordsService;
import org.springblade.modules.dispatcher.entity.Dispatcher;
@@ -1132,6 +1133,7 @@
@GetMapping("/security-apply-tree")
public R<List<TreeNode>> securityApplyTree(UserVO user) {
List<TreeNode> tree = userService.getSecurityApplyTree(user);
+ System.out.println("tree = " + tree);
return R.data(tree);
}
@@ -1182,6 +1184,7 @@
user.setDispatch("1");
user.setExaminationType("0");
user.setAccount(user.getCardid());
+ user.setStatus(1);
User user1 = new User();
user1.setIsDeleted(0);
@@ -1387,8 +1390,10 @@
Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
user.setRoleId(oneRole.getId().toString());
user.setDispatch("1");
- user.setExaminationType("0");
- user.setAccount(user.getCardid());
+ //待审查
+ user.setExaminationType("2");
+ user.setAccount(user.getRealName());
+ user.setStatus(1);
//密码加密
if (Func.isNotEmpty(user.getCardid())) {
@@ -1401,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));
@@ -1431,8 +1436,8 @@
myAsyncService.FTPObject(map);
int count = 0;
- boolean flag = false;
- R result = new R();
+ int flag = 1;
+ Result result = new Result();
//调用ftp获取返回数据
while (true){
Thread.sleep(1000);
@@ -1440,21 +1445,35 @@
result = Monitor.isFTPFileExist(uuid);
//如果返回true,就退处
if (result.getCode()==200){
- flag = true;
+ flag = 1;
break;
- }else {
+ }else if (result.getCode()==201){
+ flag = 2;
+ break;
+ }else if (result.getCode()==202){
+ flag = 3;
+ break;
+ }else if (result.getCode()==203){
+ flag = 4;
+ break;
+ }else{
//计数
count++;
//如果超过10s 没有读取到，则退出
- if (count == 10) {
+ if (count == 30) {
break;
}
}
}
- if (flag) {
+ if (flag==1 || flag==2) {
//返回
return R.data(200, null, "新增成功!");
- }else {
+ }else if (flag==3){
+ throw new ServiceException(result.getMsg());
+ }else if (flag==4){
+// return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ return R.data(201, null, "保安证编号不匹配,请核实!");
+ }else{
//返回
return R.data(400, null, "新增失败!");
}
@@ -1535,7 +1554,6 @@
"," + "'" + experience.getCompanyname() + "'" +
"," + "'" + experience.getSecurityid() + "'"
+ ")";
- //FtpUtil.sqlFileUpload(s);
myAsyncService.FTP(s);
}
}
@@ -1578,7 +1596,6 @@
if (null != user1.getFingerprint() && !user1.getFingerprint().equals("")) {
//url 转base64
String base64Url = ImageUtils.imageUrlToBase64(user1.getFingerprint());
- System.out.println("base64Url = " + base64Url);
user1.setFingerprint(base64Url);
}
return R.data(user1);
--
Gitblit v1.9.3