|
|
@@ -295,7 +295,7 @@ class MyserviceDynamodb(object):
|
|
|
)
|
|
|
items = response['Items']
|
|
|
for k, v in enumerate(items):
|
|
|
- print (items[k]['userID'])
|
|
|
+ # print (items[k]['userID'])
|
|
|
user_ID = Device_User.objects.filter(userID=items[k]['userID']).values('userID', 'username', 'NickName')
|
|
|
try:
|
|
|
items[k]['username'] = user_ID[0]['username']
|
|
|
@@ -348,16 +348,14 @@ class MyserviceDynamodb(object):
|
|
|
table.delete()
|
|
|
print ('删除表成功')
|
|
|
|
|
|
- def item_delete(self, table_name,user_id,add_time):
|
|
|
+ def item_delete(self, table_name, name ,user_id,add_time):
|
|
|
dynamodb = self.session.resource('dynamodb')
|
|
|
table = dynamodb.Table(table_name)
|
|
|
try:
|
|
|
- print ( table_name,user_id,add_time)
|
|
|
- if str(table_name) == str('user_brand'):
|
|
|
+ if name == 'user_brand':
|
|
|
table.delete_item(
|
|
|
Key={
|
|
|
'userID': user_id,
|
|
|
- 'addTime': int(add_time),
|
|
|
}
|
|
|
)
|
|
|
else:
|
|
|
@@ -538,7 +536,7 @@ class UserBrandInfo(View):
|
|
|
else:
|
|
|
logKey = 'test_user_brand_all'
|
|
|
redisObj.rpush(name=logKey, val=add_user_brand_all_data)
|
|
|
- print (redisObj.llen(name=logKey))
|
|
|
+ # print (redisObj.llen(name=logKey))
|
|
|
# 判断redis列表长度
|
|
|
try:
|
|
|
if redisObj.llen(name=logKey) > 3:
|
|
|
@@ -611,14 +609,13 @@ class UserBrandInfo(View):
|
|
|
add_time = request_dict.getlist('add_time', None)
|
|
|
table_name = request_dict.getlist('table_name', None)
|
|
|
param_flag = CommonService.get_param_flag(data=[id,username])
|
|
|
- print (table_name[0])
|
|
|
if param_flag is True:
|
|
|
check_perm = ModelService.check_perm(userID=userID, permID=10)
|
|
|
if check_perm is True:
|
|
|
- if str(table_name[0])==str(user_brand):
|
|
|
- is_delete = my.item_delete(user_brand, id[0], add_time[0])
|
|
|
+ if str(table_name[0])=='user_brand':
|
|
|
+ is_delete = my.item_delete(user_brand, 'user_brand' ,id[0], add_time[0])
|
|
|
else:
|
|
|
- is_delete = my.item_delete(user_brand_all, id[0], add_time[0])
|
|
|
+ is_delete = my.item_delete(user_brand_all, 'user_brand_all',id[0], add_time[0])
|
|
|
return response.json(0, {'delete_count': is_delete[0]})
|
|
|
else:
|
|
|
return response.json(404)
|
pzb