pyxllib 0.3.135__tar.gz → 0.3.137__tar.gz

{pyxllib-0.3.135/pyxllib.egg-info → pyxllib-0.3.137}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.135
+Version: 0.3.137
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101
@@ -42,29 +42,29 @@ Requires-Dist: opsdroid-get-image-size; extra == "xlcv"
 Requires-Dist: opencv-python; extra == "xlcv"
 Requires-Dist: pillow; extra == "xlcv"
 Provides-Extra: xlai
-Requires-Dist: pynvml; extra == "xlai"
 Requires-Dist: opsdroid-get-image-size; extra == "xlai"
+Requires-Dist: pynvml; extra == "xlai"
+Requires-Dist: visdom; extra == "xlai"
 Requires-Dist: opencv-python; extra == "xlai"
 Requires-Dist: pillow; extra == "xlai"
-Requires-Dist: visdom; extra == "xlai"
 Provides-Extra: xlall
-Requires-Dist: sentencepiece; extra == "xlall"
-Requires-Dist: flask-wtf; extra == "xlall"
-Requires-Dist: ujson; extra == "xlall"
-Requires-Dist: uvicorn; extra == "xlall"
-Requires-Dist: arts; extra == "xlall"
-Requires-Dist: flask-jwt-extended; extra == "xlall"
-Requires-Dist: fastapi; extra == "xlall"
-Requires-Dist: opsdroid-get-image-size; extra == "xlall"
 Requires-Dist: flask-restful; extra == "xlall"
-Requires-Dist: flask-cors; extra == "xlall"
-Requires-Dist: html2text; extra == "xlall"
 Requires-Dist: flask; extra == "xlall"
+Requires-Dist: opsdroid-get-image-size; extra == "xlall"
+Requires-Dist: flask-jwt-extended; extra == "xlall"
 Requires-Dist: openai2; extra == "xlall"
 Requires-Dist: opencv-python; extra == "xlall"
 Requires-Dist: pillow; extra == "xlall"
+Requires-Dist: fastapi; extra == "xlall"
+Requires-Dist: ujson; extra == "xlall"
 Requires-Dist: zhconv; extra == "xlall"
+Requires-Dist: flask-cors; extra == "xlall"
+Requires-Dist: html2text; extra == "xlall"
+Requires-Dist: uvicorn; extra == "xlall"
+Requires-Dist: sentencepiece; extra == "xlall"
+Requires-Dist: flask-wtf; extra == "xlall"
 Requires-Dist: xlrd; extra == "xlall"
+Requires-Dist: arts; extra == "xlall"
 
 # 1 install
 

pyxllib-0.3.137/pyxllib/autogui/uiautolib.py

@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# @Author : 陈坤泽
+# @Email  : 877362867@qq.com
+# @Date   : 2024/11/05
+
+"""
+以uiautomation为核心的相关工具库
+"""
+
+import uiautomation as auto
+
+# ui组件大多是树形组织结构，没有专业的树形结构库，能搞个毛线。什么？auto库有自带树形操作？那点基础功能能干毛线。
+from anytree import NodeMixin, RenderTree
+
+
+class UiCtrlNode(NodeMixin):
+    def __init__(self, ctrl, parent=None):
+        # 初始化节点信息
+        self.ctrl = ctrl
+        self.ctrl_type = ctrl.ControlTypeName
+        self.text = ctrl.Name
+        self.parent = parent  # 指定父节点，用于形成树结构
+
+        # 自动递归创建子节点
+        self.build_children()
+
+    def build_children(self):
+        """ 创建并添加子节点到树中 """
+        for child_ctrl in self.ctrl.GetChildren():
+            self.__class__(child_ctrl, parent=self)  # 递归构建子节点
+
+    def __repr__(self):
+        """ 用于在打印节点时显示关键信息 """
+        return f"UiNode(ctrl_type={self.ctrl_type}, text={self.text.replace('\n', ' ')})"
+
+    def __getitem__(self, index):
+        """ 通过索引直接访问子节点
+
+        ui操作经常要各种结构化的访问，加个这个简化引用方式
+        """
+        return self.children[index]
+
+    def render_tree(self):
+        """ 可视化输出树结构信息进行数据结构分析 """
+        for pre, fill, node in RenderTree(self):  # 使用 self.root 确保从根节点渲染
+            print(f"{pre}{node.ctrl_type} {node.get_hash_tag()} {node.text.replace('\n', ' ')}")
+
+    def get_hash_tag(self, level=1):
+        """ 生成节点的哈希字符串，以反映子树结构，一般用来对节点做分类及映射到对应处理函数 """
+        # 当前节点的类型标识符
+        hash_strs = [f"{level}{self.ctrl_type[0].lower()}"]
+        # 遍历所有子节点，递归生成子节点的哈希值
+        for child in self.children:
+            hash_strs.append(f"{child.get_hash_tag(level + 1)}")
+        return ''.join(hash_strs)

