浏览代码

fix:UniqueCode

Roc 2 年之前
父节点
当前提交
8dbde9f7a6
共有 2 个文件被更改,包括 15 次插入9 次删除
  1. 2 8
      controllers/base_from_calculate.go
  2. 13 1
      models/base_from_adjust.go

+ 2 - 8
controllers/base_from_calculate.go

@@ -1545,14 +1545,8 @@ func (this *CalculateController) SaveAdjust() {
 		br.ErrMsg = "指标名称已存在,请重新填写"
 		return
 	}
-	//指标code生成
-	randStr := utils.GetRandDigit(4)
-	edbCode := `C` + time.Now().Format("060102") + randStr
 
-	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
-	uniqueCode := utils.MD5(utils.DATA_PREFIX + "_" + timestamp)
-
-	edbInfo, err, errMsg := models.SaveAdjustEdb(req, edbCode, uniqueCode)
+	edbInfo, err, errMsg := models.SaveAdjustEdb(req)
 	if err != nil {
 		br.Msg = errMsg
 		br.Msg = "添加指标失败,Err:" + err.Error()
@@ -1589,7 +1583,7 @@ func (this *CalculateController) SaveAdjust() {
 	}
 	resp := models.AddEdbInfoResp{
 		EdbInfoId:  edbInfo.EdbInfoId,
-		UniqueCode: uniqueCode,
+		UniqueCode: edbInfo.UniqueCode,
 	}
 	br.Ret = 200
 	br.Success = true

+ 13 - 1
models/base_from_adjust.go

@@ -5,6 +5,7 @@ import (
 	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_edb_lib/services/alarm_msg"
 	"hongze/hongze_edb_lib/utils"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -29,7 +30,7 @@ type AddAdjustEdbData struct {
 }
 
 // SaveAdjustEdb 保存数据调整指标
-func SaveAdjustEdb(req SaveAdjustEdbReq, edbCode, uniqueCode string) (edbInfo *EdbInfo, err error, errMsg string) {
+func SaveAdjustEdb(req SaveAdjustEdbReq) (edbInfo *EdbInfo, err error, errMsg string) {
 	errMsg = `添加指标失败`
 	o := orm.NewOrm()
 	to, err := o.Begin()
@@ -46,7 +47,15 @@ func SaveAdjustEdb(req SaveAdjustEdbReq, edbCode, uniqueCode string) (edbInfo *E
 		}
 	}()
 
+	var edbCode string
 	if req.EdbInfoId <= 0 {
+		//指标code生成
+		randStr := utils.GetRandDigit(4)
+		edbCode = `C` + time.Now().Format("060102") + randStr
+
+		timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
+		uniqueCode := utils.MD5(utils.DATA_PREFIX + "_" + timestamp)
+
 		edbInfo = &EdbInfo{
 			Source:          utils.DATA_SOURCE_CALCULATE_ADJUST,
 			SourceName:      "数据调整",
@@ -116,6 +125,9 @@ func SaveAdjustEdb(req SaveAdjustEdbReq, edbCode, uniqueCode string) (edbInfo *E
 			return
 		}
 
+		// 指标code
+		edbCode = edbInfo.EdbCode
+
 		// 清除数据
 		dataTableName := GetEdbDataTableName(utils.DATA_SOURCE_CALCULATE_ADJUST)
 		deleteSql := ` DELETE FROM %s WHERE edb_info_id=? `