Merge branch 'eta_2.2.5_rzd_1012@guomengyuan' into debug

controllers/data_manage/base_from_rzd_index_controller.go

@@ -31,7 +31,7 @@ type BaseFromRzdIndexController struct {
 // @Description 汾渭数据分类接口
 // @Success 200 {object} data_manage.BaseFromRzdClassifyResponse
 // @router /rzd/classify [get]
-func (this *EdbInfoController) RzdClassify() {
+func (this *BaseFromRzdIndexController) RzdClassify() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
@@ -70,7 +70,7 @@ func (this *EdbInfoController) RzdClassify() {
 // @Param   Frequency   query   string  true       "频率"
 // @Success 200
 // @router /rzd/index/data [get]
-func (this *EdbInfoController) RzdIndexData() {
+func (this *BaseFromRzdIndexController) RzdIndexData() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
@@ -111,7 +111,7 @@ func (this *EdbInfoController) RzdIndexData() {
 	var condition string
 	var pars []interface{}
 	if classifyId >= 0 {
-		condition += ` AND classify_id=? `
+		condition += ` AND base_from_rzd_classify_id=? `
 		pars = append(pars, classifyId)
 	}
 
@@ -197,7 +197,7 @@ func (this *EdbInfoController) RzdIndexData() {
 // @Param   classifyId   query  int  false   "指标唯一编码"
 // @Success 200 {object} []string
 // @router /rzd/frequency/list [get]
-func (this *EdbInfoController) GetRzdFrequencyList() {
+func (this *BaseFromRzdIndexController) GetRzdFrequencyList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
@@ -233,7 +233,7 @@ func (this *EdbInfoController) GetRzdFrequencyList() {
 // @Param   req    body   data_manage.BaseFromFenWeiIndexBatchAddCheckReq     true        "请求参数"
 // @Success 200 {object} []data_manage.IndexCheckData
 // @router /rzd/index/add/validate [post]
-func (this *EdbInfoController) RzdIndexAddValidate() {
+func (this *BaseFromRzdIndexController) RzdIndexAddValidate() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
@@ -282,7 +282,7 @@ func (this *EdbInfoController) RzdIndexAddValidate() {
 // @Param   req    body   []data_manage.AddEdbInfoReq     true        "请求参数"
 // @Success 200 string "操作成功"
 // @router /rzd/index/add [post]
-func (this *EdbInfoController) RzdIndexAdd() {
+func (this *BaseFromRzdIndexController) RzdIndexAdd() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
@@ -456,7 +456,7 @@ func (this *EdbInfoController) RzdIndexAdd() {
 // @Param  ClassifyId     query   int     false        "分类ID"
 // @Success 200 string "操作成功"
 // @router /rzd/index/data/export [get]
-func (this *EdbInfoController) RzdIndexDataExport() {
+func (this *BaseFromRzdIndexController) RzdIndexDataExport() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -650,7 +650,7 @@ func (this *EdbInfoController) RzdIndexDataExport() {
 // @Param   CurrentIndex   query   int  false       "当前页页码，从1开始"
 // @Success 200 {object} data_manage.BaseFromRzdIndexPage
 // @router /rzd/get/index/info [get]
-func (this *EdbInfoController) GetRzdIndexInfo() {
+func (this *BaseFromRzdIndexController) GetRzdIndexInfo() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {

routers/commentsRouter.go

@@ -2590,6 +2590,69 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"],
+        beego.ControllerComments{
+            Method: "RzdClassify",
+            Router: `/rzd/classify`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"],
+        beego.ControllerComments{
+            Method: "GetRzdFrequencyList",
+            Router: `/rzd/frequency/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"],
+        beego.ControllerComments{
+            Method: "GetRzdIndexInfo",
+            Router: `/rzd/get/index/info`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"],
+        beego.ControllerComments{
+            Method: "RzdIndexAdd",
+            Router: `/rzd/index/add`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"],
+        beego.ControllerComments{
+            Method: "RzdIndexAddValidate",
+            Router: `/rzd/index/add/validate`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"],
+        beego.ControllerComments{
+            Method: "RzdIndexData",
+            Router: `/rzd/index/data`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromRzdIndexController"],
+        beego.ControllerComments{
+            Method: "RzdIndexDataExport",
+            Router: `/rzd/index/data/export`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromThsHfController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:BaseFromThsHfController"],
         beego.ControllerComments{
             Method: "ClassifyAdd",
@@ -5146,69 +5209,6 @@ 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: "RzdClassify",
-            Router: `/rzd/classify`,
-            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: "GetRzdFrequencyList",
-            Router: `/rzd/frequency/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: "GetRzdIndexInfo",
-            Router: `/rzd/get/index/info`,
-            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: "RzdIndexAdd",
-            Router: `/rzd/index/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: "RzdIndexAddValidate",
-            Router: `/rzd/index/add/validate`,
-            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: "RzdIndexData",
-            Router: `/rzd/index/data`,
-            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: "RzdIndexDataExport",
-            Router: `/rzd/index/data/export`,
-            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: "SciClassify",