{pyxllib-0.3.135 → pyxllib-0.3.137}/pyxllib/autogui/wechat.py

@@ -13,13 +13,19 @@ from copy import deepcopy
 from typing import Iterable
 import os
 from typing import (Iterable, Callable, List)
+import json
+import re
 
 import ctypes
 from ctypes import wintypes
 import uiautomation as auto
+from anytree import NodeMixin, RenderTree
 
 import win32clipboard
 
+from pyxllib.autogui.wechat_msgbox import msg_parsers
+from pyxllib.autogui.uiautolib import UiCtrlNode
+
 
 def __1_config():
     pass
@@ -243,6 +249,61 @@ def is_window_visible(class_name, name):
     return False
 
 
+class WechatMsgNode(UiCtrlNode):
+    """ 微信消息的节点类型 """
+
+    def __init__(self, msg_box_ctrl, parent=None):
+        super().__init__(msg_box_ctrl, parent)
+        self.time = None  # 每条消息都建立一个最近出现的时间作为时间戳？
+        self.msg_type = None  # 消息类型：system, receive, send
+        self.content_type = None  # 内容类型：text、image、file
+
+        self.user = None  # 用户名
+        self.user2 = None  # 群聊时用户会多一个群聊昵称
+        self.cite_text = None  # 引用的内容，引用的不一定是文本，但是统一转成文本显示的
+
+    def parse_ctrl(self):
+        """ 解析出更精细的结构化信息 """
+        from pyxllib.autogui.wechat_msgbox import msg_parsers
+        tag = self.get_hash_tag()
+        if tag in msg_parsers:
+            msg_parsers[tag](self)
+
+    def _format_text(self, text):
+        """ 将换行替换为空格的小工具方法 """
+        return text.replace('\n', ' ')
+
+    def render_tree(self, node=None, prefix="", is_root=True):
+        """ 可视化输出树结构信息进行数据结构分析 """
+        if node is None:
+            node = self  # 从根节点开始渲染
+
+        # 检查当前节点是否有 msg_type 标记
+        if node.msg_type:
+            # 如果有 msg_type 标记，则输出该节点信息，跳过子节点
+            msg = [f"{prefix}{node.msg_type}"]
+            if node.user:
+                msg.append(f"{node.user}：")
+            msg.append(self._format_text(node.text))
+            if node.cite_text:
+                msg.append(f"【引用】{self._format_text(node.cite_text)}")
+            print(' '.join(msg))
+            return  # 不再递归渲染子节点
+
+        # 否则正常输出当前节点信息
+        print(f"{prefix}{node.ctrl_type} {node.get_hash_tag()} {self._format_text(node.text)}")
+
+        # 递归渲染子节点，非根节点开始增加缩进
+        for child in node.children:
+            self.render_tree(child, prefix + ("    " if not is_root else ""), is_root=False)
+
+    def check_parser(self):
+        """ 检查解析效果 """
+        for c in self.root.children:
+            c.parse_ctrl()
+        self.root.render_tree()
+
+
 def __4_wx():
     pass
 
@@ -260,7 +321,7 @@ class WxOperation:
 
     Methods:
     -------
-    __goto_chat_box(name):
+    goto_chat_box(name):
         跳转到 指定好友窗口
     __send_text(*msgs):
         发送文本。
