Преглед на файлове

fix:钢联数据刷新的bug

Roc преди 2 години
родител
ревизия
b6e85bfaaa
променени са 2 файла, в които са добавени 17 реда и са изтрити 4 реда
  1. 1 1
      controllers/base_from_wind.go
  2. 16 3
      models/base_from_mysteel.go

+ 1 - 1
controllers/base_from_wind.go

@@ -179,7 +179,7 @@ func GetServerUrl(edbCode string) (windUrl string, err error) {
 		}
 	}
 
-	windUrl = `http://datawind.hzinsights.com:8040/`
+	//windUrl = `http://datawind.hzinsights.com:8040/`
 	// 设置缓存
 	cacheKey := utils.CACHE_WIND_URL + ":" + edbCode
 	_ = utils.Rc.SetNX(cacheKey, windUrl, utils.GetTodayLastSecond())

+ 16 - 3
models/base_from_mysteel.go

@@ -19,12 +19,25 @@ type GlData struct {
 
 func GetGlDataByCondition(condition string, pars []interface{}) (item []*GlData, err error) {
 	condition += " AND IS_DELETE=0 "
-	sql := ` SELECT * FROM mb_index_main_data WHERE 1=1 AND DATA_VALUE is not null `
+	sql1 := ` SELECT * FROM mb_index_main_data WHERE 1=1 AND DATA_VALUE is not null `
 	o := orm.NewOrmUsingDB("gl")
 	if condition != "" {
-		sql += condition
+		sql1 += condition
 	}
-	sql += ` ORDER BY PUBLISH_TIME DESC `
+	sql := `select * from (` + sql1 + ` having 1 order by PUBLISH_TIME DESC ) tmp group by DATA_DATE ORDER BY PUBLISH_TIME DESC `
+
+	//select * from (
+	//	select * from mb_index_main_data where
+	//		1 = 1
+	//		AND DATA_VALUE IS NOT NULL
+	//		AND INDEX_CODE ="ID00182580"
+	//		AND DATA_DATE >="2016-09-01"
+	//		AND IS_DELETE = 0   having 1 order by PUBLISH_TIME DESC
+	//
+	//
+	//		) tmp group by DATA_DATE
+	//
+	//		order by PUBLISH_TIME DESC
 	_, err = o.Raw(sql, pars).QueryRows(&item)
 	return
 }