diff --git a/apps/bi/tasks.py b/apps/bi/tasks.py index 6e71ec5b..bee4f62c 100644 --- a/apps/bi/tasks.py +++ b/apps/bi/tasks.py @@ -4,8 +4,8 @@ from django.utils import timezone from apps.bi.models import Dataset, DatasetRecord from apps.bi.services import exec_dataset import json - - +from apps.utils.tools import MyJSONEncoder + @shared_task() def exec_dataset_and_store(code: str, query: str = ''): dt = Dataset.objects.get(code=code) @@ -16,4 +16,5 @@ def exec_dataset_and_store(code: str, query: str = ''): if query: squery = json.loads(query) dtr.full_sql, dtr.result = exec_dataset(dt, squery) + dtr.result = json.loads(json.dumps(dtr.result, cls=MyJSONEncoder)) dtr.save() diff --git a/apps/wpm/services_2.py b/apps/wpm/services_2.py index 3f767583..0831037e 100644 --- a/apps/wpm/services_2.py +++ b/apps/wpm/services_2.py @@ -7,7 +7,7 @@ from django.utils import timezone from datetime import datetime from server.conf import BASE_PROJECT_CODE import json -from django.core.serializers.json import DjangoJSONEncoder +from apps.utils.tools import MyJSONEncoder def get_alldata_with_batch_and_store(batch: str): """ @@ -26,7 +26,7 @@ def get_alldata_with_batch_and_store(batch: str): "last_time": last_time }) bobj.last_time = last_time - bobj.data = json.loads(json.dumps(data, cls=DjangoJSONEncoder)) + bobj.data = json.loads(json.dumps(data, cls=MyJSONEncoder)) bobj.save() def get_alldata_with_batch_gx(batch: str):