From bef93a3facab3b343512046e714a1d1b2ea750a6 Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期一, 22 四月 2024 08:51:55 +0800
Subject: [PATCH] 用户功能调试
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java | 15 +++++++++++----
pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml | 4 ++--
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java | 2 +-
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java | 2 +-
4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java
index 4fefbde..e843aa4 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java
@@ -2,15 +2,14 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.validation.constraints.NotEmpty;
import lombok.*;
import org.hibernate.validator.constraints.Length;
+import java.util.Date;
import java.util.List;
/**
@@ -62,6 +61,7 @@
*/
@NotEmpty(message = "瀵嗙爜涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
@Length(message = "瀵嗙爜蹇呴』{max}浣嶆暟鎹�", min = 6, max = 6)
+ @JSONField(serialize = false)
public String password;
/**
@@ -80,6 +80,13 @@
*/
public Boolean deleted;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField(value = "create_dt", fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ public Date createDt;
+
//////////////////////////////////////
// 浠ヤ笅涓嶆槸鏁版嵁搴撳疄浣撳睘鎬�
//////////////////////////////////////
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
index b4adcd1..a011812 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -36,10 +36,10 @@
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, `name`, phone, `password`, supper_admin, disabled, deleted
+ id, `name`, phone, `password`, supper_admin, disabled, deleted,create_dt
</sql>
<sql id="part_Column_List">
- ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.password, ${alias}.disabled
+ ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.password, ${alias}.disabled,${alias}.create_dt
</sql>
<sql id="Login_Column_List">
id, name, phone, supper_admin
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
index 29e4c59..01bd5b6 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
@@ -241,7 +241,7 @@
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
- return BaseResponseUtils.buildSuccess("淇敼瀵嗙爜鎴愬姛");
+ return BaseResponseUtils.buildSuccess("閲嶇疆瀵嗙爜鎴愬姛");
}
}
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java
index ac488f7..753a880 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java
@@ -117,7 +117,7 @@
* @return 鎻掑叆鐢ㄦ埛涓庤鑹插叧鑱旇褰曟暟閲�
*/
@Transactional
- private int saveUserRoles(Long userId, String[] roleIds) {
+ public int saveUserRoles(Long userId, String[] roleIds) {
this.urDao.deleteByUserId(userId);
int count = 0;
if (roleIds != null && roleIds.length > 0) {
--
Gitblit v1.8.0