日常修复内容20260422

.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Black">
-    <option name="sdkName" value="Python 3.8 (cdtestplant_v1)" />
+    <option name="sdkName" value="uv (cdtestplant_v1)" />
   </component>
   <component name="ProjectRootManager" version="2" project-jdk-name="uv (cdtestplant_v1)" project-jdk-type="Python SDK" />
 </project>

apps/createDocument/controllers/bg.py

@@ -19,7 +19,7 @@ from utils.util import get_str_dict, get_list_dict, create_problem_grade_str, cr
     create_demand_summary, create_problem_type_str, create_problem_table, create_problem_type_table, \
     get_str_abbr
 # 根据轮次生成测评内容文档context
-from apps.createDocument.extensions.content_result_tool import create_round_context
+from apps.createDocument.extensions.content_result_tool import create_round_context, create_influence_context
 from apps.createDocument.extensions.zhui import create_bg_round1_zhui
 from apps.createDocument.extensions.solve_problem import create_one_problem_dit
 from utils.path_utils import project_path
@@ -105,6 +105,10 @@ class GenerateControllerBG(ControllerBase):
         language_list = []
         for language in languages:
             language_list.append(language.get('ident_version'))
+        runtimes = get_list_dict('runtime', project_obj.runtime)
+        runtime_list = [item['ident_version'] for item in runtimes]
+        devplants = get_list_dict('devplant', project_obj.devplant)
+        devplant_list = [item['ident_version'] for item in devplants]
 
         # 获取轮次
         rounds = project_obj.pField.all()
@@ -112,7 +116,7 @@ class GenerateControllerBG(ControllerBase):
         for r in rounds:
             round_dict = {}
             # 获取SO的dut
-            so_dut: Dut = r.rdField.filter(type='SO').first()
+            so_dut: Dut | None = r.rdField.filter(type='SO').first()
             if so_dut:
                 round_dict['version'] = so_dut.version
                 round_dict['line_count'] = int(so_dut.total_lines)
@@ -123,8 +127,8 @@ class GenerateControllerBG(ControllerBase):
             'project_name': project_obj.name,
             'soft_type': project_obj.get_soft_type_display(),
             'security_level': get_str_dict(project_obj.security_level, 'security_level'),
-            'runtime': get_str_dict(project_obj.runtime, 'runtime'),
-            'devplant': get_str_dict(project_obj.devplant, 'devplant'),
+            'runtime': "\a".join(runtime_list),
+            'devplant': "\a".join(devplant_list),
             'language': "\a".join(language_list),
             'recv_date': project_obj.beginTime.strftime("%Y-%m-%d"),
             'dev_unit': project_obj.dev_unit,
@@ -354,9 +358,11 @@ class GenerateControllerBG(ControllerBase):
         # 每个轮次都需要生成一个测试内容和标题
         project_path_str = project_path(id)
         for round_str in round_str_list:
-            context = create_round_context(project_obj, round_str)
+            context, round_obj = create_round_context(project_obj, round_str)
             template_path = Path.cwd() / 'media' / project_path_str / 'form_template' / 'bg' / '测试内容和结果_第二轮次.docx'
             doc = DocxTemplate(template_path)
+            # ~~~额外添加：除第一轮次的影响域分析~~~
+            context['influence'] = create_influence_context(doc, round_obj, project_obj)
             doc.render(context, autoescape=True)
             try:
                 doc.save(
@@ -442,7 +448,7 @@ class GenerateControllerBG(ControllerBase):
                 design_dict['demands'] = '\a'.join(demand_list)
             # 通过还是未通过
             design_dict['pass'] = '通过'
-            design_dict['index'] = design_index
+            design_dict['index'] = design_index  # noqa
             data_list.append(design_dict)
             design_index += 1
 

apps/createDocument/controllers/dg.py

@@ -1,13 +1,21 @@
+import base64
+import io
+from typing import Any
 from datetime import datetime
+from docx.shared import Mm
+from docx.enum.text import WD_ALIGN_PARAGRAPH
+from docx.enum.table import WD_ALIGN_VERTICAL
+from docx.oxml.ns import qn
 from ninja.errors import HttpError
 from ninja_extra import ControllerBase, api_controller, route
 from django.db import transaction
 from django.db.models import Q
-from docxtpl import DocxTemplate
+from docxtpl import DocxTemplate, InlineImage
 from pathlib import Path
 from utils.chen_response import ChenResponse
 # 导入数据库ORM
-from apps.project.models import Project, Contact, Abbreviation
+from apps.project.models import Project, Contact, Abbreviation, ProjectSoftSummary, StuctSortData, StaticSoftItem, StaticSoftHardware, \
+    DynamicSoftTable, DynamicHardwareTable, ProjectDynamicDescription, EvaluateData, EnvAnalysis, Design
 from apps.dict.models import Dict
 # 导入工具函数
 from utils.util import get_str_dict, get_list_dict, get_testType, get_ident, get_str_abbr
@@ -23,7 +31,7 @@ from apps.createSeiTaiDocument.extensions.logger import GenerateLogger
 # 导入mixins-处理文档片段
 from apps.createDocument.extensions.mixins import FragementToolsMixin
 # 导入工具
-from apps.createDocument.extensions.tools import demand_sort_by_designKey
+from apps.createDocument.extensions.tools import demand_sort_by_designKey, set_table_border_by_cell_position, set_cell_margins
 
 # @api_controller("/generate", tags=['生成大纲文档'], auth=JWTAuth(), permissions=[IsAuthenticated])
 @api_controller("/generate", tags=['生成大纲文档'])
@@ -74,21 +82,32 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
                 for tm_item in single_qs.testMethod:
                     if tm_item == dict_item_qs.key:
                         testmethod_str += dict_item_qs.title + " "
-            # 富文本解析
             # ***Inspect-start：检查设计需求的描述是否为空***
             if single_qs.design.description == '':
                 design_info = single_qs.design.ident + '-' + single_qs.design.name
                 self.logger.write_warning_log('测试项', f'设计需求中的描述为空，请检查 -> {design_info}')
             # ***Inspect-end***
+            # 富文本解析
             html_parser = RichParser(single_qs.design.description)
             desc_list = html_parser.get_final_list(doc)
             # 查询关联design以及普通design
-            doc_list = [{'dut_name': single_qs.dut.name, 'design_chapter': single_qs.design.chapter,
-                         'design_name': single_qs.design.name}]
-            for relate_design in single_qs.otherDesign.all():
-                ddict = {'dut_name': relate_design.dut.name, 'design_chapter': relate_design.chapter,
-                         'design_name': relate_design.name}
+            doc_list = [{
+                'dut_name': single_qs.dut.name,
+                'design_chapter': single_qs.design.chapter,
+                'design_name': single_qs.design.name,
+                'dut_type': single_qs.dut.type  # 添加 type 字段用于排序
+            }]
+            for relate_design in single_qs.otherDesign.all():  # type: Design
+                ddict = {
+                    'dut_name': relate_design.dut.name,
+                    'design_chapter': relate_design.chapter,
+                    'design_name': relate_design.name,
+                    'dut_type': relate_design.dut.type  # 添加 type 字段用于排序
+                }
                 doc_list.append(ddict)
+            # 定义排序顺序映射
+            TYPE_ORDER = {'YZ': 0, 'XQ': 1, 'XY': 2, 'SJ': 3, None: 99, '': 999}
+            doc_list.sort(key=lambda x: TYPE_ORDER.get(x.get('dut_type'), 999))
 
             # 组装单个测试项
             ## 打印本项目是FPGA还是CPU
@@ -102,7 +121,8 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
                 "test_demand_content": content_list,
                 "testMethod": testmethod_str.strip(),
                 "adequacy": single_qs.adequacy.replace("\n", "\a"),
-                "testDesciption": single_qs.testDesciption.replace("\n", "\a"),  # 测试项描述
+                # 测试项描述FPGA或'静态分析'、'文档审查'、'代码审查'
+                "testDesciption": single_qs.testDesciption.replace("\n", "\a"),
                 "testType": get_testType(single_qs.testType, 'testType'),
             }
             list_list[type_index].append(testdemand_dict)
@@ -282,10 +302,81 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
         except PermissionError as e:
             return ChenResponse(status=400, code=400, message="模版文件已打开，请关闭后再试，{0}".format(e))
 
+    # 生成dataSchemas的context - 服务于 1、测评对象 2、动态环境描述
+    @classmethod
+    def create_data_schema_list_context(cls, data_qs, doc: DocxTemplate):
+        if data_qs.exists():
+            data_list = []
+            for data_obj in data_qs.all():
+                item_context: dict[str, Any] = {"fontnote": data_obj.fontnote, 'type': data_obj.type}
+                # 根据数据类型处理content字段
+                if data_obj.type == 'text':
+                    item_context['content'] = data_obj.content
+                elif data_obj.type == 'table':
+                    # 使用subdoc
+                    subdoc = doc.new_subdoc()
+                    rows = len(data_obj.content)
+                    cols = len(data_obj.content[0])
+                    table = subdoc.add_table(rows=rows, cols=cols)
+                    # 单元格处理
+                    for row in range(rows):
+                        for col in range(cols):
+                            cell = table.cell(row, col)
+                            cell.text = data_obj.content[row][col]
+                            # 第一行设置居中
+                            if row == 0:
+                                # 黑体设置
+                                cell.text = ""
+                                pa = cell.paragraphs[0]
+                                run = pa.add_run(str(data_obj.content[row][col]))
+                                run.font.name = '黑体'
+                                run._element.rPr.rFonts.set(qn('w:eastAsia'), '黑体')
+                                run.font.bold = False
+                                pa.alignment = WD_ALIGN_PARAGRAPH.CENTER
+                                # 垂直居中
+                                cell.vertical_alignment = WD_ALIGN_VERTICAL.CENTER
+                    # 表格居中
+                    table.alignment = WD_ALIGN_PARAGRAPH.CENTER
+                    # 设置边框
+                    set_table_border_by_cell_position(table)
+                    item_context['content'] = subdoc
+                elif data_obj.type == 'image':
+                    base64_bytes = base64.b64decode(data_obj.content.replace("data:image/png;base64,", ""))
+                    item_context['content'] = InlineImage(doc, io.BytesIO(base64_bytes), width=Mm(120))
+                data_list.append(item_context)
+            context = {
+                "datas": data_list,
+            }
+            return context
+        return None
+
+    # 统将需要多个DataSchemas的一对一项目字段生成响应
+    @classmethod
+    def uniform_res_from_mul_data_schemas(cls, id: int, filename: str, r_filename: str, model) -> ChenResponse | None:
+        project_obj = get_object_or_404(Project, id=id)
+        input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'dg' / filename
+        doc = DocxTemplate(input_path)
+        qs = model.objects.filter(project=project_obj)
+        if qs.exists():
+            data_qs = qs.first().data_schemas
+            context = cls.create_data_schema_list_context(data_qs, doc)
+            doc.render(context)
+            try:
+                doc.save(Path.cwd() / "media" / project_path(id) / "output_dir" / r_filename)
+                return ChenResponse(status=200, code=200, message="文档生成成功！")
+            except PermissionError as e:
+                return ChenResponse(status=400, code=400, message="模版文件已打开，请关闭后再试，{0}".format(e))
+        return None
+
     # 生成测评对象 - 包括大纲、说明、回归说明和报告
     @route.get('/create/softComposition', url_name='create-softComposition')
     @transaction.atomic
     def create_softComposition(self, id: int):
+        # 首先判断是否包含 - 项目信息-软件概述
+        res = self.uniform_res_from_mul_data_schemas(id, '测评对象_2.docx', '测评对象.docx', ProjectSoftSummary)
+        if res is not None:
+            return res
+        # 原来文档片段或者初始内容
         input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'dg' / '测评对象.docx'
         doc = DocxTemplate(input_path)
         replace, frag, rich_text_list = self._generate_frag(id, doc, '测评对象')
@@ -303,6 +394,8 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
     # 生成被测软件接口章节
     @route.get('/create/interface', url_name='create-interface')
     def create_interface(self, id: int):
+        input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'dg' / '被测软件接口.docx'
+        doc = DocxTemplate(input_path)
         project_qs = get_object_or_404(Project, id=id)
         project_name = project_qs.name
         interfaceNameList = []
@@ -321,18 +414,37 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
             interface_dict = {
                 'name': interface.name,
                 'ident': interface.ident,
-                'source': interface.source,
-                'to': interface.to,
                 'type': interface.type,
-                'protocal': interface.protocal,
+                'is_bidirectional': interface.is_bidirectional,  # 是否有反向
+                'jk_info_list': [{
+                    'source': item.source,
+                    'destination': item.destination,
+                    'description': item.description,
+                } for item in interface.jkField.all()]
             }
             interface_list.append(interface_dict)
