nelson
/
py_vislib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: get => filter

master
xuxiaofei 4 years ago
parent
41f7cd31df
commit
7e02e5ed83
2 changed files with 60 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 102
      vislib/models.py
  2. 19
      vislib/views/source.py

102
vislib/models.py
View File

@ -3,67 +3,67 @@ from django.contrib.auth.models import User
from django.utils import timezone from django.utils import timezone
def default_datetime(): def default_datetime():
now = timezone.now() now = timezone.now()
return now return now
class SourceDataBase(models.Model): class SourceDataBase(models.Model):
host = models.CharField(max_length=32) host = models.CharField(max_length=32)
port = models.IntegerField() port = models.IntegerField()
username = models.CharField(max_length=32) username = models.CharField(max_length=32)
password = models.CharField(max_length=256) password = models.CharField(max_length=256)
database = models.CharField(max_length=32) database = models.CharField(max_length=32)
base_alias = models.CharField(max_length=32) base_alias = models.CharField(max_length=32)
creator = models.ForeignKey(User, on_delete=models.CASCADE) creator = models.ForeignKey(User, on_delete=models.CASCADE)
source_id = models.CharField(max_length=64, primary_key=True) source_id = models.CharField(max_length=64, primary_key=True)
is_private = models.BooleanField(default=True) is_private = models.BooleanField(default=True)
status = models.IntegerField(default=1) status = models.IntegerField(default=1)
created_at = models.DateTimeField(db_index=True, default=default_datetime) created_at = models.DateTimeField(db_index=True, default=default_datetime)
updated_at = models.DateTimeField(db_index=True, null=False) updated_at = models.DateTimeField(db_index=True, null=False)
class SourceDataTable(models.Model): class SourceDataTable(models.Model):
database = models.ForeignKey(SourceDataBase, on_delete=models.CASCADE) database = models.ForeignKey(SourceDataBase, on_delete=models.CASCADE)
table = models.CharField(max_length=32) table = models.CharField(max_length=32)
table_alias = models.CharField(max_length=32) table_alias = models.CharField(max_length=32)
status = models.IntegerField(default=1) status = models.IntegerField(default=1)
creator = models.ForeignKey(User, on_delete=models.CASCADE) creator = models.ForeignKey(User, on_delete=models.CASCADE)
id = models.CharField(max_length=64, primary_key=True) id = models.CharField(max_length=64, primary_key=True)
created_at = models.DateTimeField(db_index=True, default=default_datetime) created_at = models.DateTimeField(db_index=True, default=default_datetime)
updated_at = models.DateTimeField(db_index=True, null=False) updated_at = models.DateTimeField(db_index=True, null=False)
# Create your models here. # Create your models here.
class Chart(models.Model): class Chart(models.Model):
chart_id = models.CharField(max_length=64, primary_key=True) chart_id = models.CharField(max_length=64, primary_key=True)
chart_name = models.CharField(max_length=128) chart_name = models.CharField(max_length=128)
source_id = models.ForeignKey(SourceDataBase, on_delete=models.CASCADE) source_id = models.ForeignKey(SourceDataBase, on_delete=models.CASCADE)
desc = models.CharField(max_length=512, null=True) desc = models.CharField(max_length=512, null=True)
content = models.TextField() content = models.TextField()
is_private = models.BooleanField() is_private = models.BooleanField()
status = models.IntegerField() status = models.IntegerField()
creator = models.ForeignKey(User, on_delete=models.CASCADE) creator = models.ForeignKey(User, on_delete=models.CASCADE)
created_at = models.DateTimeField(db_index=True, default=default_datetime) created_at = models.DateTimeField(db_index=True, default=default_datetime)
updated_at = models.DateTimeField(db_index=True, null=False) updated_at = models.DateTimeField(db_index=True, null=False)
class Dashboard(models.Model): class Dashboard(models.Model):
dashboard_id = models.CharField(max_length=64, primary_key=True) dashboard_id = models.CharField(max_length=64, primary_key=True)
name = models.CharField(max_length=128) name = models.CharField(max_length=128)
desc = models.CharField(max_length=512, null=True) desc = models.CharField(max_length=512, null=True)
content = models.TextField() content = models.TextField()
is_private = models.BooleanField() is_private = models.BooleanField()
status = models.IntegerField() status = models.IntegerField()
creator = models.ForeignKey(User, on_delete=models.CASCADE) creator = models.ForeignKey(User, on_delete=models.CASCADE)
created_at = models.DateTimeField(db_index=True, default=default_datetime) created_at = models.DateTimeField(db_index=True, default=default_datetime)
updated_at = models.DateTimeField(db_index=True, null=False) updated_at = models.DateTimeField(db_index=True, null=False)
class ChartBoardMap(models.Model): class ChartBoardMap(models.Model):
chart = models.ForeignKey(Chart, on_delete=models.CASCADE) chart = models.ForeignKey(Chart, on_delete=models.CASCADE)
dashboard = models.ForeignKey(Dashboard, on_delete=models.CASCADE) dashboard = models.ForeignKey(Dashboard, on_delete=models.CASCADE)
id = models.CharField(max_length=64, primary_key=True) id = models.CharField(max_length=64, primary_key=True)
created_at = models.DateTimeField(db_index=True, default=default_datetime) created_at = models.DateTimeField(db_index=True, default=default_datetime)
updated_at = models.DateTimeField(db_index=True, null=False) updated_at = models.DateTimeField(db_index=True, null=False)
class BoardOrder(models.Model): class BoardOrder(models.Model):
creator = models.ForeignKey(User, on_delete=models.CASCADE) creator = models.ForeignKey(User, on_delete=models.CASCADE)
order = models.TextField() order = models.TextField()
id = models.CharField(max_length=64, primary_key=True) id = models.CharField(max_length=64, primary_key=True)
created_at = models.DateTimeField(db_index=True, default=default_datetime) created_at = models.DateTimeField(db_index=True, default=default_datetime)
updated_at = models.DateTimeField(db_index=True, null=False) updated_at = models.DateTimeField(db_index=True, null=False)

