1

data_manage/operate.py

@@ -14,25 +14,21 @@ def user_channel(arg):
 
 def user_channel_group(arg):
     db = MysqlUtils()
+    di = db.zx.get_data_dict("select cast(id as char) ,nick_name from t_mp_account where del_flag=0")
     user_id = arg.get('user_id')
     if user_id:
-        # 该用户拥有的公众号组
-        sql = f"""SELECT id,name from channel_group where id in  
+        sql = f"""SELECT  id,name,channel_ids from channel_group where id in  
                (select channel_group_id from user_channel_group_auth where user_id={user_id})"""
-        return db.quchen_text.getData_json(sql)
-
-
     else:
-        # 返回所有公众号组
-        sql = "select id,name from channel_group"
-        df = db.quchen_text.getData_pd(sql)
-        print(df)
-        sql2 = "select id,nick_name from t_mp_account where del_flag=0"
-        df2 = db.zx.getData_pd(sql2)
-        df3 = pd.merge(df,df2,how='left',on='')
-
-
-        return db.quchen_text.getData_json(sql)
+        # 不传user_id 返回所有组
+        sql = "select id,name,channel_ids from channel_group"
+    data = db.quchen_text.getData_json(sql)
+    for i in data:
+        sr =''
+        for j in i['channel_ids'].split(','):
+            sr+=di[j]+','
+        i['channel_names']=sr
+    return data
 
 
 def user(arg):
@@ -144,4 +140,5 @@ def get_user_name_by_id(user_id):
 
 if __name__ == '__main__':
     # print(get_pitcher({'user_id':78}))
-    print(get_user_name_by_id(78))
+    # print(get_user_name_by_id(78))
+    user_channel_group({})

model/DataBaseOperation.py

@@ -65,7 +65,12 @@ class MysqlOperation:
             li.append(list(i))
         return li
 
-
+    def get_data_dict(self,sql):
+        data =self.getData(sql)
+        di={}
+        for i in data:
+            di[i[0]]=i[1]
+        return di
 
     def execute(self, sql,args=None):
         start = time.time()