From 13a9b7007bc81f85f5105c5a6e928dc585eaff1c Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 6 Nov 2023 18:16:30 +0800 Subject: [PATCH] =?UTF-8?q?marge:=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- features/udm_user/api_udm_user.go | 4 +- features/udm_user/repo/repo_udm_auth_user.go | 4 +- features/udm_user/repo/repo_udm_sub_user.go | 7 +- lib/midware/operate_log.go | 2 +- restagent/makefile | 2 +- src/modules/monitor/service/monitor.impl.go | 8 +- src/modules/monitor/service/monitor_test.go | 183 ++++++++++++++++++ .../system/repository/sys_user.impl.go | 11 +- src/modules/system/system.go | 6 +- 9 files changed, 206 insertions(+), 21 deletions(-) create mode 100644 src/modules/monitor/service/monitor_test.go diff --git a/features/udm_user/api_udm_user.go b/features/udm_user/api_udm_user.go index 2a61b01..a616751 100644 --- a/features/udm_user/api_udm_user.go +++ b/features/udm_user/api_udm_user.go @@ -607,7 +607,7 @@ func (s *UdmUserApi) UdmAuthUserImport(w http.ResponseWriter, r *http.Request) { go s.authUser.InsertTxt(neId, data) } } - ctx.JSON(w, 200, result.OkData(data)) + ctx.JSON(w, 200, result.OkMsg(data)) } // UDM签约用户 @@ -1197,5 +1197,5 @@ func (s *UdmUserApi) UdmSubUserImport(w http.ResponseWriter, r *http.Request) { go s.subUser.InsertTxt(neId, data) } } - ctx.JSON(w, 200, result.OkData(data)) + ctx.JSON(w, 200, result.OkMsg(data)) } diff --git a/features/udm_user/repo/repo_udm_auth_user.go b/features/udm_user/repo/repo_udm_auth_user.go index 1f0c63f..461b213 100644 --- a/features/udm_user/repo/repo_udm_auth_user.go +++ b/features/udm_user/repo/repo_udm_auth_user.go @@ -102,8 +102,8 @@ func (r *RepoUdmAuthUser) SelectPage(query map[string]any) map[string]any { if v == "imsi" { sortSql += " order by imsi " } - if v, ok := query["sortOrder"]; ok && v != nil { - if v == "desc" { + if o, ok := query["sortOrder"]; ok && o != nil && v != "" { + if o == "desc" { sortSql += " desc " } else { sortSql += " asc " diff --git a/features/udm_user/repo/repo_udm_sub_user.go b/features/udm_user/repo/repo_udm_sub_user.go index d7f5ead..93a59bc 100644 --- a/features/udm_user/repo/repo_udm_sub_user.go +++ b/features/udm_user/repo/repo_udm_sub_user.go @@ -120,8 +120,11 @@ func (r *RepoUdmSubUser) SelectPage(query map[string]any) map[string]any { if v == "imsi" { sortSql += " order by imsi " } - if v, ok := query["sortOrder"]; ok && v != nil { - if v == "desc" { + if v == "msisdn" { + sortSql += " order by msisdn " + } + if o, ok := query["sortOrder"]; ok && o != nil && v != "" { + if o == "desc" { sortSql += " desc " } else { sortSql += " asc " diff --git a/lib/midware/operate_log.go b/lib/midware/operate_log.go index c1f5cf3..7a70868 100644 --- a/lib/midware/operate_log.go +++ b/lib/midware/operate_log.go @@ -115,7 +115,7 @@ func LogOperate(options collectlogs.Options) func(http.Handler) http.Handler { status := strArr[2] // 响应状态 - if status == "200" { + if status == "200" || status == "204" { operLog.Status = common.STATUS_YES } else { operLog.Status = common.STATUS_NO diff --git a/restagent/makefile b/restagent/makefile index 015071e..c59a48d 100644 --- a/restagent/makefile +++ b/restagent/makefile @@ -1,7 +1,7 @@ # Makefile for rest agent project PROJECT = OMC -VERSION = 1.6.2 +VERSION = 2.2311.7 PLATFORM = amd64 ARMPLATFORM = aarch64 BUILDDIR = ../../build diff --git a/src/modules/monitor/service/monitor.impl.go b/src/modules/monitor/service/monitor.impl.go index 1430c97..a7e5632 100644 --- a/src/modules/monitor/service/monitor.impl.go +++ b/src/modules/monitor/service/monitor.impl.go @@ -9,11 +9,11 @@ import ( "ems.agt/src/modules/monitor/model" "ems.agt/src/modules/monitor/repository" systemService "ems.agt/src/modules/system/service" - "github.com/shirou/gopsutil/cpu" - "github.com/shirou/gopsutil/disk" - "github.com/shirou/gopsutil/load" - "github.com/shirou/gopsutil/net" + "github.com/shirou/gopsutil/v3/cpu" + "github.com/shirou/gopsutil/v3/disk" + "github.com/shirou/gopsutil/v3/load" "github.com/shirou/gopsutil/v3/mem" + "github.com/shirou/gopsutil/v3/net" ) // 实例化服务层 MonitorImpl 结构体 diff --git a/src/modules/monitor/service/monitor_test.go b/src/modules/monitor/service/monitor_test.go new file mode 100644 index 0000000..11a87a8 --- /dev/null +++ b/src/modules/monitor/service/monitor_test.go @@ -0,0 +1,183 @@ +package service + +import ( + "fmt" + "testing" + "time" + + "github.com/shirou/gopsutil/v3/cpu" + "github.com/shirou/gopsutil/v3/disk" + "github.com/shirou/gopsutil/v3/load" + "github.com/shirou/gopsutil/v3/mem" + "github.com/shirou/gopsutil/v3/net" +) + +func init() { + +} + +func TestInfo(t *testing.T) { + s := MonitorInfo{} + s.load(0.5) // 0.5 半分钟 + + fmt.Println(s) + select {} +} + +// MonitorInfo 机器资源信息 +type MonitorInfo struct { + MonitorBase MonitorBase `json:"base"` // 监控_基本信息 + MonitorIO []MonitorIO `json:"io"` // 监控_磁盘IO + MonitorNetwork []MonitorNetwork `json:"network"` // 监控_网络IO +} + +// load 执行资源获取 +func (m *MonitorInfo) load(interval float64) { + var itemBase MonitorBase + itemBase.CreateTime = time.Now().UnixMilli() + + totalPercent, _ := cpu.Percent(3*time.Second, false) + if len(totalPercent) == 1 { + itemBase.CPU = totalPercent[0] + } + cpuCount, _ := cpu.Counts(false) + + loadInfo, _ := load.Avg() + itemBase.CPULoad1 = loadInfo.Load1 + itemBase.CPULoad5 = loadInfo.Load5 + itemBase.CPULoad15 = loadInfo.Load15 + itemBase.LoadUsage = loadInfo.Load1 / (float64(cpuCount*2) * 0.75) * 100 + + memoryInfo, _ := mem.VirtualMemory() + itemBase.Memory = memoryInfo.UsedPercent + + m.MonitorBase = itemBase + + // 求平均 + m.MonitorIO = loadDiskIO(interval) + m.MonitorNetwork = loadNetIO(interval) +} + +// MonitorBase 监控_基本信息 monitor_base +type MonitorBase struct { + CreateTime int64 `json:"createTime"` // 创建时间 + CPU float64 `json:"cpu"` // cpu使用率 + LoadUsage float64 `json:"loadUsage"` // cpu平均使用率 + CPULoad1 float64 `json:"cpuLoad1"` // cpu使用1分钟 + CPULoad5 float64 `json:"cpuLoad5"` // cpu使用5分钟 + CPULoad15 float64 `json:"cpuLoad15"` // cpu使用15分钟 + Memory float64 `json:"memory"` // 内存使用率 +} + +// MonitorIO 监控_磁盘IO monitor_io +type MonitorIO struct { + CreateTime int64 `json:"createTime"` // 创建时间 + Name string `json:"name"` // 磁盘名 + Read int64 `json:"read"` // 读取K + Write int64 `json:"write"` // 写入K + Count int64 `json:"count"` // 次数 + Time int64 `json:"time"` // 耗时 +} + +// MonitorNetwork 监控_网络IO monitor_network +type MonitorNetwork struct { + CreateTime int64 `json:"createTime"` // 创建时间 + Name string `json:"name"` // 网卡名 + Up float64 `json:"up"` // 上行 + Down float64 `json:"down"` // 下行 +} + +// loadDiskIO 磁盘读写，interval表示采集的平均值（分钟） +func loadDiskIO(interval float64) []MonitorIO { + ioStat, _ := disk.IOCounters() + + time.Sleep(time.Duration(interval) * time.Minute) + + ioStat2, _ := disk.IOCounters() + var ioList []MonitorIO + timeMilli := time.Now().UnixMilli() + for _, io2 := range ioStat2 { + for _, io1 := range ioStat { + if io2.Name == io1.Name { + var itemIO MonitorIO + itemIO.CreateTime = timeMilli + itemIO.Name = io1.Name + + if io2.ReadBytes != 0 && io1.ReadBytes != 0 && io2.ReadBytes > io1.ReadBytes { + itemIO.Read = int64(float64(io2.ReadBytes-io1.ReadBytes) / interval / 60) + } + if io2.WriteBytes != 0 && io1.WriteBytes != 0 && io2.WriteBytes > io1.WriteBytes { + itemIO.Write = int64(float64(io2.WriteBytes-io1.WriteBytes) / interval / 60) + } + + if io2.ReadCount != 0 && io1.ReadCount != 0 && io2.ReadCount > io1.ReadCount { + itemIO.Count = int64(float64(io2.ReadCount-io1.ReadCount) / interval / 60) + } + writeCount := int64(0) + if io2.WriteCount != 0 && io1.WriteCount != 0 && io2.WriteCount > io1.WriteCount { + writeCount = int64(float64(io2.WriteCount-io1.WriteCount) / interval * 60) + } + if writeCount > itemIO.Count { + itemIO.Count = writeCount + } + + if io2.ReadTime != 0 && io1.ReadTime != 0 && io2.ReadTime > io1.ReadTime { + itemIO.Time = int64(float64(io2.ReadTime-io1.ReadTime) / interval / 60) + } + writeTime := int64(0) + if io2.WriteTime != 0 && io1.WriteTime != 0 && io2.WriteTime > io1.WriteTime { + writeTime = int64(float64(io2.WriteTime-io1.WriteTime) / interval / 60) + } + if writeTime > itemIO.Time { + itemIO.Time = writeTime + } + ioList = append(ioList, itemIO) + break + } + } + } + return ioList +} + +// loadNetIO 网络接口（包括虚拟接口），interval表示采集的平均值（分钟） +func loadNetIO(interval float64) []MonitorNetwork { + // 获取当前时刻 + netStat, _ := net.IOCounters(true) + netStatAll, _ := net.IOCounters(false) + var netStatList []net.IOCountersStat + netStatList = append(netStatList, netStat...) + netStatList = append(netStatList, netStatAll...) + + time.Sleep(time.Duration(interval) * time.Minute) + + // 获取结束时刻 + netStat2, _ := net.IOCounters(true) + netStat2All, _ := net.IOCounters(false) + var netStat2List []net.IOCountersStat + netStat2List = append(netStat2List, netStat2...) + netStat2List = append(netStat2List, netStat2All...) + + var netList []MonitorNetwork + timeMilli := time.Now().UnixMilli() + for _, net2 := range netStat2List { + for _, net1 := range netStatList { + if net2.Name == net1.Name { + var itemNet MonitorNetwork + itemNet.CreateTime = timeMilli + itemNet.Name = net1.Name + + // 如果结束时刻发送字节数和当前时刻发送字节数都不为零，并且结束时刻发送字节数大于当前时刻发送字节数 + if net2.BytesSent != 0 && net1.BytesSent != 0 && net2.BytesSent > net1.BytesSent { + itemNet.Up = float64(net2.BytesSent-net1.BytesSent) / 1024 / interval / 60 + } + if net2.BytesRecv != 0 && net1.BytesRecv != 0 && net2.BytesRecv > net1.BytesRecv { + itemNet.Down = float64(net2.BytesRecv-net1.BytesRecv) / 1024 / interval / 60 + } + netList = append(netList, itemNet) + break + } + } + } + + return netList +} diff --git a/src/modules/system/repository/sys_user.impl.go b/src/modules/system/repository/sys_user.impl.go index 85c957f..0442150 100644 --- a/src/modules/system/repository/sys_user.impl.go +++ b/src/modules/system/repository/sys_user.impl.go @@ -125,12 +125,11 @@ func (r *SysUserImpl) convertResultRows(rows []map[string]any) []model.SysUser { // SelectUserPage 根据条件分页查询用户列表 func (r *SysUserImpl) SelectUserPage(query map[string]any, dataScopeSQL string) map[string]any { - selectUserSql := `select - u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader - from sys_user u - left join sys_dept d on u.dept_id = d.dept_id` selectUserTotalSql := `select count(distinct u.user_id) as 'total' - from sys_user u left join sys_dept d on u.dept_id = d.dept_id` + from sys_user u + left join sys_dept d on u.dept_id = d.dept_id + left join sys_user_role ur on u.user_id = ur.user_id + left join sys_role r on r.role_id = ur.role_id` // 查询条件拼接 var conditions []string @@ -208,7 +207,7 @@ func (r *SysUserImpl) SelectUserPage(query map[string]any, dataScopeSQL string) params = append(params, pageSize) // 查询数据 - querySql := selectUserSql + whereSql + dataScopeSQL + pageSql + querySql := r.selectSql + whereSql + dataScopeSQL + pageSql results, err := datasource.RawDB("", querySql, params) if err != nil { logger.Errorf("query err => %v", err) diff --git a/src/modules/system/system.go b/src/modules/system/system.go index 82cb6a1..24ba57d 100644 --- a/src/modules/system/system.go +++ b/src/modules/system/system.go @@ -98,7 +98,7 @@ func Setup(router *gin.Engine) { controller.NewSysDept.TreeSelect, ) sysDeptGroup.GET("/roleDeptTreeSelect/:roleId", - middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:dept:query"}}), + middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:dept:query", "system:user:edit"}}), controller.NewSysDept.RoleDeptTreeSelect, ) } @@ -130,7 +130,7 @@ func Setup(router *gin.Engine) { controller.NewSysDictData.Remove, ) sysDictDataGroup.GET("/type/:dictType", - middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:dict:query"}}), + middleware.PreAuthorize(nil), controller.NewSysDictData.DictType, ) sysDictDataGroup.POST("/export", @@ -213,7 +213,7 @@ func Setup(router *gin.Engine) { controller.NewSysMenu.TreeSelect, ) sysMenuGroup.GET("/roleMenuTreeSelect/:roleId", - middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:menu:list"}}), + middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:menu:list", "system:role:query"}}), controller.NewSysMenu.RoleMenuTreeSelect, ) }