gdxz/hepa-calc-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
admin
2024-09-30 13:13:26 +08:00
parent 931ec52cc4
commit d5b0515b25
4 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/controller/adminUser.go
+25 -17
View File
@@ -3,6 +3,7 @@ package controller
import (
"crypto/md5"
"encoding/hex"
"fmt"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"hepa-calc-admin-api/api/dao"
@@ -77,7 +78,8 @@ func (r *AdminUser) AddAdminUser(c *gin.Context) {
}
// 获取当前登陆用户数据
loginUserId := c.GetInt64("UserId")
loginUserId := c.GetInt64("AdminUserId")
fmt.Println(loginUserId)
if loginUserId == 0 {
responses.FailWithMessage("数据错误", c)
return
@@ -107,8 +109,8 @@ func (r *AdminUser) AddAdminUser(c *gin.Context) {
maps := make(map[string]interface{})
maps["access"] = req.Access
maps["is_deleted"] = 0
adminUser, _ := adminUserDao.GetAdminUser(maps)
if adminUser != nil {
res, _ := adminUserDao.GetAdminUser(maps)
if res != nil {
tx.Rollback()
responses.FailWithMessage("账号名重复", c)
return
@@ -118,8 +120,8 @@ func (r *AdminUser) AddAdminUser(c *gin.Context) {
maps = make(map[string]interface{})
maps["phone"] = req.Phone
maps["is_deleted"] = 0
adminUser, _ = adminUserDao.GetAdminUser(maps)
if adminUser != nil {
res, _ = adminUserDao.GetAdminUser(maps)
if res != nil {
tx.Rollback()
responses.FailWithMessage("手机号重复", c)
return
@@ -147,7 +149,7 @@ func (r *AdminUser) AddAdminUser(c *gin.Context) {
Email: req.Email,
}
adminUser, err = adminUserDao.AddAdminUser(tx, AdminUserModel)
_, err = adminUserDao.AddAdminUser(tx, AdminUserModel)
if err != nil {
tx.Rollback()
responses.FailWithMessage("新增失败", c)
@@ -162,7 +164,7 @@ func (r *AdminUser) AddAdminUser(c *gin.Context) {
func (r *AdminUser) PutAdminUser(c *gin.Context) {
adminUserRequest := requests.AdminUserRequest{}
req := adminUserRequest.PutAdminUser
if err := c.ShouldBind(&req); err != nil {
if err := c.ShouldBindJSON(&req); err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
@@ -187,7 +189,7 @@ func (r *AdminUser) PutAdminUser(c *gin.Context) {
}
// 获取当前登陆用户数据
loginUserId := c.GetInt64("UserId")
loginUserId := c.GetInt64("AdminUserId")
if loginUserId == 0 {
responses.FailWithMessage("数据错误", c)
return
@@ -227,12 +229,11 @@ func (r *AdminUser) PutAdminUser(c *gin.Context) {
maps := make(map[string]interface{})
maps["access"] = req.Access
maps["is_deleted"] = 0
adminUser, _ = adminUserDao.GetAdminUser(maps)
if adminUser != nil {
res, _ := adminUserDao.GetAdminUser(maps)
if res != nil {
responses.FailWithMessage("账号名重复", c)
return
}
}
if req.Phone != adminUser.Phone {
@@ -306,7 +307,7 @@ func (r *AdminUser) PutAdminUserStatus(c *gin.Context) {
}
// 获取当前登陆用户数据
loginUserId := c.GetInt64("UserId")
loginUserId := c.GetInt64("AdminUserId")
if loginUserId == 0 {
responses.FailWithMessage("数据错误", c)
return
@@ -392,7 +393,7 @@ func (r *AdminUser) PutAdminUserDisabled(c *gin.Context) {
}
// 获取当前登陆用户数据
loginUserId := c.GetInt64("UserId")
loginUserId := c.GetInt64("AdminUserId")
if loginUserId == 0 {
responses.FailWithMessage("数据错误", c)
return
@@ -465,7 +466,7 @@ func (r *AdminUser) PutAdminUserPassword(c *gin.Context) {
}
// 获取当前登陆用户数据
loginUserId := c.GetInt64("UserId")
loginUserId := c.GetInt64("AdminUserId")
if loginUserId == 0 {
responses.FailWithMessage("数据错误", c)
return
@@ -484,7 +485,14 @@ func (r *AdminUser) PutAdminUserPassword(c *gin.Context) {
}
// 获取需修改用户数据
userId, err := strconv.ParseInt(req.UserId, 10, 64)
id := c.Param("user_id")
if id == "" {
responses.FailWithMessage("缺少参数", c)
return
}
// 将 id 转换为 int64 类型
userId, err := strconv.ParseInt(id, 10, 64)
if err != nil {
responses.Fail(c)
return
@@ -569,7 +577,7 @@ func (r *AdminUser) PutAdminUserPassword(c *gin.Context) {
// LoginOut 退出登陆
func (b *AdminUser) LoginOut(c *gin.Context) {
userId := c.GetInt64("UserId")
userId := c.GetInt64("AdminUserId")
if userId == 0 {
responses.FailWithMessage("用户错误", c)
return
@@ -619,7 +627,7 @@ func (r *AdminUser) DeleteAdminUser(c *gin.Context) {
}
// 获取当前登陆用户数据
loginUserId := c.GetInt64("UserId")
loginUserId := c.GetInt64("AdminUserId")
if loginUserId == 0 {
responses.FailWithMessage("数据错误", c)
return