重构 OracleJy 函数并注释代码

- 移除了 OracleJy 函数中的数据库连接逻辑
- 注释掉了 connOracle函数的实现
- 在 GDError 模型中添加了 SourceName 字段

init_serve/oracle_jy.go

@@ -1,41 +1,33 @@
 package init_serve
 
-import (
-	"database/sql"
-	"eta_gn/eta_bridge/global"
-	"fmt"
-	"github.com/godror/godror"
-	"time"
-)
-
 func OracleJy() {
-	conf := global.CONFIG.OracleJY
-	err := connOracle(conf.Account, conf.Password, conf.Conn, conf.LibDir)
-	if err != nil {
-		fmt.Println("oracle 数据库连接失败")
-		global.LOG.Info("oracle 数据库连接失败，Err: " + err.Error())
-		panic("oracle 数据库连接失败" + err.Error())
-	}
+	//conf := global.CONFIG.OracleJY
+	//err := connOracle(conf.Account, conf.Password, conf.Conn, conf.LibDir)
+	//if err != nil {
+	//	fmt.Println("oracle 数据库连接失败")
+	//	global.LOG.Info("oracle 数据库连接失败，Err: " + err.Error())
+	//	panic("oracle 数据库连接失败" + err.Error())
+	//}
 }
 
-func connOracle(username, pwd, connectionStr, libDir string) (err error) {
-	var P godror.ConnectionParams
-	P.Username, P.Password = username, godror.NewPassword(pwd)
-	P.ConnectString = connectionStr
-	/*	P.SessionTimeout = 42 * time.Second
-		P.SetSessionParamOnInit("NLS_NUMERIC_CHARACTERS", ",.")
-		P.SetSessionParamOnInit("NLS_LANGUAGE", "FRENCH")*/
-	P.Timezone = time.Local
-	P.LibDir = libDir
-	oracleJyDb := sql.OpenDB(godror.NewConnector(P))
-	err = oracleJyDb.Ping()
-	if err != nil {
-		global.LOG.Error("oracle 数据库连接失败，Err: ", err)
-		panic(err)
-	}
-	fmt.Print("连接成功")
-	global.LOG.Info("oracle 数据库连接成功")
-
-	global.OracleJy = oracleJyDb
-	return
-}
+//func connOracle(username, pwd, connectionStr, libDir string) (err error) {
+//	var P godror.ConnectionParams
+//	P.Username, P.Password = username, godror.NewPassword(pwd)
+//	P.ConnectString = connectionStr
+//	/*	P.SessionTimeout = 42 * time.Second
+//		P.SetSessionParamOnInit("NLS_NUMERIC_CHARACTERS", ",.")
+//		P.SetSessionParamOnInit("NLS_LANGUAGE", "FRENCH")*/
+//	P.Timezone = time.Local
+//	P.LibDir = libDir
+//	oracleJyDb := sql.OpenDB(godror.NewConnector(P))
+//	err = oracleJyDb.Ping()
+//	if err != nil {
+//		global.LOG.Error("oracle 数据库连接失败，Err: ", err)
+//		panic(err)
+//	}
+//	fmt.Print("连接成功")
+//	global.LOG.Info("oracle 数据库连接成功")
+//
+//	global.OracleJy = oracleJyDb
+//	return
+//}

models/gn/index.go

@@ -4,11 +4,12 @@ type IndexInfo struct {
 	ClassifyNameOne   string `description:"一级目录"`
 	ClassifyNameTwo   string `description:"二级目录"`
 	ClassifyNameThree string `description:"三级目录"`
-	OriginalEdbCode   string `description:"数据节点指标编码"`
-	EdbCode           string `description:"数据源指标原始编码"`
+	DataIndexCode     string `description:"数据节点指标编码"`
+	SourceEdbCode     string `description:"数据源指标原始编码"`
 	EdbName           string `description:"指标名称"`
 	Frequency         string `description:"频度"`
 	Unit              string `description:"单位"`
+	SourceName        string `description:"来源"`
 }
 
 // IndexData 指标数据

services/index_data/gn_platform.go

@@ -4,12 +4,16 @@ import (
 	"eta_gn/eta_bridge/global"
 	"eta_gn/eta_bridge/models/gn"
 	"eta_gn/eta_bridge/services/alarm_msg"
+	"eta_gn/eta_bridge/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"github.com/shopspring/decimal"
 	"strings"
+	"time"
 )
 
+// TODO 过滤前后空格
+
 // GetPageIndexesFromGn 分页获取指标数据
 func GetPageIndexesFromGn(pageIndex, pageSize int, modifyTime string) (list []gn.IndexInfo, page *paging.PagingItem, err error) {
 	defer func() {
@@ -34,15 +38,29 @@ func GetPageIndexesFromGn(pageIndex, pageSize int, modifyTime string) (list []gn
 	list = make([]gn.IndexInfo, 0)
 
 	for _, v := range resp.Data.Records {
+		//if v.INDEXLEVELTHREE == `` {
+		//	continue
+		//}
+		if v.INDEXLEVELONE == `` {
+			v.INDEXLEVELONE = `未分类`
+		}
+		if v.INDEXLEVELTWO == `` {
+			v.INDEXLEVELTWO = `未分类`
+		}
+		if v.INDEXLEVELTHREE == `` {
+			v.INDEXLEVELTHREE = `未分类`
+		}
+
 		list = append(list, gn.IndexInfo{
-			ClassifyNameOne:   v.INDEXLEVELONE,
-			ClassifyNameTwo:   v.INDEXLEVELTWO,
-			ClassifyNameThree: v.INDEXLEVELTHREE,
-			OriginalEdbCode:   v.INDEXORIGINCODE,
-			EdbCode:           fmt.Sprint(v.INDEXID),
-			EdbName:           v.INDEXORIGINNAME,
-			Frequency:         v.DATAFREQ,
-			Unit:              v.DATAUNIT,
+			ClassifyNameOne:   strings.TrimSpace(v.INDEXLEVELONE),
+			ClassifyNameTwo:   strings.TrimSpace(v.INDEXLEVELTWO),
+			ClassifyNameThree: strings.TrimSpace(v.INDEXLEVELTHREE),
+			DataIndexCode:     fmt.Sprint(v.INDEXID),
+			SourceEdbCode:     strings.TrimSpace(v.INDEXORIGINCODE),
+			EdbName:           strings.TrimSpace(v.INDEXORIGINNAME),
+			Frequency:         strings.TrimSpace(v.DATAFREQ),
+			Unit:              strings.TrimSpace(v.DATAUNIT),
+			SourceName:        strings.TrimSpace(v.DATASOURCE),
 		})
 	}
 
@@ -130,17 +148,22 @@ func getIndexAndDataFromGn(req IndexValueReq) (list []gn.IndexData, page *paging
 		if v.VALUE == `` {
 			continue
 		}
-		valF, tmpErr := decimal.NewFromString(v.VALUE)
+		valF, tmpErr := decimal.NewFromString(strings.TrimSpace(v.VALUE))
 		if tmpErr != nil {
 			//err = tmpErr
 			continue
 		}
 		val, _ := valF.Float64()
 
+		dataTime, tmpErr := time.ParseInLocation(utils.FormatDateTime, v.DATADATE, time.Local)
+		if tmpErr != nil {
+			continue
+		}
+
 		list = append(list, gn.IndexData{
 			Val:        val,
 			UpdateTime: v.UPDATETIME,
-			DataTime:   v.DATADATE,
+			DataTime:   dataTime.Format(utils.FormatDate),
 		})
 	}