+        # 项目接口图处理 - 2026/2/4
+        image_obj = StuctSortData.objects.filter(project=project_qs)
+        ## 判断是否存在
+        image_render = None
+        fontnote = None
+        if image_obj.exists():
+            base64_bytes = base64.b64decode(image_obj.first().content.replace("data:image/png;base64,", ""))
+            image_render = InlineImage(doc, io.BytesIO(base64_bytes), width=Mm(120))
+            fontnote = image_obj.first().fontnote
         context = {
             'project_name': project_name,
             'iters': interfaceNameList,
             'iter_list': interface_list,
+            'image_render': image_render if image_render else "",
+            'fontnote': fontnote if fontnote else "".join([project_name, '接口示意图']),
         }
-        return create_dg_docx('被测软件接口.docx', context, id)
+        doc.render(context, autoescape=True)
+        try:
+            doc.save(Path.cwd() / "media" / project_path(id) / "output_dir" / '被测软件接口.docx')
+            return ChenResponse(status=200, code=200, message="文档生成成功！")
+        except PermissionError as e:
+            return ChenResponse(status=400, code=400, message="模版文件已打开，请关闭后再试，{0}".format(e))
 
     # 生成顶层技术文件
     @route.get('/create/top_file', url_name='create-performance')
@@ -371,9 +483,104 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
         except PermissionError as e:
             return ChenResponse(status=400, code=400, message="模版文件已打开，请关闭后再试，{0}".format(e))
 
+    # 通用生成静态软件项、静态硬件项、动态软件项、动态硬件信息、测评数据的context，包含fontnote和table
+    @classmethod
+    def create_table_context(cls, table_data: list[list[str]], doc: DocxTemplate):
+        """注意：该函数会增加一列序号列，并且支持单元格内回车换行（段落换行）"""
+        subdoc = doc.new_subdoc()
+        rows = len(table_data)
+        cols = len(table_data[0]) + 1
+        table = subdoc.add_table(rows=rows, cols=cols)
+
+        # 单元格处理
+        for row in range(rows):
+            for col in range(cols):
+                cell = table.cell(row, col)
+                set_cell_margins(cell, left=100, right=100, top=100, bottom=100)
+
+                # 获取要显示的文本内容（字符串或按行拆分后的列表）
+                if col == 0:
+                    # 序号列
+                    lines = ["序号"] if row == 0 else [str(row)]
+                else:
+                    raw_text = table_data[row][col - 1]
+                    # 按换行符 \n 拆分为多个段落
+                    lines = raw_text.split('\n') if raw_text else ['']
+
+                # 清空单元格原有段落（add_table 默认有一个段落）
+                cell.text = ""
+                # 删除默认段落，稍后统一添加
+                for para in cell.paragraphs:
+                    p = para._element
+                    p.getparent().remove(p)
+
+                # 逐个添加段落
+                for i, line in enumerate(lines):
+                    if i == 0:
+                        para = cell.add_paragraph(line)
+                    else:
+                        para = cell.add_paragraph(line)
+
+                    # 设置段落对齐（第一列居中，其他左对齐，可根据需要调整）
+                    if col == 0:
+                        para.alignment = WD_ALIGN_PARAGRAPH.CENTER
+                    else:
+                        para.alignment = WD_ALIGN_PARAGRAPH.LEFT
+
+                    # 对第一行（表头）设置黑体字体
+                    if row == 0:
+                        for run in para.runs:
+                            run.font.name = '黑体'
+                            run._element.rPr.rFonts.set(qn('w:eastAsia'), '黑体')
+                            run.font.bold = False
+                        # 表头段落居中（覆盖前面的 left）
+                        para.alignment = WD_ALIGN_PARAGRAPH.CENTER
+
+                # 垂直居中
+                cell.vertical_alignment = WD_ALIGN_VERTICAL.CENTER
+
+        # 设置序号列宽度
+        for cell in table.columns[0].cells:
+            cell.width = Mm(15)
+            for para in cell.paragraphs:
+                para.alignment = WD_ALIGN_PARAGRAPH.CENTER
+
+        # 表格居中
+        table.alignment = WD_ALIGN_PARAGRAPH.CENTER
+        # 设置表格外边框
+        set_table_border_by_cell_position(table)
+        return subdoc
+
+    # 统一静态软件项、静态硬件项、动态软件项、动态硬件信息的word生成 - 模版模式
+    @classmethod
+    def uniform_static_dynamic_response(cls, id: int, filename: str, r_filename: str, model) -> ChenResponse | None:
+        project_obj = get_object_or_404(Project, id=id)
+        input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'dg' / filename
+        doc = DocxTemplate(input_path)
+        qs = model.objects.filter(project=project_obj)
+        if qs.exists():
+            obj = qs.first()
+            table_data = obj.table
+            subdoc = cls.create_table_context(table_data, doc)
+            context = {
+                'fontnote': obj.fontnote,
+                'table': subdoc,
+            }
+            doc.render(context, autoescape=True)
+            try:
+                doc.save(Path.cwd() / "media" / project_path(id) / "output_dir" / r_filename)
+                return ChenResponse(status=200, code=200, message="文档生成成功！")
+            except PermissionError as e:
+                return ChenResponse(status=400, code=400, message="模版文件已打开，请关闭后再试，{0}".format(e))
+        return None
+
     # 静态软件项
     @route.get('/create/static_soft', url_name='create-static_soft')
     def create_static_soft(self, id: int):
+        res = self.uniform_static_dynamic_response(id, '静态软件项_2.docx', '静态软件项.docx', StaticSoftItem)
+        if res is not None:
+            return res
+
         input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'dg' / '静态软件项.docx'
         doc = DocxTemplate(input_path)
         replace, frag, rich_text_list = self._generate_frag(id, doc, '静态软件项')
@@ -386,6 +593,10 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
     # 静态硬件和固件项
     @route.get('/create/static_hard', url_name='create-static_hard')
     def create_static_hard(self, id: int):
+        res = self.uniform_static_dynamic_response(id, '静态硬件和固件项_2.docx', '静态硬件和固件项.docx', StaticSoftHardware)
+        if res is not None:
+            return res
+
         input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'dg' / '静态硬件和固件项.docx'
         doc = DocxTemplate(input_path)
         replace, frag, rich_text_list = self._generate_frag(id, doc, '静态硬件和固件项')
@@ -395,9 +606,14 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
         }
         return create_dg_docx("静态硬件和固件项.docx", context, id)
 
-    # 动态测评环境说明
+    # 动态测评环境说明 - 多dataSchemas格式
     @route.get('/create/dynamic_env', url_name='create-dynamic_env')
     def create_dynamic_env(self, id: int):
+        res = self.uniform_res_from_mul_data_schemas(id, '动态测试环境说明_2.docx',
+                                                     '动态测试环境说明.docx', ProjectDynamicDescription)
+        if res is not None:
+            return res
+        # 老内容
         project_obj: Project = get_object_or_404(Project, id=id)
         input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'dg' / '动态测试环境说明.docx'
         doc = DocxTemplate(input_path)
@@ -417,6 +633,10 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
     # 动态软件项
     @route.get('/create/dynamic_soft', url_name='create-dynamic_soft')
     def create_dynamic_soft(self, id: int):
+        res = self.uniform_static_dynamic_response(id, '动态软件项_2.docx', '动态软件项.docx', DynamicSoftTable)
+        if res is not None:
+            return res
+
         project_obj: Project = get_object_or_404(Project, id=id)
         input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'dg' / '动态软件项.docx'
         doc = DocxTemplate(input_path)
@@ -428,9 +648,14 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
         }
         return create_dg_docx("动态软件项.docx", context, id)
 
-    # 动态软件项
+    # 动态硬件项
     @route.get('/create/dynamic_hard', url_name='create-dynamic_hard')
     def create_dynamic_hard(self, id: int):
+        res = self.uniform_static_dynamic_response(id, '动态硬件和固件项_2.docx',
+                                                   '动态硬件和固件项.docx', DynamicHardwareTable)
+        if res is not None:
+            return res
+
         input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'dg' / '动态硬件和固件项.docx'
         doc = DocxTemplate(input_path)
         replace, frag, rich_text_list = self._generate_frag(id, doc, '动态硬件和固件项')
@@ -443,6 +668,11 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
     # 测试数据
     @route.get('/create/test_data', url_name='create-test_data')
     def create_test_data(self, id: int):
+        res = self.uniform_static_dynamic_response(id, '测评数据_2.docx',
+                                                   '测评数据.docx', EvaluateData)
+        if res is not None:
+            return res
+        # 老内容
         input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'dg' / '测评数据.docx'
         doc = DocxTemplate(input_path)
         replace, frag, rich_text_list = self._generate_frag(id, doc, '测评数据')
@@ -455,6 +685,27 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
     # 环境差异性分析
     @route.get('/create/env_diff', url_name='create-env_diff')
     def create_env_diff(self, id: int):
+        project_obj: Project = get_object_or_404(Project, id=id)
+        input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'dg' / '环境差异性分析_2.docx'
+        doc = DocxTemplate(input_path)
+        qs = EnvAnalysis.objects.filter(project=project_obj)
+        if qs.exists():
+            obj = qs.first()
+            table_data = obj.table
+            subdoc = self.create_table_context(table_data, doc)
+            context = {
+                "description": obj.description,
+                "table": subdoc,
+                "fontnote": obj.fontnote,
+            }
+            doc.render(context, autoescape=True)
+            try:
+                doc.save(Path.cwd() / "media" / project_path(id) / "output_dir" / '环境差异性分析.docx')
+                return ChenResponse(status=200, code=200, message="文档生成成功！")
+            except PermissionError as e:
+                return ChenResponse(status=400, code=400, message="模版文件已打开，请关闭后再试，{0}".format(e))
+
+        # 老内容
         input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'dg' / '环境差异性分析.docx'
         doc = DocxTemplate(input_path)
         replace, frag, rich_text_list = self._generate_frag(id, doc, '环境差异性分析')
@@ -470,11 +721,13 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
         project_qs = get_object_or_404(Project, id=id)
         security = get_str_dict(project_qs.security_level, 'security_level')
         languages = get_list_dict('language', project_qs.language)
-        runtime = get_str_dict(project_qs.runtime, 'runtime')
-        devplant = get_str_dict(project_qs.devplant, 'devplant')
         language_list = []
         for language in languages:
             language_list.append(language.get('ident_version'))
+        runtimes = get_list_dict('runtime', project_qs.runtime)
+        runtime_list = [item['ident_version'] for item in runtimes]
+        devplants = get_list_dict('devplant', project_qs.devplant)
+        devplant_list = [item['ident_version'] for item in devplants]
         # 版本先找第一轮
         project_round = project_qs.pField.filter(key=0).first()
         first_round_SO = project_round.rdField.filter(type='SO').first()
@@ -495,8 +748,8 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
             'recv_date': project_qs.beginTime.strftime("%Y-%m-%d"),
             'dev_unit': dev_unit,
             'soft_type': project_qs.get_soft_type_display(),
-            'runtime': runtime,
-            'devplant': devplant
+            'runtime': "\a".join(runtime_list),
+            'devplant': "\a".join(devplant_list),
         }
         return create_dg_docx('被测软件基本信息.docx', context, id)
 

apps/createDocument/controllers/hjl.py

@@ -48,6 +48,10 @@ class GenerateControllerHJL(ControllerBase):
         round1_so_dut: Union[Dut, None] = round1_obj.rdField.filter(type='SO').first()
         languages = get_list_dict('language', project_obj.language)
         language_list = [item['ident_version'] for item in languages]
+        runtimes = get_list_dict('runtime', project_obj.runtime)
+        runtime_list = [item['ident_version'] for item in runtimes]
+        devplants = get_list_dict('devplant', project_obj.devplant)
+        devplant_list = [item['ident_version'] for item in devplants]
         # 取非第一轮次
         hround_list: QuerySet = project_obj.pField.exclude(key='0')
         if len(hround_list) < 1:
@@ -62,8 +66,8 @@ class GenerateControllerHJL(ControllerBase):
             'language': "、".join(language_list),
             'soft_type': project_obj.get_soft_type_display(),
             'security_level': get_str_dict(project_obj.security_level, 'security_level'),
-            'runtime': get_str_dict(project_obj.runtime, 'runtime'),
-            'devplant': get_str_dict(project_obj.devplant, 'devplant'),
+            'runtime': "、".join(runtime_list),
+            'devplant': "、".join(devplant_list),
             'recv_date': project_obj.beginTime.strftime("%Y-%m-%d"),
             'dev_unit': project_obj.dev_unit,
         }

apps/createDocument/controllers/hsm.py

@@ -19,6 +19,7 @@ from utils.path_utils import project_path
 from apps.createDocument.extensions.util import delete_dir_files
 from apps.createDocument.extensions.parse_rich_text import RichParser
 from apps.createDocument.extensions.documentTime import DocTime
