排除内部员工

common/mysql_uitl.py

@@ -59,13 +59,16 @@ def fetch_one_list(sql, args):
 def fetch_all_list(sql, args):
     conn = get_connection()
     cursor = conn.cursor()
-    cursor.executemany(sql, args)
-    data_list = cursor.fetchall()
+    try:
+        cursor.executemany(sql, args)
+        data_list = cursor.fetchall()
+        return data_list
+    except Exception as e:
+        logging.error('SQL执行失败，执行语句为:%s' % str(sql))
+        logging.error(f'SQL执行失败，错误原因是:{str(e)}')
     conn.commit()
     connect_close(cursor, conn)
 
-    return data_list
-
 
 def insert(sql, args):
     conn = get_connection()

edw/dws/user/dws_user_login_environment.py

@@ -20,8 +20,8 @@ def dws_user_login_environment(data_dt):
     login_env_dict = query_dws_user_login_env()
     # save_dws_user_login_environment(login_env_dict)
     row = save_result('tamp_data_dws', 'dws_user_login_environment', login_env_dict, file_name)
-    dws_user_recent_login_env_list = query_dws_user_recent_login_env()
-    update_dws_user_recent_login_env(dws_user_recent_login_env_list)
+    dws_user_recent_login_env_dict = query_dws_user_recent_login_env()
+    update_dws_user_recent_login_env(dws_user_recent_login_env_dict)
     now_time = now_str(YMDHMS_FORMAT)
     save_etl_log('tamp_data_dws', 'dws_user_login_environment', data_dt, row, 'done', task_file, now_time)
 
@@ -88,15 +88,18 @@ def query_dws_user_recent_login_env():
         ) p 
         where p.row_rank = 1
     '''
-    recent_login_env_list = fetch_all_list(sql, None)
+    recent_login_env_dict = fetch_all(sql, None)
     logging.info(f'query_dws_user_recent_login_env success')
-    return recent_login_env_list
+    return recent_login_env_dict
 
 
 def update_dws_user_recent_login_env(ret):
     if ret:
         logging.info(f'update_dws_user_recent_login_env success')
         row = len(ret)
+        ret_list = list()
+        for i in ret:
+            ret_list.append([i['recent_env'], i['recent_env_name'], i['recent_time'], i['user_id']])
         sql = '''
             update tamp_data_dws.dws_user_login_environment
                   set  recent_env = (%s),
@@ -104,7 +107,7 @@ def update_dws_user_recent_login_env(ret):
                        recent_time = (%s)
                   where user_id = (%s)
             '''
-        rs = update_batch(sql, ret)
+        rs = update_batch(sql, ret_list)
         if rs == row or rs == 2 * row:  # 因为这里用的是replace
             logging.info(f'update_dws_user_recent_login_env success {row}')
         else: