re-common 10.0.19__py3-none-any.whl → 10.0.22__py3-none-any.whl

re_common/v2/baselibrary/utils/basetime.py

@@ -0,0 +1,77 @@
+from datetime import datetime, timezone, timedelta
+from typing import Optional
+
+
+class BaseTime(object):
+    @staticmethod
+    def get_utc_now() -> datetime:
+        """获取当前UTC时间"""
+        return datetime.now(timezone.utc)
+
+    @staticmethod
+    def to_beijing_time(dt: datetime) -> datetime:
+        """将datetime对象转换为北京时间(UTC+8)"""
+        return dt.astimezone(timezone(timedelta(hours=8)))
+
+    @staticmethod
+    def get_current_beijing_time() -> datetime:
+        """获取当前北京时间"""
+        return BaseTime.to_beijing_time(BaseTime.get_utc_now())
+
+    @staticmethod
+    def get_beijing_time_str(format: str = "%Y-%m-%d %H:%M:%S") -> str:
+        """
+        获取当前北京时间的字符串表示
+        :param format: 时间字符串的格式 格式为'YYYY-MM-DD HH:MM:SS'
+        """
+        beijing_time = BaseTime.get_current_beijing_time()
+        return beijing_time.strftime(format)
+
+    @staticmethod
+    def get_current_month_str() -> str:
+        """获取当前月份的字符串表示，格式为'YYYYMM'"""
+        beijing_time = BaseTime.get_current_beijing_time()
+        return beijing_time.strftime("%Y%m")
+
+    @staticmethod
+    def parse_beijing_time(time_str: str, format: str = "%Y-%m-%d %H:%M:%S") -> datetime:
+        """
+        解析时间字符串为北京时间的datetime对象
+
+        :param time_str: 时间字符串
+        :param format: 时间字符串的格式
+        :return: 带有时区信息的datetime对象(UTC+8)
+        """
+        dt = datetime.strptime(time_str, format)
+        return dt.replace(tzinfo=timezone(timedelta(hours=8)))
+
+    @staticmethod
+    def get_time_difference(time_str: str) -> timedelta:
+        """
+        计算当前时间与给定时间字符串的时间差
+
+        :param time_str: 时间字符串，格式为"YYYY-MM-DD HH:MM:SS"
+        :return: timedelta对象，表示时间差
+        """
+        current_time = BaseTime.get_current_beijing_time()
+        target_time = BaseTime.parse_beijing_time(time_str)
+        difference = current_time - target_time
+        # print(f"时间差: {difference}")
+        # print(f"总秒数: {difference.total_seconds()}秒")
+        # print(f"天数: {difference.days}天")
+        # print(f"小时数: {difference.total_seconds() / 3600:.2f}小时")
+        # print(f"分钟数: {difference.total_seconds() / 60:.2f}分钟")
+
+        return difference
+
+    @staticmethod
+    def is_hour_changed(last_time_str: str) -> bool:
+        """
+        检查最后一次记录时间与当前时间是否跨越了小时边界
+
+        :param last_time_str: 最后一次记录的时间字符串，格式为"YYYY-MM-DD HH:MM:SS"
+        :return: True表示跨越了小时边界，False表示仍在同一小时内
+        """
+        current_time = BaseTime.get_current_beijing_time()
+        last_time = BaseTime.parse_beijing_time(last_time_str)
+        return current_time.hour != last_time.hour

re_common/v2/baselibrary/utils/db.py

