From 0984290ca2a75cf0316c3ca312bf8026b4edcf3e Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期三, 01 十二月 2021 22:45:38 +0800
Subject: [PATCH] 继续优化docker配置： 1.启动命令增加ASSIST_JVM_CONFIG和WVP_JVM_CONFIG两个字段，方便配置JVM参数 2.修复一处错误，application.yml media.stream-ip的值应该等于media.ip而不是之前的sip.ip
---
src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
index e217632..7eb71e6 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
@@ -10,32 +10,42 @@
@Repository
public interface UserMapper {
- @Insert("INSERT INTO user (username, password, roleId, create_time, update_time) VALUES" +
- "('${username}', '${password}', '${roleId}', '${createTime}', '${updateTime}')")
+ @Insert("INSERT INTO user (username, password, roleId, createTime, updateTime) VALUES" +
+ "('${username}', '${password}', '${role.id}', '${createTime}', '${updateTime}')")
int add(User user);
@Update(value = {" <script>" +
"UPDATE user " +
- "SET update_time='${updateTime}' " +
- "<if test=\"roleId != null\">, roleId='${roleId}'</if>" +
+ "SET updateTime='${updateTime}' " +
+ "<if test=\"role != null\">, roleId='${role.id}'</if>" +
"<if test=\"password != null\">, password='${password}'</if>" +
"<if test=\"username != null\">, username='${username}'</if>" +
"WHERE id=#{id}" +
" </script>"})
int update(User user);
- @Delete("DELETE FROM user WHERE id=#{id}")
+ @Delete("DELETE FROM user WHERE id != 1 and id=#{id}")
int delete(int id);
- @Select("select * FROM user WHERE username=#{username} AND password=#{password}")
+ @Select("select user.*, role.id roleID, role.name roleName, role.authority roleAuthority , role.createTime roleCreateTime , role.updateTime roleUpdateTime FROM user, role WHERE user.roleId=role.id and user.username=#{username} AND user.password=#{password}")
+ @Results(id = "roleMap", value = {
+ @Result(column = "roleID", property = "role.id"),
+ @Result(column = "roleName", property = "role.name"),
+ @Result(column = "roleAuthority", property = "role.authority"),
+ @Result(column = "roleCreateTime", property = "role.createTime"),
+ @Result(column = "roleUpdateTime", property = "role.updateTime")
+ })
User select(String username, String password);
- @Select("select * FROM user WHERE id=#{id}")
+ @Select("select user.*, role.id roleID, role.name roleName, role.authority roleAuthority, role.createTime roleCreateTime , role.updateTime roleUpdateTime FROM user, role WHERE user.roleId=role.id and user.id=#{id}")
+ @ResultMap(value="roleMap")
User selectById(int id);
- @Select("select * FROM user WHERE username=#{username}")
+ @Select("select user.*, role.id roleID, role.name roleName, role.authority roleAuthority, role.createTime roleCreateTime , role.updateTime roleUpdateTime FROM user, role WHERE user.roleId=role.id and username=#{username}")
+ @ResultMap(value="roleMap")
User getUserByUsername(String username);
- @Select("select * FROM user")
+ @Select("select user.*, role.id roleID, role.name roleName, role.authority roleAuthority, role.createTime roleCreateTime , role.updateTime roleUpdateTime FROM user, role WHERE user.roleId=role.id")
+ @ResultMap(value="roleMap")
List<User> selectAll();
}
--
Gitblit v1.8.0