chenjunyi/cdtestplant_v1
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

日常修复内容20260422

Browse Source
This commit is contained in:
管理员
2026-04-22 18:28:32 +08:00
parent dffc1d5872
commit 66e48d3165
507 changed files with 473 additions and 1085 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
apps/project/__pycache__/models.cpython-313.pyc
View File

Binary file not shown.

BIN
apps/project/controllers/__pycache__/design.cpython-313.pyc
View File

Binary file not shown.

BIN
apps/project/controllers/__pycache__/project.cpython-313.pyc
View File

Binary file not shown.

64
apps/project/controllers/design.py
View File

@@ -15,7 +15,7 @@ from typing import List
from utils.chen_response import ChenResponse
from utils.chen_crud import multi_delete_design
from utils.codes import HTTP_INDEX_ERROR
from apps.project.models import Design, Dut, Round, Project
from apps.project.models import Design, Dut, Round, Project, JKDesignInfo
from apps.project.schemas.design import DeleteSchema, DesignFilterSchema, DesignModelOutSchema, \
DesignTreeReturnSchema, \
DesignTreeInputSchema, DesignCreateOutSchema, DesignCreateInputSchema, MultiDesignCreateInputSchema, \
@@ -25,6 +25,22 @@ from utils.smallTools.interfaceTools import conditionNoneToBlank
from apps.project.tools.auto_create_data import auto_create_renji
from apps.project.tool.dragAndDrop import DesignDrapAtoB
def _save_jk_direction_info(design: Design, direction: str, source: str, destination: str, description: str):
"""保存或更新 JKDesignInfo 记录"""
if not source and not destination and not description:
# 如果三个字段全为空，则删除可能存在的记录（避免冗余数据）
JKDesignInfo.objects.filter(jk=design, direction=direction).delete()
return
JKDesignInfo.objects.update_or_create(
jk=design,
direction=direction,
defaults={
'source': source or '',
'destination': destination or '',
'description': description or '',
}
)
@api_controller("/project", auth=JWTAuth(), permissions=[IsAuthenticated], tags=['设计需求数据'])
class DesignController(ControllerBase):
@route.get("/getDesignDemandList", response=List[DesignModelOutSchema], exclude_none=True,
@@ -97,7 +113,30 @@ class DesignController(ControllerBase):
{'key': key_string, 'round': round_instance, 'dut': dut_instance, 'title': payload.name})
asert_dict.pop("round_key")
asert_dict.pop("dut_key")
# 去掉Design不使用的字段
asert_dict.pop("forward_source", None)
asert_dict.pop("forward_destination", None)
asert_dict.pop("forward_description", None)
asert_dict.pop("reverse_source", None)
asert_dict.pop("reverse_destination", None)
asert_dict.pop("reverse_description", None)
qs = Design.objects.create(**asert_dict)
# 处理接口方向信息（仅当 demandType == '3' 且存在正向/反向数据时）
if payload.demandType == '3':
_save_jk_direction_info(
design=qs,
direction=JKDesignInfo.Direction.FORWARD,
source=payload.forward_source,
destination=payload.forward_destination,
description=payload.forward_description,
)
_save_jk_direction_info(
design=qs,
direction=JKDesignInfo.Direction.REVERSE,
source=payload.reverse_source,
destination=payload.reverse_destination,
description=payload.reverse_description,
)
return qs
# 批量增加设计需求，对应前端批量增加页面modal
@@ -136,15 +175,36 @@ class DesignController(ControllerBase):
# 判断是否和同项目同轮次的标识重复
if len(design_search) > 1 and payload.ident != '':
return ChenResponse(code=400, status=400, message='研制需求的标识重复，请检查')
# 查到当前
design_qs = Design.objects.get(id=id)
for attr, value in payload.dict().items():
if attr == 'project_id' or attr == 'round_key' or attr == 'dut_key':
if attr in ('project_id', 'round_key', 'dut_key'):
continue
if attr == 'name':
setattr(design_qs, "title", value)
setattr(design_qs, attr, value)
design_qs.save()
# 处理接口方向信息更新
if payload.demandType == '3':
_save_jk_direction_info(
design=design_qs,
direction=JKDesignInfo.Direction.FORWARD,
source=payload.forward_source,
destination=payload.forward_destination,
description=payload.forward_description,
)
_save_jk_direction_info(
design=design_qs,
direction=JKDesignInfo.Direction.REVERSE,
source=payload.reverse_source,
destination=payload.reverse_destination,
description=payload.reverse_description,
)
else:
# 如果需求类型不再是接口，则删除已有的方向信息
JKDesignInfo.objects.filter(jk=design_qs).delete()
return design_qs
# 删除设计需求

