From c3ce2bc5d069ba57309567aee4ae418bc0cf75ed Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 17 三月 2023 13:22:05 +0800
Subject: [PATCH] 优化异常处理以及级联设备状态查询
---
src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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 7eb71e6..ecaa165 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,16 +10,17 @@
@Repository
public interface UserMapper {
- @Insert("INSERT INTO user (username, password, roleId, createTime, updateTime) VALUES" +
- "('${username}', '${password}', '${role.id}', '${createTime}', '${updateTime}')")
+ @Insert("INSERT INTO user (username, password, roleId, pushKey, createTime, updateTime) 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>" +
+ "SET updateTime=#{updateTime} " +
+ "<if test=\"pushKey != null\">, pushKey=#{pushKey}</if>" +
+ "<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);
@@ -27,7 +28,7 @@
@Delete("DELETE FROM 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 roleID, r.name as roleName, r.authority as roleAuthority , r.createTime as roleCreateTime , r.updateTime as roleUpdateTime FROM user u, user_role r WHERE u.roleId=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"),
@@ -37,15 +38,28 @@
})
User select(String username, 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 roleID, r.name as roleName, r.authority as roleAuthority , r.createTime as roleCreateTime , r.updateTime as roleUpdateTime FROM user u, user_role r WHERE u.roleId=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 roleID, r.name as roleName, r.authority as roleAuthority , r.createTime as roleCreateTime , r.updateTime as roleUpdateTime FROM user u, user_role r WHERE u.roleId=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 roleID, r.name as roleName, r.authority as roleAuthority , r.createTime as roleCreateTime , r.updateTime as roleUpdateTime FROM user u, user_role r WHERE u.roleId=r.id")
@ResultMap(value="roleMap")
List<User> selectAll();
+
+ @Select("select * from (select user.*, concat(concat(#{callId}, '_'), pushKey) as str1 from user) as u where md5(u.str1) = #{sign}")
+ List<User> checkPushAuthorityByCallIdAndSign(String callId, String sign);
+
+ @Select("select * from user where md5(pushKey) = #{sign}")
+ List<User> checkPushAuthorityByCallId(String sign);
+
+ @Select("select u.id, u.username,u.pushKey,u.roleId, r.id as roleID, r.name as roleName, r.authority as roleAuthority , r.createTime as roleCreateTime , r.updateTime as roleUpdateTime FROM user u join user_role r on u.roleId=r.id")
+ @ResultMap(value="roleMap")
+ List<User> getUsers();
+
+ @Update("update user set pushKey=#{pushKey} where id=#{id}")
+ int changePushKey(int id, String pushKey);
}
--
Gitblit v1.8.0