@@ -1,38 +1,38 @@
-from contextlib import asynccontextmanager
-from typing import AsyncGenerator, Tuple
-
-import aiomysql
-from aiomysql import Pool, Connection, Cursor, DictCursor
-
-DB_CONFIG = {
-    'host': '192.168.98.55',
-    'port': 4000,
-    'user': 'dataware_house_baseUser',
-    'password': 'FF19AF831AEBD580B450B16BF9264200',
-    'db': 'dataware_house_base',
-    'charset': 'utf8mb4',
-    'minsize': 16,  # 最小连接数
-    'maxsize': 128,  # 最大连接数
-    'autocommit': False,  # 自动提交事务
-    'pool_recycle': 3600,  # 每个连接的回收时间（秒），超过此时间后连接将被关闭并重新创建，避免失效连接
-    'echo': False,  # 打印SQL语句
-}
-
-
-@asynccontextmanager
-async def get_db_pool():
-    """异步数据库连接池管理工具"""
-    pool: Pool = await aiomysql.create_pool(**DB_CONFIG)
-    try:
-        yield pool
-    finally:
-        pool.close()
-        await pool.wait_closed()
-
-
-@asynccontextmanager
-async def get_session(pool: Pool) -> AsyncGenerator[Tuple[Connection, Cursor], None]:
-    """获取数据库会话"""
-    async with pool.acquire() as conn:
-        async with conn.cursor() as cursor:
-            yield conn, cursor
+from contextlib import asynccontextmanager
+from typing import AsyncGenerator, Tuple
+
+import aiomysql
+from aiomysql import Pool, Connection, Cursor, DictCursor
+
+DB_CONFIG = {
+    'host': '192.168.98.55',
+    'port': 4000,
+    'user': 'dataware_house_baseUser',
+    'password': 'FF19AF831AEBD580B450B16BF9264200',
+    'db': 'dataware_house_base',
+    'charset': 'utf8mb4',
+    'minsize': 16,  # 最小连接数
+    'maxsize': 128,  # 最大连接数
+    'autocommit': False,  # 自动提交事务
+    'pool_recycle': 3600,  # 每个连接的回收时间（秒），超过此时间后连接将被关闭并重新创建，避免失效连接
+    'echo': False,  # 打印SQL语句
+}
+
+
+@asynccontextmanager
+async def get_db_pool():
+    """异步数据库连接池管理工具"""
+    pool: Pool = await aiomysql.create_pool(**DB_CONFIG)
+    try:
+        yield pool
+    finally:
+        pool.close()
+        await pool.wait_closed()
+
+
+@asynccontextmanager
+async def get_session(pool: Pool) -> AsyncGenerator[Tuple[Connection, Cursor], None]:
+    """获取数据库会话"""
+    async with pool.acquire() as conn:
+        async with conn.cursor() as cursor:
+            yield conn, cursor

re_common/v2/baselibrary/utils/json_cls.py

@@ -1,11 +1,16 @@
-import base64
-import json
-
-
-class BytesEncoder(json.JSONEncoder):
-    def default(self, obj):
-        if isinstance(obj, bytes):
-            return base64.b64encode(obj).decode('utf-8')
-        return super().default(obj)
-
-# json.dumps(x, ensure_ascii=False, cls=BytesEncoder)
+import base64
+import functools
+import json
+
+json_dumps = functools.partial(json.dumps, ensure_ascii=False)
+
+
+class BytesEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, bytes):
+            return base64.b64encode(obj).decode('utf-8')
+        return super().default(obj)
+
+
+def base64_to_bytes(base64_str, encoding="utf-8") -> bytes:
+    return base64.b64decode(base64_str.encode(encoding))

re_common/v2/baselibrary/utils/mq.py

