Merge branch 'debug' of http://8.136.199.33:3000/eta_server/eta_chart_lib into bzq/bug_6744_chart_save_cf

controllers/chart.go

@@ -147,7 +147,6 @@ func (this *ChartController) ChartInfoDetail() {
 	if conf[models.BusinessConfWatermarkChart] == "true" && conf[models.BusinessConfCompanyWatermark] != "" {
 		resp.WaterMark = conf[models.BusinessConfCompanyWatermark]
 	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -505,6 +504,12 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *models.ChartInfo, key string) (
 	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
 	chartInfo.ChartSourceEn = strings.Join(sourceNameEnList, ",")
 
+	// 单位
+	if chartType == utils.CHART_TYPE_BAR && len(yDataList) > 0 {
+		chartInfo.Unit = yDataList[0].Unit
+		chartInfo.UnitEn = yDataList[0].UnitEn
+	}
+
 	resp.ChartInfo = chartInfo
 	resp.EdbInfoList = edbList
 	resp.XEdbIdValue = xEdbIdValue

controllers/chart_common.go

@@ -265,6 +265,29 @@ func GetFutureGoodChartInfoDetailFromUniqueCode(chartInfo *models.ChartInfo, key
 				}
 			}
 		}
+		if v.Source == 0 {
+			name := strings.Split(v.EdbName, "(")
+			if barConfig.FutureGoodEdbName != "" {
+				name[0] = barConfig.FutureGoodEdbName
+			}
+			v.EdbName = name[0]
+			if len(name) > 1 {
+				v.EdbName = v.EdbName + "(" + name[1]
+			}
+			//英文
+			// 编译正则表达式，匹配一个或多个数字
+
+			if v.EdbNameEn != "" {
+				name = strings.Split(v.EdbNameEn, "(")
+				if barConfig.FutureGoodEdbNameEn != "" {
+					name[0] = barConfig.FutureGoodEdbNameEn
+				}
+				v.EdbNameEn = name[0]
+				if len(name) > 1 {
+					v.EdbNameEn = v.EdbNameEn + "(" + name[1]
+				}
+			}
+		}
 	}
 	chartInfo.UnitEn = baseEdbInfo.UnitEn
 

controllers/excel_info.go

@@ -177,6 +177,49 @@ func (this *ExcelInfoController) GetTableDetail() {
 		}
 		resp.ExcelSource = strings.Join(sourceNameList, ",")
 		resp.ExcelSourceEn = strings.Join(sourceNameEnList, ",")
+	case utils.BALANCE_TABLE:
+		var result request.MixedTableReq
+		err = json.Unmarshal([]byte(excelInfo.Content), &result)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "表格json转结构体失败，Err:" + err.Error()
+			return
+		}
+		newResult, tmpErr, tmpErrMsg := excel2.GetMixedTableCellData(result, this.Lang)
+		if tmpErr != nil {
+			br.Msg = "获取失败"
+			if tmpErrMsg != `` {
+				br.Msg = tmpErrMsg
+			}
+			br.ErrMsg = "获取最新的数据失败，Err:" + tmpErr.Error()
+			return
+		}
+		tableData, err = excel.GetTableDataByMixedTableData(newResult, true)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "转换成table失败，Err:" + err.Error()
+			return
+		}
+		edbInfoIds := make([]int, 0)
+		edbInfoIdExist := make(map[int]bool)
+		if len(newResult) > 0 {
+			for _, t := range newResult {
+				for _, v := range t {
+					if v.EdbInfoId > 0 && !edbInfoIdExist[v.EdbInfoId] {
+						edbInfoIdExist[v.EdbInfoId] = true
+						edbInfoIds = append(edbInfoIds, v.EdbInfoId)
+					}
+				}
+			}
+		}
+		sourceNameList, sourceNameEnList, err := data.GetEdbSourceByEdbInfoIdListForExcel(edbInfoIds)
+		if err != nil {
+			br.Msg = "自定义表格数据获取失败"
+			br.ErrMsg = "自定义表格数据获取失败,Err:" + err.Error()
+			return
+		}
+		resp.ExcelSource = strings.Join(sourceNameList, ",")
+		resp.ExcelSourceEn = strings.Join(sourceNameEnList, ",")
 	}
 
 	tableData = excel.HandleTableCell(tableData)
