Merge pull request #69 from nineaiyu/dev

perf: 优化代码

Author: nineaiyu

common/core/config.py

@@ -172,10 +172,6 @@ def FILE_UPLOAD_SIZE(self):
     def PICTURE_UPLOAD_SIZE(self):
         return self.get_value('PICTURE_UPLOAD_SIZE', settings.PICTURE_UPLOAD_SIZE)
 
-    @property
-    def EXPORT_MAX_LIMIT(self):
-        return self.get_value('EXPORT_MAX_LIMIT', 20000)
-
 
 class MessagePushConfCache(ConfigCacheBase):
     def __init__(self, *args, **kwargs):

common/core/modelset.py

@@ -6,11 +6,11 @@
 # date : 6/2/2023
 import itertools
 import json
+import math
 import uuid
 from hashlib import md5
 from typing import Callable
 
-import math
 from django.conf import settings
 from django.db import transaction
 from django.forms.widgets import SelectMultiple, DateTimeInput
@@ -41,15 +41,17 @@
 logger = get_logger(__name__)
 
 
-def run_view_by_celery_task(view, request, kwargs, list_data, batch_length=100):
+def run_view_by_celery_task(view, request, kwargs, data, batch_length=100):
     task = kwargs.get("task", request.query_params.get('task', 'true').lower() in ['true', '1', 'yes'])  # 默认为任务异步导入
     if task:
         view_str = f"{view.__class__.__module__}.{view.__class__.__name__}"
         meta = request.META
         task_id = uuid.uuid4()
-        meta["task_count"] = math.ceil(len(list_data) / batch_length)
+        if isinstance(data, dict):
+            data = [data]
+        meta["task_count"] = math.ceil(len(data) / batch_length)
         meta["action"] = view.action
