fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
eson
2023-06-20 19:37:08 +08:00
parent e50dac6b1c f6cee27c3f
commit e6971575f1
22 changed files with 406 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/map-library/internal/logic/getmaplibrarylistlogic.go
View File

@@ -63,7 +63,7 @@ func (l *GetMapLibraryListLogic) GetMapLibraryList(userinfo *auth.UserInfo) (res
}
//tag拼装
if tagIndex, ok := mapTag[*v.TagId]; ok {
data.Tag = types.MapLibraryListTag{
data.Tag = &types.MapLibraryListTag{
Id: templateTagList[tagIndex].Id,
Title: *templateTagList[tagIndex].Title,
}

62
server/map-library/internal/types/types.go
View File

@@ -6,10 +6,10 @@ import (
)
type GetMapLibraryListRsp struct {
Mid int64 `json:"mid"`
Ctime string `json:"ctime"`
Tag MapLibraryListTag `json:"tag"`
Info interface{} `json:"info"`
Mid int64 `json:"mid"`
Ctime string `json:"ctime"`
Tag *MapLibraryListTag `json:"tag"`
Info interface{} `json:"info"`
}
type MapLibraryListTag struct {
@@ -31,33 +31,33 @@ type Tag struct {
}
type Info struct {
Id string `json:"id,optional"`
Tag string `json:"tag,optional"`
Title string `json:"title,optional"`
Type string `json:"type,optional"`
Text string `json:"text,optional"`
Fill string `json:"fill,optional"`
FontSize int64 `json:"fontSize,optional"`
FontFamily string `json:"fontFamily,optional"`
IfBr bool `json:"ifBr,optional"`
IfShow bool `json:"ifShow,optional"`
IfGroup bool `json:"ifGroup,optional"`
MaxNum int64 `json:"maxNum,optional"`
Rotation int64 `json:"rotation,optional"`
Align string `json:"align,optional"`
VerticalAlign string `json:"verticalAlign,optional"`
Material string `json:"material,optional"`
Width float64 `json:"width,optional"`
Height float64 `json:"height,optional"`
X float64 `json:"x,optional"`
Y float64 `json:"Y,optional"`
Opacity float64 `json:"opacity,optional"`
OptionalColor []OptionalColor `json:"optionalColor,optional"`
ZIndex int64 `json:"zIndex,optional"`
SvgPath string `json:"svgPath,optional"`
Follow Follow `json:"follow,optional"`
Group []Group `json:"group,optional"`
CameraStand CameraStand `json:"cameraStand,optional"`
Id string `json:"id,optional"`
Tag string `json:"tag,optional"`
Title string `json:"title,optional"`
Type string `json:"type,optional"`
Text string `json:"text,optional"`
Fill string `json:"fill,optional"`
FontSize int64 `json:"fontSize,optional"`
FontFamily string `json:"fontFamily,optional"`
IfBr bool `json:"ifBr,optional"`
IfShow bool `json:"ifShow,optional"`
IfGroup bool `json:"ifGroup,optional"`
MaxNum int64 `json:"maxNum,optional"`
Rotation int64 `json:"rotation,optional"`
Align string `json:"align,optional"`
VerticalAlign string `json:"verticalAlign,optional"`
Material string `json:"material,optional"`
Width float64 `json:"width,optional"`
Height float64 `json:"height,optional"`
X float64 `json:"x,optional"`
Y float64 `json:"Y,optional"`
Opacity float64 `json:"opacity,optional"`
OptionalColor []*OptionalColor `json:"optionalColor,optional"`
ZIndex int64 `json:"zIndex,optional"`
SvgPath string `json:"svgPath,optional"`
Follow Follow `json:"follow,optional"`
Group []*Group `json:"group,optional"`
CameraStand CameraStand `json:"cameraStand,optional"`
}
type Group struct {