From d3d7222cb64de2cb5390fc57fa1049d800e44786 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 30 Aug 2023 17:22:58 +0800
Subject: [PATCH] 用户新增时判断角色是否为保安员，如果是需要判断是否已存在身份证号相同的保安员，如果存在则提示
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 577 ++++++++++++++++++++++----------------------------------
1 files changed, 228 insertions(+), 349 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 7618fac..aedef21 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -34,6 +34,7 @@
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;
@@ -211,7 +212,9 @@
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ System.out.println("在线更新代码.... ");
IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ System.out.println("=================在线更新代码==================");
return R.data(pages);
}
@@ -222,8 +225,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())) {
@@ -232,6 +235,18 @@
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);
@@ -250,49 +265,13 @@
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);
+ } 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);
}
//返回
@@ -309,8 +288,8 @@
CacheUtil.clear(USER_CACHE);
User user1 = userService.getById(user.getId());
String url = "";
- if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
- if (user.getFingerprint().length()>100) {
+ if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
+ if (user.getFingerprint().length() > 100) {
//指纹图片上传并返回url
String s = uploadBase64String(user);
String[] split = s.split(",");
@@ -321,30 +300,36 @@
}
//判断是否持证
-// if (user.getHold().equals("1") && null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
-// //持证，校验保安证编号是否合法
-// SecurityPaper securityPaper = new SecurityPaper();
-// securityPaper.setIdCardNo(user.getCardid());
-// List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
-// if (securityPaperList.size()>0){
-// boolean status = false;
-// //遍历
-// for (SecurityPaper paper : securityPaperList) {
-// if (paper.getNumber().equals(user.getSecuritynumber())){
-// status = true;
-// }
-// }
-// if (!status){
-// throw new ServiceException("保安证编号不匹配,请核实!");
-// }
-// }else {
-// throw new ServiceException("保安证编号不匹配,请核实!");
-// }
-// }
+ boolean states = false;
+ if (user.getHold().equals("1") && null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
+ //持证，校验保安证编号是否合法
+ SecurityPaper securityPaper = new SecurityPaper();
+ securityPaper.setIdCardNo(user.getCardid());
+ List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
+ if (securityPaperList.size()>0){
+ //遍历
+ for (SecurityPaper paper : securityPaperList) {
+ if (paper.getNumber().equals(user.getSecuritynumber())){
+ states = true;
+ }
+ }
+ if (!states){
+ user.setHold("2");
+// throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ }else {
+// throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ states = false;
+ user.setHold("2");
+ }
+ }
+ if (user.getHold().equals("2")){
+ states = true;
+ }
//如果是离职
- if (null!=user.getStatus()){
- if (user.getStatus().equals(2)){
+ if (null != user.getStatus()) {
+ if (user.getStatus().equals(2)) {
//修改派遣状态
user.setDispatch("1");
//同时将派遣记录中的派遣状态修改
@@ -353,17 +338,18 @@
dispatcher.setUserIds(user.getId().toString());
dispatcher.setStatus(0);
List<Dispatcher> dispatcherList = dispatcherService.list(Condition.getQueryWrapper(dispatcher));
- if (dispatcherList.size()>0){
+ if (dispatcherList.size() > 0) {
dispatcherList.forEach(dispatcher1 -> {
dispatcher1.setStatus(1);
dispatcher1.setUpdateTime(new Date());
- dispatcherService.updateById(dispatcher1);
-
- String s1 =
- "update sys_dispatcher set status = " + "'" + dispatcher1.getStatus() + "'"
- + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher1.getUpdateTime()) + "'"
- + " " + "where id = " + "'" + dispatcher1.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ boolean b = dispatcherService.updateById(dispatcher1);
+ if (b) {
+ String s1 =
+ "update sys_dispatcher set status = " + "'" + dispatcher1.getStatus() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher1.getUpdateTime()) + "'"
+ + " " + "where id = " + "'" + dispatcher1.getId() + "'";
+ myAsyncService.dataSync(s1);
+ }
});
}
@@ -375,7 +361,7 @@
experience.setCardid(user.getCardid());
//按id降序
List<Experience> list = experienceService.list(Condition.getQueryWrapper(experience).orderByDesc("id"));
- if (list.size()>0){
+ if (list.size() > 0) {
//如果有多条取第一条更新
Experience experience1 = list.get(0);
//设置离职时间
@@ -386,56 +372,58 @@
String s1 =
"update sys_experience set departureTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience1.getDeparturetime()) + "'"
+ " " + "where id = " + "'" + experience1.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- }else {
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ } else {
//新增
- if (null!=user.getRtime()){
+ if (null != user.getRtime()) {
experience.setEntrytime(user.getRtime());
- }else {
+ } else {
experience.setEntrytime(new Date());
}
experience.setDeparturetime(new Date());
experience.setName(user.getRealName());
- if (null!=user.getReasonForLeav() && !user.getReasonForLeav().equals("")){
+ if (null != user.getReasonForLeav() && !user.getReasonForLeav().equals("")) {
experience.setLeaving(user.getReasonForLeav());
}
experience.setCardid(user.getCardid());
experience.setSecurityid(user.getId().toString());
//新增
- experienceService.save(experience);
-
- //内网同步
- String s = "insert into sys_experience(id,name,entryTime,departureTime,leaving,cardId,companyname,securityId) " +
- "values(" + "'" + experience.getId() + "'" +
- "," + "'" + experience.getName() + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getDeparturetime()) + "'" +
- "," + "'" + experience.getLeaving() + "'" +
- "," + "'" + experience.getCardid() + "'" +
- "," + "'" + experience.getCompanyname() + "'" +
- "," + "'" + experience.getSecurityid() + "'"
- + ")";
- FtpUtil.sqlFileUpload(s);
+ boolean save = experienceService.save(experience);
+ if (save) {
+ //内网同步
+ String s = "insert into sys_experience(id,name,entryTime,departureTime,leaving,cardId,companyname,securityId) " +
+ "values(" + "'" + experience.getId() + "'" +
+ "," + "'" + experience.getName() + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getDeparturetime()) + "'" +
+ "," + "'" + experience.getLeaving() + "'" +
+ "," + "'" + experience.getCardid() + "'" +
+ "," + "'" + experience.getCompanyname() + "'" +
+ "," + "'" + experience.getSecurityid() + "'"
+ + ")";
+ myAsyncService.dataSync(s);
+ }
}
boolean status = userService.updateById(user);
//qfqk 数据推送
- if (status){
- myAsyncService.updateUserByQfqk(user);
+ 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);
}
-
- //内网更新
- String s1 =
- "update blade_user set status = " + "'" + user.getStatus() + "'"
- + " " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
return R.success("修改成功");
}
}
int state = 0;
//如果是异常标记
- if (null!=user.getExaminationType() && !user.getExaminationType().equals("")){
+ if (null != user.getExaminationType() && !user.getExaminationType().equals("")) {
if (user.getExaminationType().equals("1")) {
//吊销保安证
user.setHold("3");
@@ -447,7 +435,7 @@
user.setUpdateTime(new Date());
//如果身份证号修改
- if (!user.getCardid().equals(user1.getCardid())){
+ if (!user.getCardid().equals(user1.getCardid())) {
//账号,密码也修改
user.setAccount(user.getCardid());
//获取默认密码配置
@@ -474,80 +462,15 @@
userDTO.setSex(user.getSex());
userDTO.setAvatar(user.getAvatar());
//推送qfqk
- myAsyncService.updateUserByAccount(userDTO);
+// myAsyncService.updateUserByAccount(userDTO);
} else {
- myAsyncService.updateUserByQfqk(user);
+// 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);
- } 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);
+ if (!states) {
+ return R.data(201,null,"保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
}
- return R.success("修改成功");
+ return R.data(200,null,"修改成功!");
}
@@ -557,8 +480,8 @@
@PostMapping("/updateUserInfo")
public R updateUserInfo(@Valid @RequestBody UserVO user) throws Exception {
String url = null;
- if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
- if (user.getFingerprint().length()>100) {
+ if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
+ if (user.getFingerprint().length() > 100) {
//指纹图片上传并返回url
String s = uploadBase64String(user);
String[] split = s.split(",");
@@ -572,13 +495,13 @@
userService.updateById(user);
//生成签到记录
- if (null!=user.getCandidateNo() && !user.getCandidateNo().equals("")){
+ if (null != user.getCandidateNo() && !user.getCandidateNo().equals("")) {
//查询签到记录，如果已有，则更新，没有就新增
SignInRecords signInRecords = new SignInRecords();
signInRecords.setCandidateNo(user.getCandidateNo());
SignInRecords inRecordsServiceOne = signInRecordsService.getOne(Condition.getQueryWrapper(signInRecords));
//如果为null
- if (null==inRecordsServiceOne){
+ if (null == inRecordsServiceOne) {
//查询报名信息
TrainingRegistration trainingRegistration = new TrainingRegistration();
trainingRegistration.setCandidateNo(user.getCandidateNo());
@@ -593,7 +516,7 @@
sign.setExamId(Long.parseLong(one.getTrainExamId()));
//新增
signInRecordsService.save(sign);
- }else {
+ } else {
//更新
inRecordsServiceOne.setUpdateTime(new Date());
signInRecordsService.updateById(inRecordsServiceOne);
@@ -617,17 +540,19 @@
+ ",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();
// 解密
@@ -639,10 +564,10 @@
}
}
//填写你文件上传的地址以及相应信息
- String url = "http://223.82.109.183:2081";
- String access = "zhbaadmin";
- String secret = "zhbapassword";
- String bucket = "zhba";
+ String url = FileConfig.apiUrl;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -655,7 +580,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("/");
//创建头部信息
@@ -668,15 +593,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;
}
@@ -704,7 +629,7 @@
accreditationRecords.setStatus(1);
//查询
List<AccreditationRecords> list = accreditationRecordsService.list(Condition.getQueryWrapper(accreditationRecords));
- if (list.size()>0) {
+ if (list.size() > 0) {
//排序
List<AccreditationRecords> collect = list.stream().sorted(Comparator.comparing(AccreditationRecords::getId).reversed()).collect(Collectors.toList());
//取出第一个
@@ -721,9 +646,10 @@
+ ",user_type = " + "'" + user.getUserType() + "'"
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user.getId() + "';" +
- "update sys_accreditation_records set status = " + "'" + accreditationRecords1.getStatus() + "'" +
+ "update sys_accreditation_records set status = " + "'" + accreditationRecords1.getStatus() + "'" +
" " + "where id = " + "'" + accreditationRecords1.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
//返回
return R.success("修改成功");
}
@@ -733,7 +659,8 @@
+ ",user_type = " + "'" + user.getUserType() + "'"
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
return R.success("修改成功");
}
@@ -746,19 +673,22 @@
//@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 -> {
- 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);
- });
+// 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"
+// + ",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));
}
@@ -829,8 +759,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("操作成功");
}
@@ -842,8 +772,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("操作成功");
}
@@ -855,8 +785,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("操作成功");
}
@@ -867,8 +797,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("操作成功");
}
@@ -879,8 +809,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("操作成功");
}
@@ -939,9 +869,11 @@
securityExcel.setSex("男");
securityExcel.setCardid("360XXX19XXXXXX****");
securityExcel.setNation("汉");
- securityExcel.setRegistered("江西省南昌市******");
-// securityExcel.setHold("是");
- securityExcel.setSecuritynumber("赣洪202100001");
+ securityExcel.setRegistered("山西省晋城市******");
+ securityExcel.setEducation("本科");
+ securityExcel.setPoliticaloutlook("群众");
+ securityExcel.setUnitName("晋城市***公司");
+ securityExcel.setAddress("山西省晋城市******");
list.add(securityExcel);
SecurityExcel securityExcel1 = new SecurityExcel();
@@ -951,15 +883,17 @@
securityExcel1.setSex("女");
securityExcel1.setCardid("360XXX19XXXXXX****");
securityExcel1.setNation("汉");
- securityExcel1.setRegistered("江西省南昌市******");
-// securityExcel1.setHold("否");
- securityExcel1.setSecuritynumber("");
+ securityExcel1.setRegistered("山西省晋城市******");
+ securityExcel1.setEducation("本科");
+ securityExcel1.setPoliticaloutlook("党员");
+ securityExcel1.setUnitName("晋城市***公司");
+ securityExcel1.setAddress("山西省晋城市******");
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);
@@ -984,9 +918,9 @@
securityExcel.setSex("男");
securityExcel.setCardid("360XXX19XXXXXX****");
securityExcel.setNation("汉");
- securityExcel.setRegistered("江西省南昌市******");
+ securityExcel.setRegistered("山西省晋城市******");
// securityExcel.setHold("是");
- securityExcel.setSecuritynumber("赣洪202100001");
+// securityExcel.setSecuritynumber("晋202100001");
list.add(securityExcel);
SecurityYyExcel securityExcel1 = new SecurityYyExcel();
@@ -996,7 +930,7 @@
securityExcel1.setSex("女");
securityExcel1.setCardid("360XXX19XXXXXX****");
securityExcel1.setNation("汉");
- securityExcel1.setRegistered("江西省南昌市******");
+ securityExcel1.setRegistered("山西省晋城市******");
// securityExcel1.setHold("否");
securityExcel1.setSecuritynumber("");
list.add(securityExcel1);
@@ -1004,7 +938,7 @@
try {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
- fileName = URLEncoder.encode("保安员导入数据模板"+DateUtil.time(), Charsets.UTF_8.name());
+ fileName = URLEncoder.encode("保安员导入数据模板" + DateUtil.time(), Charsets.UTF_8.name());
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
//修改单元格格式为文本格式
EasyExcel.write(response.getOutputStream(), SecurityYyExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
@@ -1128,7 +1062,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);
@@ -1164,11 +1098,11 @@
List<User> list = userService.list(Condition.getQueryWrapper(user1));
if (list.size() > 0 && Func.isEmpty(user.getId())) {
- if (null!=user.getCell() && !user.getCell().equals("")) {
- if (user.getCell().equals("2")){
+ if (null != user.getCell() && !user.getCell().equals("")) {
+ if (user.getCell().equals("2")) {
list.forEach(user2 -> {
//判断是否在本单位，如果是本单位,则不能再次新增
- if(!user2.getDeptId().equals(user.getDeptId())) {
+ if (!user2.getDeptId().equals(user.getDeptId())) {
user2.setStatus(2);
//先将原有人员离职 cell 1:手动录入 2：自动录入
user2.setUpdateTime(new Date());
@@ -1177,47 +1111,52 @@
String s1 = "update blade_user set status = " + user2.getStatus() +
",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'" +
" where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
//人员离职后修改派遣记录，修改从业记录
updateUserDispatcherExp(user2);
- }else {
+ } else {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
});
- }else {
+ } else {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
- }else {
+ } else {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
}
//判断是否持证
-// if (user.getHold().equals("1")){
-// //持证，校验保安证编号是否合法
-// SecurityPaper securityPaper = new SecurityPaper();
-// securityPaper.setIdCardNo(user.getCardid());
-// List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
-// if (securityPaperList.size()>0){
-// boolean status = false;
-// //遍历
-// for (SecurityPaper paper : securityPaperList) {
-// if (paper.getNumber().equals(user.getSecuritynumber())){
-// status = true;
-// }
-// }
-// if (!status){
-// throw new ServiceException("保安证编号不匹配,请核实!");
-// }
-// }else {
-// throw new ServiceException("保安证编号不匹配,请核实!");
-// }
-// }
+ boolean state = false;
+ if (user.getHold().equals("1")){
+ //持证，校验保安证编号是否合法
+ SecurityPaper securityPaper = new SecurityPaper();
+ securityPaper.setIdCardNo(user.getCardid());
+ List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
+ if (securityPaperList.size()>0){
+ //遍历
+ for (SecurityPaper paper : securityPaperList) {
+ if (paper.getNumber().equals(user.getSecuritynumber())){
+ state = true;
+ }
+ }
+ if (!state){
+ user.setHold("2");
+ user.setSecuritynumber(null);
+ }
+ }else {
+ user.setHold("2");
+ user.setSecuritynumber(null);
+ }
+ }else {
+ state = true;
+ }
String url = "";
- if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
- if (user.getFingerprint().length()>100) {
+ if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
+ if (user.getFingerprint().length() > 100) {
String s = uploadBase64String(user);
String[] split = s.split(",");
user.setFingerprint(split[0]);
@@ -1264,88 +1203,20 @@
// 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));
}
- //数据推送
- //1.群访群控数据推送(异步)
- if (status) {
- myAsyncService.qfqkUserSave(user);
- }
-
-
- //2.内网数据推送
- String s = "insert into blade_user(" +
- "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
- "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
- "politicaloutlook,healstats,height,address,registered,rtime," +
- "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,guncode,create_time,cell) " +
- "values(" + "'" + user.getId() + "'" +
- "," + "'" + user.getTenantId() + "'" +
- "," + "'" + user.getAccount() + "'" +
- "," + "'" + user.getPassword() + "'" +
- "," + "'" + user.getName() + "'" +
- "," + "'" + user.getRealName() + "'" +
- "," + "'" + user.getAvatar() + "'" +
- "," + "'" + user.getEmail() + "'" +
- "," + "'" + user.getPhone() + "'" +
- "," + "'" + user.getSex() + "'" +
- "," + "'" + user.getRoleId() + "'" +
- "," + "'" + user.getDeptId() + "'" +
- "," + "'" + user.getCardid() + "'" +
- "," + "'" + user.getNativeplace() + "'" +
- "," + "'" + user.getNation() + "'" +
- "," + "'" + url + "'" +
- "," + "'" + user.getEducation() + "'" +
- "," + "'" + user.getPoliticaloutlook() + "'" +
- "," + "'" + user.getHealstats() + "'"+
- "," + "'" + user.getHeight() + "'" +
- "," + "'" + user.getAddress() + "'" +
- "," + "'" + user.getRegistered() + "'" +
- "," +"'" + rtime + "'" +
- "," + "'" + user.getSecuritynumber() + "'" +
- "," + "'" + user.getHold() + "'" +
- "," + "'" + user.getJurisdiction() + "'" +
- "," + "'" + user.getExaminationType() + "'" +
- "," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getIsDeleted() + "'" +
- "," + "'" + user.getDispatch() + "'" +
- "," + "'" + user.getGuncode() + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
- "," + "'" + user.getCell() + "'" + ");"+
- "insert into sys_experience(id,name,post,entryTime," +
- "cardId,companyname,securityId) " +
- "values(" + "'" + experience.getId() + "'" + "," +
- "'" + experience.getName() + "'" + "," +
- "'" + experience.getPost() + "'" + "," +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
- "," + "'" + experience.getCardid() + "'" +
- "," + "'" + experience.getCompanyname() + "'" +
- "," + "'" + experience.getSecurityid() + "'"
- + ")";
- 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);
-// }
-// }
//判断是否持证是否为空
- return R.status(status);
+ if (!state) {
+ return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ return R.data(200,null,"新增成功!");
}
/**
* 修改派遣记录，修改从业记录
+ *
* @param user
*/
private void updateUserDispatcherExp(User user) {
@@ -1357,7 +1228,7 @@
dispatcher.setUserIds(user.getId().toString());
dispatcher.setStatus(0);
List<Dispatcher> dispatcherList = dispatcherService.list(Condition.getQueryWrapper(dispatcher));
- if (dispatcherList.size()>0){
+ if (dispatcherList.size() > 0) {
dispatcherList.forEach(dispatcher1 -> {
dispatcher1.setStatus(1);
dispatcher1.setUpdateTime(new Date());
@@ -1365,7 +1236,8 @@
"update sys_dispatcher set status = " + "'" + dispatcher1.getStatus() + "'"
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher1.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + dispatcher1.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
});
}
@@ -1376,7 +1248,7 @@
experience.setCompanyname(dept.getDeptName());
//按id降序
List<Experience> list = experienceService.list(Condition.getQueryWrapper(experience).orderByDesc("id"));
- if (list.size()>0){
+ if (list.size() > 0) {
//如果有多条取第一条更新
Experience experience1 = list.get(0);
//设置离职时间
@@ -1387,17 +1259,18 @@
String s1 =
"update sys_experience set departureTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience1.getDeparturetime()) + "'"
+ " " + "where id = " + "'" + experience1.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- }else {
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ } else {
//新增
- if (null!=user.getRtime()){
+ if (null != user.getRtime()) {
experience.setEntrytime(user.getRtime());
- }else {
+ } else {
experience.setEntrytime(new Date());
}
experience.setDeparturetime(new Date());
experience.setName(user.getRealName());
- if (null!=user.getReasonForLeav() && !user.getReasonForLeav().equals("")){
+ if (null != user.getReasonForLeav() && !user.getReasonForLeav().equals("")) {
experience.setLeaving(user.getReasonForLeav());
}
experience.setCardid(user.getCardid());
@@ -1416,7 +1289,8 @@
"," + "'" + experience.getCompanyname() + "'" +
"," + "'" + experience.getSecurityid() + "'"
+ ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
}
}
@@ -1448,13 +1322,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);
@@ -1466,17 +1341,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);
@@ -1489,6 +1365,7 @@
/**
* 保安员账号校验
+ *
* @param user
* @return
*/
@@ -1500,15 +1377,15 @@
user1.setIsDeleted(0);
user1.setStatus(1);
User user2 = userService.getOne(Condition.getQueryWrapper(user1));
- if (null!=user2){
+ if (null != user2) {
//判断是单位否一致
- if (null!=user.getDeptId() && !user.getDeptId().equals("")) {
+ if (null != user.getDeptId() && !user.getDeptId().equals("")) {
if (!user2.getDeptId().equals(user.getDeptId())) {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已在其他单位录入!", user.getCardid()));
} else {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getCardid()));
}
- }else {
+ } else {
//没有传 deptId 的情况
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getCardid()));
}
@@ -1517,21 +1394,23 @@
/**
* 年龄分布查询
+ *
* @param user
* @return
*/
@PostMapping("/getAgeStatistics")
- public R getAgeStatistics(UserVO user){
+ public R getAgeStatistics(UserVO user) {
return R.data(userService.getAgeStatistics(user));
}
/**
* 查询登录密码还是 123456 的单位信息
+ *
* @return
*/
@GetMapping("/getNotUpdatePwdInfo")
- public R getNotUpdatePwdInfo(){
+ public R getNotUpdatePwdInfo() {
return R.data(userService.getNotUpdatePwdInfo());
}
}
--
Gitblit v1.9.3