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/deviceApp.go | 132 ++++++++++++++++++++++----------------------
1 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/system-service/models/deviceApp.go b/system-service/models/deviceApp.go
index b9b7589..9603291 100644
--- a/system-service/models/deviceApp.go
+++ b/system-service/models/deviceApp.go
@@ -1,67 +1,67 @@
-package models
-
-type DeviceApp 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"`
- AppId string `gorm:"column:appId" json:"appId"`
- ExpireTime string `gorm:"column:expireTime" json:"expireTime"` //婵�娲绘椂闂�
- InstallTime string `gorm:"column:installTime" json:"installTime"` //瀹夎鏃堕棿
-}
-
-func (DeviceApp) TableName() string {
- return "t_device_app"
-}
-
-func (da *DeviceApp) Insert() bool {
- result := db.Table(da.TableName()).Create(&da)
- if result.Error == nil && result.RowsAffected > 0 {
- return true
- }
- return false
-}
-
-func (da *DeviceApp) Update() bool {
- result := db.Table(da.TableName()).Where("id=?", da.Id).Update(&da)
- if result.Error ==nil && result.RowsAffected > 0 {
- return true
- }
- return false
-}
-
-func (da *DeviceApp) Exist(devId string, appId string) (int64, error) {
- result := db.Table(da.TableName()).Where("devId=? and appId=?", devId, appId).First(&da)
- return result.RowsAffected, result.Error
-}
-
-func (da *DeviceApp) DeleteById(id string) bool {
- result := db.Exec("delete from "+da.TableName()+" where id='"+id+"'")
- if result.Error == nil && result.RowsAffected > 0 {
- return true
- }
- return false
-}
-
-func (da *DeviceApp) FindByActivateCode(activateCode string) (list []DeviceApp, err error) {
- result := db.Table(da.TableName()).Where("activateCode=?", activateCode).Find(&list)
- if result.Error != nil {
- return []DeviceApp{},result.Error
- }
- return list, nil
-}
-
-func (da *DeviceApp) FindByMachineCode(machineCode string, serverId string) (list []DeviceApp, err error) {
- result := db.Table(da.TableName()).Where("machineCode=? or devId=?", machineCode, serverId).Order("installTime desc").Find(&list)
- if result.Error != nil {
- return []DeviceApp{},result.Error
- }
- return list, nil
-}
-
-func (da *DeviceApp) FindAll() (list []DeviceApp) {
- if err := db.Table(da.TableName()).Scan(&list).Error; err != nil {
- return []DeviceApp{}
- }
- return
+package models
+
+type DeviceApp 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"`
+ AppId string `gorm:"column:appId" json:"appId"`
+ ExpireTime string `gorm:"column:expireTime" json:"expireTime"` //婵�娲绘椂闂�
+ InstallTime string `gorm:"column:installTime" json:"installTime"` //瀹夎鏃堕棿
+}
+
+func (DeviceApp) TableName() string {
+ return "t_device_app"
+}
+
+func (da *DeviceApp) Insert() bool {
+ result := db.Table(da.TableName()).Create(&da)
+ if result.Error == nil && result.RowsAffected > 0 {
+ return true
+ }
+ return false
+}
+
+func (da *DeviceApp) Update() bool {
+ result := db.Table(da.TableName()).Where("id=?", da.Id).Update(&da)
+ if result.Error ==nil && result.RowsAffected > 0 {
+ return true
+ }
+ return false
+}
+
+func (da *DeviceApp) Exist(devId string, appId string) (int64, error) {
+ result := db.Table(da.TableName()).Where("devId=? and appId=?", devId, appId).First(&da)
+ return result.RowsAffected, result.Error
+}
+
+func (da *DeviceApp) DeleteById(id string) bool {
+ result := db.Exec("delete from "+da.TableName()+" where id='"+id+"'")
+ if result.Error == nil && result.RowsAffected > 0 {
+ return true
+ }
+ return false
+}
+
+func (da *DeviceApp) FindByActivateCode(activateCode string) (list []DeviceApp, err error) {
+ result := db.Table(da.TableName()).Where("activateCode=?", activateCode).Find(&list)
+ if result.Error != nil {
+ return []DeviceApp{},result.Error
+ }
+ return list, nil
+}
+
+func (da *DeviceApp) FindByMachineCode(machineCode string, serverId string) (list []DeviceApp, err error) {
+ result := db.Table(da.TableName()).Where("machineCode=? or devId=?", machineCode, serverId).Order("installTime desc").Find(&list)
+ if result.Error != nil {
+ return []DeviceApp{},result.Error
+ }
+ return list, nil
+}
+
+func (da *DeviceApp) FindAll() (list []DeviceApp) {
+ if err := db.Table(da.TableName()).Scan(&list).Error; err != nil {
+ return []DeviceApp{}
+ }
+ return
}
\ No newline at end of file
--
Gitblit v1.8.0