Browse Source

temp commit

hsun 1 năm trước cách đây
mục cha
commit
aeda085694

+ 0 - 319
controllers/chart_framework/chart_framework.go

@@ -1,319 +0,0 @@
-package chart_framework
-
-import (
-	"encoding/json"
-	"eta/eta_api/controllers"
-	"eta/eta_api/models"
-	"eta/eta_api/models/data_manage"
-	"eta/eta_api/utils"
-	"fmt"
-	"strings"
-	"time"
-)
-
-// ChartFrameworkController 图库框架
-type ChartFrameworkController struct {
-	controllers.BaseAuthController
-}
-
-// List
-// @Title 列表
-// @Description 列表
-// @Param   Visibility	query	int		false	"可见度: 0-所有(默认); 1-我的; 2-公开"
-// @Param   Keyword		query	string	false	"关键词"
-// @Success 200 Ret=200 获取成功
-// @router /list [get]
-func (this *ChartFrameworkController) List() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}
-
-// Add
-// @Title 新增框架
-// @Description 新增框架
-// @Param	request	body data_manage.ChartFrameworkAddReq true "type json string"
-// @Success 200 Ret=200 操作成功
-// @router /add [post]
-func (this *ChartFrameworkController) Add() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	// 参数校验
-	var req data_manage.ChartFrameworkAddReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + e.Error()
-		return
-	}
-	req.FrameworkName = strings.TrimSpace(req.FrameworkName)
-	if req.FrameworkName == "" {
-		br.Msg = "框架名称不可为空"
-		return
-	}
-
-	// 重名校验
-	{
-		ob := new(data_manage.ChartFramework)
-		cond := fmt.Sprintf(` AND %s = ?`, data_manage.ChartFrameworkColumns.FrameworkName)
-		pars := make([]interface{}, 0)
-		pars = append(pars, req.FrameworkName)
-		exist, e := ob.GetItemByCondition(cond, pars)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			br.Msg = "操作失败"
-			br.ErrMsg = "获取重名框架失败, Err: " + e.Error()
-			return
-		}
-		if exist != nil {
-			br.Msg = "框架名称已存在"
-			return
-		}
-	}
-
-	now := time.Now().Local()
-	frameworkCode := utils.MD5(fmt.Sprint(now.UnixMilli()))
-	item := new(data_manage.ChartFramework)
-	item.FrameworkName = req.FrameworkName
-	item.FrameworkCode = frameworkCode
-	item.FrameworkImg = req.FrameworkImg
-	item.FrameworkContent = req.FrameworkContent
-	item.AdminId = sysUser.AdminId
-	item.AdminName = sysUser.RealName
-	item.CreateTime = now
-	item.ModifyTime = now
-	nodes := make([]*data_manage.ChartFrameworkNode, 0)
-	if len(req.Nodes) > 0 {
-		for _, v := range req.Nodes {
-			if v <= 0 {
-				continue
-			}
-			t := new(data_manage.ChartFrameworkNode)
-			t.MyChartClassifyId = v
-			t.CreateTime = now
-		}
-	}
-	if e := item.CreateFrameworkAndNodes(item, nodes); e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "新增框架及节点失败, Err: " + e.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "操作成功"
-}
-
-// Edit
-// @Title 编辑框架
-// @Description 编辑框架
-// @Param	request	body eta_business.EtaBusinessAddReq true "type json string"
-// @Success 200 Ret=200 操作成功
-// @router /edit [post]
-func (this *ChartFrameworkController) Edit() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录,SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	// 参数校验
-	var req data_manage.ChartFrameworkEditReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常!"
-		br.ErrMsg = "参数解析失败,Err:" + e.Error()
-		return
-	}
-	if req.ChartFrameworkId <= 0 {
-		br.Msg = "参数有误"
-		br.ErrMsg = fmt.Sprintf("参数有误, ChartFrameworkId: %d", req.ChartFrameworkId)
-		return
-	}
-	req.FrameworkName = strings.TrimSpace(req.FrameworkName)
-	if req.FrameworkName == "" {
-		br.Msg = "框架名称不可为空"
-		return
-	}
-
-	frameworkOb := new(data_manage.ChartFramework)
-	item, e := frameworkOb.GetItemById(req.ChartFrameworkId)
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			br.Msg = "框架不存在, 请刷新页面"
-			return
-		}
-		br.Msg = "操作失败"
-		br.ErrMsg = "获取框架失败, Err: " + e.Error()
-		return
-	}
-
-	// 重名校验
-	{
-		ob := new(data_manage.ChartFramework)
-		cond := fmt.Sprintf(` AND %s <> ? AND %s = ?`, ob.PrimaryId(), data_manage.ChartFrameworkColumns.FrameworkName)
-		pars := make([]interface{}, 0)
-		pars = append(pars, req.FrameworkName)
-		exist, e := ob.GetItemByCondition(cond, pars)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			br.Msg = "操作失败"
-			br.ErrMsg = "获取重名框架失败, Err: " + e.Error()
-			return
-		}
-		if exist != nil {
-			br.Msg = "框架名称已存在"
-			return
-		}
-	}
-
-	now := time.Now().Local()
-	item.FrameworkName = req.FrameworkName
-	item.FrameworkImg = req.FrameworkImg
-	item.FrameworkContent = req.FrameworkContent
-	item.ModifyTime = now
-	updateCols := []string{"FrameworkName", "FrameworkImg", "FrameworkContent", "ModifyTime"}
-	nodes := make([]*data_manage.ChartFrameworkNode, 0)
-	if len(req.Nodes) > 0 {
-		for _, v := range req.Nodes {
-			if v <= 0 {
-				continue
-			}
-			t := new(data_manage.ChartFrameworkNode)
-			t.ChartFrameworkId = item.ChartFrameworkId
-			t.MyChartClassifyId = v
-			t.CreateTime = now
-		}
-	}
-	if e := item.EditFrameworkAndNodes(item, updateCols, nodes); e != nil {
-		br.Msg = "操作失败"
-		br.ErrMsg = "编辑框架及节点失败, Err: " + e.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "操作成功"
-}
-
-// Remove
-// @Title 删除框架
-// @Description 删除视频
-// @Param	request	body eta_training_video.EtaTrainingVideoRemoveReq true "type json string"
-// @Success 200 Ret=200 操作成功
-// @router /remove [post]
-//func (this *ChartFrameworkController) Remove() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		if br.ErrMsg == "" {
-//			br.IsSendEmail = false
-//		}
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//	sysUser := this.SysUser
-//	if sysUser == nil {
-//		br.Msg = "请登录"
-//		br.ErrMsg = "请登录,SysUser Is Empty"
-//		br.Ret = 408
-//		return
-//	}
-//
-//	// 参数校验
-//	var req eta_training_video.EtaTrainingVideoRemoveReq
-//	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-//		br.Msg = "参数解析异常!"
-//		br.ErrMsg = "参数解析失败,Err:" + e.Error()
-//		return
-//	}
-//	if req.VideoId <= 0 {
-//		br.Msg = "参数有误"
-//		br.ErrMsg = fmt.Sprint("参数有误, 视频ID: ", req.VideoId)
-//		return
-//	}
-//
-//	ob := new(eta_training_video.EtaTrainingVideo)
-//	item, e := ob.GetItemById(req.VideoId)
-//	if e != nil {
-//		if e.Error() == utils.ErrNoRow() {
-//			br.Ret = 200
-//			br.Success = true
-//			br.Msg = "操作成功"
-//			return
-//		}
-//		br.Msg = "操作失败"
-//		br.ErrMsg = "获取ETA培训视频失败, Err: " + e.Error()
-//		return
-//	}
-//	if e := item.Del(); e != nil {
-//		br.Msg = "操作失败"
-//		br.ErrMsg = "删除ETA培训视频失败, Err: " + e.Error()
-//		return
-//	}
-//
-//	// 移除分类、标签关联, 更新标签引用数
-//	go func() {
-//		cr := new(eta_training_video.EtaTrainingVideoClassifyRelate)
-//		_ = cr.RemoveRelateByVideoId(item.EtaTrainingVideoId)
-//
-//		tr := new(eta_training_video.EtaTrainingVideoTagRelate)
-//		_ = tr.RemoveRelateByVideoId(item.EtaTrainingVideoId)
-//
-//		t := new(eta_training_video.EtaTrainingVideoTag)
-//		_ = t.RemoveVideoTotalByVideoId(item.EtaTrainingVideoId)
-//	}()
-//
-//	// 操作日志
-//	go func() {
-//		logItem := new(eta_training_video.EtaTrainingVideoOpLog)
-//		logItem.EtaTrainingVideoId = item.EtaTrainingVideoId
-//		logItem.SysUserId = sysUser.AdminId
-//		logItem.SysRealName = sysUser.RealName
-//		logItem.OpType = eta_training_video.VideoOpTypeRemove
-//		b, e := json.Marshal(item)
-//		if e != nil {
-//			return
-//		}
-//		logItem.OpData = string(b)
-//		logItem.CreateTime = time.Now().Local()
-//		_ = logItem.Create()
-//	}()
-//
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "操作成功"
-//}

