feat: 新增软件资产(软资产)管理模块

- 新增 SoftwareCategory/SoftwareAsset/SoftwareChangeLog 模型与迁移0010
- 软资产CRUD:编号/名称/分类/供应商/版本/许可类型/授权数量/许可密钥/账号/费用/起止日期/负责人/部门/状态
- 许可类型:永久授权/订阅/开源免费/按需付费;状态:在用/闲置/已过期/已注销
- 到期提醒:已过期/即将到期(30天)自动标识
- Excel导入导出:模板下载、ID存在时更新、分类自动创建、空白行跳过、缺编号/名称报错
- 软件分类独立管理,分类下有资产时禁止删除
- 独立软件变更记录页;仪表盘增加软件统计卡片、软件分类统计、许可类型分布
- 导航栏改造:资产管理/分类管理/变更记录/导入导出下拉菜单
- 全流程15项功能验证通过(CRUD/导入导出/权限/仪表盘)
This commit is contained in:
cnbugs
2026-11-11 17:22:23 +08:00
parent e894f61ddf
commit 9b79c14267
19 changed files with 1908 additions and 69 deletions
+225
View File
@@ -289,3 +289,228 @@ def import_assets_from_excel(ws, category_map, operator=None):
results['errors'].append(f'第{row_idx}行: {str(e)}')
return results
# ─── 软资产(软件资产)Excel 支持 ─────────────────
# Excel列定义(顺序与软件资产列表一致)
SOFTWARE_EXPORT_COLUMNS = [
('id', 'ID', 8),
('asset_number', '资产编号', 18),
('name', '软件名称', 25),
('category', '软件分类', 12),
('vendor', '供应商', 18),
('version', '版本', 12),
('license_type', '许可类型', 12),
('seats', '授权数量', 10),
('license_key', '许可密钥/激活码', 30),
('account', '账号', 18),
('cost', '费用(元)', 12),
('start_date', '启用日期', 12),
('expire_date', '到期日期', 12),
('responsible_person', '负责人', 10),
('department', '使用部门', 15),
('status', '状态', 8),
('remark', '备注', 30),
]
SOFTWARE_LICENSE_TYPE_MAP = {
'permanent': '永久授权', 'subscription': '订阅',
'open_source': '开源免费', 'pay_as_you_go': '按需付费',
}
SOFTWARE_LICENSE_TYPE_REVERSE = {v: k for k, v in SOFTWARE_LICENSE_TYPE_MAP.items()}
SOFTWARE_STATUS_MAP = {
'in_use': '在用', 'idle': '闲置', 'expired': '已过期', 'cancelled': '已注销',
}
SOFTWARE_STATUS_MAP_REVERSE = {v: k for k, v in SOFTWARE_STATUS_MAP.items()}
def export_software_assets_to_excel(queryset):
"""导出软件资产到Excel"""
wb = Workbook()
ws = wb.active
ws.title = '软件资产'
for col_idx, (field, header, width) in enumerate(SOFTWARE_EXPORT_COLUMNS, 1):
cell = ws.cell(row=1, column=col_idx, value=header)
cell.fill = HEADER_FILL
cell.font = HEADER_FONT
cell.alignment = Alignment(horizontal='center', vertical='center')
cell.border = THIN_BORDER
ws.column_dimensions[get_column_letter(col_idx)].width = width
for row_idx, sw in enumerate(queryset, 2):
for col_idx, (field, _, _) in enumerate(SOFTWARE_EXPORT_COLUMNS, 1):
if field == 'id':
value = sw.id
elif field == 'category':
value = str(sw.category) if sw.category else ''
elif field == 'status':
value = SOFTWARE_STATUS_MAP.get(sw.status, sw.status)
elif field == 'license_type':
value = SOFTWARE_LICENSE_TYPE_MAP.get(sw.license_type, sw.license_type)
else:
value = getattr(sw, field, '') or ''
cell = ws.cell(row=row_idx, column=col_idx, value=value)
cell.font = CELL_FONT
cell.border = THIN_BORDER
cell.alignment = Alignment(vertical='center')
ws.freeze_panes = 'A2'
return wb
def generate_software_import_template():
"""生成软件资产导入模板"""
wb = Workbook()
ws = wb.active
ws.title = '软件资产导入模板'
for col_idx, (field, header, width) in enumerate(SOFTWARE_EXPORT_COLUMNS, 1):
cell = ws.cell(row=1, column=col_idx, value=header)
cell.fill = HEADER_FILL
cell.font = HEADER_FONT
cell.alignment = Alignment(horizontal='center', vertical='center')
cell.border = THIN_BORDER
ws.column_dimensions[get_column_letter(col_idx)].width = width
example_data = [
'1', 'SW-2026-0001', 'Windows Server 2022', '操作系统', '微软', '2022 Datacenter',
'永久授权', '50', 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', 'it@company.com',
'120000', '2025-01-01', '2027-01-01', '张三', '研发部', '在用', '采购备注'
]
for col_idx, value in enumerate(example_data, 1):
cell = ws.cell(row=2, column=col_idx, value=value)
cell.font = Font(name='微软雅黑', size=10, color='666666')
cell.border = THIN_BORDER
ws.freeze_panes = 'A2'
return wb
def import_software_from_excel(ws, category_map, operator=None):
"""从Excel导入软件资产,返回结果统计"""
from .models import SoftwareAsset, SoftwareCategory, SoftwareChangeLog
header_row = [cell.value for cell in ws[1]]
field_map = {header: field for field, header, _ in SOFTWARE_EXPORT_COLUMNS}
results = {
'success': 0,
'skipped': 0,
'errors': [],
'total': 0,
}
for row_idx, row in enumerate(ws.iter_rows(min_row=2, values_only=True), 2):
# 跳过完全空白的行(ID 列可以为空)
if not row or all(v is None or str(v).strip() == '' for v in row):
continue
results['total'] += 1
try:
data = {}
for col_idx, value in enumerate(row):
if col_idx < len(header_row):
field = field_map.get(header_row[col_idx])
if field:
data[field] = str(value).strip() if value is not None else ''
# 资产编号必填
asset_number = data.get('asset_number', '').strip()
if not asset_number:
results['errors'].append(f'第{row_idx}行: 缺少资产编号')
continue
# 软件名称必填
sw_name = data.get('name', '').strip()
if not sw_name:
results['errors'].append(f'第{row_idx}行: 缺少软件名称')
continue
# 处理分类 - 不存在则自动创建
category_name = data.get('category', '').strip()
category = category_map.get(category_name)
if not category and category_name:
category = SoftwareCategory.objects.create(name=category_name)
category_map[category_name] = category
elif not category_name:
category = category_map.get('未分类')
if not category:
category = SoftwareCategory.objects.create(name='未分类')
category_map['未分类'] = category
# 许可类型
license_type = SOFTWARE_LICENSE_TYPE_REVERSE.get(
data.get('license_type', '订阅'), 'subscription')
# 状态
status = SOFTWARE_STATUS_MAP_REVERSE.get(data.get('status', '在用'), 'in_use')
# 处理ID - 如果提供了ID且已存在,则更新该记录
import_id = data.get('id', '').strip()
sw_asset = None
if import_id and import_id.isdigit():
try:
sw_asset = SoftwareAsset.objects.get(id=int(import_id))
except (SoftwareAsset.DoesNotExist, ValueError):
sw_asset = None
common_fields = {
'asset_number': asset_number,
'name': sw_name,
'category': category,
'vendor': data.get('vendor', ''),
'version': data.get('version', ''),
'license_type': license_type,
'license_key': data.get('license_key', ''),
'seats': data.get('seats', ''),
'account': data.get('account', ''),
'cost': data.get('cost', ''),
'start_date': data.get('start_date', '').strip(),
'expire_date': data.get('expire_date', '').strip(),
'responsible_person': data.get('responsible_person', ''),
'department': data.get('department', ''),
'status': status,
'remark': data.get('remark', ''),
}
if sw_asset:
# 更新已有记录
for field, value in common_fields.items():
setattr(sw_asset, field, value)
sw_asset.save()
SoftwareChangeLog.objects.create(
software_asset=sw_asset,
asset_number=sw_asset.asset_number,
action='import',
description=f'通过Excel导入更新(ID:{sw_asset.id})',
operator=operator,
)
else:
# 创建新记录
create_kwargs = dict(common_fields)
create_kwargs['created_by'] = operator
if import_id and import_id.isdigit():
create_kwargs['id'] = int(import_id)
sw_asset = SoftwareAsset.objects.create(**create_kwargs)
SoftwareChangeLog.objects.create(
software_asset=sw_asset,
asset_number=sw_asset.asset_number,
action='import',
description='通过Excel导入创建',
operator=operator,
)
results['success'] += 1
except Exception as e:
results['errors'].append(f'第{row_idx}行: {str(e)}')
return results