|  | @@ -7,7 +7,7 @@ from category import get_category_videos
 | 
											
												
													
														|  |  from video_recall import PoolRecall
 |  |  from video_recall import PoolRecall
 | 
											
												
													
														|  |  from db_helper import RedisHelper
 |  |  from db_helper import RedisHelper
 | 
											
												
													
														|  |  import traceback
 |  |  import traceback
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | 
 |  | +import ast
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  app = Flask(__name__)
 |  |  app = Flask(__name__)
 | 
											
												
													
														|  |  log_ = Log()
 |  |  log_ = Log()
 | 
											
										
											
												
													
														|  | @@ -83,24 +83,26 @@ def app_video_hot_list():
 | 
											
												
													
														|  |      try:
 |  |      try:
 | 
											
												
													
														|  |          page_size= 10
 |  |          page_size= 10
 | 
											
												
													
														|  |          request_data = request.get_data()
 |  |          request_data = request.get_data()
 | 
											
												
													
														|  | 
 |  | +        print(request_data)
 | 
											
												
													
														|  |          request_data = json.loads(request_data)
 |  |          request_data = json.loads(request_data)
 | 
											
												
													
														|  |          page = request_data.get('page', 0)
 |  |          page = request_data.get('page', 0)
 | 
											
												
													
														|  |          log_.info('request data: {}'.format(request_data))
 |  |          log_.info('request data: {}'.format(request_data))
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          redis_helper = RedisHelper()
 |  |          redis_helper = RedisHelper()
 | 
											
												
													
														|  |          datas = redis_helper.get_data_from_redis('app_video_hot_list')
 |  |          datas = redis_helper.get_data_from_redis('app_video_hot_list')
 | 
											
												
													
														|  | -        datas = eval(datas)
 |  | 
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          if datas is None or len(datas) == 0:
 |  |          if datas is None or len(datas) == 0:
 | 
											
												
													
														|  |              result = {'code': -1, 'message': 'no data'}
 |  |              result = {'code': -1, 'message': 'no data'}
 | 
											
												
													
														|  |              log_.info('result: {}'.format(result))
 |  |              log_.info('result: {}'.format(result))
 | 
											
												
													
														|  |              return json.dumps(result)
 |  |              return json.dumps(result)
 | 
											
												
													
														|  | -        elif page > len(datas):
 |  | 
 | 
											
												
													
														|  | 
 |  | +        datas = ast.literal_eval(datas)
 | 
											
												
													
														|  | 
 |  | +        total_page = int(len(datas)/page_size)
 | 
											
												
													
														|  | 
 |  | +        if page > total_page -1 :
 | 
											
												
													
														|  |              result = {'code': -1, 'message': 'page exceed max'}
 |  |              result = {'code': -1, 'message': 'page exceed max'}
 | 
											
												
													
														|  |              log_.info('result: {}'.format(result))
 |  |              log_.info('result: {}'.format(result))
 | 
											
												
													
														|  |              return json.dumps(result)
 |  |              return json.dumps(result)
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -        result = {'code': 200, 'message': '', 'data':{'hot_list':datas[page*page_size, page*page_size+page_size]}}
 |  | 
 | 
											
												
													
														|  | 
 |  | +        result = {'code': 200, 'message': '', 'data':{'total_page':total_page, 'hot_list':datas[page*page_size:page*page_size+page_size]}}
 | 
											
												
													
														|  |          log_.info('result: {}'.format(result))
 |  |          log_.info('result: {}'.format(result))
 | 
											
												
													
														|  |          return json.dumps(result)
 |  |          return json.dumps(result)
 | 
											
												
													
														|  |  
 |  |  
 |