Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_edb_lib

controllers/base_from_calculate.go

@@ -1525,7 +1525,7 @@ func (this *CalculateController) Refresh() {
 			br.Msg = "获取数据失败"
 			br.ErrMsg = "python代码获取数据失败，err:" + err.Error()
 			if errMsg != "" {
-				br.ErrMsg = errMsg
+				br.Msg = errMsg
 			}
 			return
 		}

logic/edbinfo.go

@@ -1,6 +1,7 @@
 package logic
 
 import (
+	"fmt"
 	"hongze/hongze_edb_lib/models"
 	"hongze/hongze_edb_lib/services/elastic"
 	"hongze/hongze_edb_lib/utils"
@@ -13,3 +14,13 @@ func UpdateEs(edbInfoId int) {
 	itemInfo, _ := models.GetEdbInfoItemByCondition("AND edb_info_id=?", []interface{}{edbInfoId})
 	elastic.EsAddOrEditEdbInfoData(utils.DATA_INDEX_NAME, strconv.Itoa(itemInfo.EdbInfoId), itemInfo)
 }
+
+// UpdateAllEdbInfoEs 更新所有的指标ES的信息
+func UpdateAllEdbInfoEs() {
+	//添加es
+	list, _ := models.GetEdbInfoItemListByCondition()
+	for _, itemInfo := range list {
+		elastic.EsAddOrEditEdbInfoData(utils.DATA_INDEX_NAME, strconv.Itoa(itemInfo.EdbInfoId), itemInfo)
+	}
+	fmt.Println("修复完成")
+}

logic/profit_chart_info.go

@@ -472,14 +472,10 @@ func ProfitChartChartData(baseDataList []*models.EdbDataList, futureGoodEdbInfoM
 
 			calculateMap := make(map[int]float64)
 			for _, childFutureGoodEdbInfoId := range childFutureGoodEdbInfoIdList {
-				tmpRealDateTime := findDateTime
-				tmpFindDataValue, tmpIsFind := edbDataMap[childFutureGoodEdbInfoId][findDateTime.Format(utils.FormatDate)]
+				tmpFindDataValue, tmpIsFind := edbDataMap[childFutureGoodEdbInfoId][realDateTime.Format(utils.FormatDate)]
 
 				if tmpIsFind && tmpFindDataValue != 0 {
 					calculateMap[childFutureGoodEdbInfoId] = tmpFindDataValue
-					if maxDate.IsZero() || maxDate.Before(tmpRealDateTime) {
-						maxDate = tmpRealDateTime
-					}
 				}
 			}
 			// 合约的数据不全，不参与计算

models/edb_info.go

@@ -945,6 +945,13 @@ func GetEdbInfoItemByCondition(condition string, pars []interface{}) (item *EdbI
 	return
 }
 
+func GetEdbInfoItemListByCondition() (items []*EdbInfoList, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT * FROM edb_info WHERE 1=1 `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
 // EdbInfoDetailReq 指标详情请求
 type EdbInfoDetailReq struct {
 	UniqueCode string `description:"指标唯一编码"`

services/base_from_python.go

@@ -92,11 +92,7 @@ func ExecPythonCode(edbCode, reqCode string) (dataMap models.EdbDataFromPython,
 	var out, errMsgOut bytes.Buffer
 	cmd.Stdout = &out
 	cmd.Stderr = &errMsgOut
-	err = cmd.Start()
-	if err != nil {
-		errMsg = errMsgOut.String()
-	}
-	err = cmd.Wait()
+	err = cmd.Run()
 	if err != nil {
 		errMsg = errMsgOut.String()
 		return
@@ -173,7 +169,7 @@ func getPythonFrontStr() string {
 	return str
 }
 
-// getPythonFrontStr 获取python结尾的代码
+// getPythonLaterStr 获取python结尾的代码
 func getPythonLaterStr() string {
 	return "\n\nprint(\"result=\", result.to_json())\ndb.close()"
 }

utils/config.go

@@ -185,6 +185,7 @@ func init() {
 		ES_URL = config["es_url"]
 		ES_USERNAME = config["es_username"]
 		ES_PASSWORD = config["es_password"]
+		DATA_INDEX_NAME = config["data_index_name"]
 	}
 
 	// 数据指标库ES索引名称