新增变更类型

controllers/data_stat/edb_source_stat.go

@@ -557,7 +557,7 @@ func (this *EdbSourceStatController) EdbUpdateStat() {
 			err = nil
 		}
 	}
-	list := make([]*data_stat.EdbInfoUpdateStatItem, 0)
+	list := make([]*data_stat.EdbInfoUpdateStatItemMore, 0)
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	if total == 0 {
 		resp := data_stat.GetEdbUpdateStatResp{
@@ -577,8 +577,28 @@ func (this *EdbSourceStatController) EdbUpdateStat() {
 		return
 	}
 
+	// 获取初始数据源名称
+	var edbCodeList []string
 	for _, v := range tmpList {
-		tmp := new(data_stat.EdbInfoUpdateStatItem)
+		edbCodeList = append(edbCodeList, v.EdbCode)
+	}
+	initSourceMap := make(map[string]string)
+	if len(edbCodeList) > 0 {
+		baseCond := " and index_code in (" + utils.GetOrmInReplace(len(edbCodeList)) + ")"
+		var basePars []interface{}
+		basePars = append(basePars, edbCodeList)
+		indexList, tErr := data_manage.GetMysteelChemicalIndexList(baseCond, basePars, 0, 1000)
+		if tErr != nil {
+			br.Msg = "获取初始指标信息失败"
+			br.ErrMsg = "获取初始指标信息失败,Err:" + tErr.Error()
+			return
+		}
+		for _, v := range indexList {
+			initSourceMap[v.IndexCode] = v.Source
+		}
+	}
+	for _, v := range tmpList {
+		tmp := new(data_stat.EdbInfoUpdateStatItemMore)
 		tmp.Id = v.Id
 		tmp.EdbInfoId = v.EdbInfoId
 		tmp.SourceName = v.SourceName
@@ -608,6 +628,7 @@ func (this *EdbSourceStatController) EdbUpdateStat() {
 		tmp.IsAdd = v.IsAdd
 		tmp.NeedRefresh = v.NeedRefresh
 		tmp.HasRefresh = v.HasRefresh
+		tmp.InitSourceName, _ = initSourceMap[v.EdbCode]
 		list = append(list, tmp)
 	}
 
@@ -916,7 +937,7 @@ func (this *EdbSourceStatController) EdbUpdateFailedDetailList() {
 			err = nil
 		}
 	}
-	list := make([]*data_stat.EdbInfoUpdateStatItem, 0)
+	list := make([]*data_stat.EdbInfoUpdateStatItemMore, 0)
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	if total == 0 {
 		resp := data_stat.GetEdbUpdateStatResp{
@@ -937,7 +958,7 @@ func (this *EdbSourceStatController) EdbUpdateFailedDetailList() {
 	}
 
 	for _, v := range tmpList {
-		tmp := new(data_stat.EdbInfoUpdateStatItem)
+		tmp := new(data_stat.EdbInfoUpdateStatItemMore)
 		tmp.Id = v.Id
 		tmp.EdbInfoId = v.EdbInfoId
 		tmp.SourceName = v.SourceName

models/data_stat/edb_info_update_log.go

@@ -37,6 +37,7 @@ type EdbInfoUpdateLog struct {
 	DataUpdateFailedReason string    `description:"数据未正常更新原因"`
 	DataUpdateTime         string    `description:"数据更新时间"`
 	IsSourceRefresh        int       `description:"是否为终端刷新到数据源的刷新操作：0否，1是"`
+	UpdateType             int       `description:"变更类型，0:数据明细变更，1:基础信息变更, 2:新增指标"`
 }
 
 type EdbInfoUpdateLogItem struct {
@@ -62,6 +63,7 @@ type EdbInfoUpdateLogItem struct {
 	TerminalCode          string  `description:"终端编码，用于配置在机器上"`
 	DataUpdateTime        string  `description:"最近一次数据发生变化的时间"`
 	ErDataUpdateDate      string  `description:"本次更新，数据发生变化的最早日期"`
+	UpdateType            int     `description:"变更类型，0:数据明细变更，1:基础信息变更, 2:新增指标"`
 }
 
 func AddEdbUpdateLog(item *EdbInfoUpdateLog) (lastId int64, err error) {

models/data_stat/edb_info_update_stat.go

@@ -70,8 +70,13 @@ type EdbInfoUpdateStatItem struct {
 	HasRefresh             int8    `description:"今日是否已刷新，1是，0否"`
 }
 
+type EdbInfoUpdateStatItemMore struct {
+	EdbInfoUpdateStatItem
+	InitSourceName string `description:"初始数据源"`
+}
+
 type GetEdbUpdateStatResp struct {
-	List   []*EdbInfoUpdateStatItem
+	List   []*EdbInfoUpdateStatItemMore
 	Paging *paging.PagingItem
 }