fix

controllers/sandbox/sandbox.go

@@ -1510,23 +1510,6 @@ func (this *SandboxController) DeleteV2() {
 		return
 	}
 
-	/*key := fmt.Sprint(`crm:sandbox:edit:`, req.SandboxId)
-	opUserId, _ := utils.Rc.RedisInt(key)
-	//如果当前有人操作，且获取当前操作人不是本人，那么不允许删除
-	if opUserId > 0 && opUserId != this.SysUser.AdminId {
-		br.Msg = "当前有其他人正在编辑，不允许删除该沙盘"
-		return
-	}*/
-	markStatus, err := sandboxService.UpdateSandboxEditMark(req.SandboxId, this.SysUser.AdminId, 2, this.SysUser.RealName)
-	if err != nil {
-		br.Msg = "查询标记状态失败"
-		br.ErrMsg = "查询标记状态失败，Err:" + err.Error()
-		return
-	}
-	if markStatus.Status == 1 {
-		br.Msg = fmt.Sprintf("当前%s正在编辑，不允许删除该沙盘", markStatus.Editor)
-		return
-	}
 
 	//删除沙盘
 	err = sandboxService.DeleteSandbox(req.SandboxId)
@@ -1539,4 +1522,44 @@ func (this *SandboxController) DeleteV2() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = msg
+}
+
+// GetSandboxVersionDetail
+// @Title 获取沙盘版本数据详情（已保存的）
+// @Description 获取沙盘版本数据详情接口（已保存的）
+// @Param   SandboxVersionCode   query   string  true       "沙盘版本code"
+// @Success 200 {object} sandbox.SandboxVersion
+// @router /detail [get]
+func (this *SandboxController) GetSandboxDetail() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	sandboxId, _ := this.GetInt("SandboxId")
+	if sandboxId == 0 {
+		br.Msg = "缺少沙盘Id"
+		return
+	}
+
+	//获取沙盘数据详情（已保存的）
+	sandboxVersionInfo, err := sandbox.GetSandboxById(sandboxId)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err：" + err.Error()
+		return
+	}
+	msg := "获取成功"
+	br.Ret = 200
+	br.Success = true
+	br.Msg = msg
+	br.Data = sandboxVersionInfo
 }

routers/commentsRouter.go

@@ -4138,6 +4138,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/sandbox:SandboxController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/sandbox:SandboxController"],
+        beego.ControllerComments{
+            Method: "DeleteV2",
+            Router: `/deleteV2`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/sandbox:SandboxController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/sandbox:SandboxController"],
+        beego.ControllerComments{
+            Method: "GetSandboxDetail",
+            Router: `/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/sandbox:SandboxController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/sandbox:SandboxController"],
         beego.ControllerComments{
             Method: "AddSandboxDraft",