|
@@ -6,6 +6,7 @@ import (
|
|
"eta/eta_index_lib/services/alarm_msg"
|
|
"eta/eta_index_lib/services/alarm_msg"
|
|
"eta/eta_index_lib/utils"
|
|
"eta/eta_index_lib/utils"
|
|
"fmt"
|
|
"fmt"
|
|
|
|
+ "strconv"
|
|
"strings"
|
|
"strings"
|
|
"time"
|
|
"time"
|
|
)
|
|
)
|
|
@@ -230,9 +231,23 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData, terminalCode string, c
|
|
dataItem.ModifyTime = time.Now()
|
|
dataItem.ModifyTime = time.Now()
|
|
dataItem.DataTimestamp = timestamp
|
|
dataItem.DataTimestamp = timestamp
|
|
addDataList = append(addDataList, dataItem)
|
|
addDataList = append(addDataList, dataItem)
|
|
|
|
+ if len(addDataList) > 500 {
|
|
|
|
+ err = dataObj.AddMulti(addDataList)
|
|
|
|
+ if err != nil {
|
|
|
|
+ err = fmt.Errorf("批量新增指标失败 Err:%s", err)
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ addDataList = make([]*models.BaseFromYongyiData, 0)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
if findData != nil && findData.Value != value && !strings.Contains(value, "#N/A") { //修改数据
|
|
if findData != nil && findData.Value != value && !strings.Contains(value, "#N/A") { //修改数据
|
|
|
|
+ // 过滤0.50和0.5的比较
|
|
|
|
+ oldV, _ := strconv.ParseFloat(findData.Value, 64)
|
|
|
|
+ newV, _ := strconv.ParseFloat(value, 64)
|
|
|
|
+ if oldV == newV {
|
|
|
|
+ continue
|
|
|
|
+ }
|
|
dataObj.YongyiDataId = findData.YongyiDataId
|
|
dataObj.YongyiDataId = findData.YongyiDataId
|
|
dataObj.Value = value
|
|
dataObj.Value = value
|
|
dataObj.ModifyTime = time.Now()
|
|
dataObj.ModifyTime = time.Now()
|