fix

controllers/data_manage/edb_classify.go

@@ -872,50 +872,53 @@ func (this *EdbClassifyController) ItemsV3() {
 	br.Data = resp
 }
 
-
-// @Title 新增分类
-// @Description 新增分类接口
-// @Param	request	body data_manage.AddEdbClassifyReq true "type json string"
-// @Success 200 Ret=200 保存成功
-// @router /classify/addv2 [post]
-func (this *EdbClassifyController) AddEdbClassifyV2() {
+// EdbClassifyMoveV2
+// @Title 分类移动接口v2
+// @Description 分类移动接口v2
+// @Success 200 {object} data_manage.MoveEdbClassifyReq
+// @router /edb_classify/move/v2 [post]
+func (this *EdbClassifyController) EdbClassifyMoveV2() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	var req data_manage.AddEdbClassifyReqV2
+
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	var req data_manage.MoveEdbClassifyReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-	if req.ClassifyName == "" {
-		br.Msg = "请输入分类名称"
-		br.IsSendEmail = false
-		return
-	}
-	if req.ParentId < 0 {
+
+	if req.ClassifyId <= 0 {
 		br.Msg = "参数错误"
-		br.IsSendEmail = false
+		br.ErrMsg = "分类id小于等于0"
 		return
 	}
 
-	//添加指标
-	_, err, errMsg := data.AddEdbClassifyV2(req.ClassifyName, req.ParentId, req.Level, 0, this.SysUser.AdminId, this.SysUser.AdminName)
+	err, errMsg := data.MoveEdbClassify(req.ClassifyId, req.ParentClassifyId, req.PrevClassifyId, req.NextClassifyId)
 	if errMsg != `` {
 		br.Msg = errMsg
 		br.ErrMsg = errMsg
 		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
+			br.ErrMsg = err.Error()
 		} else {
 			br.IsSendEmail = false
 		}
 		return
 	}
+
 	br.Ret = 200
-	br.Msg = "保存成功"
 	br.Success = true
-	br.IsAddLog = true
+	br.Msg = "移动成功"
 }

routers/commentsRouter.go

@@ -1564,15 +1564,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hz_eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers/data_manage:EdbClassifyController"],
-        beego.ControllerComments{
-            Method: "AddEdbClassifyV2",
-            Router: `/classify/addv2`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hz_eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers/data_manage:EdbClassifyController"],
         beego.ControllerComments{
             Method: "DeleteEdbClassify",
@@ -1654,6 +1645,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers/data_manage:EdbClassifyController"],
+        beego.ControllerComments{
+            Method: "EdbClassifyMoveV2",
+            Router: `/edb_classify/move/v2`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers/data_manage:EdbClassifyController"],
         beego.ControllerComments{
             Method: "AddMysteelChemical",

services/data/edb_classify.go

@@ -551,39 +551,3 @@ func GetPredictEdbClassifyOpButton(sysUser *system.Admin, belongUserId int) (but
 	}
 	return
 }
-
-// AddEdbClassifyV2 添加指标分类
-func AddEdbClassifyV2(classifyName string, parentId, level int, classifyType uint8, sysUserId int, sysUserName string) (classifyInfo *data_manage.EdbClassify, err error, errMsg string) {
-	count, err := data_manage.GetEdbClassifyCount(classifyName, parentId, classifyType)
-	if err != nil {
-		errMsg = `判断名称是否已存在失败`
-		return
-	}
-	if count > 0 {
-		errMsg = `分类名称已存在，请重新输入`
-		return
-	}
-	//获取该层级下最大的排序数
-	maxSort, err := data_manage.GetEdbClassifyMaxSortV2(parentId, classifyType)
-
-	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
-	classifyInfo = &data_manage.EdbClassify{
-		//ClassifyId:      0,
-		ClassifyType:    classifyType,
-		ClassifyName:    classifyName,
-		ParentId:        parentId,
-		HasData:         0,
-		CreateTime:      time.Now(),
-		ModifyTime:      time.Now(),
-		SysUserId:       sysUserId,
-		SysUserRealName: sysUserName,
-		Level:           level + 1,
-		UniqueCode:      utils.MD5(utils.DATA_PREFIX + "_" + timestamp),
-		Sort:            maxSort,
-	}
-	_, err = data_manage.AddEdbClassify(classifyInfo)
-	if err != nil {
-		errMsg = "保存分类失败"
-	}
-	return
-}