新增美国农业部数据

models/data_manage/base_from_usda_fas.go

@@ -2,9 +2,10 @@ package data_manage
 
 import (
 	"eta/eta_api/utils"
+	"time"
+
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
 )
 
 type BaseFromUsdaFasIndex struct {
@@ -23,6 +24,9 @@ type BaseFromUsdaFasIndexList struct {
 	BaseFromUsdaFasIndexId int `orm:"column(base_from_usda_fas_index_id);pk"`
 	ClassifyId             int
 	Interface              string
+	EdbInfoId              int
+	EdbUniqueCode          string `description:"指标库唯一编码"`
+	EdbClassifyId          int    `description:"指标库分类ID"`
 	IndexCode              string
 	IndexName              string
 	Frequency              string
@@ -30,6 +34,7 @@ type BaseFromUsdaFasIndexList struct {
 	Sort                   int
 	CreateTime             string
 	ModifyTime             string
+	EdbExist               int `description:"指标库是否已添加：0-否；1-是"`
 	DataList               []*BaseFromUsdaFasData
 	Paging                 *paging.PagingItem `description:"分页数据"`
 }
@@ -37,6 +42,7 @@ type BaseFromUsdaFasIndexList struct {
 type UsdaFasSingleDataResp struct {
 	BaseFromUsdaFasIndexId int
 	ClassifyId             int
+	EdbInfoId              int
 	IndexCode              string
 	IndexName              string
 	Frequency              string
@@ -44,6 +50,7 @@ type UsdaFasSingleDataResp struct {
 	StartTime              string
 	CreateTime             string
 	ModifyTime             string
+	EdbExist               int `description:"指标库是否已添加：0-否；1-是"`
 	Data                   []*UsdaFasSingleData
 }
 
@@ -52,6 +59,13 @@ type UsdaFasSingleData struct {
 	DataTime string `orm:"column(data_time)" description:"值"`
 }
 
+func GetUsdaFasIndexByClassifyId(classifyId int) (items []*BaseFromUsdaFasIndex, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT base_from_usda_fas_index_id, classify_id, index_code, index_name FROM base_from_usda_fas_index WHERE classify_id=? ORDER BY sort ASC, base_from_usda_fas_index_id ASC `
+	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	return
+}
+
 func GetUsdaFasIndex(condition string, pars interface{}) (items []*BaseFromUsdaFasIndexList, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_usda_fas_index WHERE 1=1  `
@@ -78,14 +92,53 @@ func GetUsdaFasIndexData(indexCode string, startSize, pageSize int) (items []*Ba
 }
 
 func GetUsdaFasIndexDataByCodes(indexCode []string) (items []*BaseFromUsdaFasData, err error) {
+	if len(indexCode) == 0 {
+		return
+	}
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM base_from_usda_fas_data WHERE index_code in (` + utils.GetOrmInReplace(len(indexCode)) + `) ORDER BY data_time DESC  `
 	_, err = o.Raw(sql, indexCode).QueryRows(&items)
 	return
 }
 
+// GetUsdaFasByConditionAndFrequency 根据条件获取涌益咨询指标列表
+func GetUsdaFasByConditionAndFrequency(condition, frequency string, pars []interface{}) (items []*BaseFromUsdaFasIndex, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT * FROM base_from_usda_fas_index WHERE 1=1 `
+
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` AND frequency=?`
+	sql += ` ORDER BY sort ASC, base_from_usda_fas_index_id ASC`
+	_, err = o.Raw(sql, pars, frequency).QueryRows(&items)
+	return
+}
+
+func GetUsdaFasFrequencyByCondition(condition string, pars []interface{}) (items []string, err error) {
+	sql := `SELECT DISTINCT frequency FROM base_from_usda_fas_index WHERE 1=1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` ORDER BY FIELD(frequency,'日度','周度','旬度','月度','季度','半年度','年度') `
+	o := orm.NewOrmUsingDB("data")
+	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	return
+}
+
+// GetUsdaFasDataDataTimeByIndexId 根据指标id获取指标数据的日期列表
+func GetUsdaFasDataDataTimeByIndexId(indexIdList []int) (items []string, err error) {
+	if len(indexIdList) == 0 {
+		return
+	}
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT DISTINCT data_time FROM base_from_usda_fas_data WHERE base_from_usda_fas_index_id IN (` + utils.GetOrmInReplace(len(indexIdList)) + `) ORDER BY data_time DESC`
+	_, err = o.Raw(sql, indexIdList).QueryRows(&items)
+	return
+}
+
 type BaseFromUsdaFasData struct {
-	UsdaFasDataId          int `orm:"column(UsdaFas_data_id);pk"`
+	BaseFromUsdaFasDataId  int `orm:"column(base_from_usda_fas_data_id);pk"`
 	BaseFromUsdaFasIndexId int
 	IndexCode              string
 	DataTime               string
@@ -98,6 +151,7 @@ type BaseFromUsdaFasData struct {
 type BaseFromUsdaFasIndexSearchItem struct {
 	BaseFromUsdaFasIndexId int `orm:"column(base_from_usda_fas_index_id);pk"`
 	ClassifyId             int
+	ParentClassifyId       int
 	IndexCode              string
 	IndexName              string
 }
@@ -144,3 +198,13 @@ type EditUsdaFasIndexInfoResp struct {
 	BaseFromUsdaFasIndexId int    `description:"指标ID"`
 	IndexCode              string `description:"指标code"`
 }
+
+type UsdaFasIndexSource2EdbReq struct {
+	EdbCode       string
+	EdbName       string
+	Frequency     string
+	Unit          string
+	ClassifyId    int
+	AdminId       int
+	AdminRealName string
+}

models/data_manage/base_from_usda_fas_classify.go

@@ -3,15 +3,15 @@ package data_manage
 import (
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
+
+	"github.com/beego/beego/v2/client/orm"
 )
 
 // BaseFromUsdaFasClassify UsdaFas原始数据分类表
 type BaseFromUsdaFasClassify struct {
 	ClassifyId      int       `orm:"column(classify_id);pk"`
 	ClassifyName    string    `description:"分类名称"`
-	ClassifyNameEn  string    `description:"英文分类名称"`
 	ParentId        int       `description:"父级id"`
 	SysUserId       int       `description:"创建人id"`
 	SysUserRealName string    `description:"创建人姓名"`
@@ -44,6 +44,17 @@ func GetBaseFromUsdaFasClassifyById(classifyId int) (item *BaseFromUsdaFasClassi
 	return
 }
 
+// GetBaseFromUsdaFasClassifyById 通过分类id的获取分类信息
+func GetBaseFromUsdaFasClassifyByIds(classifyIds []int) (items []*BaseFromUsdaFasClassify, err error) {
+	if len(classifyIds) == 0 {
+		return
+	}
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT * FROM base_from_usda_fas_classify WHERE classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) `
+	_, err = o.Raw(sql, classifyIds).QueryRows(&items)
+	return
+}
+
 // EditBaseFromUsdaFasClassify 修改UsdaFas原始数据分类
 func EditBaseFromUsdaFasClassify(classifyId int, classifyName string) (err error) {
 	o := orm.NewOrmUsingDB("data")
@@ -61,14 +72,15 @@ func UpdateBaseFromUsdaFasClassifySort(classifyId int) (err error) {
 }
 
 type BaseFromUsdaFasClassifyItems struct {
-	ClassifyId       int    `description:"分类ID"`
-	UsdaFasIndexId   int    `description:"指标类型ID"`
-	UsdaFasIndexCode string `description:"指标唯一编码"`
-	ClassifyName     string `description:"分类名称"`
-	ParentId         int    `description:"父级id"`
-	Level            int    `description:"层级"`
-	Sort             int    `description:"排序字段，越小越靠前，默认值：10"`
-	Children         []*BaseFromUsdaFasClassifyItems
+	ClassifyId             int    `description:"分类ID"`
+	BaseFromUsdaFasIndexId int    `description:"指标类型ID"`
+	IndexCode              string `description:"指标唯一编码"`
+	ClassifyName           string `description:"分类名称"`
+	UniqueCode             string `description:"分类唯一编码"`
+	ParentId               int    `description:"父级id"`
+	Level                  int    `description:"层级"`
+	Sort                   int    `description:"排序字段，越小越靠前，默认值：10"`
+	Children               []*BaseFromUsdaFasClassifyItems
 }
 
 type BaseFromUsdaFasClassifyNameItems struct {
@@ -210,7 +222,7 @@ SET modify_time=NOW(), sort = classify_id`
 // InitUsdaFasIndexClassifyId 历史数据的classifyId值
 func InitUsdaFasIndexClassifyId() (err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_usda_fas_index s
+	sql := `UPDATE base_from_UsdaFasindex s
 LEFT JOIN (
 SELECT
 	c1.classify_id,

routers/commentsRouter.go

@@ -5200,6 +5200,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
+        beego.ControllerComments{
+            Method: "UsdaFasBatchAdd",
+            Router: `/usda_fas/batch_add`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
+        beego.ControllerComments{
+            Method: "UsdaFasBatchSearch",
+            Router: `/usda_fas/batch_search`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
         beego.ControllerComments{
             Method: "UsdaFasClassify",
@@ -5209,6 +5227,42 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
+        beego.ControllerComments{
+            Method: "UsdaFasIndexList",
+            Router: `/usda_fas/classify/index/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
+        beego.ControllerComments{
+            Method: "UsdaFasEdbInfoAdd",
+            Router: `/usda_fas/edb_info/add`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
+        beego.ControllerComments{
+            Method: "UsdaFasAddCheck",
+            Router: `/usda_fas/edb_info/add_check`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
+        beego.ControllerComments{
+            Method: "UsdaFasNameCheck",
+            Router: `/usda_fas/edb_info/name_check`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbInfoController"],
         beego.ControllerComments{
             Method: "ExportUsdaFasList",