From 1de344674afd6bb35b51b165bbad76dbe6299b7e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 18:08:33 +0800
Subject: [PATCH] 使用冒号分隔redis的key

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java |   45 +++++++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 18 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
old mode 100644
new mode 100755
index 7eb71e6..168a577
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
@@ -2,6 +2,7 @@
 
 import com.genersoft.iot.vmp.storager.dao.dto.User;
 import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -10,42 +11,50 @@
 @Repository
 public interface UserMapper {
 
-    @Insert("INSERT INTO user (username, password, roleId, createTime, updateTime) VALUES" +
-            "('${username}', '${password}', '${role.id}', '${createTime}', '${updateTime}')")
+    @Insert("INSERT INTO wvp_user (username, password, role_id, push_key, create_time, update_time) VALUES" +
+            "(#{username}, #{password}, #{role.id}, #{pushKey}, #{createTime}, #{updateTime})")
     int add(User user);
 
     @Update(value = {" <script>" +
-            "UPDATE user " +
-            "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>" +
+            "UPDATE wvp_user " +
+            "SET update_time=#{updateTime} " +
+            "<if test=\"pushKey != null\">, push_key=#{pushKey}</if>" +
+            "<if test=\"role != null\">, role_id=#{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 != 1 and id=#{id}")
+    @Delete("DELETE from wvp_user WHERE id != 1 and id=#{id}")
     int delete(int 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.username=#{username} AND user.password=#{password}")
+    @Select("select u.*, r.id as role_id, r.name as roleName, r.authority as roleAuthority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.username=#{username} AND u.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")
+            @Result(column = "role_id", property = "role.id"),
+            @Result(column = "role_name", property = "role.name"),
+            @Result(column = "role_authority", property = "role.authority"),
+            @Result(column = "role_create_time", property = "role.createTime"),
+            @Result(column = "role_update_time", property = "role.updateTime")
     })
-    User select(String username, String password);
+    User select(@Param("username") String username, @Param("password") String 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.id=#{id}")
+    @Select("select u.*, r.id as role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.id=#{id}")
     @ResultMap(value="roleMap")
     User selectById(int 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 username=#{username}")
+    @Select("select u.*, r.id as role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id and u.username=#{username}")
     @ResultMap(value="roleMap")
     User getUserByUsername(String 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")
+    @Select("select u.*, r.id as role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u, wvp_user_role r WHERE u.role_id=r.id")
     @ResultMap(value="roleMap")
     List<User> selectAll();
+
+    @Select("select u.id, u.username,u.push_key,u.role_id, r.id as role_id, r.name as role_name, r.authority as role_authority , r.create_time as role_create_time , r.update_time as role_update_time from wvp_user u join wvp_user_role r on u.role_id=r.id")
+    @ResultMap(value="roleMap")
+    List<User> getUsers();
+
+    @Update("UPDATE wvp_user set push_key=#{pushKey} where id=#{id}")
+    int changePushKey(@Param("id") int id, @Param("pushKey") String pushKey);
 }

--
Gitblit v1.8.0