|
@@ -1388,12 +1388,6 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
- //获取该层级下最大的排序数
|
|
|
- maxSort, err := GetEdbAndClassifyMaxSort(req.ClassifyId, 0)
|
|
|
- if err != nil {
|
|
|
- err = errors.New("查询排序信息失败,Err:" + err.Error())
|
|
|
- return
|
|
|
- }
|
|
|
|
|
|
edbInfo.EdbCode = req.EdbCode
|
|
|
edbInfo.EdbName = req.EdbName
|
|
@@ -1408,7 +1402,7 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
|
|
|
edbInfo.ModifyTime = time.Now()
|
|
|
edbInfo.ServerUrl = serverUrl
|
|
|
edbInfo.TerminalCode = req.TerminalCode
|
|
|
- edbInfo.Sort = maxSort + 1
|
|
|
+ edbInfo.Sort = GetAddEdbMaxSortByClassifyId(req.ClassifyId, 0)
|
|
|
timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
|
|
|
edbInfo.UniqueCode = utils.MD5(utils.DATA_PREFIX + "_" + req.EdbCode + timestamp)
|
|
|
itemVal, err := GetEdbInfoMaxAndMinInfo(source, utils.DATA_SUB_SOURCE_EDB, req.EdbCode)
|
|
@@ -1568,29 +1562,16 @@ func TransEdbInfoDataList2SearchData(items []*EdbDataList) (list []*EdbInfoSearc
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-// getEdbMaxSortByClassifyId
|
|
|
-// @Description: 获取该分类下最大的排序
|
|
|
-// @author: Roc
|
|
|
-// @datetime 2024-07-05 09:39:46
|
|
|
-// @param classifyId int
|
|
|
-// @return sort int
|
|
|
-// @return err error
|
|
|
-func getEdbMaxSortByClassifyId(classifyId int) (sort int, err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
- sql := `SELECT Max(sort) AS sort FROM edb_info WHERE classify_id = ? `
|
|
|
- err = o.Raw(sql, classifyId).QueryRow(&sort)
|
|
|
-
|
|
|
- return
|
|
|
-}
|
|
|
-
|
|
|
-// GetEdbMaxSortByClassifyId
|
|
|
-// @Description: 获取该分类下最大的排序(忽略错误信息)
|
|
|
+// GetAddEdbMaxSortByClassifyId
|
|
|
+// @Description: 获取添加指标时,该分类下最大的排序(忽略错误信息)
|
|
|
// @author: Roc
|
|
|
// @datetime 2024-07-05 09:39:46
|
|
|
// @param classifyId int
|
|
|
+// @param classifyType uint8
|
|
|
// @return sort int
|
|
|
-func GetEdbMaxSortByClassifyId(classifyId int) (sort int) {
|
|
|
- sort, _ = getEdbMaxSortByClassifyId(classifyId)
|
|
|
+func GetAddEdbMaxSortByClassifyId(classifyId int, classifyType uint8) (sort int) {
|
|
|
+ sort, _ = GetEdbAndClassifyMaxSort(classifyId, classifyType)
|
|
|
+ sort = sort + 1
|
|
|
|
|
|
return
|
|
|
}
|