From 58bad31a9ba32798831b8241157e41618e0cccd2 Mon Sep 17 00:00:00 2001 From: wubijie Date: Mon, 8 Apr 2024 11:39:28 +0800 Subject: [PATCH] Improve some function verification --- src/app/server/network/controller/machine.go | 23 +------------------ .../server/network/controller/web_terminal.go | 1 + src/app/server/network/httpserver.go | 2 +- src/app/server/service/auth/casbin.go | 2 +- src/app/server/service/batch/batch.go | 9 ++++++++ src/app/server/service/cluster/cluster.go | 9 ++++---- src/app/server/service/depart/depart.go | 20 +++++++++++++++- .../server/service/internal/dao/roledao.go | 5 ---- src/app/server/service/role/role.go | 8 +++++++ 9 files changed, 45 insertions(+), 34 deletions(-) diff --git a/src/app/server/network/controller/machine.go b/src/app/server/network/controller/machine.go index 1dfd7037..ae19adb2 100644 --- a/src/app/server/network/controller/machine.go +++ b/src/app/server/network/controller/machine.go @@ -108,31 +108,10 @@ func ModifyMachineDepartHandler(c *gin.Context) { response.Success(c, nil, "机器部门修改成功") } -// 改变机器维护状态 -func UpdateMaintStatus(c *gin.Context) { - var M struct { - MachineIDs string `json:"machineids"` - MaintStatus string `json:"maintstatus"` - } - if err := c.Bind(&M); err != nil { - response.Fail(c, nil, "parameter error") - return - } - result, err := machineservice.UpdateMaintStatus(M.MachineIDs, M.MaintStatus) - if err != nil { - response.Fail(c, nil, err.Error()) - return - } - if len(result) != 0 { - response.Fail(c, result, err.Error()) - } - response.Success(c, nil, "机器维护状态修改成功") -} - // 维护状态列表 func MaintStatusList(c *gin.Context) { var datas []string datas = append(datas, machineservice.NormalStatus) datas = append(datas, machineservice.MaintenanceStatus) - response.Success(c, datas, "机器维护状态修改成功") + response.Success(c, datas, "机器维护状态列表") } diff --git a/src/app/server/network/controller/web_terminal.go b/src/app/server/network/controller/web_terminal.go index ee16dc5e..3bf42965 100644 --- a/src/app/server/network/controller/web_terminal.go +++ b/src/app/server/network/controller/web_terminal.go @@ -26,6 +26,7 @@ import ( "github.com/gorilla/websocket" ) +// 终端连接功能删除 func WS(c *gin.Context) { // 升级协议并获得socket连接 conn, err := Websocket.Upgrader.Upgrade(c.Writer, c.Request, nil) diff --git a/src/app/server/network/httpserver.go b/src/app/server/network/httpserver.go index 8c0d3efb..9cb58646 100644 --- a/src/app/server/network/httpserver.go +++ b/src/app/server/network/httpserver.go @@ -276,7 +276,7 @@ func registerAPIs(router *gin.Engine) { userLog := api.Group("log") // 日志管理 { - userLog.GET("/log_all", middleware.NeedPermission("log", "menu"), controller.LogAllHandler) + userLog.GET("/log_all", middleware.NeedPermission("audit", "menu"), controller.LogAllHandler) userLog.GET("/log_child", controller.GetAuditLogByIdHandler) } diff --git a/src/app/server/service/auth/casbin.go b/src/app/server/service/auth/casbin.go index 065a1953..18769a89 100644 --- a/src/app/server/service/auth/casbin.go +++ b/src/app/server/service/auth/casbin.go @@ -130,7 +130,7 @@ var ( "batch", "usermanager", "rolemanager", - "log", + "audit", "plugin", } ) diff --git a/src/app/server/service/batch/batch.go b/src/app/server/service/batch/batch.go index d82300d6..cf96fb80 100644 --- a/src/app/server/service/batch/batch.go +++ b/src/app/server/service/batch/batch.go @@ -147,6 +147,15 @@ func UpdateBatch(batchid int, name, description string) error { // 分页获取某批次的机器信息 func GetBatchMachines(offset, size, batchid int) (int64, []dao.MachineNode, error) { + //检查批次id是否存在 + isExist, err := dao.IsExistID(batchid) + if !isExist { + return 0, nil, errors.New("批次不存在") + } + if err != nil { + return 0, nil, err + } + count, machineIdlist, err := dao.GetMachineIDPaged(offset, size, batchid) if err != nil { return 0, nil, err diff --git a/src/app/server/service/cluster/cluster.go b/src/app/server/service/cluster/cluster.go index 0106c6c3..a6249146 100644 --- a/src/app/server/service/cluster/cluster.go +++ b/src/app/server/service/cluster/cluster.go @@ -31,7 +31,7 @@ type DepartMachineInfo struct { } type AgentStatus struct { - Normal int `json:"normal"` + Online int `json:"normal"` //normal显示的是在线机器数量，前端字段需要做修改 OffLine int `json:"offline"` Free int `json:"free"` } @@ -58,8 +58,7 @@ func ClusterInfo() (ClusterInfoParam, error) { return data, err } - //Normal显示的事在线机器数量，前端字段需要做修改 - data.AgentStatus.Normal = online + data.AgentStatus.Online = online data.AgentStatus.OffLine = offline data.AgentStatus.Free = maint return data, nil @@ -85,11 +84,13 @@ func DepartClusterInfo() []DepartMachineInfo { if err != nil { logger.Error(err.Error()) } + + //TODO:各部门中不存在维护状态的机器，应该统计正常使用的机器的数量，只有根节点下才会存在维护状态的机器 maint, err := dao.CountMaintStatus(machine.MaintenanceStatus, depart.ID) if err != nil { logger.Error(err.Error()) } - departInfo.AgentStatus.Normal = online + departInfo.AgentStatus.Online = online departInfo.AgentStatus.OffLine = offline departInfo.AgentStatus.Free = maint diff --git a/src/app/server/service/depart/depart.go b/src/app/server/service/depart/depart.go index 728ab29d..b5c46a8a 100644 --- a/src/app/server/service/depart/depart.go +++ b/src/app/server/service/depart/depart.go @@ -143,7 +143,7 @@ func DepartInfo() (*DepartTreeNode, error) { if len(depart) == 0 { return nil, errors.New("当前无部门节点") } - //返回所有根节点喝孩子节点 + //返回所有根节点和孩子节点 ptrchild, departRoot := Returnptrchild(depart) //构造树 MakeTree(&departRoot, ptrchild) @@ -241,11 +241,29 @@ func DeleteDepart(DelDept *DeleteDeparts) error { // 更改部门名字 func UpdateDepart(DepartID int, DepartName string) error { + //查看该部门是否存在 + temp, err := dao.GetDepartById(DepartID) + if err != nil { + return err + } + if temp.ID == 0 { + return errors.New("不存在该部门") + } return dao.UpdateDepart(DepartID, DepartName) } // 获取部门下所有机器列表 func MachineList(DepId int) ([]dao.Res, error) { + //查看该部门是否存在 + temp, err := dao.GetDepartById(DepId) + if err != nil { + return nil, err + } + if temp.ID == 0 { + return nil, errors.New("不存在该部门") + } + + //查询所有子节点 var departId []int ReturnSpecifiedDepart(DepId, &departId) departId = append(departId, DepId) diff --git a/src/app/server/service/internal/dao/roledao.go b/src/app/server/service/internal/dao/roledao.go index 8f10ed76..d1a777dd 100644 --- a/src/app/server/service/internal/dao/roledao.go +++ b/src/app/server/service/internal/dao/roledao.go @@ -15,7 +15,6 @@ package dao import ( - "fmt" "strings" "time" @@ -71,10 +70,6 @@ func GetRoles() ([]Role, error) { // 新增角色 func AddRole(r *Role) error { - if r.Name == "" { - return fmt.Errorf("角色名不能为空") - } - return mysqlmanager.MySQL().Save(r).Error } diff --git a/src/app/server/service/role/role.go b/src/app/server/service/role/role.go index 6ccc4c2c..26412569 100644 --- a/src/app/server/service/role/role.go +++ b/src/app/server/service/role/role.go @@ -109,6 +109,14 @@ func getRoleMenuButtons(role string) map[string]interface{} { // 添加角色 func AddRole(userRole *Role) error { + if userRole.Name == "" { + return errors.New("role name can not be empty") + } + + id, _ := dao.GetRoleId(userRole.Name) + if id > 0 { + return errors.New("role name already exists") + } err := dao.AddRole(userRole) if err != nil { return err -- Gitee