浏览代码

fix: 图库权限验证err

hsun 3 年之前
父节点
当前提交
ecaccb5a51
共有 4 个文件被更改,包括 13 次插入10 次删除
  1. 1 1
      middleware/check_chart_auth.go
  2. 2 2
      models/tables/edb_data/query.go
  3. 5 3
      services/chart/chart_info.go
  4. 5 4
      services/chart/edb_data.go

+ 1 - 1
middleware/check_chart_auth.go

@@ -16,7 +16,7 @@ func CheckChartAuth() gin.HandlerFunc {
 
 		ok, permissionCheckInfo, err := company.CheckUserChartPermission(userInfo.CompanyID, int(userInfo.UserID))
 		if err != nil {
-			response.Fail("图库权限验证失败", c)
+			response.FailMsg("图库权限验证失败", "图库权限验证失败" + err.Error(), c)
 			c.Abort()
 			return
 		}

+ 2 - 2
models/tables/edb_data/query.go

@@ -283,7 +283,7 @@ func GetBaseFromSmmDataAllByIndexCode(indexCode string) (list []*BaseFromSmmData
 	return
 }
 
-func GetBaseFromSmmMaxOrMinDate(indexCode string) (min_date, max_date string, err error) {
+/*func GetBaseFromSmmMaxOrMinDate(indexCode string) (min_date, max_date string, err error) {
 	//o := orm.NewOrm()
 	//o.Using("data")
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM base_from_smm_data WHERE index_code=? `
@@ -291,7 +291,7 @@ func GetBaseFromSmmMaxOrMinDate(indexCode string) (min_date, max_date string, er
 	err = global.MYSQL["data"].Raw(sql, indexCode).Scan(&min_date, &max_date).Error
 
 	return
-}
+}*/
 
 type YsResult struct {
 	Code int64 `json:"Code"`

+ 5 - 3
services/chart/chart_info.go

@@ -228,19 +228,21 @@ func RefreshChartInfo(chartInfoId int) (err error) {
 			if err != nil {
 				errMsg = "RefreshEdbDataByLz Err:" + err.Error()
 			}
-		} else if source == utils.DATA_SOURCE_YS {
+		}
+		/*else if source == utils.DATA_SOURCE_YS {
 			endDate := time.Now().AddDate(utils.DATA_END_DATE_LIMIT, 0, 0).Format(utils.FormatDate)
 			err = RefreshAllEdbDataByYs(edbInfoId, source, edbCode, startDate, endDate)
 			if err != nil {
 				errMsg = "RefreshEdbDataByYs Err:" + err.Error()
 			}
-		} else if source == utils.DATA_SOURCE_GL {
+		}
+		else if source == utils.DATA_SOURCE_GL {
 			endDate := time.Now().AddDate(utils.DATA_END_DATE_LIMIT, 0, 0).Format(utils.FormatDate)
 			err = RefreshEdbDataByGl(edbInfoId, edbCode, startDate, endDate)
 			if err != nil {
 				errMsg = "RefreshEdbDataByGl Err:" + err.Error()
 			}
-		}
+		}*/
 
 		/*maxAndMinItem, err := data_manage.GetEdbInfoMaxAndMinInfo(source, edbCode)
 		if err != nil {

+ 5 - 4
services/chart/edb_data.go

@@ -479,7 +479,7 @@ func RefreshEdbDataByLz(edbInfoId int, edbCode, startDate, endDate string) (err
 }
 
 //全部刷新有色数据
-func RefreshAllEdbDataByYs(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
+/*func RefreshAllEdbDataByYs(edbInfoId, source int, edbCode, startDate, endDate string) (err error) {
 
 	tx := global.MYSQL["data"].Begin()
 	defer func() {
@@ -552,7 +552,7 @@ func RefreshAllEdbDataByYs(edbInfoId, source int, edbCode, startDate, endDate st
 		}
 	}
 	return
-}
+}*/
 
 const (
 	dataUrl = "https://dataapi.smm.cn/GetData/" //data url (中文)
@@ -820,7 +820,7 @@ func SyncSmmIndexDataBase(edbCode, startDate, endDate string) (err error) {
 
 		//修改数据开始,结束日期
 		{
-			indexList, err := edbDataModel.GetBaseFromSmmIndexBySmmCode(smmCode)
+			/*indexList, err := edbDataModel.GetBaseFromSmmIndexBySmmCode(smmCode)
 			if err != nil {
 				fmt.Println("GetBaseFromSmmIndexBySmmCode Err:" + err.Error())
 			}
@@ -829,12 +829,13 @@ func SyncSmmIndexDataBase(edbCode, startDate, endDate string) (err error) {
 				if err != nil {
 					fmt.Println("GetEdbDataSmmMaxOrMinDate Err:" + err.Error())
 				} else {
+					// TODO:CV
 					err = edbDataModel.ModifyBaseFromSmmMinDateAndMaxDate(sv.BaseFromSmmIndexId, minDate, maxDate)
 					if err != nil {
 						fmt.Println("ModifyBaseFromSmmMinDateAndMaxDate Err:" + err.Error())
 					}
 				}
-			}
+			}*/
 		}
 	}
 	return