新旧协议

controller/SearchToolController.py

@@ -19,7 +19,7 @@ from django.utils.decorators import method_decorator
 from object.ResponseObject import ResponseObject
 from django.contrib.auth.hashers import make_password, check_password
 from model.models import UserModel, LangSetModel, LangAreaModel, LangKeyModel, LangValModel, LangPermModel, \
-    SearchToolBlock, SearchToolMessage, SearchToolKeyModel, LangLocationModel
+    SearchToolBlock, SearchToolKeyModel, LangLocationModel
 import time
 from object.TokenObject import TokenObject
 from django.db.models import Q

model/models.py

@@ -61,7 +61,7 @@ class LangProjectModel(models.Model):
 class LangKeyModel(models.Model):
     id = models.AutoField(primary_key=True)
     word_key = models.CharField(default='', max_length=64, verbose_name='词汇键')
-    project = models.ForeignKey(LangProjectModel, to_field='id', on_delete=models.CASCADE, verbose_name='关联项目表')
+    project = models.ForeignKey(LangProjectModel, null=True, to_field='id', on_delete=models.CASCADE, verbose_name='关联项目表')
     addTime = models.IntegerField(default=0, verbose_name='添加时间')
     updTime = models.IntegerField(default=0, verbose_name='更新时间')
     '''
@@ -78,8 +78,8 @@ class LangKeyModel(models.Model):
 
 class LangValModel(models.Model):
     id = models.AutoField(primary_key=True)
-    lk = models.ForeignKey(LangKeyModel, verbose_name='v关联词汇k', to_field='id', on_delete=models.CASCADE)
-    la = models.ForeignKey(LangAreaModel, verbose_name='词汇k关联语种', to_field='id', on_delete=models.CASCADE)
+    lk = models.ForeignKey(LangKeyModel, null=True, verbose_name='v关联词汇k', to_field='id', on_delete=models.CASCADE)
+    la = models.ForeignKey(LangAreaModel, null=True, verbose_name='词汇k关联语种', to_field='id', on_delete=models.CASCADE)
     word_val = models.CharField(default='', max_length=64, verbose_name='词汇v')
     addTime = models.IntegerField(default=0, verbose_name='添加时间')
     updTime = models.IntegerField(default=0, verbose_name='更新时间')
@@ -199,7 +199,7 @@ class LangClassModel(models.Model):
 
 class LangKeyClassModel(models.Model):
     id = models.AutoField(primary_key=True)
-    lk = models.ForeignKey(LangKeyModel, to_field='id', on_delete=models.CASCADE, verbose_name='关联词汇键表')
+    lk = models.ForeignKey(LangKeyModel, null=True, to_field='id', on_delete=models.CASCADE, verbose_name='关联词汇键表')
     clazz = models.ForeignKey(LangClassModel, to_field='id', on_delete=models.CASCADE, verbose_name='关联avss模块表')
 
     class Meta:
@@ -210,7 +210,7 @@ class LangKeyClassModel(models.Model):
 
 class LangLocationModel(models.Model):
     id = models.AutoField(primary_key=True)
-    lk = models.ForeignKey(LangKeyModel, to_field='id', on_delete=models.CASCADE, verbose_name='关联词汇键表')
+    lk = models.ForeignKey(LangKeyModel, null=True, to_field='id', on_delete=models.CASCADE, verbose_name='关联词汇键表')
     filename = models.TextField(default='', null=False, verbose_name='类的路径')
     line = models.IntegerField(default=0, verbose_name='所在的类的行')
 
@@ -244,21 +244,6 @@ class  SearchToolBlock(models.Model):
         verbose_name_plural = verbose_name
         db_table = 'search_tool_block'
 
-class SearchToolMessage(models.Model):
-    id = models.AutoField(primary_key=True)
-    location = models.CharField(default='', max_length=200, verbose_name='位置')
-    line = models.CharField(default='', max_length=20, verbose_name='行数')
-    source = models.CharField(default='', max_length=200, verbose_name='来源')
-    translation = models.CharField(default='', max_length=200, verbose_name='翻译')
-    bk = models.ForeignKey(SearchToolBlock, to_field='id', on_delete=models.DO_NOTHING, verbose_name='协议块存储')
-    type = models.CharField(default='', unique=True, max_length=20, verbose_name='协议类型')
-    addTime = models.IntegerField(verbose_name='添加时间', default=0)
-    updTime = models.IntegerField(verbose_name='更新时间', default=0)
-
-    class Meta:
-        verbose_name = '协议消息存储'
-        verbose_name_plural = verbose_name
-        db_table = 'search_tool_message'
 
 # key关联可编辑协议内容
 class SearchToolKeyModel(models.Model):