更新

.idea/dictionaries/zhanlangpc.xml

@@ -2,6 +2,7 @@
   <dictionary name="zhanlangpc">
     <words>
       <w>smembers</w>
+      <w>srem</w>
     </words>
   </dictionary>
 </component>

adslib/addata/custom.go

@@ -1,10 +1,13 @@
 package addata
 
 import (
+	"fmt"
 	"math/rand"
 	"miads/adslib/redis_data"
 	"miads/adslib/utils"
+	"strconv"
 	"strings"
+	"time"
 )
 
 func CombineOrderBy(adData *AdData, dsp *utils.DspParam) {
@@ -81,39 +84,52 @@ func getOneAds(dsp *utils.DspParam, orderType int, fixFlag int) (*redis_data.AdO
 	return nil, nil
 }
 
-func getSubTimeValue(adData *redis_data.AdOrderInfo, a) {
-	b_min = int(ads_item['begin_time'])
-	b_min = datetime.fromtimestamp(b_min)
+// 获取投放数量
+func getNeedDispatchCount(adData *redis_data.AdOrderInfo) (int,error) {
+	beginTime := time.Unix(adData.BeginTime, 0)
 
 	// 获取当前分钟值
-	now_minute = b_min.minute + (b_min.hour * 60)
+	beginMinute := beginTime.Minute() + (beginTime.Hour() * 60)
 
-	// 不足一天
-	all_count = 1587820.0
-	e_time = int(ads_item['end_time'])
+	// 获取起点分钟, 不知道原因, 不加会有bug
+	beginMinute += 2
 
-	// 获取起点分钟
-	be_minute = now_minute + 2
 	// 获取分钟数到24点还能跑多少值
-	key = "time_all_count_" + str(be_minute)
-	if int(ads_item['line_type']) == 1:
-	// 定制曲线
-	key = "time_all_count_{0}_{1}".format(ads_item['order_id'], str(be_minute))
+	key := "time_all_count_" + strconv.Itoa(beginMinute)
+	// 0 默认曲线, 1 定制曲线
+	if adData.LineType == 1 {
+		key = fmt.Sprintf("time_all_count_%d_%d", adData.OrderID, beginMinute)
+	}
+
 	// 起始剩余值
-	all_count = redis_tools.get_key_int_value(key)
+	beginRemainDispatchCount, err := redis_data.GetRemainDispatchCount(key)
+	if err != nil {
+		return 0, err
+	}
 
 	// 计算最后分钟
-	e_d = datetime.fromtimestamp(e_time)
-	e_d_min = e_d.minute + (e_d.hour * 60)
-	if e_d_min > 1439:
-	e_d_min = e_d_min - 1440 + 2
-	key = "time_all_count_" + str(e_d_min)
-	if int(ads_item['line_type']) == 1:
-	// 定制曲线
-	key = "time_all_count_{0}_{1}".format(ads_item['order_id'], str(e_d_min))
+	endTime := time.Unix(adData.EndTime, 0)
+
+	endMinute := endTime.Minute() + (endTime.Hour() * 60)
+	if endMinute > 1439 {
+		// 不懂这里逻辑
+		endMinute = endMinute - 1440 + 2
+	}
+
+	key = "time_all_count_" + strconv.Itoa(endMinute)
+	if adData.LineType == 1 {
+		// 定制曲线
+		key = fmt.Sprintf("time_all_count_%d_%d", adData.OrderID, endMinute)
+	}
+
+	endRemainDispatchCnt, err := redis_data.GetRemainDispatchCount(key)
+	if err != nil {
+		return 0, err
+	}
+
 	// 结束的剩余值 - 起始剩余值 = 获取区间能跑的值
-	all_count = all_count - redis_tools.get_key_int_value(key)
-	return all_count
+	needDispatchCount := beginRemainDispatchCount - endRemainDispatchCnt
+	return needDispatchCount, nil
 }
 
 func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag int, xiaomiHasFlag int) {
@@ -137,138 +153,167 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag
 		}
 	}
 
