ziwen 1 år sedan
förälder
incheckning
4ac08f81b2

+ 59 - 4
controllers/sandbox/sandbox.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"eta/eta_api/controllers"
 	"eta/eta_api/models"
+	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/sandbox"
 	"eta/eta_api/models/sandbox/request"
 	"eta/eta_api/models/sandbox/response"
@@ -1401,7 +1402,6 @@ func (this *SandboxController) ChartClassifyMove() {
 				updateCol = append(updateCol, "Sort", "ModifyTime")
 			}
 
-
 		} else {
 			// prevId为0,也就是沙盘移到最前端
 			firstClassify, err := sandbox.GetFirstSandboxByClassifyId(req.ClassifyId)
@@ -1782,14 +1782,15 @@ func (this *SandboxController) SaveV2() {
 	} else {
 		//编辑沙盘
 		sandboxInfo := &sandbox.Sandbox{
-			SandboxId: req.SandboxId,
+			SandboxId:         req.SandboxId,
 			Name:              utils.TrimStr(req.Name),
 			Content:           req.Content,
+			MindmapData:       req.MindmapData,
 			PicUrl:            utils.TrimStr(req.PicUrl),
 			ModifyTime:        time.Now(),
 			SandboxClassifyId: req.SandboxClassifyId,
 		}
-		var updateSandboxColumn = []string{"Content","PicUrl","ModifyTime","SandboxClassifyId"}
+		var updateSandboxColumn = []string{"Content", "MindmapData", "PicUrl", "ModifyTime", "SandboxClassifyId"}
 		err = sandboxInfo.Update(updateSandboxColumn)
 		if err != nil {
 			br.Msg = "保存失败!"
@@ -1979,7 +1980,6 @@ func (this *SandboxController) GetSandboxDetail() {
 //	br.Data = resp
 //}
 
-
 //// SandboxMove
 //// @Title 移动沙盘接口
 //// @Description 移动图表接口
@@ -2309,3 +2309,58 @@ func (this *SandboxController) SandboxClassifyList() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// @Title 链接指标检测
+// @Description 链接指标检测接口
+// @Param	request	body data_manage.ChartClassifyDeleteCheckResp true "type json string"
+// @Success 200 Ret=200 检测成功
+// @router /link/check [post]
+func (this *SandboxController) LinkEdbInfoCheck() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req sandbox.SandboxLinkCheckReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常!"
+		br.ErrMsg = "参数解析失败,Err:" + err.Error()
+		return
+	}
+	resp := new(sandbox.SandboxLinkCheckResp)
+	edbInfoList, err := data_manage.GetEdbInfoByIdList(req.EdbInfoIdList)
+	if err != nil {
+		br.Msg = "获取指标信息失败"
+		br.ErrMsg = "获取指标信息失败,err:" + err.Error()
+		return
+	}
+	for _, v := range edbInfoList {
+		resp.EdbInfoIdList = append(resp.EdbInfoIdList, v.EdbInfoId)
+	}
+
+	chartList, err := data_manage.GetChartInfoByIdList(req.ChartInfoIdList)
+	if err != nil {
+		br.Msg = `获取失败`
+		br.ErrMsg = `获取图表列表失败,ERR:` + err.Error()
+		return
+	}
+	for _, v := range chartList {
+		resp.ChartInfoIdList = append(resp.ChartInfoIdList, v.ChartInfoId)
+	}
+
+	reportList, err := models.GetSimpleReportByIds(req.ReportIdList)
+	if err != nil {
+		br.Msg = `获取失败`
+		br.ErrMsg = `获取报告列表失败,ERR:` + err.Error()
+		return
+	}
+	for _, v := range reportList {
+		resp.ReportIdList = append(resp.ReportIdList, v.Id)
+	}
+
+	br.Ret = 200
+	br.Msg = "检测成功"
+	br.Success = true
+	br.Data = resp
+}

+ 8 - 7
models/sandbox/request/sandbox.go

@@ -29,10 +29,11 @@ type DeleteSandboxVersion struct {
 
 // AddAndEditSandboxV2 添加/编辑沙盘的请求数据
 type AddAndEditSandboxV2 struct {
-	SandboxId          int    `description:"沙盘id"`
-	Name               string `description:"沙盘名称"`
-	Content            string `description:"沙盘内容"`
-	PicUrl             string `description:"沙盘图片地址"`
-	SvgData            string `description:"沙盘svg图片数据"`
-	SandboxClassifyId  int    `description:"分类id"`
-}
+	SandboxId         int    `description:"沙盘id"`
+	Name              string `description:"沙盘名称"`
+	Content           string `description:"沙盘内容"`
+	MindmapData       string `description:"思维导图内容"`
+	PicUrl            string `description:"沙盘图片地址"`
+	SvgData           string `description:"沙盘svg图片数据"`
+	SandboxClassifyId int    `description:"分类id"`
+}

+ 1 - 1
models/sandbox/sandbox.go

@@ -33,6 +33,7 @@ type Sandbox struct {
 	Name              string    `description:"沙盘名称"`
 	Code              string    `description:"沙盘code"`
 	Content           string    `description:"沙盘数据"`
+	MindmapData       string    `description:"思维导图数据"`
 	PicUrl            string    `description:"沙盘图片地址"`
 	SysUserId         int       `description:"作者id"`
 	SysUserName       string    `description:"作者名称"`
@@ -383,7 +384,6 @@ func MoveSandbox(sandboxId, classifyId int) (err error) {
 	return
 }
 
-
 // UpdateSandboxSortByClassifyId 根据沙盘id更新排序
 func UpdateSandboxSortByClassifyId(classifyId, nowSort, prevSandboxId int, updateSort string) (err error) {
 	o := orm.NewOrmUsingDB("data")

+ 13 - 0
models/sandbox/sandbox_classify.go

@@ -232,3 +232,16 @@ ORDER BY
 	_, err = o.Raw(sql, parentId, parentId).QueryRows(&items)
 	return
 }
+
+type SandboxLinkCheckReq struct {
+	EdbInfoIdList   []int `description:"指标id列表"`
+	ChartInfoIdList []int `description:"图库id列表"`
+	ReportIdList    []int `description:"报告id列表"`
+}
+
+
+type SandboxLinkCheckResp struct {
+	EdbInfoIdList   []int `description:"指标id列表"`
+	ChartInfoIdList []int `description:"图库id列表"`
+	ReportIdList    []int `description:"报告id列表"`
+}

+ 9 - 0
routers/commentsRouter.go

@@ -4228,6 +4228,15 @@ 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: "LinkEdbInfoCheck",
+            Router: `/link/check`,
+            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: "List",

+ 1 - 0
services/sandbox/sandbox.go

@@ -769,6 +769,7 @@ func AddSandboxV2(req request.AddAndEditSandboxV2, opUserId int, opUserName stri
 		Name:              utils.TrimStr(req.Name),
 		Code:              GenerateCode(),
 		Content:           req.Content,
+		MindmapData:       req.MindmapData,
 		PicUrl:            utils.TrimStr(req.PicUrl),
 		SysUserId:         opUserId,
 		SysUserName:       opUserName,