From a9943ed22bd7568924bf98c462139269d873cd8a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 30 Jun 2022 17:40:45 +0800
Subject: [PATCH] 新增保安员证编号批量导入，保安员新增，从业记录同步sql 修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 1121 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 867 insertions(+), 254 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 f64dc8f..5fd639c 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -33,16 +33,14 @@
import lombok.AllArgsConstructor;
import net.sf.json.JSONObject;
import org.apache.commons.codec.Charsets;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.DictCache;
import org.springblade.common.config.FtpConfig;
import org.springblade.common.enums.DictEnum;
import org.springblade.common.excel.CustomCellWriteHeightConfig;
import org.springblade.common.excel.CustomCellWriteWeightConfig;
import org.springblade.common.excel.RowWriteHandler;
-import org.springblade.common.utils.HttpClientUtils;
-import org.springblade.common.utils.HttpReqUtil;
-import org.springblade.common.utils.ImageUtils;
-import org.springblade.common.utils.arg;
+import org.springblade.common.utils.*;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.launch.constant.AppConstant;
@@ -58,6 +56,8 @@
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.FTP.Result;
import org.springblade.modules.accreditation.entity.AccreditationRecords;
import org.springblade.modules.accreditation.service.AccreditationRecordsService;
import org.springblade.modules.dispatcher.entity.Dispatcher;
@@ -86,6 +86,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.*;
@@ -104,11 +105,13 @@
import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import static org.springblade.common.config.FtpConfig.*;
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
+import static org.springblade.modules.FTP.DataHandler.handlerUserInfo;
/**
* 控制器
@@ -142,6 +145,8 @@
private final SecurityPaperService securityPaperService;
private final MyAsyncService myAsyncService;
+
+ private final RedisTemplate redisTemplate;
/**
* 查询单条
@@ -222,22 +227,39 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增或修改", notes = "传入User")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R submit(@Valid @RequestBody User user){
- if (null==user.getId()) {
- //新增
- //密码加密
- if (Func.isNotEmpty(user.getPassword())) {
- user.setPassword(DigestUtil.encrypt(user.getPassword()));
- }
+ public R submit(@Valid @RequestBody User user) {
+ if (null == user.getId()) {
Integer userCount = userService.selectCountAccount(user.getAccount());
if (userCount > 0) {
throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
+ //判断角色
+ if(user.getRoleId().equals("1412226235153731586")){
+ //如果是保安员,默认为无证
+ user.setHold("2");
+ }
user.setTenantId("000000");
+ user.setDispatch("1");
+ //待审查
+ user.setExaminationType("2");
+// String realName = user.getRealName();
+// String cardid = user.getCardid();
+//// user.setAccount(user.getRealName());
+// user.setAccount(realName.substring(0,1)+cardid.substring(cardid.length()-4));
+ //默认在职
user.setStatus(1);
user.setIsDeleted(0);
user.setCreateTime(new Date());
user.setUpdateTime(new Date());
+
+ //密码加密
+ if (Func.isNotEmpty(user.getCardid())) {
+ //取身份证号码后6位作为密码
+ user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
+ }
+ user.setCreateTime(new Date());
+ user.setTenantId("000000");
+
//判断是否为民警 code
if (null != user.getCode() && !user.getCode().equals("")) {
//民警
@@ -249,55 +271,186 @@
Jurisdiction one = jurisdictionService.getOne(Condition.getQueryWrapper(jurisdiction));
user.setJurisdiction(one.getId().toString());
}
- //新增
- userService.save(user);
- //内网同步
- String s = "insert into blade_user(" +
- "id,tenant_id,code,account,password,real_name,phone,sex,role_id,dept_id," +
- "create_time,update_time,cardid,status,is_deleted,jurisdiction) " +
- "values(" + "'" + user.getId() + "'" + "," +
- "'" + user.getTenantId() + "'" + "," +
- "'" + user.getCode() + "'" + "," +
- "'" + user.getAccount() + "'" + "," +
- "'" + user.getPassword() + "'" + "," +
- "'" + user.getRealName() + "'" + "," +
- "'" + user.getPhone() + "'" + "," +
- "'" + user.getSex() + "'" + "," +
- "'" + user.getRoleId() + "'" +
- "," + "'" + user.getDeptId() + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
- "," + "'" + user.getCardid() + "'" +
- "," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getIsDeleted() + "'" +
- "," + "'" + user.getJurisdiction() + "'"
- + ")";
- FtpUtil.sqlFileUpload(s);
- }else {
+ //用户新增
+// boolean status = userService.save(user);
+
+
+ User user1 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
+
+ //生成随机数
+ 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;
+ int flag = 1;
+ Result result = new Result();
+ //调用ftp获取返回数据
+ while (true){
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ //调用ftp获取返回数据
+ result = Monitor.isFTPFileExist(uuid);
+ //如果返回true,就退处
+ if (result.getCode()==200){
+ flag = 1;
+ break;
+ }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 == 60) {
+ System.out.println("等待超时.....................");
+ break;
+ }
+ }
+ }
+ if (flag==1 || flag==2) {
+ //返回
+ return R.data(200, null, "新增成功!");
+ }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, "新增失败!");
+ }
+
+
+ } else {
//修改
User user1 = userService.getById(user.getId());
user.setPassword(user1.getPassword());
user.setUpdateTime(new Date());
- userService.updateById(user);
-
- String s1 =
- "update blade_user set account = " + "'" + user.getAccount() + "'"
- + ",code = " + "'" + user.getCode() + "'"
- + ",real_name = " + "'" + user.getRealName() + "'"
- + ",phone = " + "'" + user.getPhone() + "'"
- + ",sex = " + "'" + user.getSex() + "'"
- + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
- + ",role_id = " + "'" + user.getRoleId() + "'"
- + ",dept_id = " + "'" + user.getDeptId() + "'"
- + ",cardid = " + "'" + user.getCardid() + "'"
- + ",guncode = " + "'" + user.getGuncode() + "'"
- + " " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ boolean b = userService.updateById(user);
+ if (b) {
+ String s1 =
+ "update blade_user set account = " + "'" + user.getAccount() + "'"
+ + ",code = " + "'" + user.getCode() + "'"
+ + ",real_name = " + "'" + user.getRealName() + "'"
+ + ",phone = " + "'" + user.getPhone() + "'"
+ + ",sex = " + "'" + user.getSex() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ + ",role_id = " + "'" + user.getRoleId() + "'"
+ + ",dept_id = " + "'" + user.getDeptId() + "'"
+ + ",cardid = " + "'" + user.getCardid() + "'"
+ + ",guncode = " + "'" + user.getGuncode() + "'"
+ + " " + "where id = " + "'" + user.getId() + "'";
+ myAsyncService.FTP(s1);
+ }
}
//返回
return R.success("成功");
}
+
+ /**
+// * 新增或修改
+// */
+// @PostMapping("/submit")
+// @ApiOperationSupport(order = 4)
+// @ApiOperation(value = "新增或修改", notes = "传入User")
+// //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+// public R submit(@Valid @RequestBody User user) {
+// if (null == user.getId()) {
+// //新增
+// //密码加密
+// if (Func.isNotEmpty(user.getPassword())) {
+// user.setPassword(DigestUtil.encrypt(user.getPassword()));
+// }
+// Integer userCount = userService.selectCountAccount(user.getAccount());
+// if (userCount > 0) {
+// throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+// }
+// user.setTenantId("000000");
+// user.setStatus(1);
+// user.setIsDeleted(0);
+// user.setCreateTime(new Date());
+// user.setUpdateTime(new Date());
+// //判断是否为民警 code
+// if (null != user.getCode() && !user.getCode().equals("")) {
+// //民警
+// //根据 deptId 查询dept信息,公安管理员
+// Dept dept = iDeptService.getById(user.getDeptId());
+// //获取辖区的数据
+// Jurisdiction jurisdiction = new Jurisdiction();
+// jurisdiction.setDeptName(dept.getDeptName());
+// Jurisdiction one = jurisdictionService.getOne(Condition.getQueryWrapper(jurisdiction));
+// user.setJurisdiction(one.getId().toString());
+// }
+// //新增
+// boolean stats = userService.save(user);
+// if (stats) {
+// //内网同步
+// String s = "insert into blade_user(" +
+// "id,tenant_id,code,account,password,real_name,phone,sex,role_id,dept_id," +
+// "create_time,update_time,cardid,status,is_deleted,jurisdiction) " +
+// "values(" + "'" + user.getId() + "'" + "," +
+// "'" + user.getTenantId() + "'" + "," +
+// "'" + user.getCode() + "'" + "," +
+// "'" + user.getAccount() + "'" + "," +
+// "'" + user.getPassword() + "'" + "," +
+// "'" + user.getRealName() + "'" + "," +
+// "'" + user.getPhone() + "'" + "," +
+// "'" + user.getSex() + "'" + "," +
+// "'" + user.getRoleId() + "'" +
+// "," + "'" + user.getDeptId() + "'" +
+// "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
+// "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
+// "," + "'" + user.getCardid() + "'" +
+// "," + "'" + user.getStatus() + "'" +
+// "," + "'" + user.getIsDeleted() + "'" +
+// "," + "'" + user.getJurisdiction() + "'"
+// + ")";
+// myAsyncService.FTP(s);
+// }
+// } else {
+// //修改
+// User user1 = userService.getById(user.getId());
+// user.setPassword(user1.getPassword());
+// user.setUpdateTime(new Date());
+// boolean b = userService.updateById(user);
+// if (b) {
+// String s1 =
+// "update blade_user set account = " + "'" + user.getAccount() + "'"
+// + ",code = " + "'" + user.getCode() + "'"
+// + ",real_name = " + "'" + user.getRealName() + "'"
+// + ",phone = " + "'" + user.getPhone() + "'"
+// + ",sex = " + "'" + user.getSex() + "'"
+// + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+// + ",role_id = " + "'" + user.getRoleId() + "'"
+// + ",dept_id = " + "'" + user.getDeptId() + "'"
+// + ",cardid = " + "'" + user.getCardid() + "'"
+// + ",guncode = " + "'" + user.getGuncode() + "'"
+// + " " + "where id = " + "'" + user.getId() + "'";
+// myAsyncService.FTP(s1);
+// }
+// }
+//
+// //返回
+// return R.success("成功");
+// }
/**
* 修改
@@ -309,8 +462,8 @@
CacheUtil.clear(USER_CACHE);
User user1 = userService.getById(user.getId());
String url = "";
- if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
- if (user.getFingerprint().length()>100) {
+ if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
+ if (user.getFingerprint().length() > 100) {
//指纹图片上传并返回url
String s = uploadBase64String(user);
String[] split = s.split(",");
@@ -321,30 +474,36 @@
}
//判断是否持证
-// if (user.getHold().equals("1") && null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
-// //持证，校验保安证编号是否合法
-// SecurityPaper securityPaper = new SecurityPaper();
-// securityPaper.setIdCardNo(user.getCardid());
-// List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
-// if (securityPaperList.size()>0){
-// boolean status = false;
-// //遍历
-// for (SecurityPaper paper : securityPaperList) {
-// if (paper.getNumber().equals(user.getSecuritynumber())){
-// status = true;
-// }
-// }
-// if (!status){
-// throw new ServiceException("保安证编号不匹配,请核实!");
-// }
-// }else {
-// throw new ServiceException("保安证编号不匹配,请核实!");
-// }
-// }
+ boolean states = false;
+ if (user.getHold().equals("1") && null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
+ //持证，校验保安证编号是否合法
+ SecurityPaper securityPaper = new SecurityPaper();
+ securityPaper.setIdCardNo(user.getCardid());
+ List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
+ if (securityPaperList.size()>0){
+ //遍历
+ for (SecurityPaper paper : securityPaperList) {
+ if (paper.getNumber().equals(user.getSecuritynumber())){
+ states = true;
+ }
+ }
+ if (!states){
+ user.setHold("2");
+// throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ }else {
+// throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ states = false;
+ user.setHold("2");
+ }
+ }
+ if (user.getHold().equals("2")){
+ states = true;
+ }
//如果是离职
- if (null!=user.getStatus()){
- if (user.getStatus().equals(2)){
+ if (null != user.getStatus()) {
+ if (user.getStatus().equals(2)) {
//修改派遣状态
user.setDispatch("1");
//同时将派遣记录中的派遣状态修改
@@ -353,17 +512,18 @@
dispatcher.setUserIds(user.getId().toString());
dispatcher.setStatus(0);
List<Dispatcher> dispatcherList = dispatcherService.list(Condition.getQueryWrapper(dispatcher));
- if (dispatcherList.size()>0){
+ if (dispatcherList.size() > 0) {
dispatcherList.forEach(dispatcher1 -> {
dispatcher1.setStatus(1);
dispatcher1.setUpdateTime(new Date());
- dispatcherService.updateById(dispatcher1);
-
- String s1 =
- "update sys_dispatcher set status = " + "'" + dispatcher1.getStatus() + "'"
- + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher1.getUpdateTime()) + "'"
- + " " + "where id = " + "'" + dispatcher1.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ boolean b = dispatcherService.updateById(dispatcher1);
+ if (b) {
+ String s1 =
+ "update sys_dispatcher set status = " + "'" + dispatcher1.getStatus() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher1.getUpdateTime()) + "'"
+ + " " + "where id = " + "'" + dispatcher1.getId() + "'";
+ myAsyncService.FTP(s1);
+ }
});
}
@@ -375,7 +535,7 @@
experience.setCardid(user.getCardid());
//按id降序
List<Experience> list = experienceService.list(Condition.getQueryWrapper(experience).orderByDesc("id"));
- if (list.size()>0){
+ if (list.size() > 0) {
//如果有多条取第一条更新
Experience experience1 = list.get(0);
//设置离职时间
@@ -386,59 +546,106 @@
String s1 =
"update sys_experience set departureTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience1.getDeparturetime()) + "'"
+ " " + "where id = " + "'" + experience1.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- }else {
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ } else {
//新增
- if (null!=user.getRtime()){
+ if (null != user.getRtime()) {
experience.setEntrytime(user.getRtime());
- }else {
+ } else {
experience.setEntrytime(new Date());
}
experience.setDeparturetime(new Date());
experience.setName(user.getRealName());
- if (null!=user.getReasonForLeav() && !user.getReasonForLeav().equals("")){
+ if (null != user.getReasonForLeav() && !user.getReasonForLeav().equals("")) {
experience.setLeaving(user.getReasonForLeav());
}
experience.setCardid(user.getCardid());
experience.setSecurityid(user.getId().toString());
//新增
- experienceService.save(experience);
-
- //内网同步
- String s = "insert into sys_experience(id,name,entryTime,departureTime,leaving,cardId,companyname,securityId) " +
- "values(" + "'" + experience.getId() + "'" +
- "," + "'" + experience.getName() + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getDeparturetime()) + "'" +
- "," + "'" + experience.getLeaving() + "'" +
- "," + "'" + experience.getCardid() + "'" +
- "," + "'" + experience.getCompanyname() + "'" +
- "," + "'" + experience.getSecurityid() + "'"
- + ")";
- FtpUtil.sqlFileUpload(s);
+ boolean save = experienceService.save(experience);
+ if (save) {
+ //内网同步
+ String s = "insert into sys_experience(id,name,entryTime,departureTime,leaving,cardId,companyname,securityId) " +
+ "values(" + "'" + experience.getId() + "'" +
+ "," + "'" + experience.getName() + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getDeparturetime()) + "'" +
+ "," + "'" + experience.getLeaving() + "'" +
+ "," + "'" + experience.getCardid() + "'" +
+ "," + "'" + experience.getCompanyname() + "'" +
+ "," + "'" + experience.getSecurityid() + "'"
+ + ")";
+ myAsyncService.FTP(s);
+ }
}
- userService.updateById(user);
- //内网更新
- String s1 =
- "update blade_user set status = " + "'" + user.getStatus() + "'"
- + " " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ boolean status = userService.updateById(user);
+ //qfqk 数据推送
+ if (status) {
+ User user2 = new User();
+ user2.setId(user.getId());
+ //删除
+ myAsyncService.deleteUserByQfqk(user2);
+ //内网更新
+ String s1 =
+ "update blade_user set status = " + "'" + user.getStatus() + "'"
+ + " " + "where id = " + "'" + user.getId() + "'";
+ myAsyncService.FTP(s1);
+ }
+
return R.success("修改成功");
}
}
+ int state = 0;
//如果是异常标记
- if (null!=user.getExaminationType() && !user.getExaminationType().equals("")){
+ if (null != user.getExaminationType() && !user.getExaminationType().equals("")) {
if (user.getExaminationType().equals("1")) {
//吊销保安证
user.setHold("3");
+ state = 1;
}
}
user.setPassword(user1.getPassword());
user.setUpdateTime(new Date());
- userService.updateById(user);
+
+ //如果身份证号修改
+ if (!user.getCardid().equals(user1.getCardid())) {
+ //账号,密码也修改
+ user.setAccount(user.getCardid());
+ //获取默认密码配置
+ user.setPassword(user.getCardid().substring(user.getCardid().length() - 6));
+ //加密
+ if (Func.isNotEmpty(user.getPassword())) {
+ user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ }
+ state = 2;
+ }
+
+ //修改
+ boolean status = userService.updateById(user);
+
+ if (status) {
+ if (state == 2) {
+ UserDTO userDTO = new UserDTO();
+ userDTO.setAccount(user.getAccount());
+ userDTO.setCardid(user.getCardid());
+ userDTO.setOldCardid(user1.getCardid());
+ userDTO.setPassword(user.getPassword());
+ userDTO.setRealName(user.getRealName());
+ userDTO.setPhone(user.getPhone());
+ userDTO.setSex(user.getSex());
+ userDTO.setAvatar(user.getAvatar());
+ //推送qfqk
+ myAsyncService.updateUserByAccount(userDTO);
+ } else {
+ myAsyncService.updateUserByQfqk(user);
+ }
+ }
+
+
String rtime;
if (user.getRtime() == null) {
String s1 =
@@ -470,7 +677,8 @@
+ ",guncode = " + "'" + user.getGuncode() + "'"
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
} else {
rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
String s1 =
@@ -503,9 +711,175 @@
+ ",guncode = " + "'" + user.getGuncode() + "'"
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
- return R.success("修改成功");
+ if (!states) {
+ return R.data(201,null,"保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ return R.data(200,null,"修改成功!");
+ }
+
+ /**
+ * 修改保安员信息
+ */
+ @PostMapping("/updateSecurityInfo")
+ public R updateSecurityInfo(@RequestBody User user) throws Exception {
+ User user1 = userService.getById(user.getId());
+ user.setId(user1.getId());
+ user.setUpdateTime(new Date());
+ user.setPassword(user1.getPassword());
+ //创建更新的字符串
+ StringBuilder builder = new StringBuilder();
+ builder.append("update blade-user set update_time = "+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()));
+
+ //姓名
+ if (null != user.getRealName() && !user.getRealName().equals("")) {
+ builder.append(",set real_name = "+user.getRealName());
+ }
+
+ int state = 1;
+ //身份证号码
+ if (null != user.getCardid() && !user.getCardid().equals("")) {
+ //身份证号校验
+ //去除所有空格
+ String cardid = user.getCardid().replaceAll(" ", "");
+ //校验
+ boolean b = IdCardNoUtil.checkIdCardNo(cardid);
+ if(b){
+ user.setCardid(cardid);
+ //账号,密码也修改
+ user.setAccount(user1.getRealName().substring(0,1)+cardid.substring(cardid.length()-4));
+ //获取默认密码配置
+ user.setPassword(user.getCardid().substring(user.getCardid().length() - 6));
+ //加密
+ if (Func.isNotEmpty(user.getPassword())) {
+ user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ }
+ state = 2;
+ builder.append(",set account = "+user.getAccount()+",set cardid = "+user.getCardid()+",set password = "+user.getPassword());
+ }else {
+ throw new ServiceException("导入失败!身份证号码[ "+user.getCardid()+" ]不正确,请核对!");
+ }
+ }
+ //手机号
+ if (null != user.getPhone() && !user.getPhone().equals("")) {
+ builder.append(",set phone = "+user.getPhone());
+ }
+ //指纹url 处理
+ String url = "";
+ if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
+ if (user.getFingerprint().length() > 100) {
+ //指纹图片上传并返回url
+ String s = uploadBase64String(user);
+ String[] split = s.split(",");
+ user.setFingerprint(split[0]);
+ //内网指纹图片url
+ url = split[1];
+ builder.append(",set fingerprint = "+url);
+ }
+ }
+ //头像
+ if (null != user.getAvatar() && !user.getAvatar().equals("")) {
+ String avatar = FtpConfig.ip +"/"+ user.getAvatar().substring(26);
+ System.out.println("头像上传 url = " + avatar);
+ builder.append(",set fingerprint = "+avatar);
+ }
+
+ //名族
+ if (null != user.getNation() && !user.getNation().equals("")) {
+ builder.append(",set nation = "+user.getNation());
+ }
+ //学历
+ if (null != user.getEducation() && !user.getEducation().equals("")) {
+ builder.append(",set education = "+user.getEducation());
+ }
+ //政治面貌
+ if (null != user.getPoliticaloutlook() && !user.getPoliticaloutlook().equals("")) {
+ builder.append(",set politicaloutlook = "+user.getPoliticaloutlook());
+ }
+ //健康状态
+ if (null != user.getHealstats() && !user.getHealstats().equals("")) {
+ builder.append(",set healstats = "+user.getHealstats());
+ }
+ //身高
+ if (null != user.getHeight() && !user.getHeight().equals("")) {
+ builder.append(",set height = "+user.getHeight());
+ }
+ //联系地址
+ if (null != user.getAddress() && !user.getAddress().equals("")) {
+ builder.append(",set address = "+user.getAddress());
+ }
+ //身份证地址
+ if (null != user.getRegistered() && !user.getRegistered().equals("")) {
+ builder.append(",set registered = "+user.getRegistered());
+ }
+
+ //修改
+// boolean status = userService.updateById(user);
+ boolean status = userService.update(user, Wrappers.<User>update().lambda().in(User::getId,user.getId()));
+
+ if (status) {
+ if (state == 2) {
+ UserDTO userDTO = new UserDTO();
+ userDTO.setAccount(user.getAccount());
+ userDTO.setCardid(user.getCardid());
+ userDTO.setOldCardid(user1.getCardid());
+ userDTO.setPassword(user.getPassword());
+ userDTO.setRealName(user.getRealName());
+ userDTO.setPhone(user.getPhone());
+ userDTO.setSex(user.getSex());
+ userDTO.setAvatar(user.getAvatar());
+ //推送qfqk
+ myAsyncService.updateUserByAccount(userDTO);
+ } else {
+ myAsyncService.updateUserByQfqk(user);
+ }
+ }
+ //拼接最终的sql
+ String sql = builder.append(" where id = " + user.getId()).toString();
+ myAsyncService.FTP(sql);
+ //返回
+ return R.data(200,null,"修改成功!");
+ }
+
+ /**
+ * 账号修改
+ * @param user
+ * @return
+ */
+ @PostMapping("/update_account")
+ public R updataAccount(@RequestBody User user){
+ boolean status = false;
+ //校验账户是否重复
+ User user1 = new User();
+ user1.setIsDeleted(0);
+ user1.setStatus(1);
+ user1.setAccount(user.getAccount());
+ List<User> list = userService.list(new QueryWrapper<>(user1));
+ if (list.size()>0){
+ throw new ServiceException("账号：["+user.getAccount()+"]已存在!");
+ }
+ //如果不重复，则进行修改操作
+ //更新用户账户信息
+ status = userService.update(user, Wrappers.<User>update().lambda().in(User::getId,user.getId()));
+// status = userService.updateById(user);
+ if (status){
+ System.out.println("user = " + user);
+ User user2 = userService.getById(user.getId());
+ UserDTO userDTO = new UserDTO();
+ userDTO.setAccount(user.getAccount());
+ userDTO.setPassword(user2.getPassword());
+ userDTO.setSecurityId(user2.getId().toString());
+ userDTO.setRealName(user1.getRealName());
+ userDTO.setPhone(user2.getPhone());
+ userDTO.setCardid(user2.getCardid());
+ userDTO.setSex(user1.getSex());
+ //异步修改群防群控
+ myAsyncService.updateUserByAccount(userDTO);
+ }
+ //返回
+ return R.status(status);
}
@@ -515,8 +889,8 @@
@PostMapping("/updateUserInfo")
public R updateUserInfo(@Valid @RequestBody UserVO user) throws Exception {
String url = null;
- if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
- if (user.getFingerprint().length()>100) {
+ if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
+ if (user.getFingerprint().length() > 100) {
//指纹图片上传并返回url
String s = uploadBase64String(user);
String[] split = s.split(",");
@@ -530,13 +904,13 @@
userService.updateById(user);
//生成签到记录
- if (null!=user.getCandidateNo() && !user.getCandidateNo().equals("")){
+ if (null != user.getCandidateNo() && !user.getCandidateNo().equals("")) {
//查询签到记录，如果已有，则更新，没有就新增
SignInRecords signInRecords = new SignInRecords();
signInRecords.setCandidateNo(user.getCandidateNo());
SignInRecords inRecordsServiceOne = signInRecordsService.getOne(Condition.getQueryWrapper(signInRecords));
//如果为null
- if (null==inRecordsServiceOne){
+ if (null == inRecordsServiceOne) {
//查询报名信息
TrainingRegistration trainingRegistration = new TrainingRegistration();
trainingRegistration.setCandidateNo(user.getCandidateNo());
@@ -551,7 +925,7 @@
sign.setExamId(Long.parseLong(one.getTrainExamId()));
//新增
signInRecordsService.save(sign);
- }else {
+ } else {
//更新
inRecordsServiceOne.setUpdateTime(new Date());
signInRecordsService.updateById(inRecordsServiceOne);
@@ -575,17 +949,19 @@
+ ",hold = " + "'" + user.getHold() + "'"
+ ",cell = " + "'" + user.getCell() + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
return R.success("修改成功");
}
/**
* 指纹图片上传
+ *
* @return
* @throws Exception
*/
- private String uploadBase64String (User user)throws Exception{
+ private String uploadBase64String(User user) throws Exception {
//图片上传
BASE64Decoder decoder = new BASE64Decoder();
// 解密
@@ -597,7 +973,7 @@
}
}
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
+ String url = "http://61.131.136.25:2081";
String access = "zhbaadmin";
String secret = "zhbapassword";
String bucket = "zhba";
@@ -613,7 +989,7 @@
minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
}
- String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "")+".jpg";
+ String newName = "upload/picture/f" + UUID.randomUUID().toString().replaceAll("-", "") + ".jpg";
InputStream in = new ByteArrayInputStream(b);
String[] split = newName.split("/");
//创建头部信息
@@ -630,11 +1006,11 @@
FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
in.close();
//外围url
- String urls = "http://223.82.109.183:2081/zhba/" + newName;
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
//内网
String inUrl = FtpConfig.ip + "/zhba/" + newName;
//返回
- return urls+","+inUrl;
+ return urls + "," + inUrl;
}
@@ -662,7 +1038,7 @@
accreditationRecords.setStatus(1);
//查询
List<AccreditationRecords> list = accreditationRecordsService.list(Condition.getQueryWrapper(accreditationRecords));
- if (list.size()>0) {
+ if (list.size() > 0) {
//排序
List<AccreditationRecords> collect = list.stream().sorted(Comparator.comparing(AccreditationRecords::getId).reversed()).collect(Collectors.toList());
//取出第一个
@@ -679,9 +1055,10 @@
+ ",user_type = " + "'" + user.getUserType() + "'"
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user.getId() + "';" +
- "update sys_accreditation_records set status = " + "'" + accreditationRecords1.getStatus() + "'" +
+ "update sys_accreditation_records set status = " + "'" + accreditationRecords1.getStatus() + "'" +
" " + "where id = " + "'" + accreditationRecords1.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
//返回
return R.success("修改成功");
}
@@ -691,7 +1068,8 @@
+ ",user_type = " + "'" + user.getUserType() + "'"
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
return R.success("修改成功");
}
@@ -706,9 +1084,17 @@
CacheUtil.clear(USER_CACHE);
List<String> list = Arrays.asList(ids.split(","));
list.forEach(id -> {
+ User user = userService.getById(id);
+ User user1 = new User();
+ user1.setId(user.getId());
+// user1.setCardid(user.getCardid());
+ user1.setIsDeleted(1);
+ //qfqk 同步
+ myAsyncService.deleteUserByQfqk(user1);
//内网同步
String s1 = "update blade_user set is_deleted = 1 where id = " + "'" + id + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
});
return R.status(userService.removeUser(ids));
}
@@ -780,8 +1166,8 @@
@PostMapping("import-user")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入用户", notes = "传入excel")
- public R importUser(MultipartFile file, Integer isCovered,String deptId) {
- UserImporter userImporter = new UserImporter(userService, false,deptId);
+ public R importUser(MultipartFile file, Integer isCovered, String deptId) {
+ UserImporter userImporter = new UserImporter(userService, false, deptId);
ExcelUtil.save(file, userImporter, UserExcel.class);
return R.success("操作成功");
}
@@ -793,8 +1179,8 @@
@PostMapping("import-qrCode")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入用户", notes = "传入excel")
- public R importQrCode(@RequestParam("file") MultipartFile file, Integer isCovered,String deptId) {
- QrCodeImporter qrCodeImporter = new QrCodeImporter(userService, false,deptId);
+ public R importQrCode(@RequestParam("file") MultipartFile file, Integer isCovered, String deptId) {
+ QrCodeImporter qrCodeImporter = new QrCodeImporter(userService, false, deptId);
ExcelUtil.save(file, qrCodeImporter, QrCodeExcel.class);
return R.success("操作成功");
}
@@ -806,8 +1192,8 @@
@PostMapping("import-security")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入用户", notes = "传入excel")
- public R importSecurity(MultipartFile file, Integer isCovered,String deptId) {
- SecurityImporter securityImporter = new SecurityImporter(userService, false,deptId);
+ public R importSecurity(MultipartFile file, Integer isCovered, String deptId) {
+ SecurityImporter securityImporter = new SecurityImporter(userService, false, deptId);
ExcelUtil.save(file, securityImporter, SecurityExcel.class);
return R.success("操作成功");
}
@@ -818,8 +1204,8 @@
@PostMapping("import-security-test")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入用户", notes = "传入excel")
- public R importSecurityTest(MultipartFile file, Integer isCovered,String deptId) {
- SecurityImporterTest securityImporter = new SecurityImporterTest(userService, false,deptId);
+ public R importSecurityTest(MultipartFile file, Integer isCovered, String deptId) {
+ SecurityImporterTest securityImporter = new SecurityImporterTest(userService);
ExcelUtil.save(file, securityImporter, SecurityExcel.class);
return R.success("操作成功");
}
@@ -830,8 +1216,8 @@
@PostMapping("import-securityYy")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入用户", notes = "传入excel")
- public R importSecurityYy(MultipartFile file, Integer isCovered,String deptId) {
- SecurityYyImporter securityYyImporter = new SecurityYyImporter(userService, false,deptId);
+ public R importSecurityYy(MultipartFile file, Integer isCovered, String deptId) {
+ SecurityYyImporter securityYyImporter = new SecurityYyImporter(userService, false, deptId);
ExcelUtil.save(file, securityYyImporter, SecurityYyExcel.class);
return R.success("操作成功");
}
@@ -910,7 +1296,7 @@
try {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
- fileName = URLEncoder.encode("保安员导入数据模板"+DateUtil.time(), Charsets.UTF_8.name());
+ fileName = URLEncoder.encode("保安员导入数据模板" + DateUtil.time(), Charsets.UTF_8.name());
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
//修改单元格格式为文本格式
EasyExcel.write(response.getOutputStream(), SecurityExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
@@ -955,7 +1341,7 @@
try {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
- fileName = URLEncoder.encode("保安员导入数据模板"+DateUtil.time(), Charsets.UTF_8.name());
+ fileName = URLEncoder.encode("保安员导入数据模板" + DateUtil.time(), Charsets.UTF_8.name());
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
//修改单元格格式为文本格式
EasyExcel.write(response.getOutputStream(), SecurityYyExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
@@ -1057,6 +1443,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);
}
@@ -1079,7 +1466,7 @@
}
@GetMapping("/zc")
- public R zc(String username, String password,String phone) {
+ public R zc(String username, String password, String phone) {
User user = new User();
user.setTenantId("000000");
user.setAccount(username);
@@ -1107,6 +1494,7 @@
user.setDispatch("1");
user.setExaminationType("0");
user.setAccount(user.getCardid());
+ user.setStatus(1);
User user1 = new User();
user1.setIsDeleted(0);
@@ -1115,11 +1503,11 @@
List<User> list = userService.list(Condition.getQueryWrapper(user1));
if (list.size() > 0 && Func.isEmpty(user.getId())) {
- if (null!=user.getCell() && !user.getCell().equals("")) {
- if (user.getCell().equals("2")){
+ if (null != user.getCell() && !user.getCell().equals("")) {
+ if (user.getCell().equals("2")) {
list.forEach(user2 -> {
//判断是否在本单位，如果是本单位,则不能再次新增
- if(!user2.getDeptId().equals(user.getDeptId())) {
+ if (!user2.getDeptId().equals(user.getDeptId())) {
user2.setStatus(2);
//先将原有人员离职 cell 1:手动录入 2：自动录入
user2.setUpdateTime(new Date());
@@ -1128,47 +1516,52 @@
String s1 = "update blade_user set status = " + user2.getStatus() +
",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'" +
" where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
//人员离职后修改派遣记录，修改从业记录
updateUserDispatcherExp(user2);
- }else {
+ } else {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
});
- }else {
+ } else {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
- }else {
+ } else {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
}
//判断是否持证
-// if (user.getHold().equals("1")){
-// //持证，校验保安证编号是否合法
-// SecurityPaper securityPaper = new SecurityPaper();
-// securityPaper.setIdCardNo(user.getCardid());
-// List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
-// if (securityPaperList.size()>0){
-// boolean status = false;
-// //遍历
-// for (SecurityPaper paper : securityPaperList) {
-// if (paper.getNumber().equals(user.getSecuritynumber())){
-// status = true;
-// }
-// }
-// if (!status){
-// throw new ServiceException("保安证编号不匹配,请核实!");
-// }
-// }else {
-// throw new ServiceException("保安证编号不匹配,请核实!");
-// }
-// }
+ boolean state = false;
+ if (user.getHold().equals("1")){
+ //持证，校验保安证编号是否合法
+ SecurityPaper securityPaper = new SecurityPaper();
+ securityPaper.setIdCardNo(user.getCardid());
+ List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
+ if (securityPaperList.size()>0){
+ //遍历
+ for (SecurityPaper paper : securityPaperList) {
+ if (paper.getNumber().equals(user.getSecuritynumber())){
+ state = true;
+ }
+ }
+ if (!state){
+ user.setHold("2");
+ user.setSecuritynumber(null);
+ }
+ }else {
+ user.setHold("2");
+ user.setSecuritynumber(null);
+ }
+ }else {
+ state = true;
+ }
String url = "";
- if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
- if (user.getFingerprint().length()>100) {
+ if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
+ if (user.getFingerprint().length() > 100) {
String s = uploadBase64String(user);
String[] split = s.split(",");
user.setFingerprint(split[0]);
@@ -1207,15 +1600,8 @@
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("")) {
+ if (null != user.getAvatar() && !user.getAvatar().equals("")) {
user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
}
@@ -1223,59 +1609,58 @@
//1.群访群控数据推送(异步)
if (status) {
myAsyncService.qfqkUserSave(user);
+ //2.内网数据推送
+ String s = "insert into blade_user(" +
+ "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
+ "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
+ "politicaloutlook,healstats,height,address,registered,rtime," +
+ "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,guncode,create_time,cell) " +
+ "values(" + "'" + user.getId() + "'" +
+ "," + "'" + user.getTenantId() + "'" +
+ "," + "'" + user.getAccount() + "'" +
+ "," + "'" + user.getPassword() + "'" +
+ "," + "'" + user.getName() + "'" +
+ "," + "'" + user.getRealName() + "'" +
+ "," + "'" + user.getAvatar() + "'" +
+ "," + "'" + user.getEmail() + "'" +
+ "," + "'" + user.getPhone() + "'" +
+ "," + "'" + user.getSex() + "'" +
+ "," + "'" + user.getRoleId() + "'" +
+ "," + "'" + user.getDeptId() + "'" +
+ "," + "'" + user.getCardid() + "'" +
+ "," + "'" + user.getNativeplace() + "'" +
+ "," + "'" + user.getNation() + "'" +
+ "," + "'" + url + "'" +
+ "," + "'" + user.getEducation() + "'" +
+ "," + "'" + user.getPoliticaloutlook() + "'" +
+ "," + "'" + user.getHealstats() + "'" +
+ "," + "'" + user.getHeight() + "'" +
+ "," + "'" + user.getAddress() + "'" +
+ "," + "'" + user.getRegistered() + "'" +
+ "," + "'" + rtime + "'" +
+ "," + "'" + user.getSecuritynumber() + "'" +
+ "," + "'" + user.getHold() + "'" +
+ "," + "'" + user.getJurisdiction() + "'" +
+ "," + "'" + user.getExaminationType() + "'" +
+ "," + "'" + user.getStatus() + "'" +
+ "," + "'" + user.getIsDeleted() + "'" +
+ "," + "'" + user.getDispatch() + "'" +
+ "," + "'" + user.getGuncode() + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
+ "," + "'" + user.getCell() + "'" + ");" +
+ "insert into sys_experience(id,name,post,entryTime," +
+ "cardId,companyname,securityId) " +
+ "values(" + "'" + experience.getId() + "'" + "," +
+ "'" + experience.getName() + "'" + "," +
+ "'" + experience.getPost() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
+ "," + "'" + experience.getCardid() + "'" +
+ "," + "'" + experience.getCompanyname() + "'" +
+ "," + "'" + experience.getSecurityid() + "'"
+ + ")";
+ myAsyncService.FTP(s);
}
-
- //2.内网数据推送
- String s = "insert into blade_user(" +
- "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
- "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
- "politicaloutlook,healstats,height,address,registered,rtime," +
- "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,guncode,create_time,cell) " +
- "values(" + "'" + user.getId() + "'" +
- "," + "'" + user.getTenantId() + "'" +
- "," + "'" + user.getAccount() + "'" +
- "," + "'" + user.getPassword() + "'" +
- "," + "'" + user.getName() + "'" +
- "," + "'" + user.getRealName() + "'" +
- "," + "'" + user.getAvatar() + "'" +
- "," + "'" + user.getEmail() + "'" +
- "," + "'" + user.getPhone() + "'" +
- "," + "'" + user.getSex() + "'" +
- "," + "'" + user.getRoleId() + "'" +
- "," + "'" + user.getDeptId() + "'" +
- "," + "'" + user.getCardid() + "'" +
- "," + "'" + user.getNativeplace() + "'" +
- "," + "'" + user.getNation() + "'" +
- "," + "'" + url + "'" +
- "," + "'" + user.getEducation() + "'" +
- "," + "'" + user.getPoliticaloutlook() + "'" +
- "," + "'" + user.getHealstats() + "'"+
- "," + "'" + user.getHeight() + "'" +
- "," + "'" + user.getAddress() + "'" +
- "," + "'" + user.getRegistered() + "'" +
- "," +"'" + rtime + "'" +
- "," + "'" + user.getSecuritynumber() + "'" +
- "," + "'" + user.getHold() + "'" +
- "," + "'" + user.getJurisdiction() + "'" +
- "," + "'" + user.getExaminationType() + "'" +
- "," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getIsDeleted() + "'" +
- "," + "'" + user.getDispatch() + "'" +
- "," + "'" + user.getGuncode() + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
- "," + "'" + user.getCell() + "'" + ");"+
- "insert into sys_experience(id,name,post,entryTime," +
- "cardId,companyname,securityId) " +
- "values(" + "'" + experience.getId() + "'" + "," +
- "'" + experience.getName() + "'" + "," +
- "'" + experience.getPost() + "'" + "," +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
- "," + "'" + experience.getCardid() + "'" +
- "," + "'" + experience.getCompanyname() + "'" +
- "," + "'" + experience.getSecurityid() + "'"
- + ")";
- FtpUtil.sqlFileUpload(s);
//获取从业记录
// List<Experience> experiences = (List<Experience>) userMap.get("userPractitionersInfo");
@@ -1292,11 +1677,210 @@
// }
// }
//判断是否持证是否为空
- return R.status(status);
+ if (!state) {
+ return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ return R.data(200,null,"新增成功!");
+ }
+
+ /**
+ * 保安员新增(外网不能存敏感数据)
+ * @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("2");
+ String realName = user.getRealName();
+ String cardid = user.getCardid();
+// user.setAccount(user.getRealName());
+ user.setAccount(realName.substring(0,1)+cardid.substring(cardid.length()-4));
+ user.setStatus(1);
+
+ //密码加密
+ 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 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
+ //头像
+ 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;
+// int flag = 1;
+// Result result0 = new Result();
+// //调用ftp获取返回数据
+// while (true){
+// System.out.println("用户新增开始接收消息......................");
+// Thread.sleep(2000);
+// //调用ftp获取返回数据
+// result0 = Monitor.isFTPFileExist(uuid);
+// System.out.println("result0 ftp 返回结果 = " + result0);
+// //如果返回true,就退处
+// if (result0.getCode()==200){
+// break;
+// }else{
+// //计数
+// count++;
+// //如果超过60s 没有读取到，则退出
+// if (count == 20) {
+// break;
+// }
+// }
+// }
+//
+// //将不能导入的保安员账号存起来
+// List<String> errorList = new ArrayList<>();
+// //保安员证编号不符的保安员信息存入集合
+// List<String> securityInvalidList = new ArrayList<>();
+// //导入状态，默认为true ,如果有一个出现问题则为 false
+// AtomicBoolean status = new AtomicBoolean(true);
+// AtomicBoolean securityInvalidStatus = new AtomicBoolean(true);
+// if (null!=result0){
+// Result result = result0.getData().get(0);
+// //用户数处理
+// User users = handlerUserInfo(uuid);
+// System.out.println("用户数据处理---------------");
+// System.out.println("用户数据 = " + users);
+// //判断结果
+// if (result.getCode()==200){
+// //新增
+// users.setId(result.getUserId());
+// users.setStatus(1);
+// //插入数据库
+// boolean save = userService.save(users);
+// if (save){
+// //异步同步到群防群控
+// myAsyncService.qfqkUserSave(users);
+// }
+// }else if (result.getCode()==201) {
+// //修改
+// users.setId(result.getUserId());
+// //先查询当前库是否有改用户？
+// User user2 = userService.getById(result.getUserId());
+// if (null!=user2) {
+// //数据修改
+// boolean b = userService.updateById(users);
+// if (b) {
+// //异步同步到群防群控
+// myAsyncService.updateUserByQfqk(users);
+// }
+// }else {
+// //新增
+// boolean save = userService.save(users);
+// if (save){
+// //异步同步到群防群控
+// myAsyncService.qfqkUserSave(users);
+// }
+// }
+// }else if (result.getCode()==203){
+// //保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 用户为新增
+// //新增
+// users.setId(result.getUserId());
+// //插入数据库
+// boolean save = userService.save(users);
+// if (save) {
+// //异步同步到群防群控
+// myAsyncService.qfqkUserSave(users);
+// }
+// securityInvalidStatus.set(false);
+// //保安证编号不匹配
+// securityInvalidList.add(user.getCardid());
+// }else if (result.getCode()==204){
+// //保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 内网用户已存在情况
+// users.setId(result.getUserId());
+// //先查询当前库是否有改用户？
+// User user2 = userService.getById(result.getUserId());
+// //判断
+// if (null!=user2) {
+// //修改
+// //数据修改
+// boolean b = userService.updateById(users);
+// if (b){
+// //异步同步到群防群控
+// myAsyncService.updateUserByQfqk(users);
+// }
+// }else {
+// //新增
+// boolean save = userService.save(users);
+// if (save){
+// //异步同步到群防群控
+// myAsyncService.qfqkUserSave(users);
+// }
+// }
+// securityInvalidStatus.set(false);
+// //保安证编号不匹配
+// securityInvalidList.add(user.getCardid());
+// }else {
+// status.set(false);
+// //已在其他单位存在
+// errorList.add(user.getCardid());
+// }
+// }
+
+ //如果所有数据导入有一个异常
+// StringBuilder errorBuilder = new StringBuilder();
+// if (!status.get()){
+// String errorAccount = StringUtils.join(errorList, "\\\n");
+// errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
+// }
+// //抛出异常
+// if (errorBuilder.length()>0){
+// throw new org.springblade.core.log.exception.ServiceException(errorBuilder.toString());
+// }
+//
+// if (!securityInvalidStatus.get()){
+//// return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+// return R.data(201, null, "保安证编号不匹配,请核实!");
+// }
+ return R.data(200, null, "新增成功!");
}
/**
* 修改派遣记录，修改从业记录
+ *
* @param user
*/
private void updateUserDispatcherExp(User user) {
@@ -1308,7 +1892,7 @@
dispatcher.setUserIds(user.getId().toString());
dispatcher.setStatus(0);
List<Dispatcher> dispatcherList = dispatcherService.list(Condition.getQueryWrapper(dispatcher));
- if (dispatcherList.size()>0){
+ if (dispatcherList.size() > 0) {
dispatcherList.forEach(dispatcher1 -> {
dispatcher1.setStatus(1);
dispatcher1.setUpdateTime(new Date());
@@ -1316,7 +1900,8 @@
"update sys_dispatcher set status = " + "'" + dispatcher1.getStatus() + "'"
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher1.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + dispatcher1.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
});
}
@@ -1327,7 +1912,7 @@
experience.setCompanyname(dept.getDeptName());
//按id降序
List<Experience> list = experienceService.list(Condition.getQueryWrapper(experience).orderByDesc("id"));
- if (list.size()>0){
+ if (list.size() > 0) {
//如果有多条取第一条更新
Experience experience1 = list.get(0);
//设置离职时间
@@ -1338,17 +1923,18 @@
String s1 =
"update sys_experience set departureTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience1.getDeparturetime()) + "'"
+ " " + "where id = " + "'" + experience1.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- }else {
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
+ } else {
//新增
- if (null!=user.getRtime()){
+ if (null != user.getRtime()) {
experience.setEntrytime(user.getRtime());
- }else {
+ } else {
experience.setEntrytime(new Date());
}
experience.setDeparturetime(new Date());
experience.setName(user.getRealName());
- if (null!=user.getReasonForLeav() && !user.getReasonForLeav().equals("")){
+ if (null != user.getReasonForLeav() && !user.getReasonForLeav().equals("")) {
experience.setLeaving(user.getReasonForLeav());
}
experience.setCardid(user.getCardid());
@@ -1358,8 +1944,8 @@
//内网同步
String s = "insert into sys_experience(id,name,entryTime,departureTime,leaving,cardId,companyname,securityId) " +
- "values(" + "'" + experience.getId() + "'" + "," +
- "'" + experience.getName() + "'" + "," +
+ "values(" + "'" + experience.getId() + "'" +
+ "," + "'" + experience.getName() + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getDeparturetime()) + "'" +
"," + "'" + experience.getLeaving() + "'" +
@@ -1367,7 +1953,7 @@
"," + "'" + experience.getCompanyname() + "'" +
"," + "'" + experience.getSecurityid() + "'"
+ ")";
- FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
}
}
@@ -1399,16 +1985,16 @@
/**
* 用户详情
+ *
* @param user
* @return
*/
@GetMapping("/details")
public R details(User user) {
User user1 = userService.getById(user.getId());
- if (null!=user1.getFingerprint() && !user1.getFingerprint().equals("")){
+ 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);
@@ -1417,20 +2003,21 @@
/**
* 保安员导出
+ *
* @param response
- * @param user 查询条件
+ * @param user 查询条件
*/
@GetMapping("export-security-info")
- public void exportSecurityInfo(HttpServletResponse response,UserVO user) throws IOException {
- List<SecurityExcel> list = userService.exportSecurityInfo(user);
+ public void exportSecurityInfo(HttpServletResponse response, UserVO user) throws IOException {
+ List<ExportSecurityExcel> list = userService.exportSecurityInfo(user);
String fileName = null;
try {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
- fileName = URLEncoder.encode("保安员数据导出"+DateUtil.time(), Charsets.UTF_8.name());
+ fileName = URLEncoder.encode("保安员数据导出" + DateUtil.time(), Charsets.UTF_8.name());
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
//修改单元格格式为文本格式
- EasyExcel.write(response.getOutputStream(), SecurityExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
+ EasyExcel.write(response.getOutputStream(), ExportSecurityExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
} catch (Throwable var6) {
throw var6;
}
@@ -1440,6 +2027,7 @@
/**
* 保安员账号校验
+ *
* @param user
* @return
*/
@@ -1451,15 +2039,15 @@
user1.setIsDeleted(0);
user1.setStatus(1);
User user2 = userService.getOne(Condition.getQueryWrapper(user1));
- if (null!=user2){
+ if (null != user2) {
//判断是单位否一致
- if (null!=user.getDeptId() && !user.getDeptId().equals("")) {
+ if (null != user.getDeptId() && !user.getDeptId().equals("")) {
if (!user2.getDeptId().equals(user.getDeptId())) {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已在其他单位录入!", user.getCardid()));
} else {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getCardid()));
}
- }else {
+ } else {
//没有传 deptId 的情况
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getCardid()));
}
@@ -1468,13 +2056,38 @@
/**
* 年龄分布查询
+ *
* @param user
* @return
*/
@PostMapping("/getAgeStatistics")
- public R getAgeStatistics(UserVO user){
+ public R getAgeStatistics(UserVO user) {
return R.data(userService.getAgeStatistics(user));
}
+ /**
+ * 查询登录密码还是 123456 的单位信息
+ *
+ * @return
+ */
+ @GetMapping("/getNotUpdatePwdInfo")
+ public R getNotUpdatePwdInfo() {
+ return R.data(userService.getNotUpdatePwdInfo());
+ }
+
+ /**
+ * 用户手动离职（用户数据未同步成功的）
+ * @param user
+ * @return
+ */
+ @GetMapping("/leave")
+ public void leave(User user){
+ user.setStatus(2);
+ String s1 =
+ "update blade_user set status = " + "'" + user.getStatus() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'"
+ + " " + "where cardid = " + "'" + user.getCardid() + "'";
+ myAsyncService.FTP(s1);
+ }
}
--
Gitblit v1.9.3