From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 1251 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 1,031 insertions(+), 220 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 eea5dfe..f4dc85c 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -17,17 +17,32 @@
package org.springblade.modules.system.controller;
+import com.alibaba.excel.EasyExcel;
+import com.aliyun.oss.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.minio.*;
+import io.minio.errors.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
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;
import org.springblade.core.excel.util.ExcelUtil;
@@ -41,42 +56,47 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
-import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.DigestUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringPool;
-import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.core.tool.utils.*;
+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.experience.entity.Experience;
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;
-import org.springblade.modules.system.excel.SecurityImporter;
-import org.springblade.modules.system.excel.UserExcel;
-import org.springblade.modules.system.excel.UserImporter;
+import org.springblade.modules.system.entity.UserDetailEntity;
+import org.springblade.modules.system.excel.*;
import org.springblade.modules.system.node.TreeNode;
-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.vo.DeptVO;
+import org.springblade.modules.system.service.*;
+import org.springblade.modules.system.vo.UserInfoDetail;
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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
+import sun.misc.BASE64Decoder;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
+import java.util.*;
+import java.util.stream.Collectors;
import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
/**
@@ -92,11 +112,26 @@
public class UserController {
private final IUserService userService;
+ private final IUserDetailService userDetailService;
private final IDeptService iDeptService;
private final IRoleService roleService;
private final IExperienceService experienceService;
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;
/**
* 查询单条
@@ -164,10 +199,9 @@
})
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
- //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
- return R.data(UserWrapper.build().pageVO(pages));
+ public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId) {
+ IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : AuthUtil.getTenantId()));
+ return R.data(pages);
}
/**
@@ -177,45 +211,73 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增或修改", notes = "传入User")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R submit(@Valid @RequestBody User user) throws Exception {
- CacheUtil.clear(USER_CACHE);
- //查询角色
- if (null!=user.getRoleId()){
- Role role = new Role();
- role.setId(Long.parseLong(user.getRoleId()));
- Role one = roleService.getOne(Condition.getQueryWrapper(role));
- if (one.getRoleAlias().equals("保安")){
- user.setHold("1");
+ public R submit(@Valid @RequestBody User user) {
+ if (null == user.getId()) {
+ //新增
+ //密码加密
+ if (Func.isNotEmpty(user.getPassword())) {
+ user.setPassword(DigestUtil.encrypt(user.getPassword()));
}
- if (one.getRoleAlias().equals("未持证保安")){
- user.setHold("2");
+ Integer userCount = userService.selectCountAccount(user.getAccount());
+ if (userCount > 0) {
+ throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
+ // 校验保安员，如果角色为保安员，则需要判断身份证号是否已注册
+ List<String> roleIds = Arrays.asList(user.getRoleId().split(","));
+ String roleId = "1412226235153731586";
+ if (roleIds.contains(roleId)){
+ // 判断是否已存在，通过身份证号码查询用户信息
+ QueryWrapper<User> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0).eq("status",1).eq("cardid",user.getCardid()).like("role_id","%"+roleId+"%");
+ List<User> list = userService.list(wrapper);
+ if (list.size()>0){
+ throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前保安员身份证号码 [{}] 已存在!", user.getCardid()));
+ }
+ }
+ 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);
+ } else {
+ //修改
+ User user1 = userService.getById(user.getId());
+ user.setPassword(user1.getPassword());
+ user.setUpdateTime(new Date());
+ boolean b = userService.updateById(user);
}
- //根据 deptId 查询dept信息,公安管理员
- Dept dept = iDeptService.getById(user.getDeptId());
- Long sid = 1123598813738675201L;
- if (dept.getParentId().equals(sid)){
- //获取辖区的数据
- Jurisdiction jurisdiction = new Jurisdiction();
- jurisdiction.setDeptName(dept.getDeptName());
- Jurisdiction one = jurisdictionService.getOne(Condition.getQueryWrapper(jurisdiction));
- user.setJurisdiction(one.getId().toString());
- }
- userService.submit(user);
- String birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
- String rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
- String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,birthday,sex,role_id,dept_id,cardid,nativePlace,nation,education," +
- "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction) " +
- "values(" + "'" + user.getId() + "'" + "," + "'" + 000000 + "'" + "," + "'" + user.getAccount() + "'" + "," +
- "'" + user.getPassword() + "'" + "," +"'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
- "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + birthday + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
- "," + "'" + user.getDeptId() + "'" + "," + "'" + user.getCardid() + "'" + "," + "'" + user.getNativeplace() + "'" + "," + "'"
- + user.getNation() + "'" + "," + "'" + user.getEducation() + "'" + "," + "'" + user.getPoliticaloutlook() + "'" + "," + "'" + user.getHealstats() + "'"
- + "," +"'" + user.getHeight() + "'" + "," + "'" + user.getAddress() + "'" +"," + "'" + user.getRegistered() + "'"+ "," +
- "'" + rtime + "'"+ "," + "'" + user.getSecuritynumber() + "'"+"," + "'" + user.getHold() + "'"+"," + "'" + user.getJurisdiction() + "'"+")";
- FtpUtil.sqlFileUpload(s);
+ //返回
return R.success("成功");
+ }
+
+ /**
+ * 微信注册
+ * @param user
+ * @return
+ */
+ @PostMapping("/wxRegister")
+ public R wxRegister(User user){
+ //密码加密
+ if (Func.isNotEmpty(user.getPassword())) {
+ user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ }
+
+ Boolean result = userService.wxRegister(user);
+ return R.status(result);
}
/**
@@ -224,53 +286,355 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入User")
- public R update(@Valid @RequestBody User user) {
+ @Transactional(rollbackFor = Exception.class)
+ public R update(@Valid @RequestBody Map<String, Object> userMap) throws Exception {
+ //获取user
+ User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")), User.class);
+ // 用户详情
+ UserDetailEntity userDetailEntity = JSON.parseObject(JSON.toJSONString(userMap.get("userDetail")), UserDetailEntity.class);
+ //分配保安角色
CacheUtil.clear(USER_CACHE);
- userService.updateUser(user);
- Date birthday1 = user.getBirthday();
- String birthday;
- String rtime;
- if (user.getBirthday()==null){
- birthday =null;
+ User user1 = userService.getById(user.getId());
+ // 指纹设置
+ fingerprintSet(user);
+ // 校验是否持证
+ boolean states = updateByIsSecurity(user);
+ //如果是离职
+ if (leaveHandle(user)) return R.success("修改成功");
+ int state = 0;
+ //如果是异常标记
+ if (null != user.getExaminationType() && !user.getExaminationType().equals("")) {
+ if (user.getExaminationType().equals("1")) {
+ //吊销保安证
+ user.setHold("3");
+ state = 1;
+ }
}
- else {
- birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
+ user.setPassword(user1.getPassword());
+ 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;
}
- if ( user.getRtime()==null){
- rtime =null;
+ //修改
+ boolean status = userService.updateById(user);
+ if (status){
+ //同时更新用户详情信息
+ userDetailService.updateById(userDetailEntity);
}
- else {
- rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
+ if (!states) {
+ return R.data(201,null,"保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ return R.data(200,null,"修改成功!");
+ }
+
+
+ /**
+ * 离职
+ */
+ @PostMapping("/userLeave")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入User")
+ @Transactional(rollbackFor = Exception.class)
+ public R userLeave(@Valid @RequestBody Map<String, Object> userMap) throws Exception {
+ //获取user
+ User user = JSON.parseObject(JSON.toJSONString(userMap), User.class);
+ //分配保安角色
+ CacheUtil.clear(USER_CACHE);
+ // 指纹设置
+ fingerprintSet(user);
+ //如果是离职
+ boolean b = leaveHandle(user);
+ return R.status(b);
+ }
+
+
+
+ /**
+ * 离职处理
+ * @param user
+ * @return
+ */
+ public boolean leaveHandle(@RequestBody @Valid User user) {
+ if (null != user.getStatus()) {
+ if (user.getStatus().equals(2)) {
+ //修改派遣状态
+ 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());
+ 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 {
+ 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);
+ }
+
+ boolean status = userService.updateById(user);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 校验是否持证-更新
+ * @param user
+ * @return
+ */
+ public boolean updateByIsSecurity(@RequestBody @Valid User user) {
+ //判断是否持证
+ 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;
+ }
+ return states;
+ }
+
+
+ /**
+ * 修改
+ */
+ @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) {
+ //指纹图片上传并返回url
+ String s = uploadBase64String(user);
+ String[] split = s.split(",");
+ user.setFingerprint(split[0]);
+ //内网指纹图片url
+ 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);
+ }
+ }
+ return R.success("修改成功");
+ }
+
+
+ /**
+ * 指纹图片上传
+ *
+ * @return
+ * @throws Exception
+ */
+ private String uploadBase64String(User user) throws Exception {
+ //图片上传
+ BASE64Decoder decoder = new BASE64Decoder();
+ // 解密
+ byte[] b = decoder.decodeBuffer(user.getFingerprint());
+ // 处理数据
+ for (int i = 0; i < b.length; ++i) {
+ if (b[i] < 0) {
+ b[i] += 256;
+ }
+ }
+ //填写你文件上传的地址以及相应信息
+ String url = FileConfig.apiUrl;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
+ MinioClient minioClient =
+ MinioClient.builder()
+ .endpoint(url)
+ .credentials(access, secret)
+ .build();
+ // 检查存储桶是否已经存在
+ boolean isExist = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucket).build());
+ if (!isExist) {
+ // 创建一个名为zip的存储桶，用于zip文件。
+ minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
+ minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
+ }
+ String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "") + ".jpg";
+ InputStream in = new ByteArrayInputStream(b);
+ String[] split = newName.split("/");
+ //创建头部信息
+ Map<String, String> headers = new HashMap<>(1 << 2);
+ //添加自定义内容类型
+ headers.put("Content-Type", "application/octet-stream");
+ //上传
+ minioClient.putObject(
+ PutObjectArgs.builder().bucket(bucket).object(newName).stream(
+ in, in.available(), -1)
+ .headers(headers)
+ .build());
+// InputStream inputStream = new ByteArrayInputStream(b);
+// FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
+ in.close();
+ //外围url
+ String urls = FileConfig.url + "/zhba/" + newName;
+ //内网
+ String inUrl = FtpConfig.ip + "/zhba/" + newName;
+ //返回
+ return urls + "," + inUrl;
+ }
+
+
+ /**
+ * 修改发证时间
+ */
+ @PostMapping("/updatePaperTime")
+ public R updatePaperTime(@RequestBody User user) {
+ user.setPaperTime(new Date());
+ user.setUpdateTime(new Date());
+ userService.updateById(user);
+ String paperTime = null;
+ //发证日期处理
+ if (user.getPaperTime() == null) {
+ paperTime = null;
+ } 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 account = " + "'" + user.getAccount()+ "'"
- + ",password = " + "'" + user.getPassword()+"'"
- + ",name = " + "'" + user.getName()+"'"
- + ",real_name = " + "'" + user.getRealName()+"'"
- + ",avatar = " + "'" + user.getAvatar()+"'"
- + ",email = " + "'" + user.getEmail()+"'"
- + ",phone = " + "'" + user.getPhone()+"'"
- + ",birthday = " + "'" + birthday+"'"
- + ",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()+"'"
- + ",address = " + "'" +user.getAddress()+"'"
- + ",registered = " + "'" +user.getRegistered()+"'"
- + ",rtime = " + "'" +rtime+"'"
- + ",securitynumber = " + "'" +user.getSecuritynumber()+"'"
- + ",hold = " + "'" +user.getHold()+"'"
- + ",jurisdiction = " + "'" +user.getJurisdiction()+"'"
- + " " +"where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(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);
+ myAsyncService.dataSync(s1);
return R.success("修改成功");
}
@@ -280,9 +644,15 @@
@PostMapping("/remove")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "删除", notes = "传入id集合")
- //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R remove(@RequestParam String ids) {
CacheUtil.clear(USER_CACHE);
+ List<String> list = Arrays.asList(ids.split(","));
+ // 遍历删除用户详情信息
+ list.forEach(id -> {
+ QueryWrapper<UserDetailEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("user_id",id);
+ userDetailService.remove(wrapper);
+ });
return R.status(userService.removeUser(ids));
}
@@ -353,9 +723,22 @@
@PostMapping("import-user")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入用户", notes = "传入excel")
- public R importUser(MultipartFile file, Integer isCovered) {
- UserImporter userImporter = new UserImporter(userService, false);
+ 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("操作成功");
+ }
+
+
+ /**
+ * 保安员证二维码批量生成
+ */
+ @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);
+ ExcelUtil.save(file, qrCodeImporter, QrCodeExcel.class);
return R.success("操作成功");
}
@@ -366,27 +749,52 @@
@PostMapping("import-security")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入用户", notes = "传入excel")
- public R importSecurity(MultipartFile file, Integer isCovered) {
- SecurityImporter securityImporter = new SecurityImporter(userService, false);
- ExcelUtil.save(file, securityImporter, UserExcel.class);
+ 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("操作成功");
}
-// /**
-// * 导出用户
-// */
-// @GetMapping("export-user")
-// @ApiOperationSupport(order = 13)
-// @ApiOperation(value = "导出用户", notes = "传入user")
-// public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
+ /**
+ * 导入保安员(test)
+ */
+ @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);
+ ExcelUtil.save(file, securityImporter, SecurityExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 导入持枪保安员
+ */
+ @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);
+ ExcelUtil.save(file, securityYyImporter, SecurityYyExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 导出用户
+ */
+ @GetMapping("export-user")
+ @ApiOperationSupport(order = 13)
+ @ApiOperation(value = "导出用户", notes = "传入user")
+ public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
// QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
// if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId());
// }
// queryWrapper.lambda().eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-// List<UserExcel> list = userService.exportUser(queryWrapper);
-// ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
-// }
+ List<UserExcel> list = userService.exportUser(user);
+ ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
+ }
+
/**
* 导出模板
@@ -400,48 +808,110 @@
}
/**
+ * 导出持枪保安模板
+ */
+ @GetMapping("export-templateYy")
+ @ApiOperationSupport(order = 14)
+ @ApiOperation(value = "导出模板")
+ public void exportUserYy(HttpServletResponse response) {
+ List<SecurityYyExcel> list = new ArrayList<>();
+ ExcelUtil.export(response, "持枪保安员数据模板", "持枪保安员数据表", list, SecurityYyExcel.class);
+ }
+
+ /**
* 保安员导出模板
*/
@GetMapping("export-template-security")
@ApiOperationSupport(order = 14)
@ApiOperation(value = "导出模板")
- public void exportSecurity(HttpServletResponse response) {
- List<UserExcel> list = new ArrayList<>();
- UserExcel userExcel = new UserExcel();
- userExcel.setDeptId("xxx保安公司");
- userExcel.setRealName("张三");
- userExcel.setEmail("xxx@**.com");
- userExcel.setPhone("12345678901");
- userExcel.setSex("男");
- userExcel.setCardid("360XXX19XXXXXX****");
- userExcel.setNativeplace("江西南昌");
- userExcel.setNation("汉");
- userExcel.setPoliticaloutlook("中共党员");
- userExcel.setHeight(180);
- userExcel.setAddress("江西省南昌市******");
- userExcel.setRegistered("江西南昌");
- userExcel.setRtime("2021-05-01");
- userExcel.setHold("是");
- userExcel.setSecuritynumber("赣洪202100001");
- list.add(userExcel);
- UserExcel userExcel1 = new UserExcel();
- userExcel1.setDeptId("xxx保安公司");
- userExcel1.setRealName("李四");
- userExcel1.setEmail("xxx@**.com");
- userExcel1.setPhone("12345678901");
- userExcel1.setSex("女");
- userExcel1.setCardid("360XXX19XXXXXX****");
- userExcel1.setNativeplace("江西南昌");
- userExcel1.setNation("汉");
- userExcel1.setPoliticaloutlook("中共党员");
- userExcel1.setHeight(180);
- userExcel1.setAddress("江西省南昌市******");
- userExcel1.setRegistered("江西南昌");
- userExcel1.setRtime("2021-05-01");
- userExcel1.setHold("否");
- userExcel1.setSecuritynumber("");
- list.add(userExcel1);
- ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
+ public void exportSecurity(HttpServletResponse response) throws IOException {
+ List<SecurityExcel> list = new ArrayList<>();
+ SecurityExcel securityExcel = new SecurityExcel();
+ securityExcel.setDeptId("xxx保安公司");
+ securityExcel.setRealName("张三");
+ securityExcel.setPhone("12345678901");
+ securityExcel.setSex("男");
+ securityExcel.setCardid("360XXX19XXXXXX****");
+ securityExcel.setNation("汉");
+ securityExcel.setPermanentResidenceAddress("山西省晋城市******");
+ securityExcel.setEducation("本科");
+ securityExcel.setPoliticaloutlook("群众");
+ securityExcel.setUnitName("晋城市***公司");
+ securityExcel.setDwellAddress("山西省晋城市******");
+ securityExcel.setAcceptanceTime("2023/12/01");
+ list.add(securityExcel);
+
+ SecurityExcel securityExcel1 = new SecurityExcel();
+ securityExcel1.setDeptId("xxx保安公司");
+ securityExcel1.setRealName("李四");
+ securityExcel1.setPhone("12345678901");
+ securityExcel1.setSex("女");
+ securityExcel1.setCardid("360XXX19XXXXXX****");
+ securityExcel1.setNation("汉");
+ securityExcel1.setPermanentResidenceAddress("山西省晋城市******");
+ securityExcel1.setEducation("本科");
+ securityExcel1.setPoliticaloutlook("党员");
+ securityExcel1.setUnitName("晋城市***公司");
+ securityExcel1.setDwellAddress("山西省晋城市******");
+ securityExcel1.setAcceptanceTime("2023/12/01");
+ 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());
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ //修改单元格格式为文本格式
+ EasyExcel.write(response.getOutputStream(), SecurityExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
+ } catch (Throwable var6) {
+ throw var6;
+ }
+// ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
+ }
+
+ /**
+ * 持枪保安员导出模板
+ */
+ @GetMapping("export-template-securityYy")
+ @ApiOperationSupport(order = 14)
+ @ApiOperation(value = "导出模板")
+ public void exportSecurityYy(HttpServletResponse response) throws IOException {
+ List<SecurityYyExcel> list = new ArrayList<>();
+ SecurityYyExcel securityExcel = new SecurityYyExcel();
+ securityExcel.setDeptId("xxx保安公司");
+ securityExcel.setRealName("张三");
+ securityExcel.setPhone("12345678901");
+ securityExcel.setSex("男");
+ securityExcel.setCardid("360XXX19XXXXXX****");
+ securityExcel.setNation("汉");
+ securityExcel.setRegistered("山西省晋城市******");
+// securityExcel.setHold("是");
+// securityExcel.setSecuritynumber("晋202100001");
+ list.add(securityExcel);
+
+ SecurityYyExcel securityExcel1 = new SecurityYyExcel();
+ securityExcel1.setDeptId("xxx保安公司");
+ securityExcel1.setRealName("李四");
+ securityExcel1.setPhone("12345678901");
+ securityExcel1.setSex("女");
+ securityExcel1.setCardid("360XXX19XXXXXX****");
+ securityExcel1.setNation("汉");
+ securityExcel1.setRegistered("山西省晋城市******");
+// 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());
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ //修改单元格格式为文本格式
+ EasyExcel.write(response.getOutputStream(), SecurityYyExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
+ } catch (Throwable var6) {
+ throw var6;
+ }
+// ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
}
@@ -517,7 +987,7 @@
*/
@GetMapping("/page-security-units")
public R pageSecurityUnits(@ApiIgnore User user, Query query) {
- List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query),user);
+ List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user);
return R.data(pages);
}
@@ -540,6 +1010,15 @@
}
/**
+ * 保安员列表树，帅选无保安证,下拉tree
+ */
+ @GetMapping("/security-dispatcher-tree")
+ public R<List<TreeNode>> getSecurityDispatcherTree(UserVO user) {
+ List<TreeNode> tree = userService.getSecurityDispatcherTree(user);
+ return R.data(tree);
+ }
+
+ /**
* 自定义用户列表(只有保安员)
*/
@GetMapping("/selectInr")
@@ -547,13 +1026,16 @@
List<Map<Object, Object>> list = userService.selectInr(deptid);
return R.data(list);
}
+
@GetMapping("/zc")
- public R zc(String username,String password) {
+ public R zc(String username, String password, String phone) {
User user = new User();
user.setTenantId("000000");
user.setAccount(username);
user.setPassword(DigestUtil.encrypt(password));
+ user.setDeptId("1426355050199945218");
user.setRoleId("1428177141018771458");
+ user.setPhone(phone);
userService.saveOrUpdate(user);
return R.success("注册成功");
}
@@ -562,86 +1044,238 @@
* 保安员新增
*/
@PostMapping("/securitySave")
- public R securitySave(@Valid @RequestBody Map<String,Object> userMap){
+ @Transactional(rollbackFor = Exception.class)
+ public R securitySave(@Valid @RequestBody Map<String, Object> userMap) throws Exception {
//获取user
- User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")),User.class);
- //判断是否为空
- if (null!=user.getHold()){
- //持证
- if (user.getHold().equals("1")){
- //分配保安角色
- Role role = new Role();
- role.setRoleAlias("保安");
- Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
- user.setRoleId(oneRole.getId().toString());
- }
- //未持证
- 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.getPassword())) {
- user.setPassword(DigestUtil.encrypt(user.getPassword()));
- }
+ User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")), User.class);
+ // 用户详情
+ UserDetailEntity userDetailEntity = JSON.parseObject(JSON.toJSONString(userMap.get("userDetail")), UserDetailEntity.class);
+ //分配保安角色
+ Role role = new Role();
+ role.setRoleAlias("保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
+ user.setDispatch("1");
+ user.setExaminationType("0");
+ user.setCreateTime(new Date());
user.setTenantId("000000");
+ user.setAccount(user.getCardid());
+ // 用户校验
+ userCheck(user);
+ // 保安员证校验
+ boolean state = securityPaperCheck(user);
+ // 指纹设置
+ fingerprintSet(user);
+ //密码加密
+ if (Func.isNotEmpty(user.getCardid())) {
+// user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ //取身份证号码后6位作为密码
+ user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
+ }
//用户新增
boolean status = userService.save(user);
-
- String birthday;
- String rtime;
- if (user.getBirthday()==null){
- birthday =null;
+ // 用户详情信息新增
+ if (status){
+ userDetailEntity.setUserId(user.getId());
+ // 新增
+ userDetailService.save(userDetailEntity);
}
- else {
- birthday = new SimpleDateFormat("yyyy-MM-dd").format(user.getBirthday());
- }
-
- if ( user.getRtime()==null){
- rtime =null;
- }
- else {
- rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
- }
-
-
-
- String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,birthday,sex,role_id,dept_id,cardid,nativePlace,nation,education," +
- "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction) " +
- "values(" + "'" + user.getId() + "'" + "," + "'" + 000000 + "'" + "," + "'" + user.getAccount() + "'" + "," +
- "'" + user.getPassword() + "'" + "," +"'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
- "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + birthday + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
- "," + "'" + user.getDeptId() + "'" + "," + "'" + user.getCardid() + "'" + "," + "'" + user.getNativeplace() + "'" + "," + "'"
- + user.getNation() + "'" + "," + "'" + user.getEducation() + "'" + "," + "'" + user.getPoliticaloutlook() + "'" + "," + "'" + user.getHealstats() + "'"
- + "," +"'" + user.getHeight() + "'" + "," + "'" + user.getAddress() + "'" +"," + "'" + user.getRegistered() + "'"+ "," +
- "'" + rtime + "'"+ "," + "'" + user.getSecuritynumber() + "'"+"," + "'" + user.getHold() + "'"+"," + "'" + user.getJurisdiction() + "'"+")";
- FtpUtil.sqlFileUpload(s);
-
- //获取从业记录
-// List<Experience> experiences = (List<Experience>) userMap.get("userPractitionersInfo");
-// if (experiences.size()>0){
-// int count = 0;
-// for (int i = 0; i < experiences.size(); i++) {
-// Experience e = JSON.parseObject(JSON.toJSONString(experiences.get(i)), Experience.class);
-// e.setSecurityid(user.getId().toString());
-// experienceService.save(e);
-// count++;
-// }
-// if (count < 1) {
-// return R.status(false);
-// }
-// }
+ //从业记录新增
+ experienceSave(user);
//判断是否持证是否为空
- return R.status(status);
+ if (!state) {
+ return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ return R.data(200,null,"新增成功!");
+ }
+
+ /**
+ * 指纹设置
+ * @param user
+ * @throws Exception
+ */
+ private void fingerprintSet(User user) throws Exception {
+ 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];
+ }
+ }
+ }
+
+ /**
+ * 保安员证校验
+ * @param user
+ * @return
+ */
+ private boolean securityPaperCheck(User user) {
+ 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;
+ }
+ return state;
+ }
+
+ /**
+ * 从业记录新增
+ * @param user
+ */
+ public void experienceSave(User user) {
+ //从业记录新增
+ Experience experience = new Experience();
+ 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);
+ }
+
+ /**
+ * 用户校验
+ * @param user
+ */
+ public void userCheck(User user) {
+ User user1 = new User();
+ user1.setIsDeleted(0);
+ user1.setStatus(1);
+ user1.setAccount(user.getCardid());
+ 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")) {
+ list.forEach(user2 -> {
+ //判断是否在本单位，如果是本单位,则不能再次新增
+ 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 {
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+ }
+ }
+ }
+
+ /**
+ * 修改派遣记录，修改从业记录
+ *
+ * @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 {
+ 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);
+ }
}
/**
* 保安员信息
+ *
* @param user
* @return
*/
@@ -651,5 +1285,182 @@
}
+ /**
+ * @param type 1:保安 2:公安
+ * @param deptid
+ * @param jurisdiction
+ * @return
+ */
+ @GetMapping("/seleL")
+ public R seleL(String type, String deptid, String jurisdiction, Long userId) {
+ List<Map<String, Object>> list = userService.seleL(type, deptid, jurisdiction, userId);
+ return R.data(list);
+ }
+
+
+ /**
+ * 用户详情
+ *
+ * @param user
+ * @return
+ */
+ @GetMapping("/details")
+ public R details(User user) {
+ UserVO userInfo = userService.getUserDetailById(user.getId());
+ // 查询对应的详情信息
+ if (null!=userInfo){
+ QueryWrapper<UserDetailEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("user_id",userInfo.getId()).eq("is_deleted",0);
+ UserDetailEntity one = userDetailService.getOne(wrapper);
+ userInfo.setUserDetail(one);
+ }
+ if (null != userInfo.getFingerprint() && !userInfo.getFingerprint().equals("")) {
+ //url 转base64
+ String base64Url = ImageUtils.imageUrlToBase64(userInfo.getFingerprint());
+ userInfo.setFingerprint(base64Url);
+ }
+ return R.data(userInfo);
+ }
+
+
+ /**
+ * 保安员导出
+ *
+ * @param response
+ * @param user 查询条件
+ */
+ @GetMapping("export-security-info")
+ 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());
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ //修改单元格格式为文本格式
+ EasyExcel.write(response.getOutputStream(), SecurityExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
+ } catch (Throwable var6) {
+ throw var6;
+ }
+// 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());
+ }
+
+
+ /**
+ * 数据处理
+ * @return
+ */
+ @GetMapping("/dataHandler")
+ public R dataHandler() {
+ return R.data(userService.dataHandler());
+ }
+
+
+ //获取用户表和用户详情表的信息
+ @GetMapping("/getUserInfoDetail")
+ public R getUserInfoDetail(String id){
+ UserInfoDetail userInfoDetail = userService.getUserInfoDetail(id);
+ return R.data(userInfoDetail);
+ }
+
+ @PostMapping("/batchAudit")
+ public R batchAudit(String ids,String auditStatus){
+ boolean result = userService.batchAudit(ids,auditStatus);
+ return R.status(result);
+ }
+
+ /**
+ * 导入保安员制证时间
+ */
+ @PostMapping("import-security-paperTime")
+ @ApiOperationSupport(order = 12)
+ @ApiOperation(value = "导入用户", notes = "传入excel")
+ public R importSecurityPaperTime(MultipartFile file, Integer isCovered, String deptId) {
+ UserCertificateExcelImporter userCertificateExcelImporter = new UserCertificateExcelImporter(userService, false, deptId);
+ ExcelUtil.save(file, userCertificateExcelImporter, UserCertificateExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 保安员制证时间导出模板
+ */
+ @GetMapping("export-template-security-paperTime")
+ @ApiOperationSupport(order = 14)
+ @ApiOperation(value = "导出模板")
+ public void exportPaperTimeExcelTemplate(HttpServletResponse response) throws IOException {
+ List<UserCertificateExcel> list = new ArrayList<>();
+ UserCertificateExcel userCertificateExcel = new UserCertificateExcel();
+ userCertificateExcel.setRealName("张三");
+ userCertificateExcel.setCardid("360XXX19XXXXXX****");
+ userCertificateExcel.setPaperTime("2023-12-26");
+
+ list.add(userCertificateExcel);
+
+ 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());
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ //修改单元格格式为文本格式
+ EasyExcel.write(response.getOutputStream(), UserCertificateExcel.class).sheet("发证时间导入数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
+ } catch (Throwable var6) {
+ throw var6;
+ }
+ }
+
}
--
Gitblit v1.9.3