2
apps/project/controllers/project.py
View File

@@ -463,7 +463,7 @@ class ProjectController(ControllerBase):
return ChenResponse(status=200, code=25001, data={"table": item_obj.table, "fontnote": item_obj.fontnote})
return ChenResponse(status=200, code=25002, data=None)
# ~~~静态软件项、静态硬件项、动态软件项、动态硬件项 - 新增或修改~~~
# ~~~静态软件项、静态硬件项、动态软件项、动态硬件项、测评数据 - 新增或修改~~~
@route.post("/post_static_dynamic_item/")
@transaction.atomic
def post_static_dynamic_item(self, data: StaticDynamicData):

51
apps/project/migrations/0033_remove_design_protocal_remove_design_to_and_more.py Normal file
View File

@@ -0,0 +1,51 @@
# Generated by Django 6.0.4 on 2026-04-21 18:21
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('project', '0032_alter_design_protocal'),
]
operations = [
migrations.RemoveField(
model_name='design',
name='protocal',
),
migrations.RemoveField(
model_name='design',
name='to',
),
migrations.RemoveField(
model_name='design',
name='type',
),
migrations.AlterField(
model_name='design',
name='source',
field=models.CharField(blank=True, default='', help_text='接口来源', max_length=256, null=True, verbose_name='接口来源'),
),
migrations.CreateModel(
name='JKDesignInfo',
fields=[
('id', models.BigAutoField(help_text='Id', primary_key=True, serialize=False, verbose_name='Id')),
('remark', models.CharField(blank=True, help_text='描述', max_length=255, null=True, verbose_name='描述')),
('update_datetime', models.DateField(auto_now=True, help_text='修改时间', null=True, verbose_name='修改时间')),
('create_datetime', models.DateField(auto_now_add=True, help_text='创建时间', null=True, verbose_name='创建时间')),
('sort', models.IntegerField(blank=True, default=1, help_text='显示排序', null=True, verbose_name='显示排序')),
('direction', models.CharField(choices=[('forward', '正向'), ('reverse', '反向')], max_length=10, verbose_name='方向')),
('description', models.TextField(blank=True, default='', max_length=1024, null=True, verbose_name='接口描述')),
('source', models.CharField(blank=True, default='', max_length=200, null=True, verbose_name='来源')),
('destination', models.CharField(blank=True, default='', max_length=200, null=True, verbose_name='目的地')),
('jk', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jkField', to='project.design', verbose_name='所属接口Design')),
],
options={
'verbose_name': '接口一个方向的信息',
'verbose_name_plural': '接口一个方向的信息',
'unique_together': {('jk', 'direction')},
},
),
]

37
apps/project/migrations/0034_remove_design_source_design_type_and_more.py Normal file
View File

@@ -0,0 +1,37 @@
# Generated by Django 6.0.4 on 2026-04-21 18:27
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('project', '0033_remove_design_protocal_remove_design_to_and_more'),
]
operations = [
migrations.RemoveField(
model_name='design',
name='source',
),
migrations.AddField(
model_name='design',
name='type',
field=models.CharField(blank=True, default='', help_text='接口类型', max_length=1024, null=True, verbose_name='接口类型'),
),
migrations.AlterField(
model_name='jkdesigninfo',
name='description',
field=models.TextField(blank=True, max_length=1024, null=True, verbose_name='接口描述'),
),
migrations.AlterField(
model_name='jkdesigninfo',
name='destination',
field=models.CharField(blank=True, max_length=200, null=True, verbose_name='目的地'),
),
migrations.AlterField(
model_name='jkdesigninfo',
name='source',
field=models.CharField(blank=True, max_length=200, null=True, verbose_name='来源'),
),
]

