|
@@ -196,6 +196,14 @@ func (this *TargetController) DataAdd() {
|
|
|
}
|
|
|
data.ModifyManualEdbMaxMinDate(edbdata.TradeCode)
|
|
|
_ = record.Create()
|
|
|
+
|
|
|
+ //将该指标的code加入到 “手工数据导入后刷新” 缓存
|
|
|
+ if utils.Re == nil {
|
|
|
+ err := utils.Rc.LPush(utils.CACHE_IMPORT_MANUAL_DATA, req.TradeCode)
|
|
|
+ if err != nil {
|
|
|
+ fmt.Println("CACHE_IMPORT_MANUAL_DATA LPush Err:" + err.Error())
|
|
|
+ }
|
|
|
+ }
|
|
|
}()
|
|
|
|
|
|
br.Ret = 200
|
|
@@ -329,6 +337,21 @@ func (this *TargetController) DataEdit() {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ // 数据操作完后的最大最小值/指标库更新
|
|
|
+ {
|
|
|
+ go func() {
|
|
|
+ data.ModifyManualEdbMaxMinDate(req.TradeCode)
|
|
|
+ //将该指标的code加入到 “手工数据导入后刷新” 缓存
|
|
|
+ if utils.Re == nil {
|
|
|
+ err := utils.Rc.LPush(utils.CACHE_IMPORT_MANUAL_DATA, req.TradeCode)
|
|
|
+ if err != nil {
|
|
|
+ fmt.Println("CACHE_IMPORT_MANUAL_DATA LPush Err:" + err.Error())
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }()
|
|
|
+ }
|
|
|
+
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "编辑成功"
|
|
@@ -3221,6 +3244,41 @@ func (this *TargetController) ExcelDataAdd() {
|
|
|
// 所有的指标数据map
|
|
|
edbCodeDataMap := make(map[string]map[string]string)
|
|
|
|
|
|
+ addEdbTradeMap := make(map[string]bool)
|
|
|
+ updateEdbTradeMap := make(map[string]bool)
|
|
|
+ updateDataTradeMap := make(map[string]bool)
|
|
|
+ defer func() {
|
|
|
+ addRecordList := make([]*models.EdbinfoOpRecord, 0)
|
|
|
+ for tradeCode := range addEdbTradeMap {
|
|
|
+ addRecordList = append(addRecordList, &models.EdbinfoOpRecord{
|
|
|
+ TradeCode: tradeCode,
|
|
|
+ Remark: "创建指标",
|
|
|
+ UserId: sysUser.AdminId,
|
|
|
+ UserName: sysUser.RealName,
|
|
|
+ CreateTime: time.Now(),
|
|
|
+ })
|
|
|
+ }
|
|
|
+ for tradeCode := range updateEdbTradeMap {
|
|
|
+ addRecordList = append(addRecordList, &models.EdbinfoOpRecord{
|
|
|
+ TradeCode: tradeCode,
|
|
|
+ Remark: "编辑指标",
|
|
|
+ UserId: sysUser.AdminId,
|
|
|
+ UserName: sysUser.RealName,
|
|
|
+ CreateTime: time.Now(),
|
|
|
+ })
|
|
|
+ }
|
|
|
+ for tradeCode := range updateDataTradeMap {
|
|
|
+ addRecordList = append(addRecordList, &models.EdbinfoOpRecord{
|
|
|
+ TradeCode: tradeCode,
|
|
|
+ Remark: "更新数据",
|
|
|
+ UserId: sysUser.AdminId,
|
|
|
+ UserName: sysUser.RealName,
|
|
|
+ CreateTime: time.Now(),
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ }()
|
|
|
+
|
|
|
//操作指标,新增指标及数据等
|
|
|
{
|
|
|
for i := 0; i < len(secNameList); i++ {
|
|
@@ -3291,6 +3349,9 @@ func (this *TargetController) ExcelDataAdd() {
|
|
|
tmpTarget, tmpErr := models.GetTargetBySecName(secName)
|
|
|
target = tmpTarget
|
|
|
targetMap[secName] = target
|
|
|
+
|
|
|
+ // 指标新增
|
|
|
+ addEdbTradeMap[target.TradeCode] = true
|
|
|
} else {
|
|
|
fmt.Println("导入数据 获取指标:Err:" + err.Error())
|
|
|
}
|
|
@@ -3341,6 +3402,8 @@ func (this *TargetController) ExcelDataAdd() {
|
|
|
errs = append(errs, err.Error())
|
|
|
//go utils.SendEmail(utils.APPNAME+"失败提醒", "导入数据 修改数据失败:Err:"+err.Error(), utils.EmailSendToUsers)
|
|
|
}
|
|
|
+ // 指标数据变更
|
|
|
+ updateDataTradeMap[target.TradeCode] = true
|
|
|
}
|
|
|
} else {
|
|
|
fmt.Println("删除数值")
|
|
@@ -3350,6 +3413,8 @@ func (this *TargetController) ExcelDataAdd() {
|
|
|
errs = append(errs, err.Error())
|
|
|
//go utils.SendEmail(utils.APPNAME+"失败提醒", "导入数据 修改数据失败:Err:"+err.Error(), utils.EmailSendToUsers)
|
|
|
}
|
|
|
+ // 指标数据变更
|
|
|
+ updateDataTradeMap[target.TradeCode] = true
|
|
|
}
|
|
|
|
|
|
if frequency != target.Frequency || unit != target.Unit || req.ClassifyId != target.ClassifyId {
|
|
@@ -3359,6 +3424,10 @@ func (this *TargetController) ExcelDataAdd() {
|
|
|
fmt.Println("EditEdbinfo err:", err.Error())
|
|
|
return
|
|
|
}
|
|
|
+ // 指标信息变更
|
|
|
+ if _, isAdd := addEdbTradeMap[target.TradeCode]; !isAdd {
|
|
|
+ updateEdbTradeMap[target.TradeCode] = true
|
|
|
+ }
|
|
|
}
|
|
|
} else { //数据不存在,进行新增操作
|
|
|
if target.TradeCode != "" && createDate != "" && closeVal != "" {
|
|
@@ -3372,6 +3441,8 @@ func (this *TargetController) ExcelDataAdd() {
|
|
|
|
|
|
tmpDataMap[createDate] = closeVal
|
|
|
edbCodeDataMap[target.TradeCode] = tmpDataMap
|
|
|
+ // 指标数据变更
|
|
|
+ updateDataTradeMap[target.TradeCode] = true
|
|
|
}
|
|
|
}
|
|
|
|