|
@@ -1768,7 +1768,7 @@ func (this *SandboxController) SaveV2() {
|
|
|
|
|
|
var errMsg string
|
|
|
|
|
|
- if req.SandboxId == 0 {
|
|
|
+ if req.SandboxId <= 0 {
|
|
|
//新增沙盘
|
|
|
sandboxResp, err = sandboxService.AddSandboxV2(req, sysUser.AdminId, sysUser.RealName)
|
|
|
if err != nil {
|
|
@@ -1782,6 +1782,7 @@ func (this *SandboxController) SaveV2() {
|
|
|
} else {
|
|
|
//编辑沙盘
|
|
|
sandboxInfo := &sandbox.Sandbox{
|
|
|
+ SandboxId: req.SandboxId,
|
|
|
Name: utils.TrimStr(req.Name),
|
|
|
Content: req.Content,
|
|
|
PicUrl: utils.TrimStr(req.PicUrl),
|
|
@@ -2264,4 +2265,47 @@ func (this *SandboxController) GetSandboxDetail() {
|
|
|
// br.Ret = 200
|
|
|
// br.Success = true
|
|
|
// br.Msg = "移动成功"
|
|
|
-//}
|
|
|
+//}
|
|
|
+
|
|
|
+// SandboxClassifyItems
|
|
|
+// @Title 获取所有沙盘分类接口-不包含沙盘
|
|
|
+// @Description 获取所有沙盘分类接口-不包含沙盘
|
|
|
+// @Param IsShowMe query bool true "是否只看我的,true、false"
|
|
|
+// @Success 200 {object} data_manage.ChartClassifyListResp
|
|
|
+// @router /classifyList [get]
|
|
|
+func (this *SandboxController) SandboxClassifyList() {
|
|
|
+ br := new(models.BaseResponse).Init()
|
|
|
+ defer func() {
|
|
|
+ this.Data["json"] = br
|
|
|
+ this.ServeJSON()
|
|
|
+ }()
|
|
|
+
|
|
|
+ resp := new(sandbox.SandboxClassifyListResp)
|
|
|
+
|
|
|
+ rootList, err := sandbox.GetSandboxClassifyByParentId(0)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取数据失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ classifyAll, err := sandbox.GetSandboxClassifyAll()
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取数据失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ nodeAll := make([]*sandbox.SandboxClassifyItems, 0)
|
|
|
+ for k := range rootList {
|
|
|
+ rootNode := rootList[k]
|
|
|
+ sandboxService.SandboxClassifyItemsMakeTree(this.SysUser, classifyAll, rootNode)
|
|
|
+ nodeAll = append(nodeAll, rootNode)
|
|
|
+ }
|
|
|
+
|
|
|
+ resp.AllNodes = nodeAll
|
|
|
+ br.Ret = 200
|
|
|
+ br.Success = true
|
|
|
+ br.Msg = "获取成功"
|
|
|
+ br.Data = resp
|
|
|
+}
|