From 7c2c09439da3dccf1e032e89e1cb950b8fa1cc26 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 01 Mar 2022 20:09:57 +0800
Subject: [PATCH] 健康证，合同基础接口编写
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 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 f647ebd..d4b9e34 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
@@ -91,6 +91,7 @@
private final IDeptService deptService;
private final JurisdictionService jurisdictionService;
private final IExperienceService experienceService;
+ private final MyAsyncService myAsyncService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -143,7 +144,8 @@
"," + "'" + user.getJurisdiction() + "'"+
"," + "'" + user.getIsDeleted() + "'"
+ ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
return b;
}
@@ -543,7 +545,8 @@
"," + "'" + user.getIsDeleted() + "'" +
"," + "'" + user.getJurisdiction() + "'"
+ ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
}else {
//匹配组织机构是否一致,如果不一致
if(!user2.getDeptId().equals(user.getDeptId())){
@@ -580,7 +583,8 @@
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
+ ",cardid = " + "'" + user2.getCardid() + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
}
});
@@ -985,7 +989,8 @@
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
+ ",registered = " + "'" + user2.getRegistered() + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}else {
status.set(false);
//加入集合
@@ -1017,7 +1022,8 @@
+ ",registered = " + "'" + user2.getRegistered() + "'"
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
}
}
@@ -1072,7 +1078,8 @@
//判断list.size 大小
if (list.size()==1000){
//执行
- FtpUtil.sqlFileUpload(builder.toString());
+ //FtpUtil.sqlFileUpload(builder.toString());
+ myAsyncService.FTP(builder.toString());
//清空
builder.delete(0,builder.length());
}
@@ -1105,14 +1112,17 @@
//判断list.size 大小
if (split1.length==1000){
//执行
- FtpUtil.sqlFileUpload(builder1.toString());
+ //FtpUtil.sqlFileUpload(builder1.toString());
+ myAsyncService.FTP(builder1.toString());
//清空
builder1.delete(0,builder1.length());
}
}
//剩余的继续执行
- FtpUtil.sqlFileUpload(builder.toString());
- FtpUtil.sqlFileUpload(builder1.toString());
+ //FtpUtil.sqlFileUpload(builder.toString());
+ myAsyncService.FTP(builder.toString());
+ //FtpUtil.sqlFileUpload(builder1.toString());
+ myAsyncService.FTP(builder1.toString());
}
// System.out.println("导入时间： = " + (System.currentTimeMillis()-time));
@@ -1298,7 +1308,8 @@
"," + "'" + experience.getCompanyname() + "'" +
"," + "'" + experience.getSecurityid() + "'"
+ ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
}
else {
//匹配组织机构是否一致,如果不一致
@@ -1347,7 +1358,8 @@
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
+ ",registered = " + "'" + user2.getRegistered() + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}else {
status.set(false);
//加入集合
@@ -1388,7 +1400,8 @@
+ ",registered = " + "'" + user2.getRegistered() + "'"
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
}
});
@@ -1475,8 +1488,8 @@
* @return
*/
@Override
- public UserVO getUserInfoBySecurityNumber(String securityNumber) {
- UserVO userVO = baseMapper.getUserInfoBySecurityNumber(securityNumber);
+ public UserVO getUserInfoBySecurityNumber(String securityNumber,String cardid) {
+ UserVO userVO = baseMapper.getUserInfoBySecurityNumber(securityNumber,cardid);
//查询派遣信息
if (null!=userVO) {
DispatcherVO dispatcherVO = baseMapper.getUserDispatcherInfo(userVO.getId());
@@ -1743,4 +1756,29 @@
//返回
return list;
}
+
+ /**
+ * 查询登录密码还是 123456 的单位信息
+ * @return
+ */
+ @Override
+ public Object getNotUpdatePwdInfo() {
+ //查询角色为保安公司管理员的用户信息
+ User user = new User();
+ user.setRoleId("1414575196264300546");
+ user.setStatus(1);
+ user.setIsDeleted(0);
+ List<User> list = this.list(Condition.getQueryWrapper(user));
+ List<User> list1 = new ArrayList<>();
+ //遍历
+ if (list.size()>0){
+ byte[] bytes = DigestUtil.decodeHex(list.get(0).getPassword());
+ try {
+ System.out.println("解密的密码 = " + new String(bytes));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return list;
+ }
}
--
Gitblit v1.9.3