+from apps.createDocument.extensions.content_result_tool import create_influence_context
 # 导入生成日志记录模块
 from apps.createSeiTaiDocument.extensions.logger import GenerateLogger
 # 导入排序
@@ -55,6 +56,10 @@ class GenerateControllerHSM(ControllerBase):
         round1_so_dut: Union[Dut, None] = round1_obj.rdField.filter(type='SO').first()
         languages = get_list_dict('language', project_obj.language)
         language_list = [item['ident_version'] for item in languages]
+        runtimes = get_list_dict('runtime', project_obj.runtime)
+        runtime_list = [item['ident_version'] for item in runtimes]
+        devplants = get_list_dict('devplant', project_obj.devplant)
+        devplant_list = [item['ident_version'] for item in devplants]
         # 取非第一轮次
         hround_list: QuerySet = project_obj.pField.exclude(key='0')
         if len(hround_list) < 1:
@@ -69,8 +74,8 @@ class GenerateControllerHSM(ControllerBase):
             'language': "、".join(language_list),
             'soft_type': project_obj.get_soft_type_display(),
             'security_level': get_str_dict(project_obj.security_level, 'security_level'),
-            'runtime': get_str_dict(project_obj.runtime, 'runtime'),
-            'devplant': get_str_dict(project_obj.devplant, 'devplant'),
+            'runtime': "、".join(runtime_list),
+            'devplant': "、".join(devplant_list),
             'recv_date': project_obj.beginTime.strftime("%Y-%m-%d"),
             'dev_unit': project_obj.dev_unit,
         }
@@ -228,13 +233,16 @@ class GenerateControllerHSM(ControllerBase):
             xq_dut: Dut = hround.rdField.filter(type='XQ').first()
             # 处理代码版本
             last_round_key = str(int(hround.key) - 1)
-            last_round: Round = project_obj.pField.filter(key=last_round_key).first()
+            last_round: Round | None = project_obj.pField.filter(key=last_round_key).first()
             last_round_so_dut = last_round.rdField.filter(type='SO').first()
             if not last_round_so_dut:
                 return ChenResponse(code=400, status=400,
                                     message=f'您第{chinese_round_name[int(hround.key)]}轮次中缺少源代码版本信息，请添加')
             last_dm_version = last_round_so_dut.version
             now_dm_version = so_dut.version
+            # 这里插入影响域分析部分，并加入context
+            context_round['influence'] = create_influence_context(doc, hround, project_obj)  # noqa
+            context_round['influence'] = None
             # 如果存在这个轮次的需求文档，则查询上个版本
             last_xq_version = ""
             if xq_dut:

apps/createDocument/controllers/wtd.py

@@ -1,5 +1,6 @@
 # 导入内置模块
 from pathlib import Path
+from django.db.models import QuerySet
 # 导入django、ninja等模块
 from ninja_extra import api_controller, ControllerBase, route
 from django.db import transaction
@@ -7,7 +8,7 @@ from django.shortcuts import get_object_or_404
 # 导入文档处理模块
 from docxtpl import DocxTemplate, InlineImage
 # 导入ORM模型
-from apps.project.models import Project
+from apps.project.models import Project, Case
 # 导入工具
 from utils.util import get_str_abbr, get_str_dict
 from utils.chen_response import ChenResponse
@@ -35,7 +36,7 @@ class GenerateControllerWtd(ControllerBase):
         for problem in problem_list:
             problem_dict = {'ident': problem.ident, 'name': problem.name}
             # 1.生成被测对象名称、被测对象标识、被测对象版本
-            cases = problem.case.all()
+            cases: QuerySet[Case] = problem.case.all()
             # generate_log:无关联问题单进入生成日志
             if cases.count() < 1:
                 gloger.write_warning_log('单个问题单表格', f'问题单{problem.ident}未关联用例，请检查')
@@ -70,9 +71,7 @@ class GenerateControllerWtd(ControllerBase):
                                 continue
                             else:
                                 p_list.append(rich)
-
-                        case_design_list.append(
-                            "-".join([case.dut.name, case.design.chapter + '章节' + ":" + ''.join(p_list)]))
+                        case_design_list.append("-".join([case.dut.name, case.design.chapter + '章节' + ":" + ''.join(p_list)]))
                 # 2.用例标识修改-YL_测试项类型_测试项标识_用例key+1
                 demand = case.test  # 中间变量
                 demand_testType = demand.testType  # 中间变量
@@ -86,12 +85,13 @@ class GenerateControllerWtd(ControllerBase):
             for i in range(len(str_dut_name_list)):
                 temp_name_version.append(
                     "".join([str_dut_name_list[i] + str_dut_ident_list[i], '/V', str_dut_version_list[i]]))
-            problem_dict['dut_name_version'] = "\a".join(temp_name_version)
+            problem_dict['dut_name_version'] = "\a".join(set(temp_name_version))
             problem_dict['case_ident'] = "，".join(set(case_ident_list))
             problem_dict['type'] = get_str_dict(problem.type, 'problemType')
             problem_dict['grade'] = get_str_dict(problem.grade, 'problemGrade')
 
             # 依据要求-获取其设计需求
+            print(case_design_list)
             problem_dict['yaoqiu'] = "\a".join(case_design_list)
             # 问题操作 - HTML解析
             desc_list = ['【问题操作】']

apps/createDocument/extensions/content_result_tool.py

@@ -1,7 +1,9 @@
-from apps.project.models import Project
+from apps.project.models import Project, Round, InfluenceArea
+from docxtpl import DocxTemplate
 from utils.util import *
 from utils.chen_response import ChenResponse
 from django.db.models import Q
+from apps.createDocument.extensions.parse_rich_text import RichParser
 
 def create_round_context(project_obj: Project, round_id: str):
     """根据轮次，生成测评报告中的测评结果"""
@@ -77,4 +79,37 @@ def create_round_context(project_obj: Project, round_id: str):
         'r2_dynamic_str': r2_dynamic_str,
         'round_id': round_chinese[round_id],
     }
-    return context
+    return context, round_obj
+
+# ~~~影响域分析：内容返回influence的render_list~~~
+def create_influence_context(doc: DocxTemplate, round_obj: Round, project_obj: Project) -> None | list:
+    area_qs = InfluenceArea.objects.filter(round=round_obj)
+    item_render_list = []
+    ## 如果存在则查询items
+    if area_qs.exists():
+        area_obj = area_qs.first()
+        items_qs = area_obj.influence_items.all()
+        if items_qs.exists():
+            index = 1
+            for item in items_qs:
+                # 1.处理关联case - 找第一轮cases
+                case_str_list = []
+                for case in project_obj.pcField.filter(key__in=item.effect_cases):
+                    case_ident_index = str(int(case.key.split("-")[-1]) + 1).zfill(3)
+                    case_str_list.append("_".join(["YL", get_str_abbr(case.test.testType, "testType"), case.ident, case_ident_index]))
+                # 2.处理富文本框
+                parser = RichParser(item.change_des)
+                item_dict = {
+                    "change_type": item.change_type,
+                    "change_influ": item.change_influ,
+                    "case_str_list": case_str_list,
+                    "change_des": parser.get_final_list(doc, img_size=40, height=30),  # 富文本未处理
+                    "index": str(index),
+                }
+                index = index + 1
+                item_render_list.append(item_dict)
+
+    if len(item_render_list) > 0:
+        return item_render_list
+    else:
+        return None

apps/createDocument/extensions/parse_rich_text.py

@@ -7,7 +7,7 @@ from bs4.element import Tag, NavigableString
 import base64
 import io
 from docxtpl import InlineImage
-from docx.shared import Mm, Cm
+from docx.shared import Mm
 import re
 
 # text.replace('\xa0', ' '))
@@ -22,6 +22,8 @@ class RichParser:
         # 最终的解析后的列表
         self.data_list = []
         self.line_parse()
+        # 匹配“表1-3”或“表1”等字符的正则
+        self.biao_pattern = re.compile(r"表\d+(?:-\d+)?")
 
     # 1.函数：将self.bs.contents去掉\n，获取每行数据
     def remove_n_in_contents(self):
@@ -82,12 +84,15 @@ class RichParser:
             if isinstance(oneline, list):
                 final_list.append({'isTable': True, 'data': oneline})
                 continue
-            if oneline.startswith("data:image/png;base64"):
+            if oneline.startswith("data:image/png;base64") or oneline.startswith("data:image/jpeg;base64,") or oneline.startswith(
+                    "data:image/jpg;base64,"):
                 base64_bytes = base64.b64decode(oneline.replace("data:image/png;base64,", ""))
                 # ~~~设置了固定宽度、高度~~~
-                final_list.append(
-                    InlineImage(doc, io.BytesIO(base64_bytes), width=Mm(img_size), height=Mm(height)))
+                inline_image = InlineImage(doc, io.BytesIO(base64_bytes), width=Mm(img_size), height=Mm(height))
+                final_list.append(inline_image)
             else:
+                # ~~~新增：将\xa0修改为普通空格~~~
+                oneline = oneline.replace('\xa0', ' ')
                 final_list.append(oneline)
         if len(final_list) <= 0:
             final_list.append("")
@@ -113,9 +118,9 @@ class RichParser:
             else:
                 # 2.和上面区别：如果<p>带有“图”则居中
                 if re.match(r"[表图]\d.*", oneline):
-                    final_list.append({"isCenter": True, "data": oneline})
+                    final_list.append({"isCenter": True, "data": oneline.replace('\xa0', ' ')})
                 else:
-                    final_list.append({"isCenter": False, "data": oneline})
+                    final_list.append({"isCenter": False, "data": oneline.replace('\xa0', ' ')})
         if len(final_list) <= 0:
             final_list.append("")
         return final_list
@@ -126,6 +131,13 @@ class RichParser:
         for oneline in self.data_list:
             if isinstance(oneline, list) or oneline.startswith("data:image/png;base64"):
                 continue
-            else:
-                final_list.append(oneline)
+            cleaned_line = oneline
+            cleaned_line = re.sub(r'\s+', '', cleaned_line)
+            cleaned_line = cleaned_line.replace(')', '）')
+            cleaned_line = cleaned_line.strip()
+            # 去掉以“表3”的行
+            if self.biao_pattern.search(cleaned_line):
+                continue
+            if cleaned_line:
+                final_list.append(cleaned_line)
         return final_list

apps/createDocument/extensions/tools.py

@@ -1,4 +1,7 @@
 from apps.project.models import TestDemand
+from docx.oxml import OxmlElement
+from docx.oxml.ns import qn
+from docx.table import _Cell, Table
 
 def demand_sort_by_designKey(demand_obj: TestDemand) -> tuple[int, ...]:
     """仅限于测试项排序函数，传入sorted函数的key里面"""
@@ -6,4 +9,134 @@ def demand_sort_by_designKey(demand_obj: TestDemand) -> tuple[int, ...]:
     sort_tuple = tuple(int(part) for part in parts)
     return sort_tuple
 
