From c23932eb00edfa5f734b0d17eced838c5c7577c0 Mon Sep 17 00:00:00 2001
From: 648540858 <456PANlinlin>
Date: 星期三, 17 十一月 2021 22:58:41 +0800
Subject: [PATCH] #221

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 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 f8507cb..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
@@ -4,30 +4,48 @@
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface UserMapper {
 
-    @Insert("INSERT INTO user (username, password, roleId, create_time) VALUES" +
-            "('${username}', '${password}', '${roleId}', datetime('now','localtime'))")
+    @Insert("INSERT INTO user (username, password, roleId, createTime, updateTime) VALUES" +
+            "('${username}', '${password}', '${role.id}', '${createTime}', '${updateTime}')")
     int add(User user);
 
-    @Update("UPDATE user " +
-            "SET username=#{username}," +
-            "password=#{password}," +
-            "roleId=#{roleId}" +
-            "WHERE id=#{id}")
+    @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>" +
+            "WHERE id=#{id}" +
+            " </script>"})
     int update(User user);
 
-    @Delete("DELETE FROM user WHERE app=#{app} AND id=#{id}")
-    int delete(User user);
+    @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 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