-        for index, batch in enumerate(itertools.batched(list_data, batch_length)):
+        for index, batch in enumerate(itertools.batched(data, batch_length)):
             meta["task_id"] = f"{task_id}_{index}"
             meta["task_index"] = index
             res = background_task_view_set_job.apply_async(args=(view_str, meta, json.dumps(batch), view.action_map),

common/drf/renders/base.py

@@ -10,7 +10,6 @@
 from rest_framework.renderers import BaseRenderer
 from rest_framework.utils import encoders, json
 
-from common.core.config import SysConfig
 from common.core.fields import LabeledChoiceField, BasePrimaryKeyRelatedField, PhoneField
 from common.utils import get_logger
 from common.utils.timezone import local_now
@@ -89,7 +88,7 @@ def process_data(self, data):
             results = [results[0]] if results else results
         else:
             # 限制数据数量
-            results = results[:SysConfig.EXPORT_MAX_LIMIT]
+            results = results[:settings.EXPORT_MAX_LIMIT]
         # 会将一些 UUID 字段转化为 string
         results = json.loads(json.dumps(results, cls=encoders.JSONEncoder))
         return results

docker-compose.yml

@@ -32,7 +32,7 @@ services:
     volumes:
       - ${VOLUME_DIR:-../}/xadmin-postgresql/data:/var/lib/postgresql/data
     healthcheck:
-      test: "pg_isready -q -U $$POSTGRES_USER"
+      test: "pg_isready -q -U $$POSTGRES_USER -d $$POSTGRES_DB"
       interval: 10s
       timeout: 5s
       retries: 3

locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-27 11:21+0800\n"
+"POT-Creation-Date: 2024-11-28 10:19+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -23,7 +23,7 @@ msgid ""
 "<h3>Celery flower service unavailable. Please contact the administrator</h3>"
 msgstr ""
 
-#: common/core/auth.py:25 common/core/filter.py:205 common/core/filter.py:213
+#: common/core/auth.py:25 common/core/filter.py:204 common/core/filter.py:212
 #: common/core/permission.py:126
 msgid "Unauthorized authentication"
 msgstr ""
@@ -97,31 +97,31 @@ msgstr ""
 msgid "Data ownership department"
 msgstr ""
 
-#: common/core/modelset.py:58
+#: common/core/modelset.py:60
 msgid "Task add success"
 msgstr ""
 
-#: common/core/modelset.py:113
+#: common/core/modelset.py:115
 msgid "Image size cannot exceed {}"
 msgstr ""
 
-#: common/core/modelset.py:116
+#: common/core/modelset.py:118
 msgid "Wrong image type, the type should be {}"
 msgstr ""
 
-#: common/core/modelset.py:139
+#: common/core/modelset.py:141
 msgid "Sorting saved successfully"
 msgstr ""
 
-#: common/core/modelset.py:410
+#: common/core/modelset.py:412
 msgid "Operation successful. Batch deleted {} data"
 msgstr ""
 
-#: common/core/modelset.py:523
+#: common/core/modelset.py:525
 msgid "Operation successful. Import {} data"
 msgstr ""
 
-#: common/core/modelset.py:524 system/utils/auth.py:104
+#: common/core/modelset.py:526 system/utils/auth.py:104
 #: system/utils/modelset.py:57 system/views/auth/register.py:69
 #: system/views/auth/reset.py:47 system/views/auth/verify_code.py:139
 msgid "Operation failed. Abnormal data"
@@ -163,90 +163,90 @@ msgstr ""
 msgid "Invalid excel file {}"
 msgstr ""
 
-#: common/drf/renders/base.py:148
+#: common/drf/renders/base.py:147
 msgid "Yes/No"
 msgstr ""
 
-#: common/drf/renders/base.py:151
+#: common/drf/renders/base.py:150
 msgid "Text, max length {}"
 msgstr ""
 
-#: common/drf/renders/base.py:153
+#: common/drf/renders/base.py:152
 msgid "Long text, no length limit"
 msgstr ""
 
-#: common/drf/renders/base.py:155
+#: common/drf/renders/base.py:154
 msgid "Number, min {}, max {}"
 msgstr ""
 
-#: common/drf/renders/base.py:157
+#: common/drf/renders/base.py:156
 msgid "Float, min {}, max {}"
 msgstr ""
 
-#: common/drf/renders/base.py:159
+#: common/drf/renders/base.py:158
 msgid "Decimal, min {}, max {}, max_digits {}, decimal_places {}"
 msgstr ""
 
-#: common/drf/renders/base.py:164
+#: common/drf/renders/base.py:163
 msgid "Datetime format {}"
 msgstr ""
 
-#: common/drf/renders/base.py:166
+#: common/drf/renders/base.py:165
 #: system/templates/notify/msg_rest_password_success.html:9
 msgid "IP"
 msgstr ""
 
-#: common/drf/renders/base.py:170
+#: common/drf/renders/base.py:169
 msgid ""
 "Choices, format name(value), name is optional for human read, value is "
 "requisite, options {}"
 msgstr ""
 
-#: common/drf/renders/base.py:173
+#: common/drf/renders/base.py:172
 msgid "Choices, options {}"
 msgstr ""
 
-#: common/drf/renders/base.py:175
+#: common/drf/renders/base.py:174
 msgid "Phone number, format +8612345678901"
 msgstr ""
 
-#: common/drf/renders/base.py:177
+#: common/drf/renders/base.py:176
 msgid "Label, format [\"key:value\"]"
 msgstr ""
 
-#: common/drf/renders/base.py:179
+#: common/drf/renders/base.py:178
 msgid ""
 "Object, format name(id), name is optional for human read, id is requisite"
 msgstr ""
 
-#: common/drf/renders/base.py:181
+#: common/drf/renders/base.py:180
 msgid "Object, format id"
 msgstr ""
 
-#: common/drf/renders/base.py:185
+#: common/drf/renders/base.py:184
 msgid ""
 "Objects, format [\"name(id)\", ...], name is optional for human read, id is "
 "requisite"
 msgstr ""
 
-#: common/drf/renders/base.py:187
+#: common/drf/renders/base.py:186
 msgid ""
 "Labels, format [\"key:value\", ...], if label not exists, will create it"
 msgstr ""
 
-#: common/drf/renders/base.py:189
+#: common/drf/renders/base.py:188
 msgid "Objects, format [\"id\", ...]"
 msgstr ""
 
-#: common/drf/renders/base.py:195
+#: common/drf/renders/base.py:194
 msgid "JSON"
 msgstr ""
 
-#: common/drf/renders/base.py:197
+#: common/drf/renders/base.py:196
 msgid "UUID4"
 msgstr ""
 
-#: common/drf/renders/base.py:302
+#: common/drf/renders/base.py:301
 msgid ""
 "{} - The encryption password has not been set - please go to personal "
 "information -> file encryption password to set the encryption password"
@@ -719,6 +719,14 @@ msgstr ""
 msgid "Data permissions are used to authorize access to data"
 msgstr ""
 
+#: settings/serializers/basic.py:39
+msgid "Export max limit"
+msgstr ""
+
+#: settings/serializers/basic.py:40
+msgid "Limit the maximum number of rows of exported data"
+msgstr ""
+
 #: settings/serializers/email.py:13
 msgid "Enable Email Service (Email)"
 msgstr ""