-__all__ = ['demand_sort_by_designKey']
+# 传入cell设置边框
+def set_cell_border(cell: _Cell, **kwargs):
+    tc = cell._tc
+    tcPr = tc.get_or_add_tcPr()
+
+    # 检查标签是否存在，如果没有找到，则创建一个
+    tcBorders = tcPr.first_child_found_in("w:tcBorders")
+    if tcBorders is None:
+        tcBorders = OxmlElement('w:tcBorders')
+        tcPr.append(tcBorders)
+
+    for border_type in ['left', 'top', 'right', 'bottom']:
+        # 设置为固定的“黑色加粗”
+        border_data = kwargs.get(border_type, {"sz": "6", "val": "single", "color": "#000000", "space": "0"})
+        tag = 'w:{}'.format(border_type)
+        element = tcBorders.find(qn(tag))
+        if element is None:
+            element = OxmlElement(tag)
+            tcBorders.append(element)
+        for key in ["sz", "val", "color", "space", "shadow"]:
+            if key in border_data:
+                element.set(qn('w:{}'.format(key)), str(border_data[key]))
+
+# 弃用，请使用下面函数
+def set_table_border(table, **kwargs):
+    """docx-设置表格上下左右边框"""
+    # 获取或创建表格属性
+    tbl_pr = table._tbl.tblPr
+
+    # 查找并移除现有的边框设置
+    existing_borders = tbl_pr.find(qn('w:tblBorders'))
+    if existing_borders is not None:
+        tbl_pr.remove(existing_borders)
+
+    # 创建新的边框元素
+    borders = OxmlElement('w:tblBorders')
+
+    # 只设置外边框：top, left, bottom, right - 设置为固定“黑色加粗”
+    # 不设置 insideV 和 insideH（内部边框）
+    for border_type in ['top', 'left', 'bottom', 'right']:
+        border_data = kwargs.get(border_type, {"sz": "12", "val": "single", "color": "#000000"})
+        border_elem = OxmlElement(f'w:{border_type}')
+
+        # 设置边框属性
+        border_elem.set(qn('w:val'), border_data.get('val', 'single'))  # 线条类型
+        border_elem.set(qn('w:sz'), border_data.get('sz', '12'))  # 线条粗细（8代表1磅）
+        border_elem.set(qn('w:color'), border_data.get('color', '#000000'))  # 颜色
+        borders.append(border_elem)  # type:ignore
+
+    # 将边框设置添加到表格属性中
+    tbl_pr.append(borders)
+
+# ~~~新解决方案：传入table对象，遍历cell，判断cell是否在外层~~~
+def set_table_border_by_cell_position(table: Table):
+    """
+    智能设置表格边框：外边框粗，内边框细。
+    """
+    # 获取表格的总行数和总列数
+    total_rows = len(table.rows)
+    total_cols = len(table.columns)
+
+    for row_idx, row in enumerate(table.rows):
+        for col_idx, cell in enumerate(row.cells):
+            # 初始化边框参数字典
+            border_kwargs = {}
+
+            # 1. 判断上边框：如果是第一行，则设置粗上边框，否则不设置（由上一行的下边框决定，或单独设置细线）
+            if row_idx == 0:
+                border_kwargs['top'] = {"sz": "12", "val": "single", "color": "#000000"}
+            # 2. 判断下边框：如果是最后一行，则设置粗下边框
+            if row_idx == total_rows - 1:
+                border_kwargs['bottom'] = {"sz": "12", "val": "single", "color": "#000000"}
+            # 3. 判断左边框：如果是第一列，则设置粗左边框
+            if col_idx == 0:
+                border_kwargs['left'] = {"sz": "12", "val": "single", "color": "#000000"}
+            # 4. 判断右边框：如果是最后一列，则设置粗右边框
+            if col_idx == total_cols - 1:
+                border_kwargs['right'] = {"sz": "12", "val": "single", "color": "#000000"}
+
+            # 5. 设置内部网格线（细线）
+            # 内部横线 (insideH): 所有单元格都需要，但最后一行不需要（已经是外边框）
+            if row_idx < total_rows - 1:
+                border_kwargs['insideH'] = {"sz": "6", "val": "single", "color": "#000000"}
+            # 内部竖线 (insideV): 所有单元格都需要，但最后一列不需要（已经是外边框）
+            if col_idx < total_cols - 1:
+                border_kwargs['insideV'] = {"sz": "6", "val": "single", "color": "#000000"}
+
+            # 调用您已有的 set_cell_border 函数
+            set_cell_border(cell, **border_kwargs)
+
+# 设置cell的左右边距
+def set_cell_margins(cell: _Cell, **kwargs):
+    """
+    设置单元格边距，确保在Office和WPS中均能生效。
+    参数示例: set_cell_margins(cell, left=50, right=50, top=100, bottom=100)
+    参数单位: 为二十分之一磅 (dxa, 1/1440英寸)。
+    """
+    tc = cell._tc
+    tcPr = tc.get_or_add_tcPr()
+
+    # 关键步骤1：检查或创建 w:tcMar 元素
+    tcMar = tcPr.find(qn('w:tcMar'))
+    if tcMar is None:
+        tcMar = OxmlElement('w:tcMar')
+        tcPr.append(tcMar)
+
+    # 关键步骤2：为每个指定的边距方向创建元素，并同时设置新旧两套属性以保证兼容性[2](@ref)
+    # 定义映射：我们的参数名 -> (XML元素名, 备用的XML元素名)
+    margin_map = {
+        'left': ('left', 'start'),
+        'right': ('right', 'end'),
+        'top': ('top', None),
+        'bottom': ('bottom', None)
+    }
+
+    for margin_key, value in kwargs.items():
+        if margin_key in margin_map:
+            primary_tag, alternate_tag = margin_map[margin_key]
+            tags_to_set = [primary_tag]
+            if alternate_tag:  # 如果存在备选标签（如left/start），则同时设置
+                tags_to_set.append(alternate_tag)
+
+            for tag in tags_to_set:
+                # 检查该边距元素是否已存在
+                margin_element = tcMar.find(qn(f'w:{tag}'))
+                if margin_element is None:
+                    margin_element = OxmlElement(f'w:{tag}')
+                    tcMar.append(margin_element) # type:ignore
+                # 设置边距值和单位类型
+                margin_element.set(qn('w:w'), str(value))
+                margin_element.set(qn('w:type'), 'dxa')

apps/createDocument/extensions/util.py

@@ -38,6 +38,17 @@ def create_sm_docx(template_name: str, context: dict, id: int) -> ChenResponse:
     except PermissionError as e:
         return ChenResponse(status=400, code=400, message="模版文件已打开，请关闭后再试，{0}".format(e))
 
+def create_hsm_docx(template_name: str, context: dict, id: int) -> ChenResponse:
+    """生成最终回归测试说明文档工具函数"""
+    input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'hsm' / template_name
+    doc = DocxTemplate(input_path)
+    doc.render(context, autoescape=True)
+    try:
+        doc.save(Path.cwd() / "media" / project_path(id) / "output_dir/hsm" / template_name)
+        return ChenResponse(status=200, code=200, message="文档生成成功！")
+    except PermissionError as e:
+        return ChenResponse(status=400, code=400, message="模版文件已打开，请关闭后再试，{0}".format(e))
+
 def create_dg_docx(template_name: str, context: dict, id: int) -> ChenResponse:
     """生成最终大纲文档工具函数"""
     input_path = Path.cwd() / 'media' / project_path(id) / 'form_template' / 'dg' / template_name
@@ -95,3 +106,4 @@ def delete_dir_files(path: Path) -> Any:
         for file in path.iterdir():
             if file.is_file():
                 file.unlink()
+

apps/createSeiTaiDocument/controllers.py

@@ -1,3 +1,6 @@
+from io import BytesIO
+import copy
+from docx.parts.image import ImagePart
 from pathlib import Path
 from django.conf import settings
 from django.core.files.storage import FileSystemStorage
@@ -468,22 +471,53 @@ class UploadDocumentController(ControllerBase):
             fs.save(f"第{digit_to_chinese(round_num)}轮{documentType}.docx", self.upload_file)
         return ChenResponse(status=200, code=200, message=f'上传{documentType}成功！')
 
-    # 主功能函数：将所有大纲的片段储存在reuse下面，以便其他文件使用
     def get_dg_to_reuse_dir(self, reuse_dir_path: Path):
-        """将大纲的文档片段储存在/reuse文件夹下面"""
-        doc = Document(self.upload_file)
-        frag_list = self.get_document_frag_list(doc)
+        """将大纲的文档片段储存在/reuse文件夹下面（保留图片）"""
+        src_doc = Document(self.upload_file)
+        frag_list = self.get_document_frag_list(src_doc)
+
         for frag_item in frag_list:
-            # 目的是格式明确按照“测评大纲.docx”进行，后续文档一样必须按照这样
+            if frag_item['content'] is None:
+                continue
+
+            # 1. 创建目标文档（基于 basic_doc.docx 模板）
             new_doc = Document((reuse_dir_path / 'basic_doc.docx').as_posix())
-            if frag_item['content'] is not None:
-                # XML元素可以直接append
             new_doc.element.body.clear_content()
-                for frag_child in frag_item['content'].iterchildren():
-                    new_doc.element.body.append(frag_child)
+
+            # 2. 逐元素复制 XML，并修复图片引用
+            for child in frag_item['content'].iterchildren():
+                self._copy_element_with_images(child, src_doc, new_doc)
+
+            # 3. 保存片段文件
             filename = f"{frag_item['alias']}.docx"
             new_doc.save((reuse_dir_path / filename).as_posix())
 
+    def _copy_element_with_images(self, element, src_doc, dst_doc):
+        """
+        复制 lxml 元素及其子树，将源文档中的图片关系迁移至目标文档。
+        """
+        # 1. 深拷贝元素
+        new_element = copy.deepcopy(element)
+        # 2. 使用本地名称匹配查找图片节点（完全避免命名空间前缀参数）
+        pic_nodes = new_element.xpath('.//*[local-name()="pic"]')
+        for pic in pic_nodes:
+            blip_nodes = pic.xpath('.//*[local-name()="blip"]')
+            for blip in blip_nodes:
+                embed_attr = '{http://schemas.openxmlformats.org/officeDocument/2006/relationships}embed'
+                old_rId = blip.get(embed_attr)
+                if not old_rId:
+                    continue
+                src_image_part = src_doc.part.related_parts.get(old_rId)
+                if src_image_part is None or not isinstance(src_image_part, ImagePart):
+                    continue
+                # 添加图片到目标文档，获取新 rId
+                image_stream = BytesIO(src_image_part.blob)
+                new_rId, _ = dst_doc.part.get_or_add_image(image_stream)
+                # 更新属性
+                blip.set(embed_attr, new_rId)
+        # 3. 追加到目标文档 body
+        dst_doc.element.body.append(new_element)
+
     # 辅助函数：将上传文件的文档片段以列表形式返回
     def get_document_frag_list(self, doc: Document):
         body = doc.element.body

apps/createSeiTaiDocument/docXmlUtils.py