-	a = datetime.now()
-
 	// 获取剩余时间内的值
-	all_count = get_sub_time_value(ads_item, a)
-	all_count = all_count * 1.0
-
-	#已经投放的key
-	show_key = "order_kpi_%s_%d%d%d_show_kpi" % (ads_item['order_id'], a.year, a.month, a.day)
-	click_key = "order_kpi_%s_%d%d%d_click_kpi" % (ads_item['order_id'], a.year, a.month, a.day)
-	over_kpi = redis_tools.get_key_int_value(show_key)
-	show_kpi = ads_item['show_kpi']
-	click_kpi = ads_item['click_kpi']
-	if all_count < 1:
-	raise
-	gen.Return((None, None))
-	plan_key = "plan_all_kpi_%s_%d%d%d_show_kpi" % (ads_item['order_id'], a.year, a.month, a.day)
-	redis_common.redis_ads().set(plan_key, all_count, 60*24*60)
-
-	w_value, rate = get_now_min_value(ads_item, all_count, show_kpi, a)
-	if w_value < 1:
-	w_value = 1
-
-	plan_key = "plan_kpi_%s_%d%d%d_%d_show_kpi" % (ads_item['order_id'], a.year, a.month, a.day, a.hour*60 + a.minute)
-	redis_common.redis_ads().set(plan_key, w_value, 60*24*60)
-
-	over_key = "order_kpi_%s_%d%d%d_%d_show_kpi" % (ads_item['order_id'], a.year, a.month, a.day, a.hour*60 + a.minute)
-	o_value = int(redis_tools.get_key_int_value(over_key))
-
-	js_order_id = int(ads_item['js_order_id'])
-	if o_value < w_value:
-	order_name = ads_item['title']
-	data =
-	{
-		"js_order_id":js_order_id,
-		"target":"",
-		"video_url":"",
-		"duration":5,
-		"target_addition":[],
-		"image_url":"",
-		"result":0,
-		"msg":0,
-		"user_agent":ua,
-		"order_name":order_name
+	needDispatchCnt, err := getNeedDispatchCount(order)
+	if err != nil {
+		return err
+	}
+
+	if needDispatchCnt < 1 {
+		return nil, nil
 	}
 
-	#放量
-	redis_tools.incr_key_value(over_key)
-	redis_tools.incr_key_value(show_key)
-	show_url = ads_item['show_url']
-	click_url = ads_item['click_url']
-
-	target = ads_item['target_url']
-
-	if order_name.find("_ios") > 0:
-	ios_imei, ios_ua = get_ios_ua_imei(dsp)
-	if ios_ua:
-	data['user_agent'] = ios_ua
-	if ads_item.get('imei_replace_flag', 0) == 1 and
-ios_imei:
-	show_url = show_url.replace('__IDFA__', ios_imei)
-	click_url = click_url.replace('__IDFA__', ios_imei)
-	target = target.replace('__IDFA__', ios_imei)
-	if order_name.find("__OS__") > 0:
-	show_url = show_url.replace('__OS__', '1')
-	click_url = click_url.replace('__OS__', '1')
-	target = target.replace('__OS__', '1')
-
-	elif
-	order_name.find("_android") > 0 :
-	### 判断是否需要替换imei
-	if ads_item.get('imei_replace_flag', 0) == 1:
-	show_url = show_url.replace('__IMEI__', dsp.real_md5_imei)
-	click_url = click_url.replace('__IMEI__', dsp.real_md5_imei)
-	target = target.replace('__IMEI__', dsp.real_md5_imei)
-
-	if order_name.find("__OS__") > 0:
-	show_url = show_url.replace('__OS__', '0')
-	click_url = click_url.replace('__OS__', '0')
-	target = target.replace('__OS__', '0')
+	curTime := time.Now()
 
-	else:
-	if r < 40:
-	ios_imei, ios_ua = get_ios_ua_imei(dsp)
-	if ios_ua:
-	data['user_agent'] = ios_ua
-	if ads_item.get('imei_replace_flag', 0) == 1 and
-ios_imei:
-	show_url = show_url.replace('__IDFA__', ios_imei)
-	click_url = click_url.replace('__IDFA__', ios_imei)
-	target = target.replace('__IDFA__', ios_imei)
-	if order_name.find("__OS__") > 0:
-	show_url = show_url.replace('__OS__', '1')
-	click_url = click_url.replace('__OS__', '1')
-	target = target.replace('__OS__', '1')
-	else:
-	if ads_item.get('imei_replace_flag', 0) == 1:
-	show_url = show_url.replace('__IMEI__', dsp.real_md5_imei)
-	click_url = click_url.replace('__IMEI__', dsp.real_md5_imei)
-	target = target.replace('__IMEI__', dsp.real_md5_imei)
-	if order_name.find("__OS__") > 0:
-	show_url = show_url.replace('__OS__', '0')
-	click_url = click_url.replace('__OS__', '0')
-	target = target.replace('__OS__', '0')
-
-	if order_name.find("__IP__") > 0:
-	show_url = show_url.replace('__IP__', dsp.ip)
-	click_url = click_url.replace('__IP__', dsp.ip)
-	target = target.replace('__IP__', dsp.ip)
-	if order_type == 0:
-	addi = get_monitor_url('VIEW', 5, order_name, req_source, show_url)
-	else:
-	addi = get_monitor_url('VIEW', 5, order_name, 'follow', show_url)
-
-	#addi['urls'].append(show_url)
-	data['target_addition'].append(addi)
-
-	r = random.randint(0, 1000)
-	c_rate = click_kpi * 1.0 / (ads_item['show_kpi']) * 1000
-	if r < c_rate:
-	#下发点击
-	addi = get_monitor_url('CLICK', 1, order_name, req_source, click_url)
-	#addi['urls'].append(click_url)
-	data['target_addition'].append(addi)
-	md5_skip = hashlib.md5(target).hexdigest()
-	redis_tools.incr_key_value(click_key)
-	real_target = ads_config.Host + "?action=LOADING&req_source={0}&advertiser={2}&skip={1}&skip_other={3}".format(
-		req_source, '', order_name, md5_skip)
-	### 塞入缓存中
-	redis_tools.set_skip_info(md5_skip, target)
-	data['target'] = real_target
-	raise
-	gen.Return((None, data))
+	// #已经投放的key
+	finishShowCnt, err := redis_data.GetFinishedDispatchCount(order.OrderID, "show", curTime)
+	if err != nil {
+		return nil, err
+	}
+	finishClickCnt, err := redis_data.GetFinishedDispatchCount(order.OrderID, "click", curTime)
+	if err != nil {
+		return nil, err
+	}
+
+	redis_data.SetPlanDispatchCount(order.OrderID, "show", needDispatchCount, time.Now().Unix())
+
+	// 计算曲线比例
+	rate := float32(order.ShowKpi) / float32(needDispatchCnt)
+
+	curMinutes := curTime.Hour() * 60 + curTime.Minute()
+	key := "time_" + strconv.Itoa(curMinutes)
+	if order.LineType == 1 {
+		// 定制曲线
+		key = fmt.Sprintf("time_%d_%d", order.OrderID, curMinutes)
+	}
+
+	lineValue, err := redis_data.GetPerMinuteNeedDispatchCnt(order.OrderID, curTime)
+	if err != nil {
+		return nil, err
+	}
+	// 当前分钟需要放出去的数量
+	curMinuteNeedDispatchCnt := int(float32(lineValue) * rate)
+	if dispatchCnt < 1 {
+		dispatchCnt = 1
+	}
+
+	redis_data.SetOrderPlanDispatchCount(order.OrderID, "show", dispatchCnt, curTime)
+
+	// 获取当前分钟已经完成的下发
+	curMinutefinishedDispatchCnt, err := redis_data.GetPreMinuteFinishedDispatchCount(order.OrderID, "show", curTime)
+
+	if curMinutefinishedDispatchCnt < curMinuteNeedDispatchCnt {
+		data =
+		{
+			"js_order_id":js_order_id,
+			"target":"",
+			"video_url":"",
+			"duration":5,
+			"target_addition":[],
+			"image_url":"",
+			"result":0,
+			"msg":0,
+			"user_agent":ua,
+			"order_name":order_name
+		}
+
+		//放量
+		newFinishCnt, err := redis_data.IncrFinishedDispatchCount(order.OrderID, "show", 1, curTime)
+		if err != nil {
+			return err
+		}
+		newCurMinutefinishedCnt, err := redis_data.IncrPreMinuteFinishedDispatchCount(order.OrderID, "show", 1, curTime)
+		if err != nil {
+			return err
+		}
+
+		show_url = ads_item['show_url']
+		click_url = ads_item['click_url']
+
+		target = ads_item['target_url']
+
+		orderName := ads_item['title']
+		if strings.Index(order.Title, "_ios") != -1 {
+			ios_imei, ios_ua = get_ios_ua_imei(dsp)
+		}
+		if ios_ua:
+		data['user_agent'] = ios_ua
+		if ads_item.get('imei_replace_flag', 0) == 1 and
+	ios_imei:
+		show_url = show_url.replace('__IDFA__', ios_imei)
+		click_url = click_url.replace('__IDFA__', ios_imei)
+		target = target.replace('__IDFA__', ios_imei)
+		if order_name.find("__OS__") > 0:
+		show_url = show_url.replace('__OS__', '1')
+		click_url = click_url.replace('__OS__', '1')
+		target = target.replace('__OS__', '1')
+
+		elif
+		order_name.find("_android") > 0 :
+		### 判断是否需要替换imei
+		if ads_item.get('imei_replace_flag', 0) == 1:
+		show_url = show_url.replace('__IMEI__', dsp.real_md5_imei)
+		click_url = click_url.replace('__IMEI__', dsp.real_md5_imei)
+		target = target.replace('__IMEI__', dsp.real_md5_imei)
+
+		if order_name.find("__OS__") > 0:
+		show_url = show_url.replace('__OS__', '0')
+		click_url = click_url.replace('__OS__', '0')
+		target = target.replace('__OS__', '0')
+
+		else:
+		if r < 40:
+		ios_imei, ios_ua = get_ios_ua_imei(dsp)
+		if ios_ua:
+		data['user_agent'] = ios_ua
+		if ads_item.get('imei_replace_flag', 0) == 1 and
+	ios_imei:
+		show_url = show_url.replace('__IDFA__', ios_imei)
+		click_url = click_url.replace('__IDFA__', ios_imei)
+		target = target.replace('__IDFA__', ios_imei)
+		if order_name.find("__OS__") > 0:
+		show_url = show_url.replace('__OS__', '1')
+		click_url = click_url.replace('__OS__', '1')
+		target = target.replace('__OS__', '1')
+		else:
+		if ads_item.get('imei_replace_flag', 0) == 1:
+		show_url = show_url.replace('__IMEI__', dsp.real_md5_imei)
+		click_url = click_url.replace('__IMEI__', dsp.real_md5_imei)
+		target = target.replace('__IMEI__', dsp.real_md5_imei)
+		if order_name.find("__OS__") > 0:
+		show_url = show_url.replace('__OS__', '0')
+		click_url = click_url.replace('__OS__', '0')
+		target = target.replace('__OS__', '0')
+
+		if order_name.find("__IP__") > 0:
+		show_url = show_url.replace('__IP__', dsp.ip)
+		click_url = click_url.replace('__IP__', dsp.ip)
+		target = target.replace('__IP__', dsp.ip)
+		if order_type == 0:
+		addi = get_monitor_url('VIEW', 5, order_name, req_source, show_url)
+		else:
+		addi = get_monitor_url('VIEW', 5, order_name, 'follow', show_url)
+
+		#addi['urls'].append(show_url)
+		data['target_addition'].append(addi)
+
+		r = random.randint(0, 1000)
+		c_rate = click_kpi * 1.0 / (ads_item['show_kpi']) * 1000
+		if r < c_rate:
+		#下发点击
+		addi = get_monitor_url('CLICK', 1, order_name, req_source, click_url)
+		#addi['urls'].append(click_url)
+		data['target_addition'].append(addi)
+		md5_skip = hashlib.md5(target).hexdigest()
+		redis_tools.incr_key_value(click_key)
+		real_target = ads_config.Host + "?action=LOADING&req_source={0}&advertiser={2}&skip={1}&skip_other={3}".format(
+			req_source, '', order_name, md5_skip)
+		### 塞入缓存中
+		redis_tools.set_skip_info(md5_skip, target)
+		data['target'] = real_target
+		raise
+		gen.Return((None, data))
+	}
 	#获取当前已经放出去的次数
 	raise gen.Return((None, None))
 }~

