public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-05-06 12:01:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

更改ID太长问题

Browse Source
This commit is contained in:
XM-GO
2023-09-19 10:18:50 +08:00
parent 4794e32106
commit a7d0cec2bf
16 changed files with 135 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/device/api/device.go
View File

@@ -11,9 +11,9 @@ import (
"github.com/PandaXGO/PandaKit/biz"
"github.com/PandaXGO/PandaKit/model"
"github.com/PandaXGO/PandaKit/restfulx"
"github.com/kakuilan/kgo"
"pandax/pkg/global"
"pandax/pkg/mqtt"
"pandax/pkg/tool"
"strings"
"time"
@@ -139,7 +139,7 @@ func (p *DeviceApi) InsertDevice(rc *restfulx.ReqCtx) {
data.OrgId = rc.LoginAccount.OrganizationId
list := p.DeviceApp.FindList(entity.Device{Name: data.Name})
biz.IsTrue(!(list != nil && len(*list) > 0), fmt.Sprintf("名称%s已存在，设置其他命名", data.Name))
data.Id = kgo.KStr.Uniqid("d_")
data.Id = tool.GenerateID()
data.LinkStatus = global.INACTIVE
data.LastAt = time.Now()
p.DeviceApp.Insert(data)

4
apps/device/api/device_cmd.go
View File

@@ -5,9 +5,9 @@ import (
"github.com/PandaXGO/PandaKit/biz"
"github.com/PandaXGO/PandaKit/model"
"github.com/PandaXGO/PandaKit/restfulx"
"github.com/kakuilan/kgo"
"pandax/pkg/global"
"pandax/pkg/mqtt"
"pandax/pkg/tool"
"strings"
"time"
@@ -42,7 +42,7 @@ func (p *DeviceCmdLogApi) GetDeviceCmdLogList(rc *restfulx.ReqCtx) {
func (p *DeviceCmdLogApi) InsertDeviceCmdLog(rc *restfulx.ReqCtx) {
var data entity.DeviceCmdLog
restfulx.BindJsonAndValid(rc, &data)
data.Id = kgo.KStr.Uniqid("cmd_")
data.Id = tool.GenerateID()
data.State = "2"
data.RequestTime = time.Now().Format("2006-01-02 15:04:05")
err := p.DeviceCmdLogApp.Insert(data)

4
apps/device/api/device_group.go
View File

@@ -2,9 +2,9 @@ package api
import (
"github.com/PandaXGO/PandaKit/restfulx"
"github.com/kakuilan/kgo"
"pandax/apps/device/entity"
"pandax/apps/device/services"
"pandax/pkg/tool"
"strings"
)
@@ -70,7 +70,7 @@ func (p *DeviceGroupApi) GetDeviceGroup(rc *restfulx.ReqCtx) {
func (p *DeviceGroupApi) InsertDeviceGroup(rc *restfulx.ReqCtx) {
var data entity.DeviceGroup
restfulx.BindJsonAndValid(rc, &data)
data.Id = kgo.KStr.Uniqid("dg_")
data.Id = tool.GenerateID()
data.Owner = rc.LoginAccount.UserName
data.OrgId = rc.LoginAccount.OrganizationId
p.DeviceGroupApp.Insert(data)

4
apps/device/api/product.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/PandaXGO/PandaKit/biz"
"github.com/PandaXGO/PandaKit/model"
"github.com/PandaXGO/PandaKit/restfulx"
"github.com/kakuilan/kgo"
"pandax/pkg/tool"
"strings"
"pandax/apps/device/entity"
@@ -66,7 +66,7 @@ func (p *ProductApi) GetProduct(rc *restfulx.ReqCtx) {
func (p *ProductApi) InsertProduct(rc *restfulx.ReqCtx) {
var data entity.Product
restfulx.BindJsonAndValid(rc, &data)
data.Id = kgo.KStr.Uniqid("p_")
data.Id = tool.GenerateID()
data.Owner = rc.LoginAccount.UserName
data.OrgId = rc.LoginAccount.OrganizationId
p.ProductApp.Insert(data)

4
apps/device/api/product_category.go
View File

@@ -2,9 +2,9 @@ package api
import (
"github.com/PandaXGO/PandaKit/restfulx"
"github.com/kakuilan/kgo"
"pandax/apps/device/entity"
"pandax/apps/device/services"
"pandax/pkg/tool"
"strings"
)
@@ -59,7 +59,7 @@ func (p *ProductCategoryApi) GetProductCategory(rc *restfulx.ReqCtx) {
func (p *ProductCategoryApi) InsertProductCategory(rc *restfulx.ReqCtx) {
var data entity.ProductCategory
restfulx.BindJsonAndValid(rc, &data)
data.Id = kgo.KStr.Uniqid("pc_")
data.Id = tool.GenerateID()
data.Owner = rc.LoginAccount.UserName
data.OrgId = rc.LoginAccount.OrganizationId
p.ProductCategoryApp.Insert(data)

4
apps/device/api/product_ota.go
View File

@@ -4,7 +4,7 @@ package api
import (
"github.com/PandaXGO/PandaKit/model"
"github.com/PandaXGO/PandaKit/restfulx"
"github.com/kakuilan/kgo"
"pandax/pkg/tool"
"strings"
"pandax/apps/device/entity"
@@ -43,7 +43,7 @@ func (p *ProductOtaApi) GetProductOta(rc *restfulx.ReqCtx) {
func (p *ProductOtaApi) InsertProductOta(rc *restfulx.ReqCtx) {
var data entity.ProductOta
restfulx.BindJsonAndValid(rc, &data)
data.Id = kgo.KStr.Uniqid("ota_")
data.Id = tool.GenerateID()
p.ProductOtaApp.Insert(data)
}

4
apps/device/api/product_template.go
View File

@@ -4,8 +4,8 @@ import (
"github.com/PandaXGO/PandaKit/biz"
"github.com/PandaXGO/PandaKit/model"
"github.com/PandaXGO/PandaKit/restfulx"
"github.com/kakuilan/kgo"
"pandax/pkg/global"
"pandax/pkg/tool"
"strings"
"pandax/apps/device/entity"
@@ -55,7 +55,7 @@ func (p *ProductTemplateApi) GetProductTemplate(rc *restfulx.ReqCtx) {
func (p *ProductTemplateApi) InsertProductTemplate(rc *restfulx.ReqCtx) {
var data entity.ProductTemplate
restfulx.BindJsonAndValid(rc, &data)
data.Id = kgo.KStr.Uniqid("tm_")
data.Id = tool.GenerateID()
data.OrgId = rc.LoginAccount.OrganizationId
// 向超级表及子表中添加字段
stable := ""