first

controllers/sandbox/sandbox.go

@@ -1243,26 +1243,27 @@ func (this *SandboxController) ChartClassifyMove() {
 		}
 
 		//如果改变了分类，那么移动该图表数据
-		if sandboxInfo.SandboxClassifyId != req.ParentClassifyId {
-			//查询需要修改的分类下是否存在同一个图表名称
-			tmpSandboxInfo, tmpErr := sandbox.GetSandboxByClassifyIdAndName(req.ParentClassifyId, sandboxInfo.Name)
-			if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
-				br.Msg = "移动失败"
-				br.ErrMsg = "移动失败,Err:" + tmpErr.Error()
-				return
-			}
-			if tmpSandboxInfo != nil {
-				br.Msg = "移动失败，同一个分类下沙盘名称不允许重复"
-				br.ErrMsg = "移动失败，同一个分类下沙盘名称不允许重复"
-				return
-			}
-			err = sandbox.MoveSandbox(req.SandboxId, req.ParentClassifyId)
-			if err != nil {
-				br.Msg = "移动失败"
-				br.ErrMsg = "移动失败,Err:" + err.Error()
-				return
-			}
-		}
+		// 11/22 ETA逻辑优化去除名称重复限制
+		//if sandboxInfo.SandboxClassifyId != req.ParentClassifyId {
+		//	//查询需要修改的分类下是否存在同一个图表名称
+		//	tmpSandboxInfo, tmpErr := sandbox.GetSandboxByClassifyIdAndName(req.ParentClassifyId, sandboxInfo.Name)
+		//	if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		//		br.Msg = "移动失败"
+		//		br.ErrMsg = "移动失败,Err:" + tmpErr.Error()
+		//		return
+		//	}
+		//	if tmpSandboxInfo != nil {
+		//		br.Msg = "移动失败，同一个分类下沙盘名称不允许重复"
+		//		br.ErrMsg = "移动失败，同一个分类下沙盘名称不允许重复"
+		//		return
+		//	}
+		//	err = sandbox.MoveSandbox(req.SandboxId, req.ParentClassifyId)
+		//	if err != nil {
+		//		br.Msg = "移动失败"
+		//		br.ErrMsg = "移动失败,Err:" + err.Error()
+		//		return
+		//	}
+		//}
 
 		//移动排序
 		updateCol := make([]string, 0)
@@ -1789,13 +1790,14 @@ func (this *SandboxController) SaveV2() {
 			PicUrl:            utils.TrimStr(req.PicUrl),
 			ModifyTime:        time.Now(),
 			SandboxClassifyId: req.SandboxClassifyId,
+			Style:             req.Style,
 		}
 		//缩略图为空时不更新
 		var updateSandboxColumn = []string{}
-		if req.PicUrl == ""{
-			updateSandboxColumn = []string{"Content", "MindmapData", "ModifyTime", "SandboxClassifyId"}
+		if req.PicUrl == "" {
+			updateSandboxColumn = []string{"Content", "MindmapData", "ModifyTime", "SandboxClassifyId","Style"}
 		} else {
-			updateSandboxColumn = []string{"Content", "MindmapData", "PicUrl", "ModifyTime", "SandboxClassifyId"}
+			updateSandboxColumn = []string{"Content", "MindmapData", "PicUrl", "ModifyTime", "SandboxClassifyId","Style"}
 		}
 		err = sandboxInfo.Update(updateSandboxColumn)
 		if err != nil {
@@ -1887,7 +1889,7 @@ func (this *SandboxController) GetSandboxDetail() {
 	}
 
 	//获取沙盘数据详情（已保存的）
-	sandboxVersionInfo, err := sandbox.GetSandboxById(sandboxId)
+	sandboxInfo, err := sandbox.GetSandboxById(sandboxId)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err：" + err.Error()
@@ -1897,7 +1899,7 @@ func (this *SandboxController) GetSandboxDetail() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = msg
-	br.Data = sandboxVersionInfo
+	br.Data = sandboxInfo
 }
 
 //// SandboxClassifyItems
@@ -2369,4 +2371,4 @@ func (this *SandboxController) LinkEdbInfoCheck() {
 	br.Msg = "检测成功"
 	br.Success = true
 	br.Data = resp
-}
+}

models/sandbox/request/sandbox.go

@@ -32,6 +32,7 @@ type AddAndEditSandboxV2 struct {
 	SandboxId         int    `description:"沙盘id"`
 	Name              string `description:"沙盘名称"`
 	Content           string `description:"沙盘内容"`
+	Style             string `description:"风格"`
 	MindmapData       string `description:"思维导图内容"`
 	PicUrl            string `description:"沙盘图片地址"`
 	SvgData           string `description:"沙盘svg图片数据"`

models/sandbox/sandbox.go

@@ -42,6 +42,7 @@ type Sandbox struct {
 	CreateTime        time.Time `description:"创建时间"`
 	SandboxClassifyId int       `description:"分类id"`
 	Sort              int       `description:"排序"`
+	Style             string    `description:"风格"`
 }
 
 // Update 沙盘字段变更

services/sandbox/sandbox.go

@@ -692,7 +692,7 @@ func GetSandboxClassifyListForMe(adminInfo system.Admin, resp *sandbox.SandboxCl
 	for _, v := range sandboxAll {
 		if _, ok := sandListMap[v.SandboxClassifyId]; !ok {
 			list := make([]*sandbox.SandboxClassifyItems, 0)
-			list  = append(list, v)
+			list = append(list, v)
 			sandListMap[v.SandboxClassifyId] = list
 		} else {
 			sandListMap[v.SandboxClassifyId] = append(sandListMap[v.SandboxClassifyId], v)
@@ -778,6 +778,7 @@ func AddSandboxV2(req request.AddAndEditSandboxV2, opUserId int, opUserName stri
 		CreateTime:        time.Now(),
 		SandboxClassifyId: req.SandboxClassifyId,
 		Sort:              0,
+		Style:             req.Style,
 	}
 
 	//新增沙盘
@@ -790,8 +791,7 @@ func AddSandboxV2(req request.AddAndEditSandboxV2, opUserId int, opUserName stri
 	return
 }
 
-
-func SandboxItemsMakeTree(allNode []*sandbox.SandboxClassifyItems, sandListMap map[int][]*sandbox.SandboxClassifyItems, sandboxClassifyId int) (nodeAll []*sandbox.SandboxClassifyItems){
+func SandboxItemsMakeTree(allNode []*sandbox.SandboxClassifyItems, sandListMap map[int][]*sandbox.SandboxClassifyItems, sandboxClassifyId int) (nodeAll []*sandbox.SandboxClassifyItems) {
 	for k := range allNode {
 		if len(allNode[k].Children) > 0 {
 			SandboxItemsMakeTree(allNode[k].Children, sandListMap, sandboxClassifyId)