From a491941cece9a90d72c9c6b0aab0e718e39dbd3c Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Mon, 22 Aug 2022 15:54:22 +0800
Subject: [PATCH] 从业记录新增同步sql 修改，用户新增审查逻辑修改，外网部门只更新状态，不更新审查明细，内网状态和明细都更新
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 70 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 34 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 c7643ed..cce72a2 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;
@@ -273,7 +274,7 @@
"," + "'" + user.getIsDeleted() + "'" +
"," + "'" + user.getJurisdiction() + "'"
+ ")";
- myAsyncService.FTP(s);
+ myAsyncService.dataSync(s);
}
} else {
//修改
@@ -294,7 +295,7 @@
+ ",cardid = " + "'" + user.getCardid() + "'"
+ ",guncode = " + "'" + user.getGuncode() + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
}
}
@@ -372,7 +373,7 @@
"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.FTP(s1);
+ myAsyncService.dataSync(s1);
}
});
}
@@ -397,7 +398,7 @@
"update sys_experience set departureTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience1.getDeparturetime()) + "'"
+ " " + "where id = " + "'" + experience1.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
} else {
//新增
if (null != user.getRtime()) {
@@ -426,7 +427,7 @@
"," + "'" + experience.getCompanyname() + "'" +
"," + "'" + experience.getSecurityid() + "'"
+ ")";
- myAsyncService.FTP(s);
+ myAsyncService.dataSync(s);
}
}
@@ -437,10 +438,10 @@
//内网更新
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.FTP(s1);
+ myAsyncService.dataSync(s1);
}
-
return R.success("修改成功");
}
}
@@ -525,7 +526,7 @@
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
} else {
rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
String s1 =
@@ -559,7 +560,7 @@
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
}
if (!states) {
return R.data(201,null,"保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
@@ -635,7 +636,7 @@
+ ",cell = " + "'" + user.getCell() + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
return R.success("修改成功");
}
@@ -658,10 +659,10 @@
}
}
//填写你文件上传的地址以及相应信息
- String url = "http://61.131.136.25:2081";
- String access = "zhbaadmin";
- String secret = "zhbapassword";
- String bucket = "zhba";
+ String url = FileConfig.url;
+ String access = FileConfig.access;
+ String secret = FileConfig.secret;
+ String bucket = FileConfig.bucket;
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -687,11 +688,11 @@
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://61.131.136.25:2081/zhba/" + newName;
+ String urls = FileConfig.url + "/zhba/" + newName;
//内网
String inUrl = FtpConfig.ip + "/zhba/" + newName;
//返回
@@ -743,7 +744,7 @@
"update sys_accreditation_records set status = " + "'" + accreditationRecords1.getStatus() + "'" +
" " + "where id = " + "'" + accreditationRecords1.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
//返回
return R.success("修改成功");
}
@@ -754,7 +755,7 @@
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
return R.success("修改成功");
}
@@ -777,9 +778,11 @@
//qfqk 同步
myAsyncService.deleteUserByQfqk(user1);
//内网同步
- String s1 = "update blade_user set is_deleted = 1 where id = " + "'" + id + "'";
+ 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.FTP(s1);
+ myAsyncService.dataSync(s1);
});
return R.status(userService.removeUser(ids));
}
@@ -1200,7 +1203,7 @@
",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'" +
" where id = " + "'" + user2.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
//人员离职后修改派遣记录，修改从业记录
updateUserDispatcherExp(user2);
@@ -1304,7 +1307,7 @@
"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) " +
+ "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,guncode,create_time,update_time,cell) " +
"values(" + "'" + user.getId() + "'" +
"," + "'" + user.getTenantId() + "'" +
"," + "'" + user.getAccount() + "'" +
@@ -1337,18 +1340,17 @@
"," + "'" + user.getDispatch() + "'" +
"," + "'" + user.getGuncode() + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
"," + "'" + user.getCell() + "'" + ");" +
- "insert into sys_experience(id,name,post,entryTime," +
- "cardId,companyname,securityId) " +
- "values(" + "'" + experience.getId() + "'" + "," +
- "'" + experience.getName() + "'" + "," +
- "'" + experience.getPost() + "'" + "," +
+ "insert into sys_experience(id,name,post,entryTime,cardId,companyname,securityId) " +
+ "values(" + "'" + experience.getId() + "'" +
+ "," + "'" + experience.getName() + "'" +
+ "," + "'" + experience.getPost() + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
"," + "'" + experience.getCardid() + "'" +
"," + "'" + experience.getCompanyname() + "'" +
- "," + "'" + experience.getSecurityid() + "'"
- + ")";
- myAsyncService.FTP(s);
+ "," + "'" + experience.getSecurityid() + "'" + ")";
+ myAsyncService.dataSync(s);
}
@@ -1396,7 +1398,7 @@
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher1.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + dispatcher1.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
});
}
@@ -1419,7 +1421,7 @@
"update sys_experience set departureTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience1.getDeparturetime()) + "'"
+ " " + "where id = " + "'" + experience1.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
} else {
//新增
if (null != user.getRtime()) {
@@ -1449,7 +1451,7 @@
"," + "'" + experience.getSecurityid() + "'"
+ ")";
//FtpUtil.sqlFileUpload(s);
- myAsyncService.FTP(s);
+ myAsyncService.dataSync(s);
}
}
--
Gitblit v1.9.3