新增wind wsd接口

controllers/data_manage/edb_info.go

@@ -31,7 +31,9 @@ type EdbInfoController struct {
 // @Title 新增指标-查询指标信息接口
 // @Description 新增指标-查询指标信息接口
 // @Param   Source   query   int  true       "来源:1:同花顺,2:wind,3:彭博"
-// @Param   EdbCode   query   string  false       "指标编码"
+// @Param   SubSource   query   int  true       "子数据来源:0:经济数据库,1:日期序列"
+// @Param   EdbCode   query   string  false       "指标编码/指标代码"
+// @Param   SecuritiesCode   query   string  false       "证券代码"
 // @Success 200 {object} data_manage.EdbInfoSearchResp
 // @router /edb_info/search [get]
 func (this *EdbInfoController) EdbInfoSearch() {
@@ -45,11 +47,14 @@ func (this *EdbInfoController) EdbInfoSearch() {
 	edbCode = strings.Trim(edbCode, "\t")
 	edbCode = strings.Trim(edbCode, " ")
 	edbCode = strings.Replace(edbCode, "\t", "", -1)
+	subSource, _ := this.GetInt("SubSource")
+	securitiesCode := this.GetString("SecuritiesCode")
 
 	if source <= 0 {
 		br.Msg = "无效的数据来源"
 		return
 	}
+
 	if edbCode == "" {
 		br.Msg = "请输入指标ID"
 		return
@@ -197,51 +202,102 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				isAdd = true
 			}
 		} else if source == utils.DATA_SOURCE_WIND {
-			fmt.Println("wind data exist")
-			dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_WIND, utils.EDB_DATA_LIMIT)
-			if err != nil && err.Error() != utils.ErrNoRow() {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取Wind已存在信息失败,Err:" + err.Error()
-				return
-			}
-			fmt.Println("wind dataItems:", len(dataItems))
-			if len(dataItems) > 0 {
-				searchItem.EdbCode = edbCode
-				minDate, maxDate, err := data_manage.GetEdbDataWindMaxOrMinDate(edbCode)
-				if err != nil {
+			if subSource == utils.DATA_SUB_SOURCE_EDB {
+				dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_WIND, utils.EDB_DATA_LIMIT)
+				if err != nil && err.Error() != utils.ErrNoRow() {
 					br.Msg = "获取失败"
-					br.ErrMsg = "获取wind日期信息失败,Err:" + err.Error()
+					br.ErrMsg = "获取Wind已存在信息失败,Err:" + err.Error()
 					return
 				}
-				searchItem.DataList = dataItems
-				searchItem.StartDate = minDate
-				searchItem.EndDate = maxDate
-			} else {
-				//endDate := dateNow.Format(utils.FormatDate)
-				//searchItem, err = data.GetEdbDataByWind(edbCode, startDate, endDate)
-				//if err != nil {
-				//	br.Msg = "获取失败"
-				//	br.ErrMsg = "wind 获取失败,Err:" + err.Error()
-				//	return
-				//}
-				respItem, err := data.AddEdbData(source, edbCode)
-				if err != nil {
+				fmt.Println("wind dataItems:", len(dataItems))
+				if len(dataItems) > 0 {
+					searchItem.EdbCode = edbCode
+					minDate, maxDate, err := data_manage.GetEdbDataWindMaxOrMinDate(edbCode)
+					if err != nil {
+						br.Msg = "获取失败"
+						br.ErrMsg = "获取wind日期信息失败,Err:" + err.Error()
+						return
+					}
+					searchItem.DataList = dataItems
+					searchItem.StartDate = minDate
+					searchItem.EndDate = maxDate
+				} else {
+					//endDate := dateNow.Format(utils.FormatDate)
+					//searchItem, err = data.GetEdbDataByWind(edbCode, startDate, endDate)
+					//if err != nil {
+					//	br.Msg = "获取失败"
+					//	br.ErrMsg = "wind 获取失败,Err:" + err.Error()
+					//	return
+					//}
+					respItem, err := data.AddEdbData(source, edbCode)
+					if err != nil {
+						br.Msg = "获取失败"
+						br.ErrMsg = "获取失败,Err:" + err.Error()
+						return
+					}
+					if respItem.Ret != 200 {
+						if respItem.Ret == 421 {
+							br.Msg = "该渠道已超过添加上限"
+						} else if respItem.Ret == 4052 {
+							br.Msg = "该指标已下架"
+						} else {
+							br.Msg = "未搜索到该指标"
+						}
+						br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
+						return
+					}
+					isAdd = true
+				}
+			} else if subSource == utils.DATA_SUB_SOURCE_DATE {
+				if securitiesCode == "" {
+					br.Msg = "请输入证券代码"
+					return
+				}
+				if edbCode == "" {
+					br.Msg = "请输入指标代码"
+					return
+				}
+
+				dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_WIND, utils.EDB_DATA_LIMIT)
+				if err != nil && err.Error() != utils.ErrNoRow() {
 					br.Msg = "获取失败"
-					br.ErrMsg = "获取失败,Err:" + err.Error()
+					br.ErrMsg = "获取Wind已存在信息失败,Err:" + err.Error()
 					return
 				}
-				if respItem.Ret != 200 {
-					if respItem.Ret == 421 {
-						br.Msg = "该渠道已超过添加上限"
-					} else if respItem.Ret == 4052 {
-						br.Msg = "该指标已下架"
-					} else {
-						br.Msg = "未搜索到该指标"
+				fmt.Println("wind dataItems:", len(dataItems))
+				if len(dataItems) > 0 {
+					searchItem.EdbCode = edbCode
+					minDate, maxDate, err := data_manage.GetEdbDataWindMaxOrMinDate(edbCode)
+					if err != nil {
+						br.Msg = "获取失败"
+						br.ErrMsg = "获取wind日期信息失败,Err:" + err.Error()
+						return
 					}
-					br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
-					return
+					searchItem.DataList = dataItems
+					searchItem.StartDate = minDate
+					searchItem.EndDate = maxDate
+				} else {
+					respItem, err := data.AddEdbData(source, edbCode)
+					if err != nil {
+						br.Msg = "获取失败"
+						br.ErrMsg = "获取失败,Err:" + err.Error()
+						return
+					}
+					if respItem.Ret != 200 {
+						if respItem.Ret == 421 {
+							br.Msg = "该渠道已超过添加上限"
+						} else if respItem.Ret == 4052 {
+							br.Msg = "该指标已下架"
+						} else {
+							br.Msg = "未搜索到该指标"
+						}
+						br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
+						return
+					}
+					isAdd = true
 				}
-				isAdd = true
+			} else {
+
 			}
 		} else if source == utils.DATA_SOURCE_PB || source == utils.DATA_SOURCE_PB_FINANCE {
 			fmt.Println("pb data exist")
@@ -4849,3 +4905,87 @@ func (this *EdbInfoController) ChartImageSet() {
 	br.Success = true
 	br.Msg = "保存成功"
 }
+
+// EdbInfoExistCheck
+// @Title 新增指标-检验指标是否存在接口
+// @Description 新增指标-检验指标是否存在接口
+// @Param   Source   query   int  true       "来源:1:同花顺,2:wind"
+// @Param   SubSource   query   int  true       "子数据来源:0:经济数据库,1:日期序列"
+// @Param   EdbCode   query   string  false       "指标编码/指标代码"
+// @Param   SecuritiesCode   query   string  false       "证券代码"
+// @Success 200 {object} data_manage.EdbInfoExistCheckResp
+// @router /edb_info/exist/check [get]
+func (this *EdbInfoController) EdbInfoExistCheck() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	source, _ := this.GetInt("Source")
+	edbCode := this.GetString("EdbCode")
+	edbCode = strings.Trim(edbCode, "\t")
+	edbCode = strings.Trim(edbCode, " ")
+	edbCode = strings.Replace(edbCode, "\t", "", -1)
+	subSource, _ := this.GetInt("SubSource")
+	securitiesCode := this.GetString("SecuritiesCode")
+
+	if source <= 0 {
+		br.Msg = "无效的数据来源"
+		return
+	}
+
+	if edbCode == "" {
+		br.Msg = "请输入指标ID"
+		return
+	}
+
+	if source != utils.DATA_SOURCE_WIND {
+		br.Msg = "无效的数据来源"
+		return
+	}
+	if subSource != utils.DATA_SUB_SOURCE_DATE {
+		br.Msg = "无效的数据库来源"
+		return
+	}
+
+	var indexCodeArr []string
+	edbCodeArr := strings.Split(edbCode, ",")
+	securitiesCodeArr := strings.Split(securitiesCode, ",")
+
+	for _, sv := range securitiesCodeArr {
+		for _, ev := range edbCodeArr {
+			indexCode := utils.WindDbWsd + sv + ev
+			indexCodeArr = append(indexCodeArr, indexCode)
+		}
+	}
+	indexList, err := data_manage.GetEdbInfoByEdbCodeList(source, indexCodeArr)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "校验指标是否存在失败"
+		br.ErrMsg = "校验指标是否存在失败,Err:" + err.Error()
+		return
+	}
+	var existSecuritiesCodeArr []string
+	var existEdbCodeArr []string
+	for _, indexItem := range indexList {
+		for _, sv := range securitiesCodeArr {
+			for _, ev := range edbCodeArr {
+				if strings.Contains(indexItem.EdbCode, sv) {
+					existSecuritiesCodeArr = append(existSecuritiesCodeArr, sv)
+				}
+				if strings.Contains(indexItem.EdbCode, ev) {
+					existEdbCodeArr = append(existEdbCodeArr, ev)
+				}
+			}
+		}
+	}
+
+	resp := new(data_manage.EdbInfoExistCheckResp)
+	if len(indexList) > 0 {
+		resp.IndexExist = true
+	}
+	resp.ExistEdbCodeArr = existEdbCodeArr
+	resp.ExistSecuritiesCodeArr = existSecuritiesCodeArr
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

models/data_manage/edb_info.go

@@ -1793,3 +1793,9 @@ func GetEdbInfoAdminList(edbType int) (list []int, err error) {
 	_, err = o.Raw(sql, edbType).QueryRows(&list)
 	return
 }
+
+type EdbInfoExistCheckResp struct {
+	IndexExist             bool     `description:"指标是否存在:true,存在,false:不存在"`
+	ExistSecuritiesCodeArr []string `description:"存在的证券代码"`
+	ExistEdbCodeArr        []string `description:"存在的指标代码"`
+}

routers/commentsRouter.go

@@ -2410,6 +2410,15 @@ 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: "EdbInfoExistCheck",
+            Router: `/edb_info/exist/check`,
+            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: "EdbInfoFilter",

swagger/swagger.yml

@@ -1363,157 +1363,6 @@ paths:
           description: ""
           schema:
             $ref: '#/definitions/response.AddExcelInfoResp'
-  /data_stat//edb_delete_log:
-    get:
-      tags:
-      - data_stat
-      description: |-
-        查询删除指标列表接口
-        <br>
-      operationId: EdbSourceStatController.查询删除指标列表
-      responses:
-        "200":
-          description: ""
-          schema:
-            $ref: '#/definitions/data_stat.GetEdbDeleteLogResp'
-  /data_stat//edb_update_log:
-    get:
-      tags:
-      - data_stat
-      description: |-
-        查询指标信息变更列表接口
-        <br>
-      operationId: EdbSourceStatController.查询指标信息变更列表
-      responses:
-        "200":
-          description: ""
-          schema:
-            $ref: '#/definitions/data_stat.GetEdbUpdateLogResp'
-  /data_stat//edb_update_stat:
-    get:
-      tags:
-      - data_stat
-      description: |-
-        查询数据源明细列表接口
-        <br>
-      operationId: EdbSourceStatController.查询数据源明细列表
-      responses:
-        "200":
-          description: ""
-          schema:
-            $ref: '#/definitions/data_stat.GetEdbUpdateStatResp'
-  /data_stat//edb_update_stat/failed:
-    get:
-      tags:
-      - data_stat
-      description: |-
-        查询指标更新失败详情列表
-        <br>
-      operationId: EdbSourceStatController.查询指标更新失败详情列表
-      responses:
-        "200":
-          description: ""
-          schema:
-            $ref: '#/definitions/data_stat.GetEdbUpdateLogResp'
-  /data_stat//source_column:
-    get:
-      tags:
-      - data_stat
-      description: |-
-        查询 数据源统计表自定义列列表
-        <br>
-      operationId: EdbSourceStatController.数据源统计表自定义列列表
-      responses:
-        "200":
-          description: ""
-          schema:
-            $ref: '#/definitions/data_stat.StatColumnList'
-  /data_stat//source_column/edit:
-    post:
-      tags:
-      - data_stat
-      description: |-
-        编辑 数据源统计表自定义列列表
-        <br>
-      operationId: EdbSourceStatController.编辑数据源统计表自定义列
-      responses:
-        "200":
-          description: ""
-          schema:
-            $ref: '#/definitions/data_stat.StatColumnList'
-  /data_stat//source_stat:
-    get:
-      tags:
-      - data_stat
-      description: |-
-        查询数据源统计列表接口
-        <br>
-      operationId: EdbSourceStatController.查询数据源统计列表
-      responses:
-        "200":
-          description: ""
-          schema:
-            $ref: '#/definitions/data_stat.GetEdbUpdateLogResp'
-  /data_stat//terminal/code:
-    get:
-      tags:
-      - data_stat
-      description: |-
-        数据源终端列表接口
-        <br>
-      operationId: EdbTerminalController.数据源终端列表
-      responses:
-        "200":
-          description: ""
-          schema:
-            $ref: '#/definitions/data_manage.EdbTerminalCodeResp'
-  /data_stat//terminal/list:
-    get:
-      tags:
-      - data_stat
-      description: |-
-        数据源终端列表接口
-        <br>
-      operationId: EdbTerminalController.数据源终端列表
-      responses:
-        "200":
-          description: ""
-          schema:
-            $ref: '#/definitions/data_manage.EdbTerminalLisResp'
-  /data_stat//terminal/save:
-    post:
-      tags:
-      - data_stat
-      description: |-
-        保存数据源终端接口
-        <br>
-      operationId: EdbTerminalController.保存数据源终端
-      parameters:
-      - in: body
-        name: request
-        description: type json string
-        schema:
-          $ref: '#/definitions/true'
-      responses:
-        "200":
-          description: string "操作成功"
-  /data_stat//terminal/status/set:
-    post:
-      tags:
-      - data_stat
-      description: |-
-        启用/禁用数据源终端
-        <br>
-      operationId: EdbTerminalController.启用/禁用数据源终端
-      parameters:
-      - in: body
-        name: request
-        description: type json string
-        schema:
-          $ref: '#/definitions/true'
-      responses:
-        "200":
-          description: string "操作成功"
   /datamanage/baiinfo/classify:
     get:
       tags:
@@ -3385,6 +3234,40 @@ paths:
           description: ""
           schema:
             $ref: '#/definitions/data_manage.EditEdbEnInfoReq'
+  /datamanage/edb_info/exist/check:
+    get:
+      tags:
+      - datamanage
+      description: |-
+        新增指标-检验指标是否存在接口
+        <br>
+      operationId: EdbInfoController.新增指标-检验指标是否存在接口
+      parameters:
+      - in: query
+        name: Source
+        description: 来源:1:同花顺,2:wind
+        required: true
+        type: integer
+        format: int64
+      - in: query
+        name: SubSource
+        description: 子数据来源:0:经济数据库,1:日期序列
+        required: true
+        type: integer
+        format: int64
+      - in: query
+        name: EdbCode
+        description: 指标编码/指标代码
+        type: string
+      - in: query
+        name: SecuritiesCode
+        description: 证券代码
+        type: string
+      responses:
+        "200":
+          description: ""
+          schema:
+            $ref: '#/definitions/data_manage.EdbInfoExistCheckResp'
   /datamanage/edb_info/filter:
     get:
       tags:
@@ -3842,9 +3725,19 @@ paths:
         required: true
         type: integer
         format: int64
+      - in: query
+        name: SubSource
+        description: 子数据来源:0:经济数据库,1:日期序列
+        required: true
+        type: integer
+        format: int64
       - in: query
         name: EdbCode
-        description: 指标编码
+        description: 指标编码/指标代码
+        type: string
+      - in: query
+        name: SecuritiesCode
+        description: 证券代码
         type: string
       responses:
         "200":
@@ -16935,16 +16828,16 @@ paths:
         Ret=200:
           description: 上传成功
 definitions:
-  3787.0x14001dc86c0.false:
+  3893.0xc0035d1620.false:
     title: "false"
     type: object
-  28773.<nil>.LuckySheetDataValue:
+  29459.<nil>.LuckySheetDataValue:
     title: LuckySheetDataValue
     type: object
-  188796.0x14001c1e240.false:
+  193187.0xc0025f60f0.false:
     title: "false"
     type: object
-  911793.0x140012f5680.false:
+  928793.0xc00336d680.false:
     title: "false"
     type: object
   EicDataV2:
@@ -17177,8 +17070,8 @@ definitions:
         type: array
         items:
           $ref: '#/definitions/company.PermissionVarietyList'
-  data_manage.&{249959 EdbClassifyItems}:
-    title: '&{249959 EdbClassifyItems}'
+  data_manage.&{255943 EdbClassifyItems}:
+    title: '&{255943 EdbClassifyItems}'
     type: object
   data_manage.AddBaseFromBaiinfoClassifyReq:
     title: AddBaseFromBaiinfoClassifyReq
@@ -18013,9 +17906,6 @@ definitions:
         description: 我的图表分类ID
         type: integer
         format: int64
-      NodeId:
-        description: 节点ID
-        type: string
       NodeName:
         description: 节点名称
         type: string
@@ -18852,7 +18742,7 @@ definitions:
     title: EdbClassifyItemList
     type: array
     items:
-      $ref: '#/definitions/data_manage.&{249959 EdbClassifyItems}'
+      $ref: '#/definitions/data_manage.&{255943 EdbClassifyItems}'
   data_manage.EdbClassifyItemsButton:
     title: EdbClassifyItemsButton
     type: object
@@ -18976,9 +18866,6 @@ definitions:
         format: datetime
       DataDateType:
         type: string
-      DataUpdateTime:
-        description: 最近一次数据发生变化的时间
-        type: string
       EdbCode:
         description: 指标编码
         type: string
@@ -19005,9 +18892,6 @@ definitions:
       EndDate:
         description: 终止日期
         type: string
-      ErDataUpdateDate:
-        description: 本次更新，数据发生变化的最早日期
-        type: string
       Frequency:
         description: 频率
         type: string
@@ -19055,9 +18939,6 @@ definitions:
         description: 来源id
         type: integer
         format: int64
-      SourceIndexName:
-        description: 数据源中的指标名称
-        type: string
       SourceName:
         description: 来源名称
         type: string
@@ -19069,9 +18950,6 @@ definitions:
         format: int64
       SysUserRealName:
         type: string
-      TerminalCode:
-        description: 终端编码，用于配置在机器上
-        type: string
       UniqueCode:
         description: 指标唯一编码
         type: string
@@ -19315,6 +19193,23 @@ definitions:
           $ref: '#/definitions/data_manage.EdbDataList'
       EdbInfo:
         $ref: '#/definitions/data_manage.EdbInfo'
+  data_manage.EdbInfoExistCheckResp:
+    title: EdbInfoExistCheckResp
+    type: object
+    properties:
+      ExistEdbCodeArr:
+        description: 存在的指标代码
+        type: array
+        items:
+          type: string
+      ExistSecuritiesCodeArr:
+        description: 存在的证券代码
+        type: array
+        items:
+          type: string
+      IndexExist:
+        description: 指标是否存在:true,存在,false:不存在
+        type: boolean
   data_manage.EdbInfoFromTag:
     title: EdbInfoFromTag
     type: object
@@ -19359,9 +19254,6 @@ definitions:
         format: datetime
       DataDateType:
         type: string
-      DataUpdateTime:
-        description: 最近一次数据发生变化的时间
-        type: string
       EdbCode:
         description: 指标编码
         type: string
@@ -19388,9 +19280,6 @@ definitions:
       EndDate:
         description: 终止日期
         type: string
-      ErDataUpdateDate:
-        description: 本次更新，数据发生变化的最早日期
-        type: string
       Frequency:
         description: 频率
         type: string
@@ -19438,9 +19327,6 @@ definitions:
         description: 来源id
         type: integer
         format: int64
-      SourceIndexName:
-        description: 数据源中的指标名称
-        type: string
       SourceName:
         description: 来源名称
         type: string
@@ -19452,9 +19338,6 @@ definitions:
         format: int64
       SysUserRealName:
         type: string
-      TerminalCode:
-        description: 终端编码，用于配置在机器上
-        type: string
       UniqueCode:
         description: 指标唯一编码
         type: string
@@ -19649,32 +19532,6 @@ definitions:
         description: 1:数据已存在于弘则数据库，2:新数据，3:数据已存在于弘则数据库，但是当前账号无权限
         type: integer
         format: int64
-  data_manage.EdbTerminalCode:
-    title: EdbTerminalCode
-    type: object
-    properties:
-      Name:
-        description: 终端别名
-        type: string
-      Source:
-        description: 指标来源类型
-        type: integer
-        format: int64
-      TerminalCode:
-        description: 终端编码，用于配置在机器上
-        type: string
-  data_manage.EdbTerminalCodeResp:
-    title: EdbTerminalCodeResp
-    type: object
-    properties:
-      List:
-        description: 终端编码列表
-        type: array
-        items:
-          $ref: '#/definitions/data_manage.EdbTerminalCode'
-  data_manage.EdbTerminalLisResp:
-    title: EdbTerminalLisResp
-    type: object
   data_manage.EdbdataClassify:
     title: EdbdataClassify
     type: object
@@ -20127,6 +19984,27 @@ definitions:
         items:
           type: integer
           format: int64
+  data_manage.MyChartClassify:
+    title: MyChartClassify
+    type: object
+    properties:
+      AdminId:
+        description: 创建人id
+        type: integer
+        format: int64
+      IsCompanyPublic:
+        description: 是否为用户公共分类
+        type: integer
+        format: int64
+      IsPublic:
+        description: 是否公共分类
+        type: integer
+        format: int64
+      MyChartClassifyId:
+        type: integer
+        format: int64
+      MyChartClassifyName:
+        type: string
   data_manage.MyChartClassifyAddReq:
     title: MyChartClassifyAddReq
     type: object
@@ -20153,33 +20031,6 @@ definitions:
       MyChartClassifyName:
         description: 分类名称
         type: string
-  data_manage.MyChartClassifyItem:
-    title: MyChartClassifyItem
-    type: object
-    properties:
-      AdminId:
-        description: 创建人id
-        type: integer
-        format: int64
-      ChartNum:
-        description: 分类下的图表数量
-        type: integer
-        format: int64
-      IsCompanyPublic:
-        description: 是否为用户公共分类
-        type: integer
-        format: int64
-      IsPublic:
-        description: 是否公共分类
-        type: integer
-        format: int64
-      MyChartClassifyId:
-        description: 分类ID
-        type: integer
-        format: int64
-      MyChartClassifyName:
-        description: 分类名称
-        type: string
   data_manage.MyChartClassifyMoveReq:
     title: MyChartClassifyMoveReq
     type: object
@@ -20206,7 +20057,7 @@ definitions:
       List:
         type: array
         items:
-          $ref: '#/definitions/data_manage.MyChartClassifyItem'
+          $ref: '#/definitions/data_manage.MyChartClassify'
   data_manage.MyChartDeleteReq:
     title: MyChartDeleteReq
     type: object
@@ -20478,7 +20329,7 @@ definitions:
       EdbInfoIdArr:
         type: array
         items:
-          $ref: '#/definitions/911793.0x140012f5680.false'
+          $ref: '#/definitions/928793.0xc00336d680.false'
       EdbName:
         description: 指标名称
         type: string
@@ -20952,321 +20803,6 @@ definitions:
   data_manage.interface:
     title: interface
     type: object
-  data_stat.EdbInfoDeleteLogItem:
-    title: EdbInfoDeleteLogItem
-    type: object
-    properties:
-      CreateTime:
-        description: 创建时间即删除时间
-        type: string
-      DataUpdateTime:
-        description: 最近一次数据发生变化的时间
-        type: string
-      DelSysUserId:
-        description: 删除人ID
-        type: integer
-        format: int64
-      DelSysUserRealName:
-        description: 删除人姓名
-        type: string
-      EdbCode:
-        description: 指标编码
-        type: string
-      EdbCreateTime:
-        description: 指标创建时间
-        type: string
-      EdbInfoId:
-        description: 指标ID
-        type: integer
-        format: int64
-      EdbInfoType:
-        description: 指标类型，0：普通指标，1：预测指标
-        type: integer
-        format: int64
-      EdbName:
-        description: 指标名称
-        type: string
-      EdbNameEn:
-        description: 英文指标名称
-        type: string
-      EdbNameSource:
-        description: 指标名称来源
-        type: string
-      EndDate:
-        description: 终止日期
-        type: string
-      ErDataUpdateDate:
-        description: 本次更新，数据发生变化的最早日期
-        type: string
-      Frequency:
-        description: 频率
-        type: string
-      Id:
-        type: integer
-        format: int64
-      LatestDate:
-        description: 数据最新日期
-        type: string
-      LatestValue:
-        description: 数据最新值
-        type: number
-        format: double
-      Source:
-        description: 来源id
-        type: integer
-        format: int64
-      SourceName:
-        description: 来源名称
-        type: string
-      StartDate:
-        description: 起始日期
-        type: string
-      SysUserId:
-        description: 创建人ID
-        type: integer
-        format: int64
-      SysUserRealName:
-        description: 创建人姓名
-        type: string
-      TerminalCode:
-        description: 终端编码，用于配置在机器上
-        type: string
-      Unit:
-        description: 单位
-        type: string
-  data_stat.EdbInfoStatColumnListItem:
-    title: EdbInfoStatColumnListItem
-    type: object
-    properties:
-      ColumnKey:
-        description: 字段
-        type: string
-      ColumnName:
-        description: 字段名称
-        type: string
-      Id:
-        description: 自增id
-        type: integer
-        format: int64
-      IsMust:
-        description: '是否必选列: 0非必选 1必须'
-        type: integer
-        format: int64
-      IsShow:
-        description: 是否展示：1展示，0不展示
-        type: integer
-        format: int64
-      IsSort:
-        description: 是否是允许排序的列，0否，1是
-        type: integer
-        format: int64
-      Type:
-        description: 列表类型：1数据源明细表，2数据源统计表，3删除指标列表，4指标信息变更表
-        type: integer
-        format: int64
-  data_stat.EdbInfoUpdateLogItem:
-    title: EdbInfoUpdateLogItem
-    type: object
-    properties:
-      CreateTime:
-        type: string
-      DataUpdateTime:
-        description: 最近一次数据发生变化的时间
-        type: string
-      EdbCode:
-        description: 指标编码
-        type: string
-      EdbInfoId:
-        description: 指标ID
-        type: integer
-        format: int64
-      EdbName:
-        description: 指标名称
-        type: string
-      EdbNameSource:
-        description: 指标名称来源
-        type: string
-      EndDate:
-        description: 终止日期
-        type: string
-      ErDataUpdateDate:
-        description: 本次更新，数据发生变化的最早日期
-        type: string
-      Frequency:
-        description: 频率
-        type: string
-      Id:
-        type: integer
-        format: int64
-      LatestDate:
-        description: 数据最新日期
-        type: string
-      LatestValue:
-        description: 数据最新值
-        type: number
-        format: double
-      Source:
-        description: 来源id
-        type: integer
-        format: int64
-      SourceName:
-        description: 来源名称
-        type: string
-      StartDate:
-        description: 起始日期
-        type: string
-      SysUserId:
-        description: 创建人ID
-        type: integer
-        format: int64
-      SysUserRealName:
-        description: 创建人姓名
-        type: string
-      TerminalCode:
-        description: 终端编码，用于配置在机器上
-        type: string
-      UniqueCode:
-        description: 指标唯一编码
-        type: string
-      Unit:
-        description: 单位
-        type: string
-      UpdateSysUserId:
-        description: 变更人ID
-        type: integer
-        format: int64
-      UpdateSysUserRealName:
-        description: 变更人姓名
-        type: string
-  data_stat.EdbInfoUpdateStatItem:
-    title: EdbInfoUpdateStatItem
-    type: object
-    properties:
-      CreateTime:
-        description: 创建时间
-        type: string
-      DataUpdateFailedReason:
-        description: 数据未正常更新原因
-        type: string
-      DataUpdateResult:
-        description: 数据更新结果：1成功，2失败
-        type: integer
-        format: int64
-      DataUpdateTime:
-        description: 数据更新时间
-        type: string
-      EdbCode:
-        description: 指标编码
-        type: string
-      EdbInfoId:
-        description: 指标ID
-        type: integer
-        format: int64
-      EdbName:
-        description: 指标名称
-        type: string
-      EdbNameSource:
-        description: 指标名称来源
-        type: string
-      ErDataUpdateDate:
-        description: 本次更新，数据发生变化的最早日期
-        type: string
-      Frequency:
-        description: 频率
-        type: string
-      HasRefresh:
-        description: 今日是否已刷新，1是，0否
-        type: integer
-        format: int32
-      Id:
-        type: integer
-        format: int64
-      IsAdd:
-        description: 是否是当日新增的指标：1是，2否
-        type: integer
-        format: int32
-      LatestDate:
-        description: 数据最新日期
-        type: string
-      LatestValue:
-        description: 数据最新值
-        type: number
-        format: double
-      NeedRefresh:
-        description: 今日是否需要定时刷新，1需要，0不需要
-        type: integer
-        format: int32
-      Source:
-        description: 来源id
-        type: integer
-        format: int64
-      SourceName:
-        description: 来源名称
-        type: string
-      StartDate:
-        description: 起始日期
-        type: string
-      SysUserId:
-        description: 创建人ID
-        type: integer
-        format: int64
-      SysUserRealName:
-        description: 创建人姓名
-        type: string
-      TerminalCode:
-        description: 终端编码，用于配置在机器上
-        type: string
-      Unit:
-        description: 单位
-        type: string
-      UpdateFailedReason:
-        description: 刷新失败原因
-        type: string
-      UpdateResult:
-        description: 本次刷新操作结果：1成功，2失败
-        type: integer
-        format: int64
-      UpdateTime:
-        description: 刷新时间
-        type: string
-  data_stat.GetEdbDeleteLogResp:
-    title: GetEdbDeleteLogResp
-    type: object
-    properties:
-      List:
-        type: array
-        items:
-          $ref: '#/definitions/data_stat.EdbInfoDeleteLogItem'
-      Paging:
-        $ref: '#/definitions/paging.PagingItem'
-  data_stat.GetEdbUpdateLogResp:
-    title: GetEdbUpdateLogResp
-    type: object
-    properties:
-      List:
-        type: array
-        items:
-          $ref: '#/definitions/data_stat.EdbInfoUpdateLogItem'
-      Paging:
-        $ref: '#/definitions/paging.PagingItem'
-  data_stat.GetEdbUpdateStatResp:
-    title: GetEdbUpdateStatResp
-    type: object
-    properties:
-      List:
-        type: array
-        items:
-          $ref: '#/definitions/data_stat.EdbInfoUpdateStatItem'
-      Paging:
-        $ref: '#/definitions/paging.PagingItem'
-  data_stat.StatColumnList:
-    title: StatColumnList
-    type: object
-    properties:
-      List:
-        type: array
-        items:
-          $ref: '#/definitions/data_stat.EdbInfoStatColumnListItem'
   excel.ExcelClassifyItems:
     title: ExcelClassifyItems
     type: object
@@ -21377,7 +20913,7 @@ definitions:
       TableDataList:
         type: array
         items:
-          $ref: '#/definitions/28773.<nil>.LuckySheetDataValue'
+          $ref: '#/definitions/29459.<nil>.LuckySheetDataValue'
   excel.TableDataMerge:
     title: TableDataMerge
     type: object
@@ -21618,7 +21154,7 @@ definitions:
         description: ppt的json数据
         type: string
       FirstPage:
-        $ref: '#/definitions/188796.0x14001c1e240.false'
+        $ref: '#/definitions/193187.0xc0025f60f0.false'
         description: 首页
       GroupId:
         description: 目录id
@@ -24778,7 +24314,7 @@ definitions:
         description: ppt的json数据
         type: string
       FirstPage:
-        $ref: '#/definitions/3787.0x14001dc86c0.false'
+        $ref: '#/definitions/3893.0xc0035d1620.false'
         description: 首页
       GroupId:
         description: 目录id
@@ -25331,16 +24867,19 @@ definitions:
       Content:
         description: 沙盘内容
         type: string
-      ExcelInfoId:
-        description: excel表格ID
-        type: integer
-        format: int64
       Name:
         description: 沙盘名称
         type: string
       PicUrl:
         description: 沙盘图片地址
         type: string
+      SandboxId:
+        description: 沙盘id
+        type: integer
+        format: int64
+      SandboxVersionCode:
+        description: 沙盘版本code
+        type: string
       SvgData:
         description: 沙盘svg图片数据
         type: string
@@ -26383,9 +25922,6 @@ definitions:
         format: datetime
       DataDateType:
         type: string
-      DataUpdateTime:
-        description: 最近一次数据发生变化的时间
-        type: string
       EdbCode:
         description: 指标编码
         type: string
@@ -26412,9 +25948,6 @@ definitions:
       EndDate:
         description: 终止日期
         type: string
-      ErDataUpdateDate:
-        description: 本次更新，数据发生变化的最早日期
-        type: string
       FixedValue:
         description: 固定值
         type: number
@@ -26475,9 +26008,6 @@ definitions:
         description: 来源id
         type: integer
         format: int64
-      SourceIndexName:
-        description: 数据源中的指标名称
-        type: string
       SourceName:
         description: 来源名称
         type: string
@@ -26489,9 +26019,6 @@ definitions:
         format: int64
       SysUserRealName:
         type: string
-      TerminalCode:
-        description: 终端编码，用于配置在机器上
-        type: string
       UniqueCode:
         description: 指标唯一编码
         type: string
@@ -28198,9 +27725,6 @@ tags:
 - name: custom_analysis
   description: |
     CustomAnalysisController 自定义分析
-- name: user_login
-  description: |
-    UserLoginAuthController 登录-需Token
 - name: eta_trial
   description: |
     EtaTrialController ETA试用
@@ -28210,12 +27734,9 @@ tags:
 - name: meeting_probabilities
   description: |
     MeetingProbabilitiesController 加息概率
-- name: data_stat
+- name: chart_framework
   description: |
-    EdbTerminalController 数据源终端管理
+    ChartFrameworkController 图库框架
 - name: smart_report
   description: |
     SmartReportController 智能研报
-- name: chart_framework
-  description: |
-    ChartFrameworkController 图库框架

utils/constants.go

@@ -349,3 +349,13 @@ const (
 
 // DIR_MOD 目录创建权限
 const DIR_MOD fs.FileMode = 0766 // Unix permission bits
+
+// 子数据来源渠道
+const (
+	DATA_SUB_SOURCE_EDB  = iota //经济数据库
+	DATA_SUB_SOURCE_DATE        //日期序列
+)
+
+const (
+	WindDbWsd = "wsd"
+)