codosdk 1.0.16__tar.gz → 1.0.18__tar.gz

{codosdk-1.0.16 → codosdk-1.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: codosdk
-Version: 1.0.16
+Version: 1.0.18
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo

{codosdk-1.0.16 → codosdk-1.0.18}/codosdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: codosdk
-Version: 1.0.16
+Version: 1.0.18
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo

{codosdk-1.0.16 → codosdk-1.0.18}/setup.py

@@ -9,7 +9,7 @@ desc   : CODO SDK
 import sys
 from setuptools import setup, find_packages
 
-VERSION = '1.0.16'
+VERSION = '1.0.18'
 
 if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 6):
     print('This program requires at least Python 2.7 or 3.6 to run.')

{codosdk-1.0.16 → codosdk-1.0.18}/websdk2/crud_utils.py

@@ -63,6 +63,7 @@ class ModelCRUDView:
         self.prepare()
 
         value = params.get('searchValue', params.get('searchVal'))
+        id_list = params.get('id_list', [])
         filter_map = params.pop('filter_map', {})
         params.setdefault('page_size', 300)  # 统一处理默认值
 
@@ -89,6 +90,8 @@ class ModelCRUDView:
         try:
             with DBContext('r') as session:
                 query = session.query(self.model).filter(filter_condition).filter_by(**filter_map)
+                if id_list and isinstance(id_list, list):
+                    query = query.filter(self.model.id.in_(id_list))
                 page = paginate(query, **params)
         except Exception as e:
             return dict(code=2, msg='查询失败', data=None, reason=str(e), timestamp=get_millisecond_timestamp())
@@ -112,18 +115,21 @@ class ModelCRUDView:
         try:
             self.pydantic_model(**data)
         except ValidationError as e:
-            return dict(code=-1, msg='数据格式出错', reason=str(e), timestamp=get_millisecond_timestamp())
+            return dict(code=-1, msg='数据格式出错', reason=str(e), data=None, timestamp=get_millisecond_timestamp())
 
         try:
             with DBContext('w', None, True) as db:
-                db.add(self.model(**data))
+                __record = self.model(**data)
+                db.add(__record)
+                db.flush()
+                new_id = __record.id
+                return dict(code=0, msg="创建成功", data={"new_id": new_id}, reason="",
+                            timestamp=get_millisecond_timestamp())
         except IntegrityError as e:
-            return dict(code=-2, msg='不要重复添加', reason=str(e), timestamp=get_millisecond_timestamp())
+            return dict(code=-2, msg='不要重复添加', data=None, reason=str(e), timestamp=get_millisecond_timestamp())
 
         except Exception as e:
-            return dict(code=-3, msg='创建失败', reason=str(e), timestamp=get_millisecond_timestamp())
-
-        return dict(code=0, msg="创建成功", reason="", timestamp=get_millisecond_timestamp())
+            return dict(code=-3, msg='创建失败', data=None, reason=str(e), timestamp=get_millisecond_timestamp())
 
     def handle_update(self, data: dict) -> dict:
         self.prepare()