Commit 60fe05f9 authored by xianyang's avatar xianyang

优化代码

parent 99a5d4ce
Pipeline #502 failed with stages
import json import json
from configs.config import env from configs.config import env
from src.libs.db_link import LinkMysql from src.libs.db_link import LinkMysql
from src.libs.functions import get_now_timestamp, str_to_time, AES_Encrypt, call_im_interface from src.libs.functions import get_now_timestamp, str_to_time, AES_Encrypt, call_im_interface
from src.libs.log_utils import Logger from src.libs.log_utils import Logger
from src.modules.examine import Examinecontent, Examinecomment from src.modules.examine import Examinecontent, Examinecomment
from src.modules.friend import FriendMessage, FriendGive, FriendComment from src.modules.friend import FriendMessage, FriendGive, FriendComment
def save_friends(data): def save_friends(data):
try: try:
if data['file_name']: if data['file_name']:
data['file_name']=','.join(data['file_name']) data['file_name']=','.join(data['file_name'])
friendmessage=FriendMessage().set_attrs(data).direct_commit_() friendmessage=FriendMessage().set_attrs(data).direct_commit_()
print(1111111111111) Examinecontent().set_attrs(data).direct_commit_()
Examinecontent().set_attrs(data).direct_commit_() except Exception as e :
except Exception as e : print(e)
print(e) return 0
return 0 return friendmessage
return friendmessage
def save_comment(data): def save_comment(data):
try: try:
friendcomment = FriendComment().set_attrs(data).direct_commit_() friendcomment = FriendComment().set_attrs(data).direct_commit_()
...@@ -28,131 +27,132 @@ def save_comment(data): ...@@ -28,131 +27,132 @@ def save_comment(data):
print(e) print(e)
return 0 return 0
return friendcomment return friendcomment
def get_infoname(data): def get_infoname(data):
result=[] result=[]
uids = [item.get("uid", "") for item in data] uids = [item.get("uid", "") for item in data]
if uids: if uids:
sql = f"SELECT nickname,user_avatar_file_name,bg_image,user_uid FROM `missu_users` where user_uid in {tuple(uids)}" sql = f"SELECT nickname,user_avatar_file_name,bg_image,user_uid FROM `missu_users` where user_uid in {tuple(uids)}"
user_info = LinkMysql(env.BUSINESS).query_mysql(sql) user_info = LinkMysql(env.BUSINESS).query_mysql(sql)
for i in range(len(data)): for i in range(len(data)):
for s in range(len(user_info)): for s in range(len(user_info)):
if data[i].get("uid")==user_info[s].get("user_uid"): if data[i].get("uid")==user_info[s].get("user_uid"):
data[i]['create_time'] = str_to_time(data[i].get("create_time", "")) data[i]['create_time'] = str_to_time(data[i].get("create_time", ""))
data[i]['nick_name'] = user_info[s].get("nickname", "") data[i]['nick_name'] = user_info[s].get("nickname", "")
data[i]['user_avatar_file_name'] = user_info[s].get("user_avatar_file_name", "") data[i]['user_avatar_file_name'] = user_info[s].get("user_avatar_file_name", "")
data[i]['bg_image'] = data[s].get("bg_image", "") data[i]['bg_image'] = data[s].get("bg_image", "")
result.append(data[i]) result.append(data[i])
return result return result
class FriendMessageNotice(object): class FriendMessageNotice(object):
def __init__(self, fcmid, praise, uid): def __init__(self, fcmid, praise, uid):
self.fcmid = fcmid self.fcmid = fcmid
self.praise = praise self.praise = praise
self.uid = uid self.uid = uid
self.to_uuid = None self.to_uuid = None
def query_friends_info(self, user_id): def query_friends_info(self, user_id):
"""获取朋友圈发送者""" """获取朋友圈发送者"""
sql = f"select uid from missu_friend_message where id={user_id}" sql = f"select uid from missu_friend_message where id={user_id}"
user_info = LinkMysql(env.BUSINESS).query_mysql(sql) user_info = LinkMysql(env.BUSINESS).query_mysql(sql)
if user_info: if user_info:
self.to_uuid = user_info[0]['uid'] self.to_uuid = user_info[0]['uid']
def query_user_head_portrait(self, user_id=None): def query_user_head_portrait(self, user_id=None):
"""获取用户头像""" """获取用户头像"""
if not user_id: if not user_id:
user_id = self.uid user_id = self.uid
sql = f"select nickname,user_avatar_file_name from missu_users where user_uid={user_id}" sql = f"select nickname,user_avatar_file_name from missu_users where user_uid={user_id}"
user_info = LinkMysql(env.BUSINESS).query_mysql(sql) user_info = LinkMysql(env.BUSINESS).query_mysql(sql)
if user_info: if user_info:
return user_info[0] return user_info[0]
return {} return {}
def public_method(self): def public_method(self):
first_data = self.query_friends_info() first_data = self.query_friends_info()
if first_data: if first_data:
query_user = FriendGive.query.filter(FriendGive.is_look == 0, query_user = FriendGive.query.filter(FriendGive.is_look == 0,
FriendGive.uid == first_data.fcmid, FriendGive.uid == first_data.fcmid,
FriendGive.status == 0).order_by(FriendGive.id.desc()) FriendGive.status == 0).order_by(FriendGive.id.desc())
paginate = query_user.paginate(error_out=True) paginate = query_user.paginate(error_out=True)
query_com = FriendComment.query.filter(FriendComment.is_look == 0, query_com = FriendComment.query.filter(FriendComment.is_look == 0,
FriendComment.status == 0, FriendComment.status == 0,
FriendComment.uid != first_data.uid, FriendComment.uid != first_data.uid,
FriendComment.fcmid == self.fcmid, FriendComment.fcmid == self.fcmid,
FriendComment.review_to != None).order_by(FriendComment.id.desc()) FriendComment.review_to != None).order_by(FriendComment.id.desc())
paginate_com = query_com.paginate(error_out=True) paginate_com = query_com.paginate(error_out=True)
return paginate.items, paginate_com.items return paginate.items, paginate_com.items
return [], [] return [], []
def query_praise_comment(self): def query_praise_comment(self):
"""查看用户收到点赞,评论""" """查看用户收到点赞,评论"""
Logger().logger.info(f'接受参数fcmid:{self.fcmid},,,uid:{self.uid}')
self.query_friends_info(self.fcmid) Logger().logger.info(f'接受参数fcmid:{self.fcmid},,,uid:{self.uid}')
user_data = self.query_user_head_portrait() self.query_friends_info(self.fcmid)
source_user = self.query_user_head_portrait(self.to_uuid) user_data = self.query_user_head_portrait()
friend_info = CircleOfFriends().query_info(self.praise.fcmid) source_user = self.query_user_head_portrait(self.to_uuid)
friend_img = friend_info.get('file_name','') friend_info = CircleOfFriends().query_info(self.praise.fcmid)
if not user_data: friend_img = friend_info.get('file_name','')
return if not user_data:
try: return
content = self.praise.content try:
except Exception as e: content = self.praise.content
content = "" except Exception as e:
if not content: # 点赞数据 content = ""
add_data = { if not content: # 点赞数据
"id":self.praise.id, add_data = {
"fcmid":self.praise.fcmid, "id":self.praise.id,
"uid":self.praise.uid, "fcmid":self.praise.fcmid,
"head_path":user_data.get('user_avatar_file_name'), "uid":self.praise.uid,
"nickname":user_data.get('nickname'), "head_path":user_data.get('user_avatar_file_name'),
"source_head_path":source_user.get('user_avatar_file_name'), "nickname":user_data.get('nickname'),
"source_name":source_user.get('nickname'), "source_head_path":source_user.get('user_avatar_file_name'),
"friend_path":friend_img, "source_name":source_user.get('nickname'),
"coding":"1", "friend_path":friend_img,
"create_time":str(self.praise.create_time) "coding":"1",
} "create_time":str_to_time(self.praise.create_time)
else: # 评论数据 }
add_data = { else: # 评论数据
"id":self.praise.id, add_data = {
"review_to":self.praise.review_to, "id":self.praise.id,
"fcmid":self.praise.fcmid, "review_to":self.praise.review_to,
"uid":self.praise.uid, "fcmid":self.praise.fcmid,
"content":self.praise.content, "uid":self.praise.uid,
"head_path":user_data.get('user_avatar_file_name'), "content":self.praise.content,
"nickname":user_data.get('nickname'), "head_path":user_data.get('user_avatar_file_name'),
"source_head_path":source_user.get('user_avatar_file_name'), "nickname":user_data.get('nickname'),
"source_name":source_user.get('nickname'), "source_head_path":source_user.get('user_avatar_file_name'),
"friend_path":friend_img, "source_name":source_user.get('nickname'),
"coding": "2", "friend_path":friend_img,
"create_time":str(self.praise.create_time) "coding": "2",
} "create_time":str_to_time(self.praise.create_time)
data = { }
"processorId":1008, data = {
"jobDispatchId":1, "processorId":1008,
"actionId":3, "jobDispatchId":1,
"newData":json.dumps({"to_uid":self.to_uuid,"typeu": "53","msg":add_data}) "actionId":3,
} "newData":json.dumps({"to_uid":self.to_uuid,"typeu": "53","msg":add_data})
aes = AES_Encrypt(json.dumps(data)) }
Logger().logger.info(f'请求IM参数:{data},,,密文:{aes}') aes = AES_Encrypt(json.dumps(data))
result = call_im_interface(aes) Logger().logger.info(f'请求IM参数:{data},,,密文:{aes}')
Logger().logger.info(f'请求IM接口:{result.status_code}') result = call_im_interface(aes)
if result and result.status_code == 200: Logger().logger.info(f'请求IM接口:{result.status_code}')
res = json.loads(result.text) if result and result.status_code == 200:
Logger().logger.info(f"接口返回结果:{res.get('success')}") res = json.loads(result.text)
Logger().logger.info(f"接口返回结果:{res.get('success')}")
class CircleOfFriends(object):
"""朋友圈详情""" class CircleOfFriends(object):
@staticmethod """朋友圈详情"""
def query_info(fc_mid): @staticmethod
sql = f"select uid,res_type,content,file_name,location,create_time from missu_friend_message where id={fc_mid}" def query_info(fc_mid):
friends = LinkMysql(env.BUSINESS).query_mysql(sql) sql = f"select uid,res_type,content,file_name,location,create_time from missu_friend_message where id={fc_mid}"
if friends: friends = LinkMysql(env.BUSINESS).query_mysql(sql)
friend = friends[0] if friends:
friend['create_time'] = str(friend['create_time']) friend = friends[0]
return friend friend['create_time'] = str(friend['create_time'])
return {} return friend
return {}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment