fix:分类移动和排序

controllers/edb_monitor/edb_monitor_classify.go

@@ -200,9 +200,9 @@ func (c *EdbMonitorClassifyController) Delete() {
 	br.Success = true
 }
 
-// ChartClassifyMove
-// @Title 图表分类移动接口
-// @Description 图表分类移动接口
+// Move
+// @Title 预警分类移动接口
+// @Description 预警分类移动接口
 // @Param   request body request.MoveEdbMonitorClassifyReq  true  "每页数据条数"
 // @router /classify/move [post]
 func (c *EdbMonitorClassifyController) Move() {

models/edb_monitor/edb_monitor_classify.go

@@ -69,7 +69,7 @@ func DeleteEdbMonitorClassifyByIdList(ids []int) (err error) {
 
 func GetEdbMonitorClassifyList() (items []*EdbMonitorClassify, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := "SELECT * FROM edb_monitor_classify"
+	sql := "SELECT * FROM edb_monitor_classify ORDER BY sort ASC"
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -122,7 +122,7 @@ func GetEdbMonitorClassifyCountByIdList(ids []int) (count int, err error) {
 // GetEdbMonitorClassifyByParentIdAndName 根据父级ID和名称获取分类
 func GetEdbMonitorClassifyByParentIdAndName(parentId int, classifyName string, classifyId int) (item *EdbMonitorClassify, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM chart_classify WHERE parent_id = ? AND classify_name = ? AND classify_id <> ? LIMIT 1`
+	sql := `SELECT * FROM edb_monitor_classify WHERE parent_id = ? AND classify_name = ? AND classify_id <> ? LIMIT 1`
 	err = o.Raw(sql, parentId, classifyName, classifyId).QueryRow(&item)
 	return
 }

services/edb_monitor/edb_monitor_classify.go

@@ -201,6 +201,7 @@ func MoveEdbMonitorClassify(req request.MoveEdbMonitorClassifyReq) (msg string,
 
 	classifyInfo, er := edbmonitor.GetEdbMonitorClassifyById(req.ClassifyId)
 	if er != nil {
+		err = er
 		if er.Error() == utils.ErrNoRow() {
 			msg = "分类不存在，请刷新页面"
 			return
@@ -213,6 +214,7 @@ func MoveEdbMonitorClassify(req request.MoveEdbMonitorClassifyReq) (msg string,
 	exists, er := edbmonitor.GetEdbMonitorClassifyByParentIdAndName(req.ParentClassifyId, classifyInfo.ClassifyName, req.ClassifyId)
 	if er != nil && er.Error() != utils.ErrNoRow() {
 		msg = "移动失败"
+		err = er
 		return
 	}
 	if exists != nil {
@@ -228,6 +230,7 @@ func MoveEdbMonitorClassify(req request.MoveEdbMonitorClassifyReq) (msg string,
 	if classifyInfo.ParentId != req.ParentClassifyId && req.ParentClassifyId != 0 {
 		parentClassify, er := edbmonitor.GetEdbMonitorClassifyById(req.ParentClassifyId)
 		if er != nil {
+			err = er
 			if er.Error() == utils.ErrNoRow() {
 				msg = "父级分类不存在，请刷新页面"
 				return