From 0f8b802c137ad121cadd3a798f818903e9de72ac Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 09 May 2022 15:20:18 +0800
Subject: [PATCH] 用户数据同步修改，test 数据库连接修改
---
src/main/java/org/springblade/modules/system/excel/UserExcels.java | 36 ++++++++++-------
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java | 1
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 4 +
src/main/java/org/springblade/modules/system/controller/UserController.java | 45 +++++++++++++++-------
src/main/java/org/springblade/modules/system/dto/UserDTO.java | 2 +
src/main/java/org/springblade/modules/system/entity/User.java | 5 ++
src/main/resources/application-test.yml | 6 +-
7 files changed, 65 insertions(+), 34 deletions(-)
diff --git a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
index eb2ec3b..b60159a 100644
--- a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
+++ b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
@@ -111,6 +111,7 @@
.set("workjurisdiction", user.getWorkjurisdiction())
.set("firstlogin", user.getFirstlogin())
.set("dwmc", user.getRolename())
+ .set("securityId", user.getSecurityId())
.set(TokenConstant.OAUTH_ID, userInfo.getOauthId())
.set(TokenConstant.ACCOUNT, user.getAccount())
.set(TokenConstant.USER_NAME, user.getAccount())
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 7b0a167..b5852c7 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -541,11 +541,11 @@
@PostMapping("/securitySaves")
@Transactional(rollbackFor = Exception.class)
public R securitySaves(@RequestBody User user) {
- Integer userCount = userService.selectCount(user.getAccount());
- //判断用户是否存在
- if (userCount > 0) {
- throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
- }
+// Integer userCount = userService.selectCount(user.getAccount());
+// //判断用户是否存在
+// if (userCount > 0) {
+// throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+// }
user.setRoleId("1495714343888039937");
user.setDeptId("1424615972718895106");
user.setStype("1");
@@ -557,7 +557,7 @@
}
/**
- * 保安员新增(数据同步调用)
+ * 保安员修改(数据同步调用)
*/
@PostMapping("/updateBySecurtiy")
@Transactional(rollbackFor = Exception.class)
@@ -565,7 +565,8 @@
User user1 = new User();
user1.setIsDeleted(0);
user1.setStatus(1);
- user1.setCardid(user.getCardid());
+// user1.setCardid(user.getCardid());
+ user1.setSecurityId(user.getSecurityId());
User one = userService.getOne(Condition.getQueryWrapper(user1));
boolean status = false;
if (null!=one){
@@ -591,17 +592,30 @@
User user1 = new User();
user1.setIsDeleted(0);
user1.setStatus(1);
- user1.setCardid(user.getOldCardid());
+ user1.setSecurityId(user.getSecurityId());
+// user1.setCardid(user.getOldCardid());
User one = userService.getOne(Condition.getQueryWrapper(user1));
boolean status = false;
if (null!=one){
//修改
- one.setAccount(user.getCardid());
- one.setCardid(user.getCardid());
- one.setPassword(user.getPassword());
- one.setAvatar(user.getAvatar());
- one.setPhone(user.getPhone());
- one.setRealName(user.getRealName());
+ if (null!= one.getAccount()) {
+ one.setAccount(user.getAccount());
+ }
+ if (null!= one.getCardid()) {
+ one.setCardid(user.getCardid());
+ }
+ if (null!= one.getPassword()) {
+ one.setPassword(user.getPassword());
+ }
+ if (null!= one.getAvatar()) {
+ one.setAvatar(user.getAvatar());
+ }
+ if (null!= one.getPhone()) {
+ one.setPhone(user.getPhone());
+ }
+ if (null!= one.getRealName()) {
+ one.setRealName(user.getRealName());
+ }
one.setUpdateTime(new Date());
//用户修改
status = userService.updateById(one);
@@ -619,7 +633,8 @@
User user1 = new User();
user1.setIsDeleted(0);
user1.setStatus(1);
- user1.setCardid(user.getCardid());
+ user1.setSecurityId(user.getSecurityId());
+// user1.setCardid(user.getCardid());
User one = userService.getOne(Condition.getQueryWrapper(user1));
boolean status = false;
if (null!=one){
diff --git a/src/main/java/org/springblade/modules/system/dto/UserDTO.java b/src/main/java/org/springblade/modules/system/dto/UserDTO.java
index 4b89df1..391fbf5 100644
--- a/src/main/java/org/springblade/modules/system/dto/UserDTO.java
+++ b/src/main/java/org/springblade/modules/system/dto/UserDTO.java
@@ -45,4 +45,6 @@
private String cardid;
private String oldCardid;
+
+ private String securityId;
}
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 6945cc0..12bb5f4 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -152,4 +152,9 @@
private String jobUnit;
private String firstlogin;
private String rolename;
+
+ /**
+ * 保安员id,关联保安系统
+ */
+ private String securityId;
}
diff --git a/src/main/java/org/springblade/modules/system/excel/UserExcels.java b/src/main/java/org/springblade/modules/system/excel/UserExcels.java
index 44f4221..54e80db 100644
--- a/src/main/java/org/springblade/modules/system/excel/UserExcels.java
+++ b/src/main/java/org/springblade/modules/system/excel/UserExcels.java
@@ -38,6 +38,11 @@
public class UserExcels implements Serializable {
private static final long serialVersionUID = 1L;
+
+ @ColumnWidth(20)
+ @ExcelProperty("保安系统用户ID")
+ private String securityId;
+
@ColumnWidth(15)
@ExcelProperty("账户")
private String account;
@@ -69,34 +74,35 @@
@ExcelProperty("性别")
private Integer sex;
- @ColumnWidth(20)
- @ExcelProperty("角色ID")
- private String roleId;
+// @ColumnWidth(20)
+// @ExcelProperty("角色ID")
+// private String roleId;
- @ColumnWidth(10)
- @ExcelProperty("是否在职")
- private Integer status;
+// @ColumnWidth(10)
+// @ExcelProperty("是否在职")
+// private Integer status;
- @ColumnWidth(10)
- @ExcelProperty("是否删除")
- private Integer isDeleted;
+// @ColumnWidth(10)
+// @ExcelProperty("是否删除")
+// private Integer isDeleted;
@ColumnWidth(10)
@ExcelProperty("审查状态")
private String examinationType;
- @ColumnWidth(15)
- @ExcelProperty("审查明细")
- private String examinationMx;
+// @ColumnWidth(15)
+// @ExcelProperty("审查明细")
+// private String examinationMx;
- @ColumnWidth(15)
- @ExcelProperty("辖区ID")
- private String jurisdiction;
+// @ColumnWidth(15)
+// @ExcelProperty("辖区ID")
+// private String jurisdiction;
@ColumnWidth(20)
@ExcelProperty("身份证号码")
private String cardid;
+
}
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 c228aab..6f1ba77 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
@@ -565,11 +565,13 @@
user.setRoleId("1495714343888039937");
user.setDeptId("1424615972718895106");
user.setStype("1");
+ user.setIsDeleted(0);
+ user.setStatus(1);
//查询身份证号是否有重复的,有的话只更新
User user1 = new User();
- user1.setCardid(user.getCardid());
user1.setStatus(1);
user1.setIsDeleted(0);
+ user1.setSecurityId(userExcel.getSecurityId());
List<User> list = this.list(Condition.getQueryWrapper(user1));
if (list.size()>0){
//更新
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 8db0ea3..f113383 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -21,9 +21,9 @@
# username: root
# password: zhba0728
- url: jdbc:mysql://61.131.136.25:2083/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://36.134.81.48:3306/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: ZHba@0112
+ password: jfpt123
# url: jdbc:mysql://47.49.36.191:3306/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
# username: root
@@ -44,7 +44,7 @@
#ftp 设置
ftp:
- sqlConnect: jdbc:mysql://localhost:2083/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ sqlConnect: jdbc:mysql://36.134.81.48:3306/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
ftpHost: 192.168.0.198
ftpPort: 21
ftpUserName: arsn
--
Gitblit v1.9.3