From 63645d248c765244488cd34dbc1bb6528ca6b7c7 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 05 九月 2023 09:58:13 +0800
Subject: [PATCH] 修复编译
---
system-service/models/deviceSdk.go | 168 ++++++++++++++++++++++++++++----------------------------
1 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/system-service/models/deviceSdk.go b/system-service/models/deviceSdk.go
index d922823..13cf609 100644
--- a/system-service/models/deviceSdk.go
+++ b/system-service/models/deviceSdk.go
@@ -1,85 +1,85 @@
-package models
-
-type DeviceSdk struct {
- Id string `gorm:"column:id;primary_key;type:varchar(50);unique;not null;" json:"id"`
- DevId string `gorm:"column:devId" json:"devId"`
- MachineCode string `gorm:"column:machineCode" json:"machineCode"`
- ActivateCode string `gorm:"column:activateCode" json:"activateCode"`
- SdkId string `gorm:"column:sdkId" json:"sdkId"`
- ExpireTime string `gorm:"column:expireTime" json:"expireTime"`
- InstallTime string `gorm:"column:installTime" json:"installTime"` //瀹夎鏃堕棿
-
-}
-
-func (DeviceSdk) TableName() string {
- return "t_device_sdk"
-}
-
-func (ds *DeviceSdk) Insert() bool {
- result := db.Table(ds.TableName()).Create(&ds)
- if result.Error == nil && result.RowsAffected > 0 {
- return true
- }
- return false
-}
-
-func (ds *DeviceSdk) Update() bool {
- result := db.Table(ds.TableName()).Where("id=?", ds.Id).Update(&ds)
- if result.Error ==nil && result.RowsAffected > 0 {
- return true
- }
- return false
-}
-
-func (ds *DeviceSdk) Exist(devId string, sdkId string) (int64, error) {
- result := db.Table(ds.TableName()).Where("devId=? and sdkId=?", devId, sdkId).First(&ds)
- return result.RowsAffected, result.Error
-}
-
-func (ds *DeviceSdk) DeleteById(id string) bool {
- result := db.Exec("delete from "+ds.TableName()+" where id='"+id+"'")
- if result.Error == nil && result.RowsAffected > 0 {
- return true
- }
- return false
-}
-
-func (ds *DeviceSdk) FindByActivateCode(activateCode string) (list []DeviceSdk, err error) {
- result := db.Table(ds.TableName()).Where("activateCode=?", activateCode).Find(&list)
- if result.Error != nil {
- return []DeviceSdk{},result.Error
- }
- return list, nil
-}
-
-func (ds *DeviceSdk) FindByMachineCode(machineCode string, serverId string) (list []DeviceSdk, err error) {
- result := db.Table(ds.TableName()).Where("machineCode=? or devId=?", machineCode, serverId).Order("installTime desc").Find(&list)
- if result.Error != nil {
- return []DeviceSdk{},result.Error
- }
- return list, nil
-}
-
-func (ds *DeviceSdk) FindByMacAndSdk(macCode, serverId, sdkId string) (list []DeviceSdk, err error) {
- result := db.Table(ds.TableName()).Where("(machineCode=? or devId=?) and sdkId=?", macCode, serverId, sdkId).Find(&list)
- if result.Error != nil {
- return []DeviceSdk{},result.Error
- }
- return list, nil
-}
-
-//鎸夎澶噄d缁熻绠楁硶鏁伴噺
-func (ds *DeviceSdk) CountByDevId(devId string) (int,error) {
- var count int
- if err := db.Raw("select count(1) as count from "+ds.TableName()+" where devId=?",devId).Count(&count).Error; err != nil {
- return 0, err
- }
- return count, nil
-}
-
-func (ds *DeviceSdk) FindAll() (list []DeviceSdk) {
- if err := db.Table(ds.TableName()).Find(&list).Error;err != nil {
- return []DeviceSdk{}
- }
- return
+package models
+
+type DeviceSdk struct {
+ Id string `gorm:"column:id;primary_key;type:varchar(50);unique;not null;" json:"id"`
+ DevId string `gorm:"column:devId" json:"devId"`
+ MachineCode string `gorm:"column:machineCode" json:"machineCode"`
+ ActivateCode string `gorm:"column:activateCode" json:"activateCode"`
+ SdkId string `gorm:"column:sdkId" json:"sdkId"`
+ ExpireTime string `gorm:"column:expireTime" json:"expireTime"`
+ InstallTime string `gorm:"column:installTime" json:"installTime"` //瀹夎鏃堕棿
+
+}
+
+func (DeviceSdk) TableName() string {
+ return "t_device_sdk"
+}
+
+func (ds *DeviceSdk) Insert() bool {
+ result := db.Table(ds.TableName()).Create(&ds)
+ if result.Error == nil && result.RowsAffected > 0 {
+ return true
+ }
+ return false
+}
+
+func (ds *DeviceSdk) Update() bool {
+ result := db.Table(ds.TableName()).Where("id=?", ds.Id).Update(&ds)
+ if result.Error ==nil && result.RowsAffected > 0 {
+ return true
+ }
+ return false
+}
+
+func (ds *DeviceSdk) Exist(devId string, sdkId string) (int64, error) {
+ result := db.Table(ds.TableName()).Where("devId=? and sdkId=?", devId, sdkId).First(&ds)
+ return result.RowsAffected, result.Error
+}
+
+func (ds *DeviceSdk) DeleteById(id string) bool {
+ result := db.Exec("delete from "+ds.TableName()+" where id='"+id+"'")
+ if result.Error == nil && result.RowsAffected > 0 {
+ return true
+ }
+ return false
+}
+
+func (ds *DeviceSdk) FindByActivateCode(activateCode string) (list []DeviceSdk, err error) {
+ result := db.Table(ds.TableName()).Where("activateCode=?", activateCode).Find(&list)
+ if result.Error != nil {
+ return []DeviceSdk{},result.Error
+ }
+ return list, nil
+}
+
+func (ds *DeviceSdk) FindByMachineCode(machineCode string, serverId string) (list []DeviceSdk, err error) {
+ result := db.Table(ds.TableName()).Where("machineCode=? or devId=?", machineCode, serverId).Order("installTime desc").Find(&list)
+ if result.Error != nil {
+ return []DeviceSdk{},result.Error
+ }
+ return list, nil
+}
+
+func (ds *DeviceSdk) FindByMacAndSdk(macCode, serverId, sdkId string) (list []DeviceSdk, err error) {
+ result := db.Table(ds.TableName()).Where("(machineCode=? or devId=?) and sdkId=?", macCode, serverId, sdkId).Find(&list)
+ if result.Error != nil {
+ return []DeviceSdk{},result.Error
+ }
+ return list, nil
+}
+
+//鎸夎澶噄d缁熻绠楁硶鏁伴噺
+func (ds *DeviceSdk) CountByDevId(devId string) (int,error) {
+ var count int
+ if err := db.Raw("select count(1) as count from "+ds.TableName()+" where devId=?",devId).Count(&count).Error; err != nil {
+ return 0, err
+ }
+ return count, nil
+}
+
+func (ds *DeviceSdk) FindAll() (list []DeviceSdk) {
+ if err := db.Table(ds.TableName()).Find(&list).Error;err != nil {
+ return []DeviceSdk{}
+ }
+ return
}
\ No newline at end of file
--
Gitblit v1.8.0