图标新增煤炭来源

models/data_manage/edb_data_coal.go

@@ -0,0 +1,329 @@
+package data_manage
+
+import (
+	"fmt"
+	"github.com/rdlucklib/rdluck_tools/orm"
+	"hongze/hongze_chart_lib/utils"
+	"strconv"
+	"strings"
+	"time"
+)
+
+func AddEdbDataCoalBySql(sqlStr string) (err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	_, err = o.Raw(sqlStr).Exec()
+	return
+}
+
+func GetEdbDataCoalByEdbCode(edbCode string) (items []*EdbInfoSearchData, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := ` SELECT * FROM edb_data_coal WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
+	_, err = o.Raw(sql, edbCode, utils.EDB_DATA_LIMIT).QueryRows(&items)
+	return
+}
+
+func GetEdbDataCoalMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_coal WHERE edb_code=? `
+	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+	return
+}
+
+type coalSurveyData struct {
+	DataTime   string `orm:"column(data_time)" description:"日期"`
+	InputValue string `orm:"column(input_value)" description:"值"`
+}
+
+func GetCoalSurveyDataByTradeCode(condition string, pars []interface{}) (item []*coalSurveyData, err error) {
+	sql := ` SELECT  a.* FROM longzhong_survey_data AS a
+				INNER JOIN longzhong_survey_product AS b ON a.survey_product_id=b.survey_product_id
+				WHERE 1=1 `
+	o := orm.NewOrm()
+	o.Using("edb")
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` ORDER BY a.data_time DESC `
+	_, err = o.Raw(sql, pars).QueryRows(&item)
+	return
+}
+
+func GetEdbDataCoalByCode(edbCode string) (items []*EdbInfoSearchData, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := ` SELECT * FROM edb_data_coal WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
+	_, err = o.Raw(sql, edbCode, utils.EDB_DATA_LIMIT).QueryRows(&items)
+	return
+}
+
+func GetEdbDataByCoal(edbCode, startDate, endDate string) (searchItem *EdbInfoSearch, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	o.Begin()
+	defer func() {
+		if err != nil {
+			o.Rollback()
+		} else {
+			o.Commit()
+		}
+	}()
+	var condition string
+	var pars []interface{}
+
+	if edbCode != "" {
+		condition += " AND b.coal_code=? "
+		pars = append(pars, edbCode)
+	}
+
+	coalDataList, err := GetCoalSurveyDataByTradeCode(condition, pars)
+	if err != nil {
+		return
+	}
+	searchItem = new(EdbInfoSearch)
+	searchItem.EdbCode = edbCode
+	dataLen := len(coalDataList)
+
+	if dataLen > 0 {
+		var isAdd bool
+		addSql := ` INSERT INTO edb_data_coal(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+		nowStr := time.Now().Format(utils.FormatDateTime)
+		dataList := make([]*EdbInfoSearchData, 0)
+		for i := 0; i < dataLen; i++ {
+			item := coalDataList[i]
+			eDate := item.DataTime
+			sValue := item.InputValue
+			dataTime, err := time.Parse(utils.FormatDate, eDate)
+			if err != nil {
+				return nil, err
+			}
+			timestamp := dataTime.UnixNano() / 1e6
+			timeStr := fmt.Sprintf("%d", timestamp)
+			addSql += "("
+			addSql += "0," + "'" + edbCode + "'" + "," + "'" + eDate + "'" + "," + sValue + "," + "'" + nowStr + "'" +
+				"," + "'" + nowStr + "'" + "," + "0" + "," + "'" + timeStr + "'"
+			addSql += "),"
+			isAdd = true
+		}
+		if isAdd {
+			addSql = strings.TrimRight(addSql, ",")
+			err = AddEdbDataCoalBySql(addSql)
+			if err != nil {
+				utils.FileLogData.Info("AddEdbDataCoalBySql Err:%s", err.Error())
+				return
+			}
+		}
+
+		dataList, err := GetEdbDataCoalByCode(edbCode)
+		if err != nil {
+			utils.FileLogData.Info("GetEdbDataCoalByCode Err:%s", err.Error())
+			return searchItem, err
+		}
+		minDate, maxDate, err := GetEdbDataCoalMaxOrMinDate(edbCode)
+		if err != nil {
+			return searchItem, err
+		}
+		searchItem.DataList = dataList
+		searchItem.StartDate = minDate
+		searchItem.EndDate = maxDate
+	}
+	if searchItem.DataList == nil {
+		searchItem.DataList = make([]*EdbInfoSearchData, 0)
+	}
+	return
+}
+
+func ModifyEdbDataCoalStatus(edbInfoId int64, edbCode string) (err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := ` UPDATE edb_data_coal SET edb_info_id=?, status=1,modify_time=NOW() WHERE edb_code=? `
+	_, err = o.Raw(sql, edbInfoId, edbCode).Exec()
+	return
+}
+
+func GetEdbDataCoalByCodeAndDate(edbCode string, startDate string) (count int, err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := ` SELECT COUNT(1) AS count FROM edb_data_coal WHERE edb_code=? AND data_time=? `
+	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
+	return
+}
+
+func ModifyEdbDataCoal(edbInfoId int64, dataTime, value string) (err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	sql := ` UPDATE edb_data_coal SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
+	return
+}
+
+//刷新煤炭指标数据
+func RefreshEdbDataByCoal(edbInfoId int, edbCode, startDate, endDate string) (err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	o.Begin()
+	defer func() {
+		if err != nil {
+			o.Rollback()
+		} else {
+			o.Commit()
+		}
+	}()
+
+	if err != nil {
+		return
+	}
+	edbInfoIdStr := strconv.Itoa(edbInfoId)
+	//计算数据
+	var condition string
+	var pars []interface{}
+
+	if edbCode != "" {
+		condition += " AND b.coal_code=? "
+		pars = append(pars, edbCode)
+	}
+
+	if startDate != "" {
+		condition += " AND a.data_time>=? "
+		pars = append(pars, startDate)
+	}
+
+	if endDate != "" {
+		condition += " AND a.data_time<=? "
+		pars = append(pars, endDate)
+	}
+
+	coalDataList, err := GetCoalSurveyDataByTradeCode(condition, pars)
+
+	addSql := ` INSERT INTO edb_data_coal(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	var isAdd bool
+	for _, v := range coalDataList {
+		item := v
+		count, err := GetEdbDataCoalByCodeAndDate(edbCode, v.DataTime)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			return err
+		}
+		if count <= 0 {
+			nowStr := time.Now().Format(utils.FormatDateTime)
+			eDate := item.DataTime
+			sValue := item.InputValue
+			dataTime, err := time.Parse(utils.FormatDate, eDate)
+			if err != nil {
+				return err
+			}
+			timestamp := dataTime.UnixNano() / 1e6
+			timeStr := fmt.Sprintf("%d", timestamp)
+			addSql += "("
+			addSql += edbInfoIdStr + "," + "'" + edbCode + "'" + "," + "'" + eDate + "'" + "," + sValue + "," + "'" + nowStr + "'" +
+				"," + "'" + nowStr + "'" + "," + "1" + "," + "'" + timeStr + "'"
+			addSql += "),"
+			isAdd = true
+		} else {
+			err = ModifyEdbDataCoal(int64(edbInfoId), v.DataTime, v.InputValue)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		_, err = o.Raw(addSql).Exec()
+		if err != nil {
+			return err
+		}
+	}
+	return
+}
+
+//全部刷新隆众数据
+func RefreshAllEdbDataByCoal(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
+	o := orm.NewOrm()
+	o.Using("data")
+	o.Begin()
+	defer func() {
+		if err != nil {
+			o.Rollback()
+		} else {
+			o.Commit()
+		}
+	}()
+
+	if err != nil {
+		return
+	}
+	edbInfoIdStr := strconv.Itoa(edbInfoId)
+	//计算数据
+	var condition string
+	var pars []interface{}
+
+	if edbCode != "" {
+		condition += " AND b.coal_code=? "
+		pars = append(pars, edbCode)
+	}
+
+	if startDate != "" {
+		condition += " AND a.data_time>=? "
+		pars = append(pars, startDate)
+	}
+
+	if endDate != "" {
+		condition += " AND a.data_time<=? "
+		pars = append(pars, endDate)
+	}
+
+	coalDataList, err := GetCoalSurveyDataByTradeCode(condition, pars)
+
+	//获取指标所有数据
+	dataList := make([]*EdbDataBase, 0)
+	dataTableName := GetEdbDataTableName(source)
+	sql := `SELECT * FROM %s WHERE edb_info_id=? `
+	sql = fmt.Sprintf(sql, dataTableName)
+	_, err = o.Raw(sql, edbInfoId).QueryRows(&dataList)
+	if err != nil {
+		return err
+	}
+	dataMap := make(map[string]string)
+	for _, v := range dataList {
+		dataMap[v.DataTime] = v.Value
+	}
+
+	addSql := ` INSERT INTO edb_data_coal(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	var isAdd bool
+	for _, v := range coalDataList {
+		item := v
+
+		eDate := item.DataTime
+		sValue := item.InputValue
+		dataTime, err := time.Parse(utils.FormatDate, eDate)
+		if err != nil {
+			return err
+		}
+		timestamp := dataTime.UnixNano() / 1e6
+		timeStr := fmt.Sprintf("%d", timestamp)
+		saveValue := sValue
+
+		if existVal, ok := dataMap[eDate]; !ok {
+			addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, saveValue)
+			isAdd = true
+		} else {
+			if existVal != saveValue {
+				sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+				sql = fmt.Sprintf(sql, dataTableName)
+				_, err = o.Raw(sql, sValue, edbInfoId, eDate).Exec()
+				if err != nil {
+					return err
+				}
+			}
+		}
+	}
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		_, err = o.Raw(addSql).Exec()
+		if err != nil {
+			return err
+		}
+	}
+	return
+}

services/data/chart_info.go

@@ -106,6 +106,12 @@ func ChartInfoRefresh(chartInfoId int) (err error) {
 			if err != nil {
 				errmsg = "RefreshAllEdbDataByLT Err:" + err.Error()
 			}
+		}else if source == utils.DATA_SOURCE_COAL {
+			endDate := time.Now().Format(utils.FormatDate)
+			err = data_manage.RefreshEdbDataByCoal(edbInfoId, edbCode, startDate, endDate)
+			if err != nil {
+				errmsg = "RefreshEdbDataByGl Err:" + err.Error()
+			}
 		}
 
 		maxAndMinItem, err := data_manage.GetEdbInfoMaxAndMinInfo(source, edbCode)
@@ -400,6 +406,12 @@ func ChartInfoRefreshV1(chartInfoId int) (err error) {
 			if err != nil {
 				errmsg = "RefreshAllEdbDataByLT Err:" + err.Error()
 			}
+		}else if source == utils.DATA_SOURCE_COAL {
+			endDate := time.Now().Format(utils.FormatDate)
+			err = data_manage.RefreshAllEdbDataByCoal(edbInfoId, source, edbCode, startDate, endDate)
+			if err != nil {
+				errmsg = "RefreshAllEdbDataByCoal Err:" + err.Error()
+			}
 		}
 
 		maxAndMinItem, err := data_manage.GetEdbInfoMaxAndMinInfo(source, edbCode)

services/data/edb_info.go

@@ -955,6 +955,12 @@ func EdbInfoRefreshAllFromBase(edbInfoId int) (err error) {
 			if err != nil {
 				errmsg = "RefreshAllEdbDataByLT Err:" + err.Error()
 			}
+		}else if source == utils.DATA_SOURCE_COAL {
+			endDate := time.Now().Format(utils.FormatDate)
+			err = data_manage.RefreshAllEdbDataByCoal(edbInfoId, source, edbCode, startDate, endDate)
+			if err != nil {
+				errmsg = "RefreshAllEdbDataByCoal Err:" + err.Error()
+			}
 		}
 
 		maxAndMinItem, err := data_manage.GetEdbInfoMaxAndMinInfo(source, edbCode)