18
apps/project/migrations/0035_design_is_bidirectional.py Normal file
View File

@@ -0,0 +1,18 @@
# Generated by Django 6.0.4 on 2026-04-21 18:38
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('project', '0034_remove_design_source_design_type_and_more'),
]
operations = [
migrations.AddField(
model_name='design',
name='is_bidirectional',
field=models.BooleanField(default=False, verbose_name='是否双向'),
),
]

BIN
apps/project/migrations/__pycache__/0033_remove_design_protocal_remove_design_to_and_more.cpython-313.pyc Normal file
View File

Binary file not shown.

BIN
apps/project/migrations/__pycache__/0034_remove_design_source_design_type_and_more.cpython-313.pyc Normal file
View File

Binary file not shown.

BIN
apps/project/migrations/__pycache__/0035_design_is_bidirectional.cpython-313.pyc Normal file
View File

Binary file not shown.

40
apps/project/models.py
View File

@@ -15,9 +15,9 @@ class Project(CoreModel):
help_text="项目标识", unique=True) # 唯一
name = models.CharField(max_length=100, blank=True, null=True, verbose_name="项目名称",
help_text="项目名称")
beginTime = models.DateField(auto_now_add=True, null=True, blank=True, help_text="开始时间",
beginTime = models.DateField(null=True, blank=True, help_text="开始时间",
verbose_name="开始时间")
endTime = models.DateField(auto_now_add=True, null=True, blank=True, help_text="结束时间",
endTime = models.DateField(null=True, blank=True, help_text="结束时间",
verbose_name="结束时间")
duty_person = models.CharField(max_length=64, verbose_name="负责人", help_text="负责人")
member = models.JSONField(null=True, blank=True, help_text="项目成员", verbose_name="项目成员",
@@ -198,15 +198,12 @@ class Design(CoreModel):
dut = models.ForeignKey(to="Dut", db_constraint=False, related_name="rsField", on_delete=models.CASCADE,
verbose_name='归属轮次', help_text='归属轮次', related_query_name='rsQuery')
# 如果是demandTye='3'则加上如下字段
source = models.CharField(max_length=64, blank=True, null=True, default='', verbose_name='接口来源',
help_text='接口来源')
to = models.CharField(max_length=64, blank=True, null=True, default='', verbose_name='接口目的地',
help_text='接口目的地')
type = models.CharField(max_length=64, blank=True, null=True, default='', verbose_name='接口类型',
type = models.CharField(max_length=1024, blank=True, null=True, default='', verbose_name='接口类型',
help_text='接口类型')
# 注意：该字段改为接口数据
protocal = models.CharField(max_length=1024, blank=True, null=True, default='', verbose_name='接口数据',
help_text='接口数据')
is_bidirectional = models.BooleanField(
default=False,
verbose_name="是否双向"
)
def __str__(self):
return f'设计需求:{self.name}'
@@ -217,6 +214,29 @@ class Design(CoreModel):
verbose_name_plural = verbose_name
ordering = ('key',)
class JKDesignInfo(CoreModel):
class Direction(models.TextChoices):
FORWARD = 'forward', '正向'
REVERSE = 'reverse', '反向'
jk = models.ForeignKey(Design, on_delete=models.CASCADE, related_name="jkField", verbose_name="所属接口Design")
direction = models.CharField(
max_length=10,
choices=Direction.choices, # type: ignore
verbose_name="方向"
)
description = models.TextField(max_length=1024, blank=True, null=True, verbose_name="接口描述")
source = models.CharField(max_length=200, blank=True, null=True, verbose_name="来源")
destination = models.CharField(max_length=200, blank=True, null=True, verbose_name="目的地")
class Meta:
unique_together = [['jk', 'direction']] # 同一个方向仅一条记录
verbose_name = "接口一个方向的信息"
verbose_name_plural = "接口一个方向的信息"
def __str__(self):
return f"{self.jk.name} - {self.get_direction_display()}"
class TestDemand(CoreModel):
"""测试项"""
objects = models.Manager()

BIN
apps/project/schemas/__pycache__/design.cpython-313.pyc
View File

Binary file not shown.

BIN
apps/project/schemas/__pycache__/project.cpython-313.pyc
View File

Binary file not shown.

57
apps/project/schemas/design.py
View File

@@ -1,5 +1,5 @@
from typing import Optional
from apps.project.models import Design
from apps.project.models import Design, JKDesignInfo
from ninja import Field, Schema, ModelSchema
from typing import List, Union
from pydantic import AliasChoices
@@ -30,11 +30,54 @@ class DesignModelOutSchemaOrigin(ModelSchema):
class DesignModelOutSchema(ModelSchema):
# 新增字段 - 上级的dut对象
dut: Optional[DutModelOutSchema] = None
is_bidirectional: bool = Field(False, alias='is_bidirectional')
forward_source: str = Field("")
forward_destination: str = Field("")
forward_description: str = Field("")
reverse_source: str = Field("")
reverse_destination: str = Field("")
reverse_description: str = Field("")
class Meta:
model = Design
exclude = ['project', 'round', 'dut', 'remark', 'sort']
# ---------- 解析器方法 ----------
@staticmethod
def resolve_is_bidirectional(obj: Design) -> bool:
return obj.is_bidirectional
@staticmethod
def resolve_forward_source(obj: Design) -> str:
"""从 JKDesignInfo 正向记录中获取 source"""
info = obj.jkField.filter(direction=JKDesignInfo.Direction.FORWARD).first()
return info.source if info else ""
@staticmethod
def resolve_forward_destination(obj: Design) -> str:
info = obj.jkField.filter(direction=JKDesignInfo.Direction.FORWARD).first()
return info.destination if info else ""
@staticmethod
def resolve_forward_description(obj: Design) -> str:
info = obj.jkField.filter(direction=JKDesignInfo.Direction.FORWARD).first()
return info.description if info else ""
@staticmethod
def resolve_reverse_source(obj: Design) -> str:
info = obj.jkField.filter(direction=JKDesignInfo.Direction.REVERSE).first()
return info.source if info else ""
@staticmethod
def resolve_reverse_destination(obj: Design) -> str:
info = obj.jkField.filter(direction=JKDesignInfo.Direction.REVERSE).first()
return info.destination if info else ""
@staticmethod
def resolve_reverse_description(obj: Design) -> str:
info = obj.jkField.filter(direction=JKDesignInfo.Direction.REVERSE).first()
return info.description if info else ""
# 处理树状结构的schema
class DesignTreeReturnSchema(Schema):
title: str = Field(..., alias='title')
@@ -66,11 +109,15 @@ class DesignCreateInputSchema(Schema):
demandType: str = Field(None, alias="demandType")
description: str = Field("", alias="description")
chapter: str = Field(None, alias='chapter')
# 接口独有的4个字段
source: str = Field('', alias='source')
to: str = Field('', alias='to')
# 接口类型包含
type: str = Field('', alias='type')
protocal: str = Field('', alias='protocal')
is_bidirectional: bool = Field(False, alias='is_bidirectional')
forward_source: str = Field("")
forward_destination: str = Field("")
forward_description: str = Field("")
reverse_source: str = Field("")
reverse_destination: str = Field("")
reverse_description: str = Field("")
class SingleDesignSchema(Schema):
ident: str = Field(None, alias="ident")