From f47e7d71f9ce13f3964b7d3753d3b42b36d35582 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Dec 2021 11:47:57 +0800
Subject: [PATCH] 保安员新增，修改，时间同步，定时任务打印时间
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 90 ++++++++++++++++++++++++++++++++-------------
1 files changed, 64 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index ae31613..4385e20 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -44,6 +44,8 @@
import org.springblade.modules.accreditation.service.AccreditationRecordsService;
import org.springblade.modules.auth.enums.UserEnum;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
+import org.springblade.modules.experience.entity.Experience;
+import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
@@ -60,6 +62,7 @@
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import sun.java2d.pipe.SpanShapeRenderer;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -89,7 +92,7 @@
private final IInformationService iInformationService;
private final IDeptService deptService;
private final JurisdictionService jurisdictionService;
- private final AccreditationRecordsService accreditationRecordsService;
+ private final IExperienceService experienceService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -899,14 +902,27 @@
if (userCount > 0 && Func.isEmpty(user.getId())) {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
+ user.setCreateTime(new Date());
//新增
this.save(user);
+
+
+ //从业记录新增
+ Experience experience = new Experience();
+ experience.setCardid(user.getCardid());
+ experience.setSecurityid(user.getId().toString());
+ experience.setCompanyname(userExcel.getDeptId());
+ experience.setName(user.getRealName());
+ experience.setPost("保安员");
+ experience.setEntrytime(new Date());
+ experienceService.save(experience);
+
//内网同步
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," +
- "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
+ "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,create_time) " +
"values(" + "'" + user.getId() + "'" +
"," + "'" + user.getTenantId() + "'" +
"," + "'" + user.getAccount() + "'" +
@@ -935,7 +951,18 @@
"," + "'" + user.getExaminationType() + "'" +
"," + "'" + user.getStatus() + "'" +
"," + "'" + user.getIsDeleted() + "'" +
- "," + "'" + user.getDispatch() + "'" + ")";
+ "," + "'" + user.getDispatch() + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" + ");"+
+ "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);
// }else {
// agetStatus.set(false);
@@ -966,11 +993,13 @@
user2.setRegistered("");
}
//更新用户数据
+ user2.setUpdateTime(new Date());
this.updateById(user2);
String s1 =
"update blade_user set hold = " + "'" + user2.getHold() + "'"
+ ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
+ ",dept_id = " + "'" + user2.getDeptId() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
+ ",registered = " + "'" + user2.getRegistered() + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
FtpUtil.sqlFileUpload(s1);
@@ -999,12 +1028,14 @@
}else {
user2.setRegistered("");
}
+ user2.setUpdateTime(new Date());
//更新用户数据
this.updateById(user2);
String s1 =
"update blade_user set hold = " + "'" + user2.getHold() + "'"
+ ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
+ ",registered = " + "'" + user2.getRegistered() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}
@@ -1130,34 +1161,26 @@
if (userCount > 0 && Func.isEmpty(user.getId())) {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
+ user.setCreateTime(new Date());
//新增
this.save(user);
+
+ //从业记录新增
+ Experience experience = new Experience();
+ experience.setCardid(user.getCardid());
+ experience.setSecurityid(user.getId().toString());
+ experience.setCompanyname(userExcel.getDeptId());
+ experience.setName(user.getRealName());
+ experience.setPost("保安员");
+ experience.setEntrytime(new Date());
+ experienceService.save(experience);
+
//内网同步
-// String s = "insert into blade_user(" +
-// "id,tenant_id,account,password,real_name,phone,sex,role_id,dept_id," +
-// "cardid,nation,registered,securitynumber,hold,status,is_deleted) " +
-// "values(" + "'" + user.getId() + "'" + "," +
-// "'" + user.getTenantId() + "'" + "," +
-// "'" + user.getAccount() + "'" + "," +
-// "'" + user.getPassword() + "'" + "," +
-// "'" + user.getRealName() + "'" + "," +
-// "'" + user.getPhone() + "'" + "," +
-// "'" + user.getSex() + "'" + "," +
-// "'" + user.getRoleId() + "'" +
-// "," + "'" + user.getDeptId() + "'" +
-// "," + "'" + user.getCardid() + "'" +
-// "," + "'" + user.getNation() + "'" +
-// "," + "'" + user.getRegistered() + "'" +
-// "," + "'" + user.getSecuritynumber() + "'" +
-// "," + "'" + user.getHold() + "'" +
-// "," + "'" + user.getStatus() + "'" +
-// "," + "'" + user.getIsDeleted() + "'"
-// + ")";
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," +
- "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,guncode) " +
+ "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,create_time,guncode) " +
"values(" + "'" + user.getId() + "'" +
"," + "'" + user.getTenantId() + "'" +
"," + "'" + user.getAccount() + "'" +
@@ -1186,8 +1209,19 @@
"," + "'" + user.getExaminationType() + "'" +
"," + "'" + user.getStatus() + "'" +
"," + "'" + user.getIsDeleted() + "'" +
- "," + "'" + user.getIsDeleted() + "'" +
- "," + "'" + user.getGuncode() + "'" + ")";
+ "," + "'" + user.getDispatch() + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
+ "," + "'" + user.getGuncode() + "'" + ");"+
+ "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);
}
else {
@@ -1221,12 +1255,14 @@
}else {
user2.setRegistered("");
}
+ user2.setUpdateTime(new Date());
//更新用户数据
this.updateById(user2);
String s1 =
"update blade_user set hold = " + "'" + user2.getHold() + "'"
+ ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
+ ",dept_id = " + "'" + user2.getDeptId() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
+ ",registered = " + "'" + user2.getRegistered() + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
FtpUtil.sqlFileUpload(s1);
@@ -1255,12 +1291,14 @@
}else {
user2.setRegistered("");
}
+ user2.setUpdateTime(new Date());
//更新用户数据
this.updateById(user2);
String s1 =
"update blade_user set hold = " + "'" + user2.getHold() + "'"
+ ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
+ ",registered = " + "'" + user2.getRegistered() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}
--
Gitblit v1.9.3