@@ -196,7 +196,11 @@ def generate_temp_doc(doc_type: str, project_id: int, round_num=None, frag_list=
                                 # 根据节点找到图片的关联id
                                 embed = img.xpath('.//a:blip/@r:embed')[0]
                                 # 这里得到ImagePart -> 马上要给新文档添加
-                                related_part: ImagePart = doc_copied.part.related_parts[embed]
+                                related_part: ImagePart = doc_copied.part.related_parts.get(embed)
+                                if related_part is None:
+                                    # 可选：记录警告日志，便于排查哪些文档片段有问题
+                                    print(f"警告: 文档片段 '{area_pop_name}' 中的图片引用 {embed} 未找到，已跳过!!!!")
+                                    continue
                                 # doc_copied.part.related_parts是一个字典
                                 image_part_list.append({'name': area_pop_name, 'img': related_part})
 

apps/project/controllers/case.py

@@ -257,7 +257,7 @@ class CaseController(ControllerBase):
             single_qs.key = case_key
             index = index + 1
             single_qs.save()
-        return ChenResponse(message="测试用例删除成功！")
+        return ChenResponse(message="测试用例删除成功！影响域分析中如果有该关联用例则被删除。")
 
     # 右键测试项，根据测试子项生成用例
     @route.post("/case/create_by_demand", url_name='case-create-by-demand')
@@ -396,3 +396,21 @@ class CaseController(ControllerBase):
         Case.objects.bulk_update(updated_cases, ['exe_time'])
         return ChenResponse(status=200, code=200, data=len(updated_cases),
                             message=f"成功更新{len(updated_cases)}个用例执行时间")
+
+    # 给级联选择器数据 -> 上一轮次所有用例
+    @route.get("/case/getRelatedCase", url_name='case-related-case')
+    def get_cases_related_case(self, id: int, round_key: str):
+        project_obj = get_object_or_404(Project, id=id)
+        previous_round_obj = project_obj.pField.filter(key=int(round_key) - 1).first()
+        # dut -> design
+        data_list = []
+        for dut in previous_round_obj.rdField.all():
+            dut_dict = {'label': dut.name, 'value': dut.id, 'key': dut.key, 'children': []}
+            for design in dut.rsField.all():
+                design_dict = {'label': design.name, 'value': design.id, 'key': design.key, 'children': []}
+                for case in design.dcField.all():
+                    case_dict = {'label': case.name, 'value': case.id, 'key': case.key}
+                    design_dict['children'].append(case_dict)
+                dut_dict['children'].append(design_dict)
+            data_list.append(dut_dict)
+        return ChenResponse(message='获取成功', data=data_list)

apps/project/controllers/design.py

@@ -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
 
     # 删除设计需求

apps/project/controllers/project.py

@@ -10,11 +10,14 @@ from ninja_jwt.authentication import JWTAuth
 from apps.user.models import Users
 from utils.chen_pagination import MyPagination
 from ninja.pagination import paginate
+from ninja.errors import HttpError
 from ninja import Query
 from utils.chen_response import ChenResponse
 from utils.chen_crud import create, multi_delete_project
-from apps.project.models import Project, Round
-from apps.project.schemas.project import ProjectRetrieveSchema, ProjectFilterSchema, ProjectCreateInput, DeleteSchema
+from apps.project.models import Project, Round, ProjectSoftSummary, StuctSortData, StaticSoftItem, StaticSoftHardware, DynamicSoftTable, \
+    DynamicHardwareTable, ProjectDynamicDescription, EvaluateData, EnvAnalysis
+from apps.project.schemas.project import ProjectRetrieveSchema, ProjectFilterSchema, ProjectCreateInput, \
+    DeleteSchema, SoftSummarySchema, DataSchema, StaticDynamicData, EnvAnalysisSchema
 from utils.util import get_str_dict
 # 时间处理模块
 from apps.project.tool.timeList import time_return_to
@@ -89,12 +92,14 @@ class ProjectController(ControllerBase):
             try:
                 copytree(src_dir, dist_dir)  # shutil模块直接是复制并命名，如果命名文件存在则抛出FileExists异常
             except PermissionError:
-                return ChenResponse(code=500, status=500, message="错误，检查是否打开了服务器的conf中的文档，关闭后重试")
+                return ChenResponse(code=500, status=500,
+                                    message="错误，检查是否打开了服务器的conf中的文档，关闭后重试")
             except FileExistsError:
                 return ChenResponse(code=500, status=500, message='文件标识已存在或输入为空格，请修改')
             except FileNotFoundError:
                 return ChenResponse(code=500, status=500, message='文件不存在，请检查')
             return ChenResponse(code=200, status=200, message="添加项目成功，并添加第一轮测试")
+        return ChenResponse(code=400, status=400, message="未添加任何项目")
 
     @route.put("/update/{project_id}")
     @transaction.atomic
@@ -135,7 +140,7 @@ class ProjectController(ControllerBase):
             project_media_path = media_path / ident
             try:
                 rmtree(project_media_path)
-            except FileNotFoundError as e:
+            except FileNotFoundError:
                 return ChenResponse(status=400, code=400, message='项目模版目录可能不存在，可能之前已删除')
         return ChenResponse(message="删除成功！")
 
@@ -183,8 +188,8 @@ class ProjectController(ControllerBase):
         # 7.将时间提取 todo:后续将计算的事件放入该页面
         timers = {'round_time': []}
         rounds = project_obj.pField.all()
-        timers['start_time'] = project_obj.beginTime
-        timers['end_time'] = project_obj.endTime
+        timers['start_time'] = project_obj.beginTime  # type:ignore
+        timers['end_time'] = project_obj.endTime  # type:ignore
         for round in rounds:
             round_number = int(round.key) + 1
             timers['round_time'].append({
@@ -197,7 +202,8 @@ class ProjectController(ControllerBase):
         # 9.提取测试类型下面测试项数量、用例数量
         data_list = []
         for round in rounds:
-            round_dict = {'name': f'第{int(round.key) + 1}轮次', 'desings': [], 'method_demand': {}, 'method_case': {}}
+            round_dict = {'name': f'第{int(round.key) + 1}轮次', 'desings': [], 'method_demand': {},
+                          'method_case': {}}
             designs = round.dsField.all()
             for design in designs:
                 design_dict = {
@@ -264,3 +270,228 @@ class ProjectController(ControllerBase):
     def document_time_show(self, id: int):
         time = time_return_to(id)
         return time
+
+    # [变] 项目级信息前端告警数据获取
+    @route.get("/project_info_status/")
+    @transaction.atomic
+    def project_info_status(self, id: int):
+        project_obj = self.get_project_by_id(id)
+
+        # 统一配置每个状态的检查逻辑
+        status_configs = {
+            "soft_summary": {
+                "model": ProjectSoftSummary,
+                "check": lambda qs: qs.exists() and qs.first().data_schemas.exists()
+            },
+            "interface_image": {
+                "model": StuctSortData,
+                "check": lambda qs: qs.exists()
+            },
+            "static_soft_item": {
+                "model": StaticSoftItem,
+                "check": lambda qs: qs.exists()
+            },
+            "static_soft_hardware": {
+                "model": StaticSoftHardware,
+                "check": lambda qs: qs.exists()
+            },
+            "dynamic_soft_item": {
+                "model": DynamicSoftTable,
+                "check": lambda qs: qs.exists()
+            },
+            "dynamic_soft_hardware": {
+                "model": DynamicHardwareTable,
+                "check": lambda qs: qs.exists()
+            },
+            "dynamic_des": {
+                "model": ProjectDynamicDescription,
+                "check": lambda qs: qs.exists() and qs.first().data_schemas.exists()
+            },
+            "evaluate_data": {
+                "model": EvaluateData,
+                "check": lambda qs: qs.exists()
+            },
+            "env_analysis": {
+                "model": EnvAnalysis,
+                "check": lambda qs: qs.exists()
+            }
+        }
+
+        all_status = {}
+        for status_key, config in status_configs.items():
+            qs = config["model"].objects.filter(project=project_obj)
+            all_status[status_key] = config["check"](qs)
+        return ChenResponse(status=200, code=20000, data=all_status, message='查询成功')
+
+    # [变] 封装结构化数据新增-修改（针对project - OneToOne - DataSchemas形式）
+    @classmethod
+    def bulk_create_data_schemas(cls, parent_obj, datas: list[DataSchema]):
+        """
+            批量创建结构化排序数据 (自动类型推断)
+            Args:
+                parent_obj: 父级对象，可以是 ProjectSoftSummary 或 Project 的实例
+                datas (list[DataSchema]): 数据模式对象列表
+        """
+        # 动态确定所属父model
+        field_name = None  # type:ignore
+        if isinstance(parent_obj, ProjectSoftSummary):
+            field_name = 'soft_summary'
+        elif isinstance(parent_obj, Project):
+            field_name = 'project'
+        elif isinstance(parent_obj, ProjectDynamicDescription):
+            field_name = 'dynamic_description'
+        else:
+            raise HttpError(400, "添加的数据未在系统内，请联系管理员")
+
+        data_list = []
+        for data in datas:
+            new_data = StuctSortData(
+                type=data.type,
+                fontnote=data.fontnote,
+                content=data.content,
+            )
+            setattr(new_data, field_name, parent_obj)
+            data_list.append(new_data)
+        StuctSortData.objects.bulk_create(data_list)
+
+    # 封装只有model不同 -修改和新增dataSchemas（针对project - OneToOne - DataSchemas形式）
+    @classmethod
+    def create_or_modify_data_schemas(cls, id: int, model, data):
+        project_obj = get_object_or_404(Project, pk=id)
+        qs = model.objects.filter(project=project_obj)
+        if qs.exists():
+            obj = qs.first()
+            # 如果存在则修改：先删除再创建
+            obj.data_schemas.all().delete()
+            cls.bulk_create_data_schemas(obj, data)
+        else:
+            parent_obj = model.objects.create(project=project_obj)
+            cls.bulk_create_data_schemas(parent_obj, data)
+
+    # ~~~软件概述-新增和修改~~~
+    @route.post('/soft_summary/')
+    @transaction.atomic
+    def soft_summary(self, payload: SoftSummarySchema):
+        self.create_or_modify_data_schemas(payload.id, ProjectSoftSummary, payload.data)
+
+    # ~~~动态环境描述-新增和修改~~~
+    @route.post('/dynamic_description/')
+    @transaction.atomic
+    def dynamic_description(self, payload: SoftSummarySchema):
+        self.create_or_modify_data_schemas(payload.id, ProjectDynamicDescription, payload.data)
+
+    @classmethod
+    def get_res_from_info(cls, project_obj: Project, model) -> list[dict] | None:
+        """model: 当前一对一模型，直接获取结构化数据信息数组返回"""
+        qs = model.objects.filter(project=project_obj)
+        if qs.exists():
+            obj = qs.first()
+            ds_qs = obj.data_schemas.all()
+            data_list = [{
+                "type": item.type,
+                "content": item.content,
+                "fontnote": item.fontnote,
+            } for item in ds_qs]
+            return data_list
+        return None
+
+    # ~~~软件概述-获取到前端展示~~~
+    @route.get("/get_soft_summary/", response=list[DataSchema])
+    @transaction.atomic
+    def get_soft_summary(self, id: int):
+        project_obj = self.get_project_by_id(id)
+        data_list = self.get_res_from_info(project_obj, ProjectSoftSummary)
+        if data_list:
+            return ChenResponse(status=200, code=20000, data=data_list)
+        return ChenResponse(status=200, code=20000, data=[])
+
+    # ~~~动态环境描述 - 获取展示~~~
+    @route.get("/dynamic_des/", response=list[DataSchema])
+    @transaction.atomic
+    def get_dynamic_des(self, id: int):
+        project_obj = self.get_project_by_id(id)
+        data_list = self.get_res_from_info(project_obj, ProjectDynamicDescription)
+        if data_list:
+            return ChenResponse(status=200, code=20000, data=data_list)
+        return ChenResponse(status=200, code=20000, data=[])
+
+    # ~~~接口图新增或修改~~~
+    @route.post("/interface_image/")
+    @transaction.atomic
+    def post_interface_image(self, id: int, dataSchema: DataSchema):
+        project_obj = self.get_project_by_id(id)
+        image_qs = StuctSortData.objects.filter(project=project_obj)
+        if image_qs.exists():
+            image_qs.delete()
+        self.bulk_create_data_schemas(project_obj, [dataSchema])
+
+    # ~~~接口图-获取数据~~~
+    @route.get("/get_interface_image/", response=DataSchema)
+    @transaction.atomic
+    def get_interface_image(self, id: int):
+        project_obj = self.get_project_by_id(id)
+        image_qs = StuctSortData.objects.filter(project=project_obj)
+        if image_qs.exists():
+            # 如果存在则返回数据
+            image_obj = image_qs.first()
+            return ChenResponse(status=200, code=25001, data={
+                "type": image_obj.type,
+                "content": image_obj.content,
+                "fontnote": image_obj.fontnote,
+            })
+        return ChenResponse(status=200, code=25002, data=None)
+
+    # 动态返回是哪个模型
+    @classmethod
+    def get_model_from_category(cls, category: str):
+        mapDict = {
+            '静态软件项': StaticSoftItem,
+            '静态硬件项': StaticSoftHardware,
+            '动态软件项': DynamicSoftTable,
+            '动态硬件项': DynamicHardwareTable,
+            '测评数据': EvaluateData
+        }
+        return mapDict[category]
+
+    # ~~~静态软件项、静态硬件项、动态软件项、动态硬件项 - 获取~~~
+    @route.get("/get_static_dynamic_items/")
+    def get_static_dynamic_items(self, id: int, category: str):
+        project_obj = self.get_project_by_id(id)
+        item_qs = self.get_model_from_category(category).objects.filter(project=project_obj)
+        if item_qs.exists():
+            item_obj = item_qs.first()
+            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):
+        project_obj = self.get_project_by_id(data.id)
+        model = self.get_model_from_category(data.category)
+        item_qs = model.objects.filter(project=project_obj)
+        if item_qs.exists():
+            # 如果存在则修改
+            item_qs.delete()
+        model.objects.create(project=project_obj, table=data.table, fontnote=data.fontnote)
+
+    # ~~~环境差异性分析 - 获取~~~
+    @route.get("/get_env_analysis/")
+    @transaction.atomic
+    def get_env_analysis(self, id: int):
+        project_obj = self.get_project_by_id(id)
+        qs = EnvAnalysis.objects.filter(project=project_obj)
+        if qs.exists():
+            obj = qs.first()
+            return ChenResponse(status=200, code=25001, data={"table": obj.table, "fontnote": obj.fontnote, "description": obj.description})
+        return ChenResponse(status=200, code=25002, data=None)
+
+    # ~~~环境差异性分析 - 新增和修改~~~
+    @route.post("/post_env_analysis/")
+    @transaction.atomic
+    def post_env_analysis(self, data: EnvAnalysisSchema):
+        project_obj = self.get_project_by_id(data.id)
+        qs = EnvAnalysis.objects.filter(project=project_obj)
+        if qs.exists():
+            qs.delete()
+        EnvAnalysis.objects.create(project=project_obj, table=data.table, fontnote=data.fontnote, description=data.description)

apps/project/controllers/round.py

@@ -2,9 +2,9 @@ from ninja_extra import api_controller, ControllerBase, route
 from ninja_jwt.authentication import JWTAuth
 from ninja_extra.permissions import IsAuthenticated
 from django.db import transaction
-from apps.project.models import Round
+from apps.project.models import Round, InfluenceArea, InfluenceItem
 from apps.project.schemas.round import TreeReturnRound, RoundInfoOutSchema, EditSchemaIn, DeleteSchema, \
-    CreateRoundOutSchema, CreateRoundInputSchema
+    CreateRoundOutSchema, CreateRoundInputSchema, InfluenceItemOutSchema, InfluenceInputSchema
 from typing import List
 from utils.chen_response import ChenResponse
 from apps.project.tools.delete_change_key import round_delete_sub_node_key
@@ -81,3 +81,62 @@ class RoundController(ControllerBase):
                     return ChenResponse(code=400, status=400, message='标识和其他重复')
         Round.objects.create(**asert_dict)
         return ChenResponse(message="新增轮次成功")
+
+    # ~~~影响域分析 - 获取数据和状态~~~
+    @route.get("/round/get_influence", response=List[InfluenceItemOutSchema], url_name="round-get-influence-items")
+    @transaction.atomic
+    def get_influence(self, id: int, round_key: str):
+        round_qs = Round.objects.filter(project__id=id, key=round_key)
+        round_obj = round_qs.first()
+        influence_qs = InfluenceArea.objects.filter(round=round_obj)
+        if influence_qs.exists():
+            influence = influence_qs.first()
+            items_qs = influence.influence_items.all()
+            if items_qs.exists():
+                return items_qs
+        return ChenResponse(status=200, code=25002, data=[])
+
+    # ~~~影响域分析是否有值~~~
+    @route.get("/round/get_status_influence", url_name="round-get-status-influence")
+    @transaction.atomic
+    def get_status_influence(self, id: int, round_key: str):
+        round_qs = Round.objects.filter(project__id=id, key=round_key)
+        round_obj = round_qs.first()
+        influence_qs = InfluenceArea.objects.filter(round=round_obj)
+        if influence_qs.exists():
+            influence = influence_qs.first()
+            items_qs = influence.influence_items.all()
+            if items_qs.exists():
+                return ChenResponse(status=200, code=25005, data=True)
+        return ChenResponse(status=200, code=25006, data=False)
+
+    # ~~~影响域分析 - 修改或新增~~~
+    @route.post("/round/create_influence", url_name="round-influence-create")
+    @transaction.atomic
+    def post_influence(self, data: InfluenceInputSchema):
+        round_obj = Round.objects.filter(project_id=data.id, key=data.round_key).first()
+        influence_area_qs = InfluenceArea.objects.filter(round=round_obj)
+        if influence_area_qs.exists():
+            influence_area_obj = influence_area_qs.first()
+            influence_area_obj.influence_items.all().delete()
+            # 先删除再创建
+            data_list = []
+            for item in data.item_list:
+                new_item = InfluenceItem(influence=influence_area_obj,
+                                         change_type=item.change_type,
+                                         change_influ=item.change_influ,
+                                         change_des=item.change_des,
+                                         effect_cases=item.effect_cases)
+                data_list.append(new_item)
+            InfluenceItem.objects.bulk_create(data_list)
+        else:
+            parent_obj = InfluenceArea.objects.create(round=round_obj)
+            data_list = []
+            for item in data.item_list:
+                new_item = InfluenceItem(influence=parent_obj,
+                                         change_type=item.change_type,
+                                         change_influ=item.change_influ,
+                                         change_des=item.change_des,
+                                         effect_cases=item.effect_cases)
+                data_list.append(new_item)
+            InfluenceItem.objects.bulk_create(data_list)

apps/project/migrations/0019_projectsoftsummary_stuctsortdata.py

@@ -0,0 +1,45 @@
+# Generated by Django 6.0.1 on 2026-02-02 15:00
+
+import apps.project.models
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0018_testdemandcontent_subdescription'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProjectSoftSummary',
+            fields=[
+                ('project', models.OneToOneField(db_constraint=False, help_text='关联项目', on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='projSoftSummary', serialize=False, to='project.project', verbose_name='关联项目')),
+            ],
+            options={
+                'verbose_name': '软件概述表',
+                'verbose_name_plural': '软件概述表',
+                'db_table': 'project_soft_summary',
+            },
+        ),
+        migrations.CreateModel(
+            name='StuctSortData',
+            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='显示排序')),
+                ('type', models.CharField(choices=[('text', '文本'), ('table', '表格'), ('image', '图片')], default='text', max_length=20, verbose_name='数据类型')),
+                ('fontnote', models.CharField(blank=True, default='', help_text='数据的题注说明', max_length=256, verbose_name='题注')),
+                ('content', models.JSONField(default=apps.project.models.default_json_value, help_text='存储文本内容或二维表格数据或图片数据', verbose_name='内容')),
+                ('soft_summary', models.ForeignKey(db_constraint=False, on_delete=django.db.models.deletion.CASCADE, related_name='data_schemas', to='project.projectsoftsummary', verbose_name='所属软件概述')),
+            ],
+            options={
+                'verbose_name': '结构排序化数据',
+                'verbose_name_plural': '结构排序化数据',
+                'db_table': 'data_schemas',
+            },
+        ),
+    ]

