钢联统计表查询更新

controllers/data_manage/edb_info.go

@@ -2067,7 +2067,7 @@ func (this *EdbInfoController) EdbInfoEdit() {
 
 	// 添加钢联指标更新日志
 	if edbInfo.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
-		go data_stat.AddEdbInfoUpdateLog(req.EdbInfoId, 1, "")
+		go data_stat.AddEdbInfoUpdateLog(req.EdbInfoId, 1, "", sysUser)
 	}
 
 	br.Ret = 200

controllers/data_stat/edb_source_stat.go

@@ -98,12 +98,34 @@ func (this *EdbSourceStatController) EditColumn() {
 		return
 	}
 
+	tmpList, err := data_stat.GetAllStatColumn()
+	if err != nil {
+		br.Msg = "获取自定义列失败"
+		br.ErrMsg = "获取自定义列失败,Err:" + err.Error()
+		return
+	}
+	isMustMap := make(map[int]data_stat.EdbInfoStatColumn)
+	if len(tmpList) > 0 {
+		for _, v := range tmpList {
+			if v.IsMust == 1 {
+				isMustMap[v.Id] = v
+			}
+		}
+	}
+
 	var list []*data_stat.EdbInfoStatColumn
 	for k, v := range req.List {
 		if v.Id == 0 {
 			br.Msg = "列序号不能为空"
 			return
 		}
+
+		if v.IsShow == 0 {
+			if exist, ok := isMustMap[v.Id]; ok {
+				br.Msg = exist.ColumnName + "为必选列！"
+				return
+			}
+		}
 		tmp := new(data_stat.EdbInfoStatColumn)
 		tmp.Id = v.Id
 		tmp.Sort = k + 1
@@ -159,8 +181,9 @@ func (this *EdbSourceStatController) EdbDeleteLog() {
 
 	startSize = paging.StartIndex(currentIndex, pageSize)
 
-	var condition string
+	condition := " and source = ?"
 	var pars []interface{}
+	pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)
 
 	if createTime != "" {
 		startT, err := time.ParseInLocation(utils.FormatDate, createTime, time.Local)
@@ -280,7 +303,7 @@ func (this *EdbSourceStatController) EdbUpdateLog() {
 
 	sortParamReq := this.GetString("SortParam", "")
 	sortType := this.GetString("SortType", "desc")
-	updateTime := this.GetString("UpdateTime", "")
+	createTime := this.GetString("CreateTime", "")
 
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
@@ -295,26 +318,27 @@ func (this *EdbSourceStatController) EdbUpdateLog() {
 
 	startSize = paging.StartIndex(currentIndex, pageSize)
 
-	var condition string
+	condition := " and source = ?"
 	var pars []interface{}
+	pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)
 
-	if updateTime != "" {
-		startT, err := time.ParseInLocation(utils.FormatDate, updateTime, time.Local)
+	if createTime != "" {
+		startT, err := time.ParseInLocation(utils.FormatDate, createTime, time.Local)
 		if err != nil {
 			br.Msg = "请求时间格式错误"
 			return
 		}
 		endT := startT.AddDate(0, 0, 1)
-		condition += " AND update_time >= ? AND update_time < ?"
-		pars = append(pars, updateTime, endT.Format(utils.FormatDate))
+		condition += " AND create_time >= ? AND create_time < ?"
+		pars = append(pars, createTime, endT.Format(utils.FormatDate))
 	}
 
 	sortStr := ``
 	sortParam := ``
 	if sortParamReq != `` {
 		switch sortParamReq {
-		case "UpdateTime":
-			sortParam = "update_time"
+		case "CreateTime":
+			sortParam = "create_time"
 		case "DataUpdateTime":
 			sortParam = "data_update_time"
 		case "ErDataUpdateDate":
@@ -379,13 +403,15 @@ func (this *EdbSourceStatController) EdbUpdateLog() {
 		tmp.EndDate = v.EndDate
 		tmp.SysUserId = v.SysUserId
 		tmp.SysUserRealName = v.SysUserRealName
+		tmp.UpdateSysUserRealName = v.UpdateSysUserRealName
+		tmp.UpdateSysUserId = v.UpdateSysUserId
 		tmp.UniqueCode = v.UniqueCode
-		tmp.UpdateTime = v.UpdateTime
+		tmp.CreateTime = v.CreateTime.Format(utils.FormatDateTime)
 		tmp.LatestDate = v.LatestDate
 		tmp.LatestValue = v.LatestValue
 		tmp.TerminalCode = v.TerminalCode
-		tmp.DataUpdateTime = v.DataUpdateTime.Format(utils.FormatDateTime)
-		tmp.ErDataUpdateDate = v.ErDataUpdateDate.Format(utils.FormatDate)
+		tmp.DataUpdateTime = v.DataUpdateTime
+		tmp.ErDataUpdateDate = v.ErDataUpdateDate
 
 		list = append(list, tmp)
 	}
@@ -421,13 +447,12 @@ func (this *EdbSourceStatController) EdbUpdateStat() {
 
 	sortParamReq := this.GetString("SortParam", "")
 	sortType := this.GetString("SortType", "desc")
-	source, _ := this.GetInt("Source")
 	terminalCode := this.GetString("TerminalCode", "")
 	sysUserId, _ := this.GetInt("SysUserId")
 	frequency := this.GetString("Frequency", "")
-	keyWord := this.GetString("KeyWord", "") //指标ID/指标名称
+	keyWord := this.GetString("KeyWord", "") //指标编码/指标名称
 
-	updateTime := this.GetString("UpdateTime", "")
+	createTime := this.GetString("CreateTime", "")
 
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
@@ -442,23 +467,20 @@ func (this *EdbSourceStatController) EdbUpdateStat() {
 
 	startSize = paging.StartIndex(currentIndex, pageSize)
 
-	var condition string
+	condition := " and source = ?"
 	var pars []interface{}
-
-	if updateTime != "" {
-		startT, err := time.ParseInLocation(utils.FormatDate, updateTime, time.Local)
+	pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)
+	if createTime != "" {
+		startT, err := time.ParseInLocation(utils.FormatDate, createTime, time.Local)
 		if err != nil {
 			br.Msg = "请求时间格式错误"
 			return
 		}
 		endT := startT.AddDate(0, 0, 1)
-		condition += " AND update_time >= ? AND update_time < ?"
-		pars = append(pars, updateTime, endT.Format(utils.FormatDate))
-	}
-	if source > 0 {
-		condition += " AND source = ?"
-		pars = append(pars, source)
+		condition += " AND create_time >= ? AND create_time < ?"
+		pars = append(pars, createTime, endT.Format(utils.FormatDate))
 	}
+
 	if terminalCode != "" {
 		condition += " AND terminal_code = ?"
 		pars = append(pars, terminalCode)
@@ -483,8 +505,8 @@ func (this *EdbSourceStatController) EdbUpdateStat() {
 	sortParam := ``
 	if sortParamReq != `` {
 		switch sortParamReq {
-		case "UpdateTime":
-			sortParam = "update_time"
+		case "CreateTime":
+			sortParam = "create_time"
 		case "DataUpdateTime":
 			sortParam = "data_update_time"
 		case "ErDataUpdateDate":
@@ -553,9 +575,9 @@ func (this *EdbSourceStatController) EdbUpdateStat() {
 		tmp.TerminalCode = v.TerminalCode
 		tmp.DataUpdateTime = v.DataUpdateTime.Format(utils.FormatDateTime)
 		tmp.ErDataUpdateDate = v.ErDataUpdateDate.Format(utils.FormatDate)
-		tmp.UpdateResult = v.UpdateResult
-		tmp.UpdateFailedReason = v.UpdateFailedReason
-		tmp.UpdateTime = v.UpdateTime
+		tmp.SourceUpdateResult = v.SourceUpdateResult
+		tmp.SourceUpdateFailedReason = v.SourceUpdateFailedReason
+		tmp.SourceUpdateTime = v.SourceUpdateTime
 		tmp.IsAdd = v.IsAdd
 		tmp.NeedRefresh = v.NeedRefresh
 		tmp.HasRefresh = v.HasRefresh
@@ -593,7 +615,7 @@ func (this *EdbSourceStatController) EdbSourceStat() {
 
 	sortParamReq := this.GetString("SortParam", "")
 	sortType := this.GetString("SortType", "desc")
-	statTime := this.GetString("StatTime", "")
+	createTime := this.GetString("CreateTime", "")
 
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
@@ -608,17 +630,19 @@ func (this *EdbSourceStatController) EdbSourceStat() {
 
 	startSize = paging.StartIndex(currentIndex, pageSize)
 
-	var condition string
+	condition := " and source = ?"
 	var pars []interface{}
+	pars = append(pars, utils.DATA_SOURCE_MYSTEEL_CHEMICAL)
 
-	if statTime != "" {
-		_, err := time.ParseInLocation(utils.FormatDate, statTime, time.Local)
+	if createTime != "" {
+		startT, err := time.ParseInLocation(utils.FormatDate, createTime, time.Local)
 		if err != nil {
 			br.Msg = "请求时间格式错误"
 			return
 		}
-		condition += " AND stat_time = ?"
-		pars = append(pars, statTime)
+		endT := startT.AddDate(0, 0, 1)
+		condition += " AND create_time >= ? AND create_time < ?"
+		pars = append(pars, createTime, endT.Format(utils.FormatDate))
 	}
 
 	sortStr := ``
@@ -627,7 +651,16 @@ func (this *EdbSourceStatController) EdbSourceStat() {
 		switch sortParamReq {
 		case "EdbNum":
 			sortParam = "edb_num"
+		case "NeedRefreshNum":
+			sortParam = "need_refresh_num"
+		case "hasRefreshNum":
+			sortParam = "has_refresh_num"
+		case "UpdateSuccessNum":
+			sortParam = "update_success_num"
+		case "UpdateFailedNum":
+			sortParam = "update_failed_num"
 		}
+
 		if sortParam == "" {
 			br.Msg = "请输入正确的排序字段"
 			return
@@ -682,7 +715,6 @@ func (this *EdbSourceStatController) EdbSourceStat() {
 		tmp.UpdateSuccessNum = v.UpdateSuccessNum
 		tmp.UpdateFailedNum = v.UpdateFailedNum
 		tmp.DataUpdateSuccessNum = v.DataUpdateSuccessNum
-		tmp.StatTime = v.StatTime
 		list = append(list, tmp)
 	}
 

models/data_stat/edb_info_stat_column.go

@@ -41,11 +41,19 @@ type EdbInfoStatColumnListReq struct {
 // GetStatColumn 获取自定义列
 func GetStatColumn(columnType int) (list []EdbInfoStatColumn, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM edb_info_stat_column WHERE type=? ORDER BY sort asc `
+	sql := `SELECT * FROM edb_info_stat_column WHERE type=? ORDER BY sort asc, id asc `
 	_, err = o.Raw(sql, columnType).QueryRows(&list)
 	return
 }
 
+// GetAllStatColumn 获取所有自定义列
+func GetAllStatColumn() (list []EdbInfoStatColumn, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT * FROM edb_info_stat_column ORDER BY sort asc, id asc  `
+	_, err = o.Raw(sql).QueryRows(&list)
+	return
+}
+
 // UpdateStatColumn 批量更新自定义列
 func UpdateStatColumn(list []*EdbInfoStatColumn) (err error) {
 	o := orm.NewOrmUsingDB("data")

models/data_stat/edb_info_update_log.go

@@ -8,54 +8,59 @@ import (
 
 // EdbInfoUpdateLog 指标更新/刷新日志列表
 type EdbInfoUpdateLog struct {
-	Id                 uint64    `orm:"column(id);pk"`
-	EdbInfoId          int       `description:"指标ID"`
-	SourceName         string    `description:"来源名称"`
-	Source             int       `description:"来源id"`
-	EdbCode            string    `description:"指标编码"`
-	EdbName            string    `description:"指标名称"`
-	EdbNameSource      string    `description:"指标名称来源"`
-	Frequency          string    `description:"频率"`
-	Unit               string    `description:"单位"`
-	StartDate          string    `description:"起始日期"`
-	EndDate            string    `description:"终止日期"`
-	SysUserId          int       `description:"创建人ID"`
-	SysUserRealName    string    `description:"创建人姓名"`
-	UniqueCode         string    `description:"指标唯一编码"`
-	EdbCreateTime      time.Time `description:"指标创建时间"`
-	EdbModifyTime      time.Time `description:"指标修改时间"`
-	CreateTime         time.Time
-	UpdateTime         time.Time `description:"刷新/修改时间"`
-	LatestDate         string    `description:"数据最新日期"`
-	LatestValue        float64   `description:"数据最新值"`
-	TerminalCode       string    `description:"终端编码，用于配置在机器上"`
-	DataUpdateTime     string    `description:"最近一次数据发生变化的时间"`
-	ErDataUpdateDate   string    `description:"本次更新，数据发生变化的最早日期"`
-	UpdateResult       int       `description:"本次刷新结果：1成功，2失败"`
-	UpdateFailedReason string    `description:"数据未正常刷新原因"`
+	Id              uint64 `orm:"column(id);pk"`
+	EdbInfoId       int    `description:"指标ID"`
+	SourceName      string `description:"来源名称"`
+	Source          int    `description:"来源id"`
+	EdbCode         string `description:"指标编码"`
+	EdbName         string `description:"指标名称"`
+	EdbNameSource   string `description:"指标名称来源"`
+	Frequency       string `description:"频率"`
+	Unit            string `description:"单位"`
+	StartDate       string `description:"起始日期"`
+	EndDate         string `description:"终止日期"`
+	SysUserId       int    `description:"创建人ID"`
+	SysUserRealName string `description:"创建人姓名"`
+
+	UniqueCode            string    `description:"指标唯一编码"`
+	EdbCreateTime         time.Time `description:"指标创建时间"`
+	EdbModifyTime         time.Time `description:"指标修改时间"`
+	CreateTime            time.Time
+	UpdateSysUserId       int    `description:"变更人ID"`
+	UpdateSysUserRealName string `description:"变更人姓名"`
+	//UpdateTime         time.Time `description:"刷新/修改时间"`
+	LatestDate         string  `description:"数据最新日期"`
+	LatestValue        float64 `description:"数据最新值"`
+	TerminalCode       string  `description:"终端编码，用于配置在机器上"`
+	DataUpdateTime     string  `description:"最近一次数据发生变化的时间"`
+	ErDataUpdateDate   string  `description:"本次更新，数据发生变化的最早日期"`
+	UpdateResult       int     `description:"本次刷新结果：1成功，2失败"`
+	UpdateFailedReason string  `description:"数据未正常刷新原因"`
 }
 
 type EdbInfoUpdateLogItem struct {
-	Id               uint64  `orm:"column(id);pk"`
-	EdbInfoId        int     `description:"指标ID"`
-	SourceName       string  `description:"来源名称"`
-	Source           int     `description:"来源id"`
-	EdbCode          string  `description:"指标编码"`
-	EdbName          string  `description:"指标名称"`
-	EdbNameSource    string  `description:"指标名称来源"`
-	Frequency        string  `description:"频率"`
-	Unit             string  `description:"单位"`
-	StartDate        string  `description:"起始日期"`
-	EndDate          string  `description:"终止日期"`
-	SysUserId        int     `description:"创建人ID"`
-	SysUserRealName  string  `description:"创建人姓名"`
-	UniqueCode       string  `description:"指标唯一编码"`
-	UpdateTime       string  `description:"刷新/修改时间"`
-	LatestDate       string  `description:"数据最新日期"`
-	LatestValue      float64 `description:"数据最新值"`
-	TerminalCode     string  `description:"终端编码，用于配置在机器上"`
-	DataUpdateTime   string  `description:"最近一次数据发生变化的时间"`
-	ErDataUpdateDate string  `description:"本次更新，数据发生变化的最早日期"`
+	Id                    uint64 `orm:"column(id);pk"`
+	EdbInfoId             int    `description:"指标ID"`
+	SourceName            string `description:"来源名称"`
+	Source                int    `description:"来源id"`
+	EdbCode               string `description:"指标编码"`
+	EdbName               string `description:"指标名称"`
+	EdbNameSource         string `description:"指标名称来源"`
+	Frequency             string `description:"频率"`
+	Unit                  string `description:"单位"`
+	StartDate             string `description:"起始日期"`
+	EndDate               string `description:"终止日期"`
+	SysUserId             int    `description:"创建人ID"`
+	SysUserRealName       string `description:"创建人姓名"`
+	UpdateSysUserId       int    `description:"变更人ID"`
+	UpdateSysUserRealName string `description:"变更人姓名"`
+	CreateTime            string
+	UniqueCode            string  `description:"指标唯一编码"`
+	LatestDate            string  `description:"数据最新日期"`
+	LatestValue           float64 `description:"数据最新值"`
+	TerminalCode          string  `description:"终端编码，用于配置在机器上"`
+	DataUpdateTime        string  `description:"最近一次数据发生变化的时间"`
+	ErDataUpdateDate      string  `description:"本次更新，数据发生变化的最早日期"`
 }
 
 func AddEdbUpdateLog(item *EdbInfoUpdateLog) (lastId int64, err error) {
@@ -78,7 +83,7 @@ func GetEdbUpdateLogByCondition(condition string, pars []interface{}, orderStr s
 	if orderStr != "" {
 		sql += orderStr
 	} else {
-		sql += ` ORDER BY update_time DESC, id DESC `
+		sql += ` ORDER BY create_time DESC, id DESC `
 	}
 
 	sql += ` LIMIT ?,? `

models/data_stat/edb_info_update_stat.go

@@ -8,67 +8,67 @@ import (
 
 // EdbInfoUpdateStat 指标更新/刷新 汇总表（数据源明细表）
 type EdbInfoUpdateStat struct {
-	Id                 uint64    `orm:"column(id);pk"`
-	EdbInfoId          int       `description:"指标ID"`
-	SourceName         string    `description:"来源名称"`
-	Source             int       `description:"来源id"`
-	EdbCode            string    `description:"指标编码"`
-	EdbName            string    `description:"指标名称"`
-	EdbNameSource      string    `description:"指标名称来源"`
-	Frequency          string    `description:"频率"`
-	Unit               string    `description:"单位"`
-	StartDate          string    `description:"起始日期"`
-	EndDate            string    `description:"终止日期"`
-	SysUserId          int       `description:"创建人ID"`
-	SysUserRealName    string    `description:"创建人姓名"`
-	UniqueCode         string    `description:"指标唯一编码"`
-	EdbCreateTime      time.Time `description:"指标创建时间"`
-	EdbModifyTime      time.Time `description:"指标修改时间"`
-	CreateTime         time.Time
-	LatestDate         string    `description:"数据最新日期"`
-	LatestValue        float64   `description:"数据最新值"`
-	TerminalCode       string    `description:"终端编码，用于配置在机器上"`
-	DataUpdateTime     time.Time `description:"最近一次数据发生变化的时间"`
-	ErDataUpdateDate   time.Time `description:"本次更新，数据发生变化的最早日期"`
-	UpdateResult       int32     `description:"本次刷新结果：1成功，2失败"`
-	UpdateFailedReason string    `description:"数据未正常刷新原因"`
-	ModifyTime         string    `description:"修改时间"`
+	Id               uint64    `orm:"column(id);pk"`
+	EdbInfoId        int       `description:"指标ID"`
+	SourceName       string    `description:"来源名称"`
+	Source           int       `description:"来源id"`
+	EdbCode          string    `description:"指标编码"`
+	EdbName          string    `description:"指标名称"`
+	EdbNameSource    string    `description:"指标名称来源"`
+	Frequency        string    `description:"频率"`
+	Unit             string    `description:"单位"`
+	StartDate        string    `description:"起始日期"`
+	EndDate          string    `description:"终止日期"`
+	SysUserId        int       `description:"创建人ID"`
+	SysUserRealName  string    `description:"创建人姓名"`
+	UniqueCode       string    `description:"指标唯一编码"`
+	EdbCreateTime    time.Time `description:"指标创建时间"`
+	EdbModifyTime    time.Time `description:"指标修改时间"`
+	CreateTime       time.Time
+	LatestDate       string    `description:"数据最新日期"`
+	LatestValue      float64   `description:"数据最新值"`
+	TerminalCode     string    `description:"终端编码，用于配置在机器上"`
+	DataUpdateTime   time.Time `description:"最近一次数据发生变化的时间"`
+	ErDataUpdateDate time.Time `description:"本次更新，数据发生变化的最早日期"`
+	/*UpdateResult       int32     `description:"本次刷新结果：1成功，2失败"`
 	UpdateTime         string    `description:"刷新/修改时间"`
-	IsAdd              int8      `description:"是否是当日新增的指标：1是，2否"`
-	NeedRefresh        int8      `description:"今日是否需要定时刷新，1需要，0不需要"` //todo 确认该字段
-	HasRefresh         int8      `description:"今日是否已刷新，1是，0否"`
+	UpdateFailedReason string    `description:"数据未正常刷新原因"`*/
+	SourceUpdateResult       int    `description:"从终端刷新到数据源的刷新结果：1成功，2失败"`
+	SourceUpdateFailedReason string `description:"从终端刷新到数据源的数据未正常刷新原因"`
+	SourceUpdateTime         string `description:"从终端刷新到数据源的 刷新时间"`
+	ModifyTime               string `description:"修改时间"`
+	IsAdd                    int8   `description:"是否是当日新增的指标：1是，2否"`
+	NeedRefresh              int8   `description:"今日是否需要定时刷新，1需要，0不需要"` //todo 确认该字段
+	HasRefresh               int8   `description:"今日是否已刷新，1是，0否"`
 }
 
 type EdbInfoUpdateStatItem struct {
-	Id                 uint64  `orm:"column(id);pk"`
-	EdbInfoId          int     `description:"指标ID"`
-	SourceName         string  `description:"来源名称"`
-	Source             int     `description:"来源id"`
-	EdbCode            string  `description:"指标编码"`
-	EdbName            string  `description:"指标名称"`
-	EdbNameSource      string  `description:"指标名称来源"`
-	Frequency          string  `description:"频率"`
-	Unit               string  `description:"单位"`
-	StartDate          string  `description:"起始日期"`
-	SysUserId          int     `description:"创建人ID"`
-	SysUserRealName    string  `description:"创建人姓名"`
-	LatestDate         string  `description:"数据最新日期"`
-	LatestValue        float64 `description:"数据最新值"`
-	TerminalCode       string  `description:"终端编码，用于配置在机器上"`
-	DataUpdateTime     string  `description:"最近一次数据发生变化的时间"`
-	ErDataUpdateDate   string  `description:"本次更新，数据发生变化的最早日期"`
-	UpdateResult       int32   `description:"本次刷新结果：1成功，2失败"`
-	UpdateFailedReason string  `description:"数据未正常刷新原因"`
-	UpdateTime         string  `description:"当日刷新/修改时间"`
-	IsAdd              int8    `description:"是否是当日新增的指标：1是，2否"`
-	NeedRefresh        int8    `description:"今日是否需要定时刷新，1需要，0不需要"` //todo 确认该字段
-	HasRefresh         int8    `description:"今日是否已刷新，1是，0否"`
-}
-
-func AddEdbUpdateStat(item *EdbInfoUpdateStat) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
-	return
+	Id               uint64  `orm:"column(id);pk"`
+	EdbInfoId        int     `description:"指标ID"`
+	SourceName       string  `description:"来源名称"`
+	Source           int     `description:"来源id"`
+	EdbCode          string  `description:"指标编码"`
+	EdbName          string  `description:"指标名称"`
+	EdbNameSource    string  `description:"指标名称来源"`
+	Frequency        string  `description:"频率"`
+	Unit             string  `description:"单位"`
+	StartDate        string  `description:"起始日期"`
+	SysUserId        int     `description:"创建人ID"`
+	SysUserRealName  string  `description:"创建人姓名"`
+	LatestDate       string  `description:"数据最新日期"`
+	LatestValue      float64 `description:"数据最新值"`
+	TerminalCode     string  `description:"终端编码，用于配置在机器上"`
+	DataUpdateTime   string  `description:"最近一次数据发生变化的时间"`
+	ErDataUpdateDate string  `description:"本次更新，数据发生变化的最早日期"`
+	/*	UpdateResult       int32   `description:"本次刷新结果：1成功，2失败"`
+		UpdateFailedReason string  `description:"数据未正常刷新原因"`
+		UpdateTime         string  `description:"当日刷新/修改时间"`*/
+	SourceUpdateResult       int    `description:"从终端刷新到数据源的刷新结果：1成功，2失败"`
+	SourceUpdateFailedReason string `description:"从终端刷新到数据源的数据未正常刷新原因"`
+	SourceUpdateTime         string `description:"从终端刷新到数据源的 刷新时间"`
+	IsAdd                    int8   `description:"是否是当日新增的指标：1是，2否"`
+	NeedRefresh              int8   `description:"今日是否需要定时刷新，1需要，0不需要"` //todo 确认该字段
+	HasRefresh               int8   `description:"今日是否已刷新，1是，0否"`
 }
 
 type GetEdbUpdateStatResp struct {

models/data_stat/edb_source_stat.go

@@ -22,13 +22,6 @@ type EdbSourceStat struct {
 	DataUpdateSuccessNum int32     `description:"今日已更新指标"`
 	CreateTime           time.Time `description:"创建时间"`
 	ModifyTime           time.Time `description:"修改时间"`
-	StatTime             string    `description:"统计汇总日期"`
-}
-
-func AddEdbSourceStat(item *EdbInfoDeleteLog) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
-	return
 }
 
 type EdbInfoSourceStatItem struct {
@@ -44,7 +37,6 @@ type EdbInfoSourceStatItem struct {
 	UpdateSuccessNum     int32  `description:"今日已刷新成功指标数"`
 	UpdateFailedNum      int32  `description:"今日已刷新失败指标数"`
 	DataUpdateSuccessNum int32  `description:"今日已更新指标"`
-	StatTime             string `description:"统计汇总日期"`
 }
 
 type GetEdbSourceStatResp struct {

services/data_stat/edb_info_stat.go

@@ -3,12 +3,13 @@ package data_stat
 import (
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/models/data_stat"
+	"eta/eta_api/models/system"
 	"fmt"
 	"time"
 )
 
 // AddEdbInfoUpdateLog 添加指标编辑/刷新日志
-func AddEdbInfoUpdateLog(edbInfoId int, updateResult int, updateFailedReason string) (err error) {
+func AddEdbInfoUpdateLog(edbInfoId int, updateResult int, updateFailedReason string, sysUser *system.Admin) (err error) {
 	var edbInfo *data_manage.EdbInfo
 	if edbInfoId > 0 {
 		// 获取指标详情
@@ -31,11 +32,12 @@ func AddEdbInfoUpdateLog(edbInfoId int, updateResult int, updateFailedReason str
 		log.EndDate = edbInfo.EndDate
 		log.SysUserId = edbInfo.SysUserId
 		log.SysUserRealName = edbInfo.SysUserRealName
+		log.UpdateSysUserId = sysUser.AdminId
+		log.UpdateSysUserRealName = sysUser.RealName
 		log.UniqueCode = edbInfo.UniqueCode
 		log.EdbCreateTime = edbInfo.CreateTime
 		log.EdbModifyTime = edbInfo.ModifyTime
 		log.CreateTime = nowTime
-		log.UpdateTime = nowTime
 		log.LatestDate = edbInfo.LatestDate
 		log.LatestValue = edbInfo.LatestValue
 		log.TerminalCode = edbInfo.TerminalCode