From fc21989ae9cde74aff82a9018087dd104d255f79 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 25 Jun 2023 17:11:47 +0800
Subject: [PATCH] 晋城版
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 202 ++++++++------------------------------------------
1 files changed, 33 insertions(+), 169 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 d5a67bd..c0a31a5 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -436,7 +436,7 @@
boolean status = userService.updateById(user);
//qfqk 数据推送
if (status) {
- myAsyncService.updateUserByQfqk(user);
+// myAsyncService.updateUserByQfqk(user);
//内网更新
String s1 =
"update blade_user set status = " + "'" + user.getStatus() + "'"
@@ -489,80 +489,10 @@
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);
- myAsyncService.dataSync(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);
- myAsyncService.dataSync(s1);
}
if (!states) {
return R.data(201,null,"保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
@@ -661,7 +591,7 @@
}
}
//填写你文件上传的地址以及相应信息
- String url = FileConfig.url;
+ String url = FileConfig.apiUrl;
String access = FileConfig.access;
String secret = FileConfig.secret;
String bucket = FileConfig.bucket;
@@ -770,22 +700,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"
- + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'"
- + " " + "where id = " + "'" + id + "'";
- //FtpUtil.sqlFileUpload(s1);
- myAsyncService.dataSync(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));
}
@@ -966,9 +896,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();
@@ -978,9 +910,11 @@
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 {
@@ -1011,9 +945,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();
@@ -1023,7 +957,7 @@
securityExcel1.setSex("女");
securityExcel1.setCardid("360XXX19XXXXXX****");
securityExcel1.setNation("汉");
- securityExcel1.setRegistered("江西省南昌市******");
+ securityExcel1.setRegistered("山西省晋城市******");
// securityExcel1.setHold("否");
securityExcel1.setSecuritynumber("");
list.add(securityExcel1);
@@ -1300,76 +1234,6 @@
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,update_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()) + "'" +
- "," + "'" + 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() + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
- "," + "'" + experience.getCardid() + "'" +
- "," + "'" + experience.getCompanyname() + "'" +
- "," + "'" + experience.getSecurityid() + "'" + ")";
- myAsyncService.dataSync(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);
-// }
-// }
//判断是否持证是否为空
if (!state) {
return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
--
Gitblit v1.9.3