From 1d753b48c023090430c2931fd8e3a45a382eddf8 Mon Sep 17 00:00:00 2001
From: hotcoffie <35990065+hotcoffie@users.noreply.github.com>
Date: 星期二, 17 五月 2022 11:53:42 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/test/java/com/genersoft/iot/vmp/service/impl/UserServiceImplTest.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/test/java/com/genersoft/iot/vmp/service/impl/UserServiceImplTest.java b/src/test/java/com/genersoft/iot/vmp/service/impl/UserServiceImplTest.java
index eea7f04..3f902dc 100644
--- a/src/test/java/com/genersoft/iot/vmp/service/impl/UserServiceImplTest.java
+++ b/src/test/java/com/genersoft/iot/vmp/service/impl/UserServiceImplTest.java
@@ -1,16 +1,15 @@
package com.genersoft.iot.vmp.service.impl;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
-import com.genersoft.iot.vmp.service.IDeviceAlarmService;
import com.genersoft.iot.vmp.service.IUserService;
+import com.genersoft.iot.vmp.storager.dao.dto.Role;
import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.utils.DateUtil;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.List;
@SpringBootTest
@@ -20,11 +19,12 @@
@Resource
private IUserService userService;
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@org.junit.jupiter.api.Test
void getAllUser() {
- System.out.println(userService.getAllUsers().size());
+ List<User> allUsers = userService.getAllUsers();
+ User admin = userService.getUser("admin", "21232f297a57a5a743894a0e4a801fc3");
+ User admin1 = userService.getUserByUsername("admin");
}
@@ -34,9 +34,12 @@
User user = new User();
user.setUsername("admin_" + i);
user.setPassword("admin_password_" + i);
- user.setRoleId((int)(Math.random()*4 + 1));
- user.setCreateTime(format.format(System.currentTimeMillis()));
- user.setUpdateTime(format.format(System.currentTimeMillis()));
+
+ Role role = new Role();
+ role.setId(1);
+ user.setRole(role);
+ user.setCreateTime(DateUtil.getNow());
+ user.setUpdateTime(DateUtil.getNow());
userService.addUser(user);
}
}
@@ -49,11 +52,13 @@
@org.junit.jupiter.api.Test
void update() {
User user = new User();
- user.setId(1003);
+ user.setId(11);
user.setUsername("update" );
user.setPassword("update");
- user.setRoleId((int)(Math.random()*4 + 1));
- user.setUpdateTime(format.format(System.currentTimeMillis()));
+ Role role = new Role();
+ role.setId(2);
+ user.setRole(role);
+ user.setUpdateTime(DateUtil.getNow());
userService.updateUsers(user);
}
--
Gitblit v1.8.0