apps/project/migrations/0020_stuctsortdata_project_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 6.0.2 on 2026-02-04 10:28
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0019_projectsoftsummary_stuctsortdata'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='stuctsortdata',
+            name='project',
+            field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='data_schemas', to='project.project', verbose_name='该接口图所属的项目'),
+        ),
+        migrations.AlterField(
+            model_name='stuctsortdata',
+            name='soft_summary',
+            field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='data_schemas', to='project.projectsoftsummary', verbose_name='所属软件概述'),
+        ),
+    ]

apps/project/migrations/0021_alter_stuctsortdata_project.py

@@ -0,0 +1,19 @@
+# Generated by Django 6.0.2 on 2026-02-04 10:31
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0020_stuctsortdata_project_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='stuctsortdata',
+            name='project',
+            field=models.OneToOneField(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='data_schemas', to='project.project', verbose_name='该接口图所属的项目'),
+        ),
+    ]

apps/project/migrations/0022_dynamichardwaretable_dynamicsofttable_and_more.py

@@ -0,0 +1,63 @@
+# Generated by Django 6.0.2 on 2026-02-05 09:45
+
+import apps.project.models
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0021_alter_stuctsortdata_project'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DynamicHardwareTable',
+            fields=[
+                ('project', models.OneToOneField(db_constraint=False, help_text='关联项目', on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='dynamic_hardware', serialize=False, to='project.project', verbose_name='关联项目')),
+                ('table', models.JSONField(default=apps.project.models.default_json_value, help_text='储存表格二维数组', verbose_name='储存表格二维数组')),
+            ],
+            options={
+                'verbose_name': '动态硬件项表',
+                'verbose_name_plural': '动态硬件项表',
+                'db_table': 'project_dynamic_hardware',
+            },
+        ),
+        migrations.CreateModel(
+            name='DynamicSoftTable',
+            fields=[
+                ('project', models.OneToOneField(db_constraint=False, help_text='关联项目', on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='dynamic_soft_item', serialize=False, to='project.project', verbose_name='关联项目')),
+                ('table', models.JSONField(default=apps.project.models.default_json_value, help_text='储存表格二维数组', verbose_name='储存表格二维数组')),
+            ],
+            options={
+                'verbose_name': '动态软件项表',
+                'verbose_name_plural': '动态软件项表',
+                'db_table': 'project_dynamic_soft_item',
+            },
+        ),
+        migrations.CreateModel(
+            name='StaticSoftHardware',
+            fields=[
+                ('project', models.OneToOneField(db_constraint=False, help_text='关联项目', on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='static_hardware', serialize=False, to='project.project', verbose_name='关联项目')),
+                ('table', models.JSONField(default=apps.project.models.default_json_value, help_text='储存表格二维数组', verbose_name='储存表格二维数组')),
+            ],
+            options={
+                'verbose_name': '静态硬件项表',
+                'verbose_name_plural': '静态硬件项表',
+                'db_table': 'project_static_hardware',
+            },
+        ),
+        migrations.CreateModel(
+            name='StaticSoftItem',
+            fields=[
+                ('project', models.OneToOneField(db_constraint=False, help_text='关联项目', on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='static_soft_item', serialize=False, to='project.project', verbose_name='关联项目')),
+                ('table', models.JSONField(default=apps.project.models.default_json_value, help_text='储存表格二维数组', verbose_name='储存表格二维数组')),
+            ],
+            options={
+                'verbose_name': '静态软件项表',
+                'verbose_name_plural': '静态软件项表',
+                'db_table': 'project_static_soft_item',
+            },
+        ),
+    ]

apps/project/migrations/0023_dynamichardwaretable_fontnote_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 6.0.2 on 2026-02-05 11:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0022_dynamichardwaretable_dynamicsofttable_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dynamichardwaretable',
+            name='fontnote',
+            field=models.CharField(default='', help_text='数据的题注说明', max_length=256, null=True, verbose_name='题注'),
+        ),
+        migrations.AddField(
+            model_name='dynamicsofttable',
+            name='fontnote',
+            field=models.CharField(default='', help_text='数据的题注说明', max_length=256, null=True, verbose_name='题注'),
+        ),
+        migrations.AddField(
+            model_name='staticsofthardware',
+            name='fontnote',
+            field=models.CharField(default='', help_text='数据的题注说明', max_length=256, null=True, verbose_name='题注'),
+        ),
+        migrations.AddField(
+            model_name='staticsoftitem',
+            name='fontnote',
+            field=models.CharField(default='', help_text='数据的题注说明', max_length=256, null=True, verbose_name='题注'),
+        ),
+    ]

apps/project/migrations/0024_projectdynamicdescription_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 6.0.2 on 2026-02-05 17:48
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0023_dynamichardwaretable_fontnote_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProjectDynamicDescription',
+            fields=[
+                ('project', models.OneToOneField(db_constraint=False, help_text='关联项目', on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='dynamic_des', serialize=False, to='project.project', verbose_name='关联项目')),
+            ],
+            options={
+                'verbose_name': '动态环境描述',
+                'verbose_name_plural': '动态环境描述',
+                'db_table': 'project_dynamic_description',
+            },
+        ),
+        migrations.AddField(
+            model_name='stuctsortdata',
+            name='dynamic_description',
+            field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='data_schemas', to='project.projectdynamicdescription', verbose_name='所属动态环境描述'),
+        ),
+    ]

apps/project/migrations/0025_evaluatedata.py

@@ -0,0 +1,28 @@
+# Generated by Django 6.0.2 on 2026-02-06 10:56
+
+import apps.project.models
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0024_projectdynamicdescription_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='EvaluateData',
+            fields=[
+                ('project', models.OneToOneField(db_constraint=False, help_text='关联项目', on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='evaluate_data', serialize=False, to='project.project', verbose_name='关联项目')),
+                ('table', models.JSONField(default=apps.project.models.default_json_value, help_text='储存表格二维数组', verbose_name='储存表格二维数组')),
+                ('fontnote', models.CharField(default='', help_text='数据的题注说明', max_length=256, null=True, verbose_name='题注')),
+            ],
+            options={
+                'verbose_name': '测评数据',
+                'verbose_name_plural': '测评数据',
+                'db_table': 'project_evaluate_data',
+            },
+        ),
+    ]

apps/project/migrations/0026_envanalysis.py

@@ -0,0 +1,29 @@
+# Generated by Django 6.0.2 on 2026-02-06 13:56
+
+import apps.project.models
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0025_evaluatedata'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='EnvAnalysis',
+            fields=[
+                ('project', models.OneToOneField(db_constraint=False, help_text='关联项目', on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='env_analysis', serialize=False, to='project.project', verbose_name='关联项目')),
+                ('table', models.JSONField(default=apps.project.models.default_json_value, help_text='储存表格二维数组', verbose_name='储存表格二维数组')),
+                ('fontnote', models.CharField(default='', help_text='数据的题注说明', max_length=256, null=True, verbose_name='题注')),
+                ('description', models.CharField(default='', max_length=1024, null=True, verbose_name='差异性分析文字')),
+            ],
+            options={
+                'verbose_name': '环境差异性分析表',
+                'verbose_name_plural': '环境差异性分析表',
+                'db_table': 'project_env_analysis',
+            },
+        ),
+    ]

apps/project/migrations/0027_influencearea_influenceitem.py

@@ -0,0 +1,46 @@
+# Generated by Django 6.0.2 on 2026-02-06 16:05
+
+import apps.project.models
+import django.db.models.deletion
+import tinymce.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0026_envanalysis'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='InfluenceArea',
+            fields=[
+                ('project', models.OneToOneField(db_constraint=False, help_text='关联项目', on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='influence', serialize=False, to='project.round', verbose_name='关联项目')),
+            ],
+            options={
+                'verbose_name': '影响域分析',
+                'verbose_name_plural': '影响域分析',
+                'db_table': 'round_influence_area',
+            },
+        ),
+        migrations.CreateModel(
+            name='InfluenceItem',
+            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='显示排序')),
+                ('change_type', models.CharField(default='', help_text='更改类型', max_length=256, null=True, verbose_name='更改类型')),
+                ('change_des', tinymce.models.HTMLField(blank=True, null=True, verbose_name='更改内容描述')),
+                ('effect_cases', models.JSONField(default=apps.project.models.create_list, verbose_name='影响的用例key数组')),
+                ('influence', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='influence_items', to='project.influencearea', verbose_name='所属影响域分析')),
+            ],
+            options={
+                'verbose_name': '影响域分析 - 行数据',
+                'verbose_name_plural': '影响域分析 - 行数据',
+                'db_table': 'influence_item',
+            },
+        ),
+    ]

apps/project/migrations/0028_rename_project_influencearea_round.py

