lesscode-flask 0.1.69__tar.gz → 0.1.71__tar.gz

{lesscode_flask-0.1.69 → lesscode_flask-0.1.71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.1.69
+Version: 0.1.71
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode_flask-0.1.69 → lesscode_flask-0.1.71}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.69'
+__version__ = '0.1.71'
 
 import functools
 import logging

{lesscode_flask-0.1.69 → lesscode_flask-0.1.71}/lesscode_flask/model/access_log.py

@@ -1,6 +1,6 @@
-from lesscode_flask.model.base_model import BaseModel
+from lesscode_flask.model.base_model import BaseModel, DatetimeEncodedString
 from lesscode_flask.utils.helpers import generate_uuid
-from sqlalchemy import Column, DateTime, JSON, text, String, Integer, Float, DOUBLE
+from sqlalchemy import Column, JSON, text, String, Integer,  DOUBLE
 
 
 class AccessLog(BaseModel):
@@ -29,4 +29,4 @@ class AccessLog(BaseModel):
     status_code = Column(Integer, comment='响应状态码')
     create_user_id = Column(String(36), nullable=False, comment='创建人id')
     create_user_name = Column(String(36), nullable=False, comment='创建人用户名')
-    create_time = Column(DateTime, server_default=text("CURRENT_TIMESTAMP"), comment='创建时间')
+    create_time = Column(DatetimeEncodedString(), server_default=text("CURRENT_TIMESTAMP"), comment='创建时间')

{lesscode_flask-0.1.69 → lesscode_flask-0.1.71}/lesscode_flask/model/base_model.py

@@ -1,7 +1,7 @@
 import json
 import logging
 from datetime import datetime
-from typing import Optional
+from typing import Optional, Type, Any
 
 from sqlalchemy.sql.type_api import _T
 
@@ -41,7 +41,15 @@ class JSONEncodedDict(TypeDecorator):
 class DatetimeEncodedString(TypeDecorator):
     """数据字段日期与字符串进行互转"""
 
+    @property
+    def python_type(self) -> Type[Any]:
+        return str
+
+    def process_literal_param(self, value: Optional[_T], dialect: Dialect) -> str:
+        return value
+
     impl = VARCHAR
+    cache_ok = True
 
     def __init__(self, date_format="%Y-%m-%d %H:%M:%S"):
         self.date_format = date_format

{lesscode_flask-0.1.69 → lesscode_flask-0.1.71}/lesscode_flask/service/base_service.py

@@ -158,7 +158,8 @@ class BaseService:
             return data
         return 0
 
-    def page(self, select_columns: list = None, order_columns: list = None, filters: list = None,
+    def page(self, select_columns: list = None, order_columns: list = None, group_columns: list = None,
+             filters: list = None,
              page_num: int = 1,
              page_size: int = 10):
         """
@@ -177,7 +178,8 @@ class BaseService:
             query = query.order_by(*order_columns)
         if select_columns:
             query = query.with_entities(*select_columns)
-
+        if group_columns:
+            query = query.group_by(*group_columns)
         pagination = query.paginate(page=page_num, per_page=page_size, error_out=False)
         # 获取当前页的数据
         items = pagination.items

{lesscode_flask-0.1.69 → lesscode_flask-0.1.71}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.1.69
+Version: 0.1.71
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy