|  | @@ -336,13 +336,11 @@ object makedata_ad_33_bucketDataPrint_20240628 {
 | 
	
		
			
				|  |  |            val allfeaturemap = if (record.isNull("allfeature")) new JSONObject() else
 | 
	
		
			
				|  |  |              JSON.parseObject(record.getString("allfeature"))
 | 
	
		
			
				|  |  |            val apptype = record.getString("apptype")
 | 
	
		
			
				|  |  | -          val abcode = record.getString("abcode")
 | 
	
		
			
				|  |  |            val label = record.getString("ad_is_conversion")
 | 
	
		
			
				|  |  | -          (apptype, "pagesource", "level", label, abcode, allfeaturemap, featureMap, flag)
 | 
	
		
			
				|  |  | +          (apptype, "pagesource", "level", label, "abcode", allfeaturemap, featureMap, flag)
 | 
	
		
			
				|  |  |          }).filter{
 | 
	
		
			
				|  |  |            case (apptype, pagesource, level, label, abcode, allfeaturemap, featureMap, flag) =>
 | 
	
		
			
				|  |  | -            Set("17").contains(apptype) &&
 | 
	
		
			
				|  |  | -            Set("ab0", "ab1", "ab2", "ab3", "ab4").contains(abcode) && !flag
 | 
	
		
			
				|  |  | +            Set("17").contains(apptype) && !flag
 | 
	
		
			
				|  |  |          }.mapPartitions(row => {
 | 
	
		
			
				|  |  |            val result = new ArrayBuffer[String]()
 | 
	
		
			
				|  |  |            val bucketsMap = bucketsMap_br.value
 |