@@ -0,0 +1,18 @@
+# Generated by Django 6.0.2 on 2026-02-07 13:45
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0027_influencearea_influenceitem'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='influencearea',
+            old_name='project',
+            new_name='round',
+        ),
+    ]

apps/project/migrations/0029_influenceitem_change_influ.py

@@ -0,0 +1,18 @@
+# Generated by Django 6.0.2 on 2026-02-07 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0028_rename_project_influencearea_round'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='influenceitem',
+            name='change_influ',
+            field=models.TextField(default='', help_text='影响域分析', max_length=2048, null=True, verbose_name='影响域分析'),
+        ),
+    ]

apps/project/migrations/0030_alter_project_devplant_alter_project_runtime.py

@@ -0,0 +1,24 @@
+# Generated by Django 6.0.4 on 2026-04-17 13:57
+
+import apps.project.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0029_influenceitem_change_influ'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='project',
+            name='devplant',
+            field=models.JSONField(blank=True, default=apps.project.models.create_list, help_text='开发环境', null=True, verbose_name='开发环境'),
+        ),
+        migrations.AlterField(
+            model_name='project',
+            name='runtime',
+            field=models.JSONField(blank=True, default=apps.project.models.create_list, help_text='运行环境', null=True, verbose_name='运行环境'),
+        ),
+    ]

apps/project/migrations/0031_alter_testdemand_adequacy.py

@@ -0,0 +1,18 @@
+# Generated by Django 6.0.4 on 2026-04-17 16:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0030_alter_project_devplant_alter_project_runtime'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='testdemand',
+            name='adequacy',
+            field=models.CharField(blank=True, help_text='充分条件', max_length=2048, null=True, verbose_name='充分条件'),
+        ),
+    ]

apps/project/migrations/0032_alter_design_protocal.py

@@ -0,0 +1,18 @@
+# Generated by Django 6.0.4 on 2026-04-20 10:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0031_alter_testdemand_adequacy'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='design',
+            name='protocal',
+            field=models.CharField(blank=True, default='', help_text='接口数据', max_length=1024, null=True, verbose_name='接口数据'),
+        ),
+    ]

apps/project/migrations/0033_remove_design_protocal_remove_design_to_and_more.py

@@ -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')},
+            },
+        ),
+    ]

apps/project/migrations/0034_remove_design_source_design_type_and_more.py

@@ -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='来源'),
+        ),
+    ]

apps/project/migrations/0035_design_is_bidirectional.py

@@ -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='是否双向'),
+        ),
+    ]

apps/project/models.py

@@ -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="项目成员",
@@ -27,50 +27,29 @@ class Project(CoreModel):
     vise_person = models.CharField(max_length=64, verbose_name="质量监督员", help_text="质量监督员")
     config_person = models.CharField(max_length=64, verbose_name="配置管理员", help_text="配置管理员")
     # ~~~~~~~~~~~
-    security_level = models.CharField(max_length=8, blank=True, null=True, verbose_name="安全等级",
-                                      help_text="安全等级")
-    test_level = models.JSONField(null=True, blank=True, help_text="测试级别", verbose_name="测试级别",
-                                  default=create_list)
-    plant_type = models.JSONField(null=True, blank=True, help_text="平台类型", verbose_name="平台类型",
-                                  default=create_list)
-    report_type = models.CharField(max_length=64, blank=True, null=True, verbose_name="报告类型",
-                                   help_text="报告类型")
-    language = models.JSONField(null=True, blank=True, help_text="被测语言", verbose_name="被测语言",
-                                default=create_list)
-    standard = models.JSONField(null=True, blank=True, help_text="依据标准", verbose_name="依据标准",
-                                default=create_list)
+    security_level = models.CharField(max_length=8, blank=True, null=True, verbose_name="安全等级", help_text="安全等级")
+    test_level = models.JSONField(null=True, blank=True, help_text="测试级别", verbose_name="测试级别", default=create_list)
+    plant_type = models.JSONField(null=True, blank=True, help_text="平台类型", verbose_name="平台类型", default=create_list)
+    report_type = models.CharField(max_length=64, blank=True, null=True, verbose_name="报告类型", help_text="报告类型")
+    language = models.JSONField(null=True, blank=True, help_text="被测语言", verbose_name="被测语言", default=create_list)
+    standard = models.JSONField(null=True, blank=True, help_text="依据标准", verbose_name="依据标准", default=create_list)
     entrust_unit = models.CharField(max_length=64, verbose_name="委托方单位", help_text="委托方单位")
-    entrust_contact = models.CharField(max_length=64, blank=True, null=True, verbose_name="委托方联系人",
-                                       help_text="委托方联系人")
-    entrust_contact_phone = models.CharField(max_length=64, blank=True, null=True, verbose_name="委托方电话",
-                                             help_text="委托方电话")
-    entrust_email = models.CharField(max_length=64, blank=True, null=True, verbose_name="委托方邮箱",
-                                     help_text="委托方邮箱")
+    entrust_contact = models.CharField(max_length=64, blank=True, null=True, verbose_name="委托方联系人", help_text="委托方联系人")
+    entrust_contact_phone = models.CharField(max_length=64, blank=True, null=True, verbose_name="委托方电话", help_text="委托方电话")
+    entrust_email = models.CharField(max_length=64, blank=True, null=True, verbose_name="委托方邮箱", help_text="委托方邮箱")
     dev_unit = models.CharField(max_length=64, verbose_name="开发方单位", help_text="开发方单位")
-    dev_contact = models.CharField(max_length=64, blank=True, null=True, verbose_name="研制方联系人",
-                                   help_text="研制方联系人")
-    dev_contact_phone = models.CharField(max_length=64, blank=True, null=True, verbose_name="研制方电话",
-                                         help_text="研制方电话")
-    dev_email = models.CharField(max_length=64, blank=True, null=True, verbose_name="研制方邮箱",
-                                 help_text="研制方邮箱")
+    dev_contact = models.CharField(max_length=64, blank=True, null=True, verbose_name="研制方联系人", help_text="研制方联系人")
+    dev_contact_phone = models.CharField(max_length=64, blank=True, null=True, verbose_name="研制方电话", help_text="研制方电话")
+    dev_email = models.CharField(max_length=64, blank=True, null=True, verbose_name="研制方邮箱", help_text="研制方邮箱")
     test_unit = models.CharField(max_length=64, verbose_name="测试方单位", help_text="测试方单位")
-    test_contact = models.CharField(max_length=64, blank=True, null=True, verbose_name="测评中心联系人",
-                                    help_text="测评中心联系人")
-    test_contact_phone = models.CharField(max_length=64, blank=True, null=True, verbose_name="测评中心电话",
-                                          help_text="测评中心电话")
-    test_email = models.CharField(max_length=64, blank=True, null=True, verbose_name="测评中心邮箱",
-                                  help_text="测评中心邮箱")
-    step = models.CharField(max_length=8, blank=True, null=True, verbose_name="项目阶段",
-                            help_text="项目阶段")
-    abbreviation = models.JSONField(null=True, blank=True, help_text="缩略语", verbose_name="缩略语",
-                                    default=create_list)
-    soft_type = models.SmallIntegerField(verbose_name='软件类型',
-                                         choices=((1, '新研'), (2, '改造'), (3, '沿用')),
-                                         default=1)
-    runtime = models.CharField(max_length=8, blank=True, null=True, verbose_name="运行环境",
-                               help_text="运行环境")
-    devplant = models.CharField(max_length=8, blank=True, null=True, verbose_name="开发环境",
-                                help_text="开发环境")
+    test_contact = models.CharField(max_length=64, blank=True, null=True, verbose_name="测评中心联系人", help_text="测评中心联系人")
+    test_contact_phone = models.CharField(max_length=64, blank=True, null=True, verbose_name="测评中心电话", help_text="测评中心电话")
+    test_email = models.CharField(max_length=64, blank=True, null=True, verbose_name="测评中心邮箱", help_text="测评中心邮箱")
+    step = models.CharField(max_length=8, blank=True, null=True, verbose_name="项目阶段", help_text="项目阶段")
+    abbreviation = models.JSONField(null=True, blank=True, help_text="缩略语", verbose_name="缩略语", default=create_list)
+    soft_type = models.SmallIntegerField(verbose_name='软件类型', choices=((1, '新研'), (2, '改造'), (3, '沿用')), default=1)
+    runtime = models.JSONField(null=True, blank=True, help_text="运行环境", verbose_name="运行环境", default=create_list)
+    devplant = models.JSONField(null=True, blank=True, help_text="开发环境", verbose_name="开发环境", default=create_list)
     # 9月2日新增字段：密级
     secret = models.CharField(max_length=30, default='1', verbose_name='密级', help_text='密级')
 
@@ -219,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=64, blank=True, null=True, default='', verbose_name='接口数据',
-                                help_text='接口数据')
+    is_bidirectional = models.BooleanField(
+        default=False,
+        verbose_name="是否双向"
+    )
 
     def __str__(self):
         return f'设计需求:{self.name}'
@@ -238,24 +214,39 @@ 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()
     """测试项"""
-    ident = models.CharField(max_length=64, blank=True, null=True, verbose_name="测试需求标识",
-                             help_text="测试需求标识")
-    name = models.CharField(max_length=64, blank=True, null=True, verbose_name="测试需求名称",
-                            help_text="测试需求名称")
-    adequacy = models.CharField(max_length=256, blank=True, null=True, verbose_name="充分条件",
-                                help_text="充分条件")
-    priority = models.CharField(max_length=8, blank=True, null=True, verbose_name="优先级",
-                                help_text="优先级")
-    testType = models.CharField(max_length=8, null=True, blank=True, help_text="测试类型",
-                                verbose_name="测试类型",
-                                default="1")
-    testMethod = models.JSONField(blank=True, help_text="测试方法", verbose_name="测试方法",
-                                  default=create_list)
-    title = models.CharField(max_length=64, blank=True, null=True, verbose_name="树-名称",
-                             help_text="树-名称")
+    objects = models.Manager()
+    ident = models.CharField(max_length=64, blank=True, null=True, verbose_name="测试需求标识", help_text="测试需求标识")
+    name = models.CharField(max_length=64, blank=True, null=True, verbose_name="测试需求名称", help_text="测试需求名称")
+    adequacy = models.CharField(max_length=2048, blank=True, null=True, verbose_name="充分条件", help_text="充分条件")
+    priority = models.CharField(max_length=8, blank=True, null=True, verbose_name="优先级", help_text="优先级")
+    testType = models.CharField(max_length=8, null=True, blank=True, help_text="测试类型", verbose_name="测试类型", default="1")
+    testMethod = models.JSONField(blank=True, help_text="测试方法", verbose_name="测试方法", default=create_list)
+    title = models.CharField(max_length=64, blank=True, null=True, verbose_name="树-名称", help_text="树-名称")
     key = models.CharField(max_length=64, blank=True, null=True,
                            verbose_name="round-dut-designkey-testdemand",
                            help_text="round-dut-designkey-testdemand")
@@ -466,6 +457,9 @@ class Contact(CoreModel):
         ordering = ('create_datetime',)
 
 # ~~~~~2024年2月27日新增~~~~~
+def default_json_value():
+    return ""
+
 class Abbreviation(models.Model):
     objects = models.Manager()
     title = models.CharField(max_length=64, verbose_name="缩略语", help_text="缩略语")
@@ -478,3 +472,163 @@ class Abbreviation(models.Model):
         db_table = 'project_abbreviation'
         verbose_name = '缩略语和行业词汇'
         verbose_name_plural = '缩略语和行业词汇'