@@ -293,14 +354,14 @@ class WxOperation:
         # 微信窗口置顶
         self.wx_window.SetTopmost(isTopmost=True)
 
-    def __match_nickname(self, name) -> bool:
+    def match_nickname(self, name):
         """获取当前面板的好友昵称"""
         self.input_edit = self.wx_window.EditControl(Name=name)
         if self.input_edit.Exists(Interval.MAX_SEARCH_SECOND, searchIntervalSeconds=Interval.MAX_SEARCH_INTERVAL):
-            return True
+            return self.input_edit
         return False
 
-    def __goto_chat_box(self, name: str) -> bool:
+    def goto_chat_box(self, name: str) -> bool:
         """
         跳转到指定 name好友的聊天窗口。
 
@@ -310,6 +371,10 @@ class WxOperation:
         Returns:
             None
         """
+        if ctrl := self.match_nickname(name):
+            ctrl.SetFocus()
+            return ctrl
+
         assert name, "无法跳转到名字为空的聊天窗口"
         self.wx_window.SendKeys(text='{Ctrl}F', waitTime=Interval.BASE_INTERVAL)
         self.wx_window.SendKeys(text='{Ctrl}A', waitTime=Interval.BASE_INTERVAL)
@@ -331,6 +396,14 @@ class WxOperation:
         self.wx_window.SendKeys(text='{Esc}', waitTime=Interval.BASE_INTERVAL)
         return False
 
