|
@@ -1081,6 +1081,20 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
|
|
|
edbType = 2 //计算指标
|
|
|
}
|
|
|
|
|
|
+ // 钢联化工需要校验下信息是否完整
|
|
|
+ if source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
|
|
|
+ indexObj := new(BaseFromMysteelChemicalIndex)
|
|
|
+ tmpItem, tmpErr := indexObj.GetIndexItem(req.EdbCode)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if tmpItem == nil || tmpItem.IndexName == `` {
|
|
|
+ err = errors.New("指标信息不全")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
edbInfo.EdbCode = req.EdbCode
|
|
|
edbInfo.EdbName = req.EdbName
|
|
|
edbInfo.EdbNameSource = req.EdbName
|
|
@@ -1094,7 +1108,7 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
|
|
|
edbInfo.ModifyTime = time.Now()
|
|
|
edbInfo.ServerUrl = serverUrl
|
|
|
timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
|
|
|
- edbInfo.UniqueCode = utils.MD5(utils.DATA_PREFIX + "_" + timestamp)
|
|
|
+ edbInfo.UniqueCode = utils.MD5(utils.DATA_PREFIX + "_" + req.EdbCode + timestamp)
|
|
|
itemVal, err := GetEdbInfoMaxAndMinInfo(source, req.EdbCode)
|
|
|
if itemVal != nil && err == nil {
|
|
|
edbInfo.MaxValue = itemVal.MaxValue
|