@@ -1,83 +1,83 @@
-import logging
-import traceback
-
-from re_common.v2.baselibrary.utils.basepika import BasePika
-from retry import retry
-
-logging_logger = logging.getLogger(__name__)
-
-
-class UseMq(object):
-
-    def __init__(self, queue, qos=1):
-        self.queue = queue
-        self.qos = qos
-        self.basepika = BasePika()
-        self.basepika.set_default()
-        self.basepika.connect()
-        self.basepika.create_channel()
-        self.basepika.queue_declare(queue=queue, durable=True)
-        self.basepika.basic_qos(qos)
-        self.properties = self.basepika.get_properties()
-
-    def re_conn(self):
-        """
-        重新连接
-        :return:
-        """
-        self.basepika.connect()
-        self.basepika.create_channel()
-        self.basepika.queue_declare(queue=self.queue, durable=True)
-        self.basepika.basic_qos(self.qos)
-
-    @retry(delay=5, backoff=2, max_delay=60 * 3, logger=logging_logger)
-    def get_mq(self):
-        try:
-            if self.basepika.channel.is_closed:
-                logging_logger.info("重连中......")
-                self.re_conn()
-                logging_logger.info("重连完成......")
-            self.basepika.set_get_msg_callback(routing_key=self.queue, callback=self.callback, auto_ack=False)
-            self.basepika.start_get_msg()
-        except:
-            traceback.print_exc()
-            logging_logger.info("重连中......")
-            self.re_conn()
-
-    def callback(self, ch, method, properties, body):
-        # print(type(body))
-        # print(" [x] Received %r" % body)
-        # body = body.decode()
-        self.callback2(ch, method, properties, body)
-        if self.basepika.auto_ack is False:
-            self.basepika.basic_ack(ch, method)
-
-    def callback2(self, ch, method, properties, body):
-        pass
-
-    @retry(delay=5, backoff=2, max_delay=60 * 3, logger=logging_logger)
-    def send_mq(self, body, num=100):
-        try:
-            if self.basepika.get_queue_size(self.queue) < num:
-                self.basepika.easy_send_msg(routing_key=self.queue,
-                                            body=body,
-                                            properties=self.properties)
-                return True
-            else:
-                return False
-        except:
-            traceback.print_exc()
-            logging_logger.info("重连中......")
-            self.re_conn()
-            return False
-
-    def get_server_mq_num(self, num=100):
-        if self.basepika.get_queue_size(self.queue) < num:
-            return True
-        else:
-            return False
-
-    def easy_send_mq(self, body):
-        self.basepika.easy_send_msg(routing_key=self.queue,
-                                    body=body,
-                                    properties=self.properties)
+import logging
+import traceback
+
+from re_common.v2.baselibrary.utils.basepika import BasePika
+from retry import retry
+
+logging_logger = logging.getLogger(__name__)
+
+
+class UseMq(object):
+
+    def __init__(self, queue, qos=1):
+        self.queue = queue
+        self.qos = qos
+        self.basepika = BasePika()
+        self.basepika.set_default()
+        self.basepika.connect()
+        self.basepika.create_channel()
+        self.basepika.queue_declare(queue=queue, durable=True)
+        self.basepika.basic_qos(qos)
+        self.properties = self.basepika.get_properties()
+
+    def re_conn(self):
+        """
+        重新连接
+        :return:
+        """
+        self.basepika.connect()
+        self.basepika.create_channel()
+        self.basepika.queue_declare(queue=self.queue, durable=True)
+        self.basepika.basic_qos(self.qos)
+
+    @retry(delay=5, backoff=2, max_delay=60 * 3, logger=logging_logger)
+    def get_mq(self):
+        try:
+            if self.basepika.channel.is_closed:
+                logging_logger.info("重连中......")
+                self.re_conn()
+                logging_logger.info("重连完成......")
+            self.basepika.set_get_msg_callback(routing_key=self.queue, callback=self.callback, auto_ack=False)
+            self.basepika.start_get_msg()
+        except:
+            traceback.print_exc()
+            logging_logger.info("重连中......")
+            self.re_conn()
+
+    def callback(self, ch, method, properties, body):
+        # print(type(body))
+        # print(" [x] Received %r" % body)
+        # body = body.decode()
+        self.callback2(ch, method, properties, body)
+        if self.basepika.auto_ack is False:
+            self.basepika.basic_ack(ch, method)
+
+    def callback2(self, ch, method, properties, body):
+        pass
+
+    @retry(delay=5, backoff=2, max_delay=60 * 3, logger=logging_logger)
+    def send_mq(self, body, num=100):
+        try:
+            if self.basepika.get_queue_size(self.queue) < num:
+                self.basepika.easy_send_msg(routing_key=self.queue,
+                                            body=body,
+                                            properties=self.properties)
+                return True
+            else:
+                return False
+        except:
+            traceback.print_exc()
+            logging_logger.info("重连中......")
+            self.re_conn()
+            return False
+
+    def get_server_mq_num(self, num=100):
+        if self.basepika.get_queue_size(self.queue) < num:
+            return True
+        else:
+            return False
+
+    def easy_send_mq(self, body):
+        self.basepika.easy_send_msg(routing_key=self.queue,
+                                    body=body,
+                                    properties=self.properties)