Merge remote-tracking branch 'origin/eta/2.0.0' into debug

# Conflicts:
#	controllers/target.go

controllers/data_manage/manual_edb.go

@@ -680,6 +680,14 @@ func (c *ManualEdbController) EditExcelData() {
 				_ = record.Create()
 			}()
 		}
+
+		//将该指标的code加入到 “手工数据导入后刷新” 缓存
+		if utils.Re == nil {
+			err := utils.Rc.LPush(utils.CACHE_IMPORT_MANUAL_DATA, manualEdbInfo.TradeCode)
+			if err != nil {
+				fmt.Println("CACHE_IMPORT_MANUAL_DATA LPush Err:" + err.Error())
+			}
+		}
 	}
 
 	br.Ret = 200

controllers/target.go

@@ -203,6 +203,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
@@ -336,13 +344,21 @@ func (this *TargetController) DataEdit() {
 			}
 		}
 	}
-	//将该指标的code加入到 “手工数据导入后刷新” 缓存
-	if utils.Re == nil {
-		err := utils.Rc.LPush(utils.CACHE_IMPORT_MANUAL_DATA, edbdata.TradeCode)
-		if err != nil {
-			fmt.Println("DataEdit CACHE_IMPORT_MANUAL_DATA LPush Err:" + err.Error())
-		}
+
+	// 数据操作完后的最大最小值/指标库更新
+	{
+		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 = "编辑成功"
@@ -3255,6 +3271,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++ {
@@ -3325,6 +3376,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())
 							}
@@ -3375,6 +3429,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("删除数值")
@@ -3384,6 +3440,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 {
@@ -3393,6 +3451,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 != "" {
@@ -3406,6 +3468,8 @@ func (this *TargetController) ExcelDataAdd() {
 
 							tmpDataMap[createDate] = closeVal
 							edbCodeDataMap[target.TradeCode] = tmpDataMap
+							// 指标数据变更
+							updateDataTradeMap[target.TradeCode] = true
 						}
 					}
 

models/target.go

@@ -338,7 +338,6 @@ func AddEdbinfo(tradeCode, secName, unit, remark, frequency, noticeTime string,
 		IsJoinEdb:  0,
 	}
 	_, err = o.Insert(edbInfo)
-
 	return
 }