iiiiiiiiiiiiiiii

Signed-off-by: binren <zhangbr@elab-plus.com>

apscheduler_elab.py

@@ -146,7 +146,7 @@ class Config(object):
 
     SCHEDULER_JOB_DEFAULTS = {
         'coalesce': False,
-        'max_instances': 3
+        'max_instances': 5
     }
 
     # 调度器开关

flask_app.py

@@ -271,14 +271,13 @@ def send_mail_to_customer():
     rj = JianYeReport()
     try:
         customer_id = request.args.get('id', default=0, type=int)
-        mail = request.args.get('mail', default=0, type=str)
+        mail = request.args.get('mail', default=None, type=str)
         data = rj.send_mail_for_customer_id(customer_id, mail)
         result['data'] = data
         pass
     except Exception as e:
         result['error'] = str(e)
-    finally:
-        return json.dumps(result, ensure_ascii=False, cls=DecimalEncoder)
+    return json.dumps(result, ensure_ascii=False, cls=DecimalEncoder)
 
 
 class DecimalEncoder(json.JSONEncoder):

jianye_report.py

@@ -192,8 +192,7 @@ class JianYeReport(object):
             for x in pv_data:
                 if str(x[1]) == str(house_id):
                     return x[3:]
-        else:
-            return [0, 0, 0, 0]
+        return [0, 0, 0, 0]
 
     def house_data_of_time(self, time_range, house_ids, time_type):
         # brand_id, house_id, house_name, city
@@ -201,11 +200,7 @@ class JianYeReport(object):
         data_1 = []
         for id in house_ids:
             sub = [id]
-            try:
-                sub.extend(self.get_house_pv_data(id, time_type))
-            except Exception as e:
-                print(e)
-                sub.extend([0, 0, 0, 0])
+            sub.extend(self.get_house_pv_data(id, time_type))
             data_1.append(sub)
         data_2 = []
         for id in house_ids:
@@ -402,8 +397,9 @@ class JianYeReport(object):
 
     def send_mail_for_customer_id(self, customer_id, new_mail=None):
         """
-            发送指客户的邮件
-        :param task_key:
+            获取指定客户的邮件信息
+        :param customer_id:
+        :param new_mail:
         :return:
         """
         message = {}