From 6934ffe9ae5aa3e0096a7028d3b70b07e08294aa Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 26 Apr 2022 20:43:14 +0800
Subject: [PATCH] ftp 修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 94 insertions(+), 7 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 c7643ed..8ee27f2 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -58,6 +58,7 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.FTP.Monitor;
import org.springblade.modules.accreditation.entity.AccreditationRecords;
import org.springblade.modules.accreditation.service.AccreditationRecordsService;
import org.springblade.modules.dispatcher.entity.Dispatcher;
@@ -86,6 +87,7 @@
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.service.TrainingRegistrationService;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -142,6 +144,8 @@
private final SecurityPaperService securityPaperService;
private final MyAsyncService myAsyncService;
+
+ private final RedisTemplate redisTemplate;
/**
* 查询单条
@@ -1283,13 +1287,6 @@
experience.setPost("保安员");
experienceService.save(experience);
-
- //发证日期处理
-// if (user.getPaperTime() == null) {
-// paperTime = "";
-// } else {
-// paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
-// }
//头像
if (null != user.getAvatar() && !user.getAvatar().equals("")) {
user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
@@ -1374,6 +1371,96 @@
}
/**
+ * 保安员新增(外网不能存敏感数据)
+ * @since 2022-04-26
+ * @param userMap
+ */
+ @PostMapping("/securitySaves")
+ @Transactional(rollbackFor = Exception.class)
+ public R securitySaves(@Valid @RequestBody Map<String, Object> userMap) throws Exception {
+ //获取user
+ User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")), User.class);
+
+ //分配保安角色
+ Role role = new Role();
+ role.setRoleAlias("保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
+ user.setDispatch("1");
+ user.setExaminationType("0");
+ user.setAccount(user.getCardid());
+
+ //密码加密
+ if (Func.isNotEmpty(user.getCardid())) {
+ //取身份证号码后6位作为密码
+ user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
+ }
+ user.setCreateTime(new Date());
+ user.setTenantId("000000");
+ //用户新增
+// boolean status = userService.save(user);
+
+
+ User user1 = user;
+ //头像
+ if (null != user.getAvatar() && !user.getAvatar().equals("")) {
+ user1.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
+ }
+ //指纹
+ String url = "";
+ if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
+ if (user.getFingerprint().length() > 100) {
+ String s = uploadBase64String(user);
+ String[] split = s.split(",");
+ user.setFingerprint(split[0]);
+ url = split[1];
+ user1.setFingerprint(url);
+ }
+ }
+
+ //生成随机数
+ String uuid = UUID.randomUUID().toString();
+ //将 user 存入 redis
+ redisTemplate.opsForValue().set(uuid,JSON.toJSONString(user));
+ //user1 临时设置uuid 到 reason_for_leav 离职原因字段
+ user1.setReasonForLeav(uuid);
+
+ //数据推送
+ Map<String, Object> map = new HashMap<>(1);
+ map.put("user",user1);
+ myAsyncService.FTPObject(map);
+
+ int count = 0;
+ boolean flag = false;
+ R result = new R();
+ //调用ftp获取返回数据
+ while (true){
+ Thread.sleep(1000);
+ //调用ftp获取返回数据
+ result = Monitor.isFTPFileExist(uuid);
+ //如果返回true,就退处
+ if (result.getCode()==200){
+ flag = true;
+ break;
+ }else {
+ //计数
+ count++;
+ //如果超过10s 没有读取到，则退出
+ if (count == 10) {
+ break;
+ }
+ }
+ }
+ if (flag) {
+ //返回
+ return R.data(200, null, "新增成功!");
+ }else {
+ //返回
+ return R.data(400, null, "新增失败!");
+ }
+ }
+
+ /**
* 修改派遣记录，修改从业记录
*
* @param user
--
Gitblit v1.9.3