@@ -229,48 +272,6 @@ func (this *ExcelInfoController) GetTableDetail() {
 	br.Data = resp
 }
 
-func refreshBalanceTable(excelDetail *excel3.ExcelInfo, lang string) (err error) {
-
-	edbInfoIds := make([]int, 0)
-	edbInfoIdExist := make(map[int]bool)
-	var result request.MixedTableReq
-	err = json.Unmarshal([]byte(excelDetail.Content), &result)
-	if err != nil {
-		err = fmt.Errorf("表格json转结构体失败，Err:" + err.Error())
-		return
-	}
-	newData, tmpErr, _ := excel2.GetMixedTableCellData(result, lang)
-	if tmpErr != nil {
-		err = tmpErr
-		return
-	}
-	if len(newData) > 0 {
-		for _, t := range newData {
-			for _, v := range t {
-				if v.EdbInfoId > 0 && !edbInfoIdExist[v.EdbInfoId] {
-					edbInfoIdExist[v.EdbInfoId] = true
-					edbInfoIds = append(edbInfoIds, v.EdbInfoId)
-				}
-			}
-		}
-	}
-
-	// 清除缓存
-	key := utils.HZ_CHART_LIB_EXCEL_TABLE_DETAIL + ":" + excelDetail.UniqueCode
-	if utils.Re == nil {
-		_ = utils.Rc.Delete(key)
-	}
-
-	if len(edbInfoIds) > 0 {
-		err, _ = data.EdbInfoRefreshAllFromBase(edbInfoIds, false)
-		if err != nil {
-			err = fmt.Errorf("刷新混合表格数据失败, Err: " + err.Error())
-			return
-		}
-	}
-	return
-}
-
 // Refresh
 // @Title 刷新
 // @Description 刷新接口
@@ -386,3 +387,45 @@ func (this *ExcelInfoController) Refresh() {
 	br.Success = true
 	br.Msg = "刷新成功"
 }
+
+func refreshBalanceTable(excelDetail *excel3.ExcelInfo, lang string) (err error) {
+
+	edbInfoIds := make([]int, 0)
+	edbInfoIdExist := make(map[int]bool)
+	var result request.MixedTableReq
+	err = json.Unmarshal([]byte(excelDetail.Content), &result)
+	if err != nil {
+		err = fmt.Errorf("表格json转结构体失败，Err:" + err.Error())
+		return
+	}
+	newData, tmpErr, _ := excel2.GetMixedTableCellData(result, lang)
+	if tmpErr != nil {
+		err = tmpErr
+		return
+	}
+	if len(newData) > 0 {
+		for _, t := range newData {
+			for _, v := range t {
+				if v.EdbInfoId > 0 && !edbInfoIdExist[v.EdbInfoId] {
+					edbInfoIdExist[v.EdbInfoId] = true
+					edbInfoIds = append(edbInfoIds, v.EdbInfoId)
+				}
+			}
+		}
+	}
+
+	// 清除缓存
+	key := utils.HZ_CHART_LIB_EXCEL_TABLE_DETAIL + ":" + excelDetail.UniqueCode
+	if utils.Re == nil {
+		_ = utils.Rc.Delete(key)
+	}
+
+	if len(edbInfoIds) > 0 {
+		err, _ = data.EdbInfoRefreshAllFromBase(edbInfoIds, false)
+		if err != nil {
+			err = fmt.Errorf("刷新混合表格数据失败, Err: " + err.Error())
+			return
+		}
+	}
+	return
+}

models/chart.go

