This is an automated email from the ASF dual-hosted git repository.
nicholasjiang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/paimon-webui.git
The following commit(s) were added to refs/heads/main by this push:
new 7d702aac [Bugfix] Add updateTime field into Mapper (#313)
7d702aac is described below
commit 7d702aac4cb5c8f4f5a61e4555323e8b975be108
Author: XianmingZhou00 <[email protected]>
AuthorDate: Fri Jun 7 11:40:43 2024 +0800
[Bugfix] Add updateTime field into Mapper (#313)
---
.../web/server/configrue/MybatisPlusMetaObjectHandler.java | 1 +
.../src/main/resources/mapper/SysRoleMapper.xml | 2 +-
paimon-web-server/src/main/resources/mapper/UserMapper.xml | 2 +-
.../paimon/web/server/controller/SysRoleControllerTest.java | 12 ++++++++++--
.../paimon/web/server/controller/UserControllerTest.java | 6 ++++++
5 files changed, 19 insertions(+), 4 deletions(-)
diff --git
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/configrue/MybatisPlusMetaObjectHandler.java
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/configrue/MybatisPlusMetaObjectHandler.java
index 49d61f2f..8ce127bb 100644
---
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/configrue/MybatisPlusMetaObjectHandler.java
+++
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/configrue/MybatisPlusMetaObjectHandler.java
@@ -32,6 +32,7 @@ public class MybatisPlusMetaObjectHandler implements
MetaObjectHandler {
@Override
public void insertFill(MetaObject metaObject) {
this.strictInsertFill(metaObject, "createTime", LocalDateTime.class,
LocalDateTime.now());
+ this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class,
LocalDateTime.now());
}
@Override
diff --git a/paimon-web-server/src/main/resources/mapper/SysRoleMapper.xml
b/paimon-web-server/src/main/resources/mapper/SysRoleMapper.xml
index 75256ea5..d00d4449 100644
--- a/paimon-web-server/src/main/resources/mapper/SysRoleMapper.xml
+++ b/paimon-web-server/src/main/resources/mapper/SysRoleMapper.xml
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectRoleVo">
select distinct r.id, r.role_name, r.role_key, r.sort,
- r.enabled, r.is_delete, r.create_time, r.remark
+ r.enabled, r.is_delete, r.create_time, r.update_time, r.remark
from sys_role r
left join user_role urole on urole.role_id = r.id
left join user u on u.id = urole.user_id
diff --git a/paimon-web-server/src/main/resources/mapper/UserMapper.xml
b/paimon-web-server/src/main/resources/mapper/UserMapper.xml
index 116d923e..d8d544a2 100644
--- a/paimon-web-server/src/main/resources/mapper/UserMapper.xml
+++ b/paimon-web-server/src/main/resources/mapper/UserMapper.xml
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectUserVo">
select u.id, u.username, u.nickname, u.user_type, u.email, u.url,
u.mobile, u.password, u.is_delete, u.enabled, u.create_time,
- r.id, r.role_name, r.role_key, r.sort, r.enabled as role_status
+ u.update_time, r.id, r.role_name, r.role_key, r.sort, r.enabled as
role_status
from user u
left join user_role urole on u.id = urole.user_id
left join sys_role r on r.id = urole.role_id
diff --git
a/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/SysRoleControllerTest.java
b/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/SysRoleControllerTest.java
index 1c89fe15..e7884198 100644
---
a/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/SysRoleControllerTest.java
+++
b/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/SysRoleControllerTest.java
@@ -97,6 +97,8 @@ public class SysRoleControllerTest extends ControllerTestBase
{
ObjectMapperUtils.fromJSON(responseString, new
TypeReference<R<SysRole>>() {});
assertEquals(200, r.getCode());
assertNotNull(r.getData());
+ assertNotNull(r.getData().getCreateTime());
+ assertNotNull(r.getData().getUpdateTime());
assertEquals(r.getData().getRoleName(), roleName);
}
@@ -189,6 +191,8 @@ public class SysRoleControllerTest extends
ControllerTestBase {
assertEquals(1, firstRole.getSort());
assertTrue(firstRole.getEnabled());
assertFalse(firstRole.getIsDelete());
+ assertNotNull(firstRole.getCreateTime());
+ assertNotNull(firstRole.getUpdateTime());
SysRole secondRole = r.getData().get(1);
assertEquals(2, secondRole.getId());
@@ -197,14 +201,18 @@ public class SysRoleControllerTest extends
ControllerTestBase {
assertEquals(2, secondRole.getSort());
assertTrue(secondRole.getEnabled());
assertFalse(secondRole.getIsDelete());
+ assertNotNull(secondRole.getCreateTime());
+ assertNotNull(secondRole.getUpdateTime());
SysRole thirdRole = r.getData().get(2);
assertEquals(3, thirdRole.getId());
assertEquals("test-edit", thirdRole.getRoleName());
assertEquals("test-edit", thirdRole.getRoleKey());
assertEquals(3, thirdRole.getSort());
- assertTrue(secondRole.getEnabled());
- assertFalse(secondRole.getIsDelete());
+ assertTrue(thirdRole.getEnabled());
+ assertFalse(thirdRole.getIsDelete());
+ assertNotNull(thirdRole.getCreateTime());
+ assertNotNull(thirdRole.getUpdateTime());
}
@Test
diff --git
a/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/UserControllerTest.java
b/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/UserControllerTest.java
index 4c448b40..1cbf6d79 100644
---
a/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/UserControllerTest.java
+++
b/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/UserControllerTest.java
@@ -83,6 +83,8 @@ public class UserControllerTest extends ControllerTestBase {
UserVO user = getUser(userId);
assertNotNull(user);
assertEquals(user.getUsername(), username);
+ assertNotNull(user.getCreateTime());
+ assertNotNull(user.getUpdateTime());
}
@Test
@@ -190,6 +192,8 @@ public class UserControllerTest extends ControllerTestBase {
assertEquals("Admin", firstUser.getNickname());
assertEquals("[email protected]", firstUser.getEmail());
assertEquals("LOCAL", firstUser.getUserType());
+ assertNotNull(firstUser.getCreateTime());
+ assertNotNull(firstUser.getUpdateTime());
assertTrue(firstUser.getEnabled());
UserVO secondUser = r.getData().get(1);
@@ -197,6 +201,8 @@ public class UserControllerTest extends ControllerTestBase {
assertEquals("common", secondUser.getNickname());
assertEquals("[email protected]", secondUser.getEmail());
assertEquals("LOCAL", secondUser.getUserType());
+ assertNotNull(secondUser.getCreateTime());
+ assertNotNull(secondUser.getUpdateTime());
assertTrue(secondUser.getEnabled());
}