+
+# 一对一项目model：软件概述
+class ProjectSoftSummary(models.Model):
+    project = models.OneToOneField(to="Project", primary_key=True, db_constraint=False, related_name="projSoftSummary", on_delete=models.CASCADE,
+                                   verbose_name="关联项目", help_text="关联项目")
+
+    class Meta:
+        db_table = 'project_soft_summary'
+        verbose_name = "软件概述表"
+        verbose_name_plural = verbose_name
+
+# 一对一项目model：动态测试环境描述
+class ProjectDynamicDescription(models.Model):
+    project = models.OneToOneField(to="Project", primary_key=True, db_constraint=False, related_name="dynamic_des", on_delete=models.CASCADE,
+                                   verbose_name="关联项目", help_text="关联项目")
+
+    class Meta:
+        db_table = 'project_dynamic_description'
+        verbose_name = "动态环境描述"
+        verbose_name_plural = verbose_name
+
+# 一对一项目model：静态软件项表
+class StaticSoftItem(models.Model):
+    project = models.OneToOneField(to="Project", primary_key=True, db_constraint=False, related_name="static_soft_item", on_delete=models.CASCADE,
+                                   verbose_name="关联项目", help_text="关联项目")
+    table = models.JSONField(verbose_name="储存表格二维数组", help_text="储存表格二维数组", default=default_json_value)
+    fontnote = models.CharField(max_length=256, null=True, default="", verbose_name="题注", help_text="数据的题注说明")
+
+    class Meta:
+        db_table = 'project_static_soft_item'
+        verbose_name = "静态软件项表"
+        verbose_name_plural = verbose_name
+
+# 一对一项目model：静态硬件项表
+class StaticSoftHardware(models.Model):
+    project = models.OneToOneField(to="Project", primary_key=True, db_constraint=False, related_name="static_hardware", on_delete=models.CASCADE,
+                                   verbose_name="关联项目", help_text="关联项目")
+    table = models.JSONField(verbose_name="储存表格二维数组", help_text="储存表格二维数组", default=default_json_value)
+    fontnote = models.CharField(max_length=256, null=True, default="", verbose_name="题注", help_text="数据的题注说明")
+
+    class Meta:
+        db_table = 'project_static_hardware'
+        verbose_name = "静态硬件项表"
+        verbose_name_plural = verbose_name
+
+# 一对一项目model：动态软件项表
+class DynamicSoftTable(models.Model):
+    project = models.OneToOneField(to="Project", primary_key=True, db_constraint=False, related_name="dynamic_soft_item", on_delete=models.CASCADE,
+                                   verbose_name="关联项目", help_text="关联项目")
+    table = models.JSONField(verbose_name="储存表格二维数组", help_text="储存表格二维数组", default=default_json_value)
+    fontnote = models.CharField(max_length=256, null=True, default="", verbose_name="题注", help_text="数据的题注说明")
+
+    class Meta:
+        db_table = 'project_dynamic_soft_item'
+        verbose_name = "动态软件项表"
+        verbose_name_plural = verbose_name
+
+# 一对一项目model：动态硬件项
+class DynamicHardwareTable(models.Model):
+    project = models.OneToOneField(to="Project", primary_key=True, db_constraint=False, related_name="dynamic_hardware", on_delete=models.CASCADE,
+                                   verbose_name="关联项目", help_text="关联项目")
+    table = models.JSONField(verbose_name="储存表格二维数组", help_text="储存表格二维数组", default=default_json_value)
+    fontnote = models.CharField(max_length=256, null=True, default="", verbose_name="题注", help_text="数据的题注说明")
+
+    class Meta:
+        db_table = 'project_dynamic_hardware'
+        verbose_name = "动态硬件项表"
+        verbose_name_plural = verbose_name
+
+# 一对一项目model：动态环境 - 测评数据
+class EvaluateData(models.Model):
+    project = models.OneToOneField(to="Project", primary_key=True, db_constraint=False, related_name="evaluate_data", on_delete=models.CASCADE,
+                                   verbose_name="关联项目", help_text="关联项目")
+    table = models.JSONField(verbose_name="储存表格二维数组", help_text="储存表格二维数组", default=default_json_value)
+    fontnote = models.CharField(max_length=256, null=True, default="", verbose_name="题注", help_text="数据的题注说明")
+
+    class Meta:
+        db_table = 'project_evaluate_data'
+        verbose_name = "测评数据"
+        verbose_name_plural = verbose_name
+
+# 一对一项目model：环境差异性分析
+class EnvAnalysis(models.Model):
+    project = models.OneToOneField(to="Project", primary_key=True, db_constraint=False,
+                                   related_name="env_analysis", on_delete=models.CASCADE,
+                                   verbose_name="关联项目", help_text="关联项目")
+    table = models.JSONField(verbose_name="储存表格二维数组", help_text="储存表格二维数组", default=default_json_value)
+    fontnote = models.CharField(max_length=256, null=True, default="", verbose_name="题注", help_text="数据的题注说明")
+    description = models.CharField(max_length=1024, null=True, default="", verbose_name="差异性分析文字")
+
+    class Meta:
+        db_table = 'project_env_analysis'
+        verbose_name = "环境差异性分析表"
+        verbose_name_plural = verbose_name
+
+# 结构化排序数据
+class StuctSortData(CoreModel):
+    """
+        与其他项目信息的多对一关系
+    """
+    # 软件概述内容
+    soft_summary = models.ForeignKey(ProjectSoftSummary, db_constraint=False, related_name="data_schemas", verbose_name="所属软件概述",
+                                     on_delete=models.CASCADE, null=True, blank=True)
+    # 接口图
+    project = models.OneToOneField(Project, db_constraint=False, related_name="data_schemas", on_delete=models.CASCADE, null=True, blank=True,
+                                   verbose_name="该接口图所属的项目")
+    # 动态环境描述
+    dynamic_description = models.ForeignKey(ProjectDynamicDescription, db_constraint=False, related_name="data_schemas",
+                                            verbose_name="所属动态环境描述",
+                                            on_delete=models.CASCADE, null=True, blank=True)
+
+    type = models.CharField(
+        max_length=20,
+        choices=(('text', '文本'), ('table', '表格'), ('image', '图片')),
+        default='text',
+        verbose_name="数据类型",
+    )
+    # 题注字段
+    fontnote = models.CharField(
+        max_length=256,
+        blank=True,
+        default="",
+        verbose_name="题注",
+        help_text="数据的题注说明"
+    )
+    # 内容字段 - 存储字符串、列表、字典
+    content = models.JSONField(verbose_name="内容", help_text="存储文本内容或二维表格数据或图片数据", default=default_json_value)
+
+    class Meta:
+        db_table = 'data_schemas'
+        verbose_name = "结构排序化数据"
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return f"结构排序化数据：({self.pk})"
+
+# 影响域分析 - 隶属：轮次（不能是第一轮次）
+class InfluenceArea(models.Model):
+    round = models.OneToOneField(to="Round", primary_key=True, db_constraint=False,
+                                 related_name="influence", on_delete=models.CASCADE,
+                                 verbose_name="关联项目", help_text="关联项目")
+
+    class Meta:
+        db_table = 'round_influence_area'
+        verbose_name = "影响域分析"
+        verbose_name_plural = verbose_name
+
+class InfluenceItem(CoreModel):
+    # 外键：影响域分析
+    influence = models.ForeignKey(InfluenceArea, db_constraint=False, related_name="influence_items", verbose_name="所属影响域分析",
+                                  on_delete=models.CASCADE, null=True, blank=True)
+    change_type = models.CharField(max_length=256, null=True, default="", verbose_name="更改类型", help_text="更改类型")
+    change_influ = models.TextField(max_length=2048, null=True, default="", verbose_name="影响域分析", help_text="影响域分析")
+    change_des = HTMLField(blank=True, null=True, verbose_name="更改内容描述")
+    effect_cases = models.JSONField(default=create_list, verbose_name="影响的用例key数组")
+
+    class Meta:
+        db_table = 'influence_item'
+        verbose_name = "影响域分析 - 行数据"
+        verbose_name_plural = verbose_name

apps/project/schemas/design.py

@@ -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")

apps/project/schemas/project.py

@@ -1,5 +1,7 @@
 from ninja.errors import HttpError
-from apps.project.models import Project
+from pyasn1_modules.rfc2315 import Data
+
+from apps.project.models import Project, StuctSortData
 from ninja import Schema, ModelSchema
 from pydantic import field_validator
 from typing import List, Optional
@@ -39,3 +41,31 @@ class ProjectCreateInput(ModelSchema):
 
 class DeleteSchema(Schema):
     ids: List[int]
+
+# ~~~软件概述~~~
+class DataSchema(Schema):
+    type: Optional[str] = "text"
+    fontnote: Optional[str] = ""
+    content: str | list[list[str]]
+
+## 输入
+class SoftSummarySchema(Schema):
+    id: int
+    data: list[DataSchema]
+
+# ~~~软件接口图~~~
+## 复用DataSchema
+
+# ~~~静态软件项、静态硬件项、动态软件项、动态硬件项~~~
+class StaticDynamicData(Schema):
+    id: int
+    category: str
+    table: list[list[str]]
+    fontnote: Optional[str] = ""
+
+# ~~~环境差异性分析~~~
+class EnvAnalysisSchema(Schema):
+    id: int
+    table: list[list[str]]
+    fontnote: Optional[str] = ""
+    description: Optional[str] = ""

apps/project/schemas/round.py

@@ -1,7 +1,7 @@
 from typing import Optional
 from ninja import Schema, ModelSchema
 from pydantic import Field
-from apps.project.models import Round
+from apps.project.models import Round, InfluenceItem
 
 # 输出树状信息的schema
 class TreeReturnRound(Schema):
@@ -55,3 +55,21 @@ class CreateRoundInputSchema(ModelSchema):
         fields_optional = ['best_condition_tem', 'best_condition_voltage',
                            'low_condition_tem', 'low_condition_voltage', 'typical_condition_tem',
                            'typical_condition_voltage' 'grade']
+
+# influence_item return
+class InfluenceItemOutSchema(ModelSchema):
+    class Meta:
+        model = InfluenceItem
+        fields = ['id', 'change_type', 'change_des', 'effect_cases', 'change_influ']
+
+# influence input
+class OneItemInputSchema(Schema):
+    change_type: str
+    change_des: Optional[str] = ""
+    effect_cases: Optional[list[str]] = []
+    change_influ: Optional[str] = ""
+
+class InfluenceInputSchema(Schema):
+    id: int
+    round_key: str
+    item_list: list[OneItemInputSchema]

apps/project/signals.py

@@ -5,6 +5,8 @@ from django.db.models.signals import post_save, post_delete
 from django.dispatch import receiver
 from django.utils.functional import SimpleLazyObject
 from django.contrib.auth import get_user_model
+# 导入用例和影响域分析Model-设计信号当删除用例对应影响域分析删除关联用例
+from apps.project.models import Case, InfluenceItem
 # 导入日志的模型
 from apps.user.models import TableOperationLog, Users
 # 导入其他模型用于排除
@@ -89,3 +91,42 @@ def post_delete_handler(sender, instance, **kwargs):
         'operate_des': '删除'
     }
     log_manager.create(user=user, **ope_dict)
+
+# 信号：删除影响域分析关联的用例，将影响域分析管理用例删除
+@receiver(post_delete, sender=Case)
+def clean_up_deleted_case_reference_from_influence(sender, instance, **kwargs):
+    """
+    监听 Case 的删除信号。
+    仅在同一个 Project 范围内，从 InfluenceItem 的 effect_cases 中移除被删用例的 key。
+    """
+    deleted_key = instance.key
+    project_id = instance.project_id
+
+    if not deleted_key or not project_id:
+        return
+
+    # 查询当前项目的影响域分析并且包含该用例
+    items = InfluenceItem.objects.filter(
+        influence__round__project_id=project_id,  # 外键链锁定项目
+        effect_cases__contains=[deleted_key]  # JSON 字段包含该 key
+    )
+
+    # 未发现有关联的影响域分析则不处理
+    if not items.exists():
+        return
+
+    # 更新影响域分析的关联用例
+    updated_items = []
+    for item in items:
+        original_keys = item.effect_cases
+        # 过滤掉被删除的 key，保留其他
+        new_keys = [k for k in original_keys if k != deleted_key]
+
+        if len(new_keys) != len(original_keys):
+            item.effect_cases = new_keys
+            updated_items.append(item)
+
+    if updated_items:
+        InfluenceItem.objects.bulk_update(updated_items, ['effect_cases'])
+    else:
+        print("⚠️ 查询到记录但未发生变更，可能数据有误")

apps/project/tools/auto_create_data.py

@@ -182,6 +182,8 @@ def auto_create_wd(user_name: str, dut_qs: Dut, project_obj: Project):
     }
     new_wd_design_obj: Design = Design.objects.create(**wd_design_create_dict)
     # 1.1.1.自动创建demand文档审查
+    is_JD = (project_obj.report_type == '9')
+    test_des = "本次三方文档审查内容包括软件需求规格说明、软件设计说明等"
     wd_demand_create_dict = {
         'ident': 'WDSC',
         'name': '文档审查',
@@ -206,7 +208,7 @@ def auto_create_wd(user_name: str, dut_qs: Dut, project_obj: Project):
                           '13）软件研制总结报告\a'
                           '14）软件版本说明\a'
                           '15）软件产品规格说明\a'
-                          '16）固件保障手册',
+                          '16）固件保障手册' if is_JD else test_des,
         'key': ''.join([new_wd_design_obj.key, '-', '0']),
         'level': '3',
         'project': project_obj,

conf/env.py

@@ -15,7 +15,7 @@ env.read_env(env_file=Path(__file__).resolve().parent.parent / env_file)
 # 数据库地址
 DATABASE_HOST = "127.0.0.1"
 # 数据库端口
-DATABASE_PORT = 3307  # 生成环境配置
+DATABASE_PORT = 3306  # 生成环境配置-注意打包时务必需改为3307!!!!!!
 # 数据库用户名
 DATABASE_USER = "root"
 # 数据库密码