adslib/redis_data/redis_data.go

@@ -251,3 +251,178 @@ func SetReqSourceView(adv string, reqSource string, source string) {
 	key := fmt.Sprintf("view3_%s_%s_%d_%s", adv, reqSource, dateInt, source)
 	conn.Do("incr", key)
 }
+
+// 获取剩余总投放量
+func GetRemainDispatchCount(key string) (int, error)  {
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	rsp, err := conn.Do("GET", key)
+	if err != nil {
+		return 0, err
+	}
+
+	if rsp == nil {
+		return 0, nil
+	}
+
+	count, _ := redis.Int(rsp, err)
+	return count, nil
+}
+
+
+// 获取已经投放的量
+// dispatchType: "click", "show"
+func GetFinishedDispatchCount(orderId int64, dispatchType string, curTime time.Time) (int, error)  {
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	key := fmt.Sprintf("order_kpi_%d_%d%d%d_%s_kpi", orderId, curTime.Year(), curTime.Month(), curTime.Day(), dispatchType)
+	rsp, err := conn.Do("GET", key)
+	if err != nil {
+		return 0, err
+	}
+
+	if rsp == nil {
+		return 0, nil
+	}
+
+	count, _ := redis.Int(rsp, err)
+	return count, nil
+}
+
+// 增加已经投放的量
+// dispatchType: "click", "show"
+func IncrFinishedDispatchCount(orderId int64, dispatchType string, incrCnt int, curTime time.Time) (int, error)  {
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	key := fmt.Sprintf("order_kpi_%d_%d%d%d_%s_kpi", orderId, curTime.Year(), curTime.Month(), curTime.Day(), dispatchType)
+	rsp, err := conn.Do("INCR", key, incrCnt)
+	if err != nil {
+		return 0, err
+	}
+
+	count, _ := redis.Int(rsp, err)
+	return count, nil
+}
+
+// 获取当前分钟已经投放的量
+// dispatchType: "click", "show"
+func GetPreMinuteFinishedDispatchCount(orderId int64, dispatchType string, curTime time.Time) (int, error)  {
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	curMinutes := curTime.Hour() * 60 + curTime.Minute()
+	key := fmt.Sprintf("order_kpi_%d_%d%d%d_%d_%s_kpi", orderId, curTime.Year(), curTime.Month(), curTime.Day(), curMinutes, dispatchType)
+	rsp, err := conn.Do("GET", key)
+	if err != nil {
+		return 0, err
+	}
+
+	if rsp == nil {
+		return 0, nil
+	}
+
+	count, _ := redis.Int(rsp, err)
+	return count, nil
+}
+
+// 增加当前分钟已经投放的量
+// dispatchType: "click", "show"
+func IncrPreMinuteFinishedDispatchCount(orderId int64, dispatchType string, incrCnt int, curTime time.Time) (int, error)  {
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	curMinutes := curTime.Hour() * 60 + curTime.Minute()
+	key := fmt.Sprintf("order_kpi_%d_%d%d%d_%d_%s_kpi", orderId, curTime.Year(), curTime.Month(), curTime.Day(), curMinutes, dispatchType)
+	rsp, err := conn.Do("INCR", key, incrCnt)
+	if err != nil {
+		return 0, err
+	}
+	count, _ := redis.Int(rsp, err)
+	return count, nil
+}
+
+// 设置总计划投放数量
+// dispatchType: "click", "show"
+func SetPlanDispatchCount(orderId int64, dispatchType string, cnt int, curTime time.Time) {
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	key := fmt.Sprintf("plan_all_kpi_%d_%d%d%d_%s_kpi", orderId, curTime.Year(), curTime.Month(), curTime.Day(), dispatchType)
+	conn.Do("SET", key, cnt, 3600*24)
+}
+
+// 设置订单计划投放数量
+// dispatchType: "click", "show"
+func SetOrderPlanDispatchCount(orderId int64, dispatchType string, cnt int, curTime time.Time) {
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	curMinutes := curTime.Hour() * 60 + curTime.Minute()
+	key := fmt.Sprintf("plan_kpi_%d_%d%d%d_%d_%s_kpi", orderId, curTime.Year(), curTime.Month(), curTime.Day(), curMinutes, dispatchType)
+	conn.Do("SET", key, cnt, 3600*24)
+}
+
+// 获取每分钟要投放的量
+func GetPerMinuteNeedDispatchCnt(orderId int64, curTime time.Time) (int, error){
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	curMinutes := curTime.Minute() + (curTime.Hour() * 60)
+	key := fmt.Sprintf("time_%d_%d", orderId, curMinutes)
+	rsp, err := conn.Do("GET", key)
+
+	if err != nil {
+		return 0, err
+	}
+
+	if rsp == nil {
+		return 0, nil
+	}
+
+	count, _ := redis.Int(rsp, err)
+	return count, nil
+}
+
+// 获取ios的ua和imei
+func GetIosUaImei(ip string) (string, string, error){
+	conn := ads_redis.RedisConn.Get()
+	defer conn.Close()
+
+	dateInt, _ := strconv.Atoi(time.Now().Format("20060102"))
+	redisKey := fmt.Sprintf("ads_ios_%d_%s", dateInt, ip)
+
+	// "{'imei': 'F389E3E1-5459-4B30-83A9-1AD504F6293F', 'ua': 'Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML like Gecko) Mobile/15E148'}"
+	rsp, err := conn.Do("GET", redisKey)
+	if err != nil {
+		return "", "", err
+	}
+
+	if rsp == nil {
+		redisKey = fmt.Sprintf("new_ios_ua_v2_%d", dateInt)
+		rsp, err = conn.Do("SRANDMEMBER", redisKey)
+		if err != nil {
+			return "", "", err
+		}
+		if rsp == nil {
+			return "", "", nil
+		}
+
+		conn.Do("SREM", redisKey, rsp)
+
+		tomorrowDateInt := time.Unix(time.Now().Unix()+86400, 0).Format("20060102")
+		set_new_ios_ua(redis_value,tomorrow_day_id)
+		return eval(redis_value)
+	}
+
+	redis_ua_value = redis_ua.get_ip_ios_ua(ip)
+	if not redis_ua_value:
+	redis_ua_value = redis_ua.get_new_ios_ua()
+	if redis_ua_value:
+	redis_ua.set_ip_ios_ua(ip,redis_ua_value)
+	imei = redis_ua_value.get('imei','')
+	ua = redis_ua_value.get('ua','')
+	return imei,ua
+}