+ 504 - 0
controllers/data_manage/chart_framework.go

@@ -0,0 +1,504 @@
+package data_manage
+
+import (
+	"encoding/json"
+	"eta/eta_api/controllers"
+	"eta/eta_api/models"
+	"eta/eta_api/models/data_manage"
+	"eta/eta_api/utils"
+	"fmt"
+	"strings"
+	"time"
+)
+
+// ChartFrameworkController 图库框架
+type ChartFrameworkController struct {
+	controllers.BaseAuthController
+}
+
+// List
+// @Title 列表
+// @Description 列表
+// @Param   Visibility	query	int		false	"可见度: 0-所有(默认); 1-我的; 2-公开"
+// @Param   Keyword		query	string	false	"关键词"
+// @Success 200 Ret=200 获取成功
+// @router /list [get]
+func (this *ChartFrameworkController) List() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录,SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}
+
+// Add
+// @Title 新增框架
+// @Description 新增框架
+// @Param	request	body data_manage.ChartFrameworkAddReq true "type json string"
+// @Success 200 Ret=200 操作成功
+// @router /add [post]
+func (this *ChartFrameworkController) Add() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录,SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	// 参数校验
+	var req data_manage.ChartFrameworkAddReq
+	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+		br.Msg = "参数解析异常!"
+		br.ErrMsg = "参数解析失败,Err:" + e.Error()
+		return
+	}
+	req.FrameworkName = strings.TrimSpace(req.FrameworkName)
+	if req.FrameworkName == "" {
+		br.Msg = "框架名称不可为空"
+		return
+	}
+
+	// 重名校验
+	{
+		ob := new(data_manage.ChartFramework)
+		cond := fmt.Sprintf(` AND %s = ?`, data_manage.ChartFrameworkColumns.FrameworkName)
+		pars := make([]interface{}, 0)
+		pars = append(pars, req.FrameworkName)
+		exist, e := ob.GetItemByCondition(cond, pars)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			br.Msg = "操作失败"
+			br.ErrMsg = "获取重名框架失败, Err: " + e.Error()
+			return
+		}
+		if exist != nil {
+			br.Msg = "框架名称已存在"
+			return
+		}
+	}
+
+	now := time.Now().Local()
+	frameworkCode := utils.MD5(fmt.Sprint(now.UnixMilli()))
+	item := new(data_manage.ChartFramework)
+	item.FrameworkName = req.FrameworkName
+	item.FrameworkCode = frameworkCode
+	item.FrameworkImg = req.FrameworkImg
+	item.FrameworkContent = req.FrameworkContent
+	item.AdminId = sysUser.AdminId
+	item.AdminName = sysUser.RealName
+	item.CreateTime = now
+	item.ModifyTime = now
+	nodes := make([]*data_manage.ChartFrameworkNode, 0)
+	if len(req.Nodes) > 0 {
+		for _, v := range req.Nodes {
+			if v <= 0 {
+				continue
+			}
+			t := new(data_manage.ChartFrameworkNode)
+			t.MyChartClassifyId = v
+			t.CreateTime = now
+		}
+	}
+	if e := item.CreateFrameworkAndNodes(item, nodes); e != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "新增框架及节点失败, Err: " + e.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}
+
+// Edit
+// @Title 编辑框架
+// @Description 编辑框架
+// @Param	request	body data_manage.ChartFrameworkEditReq true "type json string"
+// @Success 200 Ret=200 操作成功
+// @router /edit [post]
+func (this *ChartFrameworkController) Edit() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录,SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	// 参数校验
+	var req data_manage.ChartFrameworkEditReq
+	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+		br.Msg = "参数解析异常!"
+		br.ErrMsg = "参数解析失败,Err:" + e.Error()
+		return
+	}
+	if req.ChartFrameworkId <= 0 {
+		br.Msg = "参数有误"
+		br.ErrMsg = fmt.Sprintf("参数有误, ChartFrameworkId: %d", req.ChartFrameworkId)
+		return
+	}
+	req.FrameworkName = strings.TrimSpace(req.FrameworkName)
+	if req.FrameworkName == "" {
+		br.Msg = "框架名称不可为空"
+		return
+	}
+
+	frameworkOb := new(data_manage.ChartFramework)
+	item, e := frameworkOb.GetItemById(req.ChartFrameworkId)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Msg = "框架不存在, 请刷新页面"
+			return
+		}
+		br.Msg = "操作失败"
+		br.ErrMsg = "获取框架失败, Err: " + e.Error()
+		return
+	}
+
+	// 重名校验
+	{
+		ob := new(data_manage.ChartFramework)
+		cond := fmt.Sprintf(` AND %s <> ? AND %s = ?`, ob.PrimaryId(), data_manage.ChartFrameworkColumns.FrameworkName)
+		pars := make([]interface{}, 0)
+		pars = append(pars, req.FrameworkName)
+		exist, e := ob.GetItemByCondition(cond, pars)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			br.Msg = "操作失败"
+			br.ErrMsg = "获取重名框架失败, Err: " + e.Error()
+			return
+		}
+		if exist != nil {
+			br.Msg = "框架名称已存在"
+			return
+		}
+	}
+
+	now := time.Now().Local()
+	item.FrameworkName = req.FrameworkName
+	item.FrameworkImg = req.FrameworkImg
+	item.FrameworkContent = req.FrameworkContent
+	item.ModifyTime = now
+	updateCols := []string{"FrameworkName", "FrameworkImg", "FrameworkContent", "ModifyTime"}
+	nodes := make([]*data_manage.ChartFrameworkNode, 0)
+	if len(req.Nodes) > 0 {
+		for _, v := range req.Nodes {
+			if v <= 0 {
+				continue
+			}
+			t := new(data_manage.ChartFrameworkNode)
+			t.ChartFrameworkId = item.ChartFrameworkId
+			t.MyChartClassifyId = v
+			t.CreateTime = now
+		}
+	}
+	if e := item.EditFrameworkAndNodes(item, updateCols, nodes); e != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "编辑框架及节点失败, Err: " + e.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}
+
+// Remove
+// @Title 删除框架
+// @Description 删除视频
+// @Param	request	body data_manage.ChartFrameworkRemoveReq true "type json string"
+// @Success 200 Ret=200 操作成功
+// @router /remove [post]
+func (this *ChartFrameworkController) Remove() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录,SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	// 参数校验
+	var req data_manage.ChartFrameworkRemoveReq
+	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+		br.Msg = "参数解析异常!"
+		br.ErrMsg = "参数解析失败,Err:" + e.Error()
+		return
+	}
+	if req.ChartFrameworkId <= 0 {
+		br.Msg = "参数有误"
+		br.ErrMsg = fmt.Sprintf("参数有误, ChartFrameworkId: %d", req.ChartFrameworkId)
+		return
+	}
+
+	ob := new(data_manage.ChartFramework)
+	item, e := ob.GetItemById(req.ChartFrameworkId)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Ret = 200
+			br.Success = true
+			br.Msg = "操作成功"
+			return
+		}
+		br.Msg = "操作失败"
+		br.ErrMsg = "获取框架失败, Err: " + e.Error()
+		return
+	}
+	if e := item.RemoveFrameworkAndNodes(req.ChartFrameworkId); e != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "删除框架失败, Err: " + e.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}
+
+// Rename
+// @Title 重命名框架
+// @Description 重命名框架
+// @Param	request	body data_manage.ChartFrameworkRenameReq true "type json string"
+// @Success 200 Ret=200 操作成功
+// @router /rename [post]
+func (this *ChartFrameworkController) Rename() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录,SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	// 参数校验
+	var req data_manage.ChartFrameworkRenameReq
+	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+		br.Msg = "参数解析异常!"
+		br.ErrMsg = "参数解析失败,Err:" + e.Error()
+		return
+	}
+	if req.ChartFrameworkId <= 0 {
+		br.Msg = "参数有误"
+		br.ErrMsg = fmt.Sprintf("参数有误, ChartFrameworkId: %d", req.ChartFrameworkId)
+		return
+	}
+	req.FrameworkName = strings.TrimSpace(req.FrameworkName)
+	if req.FrameworkName == "" {
+		br.Msg = "框架名称不可为空"
+		return
+	}
+
+	frameworkOb := new(data_manage.ChartFramework)
+	item, e := frameworkOb.GetItemById(req.ChartFrameworkId)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Msg = "框架不存在, 请刷新页面"
+			return
+		}
+		br.Msg = "操作失败"
+		br.ErrMsg = "获取框架失败, Err: " + e.Error()
+		return
+	}
+
+	// 重名校验
+	{
+		ob := new(data_manage.ChartFramework)
+		cond := fmt.Sprintf(` AND %s <> ? AND %s = ?`, ob.PrimaryId(), data_manage.ChartFrameworkColumns.FrameworkName)
+		pars := make([]interface{}, 0)
+		pars = append(pars, req.FrameworkName)
+		exist, e := ob.GetItemByCondition(cond, pars)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			br.Msg = "操作失败"
+			br.ErrMsg = "获取重名框架失败, Err: " + e.Error()
+			return
+		}
+		if exist != nil {
+			br.Msg = "框架名称已存在"
+			return
+		}
+	}
+
+	now := time.Now().Local()
+	item.FrameworkName = req.FrameworkName
+	item.ModifyTime = now
+	updateCols := []string{"FrameworkName", "ModifyTime"}
+	if e := item.Update(updateCols); e != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "框架重命名失败, Err: " + e.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}
+
+// EditPublic
+// @Title 公开/隐藏框架
+// @Description 公开/隐藏框架
+// @Param	request	body data_manage.ChartFrameworkEditPublicReq true "type json string"
+// @Success 200 Ret=200 操作成功
+// @router /edit_public [post]
+func (this *ChartFrameworkController) EditPublic() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录,SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	// 参数校验
+	var req data_manage.ChartFrameworkEditPublicReq
+	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+		br.Msg = "参数解析异常!"
+		br.ErrMsg = "参数解析失败,Err:" + e.Error()
+		return
+	}
+	if req.ChartFrameworkId <= 0 {
+		br.Msg = "参数有误"
+		br.ErrMsg = fmt.Sprintf("参数有误, ChartFrameworkId: %d", req.ChartFrameworkId)
+		return
+	}
+	if req.IsPublic != 0 && req.IsPublic != 1 {
+		br.Msg = "参数有误"
+		br.ErrMsg = fmt.Sprintf("参数有误, IsPublic: %d", req.IsPublic)
+		return
+	}
+
+	frameworkOb := new(data_manage.ChartFramework)
+	item, e := frameworkOb.GetItemById(req.ChartFrameworkId)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Msg = "框架不存在, 请刷新页面"
+			return
+		}
+		br.Msg = "操作失败"
+		br.ErrMsg = "获取框架失败, Err: " + e.Error()
+		return
+	}
+
+	now := time.Now().Local()
+	item.IsPublic = req.IsPublic
+	item.ModifyTime = now
+	updateCols := []string{"IsPublic", "ModifyTime"}
+	if e := item.Update(updateCols); e != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "更新框架是否公开失败, Err: " + e.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}
+
+// Move
+// @Title 移动排序
+// @Description 移动排序
+// @Param	request	body data_manage.ChartFrameworkMoveReq true "type json string"
+// @Success 200 Ret=200 操作成功
+// @router /move [post]
+func (this *ChartFrameworkController) Move() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录,SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	// 参数校验
+	var req data_manage.ChartFrameworkMoveReq
+	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+		br.Msg = "参数解析异常!"
+		br.ErrMsg = "参数解析失败,Err:" + e.Error()
+		return
+	}
+	if req.ChartFrameworkId <= 0 {
+		br.Msg = "参数有误"
+		br.ErrMsg = fmt.Sprintf("参数有误, ChartFrameworkId: %d", req.ChartFrameworkId)
+		return
+	}
+
+	//frameworkOb := new(data_manage.ChartFramework)
+	//item, e := frameworkOb.GetItemById(req.ChartFrameworkId)
+	//if e != nil {
+	//	if e.Error() == utils.ErrNoRow() {
+	//		br.Msg = "框架不存在, 请刷新页面"
+	//		return
+	//	}
+	//	br.Msg = "操作失败"
+	//	br.ErrMsg = "获取框架失败, Err: " + e.Error()
+	//	return
+	//}
+
+	//now := time.Now().Local()
+	//item.IsPublic = req.IsPublic
+	//item.ModifyTime = now
+	//updateCols := []string{"IsPublic", "ModifyTime"}
+	//if e := item.Update(updateCols); e != nil {
+	//	br.Msg = "操作失败"
+	//	br.ErrMsg = "更新框架是否公开失败, Err: " + e.Error()
+	//	return
+	//}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}

