From 479765110e20384163cf631a4fcfc387a6144ce7 Mon Sep 17 00:00:00 2001 From: zhangwei <894646498@qq.com> Date: Fri, 21 Jul 2023 10:50:04 +0800 Subject: [PATCH] =?UTF-8?q?model=20=E8=8A=82=E7=82=B9=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: e13578349e9d7372f6ce249f70d40a1d0fc68e0b --- model/scnodeavailinfomodel_gen.go | 32 +++++++++---------- model/scnodephyinfomodel.go | 14 -------- model/scnodephyinfomodel_gen.go | 53 ++++++++----------------------- rpc/pcmcore.go | 2 +- 4 files changed, 30 insertions(+), 71 deletions(-) diff --git a/model/scnodeavailinfomodel_gen.go b/model/scnodeavailinfomodel_gen.go index 274bb29d..bf94ffda 100755 --- a/model/scnodeavailinfomodel_gen.go +++ b/model/scnodeavailinfomodel_gen.go @@ -39,22 +39,22 @@ type ( } ScNodeAvailInfo struct { - Id int64 `db:"id"` // id - NodeName sql.NullString `db:"node_name"` // 节点名称 - CpuTotal sql.NullInt64 `db:"cpu_total"` // cpu核数 - CpuAvail sql.NullInt64 `db:"cpu_avail"` // cpu可用核数 - DiskTotal sql.NullInt64 `db:"disk_total"` // 磁盘空间 - DiskAvail sql.NullInt64 `db:"disk_avail"` // 磁盘可用空间 - MemTotal sql.NullInt64 `db:"mem_total"` // 内存总数 - MemAvail sql.NullInt64 `db:"mem_avail"` // 内存可用数 - GpuTotal sql.NullInt64 `db:"gpu_total"` // gpu总数 - GpuAvail sql.NullInt64 `db:"gpu_avail"` // gpu可用数 - ClusterLogicId int64 `db:"cluster_logic_id"` // 集群静态信息id - DeletedFlag int64 `db:"deleted_flag"` // 是否删除 - CreatedBy sql.NullInt64 `db:"created_by"` // 创建人 - CreatedTime time.Time `db:"created_time"` // 创建时间 - UpdatedBy sql.NullInt64 `db:"updated_by"` // 更新人 - UpdatedTime sql.NullTime `db:"updated_time"` // 更新时间 + Id int64 `db:"id"` // id + NodeName string `db:"node_name"` // 节点名称 + CpuTotal int64 `db:"cpu_total"` // cpu核数 + CpuAvail int64 `db:"cpu_avail"` // cpu可用核数 + DiskTotal int64 `db:"disk_total"` // 磁盘空间 + DiskAvail int64 `db:"disk_avail"` // 磁盘可用空间 + MemTotal int64 `db:"mem_total"` // 内存总数 + MemAvail int64 `db:"mem_avail"` // 内存可用数 + GpuTotal int64 `db:"gpu_total"` // gpu总数 + GpuAvail int64 `db:"gpu_avail"` // gpu可用数 + ClusterLogicId int64 `db:"cluster_logic_id"` // 集群静态信息id + DeletedFlag int64 `db:"deleted_flag"` // 是否删除 + CreatedBy int64 `db:"created_by"` // 创建人 + CreatedTime time.Time `db:"created_time"` // 创建时间 + UpdatedBy int64 `db:"updated_by"` // 更新人 + UpdatedTime time.Time `db:"updated_time"` // 更新时间 } ) diff --git a/model/scnodephyinfomodel.go b/model/scnodephyinfomodel.go index 97628778..ded5bea4 100755 --- a/model/scnodephyinfomodel.go +++ b/model/scnodephyinfomodel.go @@ -1,12 +1,5 @@ package model -import ( - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlx" -) - -var _ ScNodePhyInfoModel = (*customScNodePhyInfoModel)(nil) - type ( // ScNodePhyInfoModel is an interface to be customized, add more methods here, // and implement the added methods in customScNodePhyInfoModel. @@ -18,10 +11,3 @@ type ( *defaultScNodePhyInfoModel } ) - -// NewScNodePhyInfoModel returns a model for the database table. -func NewScNodePhyInfoModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) ScNodePhyInfoModel { - return &customScNodePhyInfoModel{ - defaultScNodePhyInfoModel: newScNodePhyInfoModel(conn, c, opts...), - } -} diff --git a/model/scnodephyinfomodel_gen.go b/model/scnodephyinfomodel_gen.go index ecbd4622..53e710ed 100755 --- a/model/scnodephyinfomodel_gen.go +++ b/model/scnodephyinfomodel_gen.go @@ -39,19 +39,19 @@ type ( } ScNodePhyInfo struct { - Id int64 `db:"id"` // id - NodeName string `db:"node_name"` // 节点名称 - OsName string `db:"os_name"` // 系统名称 - OsVersion int64 `db:"os_version"` // 系统版本 - ArchType string `db:"arch_type"` // 架构类型 - ArchName string `db:"arch_name"` // 架构名称 - ArchFreq string `db:"arch_freq"` // 架构频率 - ClusterId sql.NullInt64 `db:"cluster_id"` // 集群静态信息id - DeletedFlag int64 `db:"deleted_flag"` // 是否删除 - CreatedBy sql.NullInt64 `db:"created_by"` // 创建人 - CreatedTime time.Time `db:"created_time"` // 创建时间 - UpdatedBy sql.NullInt64 `db:"updated_by"` // 更新人 - UpdatedTime sql.NullTime `db:"updated_time"` // 更新时间 + Id int64 `db:"id"` // id + NodeName string `db:"node_name"` // 节点名称 + OsName string `db:"os_name"` // 系统名称 + OsVersion int64 `db:"os_version"` // 系统版本 + ArchType string `db:"arch_type"` // 架构类型 + ArchName string `db:"arch_name"` // 架构名称 + ArchFreq string `db:"arch_freq"` // 架构频率 + ParticipantId int64 `db:"cluster_id"` // 集群静态信息id + DeletedFlag int64 `db:"deleted_flag"` // 是否删除 + CreatedBy int64 `db:"created_by"` // 创建人 + CreatedTime time.Time `db:"created_time"` // 创建时间 + UpdatedBy int64 `db:"updated_by"` // 更新人 + UpdatedTime time.Time `db:"updated_time"` // 更新时间 } ) @@ -95,33 +95,6 @@ func (m *defaultScNodePhyInfoModel) FindOne(ctx context.Context, id int64) (*ScN } } -func (m *defaultScNodePhyInfoModel) Insert(ctx context.Context, data *ScNodePhyInfo) (sql.Result, error) { - pcmScNodePhyInfoIdKey := fmt.Sprintf("%s%v", cachePcmScNodePhyInfoIdPrefix, data.Id) - ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, scNodePhyInfoRowsExpectAutoSet) - return conn.ExecCtx(ctx, query, data.Id, data.NodeName, data.OsName, data.OsVersion, data.ArchType, data.ArchName, data.ArchFreq, data.ClusterId, data.DeletedFlag, data.CreatedBy, data.CreatedTime, data.UpdatedBy, data.UpdatedTime) - }, pcmScNodePhyInfoIdKey) - return ret, err -} - -func (m *defaultScNodePhyInfoModel) Update(ctx context.Context, data *ScNodePhyInfo) error { - pcmScNodePhyInfoIdKey := fmt.Sprintf("%s%v", cachePcmScNodePhyInfoIdPrefix, data.Id) - _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, scNodePhyInfoRowsWithPlaceHolder) - return conn.ExecCtx(ctx, query, data.NodeName, data.OsName, data.OsVersion, data.ArchType, data.ArchName, data.ArchFreq, data.ClusterId, data.DeletedFlag, data.CreatedBy, data.CreatedTime, data.UpdatedBy, data.UpdatedTime, data.Id) - }, pcmScNodePhyInfoIdKey) - return err -} - -func (m *defaultScNodePhyInfoModel) formatPrimary(primary any) string { - return fmt.Sprintf("%s%v", cachePcmScNodePhyInfoIdPrefix, primary) -} - -func (m *defaultScNodePhyInfoModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", scNodePhyInfoRows, m.table) - return conn.QueryRowCtx(ctx, v, query, primary) -} - func (m *defaultScNodePhyInfoModel) tableName() string { return m.table } diff --git a/rpc/pcmcore.go b/rpc/pcmcore.go index c189e1f0..ea9e8376 100644 --- a/rpc/pcmcore.go +++ b/rpc/pcmcore.go @@ -17,7 +17,7 @@ import ( "google.golang.org/grpc/reflection" ) -var configFile = flag.String("f", "etc/pcmcore.yaml", "the config file") +var configFile = flag.String("f", "rpc/etc/pcmcore.yaml", "the config file") func main() {