From a491941cece9a90d72c9c6b0aab0e718e39dbd3c Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Mon, 22 Aug 2022 15:54:22 +0800
Subject: [PATCH] 从业记录新增同步sql 修改，用户新增审查逻辑修改，外网部门只更新状态，不更新审查明细，内网状态和明细都更新
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 881 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 684 insertions(+), 197 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 b8a4132..cce72a2 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -31,13 +31,17 @@
import io.swagger.annotations.ApiParam;
import com.alibaba.fastjson.JSON;
import lombok.AllArgsConstructor;
+import net.sf.json.JSONObject;
import org.apache.commons.codec.Charsets;
import org.springblade.common.cache.DictCache;
+import org.springblade.common.config.FileConfig;
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.core.cache.utils.CacheUtil;
@@ -55,6 +59,8 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.accreditation.entity.AccreditationRecords;
+import org.springblade.modules.accreditation.service.AccreditationRecordsService;
import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.dispatcher.service.IDispatcherService;
import org.springblade.modules.exam.excel.ExportExamScoreExcel;
@@ -62,6 +68,11 @@
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
import org.springblade.modules.jurisdiction.service.JurisdictionService;
+import org.springblade.modules.securitypaper.entity.SecurityPaper;
+import org.springblade.modules.securitypaper.service.SecurityPaperService;
+import org.springblade.modules.signinrecords.entity.SignInRecords;
+import org.springblade.modules.signinrecords.service.SignInRecordsService;
+import org.springblade.modules.system.dto.UserDTO;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
@@ -70,9 +81,13 @@
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
+import org.springblade.modules.training.entity.TrainingRegistration;
+import org.springblade.modules.training.service.TrainingRegistrationService;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -90,6 +105,7 @@
import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
import static org.springblade.common.config.FtpConfig.*;
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
@@ -115,6 +131,18 @@
private final JurisdictionService jurisdictionService;
private final IDispatcherService dispatcherService;
+
+ private final SignInRecordsService signInRecordsService;
+
+
+ private final TrainingRegistrationService trainingRegistrationService;
+
+ private final AccreditationRecordsService accreditationRecordsService;
+
+
+ private final SecurityPaperService securityPaperService;
+
+ private final MyAsyncService myAsyncService;
/**
* 查询单条
@@ -195,8 +223,8 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增或修改", notes = "传入User")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R submit(@Valid @RequestBody User user){
- if (null==user.getId()) {
+ public R submit(@Valid @RequestBody User user) {
+ if (null == user.getId()) {
//新增
//密码加密
if (Func.isNotEmpty(user.getPassword())) {
@@ -223,49 +251,52 @@
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 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.dataSync(s);
+ }
+ } 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.dataSync(s1);
+ }
}
//返回
@@ -281,9 +312,9 @@
public R update(@Valid @RequestBody User user) throws Exception {
CacheUtil.clear(USER_CACHE);
User user1 = userService.getById(user.getId());
- String url = null;
- if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
- if (user.getFingerprint().length()>100) {
+ String url = "";
+ if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
+ if (user.getFingerprint().length() > 100) {
//指纹图片上传并返回url
String s = uploadBase64String(user);
String[] split = s.split(",");
@@ -293,9 +324,37 @@
}
}
+ //判断是否持证
+ 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()==2){
+ if (null != user.getStatus()) {
+ if (user.getStatus().equals(2)) {
//修改派遣状态
user.setDispatch("1");
//同时将派遣记录中的派遣状态修改
@@ -304,60 +363,209 @@
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());
- 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.dataSync(s1);
+ }
});
}
+
+ //查询当前用户是否有从业记录，没有的话新增，有就更新
+ //根据公司名查询单位
+ Dept dept = iDeptService.getById(user.getDeptId());
+ Experience experience = new Experience();
+ experience.setCompanyname(dept.getDeptName());
+ experience.setCardid(user.getCardid());
+ //按id降序
+ List<Experience> list = experienceService.list(Condition.getQueryWrapper(experience).orderByDesc("id"));
+ if (list.size() > 0) {
+ //如果有多条取第一条更新
+ Experience experience1 = list.get(0);
+ //设置离职时间
+ experience1.setDeparturetime(new Date());
+ //更新从业记录信息
+ experienceService.updateById(experience1);
+ //数据同步
+ String s1 =
+ "update sys_experience set departureTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience1.getDeparturetime()) + "'"
+ + " " + "where id = " + "'" + experience1.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ } else {
+ //新增
+ if (null != user.getRtime()) {
+ experience.setEntrytime(user.getRtime());
+ } else {
+ experience.setEntrytime(new Date());
+ }
+ experience.setDeparturetime(new Date());
+ experience.setName(user.getRealName());
+ if (null != user.getReasonForLeav() && !user.getReasonForLeav().equals("")) {
+ experience.setLeaving(user.getReasonForLeav());
+ }
+ experience.setCardid(user.getCardid());
+ experience.setSecurityid(user.getId().toString());
+ //新增
+ 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.dataSync(s);
+ }
+ }
+
+ boolean status = userService.updateById(user);
+ //qfqk 数据推送
+ if (status) {
+ myAsyncService.updateUserByQfqk(user);
+ //内网更新
+ String s1 =
+ "update blade_user set status = " + "'" + user.getStatus() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'"
+ + " " + "where id = " + "'" + user.getId() + "'";
+ myAsyncService.dataSync(s1);
+ }
+ return R.success("修改成功");
+ }
+ }
+
+ int state = 0;
+ //如果是异常标记
+ if (null != user.getExaminationType() && !user.getExaminationType().equals("")) {
+ if (user.getExaminationType().equals("1")) {
+ //吊销保安证
+ user.setHold("3");
+ state = 1;
}
}
user.setPassword(user1.getPassword());
- userService.updateById(user);
- String rtime;
- if (user.getRtime() == null) {
- rtime = null;
- } else {
- rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
+ user.setUpdateTime(new Date());
+
+ //如果身份证号修改
+ 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;
}
- String s1 =
- "update blade_user set account = " + "'" + user.getAccount() + "'"
- + ",name = " + "'" + user.getName() + "'"
- + ",real_name = " + "'" + user.getRealName() + "'"
- + ",avatar = " + "'" + user.getAvatar() + "'"
- + ",email = " + "'" + user.getEmail() + "'"
- + ",phone = " + "'" + user.getPhone() + "'"
- + ",sex = " + "'" + user.getSex() + "'"
- + ",role_id = " + "'" + user.getRoleId() + "'"
- + ",dept_id = " + "'" + user.getDeptId() + "'"
- + ",cardid = " + "'" + user.getCardid() + "'"
- + ",nativePlace = " + "'" + user.getNativeplace() + "'"
- + ",nation = " + "'" + user.getNation() + "'"
- + ",education = " + "'" + user.getEducation() + "'"
- + ",politicaloutlook = " + "'" + user.getPoliticaloutlook() + "'"
- + ",healstats = " + "'" + user.getHealstats() + "'"
- + ",height = " + "'" + user.getHeight() + "'"
- + ",fingerprint = " + "'" + url + "'"
- + ",my_picture = " + "'" + user.getMyPicture() + "'"
- + ",address = " + "'" + user.getAddress() + "'"
- + ",registered = " + "'" + user.getRegistered() + "'"
- + ",rtime = " + "'" + rtime + "'"
- + ",dispatch = " + "'" + user.getDispatch() + "'"
- + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
- + ",hold = " + "'" + user.getHold() + "'"
- + ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
- + ",reason_for_leav = " + "'" + user.getReasonForLeav() + "'"
- + ",guncode = " + "'" + user.getGuncode() + "'"
- + " " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- return R.success("修改成功");
+ //修改
+ 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 =
+ "update blade_user set account = " + "'" + user.getAccount() + "'"
+ + ",name = " + "'" + user.getName() + "'"
+ + ",real_name = " + "'" + user.getRealName() + "'"
+ + ",avatar = " + "'" + user.getAvatar() + "'"
+ + ",email = " + "'" + user.getEmail() + "'"
+ + ",phone = " + "'" + user.getPhone() + "'"
+ + ",sex = " + "'" + user.getSex() + "'"
+ + ",role_id = " + "'" + user.getRoleId() + "'"
+ + ",dept_id = " + "'" + user.getDeptId() + "'"
+ + ",cardid = " + "'" + user.getCardid() + "'"
+ + ",nativePlace = " + "'" + user.getNativeplace() + "'"
+ + ",nation = " + "'" + user.getNation() + "'"
+ + ",education = " + "'" + user.getEducation() + "'"
+ + ",politicaloutlook = " + "'" + user.getPoliticaloutlook() + "'"
+ + ",healstats = " + "'" + user.getHealstats() + "'"
+ + ",height = " + "'" + user.getHeight() + "'"
+ + ",fingerprint = " + "'" + url + "'"
+ + ",my_picture = " + "'" + user.getMyPicture() + "'"
+ + ",address = " + "'" + user.getAddress() + "'"
+ + ",registered = " + "'" + user.getRegistered() + "'"
+ + ",dispatch = " + "'" + user.getDispatch() + "'"
+ + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
+ + ",hold = " + "'" + user.getHold() + "'"
+ + ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
+ + ",reason_for_leav = " + "'" + user.getReasonForLeav() + "'"
+ + ",guncode = " + "'" + user.getGuncode() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ + " " + "where id = " + "'" + user.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ } else {
+ rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
+ String s1 =
+ "update blade_user set account = " + "'" + user.getAccount() + "'"
+ + ",name = " + "'" + user.getName() + "'"
+ + ",real_name = " + "'" + user.getRealName() + "'"
+ + ",avatar = " + "'" + user.getAvatar() + "'"
+ + ",email = " + "'" + user.getEmail() + "'"
+ + ",phone = " + "'" + user.getPhone() + "'"
+ + ",sex = " + "'" + user.getSex() + "'"
+ + ",role_id = " + "'" + user.getRoleId() + "'"
+ + ",dept_id = " + "'" + user.getDeptId() + "'"
+ + ",cardid = " + "'" + user.getCardid() + "'"
+ + ",nativePlace = " + "'" + user.getNativeplace() + "'"
+ + ",nation = " + "'" + user.getNation() + "'"
+ + ",education = " + "'" + user.getEducation() + "'"
+ + ",politicaloutlook = " + "'" + user.getPoliticaloutlook() + "'"
+ + ",healstats = " + "'" + user.getHealstats() + "'"
+ + ",height = " + "'" + user.getHeight() + "'"
+ + ",fingerprint = " + "'" + url + "'"
+ + ",my_picture = " + "'" + user.getMyPicture() + "'"
+ + ",address = " + "'" + user.getAddress() + "'"
+ + ",registered = " + "'" + user.getRegistered() + "'"
+ + ",rtime = " + "'" + rtime + "'"
+ + ",dispatch = " + "'" + user.getDispatch() + "'"
+ + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
+ + ",hold = " + "'" + user.getHold() + "'"
+ + ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
+ + ",reason_for_leav = " + "'" + user.getReasonForLeav() + "'"
+ + ",guncode = " + "'" + user.getGuncode() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ + " " + "where id = " + "'" + user.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ }
+ if (!states) {
+ return R.data(201,null,"保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ return R.data(200,null,"修改成功!");
}
@@ -365,10 +573,10 @@
* 修改
*/
@PostMapping("/updateUserInfo")
- public R updateUserInfo(@Valid @RequestBody User user) throws Exception {
+ 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(",");
@@ -377,8 +585,38 @@
url = split[1];
}
}
-
+ user.setUpdateTime(new Date());
+ //更新
userService.updateById(user);
+
+ //生成签到记录
+ 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) {
+ //查询报名信息
+ TrainingRegistration trainingRegistration = new TrainingRegistration();
+ trainingRegistration.setCandidateNo(user.getCandidateNo());
+ TrainingRegistration one = trainingRegistrationService.getOne(Condition.getQueryWrapper(trainingRegistration));
+ //新增,数据封装
+ SignInRecords sign = new SignInRecords();
+ sign.setCreateTime(new Date());
+ sign.setUpdateTime(new Date());
+ sign.setCandidateNo(user.getCandidateNo());
+ sign.setUserId(user.getId());
+ sign.setApplyId(one.getId());
+ sign.setExamId(Long.parseLong(one.getTrainExamId()));
+ //新增
+ signInRecordsService.save(sign);
+ } else {
+ //更新
+ inRecordsServiceOne.setUpdateTime(new Date());
+ signInRecordsService.updateById(inRecordsServiceOne);
+ }
+ }
//内网同步
String s1 =
@@ -393,19 +631,23 @@
+ ",address = " + "'" + user.getAddress() + "'"
+ ",registered = " + "'" + user.getRegistered() + "'"
+ ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ ",hold = " + "'" + user.getHold() + "'"
+ + ",cell = " + "'" + user.getCell() + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(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();
// 解密
@@ -417,10 +659,10 @@
}
}
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
- String access = "zhbaadmin";
- String secret = "zhbapassword";
- String bucket = "zhba";
+ String url = FileConfig.url;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -433,7 +675,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/" + UUID.randomUUID().toString().replaceAll("-", "") + ".jpg";
InputStream in = new ByteArrayInputStream(b);
String[] split = newName.split("/");
//创建头部信息
@@ -446,15 +688,15 @@
in, in.available(), -1)
.headers(headers)
.build());
- InputStream inputStream = new ByteArrayInputStream(b);
- FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+// InputStream inputStream = new ByteArrayInputStream(b);
+// 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 = FileConfig.url + "/zhba/" + newName;
//内网
String inUrl = FtpConfig.ip + "/zhba/" + newName;
//返回
- return urls+","+inUrl;
+ return urls + "," + inUrl;
}
@@ -464,6 +706,7 @@
@PostMapping("/updatePaperTime")
public R updatePaperTime(@RequestBody User user) {
user.setPaperTime(new Date());
+ user.setUpdateTime(new Date());
userService.updateById(user);
String paperTime = null;
//发证日期处理
@@ -472,11 +715,47 @@
} else {
paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
}
+ //更新制证记录制证状态
+ AccreditationRecords accreditationRecords = new AccreditationRecords();
+ accreditationRecords.setUserId(user.getId());
+ //审核通过的
+ accreditationRecords.setAuditStatus(2);
+ //未制证的记录
+ accreditationRecords.setStatus(1);
+ //查询
+ List<AccreditationRecords> list = accreditationRecordsService.list(Condition.getQueryWrapper(accreditationRecords));
+ if (list.size() > 0) {
+ //排序
+ List<AccreditationRecords> collect = list.stream().sorted(Comparator.comparing(AccreditationRecords::getId).reversed()).collect(Collectors.toList());
+ //取出第一个
+ AccreditationRecords accreditationRecords1 = collect.get(0);
+ //修改为已制证状态
+ accreditationRecords1.setStatus(2);
+ //记录打印时间
+ accreditationRecords1.setPaperTime(new Date());
+ //更新
+ accreditationRecordsService.updateById(accreditationRecords1);
+ //同步
+ String s1 =
+ "update blade_user set paper_time = " + "'" + paperTime + "'"
+ + ",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() + "'" +
+ " " + "where id = " + "'" + accreditationRecords1.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ //返回
+ return R.success("修改成功");
+ }
+
String s1 =
"update blade_user set paper_time = " + "'" + paperTime + "'"
+ ",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.dataSync(s1);
return R.success("修改成功");
}
@@ -491,9 +770,19 @@
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);
+ String s1 = "update blade_user set is_deleted = 1"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'"
+ + " " + "where id = " + "'" + id + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
});
return R.status(userService.removeUser(ids));
}
@@ -565,8 +854,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("操作成功");
}
@@ -578,8 +867,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("操作成功");
}
@@ -591,8 +880,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("操作成功");
}
@@ -603,8 +892,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("操作成功");
}
@@ -615,8 +904,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("操作成功");
}
@@ -676,7 +965,7 @@
securityExcel.setCardid("360XXX19XXXXXX****");
securityExcel.setNation("汉");
securityExcel.setRegistered("江西省南昌市******");
- securityExcel.setHold("是");
+// securityExcel.setHold("是");
securityExcel.setSecuritynumber("赣洪202100001");
list.add(securityExcel);
@@ -688,14 +977,14 @@
securityExcel1.setCardid("360XXX19XXXXXX****");
securityExcel1.setNation("汉");
securityExcel1.setRegistered("江西省南昌市******");
- securityExcel1.setHold("否");
+// securityExcel1.setHold("否");
securityExcel1.setSecuritynumber("");
list.add(securityExcel1);
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);
@@ -721,7 +1010,7 @@
securityExcel.setCardid("360XXX19XXXXXX****");
securityExcel.setNation("汉");
securityExcel.setRegistered("江西省南昌市******");
- securityExcel.setHold("是");
+// securityExcel.setHold("是");
securityExcel.setSecuritynumber("赣洪202100001");
list.add(securityExcel);
@@ -733,14 +1022,14 @@
securityExcel1.setCardid("360XXX19XXXXXX****");
securityExcel1.setNation("汉");
securityExcel1.setRegistered("江西省南昌市******");
- securityExcel1.setHold("否");
+// securityExcel1.setHold("否");
securityExcel1.setSecuritynumber("");
list.add(securityExcel1);
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(), SecurityYyExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
@@ -864,7 +1153,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);
@@ -893,7 +1182,6 @@
user.setExaminationType("0");
user.setAccount(user.getCardid());
-// Integer userCount = userService.selectCount(user.getAccount());
User user1 = new User();
user1.setIsDeleted(0);
user1.setStatus(1);
@@ -901,107 +1189,170 @@
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 -> {
- user2.setStatus(2);
- //先将原有人员离职 cell 1:手动录入 2：自动录入
- userService.updateById(user2);
- //内网同步
- String s1 = "update blade_user set status = " + user2.getStatus() +
- " where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //判断是否在本单位，如果是本单位,则不能再次新增
+ if (!user2.getDeptId().equals(user.getDeptId())) {
+ user2.setStatus(2);
+ //先将原有人员离职 cell 1:手动录入 2：自动录入
+ user2.setUpdateTime(new Date());
+ userService.updateById(user2);
+ //内网同步
+ 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);
+ myAsyncService.dataSync(s1);
+
+ //人员离职后修改派遣记录，修改从业记录
+ updateUserDispatcherExp(user2);
+ } else {
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+ }
});
+ } else {
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
- }else {
+ } else {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
}
- String url = null;
- if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
- if (user.getFingerprint().length()>100) {
+ //判断是否持证
+ 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) {
String s = uploadBase64String(user);
String[] split = s.split(",");
user.setFingerprint(split[0]);
url = split[1];
}
}
-// }
- //未持证
-// if (user.getHold().equals("2")){
-// //分配未持证保安角色
-// Role role = new Role();
-// role.setRoleAlias("未持证保安");
-// Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
-// user.setRoleId(oneRole.getId().toString());
-// }
-// }
+
//密码加密
if (Func.isNotEmpty(user.getCardid())) {
// user.setPassword(DigestUtil.encrypt(user.getPassword()));
//取身份证号码后6位作为密码
user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
}
+ user.setCreateTime(new Date());
user.setTenantId("000000");
//用户新增
boolean status = userService.save(user);
+
+ //从业记录新增
+ Experience experience = new Experience();
+
String rtime;
String paperTime;
if (user.getRtime() == null) {
rtime = null;
} else {
rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
+ experience.setEntrytime(user.getRtime());
}
+
+ Dept dept = iDeptService.getById(user.getDeptId());
+ experience.setCardid(user.getCardid());
+ experience.setSecurityid(user.getId().toString());
+ experience.setCompanyname(dept.getDeptName());
+ experience.setName(user.getRealName());
+ experience.setPost("保安员");
+ experienceService.save(experience);
+
+
//发证日期处理
- if (user.getPaperTime() == null) {
- paperTime = "";
- } else {
- paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
- }
+// 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));
}
- 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,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() + "'" +
- "," + "'" + user.getCell() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ //数据推送
+ //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,update_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()) + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
+ "," + "'" + 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.dataSync(s);
+ }
+
//获取从业记录
// List<Experience> experiences = (List<Experience>) userMap.get("userPractitionersInfo");
@@ -1018,7 +1369,90 @@
// }
// }
//判断是否持证是否为空
- return R.status(status);
+ if (!state) {
+ return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ return R.data(200,null,"新增成功!");
+ }
+
+ /**
+ * 修改派遣记录，修改从业记录
+ *
+ * @param user
+ */
+ private void updateUserDispatcherExp(User user) {
+ //修改派遣状态
+ user.setDispatch("1");
+ //同时将派遣记录中的派遣状态修改
+ //查询派遣记录(还在派遣中的)
+ Dispatcher dispatcher = new Dispatcher();
+ dispatcher.setUserIds(user.getId().toString());
+ dispatcher.setStatus(0);
+ List<Dispatcher> dispatcherList = dispatcherService.list(Condition.getQueryWrapper(dispatcher));
+ if (dispatcherList.size() > 0) {
+ dispatcherList.forEach(dispatcher1 -> {
+ dispatcher1.setStatus(1);
+ dispatcher1.setUpdateTime(new Date());
+ 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);
+ myAsyncService.dataSync(s1);
+ });
+ }
+
+ //查询当前用户是否有从业记录，没有的话新增，有就更新
+ //根据公司名查询单位
+ Dept dept = iDeptService.getById(user.getDeptId());
+ Experience experience = new Experience();
+ experience.setCompanyname(dept.getDeptName());
+ //按id降序
+ List<Experience> list = experienceService.list(Condition.getQueryWrapper(experience).orderByDesc("id"));
+ if (list.size() > 0) {
+ //如果有多条取第一条更新
+ Experience experience1 = list.get(0);
+ //设置离职时间
+ experience1.setDeparturetime(new Date());
+ //更新从业记录信息
+ experienceService.updateById(experience1);
+ //数据同步
+ String s1 =
+ "update sys_experience set departureTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience1.getDeparturetime()) + "'"
+ + " " + "where id = " + "'" + experience1.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ } else {
+ //新增
+ if (null != user.getRtime()) {
+ experience.setEntrytime(user.getRtime());
+ } else {
+ experience.setEntrytime(new Date());
+ }
+ experience.setDeparturetime(new Date());
+ experience.setName(user.getRealName());
+ 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);
+ myAsyncService.dataSync(s);
+ }
}
@@ -1049,13 +1483,14 @@
/**
* 用户详情
+ *
* @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);
@@ -1067,17 +1502,18 @@
/**
* 保安员导出
+ *
* @param response
- * @param user 查询条件
+ * @param user 查询条件
*/
@GetMapping("export-security-info")
- public void exportSecurityInfo(HttpServletResponse response,UserVO user) throws IOException {
+ public void exportSecurityInfo(HttpServletResponse response, UserVO user) throws IOException {
List<SecurityExcel> 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);
@@ -1087,4 +1523,55 @@
// ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
}
+
+ /**
+ * 保安员账号校验
+ *
+ * @param user
+ * @return
+ */
+ @GetMapping("/checkAccount")
+ public void checkAccount(User user) {
+ //根据身份证号查询用户
+ User user1 = new User();
+ user1.setAccount(user.getCardid());
+ user1.setIsDeleted(0);
+ user1.setStatus(1);
+ User user2 = userService.getOne(Condition.getQueryWrapper(user1));
+ if (null != user2) {
+ //判断是单位否一致
+ 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 {
+ //没有传 deptId 的情况
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getCardid()));
+ }
+ }
+ }
+
+ /**
+ * 年龄分布查询
+ *
+ * @param user
+ * @return
+ */
+ @PostMapping("/getAgeStatistics")
+ public R getAgeStatistics(UserVO user) {
+ return R.data(userService.getAgeStatistics(user));
+ }
+
+
+ /**
+ * 查询登录密码还是 123456 的单位信息
+ *
+ * @return
+ */
+ @GetMapping("/getNotUpdatePwdInfo")
+ public R getNotUpdatePwdInfo() {
+ return R.data(userService.getNotUpdatePwdInfo());
+ }
}
--
Gitblit v1.9.3