From bb1739d042d95d49cc902187fa12c00d5fcf039b Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Tue, 29 Jun 2021 19:38:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=9B=E5=BB=BA=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E5=99=A8=E3=80=81=E7=B3=BB=E7=BB=9F=E6=97=B6=E9=99=90?= =?UTF-8?q?=E5=88=B6=E5=90=8D=E7=A7=B0=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/client_browser_dao.go | 5 ++++ internal/db/models/client_system_dao.go | 5 ++++ .../service_node_cluster_metric_item.go | 25 +++++++++++++++++-- ...vice_server_client_browser_monthly_stat.go | 4 +-- ...rvice_server_client_system_monthly_stat.go | 4 +-- 5 files changed, 37 insertions(+), 6 deletions(-) diff --git a/internal/db/models/client_browser_dao.go b/internal/db/models/client_browser_dao.go index eee8b11c..031ac0f9 100644 --- a/internal/db/models/client_browser_dao.go +++ b/internal/db/models/client_browser_dao.go @@ -104,6 +104,11 @@ func (this *ClientBrowserDAO) FindBrowserIdWithNameCacheable(tx *dbs.Tx, browser // CreateBrowser 创建浏览器 func (this *ClientBrowserDAO) CreateBrowser(tx *dbs.Tx, browserName string) (int64, error) { + var maxlength = 50 + if len(browserName) > maxlength { + browserName = browserName[:50] + } + SharedCacheLocker.Lock() defer SharedCacheLocker.Unlock() diff --git a/internal/db/models/client_system_dao.go b/internal/db/models/client_system_dao.go index c7b7267d..7d86f577 100644 --- a/internal/db/models/client_system_dao.go +++ b/internal/db/models/client_system_dao.go @@ -104,6 +104,11 @@ func (this *ClientSystemDAO) FindSystemIdWithNameCacheable(tx *dbs.Tx, systemNam // CreateSystem 创建浏览器 func (this *ClientSystemDAO) CreateSystem(tx *dbs.Tx, systemName string) (int64, error) { + var maxlength = 50 + if len(systemName) > maxlength { + systemName = systemName[:50] + } + SharedCacheLocker.Lock() defer SharedCacheLocker.Unlock() diff --git a/internal/rpc/services/service_node_cluster_metric_item.go b/internal/rpc/services/service_node_cluster_metric_item.go index 0f2bb777..e804a718 100644 --- a/internal/rpc/services/service_node_cluster_metric_item.go +++ b/internal/rpc/services/service_node_cluster_metric_item.go @@ -23,10 +23,16 @@ func (this *NodeClusterMetricItemService) EnableNodeClusterMetricItem(ctx contex } var tx = this.NullTx() - err = models.SharedNodeClusterMetricItemDAO.EnableClusterItem(tx, req.NodeClusterId, req.MetricItemId) + exists, err := models.SharedNodeClusterMetricItemDAO.ExistsClusterItem(tx, req.NodeClusterId, req.MetricItemId) if err != nil { return nil, err } + if !exists { + err = models.SharedNodeClusterMetricItemDAO.EnableClusterItem(tx, req.NodeClusterId, req.MetricItemId) + if err != nil { + return nil, err + } + } return this.Success() } @@ -53,7 +59,7 @@ func (this *NodeClusterMetricItemService) FindAllNodeClusterMetricItems(ctx cont } var tx = this.NullTx() - clusterItems, err := models.SharedNodeClusterMetricItemDAO.FindAllClusterItems(tx, req.NodeClusterId) + clusterItems, err := models.SharedNodeClusterMetricItemDAO.FindAllClusterItems(tx, req.NodeClusterId, req.Category) if err != nil { return nil, err } @@ -79,3 +85,18 @@ func (this *NodeClusterMetricItemService) FindAllNodeClusterMetricItems(ctx cont } return &pb.FindAllNodeClusterMetricItemsResponse{MetricItems: pbItems}, nil } + +// ExistsNodeClusterMetricItem 检查是否已添加某个指标 +func (this *NodeClusterMetricItemService) ExistsNodeClusterMetricItem(ctx context.Context, req *pb.ExistsNodeClusterMetricItemRequest) (*pb.RPCExists, error) { + _, err := this.ValidateAdmin(ctx, 0) + if err != nil { + return nil, err + } + + var tx = this.NullTx() + b, err := models.SharedNodeClusterMetricItemDAO.ExistsClusterItem(tx, req.NodeClusterId, req.MetricItemId) + if err != nil { + return nil, err + } + return this.Exists(b) +} diff --git a/internal/rpc/services/service_server_client_browser_monthly_stat.go b/internal/rpc/services/service_server_client_browser_monthly_stat.go index 439adc86..bdcf1182 100644 --- a/internal/rpc/services/service_server_client_browser_monthly_stat.go +++ b/internal/rpc/services/service_server_client_browser_monthly_stat.go @@ -7,12 +7,12 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) -// 操作系统统计 +// ServerClientBrowserMonthlyStatService 操作系统统计 type ServerClientBrowserMonthlyStatService struct { BaseService } -// 查找前N个操作系统 +// FindTopServerClientBrowserMonthlyStats 查找前N个操作系统 func (this *ServerClientBrowserMonthlyStatService) FindTopServerClientBrowserMonthlyStats(ctx context.Context, req *pb.FindTopServerClientBrowserMonthlyStatsRequest) (*pb.FindTopServerClientBrowserMonthlyStatsResponse, error) { _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) if err != nil { diff --git a/internal/rpc/services/service_server_client_system_monthly_stat.go b/internal/rpc/services/service_server_client_system_monthly_stat.go index 4c8ae134..86efe68b 100644 --- a/internal/rpc/services/service_server_client_system_monthly_stat.go +++ b/internal/rpc/services/service_server_client_system_monthly_stat.go @@ -7,12 +7,12 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) -// 操作系统统计 +// ServerClientSystemMonthlyStatService 操作系统统计 type ServerClientSystemMonthlyStatService struct { BaseService } -// 查找前N个操作系统 +// FindTopServerClientSystemMonthlyStats 查找前N个操作系统 func (this *ServerClientSystemMonthlyStatService) FindTopServerClientSystemMonthlyStats(ctx context.Context, req *pb.FindTopServerClientSystemMonthlyStatsRequest) (*pb.FindTopServerClientSystemMonthlyStatsResponse, error) { _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) if err != nil {