Merge branch 'fix/2023-8-11' into debug

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("修复完成")
+}

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

@@ -80,7 +80,7 @@ func ExecPythonCode(edbCode, reqCode string) (dataMap models.EdbDataFromPython,
 		return
 	}
 	defer func() {
-		os.Remove(pythonFile)
+		//os.Remove(pythonFile)
 	}()
 	_, err = fileHandle.Write([]byte(pthonCodeStr))
 	if err != nil {
@@ -92,15 +92,20 @@ 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
 	}
+	//err = cmd.Start()
+	//if err != nil {
+	//	errMsg = errMsgOut.String()
+	//}
+	//err = cmd.Wait()
+	//if err != nil {
+	//	errMsg = errMsgOut.String()
+	//	return
+	//}
 
 	outputByte := out.String()
 	if err != nil {
@@ -173,7 +178,7 @@ func getPythonFrontStr() string {
 	return str
 }
 
-// getPythonFrontStr 获取python结尾的代码
+// getPythonLaterStr 获取python结尾的代码
 func getPythonLaterStr() string {
 	return "\n\nprint(\"result=\", result.to_json())\ndb.close()"
 }