@@ -45,8 +45,8 @@ type ChartInfo struct {
 	Right2Max         string    `description:"图表右侧2最大值"`
 	MinMaxSave        int       `description:"是否手动保存过上下限：0-否；1-是"`
 	Source            int       `description:"1：ETA图库；2：商品价格曲线"`
-	Unit              string    `description:"中文单位名称"`
-	UnitEn            string    `description:"英文单位名称"`
+	UnitEn            string    `description:"英文图表单位"`
+	Unit              string    `description:"图表单位"`
 	ExtraConfig       string    `description:"图表额外配置,json数据" json:"-"`
 	ChartSource       string    `description:"图表来源str"`
 	ChartSourceEn     string    `description:"图表来源（英文）"`
@@ -311,6 +311,8 @@ type YData struct {
 	M              []int           `description:"对应开始日期的间隔值" json:"-"`
 	NameList       []string        `description:"每个值对应的名称"`
 	EnNameList     []string        `description:"每个值对应的英文名称"`
+	Unit           string          `description:"中文单位名称"`
+	UnitEn         string          `description:"英文单位名称"`
 	SeriesEdb      struct {
 		SeriesId  int `description:"因子指标系列ID"`
 		EdbInfoId int `description:"指标ID"`

models/data_manage/chart_info.go

@@ -62,13 +62,17 @@ type BarChartInfoReq struct {
 	EdbInfoIdList []BarChartInfoEdbItemReq `description:"指标信息"`
 	DateList      []BarChartInfoDateReq    `description:"日期配置"`
 	Sort          BarChartInfoSortReq      `description:"排序"`
+	Unit          string                   `description:"中文单位名称"`
+	UnitEn        string                   `description:"英文单位名称"`
 }
 
 type FutureGoodBarChartInfoReq struct {
-	EdbInfoIdList []BarChartInfoEdbItemReq `description:"指标信息"`
-	DateList      []BarChartInfoDateReq    `description:"日期配置"`
-	XDataList     []XData                  `description:"横轴配置"`
-	BaseEdbInfoId int                      `description:"日期基准指标id"`
+	EdbInfoIdList       []BarChartInfoEdbItemReq `description:"指标信息"`
+	DateList            []BarChartInfoDateReq    `description:"日期配置"`
+	XDataList           []XData                  `description:"横轴配置"`
+	BaseEdbInfoId       int                      `description:"日期基准指标id"`
+	FutureGoodEdbName   string                   `description:"期货名称"`
+	FutureGoodEdbNameEn string                   `description:"期货英文名称"`
 }
 
 // XData 商品价格曲线的的x轴数据

models/request/mixed_table.go

@@ -167,7 +167,6 @@ type MixCellShowStyle struct {
 	Last            string      `description:"起始操作：nt|decimal" json:"last"`
 	Color           string      `description:"颜色值，#RRG" json:"color"`
 	BackgroundColor string      `description:"背景颜色值，#RRG" json:"background-color"`
-	Width           float64     `description:"单元格宽度" json:"width"`
 	Align           string      `description:"对齐方式：left|center|right" json:"align"`
 }
 

services/data/chart_info.go

@@ -326,6 +326,12 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 				}
 			}
 		}
+
+		for k := range yDataList {
+			yDataList[k].Unit = barChartConf.Unit
+			yDataList[k].UnitEn = barChartConf.UnitEn
+		}
+
 	case 10: // 截面散点图
 		sectionScatterConf := extraConfig.(data_manage.SectionScatterReq)
 		xEdbIdValue, dataResp, err = GetSectionScatterChartData(mappingList, edbDataListMap, sectionScatterConf)

services/data/correlation/chart_info.go

@@ -277,6 +277,8 @@ func GetChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *models.ChartEdbInfo
 				return
 			}
 			changeDataList = tmpNewChangeDataList
+
+			// 那么A指标不管是高频，或者同频，那么就直接赋值A指标吧
 			baseDataList = aDataList
 			for _, v := range baseDataList {
 				baseDataMap[v.DataTime] = v.Value

services/data/future_good/base_future_good_lib.go

@@ -31,9 +31,9 @@ func RefreshEdbData(futureGoodEdbInfoId int, futureGoodEdbCode, startDate string
 }
 
 // RefreshEdbRelation 刷新商品期货指标相关的数据
-func RefreshEdbRelation(futureGoodEdbInfoId int) (resp *models.BaseResponse, err error) {
+func RefreshEdbRelation(chartInfoId int) (resp *models.BaseResponse, err error) {
 	param := make(map[string]interface{})
-	param["FutureGoodEdbInfoId"] = futureGoodEdbInfoId
+	param["ChartInfoId"] = chartInfoId
 	urlStr := `future_good/relation/refresh`
 	resp, err = postRefreshEdbData(param, urlStr)
 	return

services/data/future_good/chart_info.go

@@ -1072,5 +1072,13 @@ func FutureGoodChartInfoRefresh(chartInfoId int) (err error) {
 		return
 	}
 
+	resp, err := RefreshEdbRelation(chartInfoId)
+	if err != nil {
+		return
+	}
+	if resp.Ret != 200 {
+		err = fmt.Errorf("刷新利润曲线图表数据失败:Err:%s", resp.Msg)
+		return
+	}
 	return
 }

services/data/future_good/future_edb_info.go

@@ -53,13 +53,5 @@ func FutureGoodEdbInfoRefreshAllFromBase(futureGoodEdbInfoList []*future_good.Fu
 			return fmt.Errorf("刷新失败, err:%s", errMsg)
 		}
 	}
-
-	// 刷新商品期货指标相关的数据
-	for _, bv := range futureGoodEdbInfoList {
-		if bv.ParentId == 0 {
-			RefreshEdbRelation(bv.FutureGoodEdbInfoId)
-		}
-	}
-
 	return err
 }