+ 33 - 2
models/data_manage/chart_framework.go

@@ -215,6 +215,37 @@ func (m *ChartFramework) EditFrameworkAndNodes(item *ChartFramework, updateCols
 	return
 }
 
+func (m *ChartFramework) RemoveFrameworkAndNodes(frameworkId int) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	tx, e := o.Begin()
+	if e != nil {
+		err = fmt.Errorf("orm begin err: %s", e.Error())
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = tx.Rollback()
+			return
+		}
+		_ = tx.Commit()
+	}()
+
+	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
+	_, e = tx.Raw(sql, frameworkId).Exec()
+	if e != nil {
+		err = fmt.Errorf("delete framework err: %s", e.Error())
+		return
+	}
+
+	sql = `DELETE FROM chart_framework_node WHERE chart_framework_id = ?`
+	_, e = tx.Raw(sql, frameworkId).Exec()
+	if e != nil {
+		err = fmt.Errorf("clear nodes err: %s", e.Error())
+		return
+	}
+	return
+}
+
 // ChartFrameworkAddReq 图库框架新增请求体
 type ChartFrameworkAddReq struct {
 	FrameworkName    string `description:"框架名称"`
@@ -236,8 +267,8 @@ type ChartFrameworkRemoveReq struct {
 
 // ChartFrameworkRenameReq 图库框架重命名请求体
 type ChartFrameworkRenameReq struct {
-	ChartFrameworkId int `description:"图库框架ID"`
-	FrameworkName    int `description:"框架名称"`
+	ChartFrameworkId int    `description:"图库框架ID"`
+	FrameworkName    string `description:"框架名称"`
 }
 
 // ChartFrameworkEditPublicReq 图库框架编辑公开请求体

+ 1 - 2
routers/router.go

@@ -9,7 +9,6 @@ package routers
 
 import (
 	"eta/eta_api/controllers"
-	"eta/eta_api/controllers/chart_framework"
 	"eta/eta_api/controllers/data_manage"
 	"eta/eta_api/controllers/data_manage/correlation"
 	future_good2 "eta/eta_api/controllers/data_manage/future_good"
@@ -290,7 +289,7 @@ func init() {
 		),
 		web.NSNamespace("/chart_framework",
 			web.NSInclude(
-				&chart_framework.ChartFrameworkController{},
+				&data_manage.ChartFrameworkController{},
 			),
 		),
 	)