|  | @@ -403,6 +403,10 @@ class Mvp:
 | 
	
		
			
				|  |  |          print('update finished!!!')
 | 
	
		
			
				|  |  |          return scores_behavioral
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +    def fz_fm(self, city=None, age=None, crowd=None):
 | 
	
		
			
				|  |  | +        scores_behavioral = self.city_age_crowd_1(city, age, crowd)
 | 
	
		
			
				|  |  | +        return scores_behavioral
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      def people_info(self):
 | 
	
		
			
				|  |  |          """
 | 
	
		
			
				|  |  |              答题人个人信息获取
 | 
	
	
		
			
				|  | @@ -745,6 +749,36 @@ class Mvp:
 | 
	
		
			
				|  |  |          return {'behavior_score': result, 'module_score': module_scores}
 | 
	
		
			
				|  |  |          # return {'score': result, 'data': data_list}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +    def city_age_crowd_1(self, city=None, age=None, crowd=None):
 | 
	
		
			
				|  |  | +        data_start = []
 | 
	
		
			
				|  |  | +        result = []
 | 
	
		
			
				|  |  | +        module_scores = []
 | 
	
		
			
				|  |  | +        if city is not None and age is not None and crowd is not None:
 | 
	
		
			
				|  |  | +            print('获取指定城市,年龄段,人群类型的数据...')
 | 
	
		
			
				|  |  | +            # people_uuids = self.get_people_uuid_by_type(crowd)
 | 
	
		
			
				|  |  | +            people_uuids = self.people_filter(city, age, crowd)
 | 
	
		
			
				|  |  | +            behavior_data = None
 | 
	
		
			
				|  |  | +            if len(people_uuids) > 0:
 | 
	
		
			
				|  |  | +                print('{}-{}-{}'.format(city, age, crowd))
 | 
	
		
			
				|  |  | +                datas = self.behavior_tag_init(city, age, people_uuids)
 | 
	
		
			
				|  |  | +                data_start.append(datas)
 | 
	
		
			
				|  |  | +                all_data, behavior_data_1 = self.calculation_standard_score(datas, city, age, crowd)
 | 
	
		
			
				|  |  | +                result.append(all_data)
 | 
	
		
			
				|  |  | +                behavior_data = behavior_data_1
 | 
	
		
			
				|  |  | +            if behavior_data:
 | 
	
		
			
				|  |  | +                module_scores.extend(self.module_score(crowd, city, age, behavior_data))
 | 
	
		
			
				|  |  | +        # data_list = []
 | 
	
		
			
				|  |  | +        # for e in data_start:
 | 
	
		
			
				|  |  | +        #     for key in e.keys():
 | 
	
		
			
				|  |  | +        #         values = e[key]
 | 
	
		
			
				|  |  | +        #         for sub_e in values:
 | 
	
		
			
				|  |  | +        #             ele = [key]
 | 
	
		
			
				|  |  | +        #             ele.extend(sub_e)
 | 
	
		
			
				|  |  | +        #             data_list.append(ele)
 | 
	
		
			
				|  |  | +        #     pass
 | 
	
		
			
				|  |  | +        return datas
 | 
	
		
			
				|  |  | +        # return {'score': result, 'data': data_list}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |      def scores(self):
 | 
	
		
			
				|  |  |          behavior_score = []
 | 
	
		
			
				|  |  |          module_scores = []
 |