Browse Source

Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer into peng

peng 1 year ago
parent
commit
c03447d3f4
1 changed files with 4 additions and 3 deletions
  1. 4 3
      Controller/AppCampaignController.py

+ 4 - 3
Controller/AppCampaignController.py

@@ -127,18 +127,19 @@ class AppCampaignView(View):
         campaign_name = request_dict.get('campaign_name', None)
         campaign_name = request_dict.get('campaign_name', None)
         campaign_url = request_dict.get('campaign_url', None)
         campaign_url = request_dict.get('campaign_url', None)
         campaign_type = request_dict.get('campaign_type', None)
         campaign_type = request_dict.get('campaign_type', None)
+        status = request_dict.get('status', None)
         device_type_names = json.loads(request_dict.get('device_type_list', None))  # 设备类型名称列表
         device_type_names = json.loads(request_dict.get('device_type_list', None))  # 设备类型名称列表
         country_name_list = json.loads(request_dict.get('country_name_list', None))  # 地区列表
         country_name_list = json.loads(request_dict.get('country_name_list', None))  # 地区列表
         campaign_start_time = request_dict.get('campaign_start_time', None)
         campaign_start_time = request_dict.get('campaign_start_time', None)
         campaign_end_time = request_dict.get('campaign_end_time', None)
         campaign_end_time = request_dict.get('campaign_end_time', None)
         campaign_show_stime = request_dict.get('campaign_show_stime', 0)
         campaign_show_stime = request_dict.get('campaign_show_stime', 0)
-        campaign_show_etime = request_dict.get('campaign_show_etime', 86400)
+        campaign_show_etime = request_dict.get('campaign_show_etime', 86399)
 
 
         if not all([campaign_name, campaign_type, device_type_names, campaign_url,
         if not all([campaign_name, campaign_type, device_type_names, campaign_url,
                     country_name_list, campaign_start_time, campaign_end_time, file]):
                     country_name_list, campaign_start_time, campaign_end_time, file]):
             return response.json(444)
             return response.json(444)
 
 
-        # 针对特殊地区的处理,写的确实烂,别骂了
+        # 针对特殊地区的处理,表没设计好用这个处理挽救一下
         unknown_country = 0
         unknown_country = 0
         if "未知地区" in country_name_list:
         if "未知地区" in country_name_list:
             unknown_country = 1
             unknown_country = 1
@@ -164,7 +165,7 @@ class AppCampaignView(View):
                 campaign_name=campaign_name,
                 campaign_name=campaign_name,
                 campaign_url=campaign_url,
                 campaign_url=campaign_url,
                 campaign_type=campaign_type,
                 campaign_type=campaign_type,
-                status=1,
+                status=status,
                 unknown_country=unknown_country,
                 unknown_country=unknown_country,
                 campaign_start_date=campaign_start_time,
                 campaign_start_date=campaign_start_time,
                 campaign_end_date=campaign_end_time,
                 campaign_end_date=campaign_end_time,