+    def get_messages(self):
+        """ 获得当前会话窗口的结构化对话记录 """
+        msg_box = WechatMsgNode(self.wx_window.ListControl(Name='消息'))
+        # for c in msg_box.children:
+        #     c.parse_ctrl()
+        # msg_box.render_tree()
+        msg_box.check_parser()
+
     def at_at_everyone(self, group_chat_name: str):
         """
         @全部人的操作
@@ -517,8 +590,8 @@ class WxOperation:
             raise TypeError("发送的文件路径必须是可迭代的")
 
         # 如果当前面板已经是需发送好友, 则无需再次搜索跳转
-        if not self.__match_nickname(name=name):
-            if not self.__goto_chat_box(name=name):
+        if not self.match_nickname(name=name):
+            if not self.goto_chat_box(name=name):
                 raise NameError('昵称不匹配')
 
         # 设置输入框为当前焦点

pyxllib-0.3.137/pyxllib/autogui/wechat_msgbox.py

@@ -0,0 +1,339 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# @Author : 陈坤泽
+# @Email  : 877362867@qq.com
+# @Date   : 2024/11/05
+
+"""
+微信 消息框中不同消息结构的解析器 工具
+"""
+
+import re
+import json
+
+# 定义全局字典
+msg_parsers = {}
+
+
+# 定义装饰器
+def register_tool(key):
+    def decorator(func):
+        # 将函数添加到全局字典中，键为传入的key参数
+        msg_parsers[key] = func
+        return func
+
+    return decorator
+
+
+@register_tool("1b2p3p3b3p")
+def 系统_查看更多消息(node):
+    node.msg_type = 'system'
+    node.content_type = 'button_more'
+
+
+@register_tool("1l2t")
+def 系统_时间标签(node):
+    node.msg_type = 'system'
+    node.content_type = 'time'
+    node.time = node.text
+
+
+# 刚刚发送的特殊时间标签
+@register_tool("1l2p3p3p3t3p3p")
+def 系统_时间标签2(node):
+    node.msg_type = 'system'
+    node.content_type = 'time'
+    node.time = node.text
+
+
+@register_tool("1l2p3p3t3p")
+def 系统_撤回消息(node):
+    node.msg_type = 'system'
+    node.content_type = 'recall'
+
+
+@register_tool("1l2p3p3p4p5p6p7t3b")
+def 发送_文本(node):
+    node.msg_type = 'send'
+    node.content_type = 'text'
+    node.user = node[0][2].text
+
+
+@register_tool("1l2p3p3p4p5p6p7p7p8p8b3b")
+def 发送_图片(node):
+    node.msg_type = 'send'
+    node.content_type = 'image'
+    node.user = node[0][2].text
+
+
+@register_tool("1l2p3p3p4p5p6p7p7p8p9t9p9b8b3b")
+def 发送_视频(node):
+    node.msg_type = 'send'
+    node.content_type = 'video'
+    node.user = node[0][2].text
+
+
+@register_tool("1l2p3p3p4p5p6p7p7p8p9p10p11t6p7p8p9p10p11t7b3b")
+def 发送_文本_引用文本(node):
+    node.msg_type = 'send'
+    node.content_type = 'text'
+    node.user = node[0][2].text
+    quoted_node = node[0][1][0][0]  # 引用的层级结构
+    node.text = quoted_node[0][1][0][0][0][0].text
+    node.cite_text = quoted_node[1][0][0][0][0][0].text
+
+
+@register_tool("1l2p3p3p4p5p6p7p7p8p9p10p11t6p7p8p9p10p11t11t11p12b7b3b")
+def 发送_文本_引用图片(node):
+    node.msg_type = 'send'
+    node.content_type = 'text'
+    node.user = node[0][2].text
+    quoted_node = node[0][1][0][0]
+    node.text = quoted_node[0][1][0][0][0][0].text
+    node.cite_text = f'{quoted_node[1][0][0][0][0][0].text} : [图片]'
+
+
+# 引用文件
+@register_tool("1l2p3p3p4p5p6p7p7p8p9p10p11t6p7p8p9p10p11p12t11p12b7b3b")
+def 发送_文本_引用文件(node):
+    node.msg_type = 'send'
+    node.content_type = 'text'
+    node.user = node[0][2].text
+    quoted_node = node[0][1][0][0]
+    node.text = quoted_node[0][1][0][0][0][0].text
+    node.cite_text = f'[文件] {quoted_node[1][0][0][0][0][0][0].text}'
+
+
+# 发送文件
+@register_tool("1l2p3p3p4p5p6p7p8p9p10t10p11t11t9p10p10p8p9t7b7b3b")
+def 发送_文本_引用文件(node):
+    node.msg_type = 'send'
+    node.content_type = 'file'
+    node.user = node[0][2].text
+    file_node = node[0][1][0][0][0][0]
+    desc = {
+        'name': file_node[0][0][0].text,
+        'size': file_node[0][0][1][0].text,
+        'platform': file_node[1][0].text
+    }
+    node.text = json.dumps(desc, ensure_ascii=False)
+
+
+# 发送链接
+@register_tool("1l2p3p3p4p5p6p7p8t8p9t9p9b8p9b9t7b3b")
+def 发送_链接(node):
+    node.msg_type = 'send'
+    node.content_type = 'link'
+    node.user = node[0][2].text
+    link_node = node[0][1][0][0]
+    desc = {
+        'title': link_node[0][0][0].text,
+        'head': link_node[0][0][1][0].text,
+        'author': link_node[0][0][2][1].text
+    }
+    node.text = json.dumps(desc, ensure_ascii=False)
+
+
+# 转发消息
+@register_tool("1l2p3p3p4p5p6p7p8t8p9t9t9t8p9p9t7b3b")
+def 发送_转发消息(node):
+    node.msg_type = 'send'
+    node.content_type = 'messages'
+    node.user = node[0][2].text
+
+
+@register_tool("1l2p3b3p4p5p6p7t3p")
+def 接收_文本(node):
+    node.msg_type = 'receive'
+    node.content_type = 'text'
+    node.user = node[0][0].text
+
+
+@register_tool("1l2p3b3p4p5p6p7p7b3p")
+def 接收_图片(node):
+    node.msg_type = 'receive'
+    node.content_type = 'image'
+    node.user = node[0][0].text
+
+
+@register_tool("1l2p3b3p4p5p6p7p8b8p8t7b3p")
+def 接收_语音(node):
+    node.msg_type = 'receive'
+    node.content_type = 'voice'
+    node.user = node[0][0].text
+
+
+@register_tool("1l2p3b3p4p5p6p7p8t8p9t9p9b8p9b9t7b3p")
+def 接收_链接(node):
+    node.msg_type = 'receive'
+    node.content_type = 'link'
+    node.user = node[0][0].text
+    link_node = node[0][1][0][0][0][0]  # 链接内容的层级结构
+    desc = {
+        'title': link_node[0].text,
+        'head': link_node[1][0].text,  # 文章开头部分
+        'author': link_node[2][1].text
+    }
+    node.text = json.dumps(desc, ensure_ascii=False)
+
+
+@register_tool("1l2p3b3p4p5t4p5p6p7t3p")
+def 群接收_文本(node):
+    node.msg_type = 'receive'
+    node.content_type = 'text'
+    node.user = node[0][0].text
+    node.user2 = node[0][1][0][0].text
+
+
+@register_tool("1l2p3b3p4p5t4p5p6p7p7b3p")
+def 群接收_图片(node):
+    node.msg_type = 'receive'
+    node.content_type = 'image'
+    node.user = node[0][0].text
+    node.user2 = node[0][1][0][0].text
+
+
+@register_tool("1l2p3b3p4p5t4p5p6p7p8p9p10t10p11t11t9p10p10p7b7b3p")
+def 群接收_文件(node):
+    node.msg_type = 'receive'
+    node.content_type = 'file'
+    node.user = node[0][0].text
+    file_node = node[0][1]  # 文件信息的节点
+    node.user2 = file_node[0][0].text
+    file_info_node = file_node[1][0][0][0][0]
+    desc = {
+        'name': file_info_node[0][0].text,
+        'size': file_info_node[0][1][0].text
+    }
+    node.text = json.dumps(desc, ensure_ascii=False)
+
+
+@register_tool("1l2p3b3p4p5t4p5p6p7p8p9p10t10p11t11t9p10p10p8p9t7b7b3p")
+def 群接收_文件2(node):
+    node.msg_type = 'receive'
+    node.content_type = 'file'
+    node.user = node[0][0].text
+    node.user2 = node[0][1][0][0].text
+    file_info_node = node[0][1][1][0][0][0]
+    desc = {
+        'name': file_info_node[0][0][0].text,
+        'size': file_info_node[0][0][1][0].text,
+        'platform': file_info_node[1][0].text
+    }
+    node.text = json.dumps(desc, ensure_ascii=False)
+
+
+@register_tool("1l2p3b3p4p5t4p5p6p7b3p")
+def 群接收_动画表情(node):
+    node.msg_type = 'receive'
+    node.content_type = 'emoji'
+    node.user = node[0][0].text
+    node.user2 = node[0][1][0][0].text
+
+
+@register_tool("1l2p3b3p4p5t4p5p6p7p8t8p9t9p9b8p9b9t7b3p")
+def 群接收_链接_有公众号作者名(node):
+    node.msg_type = 'receive'
+    node.content_type = 'link'
+    node.user = node[0][0].text
+    link_node = node[0][1]
+    node.user2 = link_node[0][0].text
+    link_info_node = link_node[1][0][0][0]
+    desc = {
+        'title': link_info_node[0].text,
+        'head': link_info_node[1][0].text,  # 文章开头的一小部分
+        'author': link_info_node[2][0].text
+    }
+    node.text = json.dumps(desc, ensure_ascii=False)
+
+
+@register_tool("1l2p3b3p4p5t4p5p6p7p8t8p9t9p9b7b3p")
+def 群接收_链接_无公众号作者名(node):
+    node.msg_type = 'receive'
+    node.content_type = 'link'
+    node.user = node[0][0].text
+    link_node = node[0][1]
+    node.user2 = link_node[0][0].text
+    link_info_node = link_node[1][0][0][0]
+    desc = {
+        'title': link_info_node[0].text,
+        'head': link_info_node[1][0].text  # 文章开头的一小部分
+    }
+    node.text = json.dumps(desc, ensure_ascii=False)
+
+
+@register_tool("1l2p3b3p4p5t4p5p6p7p8b8p9p8p9p10p10t8p9p7b3p")
+def 群接收_视频(node):
+    node.msg_type = 'receive'
+    node.content_type = 'video'
+    node.user = node[0][0].text
+    video_node = node[0][1]
+    node.user2 = video_node[0][0].text
+    video_info_node = video_node[1][0][0][0]
+    desc = {
+        'author': video_info_node[2][0][1].text
+    }
+    node.text = json.dumps(desc, ensure_ascii=False)
+
+
+@register_tool("1l2p3b3p4p5t4p5p6p7p8t8p9t8t7b3p")
+def 群接收_视频2(node):
+    node.msg_type = 'receive'
+    node.content_type = 'video'
+    node.user = node[0][0].text
+    video_node = node[0][1]
+    node.user2 = video_node[0][0].text
+    video_info_node = video_node[1][0][0][0]
+    desc = {
+        'title': video_info_node[0].text,
+        'head': video_info_node[1][0].text,
+        'duration': video_info_node[2].text
+    }
+    node.text = json.dumps(desc, ensure_ascii=False)
+
+
+@register_tool("1l2p3b3p4p5t4p5p6p7p8p9b9t8t8b8p9t9t7b3p")
+def 群接收_小程序(node):
+    node.msg_type = 'receive'
+    node.content_type = 'applet'
+    node.user = node[0][0].text
+    applet_node = node[0][1]
+    node.user2 = applet_node[0][0].text
+    applet_info_node = applet_node[1][0][0][0]
+    desc = {
+        'name': applet_info_node[0][1].text,
+        'title': applet_info_node[1].text,
+        'footnote': applet_info_node[3][1].text
+    }
+    node.text = json.dumps(desc, ensure_ascii=False)
+
+
+@register_tool("1l2p3p3p4p5l6p7p7t7p3p")
+def 群接收_拍一拍(node):
+    node.msg_type = 'receive'
+    node.content_type = 'shake'
+    node.text = node[0][1][0][0].text
+    node.user = re.search(r'"(.+?)" 拍了拍 "', node.text).group(1)
+
+
+@register_tool("1l2p3b3p4p5t4p5p6p7p8t4p5p6p7p8p9t5b3p")
+def 群接收_引用消息(node):
+    node.msg_type = 'receive'
+    node.content_type = 'text'
+    node.user = node[0][0].text
+    quoted_node = node[0][1]
+    node.user2 = quoted_node[0][0].text
+    node.text = quoted_node[1][0][0][0][0].text
+    node.cite_text = quoted_node[2][0][0][0][0][0].text
+
+
+@register_tool("1l2p3b3p4p5t4p5p6p7p8t4p5p6p7p8p9p10t9p10b5b3p")
+def 群接收_引用文件(node):
+    node.msg_type = 'receive'
+    node.content_type = 'text'
+    node.user = node[0][0].text
+    quoted_node = node[0][1]
+    node.user2 = quoted_node[0][0].text
+    node.text = quoted_node[1][0][0][0][0].text
+    file_node = quoted_node[2][0][0][0][0][0][0]
+    node.cite_text = f'[文件] {file_node.text}'

{pyxllib-0.3.135 → pyxllib-0.3.137}/pyxllib/ext/kq5034lib.py

@@ -850,13 +850,44 @@ class 网课考勤:
             df = df.drop(items.index)
 
         # 3 匹配完后，还有目标金额的数据要列出来
+        
+        # items = df[df['收支金额(元)'] == f'`{value:.2f}']
+        # # todo 这个要识别到'交易单号'中间的日期，降序排序
+        # for idx, row in items.iterrows():
+        #     last_row += 1
+        #     ws.cell2(last_row, '交易单号').value = row['微信支付业务单号']
+        #     ws.cell2(last_row, '交易订单号').value = row['业务凭证号'][1:]
+        #     ws.cell2(last_row, '订单金额').value = row['收支金额(元)']
+
+        # todo：新增测试用：
+        # 初始化一个空的 DataFrame，用于存储遍历结果
+        result_df = pd.DataFrame(columns=['微信支付业务单号', '业务凭证号', '收支金额'])
+        # 遍历符合条件的数据并存储到 result_df 中
         items = df[df['收支金额(元)'] == f'`{value:.2f}']
-        # todo 这个要识别到'交易单号'中间的日期，降序排序
         for idx, row in items.iterrows():
+            # 将 row 中的数据添加到 result_df 中
+            result_df = pd.concat([
+                result_df,
+                pd.DataFrame({
+                    '微信支付业务单号': [row['微信支付业务单号']],
+                    '业务凭证号': [row['业务凭证号'][1:]],  # 去掉业务凭证号的第一个字符
+                    '收支金额': [row['收支金额(元)']]
+                })
+            ], ignore_index=True)
+
+        # 提取日期部分，并将其转为可排序的格式
+        result_df['日期'] = result_df['微信支付业务单号'].str[11:19]  # 提取日期部分，假设日期位于固定位置
+        result_df['日期'] = pd.to_datetime(result_df['日期'], format='%Y%m%d')
+
+        # 按日期降序排序
+        result_df = result_df.sort_values(by='日期', ascending=False).drop(columns=['日期'])
+
+        # 将排序后的 DataFrame 写入到工作表中
+        for idx, row in result_df.iterrows():
             last_row += 1
             ws.cell2(last_row, '交易单号').value = row['微信支付业务单号']
-            ws.cell2(last_row, '交易订单号').value = row['业务凭证号'][1:]
-            ws.cell2(last_row, '订单金额').value = row['收支金额(元)']
+            ws.cell2(last_row, '交易订单号').value = row['业务凭证号']
+            ws.cell2(last_row, '订单金额').value = row['收支金额']
 
         # 4 保存
         self.wb.save(self.表格路径)

{pyxllib-0.3.135 → pyxllib-0.3.137/pyxllib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.135
+Version: 0.3.137
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101
@@ -42,29 +42,29 @@ Requires-Dist: opsdroid-get-image-size; extra == "xlcv"
 Requires-Dist: opencv-python; extra == "xlcv"
 Requires-Dist: pillow; extra == "xlcv"
 Provides-Extra: xlai
-Requires-Dist: pynvml; extra == "xlai"
 Requires-Dist: opsdroid-get-image-size; extra == "xlai"
+Requires-Dist: pynvml; extra == "xlai"
+Requires-Dist: visdom; extra == "xlai"
 Requires-Dist: opencv-python; extra == "xlai"
 Requires-Dist: pillow; extra == "xlai"
-Requires-Dist: visdom; extra == "xlai"
 Provides-Extra: xlall
-Requires-Dist: sentencepiece; extra == "xlall"
-Requires-Dist: flask-wtf; extra == "xlall"
-Requires-Dist: ujson; extra == "xlall"
-Requires-Dist: uvicorn; extra == "xlall"
-Requires-Dist: arts; extra == "xlall"
-Requires-Dist: flask-jwt-extended; extra == "xlall"
-Requires-Dist: fastapi; extra == "xlall"
-Requires-Dist: opsdroid-get-image-size; extra == "xlall"
 Requires-Dist: flask-restful; extra == "xlall"
-Requires-Dist: flask-cors; extra == "xlall"
-Requires-Dist: html2text; extra == "xlall"
 Requires-Dist: flask; extra == "xlall"
+Requires-Dist: opsdroid-get-image-size; extra == "xlall"
+Requires-Dist: flask-jwt-extended; extra == "xlall"
 Requires-Dist: openai2; extra == "xlall"
 Requires-Dist: opencv-python; extra == "xlall"
 Requires-Dist: pillow; extra == "xlall"
+Requires-Dist: fastapi; extra == "xlall"
+Requires-Dist: ujson; extra == "xlall"
 Requires-Dist: zhconv; extra == "xlall"
+Requires-Dist: flask-cors; extra == "xlall"
+Requires-Dist: html2text; extra == "xlall"
+Requires-Dist: uvicorn; extra == "xlall"
+Requires-Dist: sentencepiece; extra == "xlall"
+Requires-Dist: flask-wtf; extra == "xlall"
 Requires-Dist: xlrd; extra == "xlall"
+Requires-Dist: arts; extra == "xlall"
 
 # 1 install