19
vislib/views/source.py
View File

@ -93,14 +93,15 @@ def sourceDetail(request, sourceId):
def sourceTables(request, sourceId): def sourceTables(request, sourceId):
json_data = [] json_data = []
try: try:
tables = SourceDataTable.objects.get(database=sourceId) tables = SourceDataTable.objects.filter(database=sourceId)
tables = serializers.serialize('json', [tables])
tables = serializers.serialize('json', tables)
tables = json.loads(tables) tables = json.loads(tables)
for table in tables: for table in tables:
json_data.append(table['fields']) json_data.append(table['fields'])
except: except Exception as e:
print('no linked tables before') print('no linked tables before', e)
source = SourceDataBase.objects.get(source_id=sourceId) source = SourceDataBase.objects.get(source_id=sourceId)
source = serializers.serialize('json', [source]) source = serializers.serialize('json', [source])
@ -161,17 +162,15 @@ def sourceTableSave(request):
@csrf_exempt @csrf_exempt
def sourceLinkedTables(request, sourceId): def sourceLinkedTables(request, sourceId):
try: try:
tables = SourceDataTable.objects.get(database=sourceId) tables = SourceDataTable.objects.filter(database=sourceId)
print(tables) tables = serializers.serialize('json', tables)
tables = serializers.serialize('json', [tables])
print(tables)
tables = json.loads(tables) tables = json.loads(tables)
print(tables)
json_data = [] json_data = []
for table in tables: for table in tables:
json_data.append(table['fields']) json_data.append(table['fields'])
except: except Exception as e:
json_data = [] json_data = []
printz(e)
return JsonResponse({'code': 20000, 'message': 'success', 'data': json_data }) return JsonResponse({'code': 20000, 'message': 'success', 'data': json_data })

Write Preview
Loading…
Cancel
Save