services/dw_mini/dw_mini.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"eta/eta_chart_lib/models"
+	"eta/eta_chart_lib/services/alarm_msg"
 	"eta/eta_chart_lib/utils"
 )
 
@@ -67,6 +68,7 @@ func MyChartCollect(token, uniqueCode, chartName, chartImage string, chartInfoId
 	if err != nil {
 		return
 	}
+	alarm_msg.SendAlarmMsg(string(reqBody), 1)
 	if err = json.Unmarshal(result, &resp); err != nil {
 		return
 	}

services/excel/lucky_sheet.go

@@ -462,23 +462,21 @@ func handleTableDataList(tableDataList [][]LuckySheetDataValue, luckySheetDataCo
 		flag = false
 		//尾部
 		deleteBottomRowIndexList := make([]int, 0)
-		if len(tableDataList) > 1 {
-			for rowIndex := lenRow - 1; rowIndex >= 0; rowIndex-- {
-				isDelete := true
-				for _, v := range tableDataList[rowIndex] {
-					if v.Monitor != `` {
-						isDelete = false
-						flag = true
-						break
-					}
-				}
-				if flag {
+		for rowIndex := lenRow - 1; rowIndex > removeTopRow; rowIndex-- {
+			isDelete := true
+			for _, v := range tableDataList[rowIndex] {
+				if v.Monitor != `` {
+					isDelete = false
+					flag = true
 					break
 				}
-				if isDelete {
-					deleteBottomRowIndexList = append(deleteBottomRowIndexList, rowIndex)
-					removeBottomRow++
-				}
+			}
+			if flag {
+				break
+			}
+			if isDelete {
+				deleteBottomRowIndexList = append(deleteBottomRowIndexList, rowIndex)
+				removeBottomRow++
 			}
 		}
 
@@ -530,28 +528,26 @@ func handleTableDataList(tableDataList [][]LuckySheetDataValue, luckySheetDataCo
 		flag = false
 		//右边
 		deleteTailColumnIndexList := make([]int, 0)
-		// 数据要大于1列才会处理
-		if lenColumn > 1 {
-			for columnIndex := lenColumn - 1; columnIndex >= 0; columnIndex-- {
-				isDelete := true
-				for _, v := range tableDataList {
-					//如果一列都没有，说明是上面几行是空行，没有数据
-					if len(v) <= 0 {
-						continue
-					}
-					if v[columnIndex].Monitor != `` || (v[columnIndex].MergeCell.Column != columnIndex && v[columnIndex].MergeCell.Column != 0) {
-						isDelete = false
-						flag = true
-						break
-					}
+		// 数据第1列不处理
+		for columnIndex := lenColumn - 1; columnIndex > removeLeftColumn; columnIndex-- {
+			isDelete := true
+			for _, v := range tableDataList {
+				//如果一列都没有，说明是上面几行是空行，没有数据
+				if len(v) <= 0 {
+					continue
 				}
-				if flag {
+				if v[columnIndex].Monitor != `` || (v[columnIndex].MergeCell.Column != columnIndex && v[columnIndex].MergeCell.Column != 0) {
+					isDelete = false
+					flag = true
 					break
 				}
-				if isDelete {
-					deleteTailColumnIndexList = append(deleteTailColumnIndexList, columnIndex)
-					removeRightColumn++
-				}
+			}
+			if flag {
+				break
+			}
+			if isDelete {
+				deleteTailColumnIndexList = append(deleteTailColumnIndexList, columnIndex)
+				removeRightColumn++
 			}
 		}
 

utils/common.go

@@ -4,8 +4,10 @@ import (
 	"bufio"
 	"crypto/cipher"
 	"crypto/des"
+	"crypto/hmac"
 	"crypto/md5"
 	"crypto/sha1"
+	"crypto/sha256"
 	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
@@ -22,6 +24,7 @@ import (
 	"os/exec"
 	"path"
 	"regexp"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -1173,6 +1176,48 @@ func DateConvMysqlConvMongo(dateCon string) string {
 	return cond
 }
 
+// HmacSha256 计算HmacSha256
+// key 是加密所使用的key
+// data 是加密的内容
+func HmacSha256(key string, data string) []byte {
+	mac := hmac.New(sha256.New, []byte(key))
+	_, _ = mac.Write([]byte(data))
+	return mac.Sum(nil)
+}
+
+// HmacSha256ToBase64 将加密后的二进制转Base64字符串
+func HmacSha256ToBase64(key string, data string) string {
+	return base64.URLEncoding.EncodeToString(HmacSha256(key, data))
+}
+func GetSign(nonce, timestamp, appId, secret string) (sign string) {
+	signStrMap := map[string]string{
+		"nonce":     nonce,
+		"timestamp": timestamp,
+		"appid":     appId,
+	}
+	keys := make([]string, 0, len(signStrMap))
+	for k := range signStrMap {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	var signStr string
+	for _, k := range keys {
+		signStr += k + "=" + signStrMap[k] + "&"
+	}
+	signStr = strings.Trim(signStr, "&")
+	fmt.Println("signStr:" + signStr)
+	sign = HmacSha256ToBase64(secret, signStr)
+	return
+}
+
+func TimeTransferString(format string, t time.Time) string {
+	str := t.Format(format)
+	if t.IsZero() {
+		return ""
+	}
+	return str
+}
+
 func DesBase64Decrypt(crypted []byte, desKey string) []byte {
 	result, _ := base64.StdEncoding.DecodeString(string(crypted))
 	remain := len(result) % 8
@@ -1211,14 +1256,6 @@ func PKCS5UnPadding(origData []byte) []byte {
 	return origData[:(length - unpadding)]
 }
 
-func TimeTransferString(format string, t time.Time) string {
-	str := t.Format(format)
-	if t.IsZero() {
-		return ""
-	}
-	return str
-}
-
 // handleSystemAppointDateT
 // @Description: 处理系统日期相关的指定频率（所在周/旬/月/季/半年/年的最后/最早一天）
 // @author: Roc

utils/constants.go

@@ -56,7 +56,7 @@ const (
 	DATA_SOURCE_PREDICT_CALCULATE                               //预测指标运算->31
 	DATA_SOURCE_PREDICT_CALCULATE_TBZ                           //预测指标同比值->32
 	DATA_SOURCE_PREDICT_CALCULATE_TCZ                           //预测指标同差值->33
-	DATA_SOURCE_MYSTEEL_CHEMICAL                                //钢联化工->34
+	DATA_SOURCE_MYSTEEL_CHEMICAL                                //上海钢联->34
 	DATA_SOURCE_CALCULATE_CJJX                                  //超季节性->35
 	DATA_SOURCE_EIA_STEO                                        //eia steo报告->36
 	DATA_SOURCE_CALCULATE_NHCC                                  //计算指标（拟合残差）->37
@@ -144,7 +144,7 @@ const (
 	CHART_SOURCE_RANGE_ANALYSIS                  = 12 // 	区间分析图表
 )
 
-// 图表来源
+// 图表查询来源
 const (
 	CHART_SOURCE_DW = 1 // 东吴
 )
@@ -155,6 +155,7 @@ const (
 	TIME_TABLE            = 2 // 时间序列表格
 	MIXED_TABLE           = 3 // 混合表格
 	CUSTOM_ANALYSIS_TABLE = 4 // 自定义分析表格
+	BALANCE_TABLE         = 5 // 平衡表
 )
 
 // 图表样式类型