新增数据同步

controllers/contract.go

@@ -16,7 +16,7 @@ type ContractController struct {
 // @Description 获取合约接口
 // @Success 200 {object} models.ContractListReq
 // @router /list [post]
-func (this *ClassifyController) ContractList() {
+func (this *ContractController) ContractList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br

models/base_from_icpi.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
@@ -79,3 +80,24 @@ func GetBaseFromIcpiData(indexCode, startDate, endDate string) (list []*BaseFrom
 	_, err = o.Raw(sql, indexCode, startDate, endDate).QueryRows(&list)
 	return
 }
+
+// GetComTradeDataList 获取icpi消费指数数据列表
+func GetBaseFromIcpiDataList(startDate, endDate string, startSize, pageSize int) (total int, list []*BaseFromIcpiData, err error) {
+	o := orm.NewOrm()
+	totalSql := `SELECT count(1) total FROM base_from_icpi_data WHERE create_time>=? AND create_time<=? `
+	err = o.Raw(totalSql, startDate, endDate).QueryRow(&total)
+	if err != nil {
+		return
+	}
+
+	sql := `SELECT * FROM base_from_icpi_data WHERE create_time>=? AND create_time<=? ORDER BY base_from_icpi_data_id ASC LIMIT ?,?`
+	_, err = o.Raw(sql, startDate, endDate, startSize, pageSize).QueryRows(&list)
+
+	return
+}
+
+// ComTradeIndexDataResp 分页列表响应体
+type BaseFromIcpiDataResp struct {
+	List   []*BaseFromIcpiData
+	Paging *paging.PagingItem `description:"分页数据"`
+}

models/base_from_trade_guangzhou.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
@@ -45,3 +46,24 @@ func GetBaseFromTradeGuangzhouData(indexCode, startDate, endDate string) (list [
 	_, err = o.Raw(sql, indexCode, startDate, endDate).QueryRows(&list)
 	return
 }
+
+// GetComTradeDataList 获取联合国商品贸易数据列表
+func GetBaseFromTradeGuangzhouDataList(startDate, endDate string, startSize, pageSize int) (total int, list []*BaseFromTradeGuangzhouData, err error) {
+	o := orm.NewOrm()
+	totalSql := `SELECT count(1) total FROM base_from_trade_guangzhou_data WHERE create_time>=? AND create_time<=? `
+	err = o.Raw(totalSql, startDate, endDate).QueryRow(&total)
+	if err != nil {
+		return
+	}
+
+	sql := `SELECT * FROM base_from_trade_guangzhou_data WHERE create_time>=? AND create_time<=? ORDER BY base_from_trade_guangzhou_data_id ASC LIMIT ?,?`
+	_, err = o.Raw(sql, startDate, endDate, startSize, pageSize).QueryRows(&list)
+
+	return
+}
+
+// ComTradeIndexDataResp 分页列表响应体
+type BaseFromTradeGuangzhouDataResp struct {
+	List   []*BaseFromTradeGuangzhouData
+	Paging *paging.PagingItem `description:"分页数据"`
+}

routers/commentsRouter.go

@@ -7,58 +7,76 @@ import (
 
 func init() {
 
-	beego.GlobalControllerRouter["eta/eta_data_push/controllers:EdbInfoCalculateController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:EdbInfoCalculateController"],
-		beego.ControllerComments{
-			Method:           "EdbInfoCalculateItem",
-			Router:           `/item`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
+    beego.GlobalControllerRouter["eta/eta_data_push/controllers:ClassifyController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:ClassifyController"],
+        beego.ControllerComments{
+            Method: "ClassifyList",
+            Router: `/list`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
 
-	beego.GlobalControllerRouter["eta/eta_data_push/controllers:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "EdbIndexDetail",
-			Router:           `/detail`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
+    beego.GlobalControllerRouter["eta/eta_data_push/controllers:ContractController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:ContractController"],
+        beego.ControllerComments{
+            Method: "ContractList",
+            Router: `/list`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
 
-	beego.GlobalControllerRouter["eta/eta_data_push/controllers:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:EdbInfoController"],
-		beego.ControllerComments{
-			Method:           "EdbIndexItem",
-			Router:           `/item`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
+    beego.GlobalControllerRouter["eta/eta_data_push/controllers:EdbInfoCalculateController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:EdbInfoCalculateController"],
+        beego.ControllerComments{
+            Method: "EdbInfoCalculateItem",
+            Router: `/item`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
 
-	beego.GlobalControllerRouter["eta/eta_data_push/controllers:IndexController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:IndexController"],
-		beego.ControllerComments{
-			Method:           "IndexDataList",
-			Router:           `/data/list`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
+    beego.GlobalControllerRouter["eta/eta_data_push/controllers:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:EdbInfoController"],
+        beego.ControllerComments{
+            Method: "EdbIndexDetail",
+            Router: `/detail`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
 
-	beego.GlobalControllerRouter["eta/eta_data_push/controllers:IndexController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:IndexController"],
-		beego.ControllerComments{
-			Method:           "IndexDataPageList",
-			Router:           `/data/list_page`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
+    beego.GlobalControllerRouter["eta/eta_data_push/controllers:EdbInfoController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:EdbInfoController"],
+        beego.ControllerComments{
+            Method: "EdbIndexItem",
+            Router: `/item`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
 
-	beego.GlobalControllerRouter["eta/eta_data_push/controllers:IndexController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:IndexController"],
-		beego.ControllerComments{
-			Method:           "IndexList",
-			Router:           `/list`,
-			AllowHTTPMethods: []string{"post"},
-			MethodParams:     param.Make(),
-			Filters:          nil,
-			Params:           nil})
+    beego.GlobalControllerRouter["eta/eta_data_push/controllers:IndexController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:IndexController"],
+        beego.ControllerComments{
+            Method: "IndexDataList",
+            Router: `/data/list`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_data_push/controllers:IndexController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:IndexController"],
+        beego.ControllerComments{
+            Method: "IndexDataPageList",
+            Router: `/data/list_page`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_data_push/controllers:IndexController"] = append(beego.GlobalControllerRouter["eta/eta_data_push/controllers:IndexController"],
+        beego.ControllerComments{
+            Method: "IndexList",
+            Router: `/list`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
 
 }

routers/router.go

@@ -35,7 +35,7 @@ func init() {
 				&controllers.ClassifyController{},
 			),
 		),
-		beego.NSNamespace("/classify",
+		beego.NSNamespace("/contract",
 			beego.NSInclude(
 				&controllers.ContractController{},
 			),

services/index.go

@@ -80,6 +80,30 @@ func GetIndexDataPageList(source, currPage, pageSize int, startDate, endDate str
 			List:   dataList,
 			Paging: page,
 		}
+	case utils.DATA_SOURCE_GFEX: //广期所
+		var total int
+		dataList := make([]*models.BaseFromTradeGuangzhouData, 0)
+		total, dataList, err = models.GetBaseFromTradeGuangzhouDataList(startDate, endDate, currPage*pageSize, pageSize)
+		if err != nil {
+			return
+		}
+		page := paging.GetPaging(currPage, pageSize, total)
+		list = models.BaseFromTradeGuangzhouDataResp{
+			List:   dataList,
+			Paging: page,
+		}
+	case utils.DATA_SOURCE_ICPI: //ICPI-消费指数
+		var total int
+		dataList := make([]*models.BaseFromIcpiData, 0)
+		total, dataList, err = models.GetBaseFromIcpiDataList(startDate, endDate, currPage*pageSize, pageSize)
+		if err != nil {
+			return
+		}
+		page := paging.GetPaging(currPage, pageSize, total)
+		list = models.BaseFromIcpiDataResp{
+			List:   dataList,
+			Paging: page,
+		}
 	default:
 	}
 	return