|
|
@@ -37,7 +37,7 @@ func (d *DataSmt) List(searchValue, dataType string, pageNum, pageSize int64) *p
|
|
|
}
|
|
|
//数据查询
|
|
|
data := &[]map[string]interface{}{}
|
|
|
- querySql := "select id,name,data_type,format,clear_status from %s where %s ORDER BY serial_number limit %v ,%v "
|
|
|
+ querySql := "select id,name,data_type,format,clear_status from %s where %s ORDER BY serial_number, update_time desc,CONVERT(name USING gbk) asc,id desc limit %v ,%v "
|
|
|
queryStrArr := []string{
|
|
|
" status=1 ",
|
|
|
}
|
|
|
@@ -69,7 +69,7 @@ func (d *DataSmt) List(searchValue, dataType string, pageNum, pageSize int64) *p
|
|
|
count := db.Mysql_BaseService.CountBySql(countQuerySql)
|
|
|
result.PageCount = count
|
|
|
//热搜词处理
|
|
|
- hotKeySql := fmt.Sprintf("select keyword from %s where status=1 ORDER BY serial_number LIMIT 0,8", DATA_SUPERMARKET)
|
|
|
+ hotKeySql := fmt.Sprintf(" select a.keyword as keyword from (SELECT keyword,min(serial_number) as serial_number,max(update_time) as update_time FROM %s where keyword<>'' and keyword is not null and status=1 GROUP BY keyword ) a ORDER BY a.serial_number, a.update_time desc,CONVERT(a.keyword USING gbk) asc limit 8", DATA_SUPERMARKET)
|
|
|
hotData := db.Mysql_BaseService.SelectBySql(hotKeySql)
|
|
|
hotKeyArr := []string{}
|
|
|
for _, m := range *hotData {
|
WH01243