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
+372 -2
View File
@@ -11,11 +11,14 @@ from openpyxl import load_workbook
from io import BytesIO
from datetime import date, timedelta
from .models import Asset, Category, AssetChangeLog
from .forms import AssetForm, AssetImportForm, CategoryForm, AdminPasswordResetForm
from .models import Asset, Category, AssetChangeLog, SoftwareAsset, SoftwareCategory, SoftwareChangeLog
from .forms import (AssetForm, AssetImportForm, CategoryForm, AdminPasswordResetForm,
SoftwareAssetForm, SoftwareCategoryForm)
from .excel_utils import (
export_assets_to_excel, generate_import_template,
import_assets_from_excel, STATUS_MAP,
export_software_assets_to_excel, generate_software_import_template,
import_software_from_excel, SOFTWARE_STATUS_MAP,
)
@@ -71,6 +74,25 @@ def dashboard(request):
# 最近变更
recent_changes = AssetChangeLog.objects.select_related('operator')[:10]
# 软件资产统计(软资产)
total_software = SoftwareAsset.objects.count()
software_status_stats = SoftwareAsset.objects.values('status').annotate(count=Count('id'))
software_status_data = {item['status']: item['count'] for item in software_status_stats}
software_category_stats = SoftwareAsset.objects.values('category__name').annotate(
count=Count('id')).order_by('-count')
software_license_stats = SoftwareAsset.objects.values('license_type').annotate(count=Count('id'))
software_license_data = {item['license_type']: item['count'] for item in software_license_stats}
sw_expiring_soon = SoftwareAsset.objects.filter(
expire_date__lte=today + timedelta(days=30),
expire_date__gte=today,
status='in_use',
).count()
sw_expired = SoftwareAsset.objects.filter(
expire_date__lt=today,
status='in_use',
).count()
recent_software_changes = SoftwareChangeLog.objects.select_related('operator')[:10]
context = {
'total_assets': total_assets,
'status_data': status_data,
@@ -79,6 +101,14 @@ def dashboard(request):
'expiring_soon': expiring_soon,
'expired': expired,
'recent_changes': recent_changes,
'total_software': total_software,
'software_status_data': software_status_data,
'software_category_stats': software_category_stats,
'sw_expiring_soon': sw_expiring_soon,
'sw_expired': sw_expired,
'recent_software_changes': recent_software_changes,
'software_status_map': SOFTWARE_STATUS_MAP,
'software_license_data': software_license_data,
}
return render(request, 'assetapp/dashboard.html', context)
@@ -519,3 +549,343 @@ def admin_password_reset(request, pk):
context = {'form': form, 'target_user': target_user}
return render(request, 'assetapp/user_password_reset.html', context)
# ─── 软件资产(软资产)管理 ─────────────────────────
SOFTWARE_LICENSE_TYPE_LABELS = {
'permanent': '永久授权', 'subscription': '订阅',
'open_source': '开源免费', 'pay_as_you_go': '按需付费',
}
@login_required
def software_list(request):
queryset = SoftwareAsset.objects.select_related('category')
# 搜索
search = request.GET.get('search', '').strip()
if search:
queryset = queryset.filter(
Q(asset_number__icontains=search) |
Q(name__icontains=search) |
Q(vendor__icontains=search) |
Q(version__icontains=search) |
Q(license_key__icontains=search) |
Q(account__icontains=search) |
Q(responsible_person__icontains=search) |
Q(department__icontains=search)
)
# 筛选
category_id = request.GET.get('category')
if category_id:
queryset = queryset.filter(category_id=category_id)
status = request.GET.get('status')
if status:
queryset = queryset.filter(status=status)
license_type = request.GET.get('license_type')
if license_type:
queryset = queryset.filter(license_type=license_type)
department = request.GET.get('department')
if department:
queryset = queryset.filter(department__icontains=department)
# 排序
sort = request.GET.get('sort', 'id')
valid_sorts = ['id', '-id', 'asset_number', '-asset_number', 'name', '-name',
'expire_date', '-expire_date', 'created_at', '-created_at']
if sort not in valid_sorts:
sort = 'id'
queryset = queryset.order_by(sort)
# 分页
paginator = Paginator(queryset, settings.ASSETS_PER_PAGE)
page_obj = paginator.get_page(request.GET.get('page', 1))
categories = SoftwareCategory.objects.all()
departments = sorted(set(
SoftwareAsset.objects.values_list('department', flat=True)
.exclude(department='')
.exclude(department=None)
))
# 导出链接附带当前筛选
export_params = []
if search:
export_params.append(f'search={search}')
if category_id:
export_params.append(f'category={category_id}')
if status:
export_params.append(f'status={status}')
query_string = '?' + '&'.join(export_params) if export_params else ''
context = {
'page_obj': page_obj,
'search': search,
'categories': categories,
'current_category': category_id,
'current_status': status,
'current_license_type': license_type,
'current_department': department,
'departments': departments,
'license_type_map': SOFTWARE_LICENSE_TYPE_LABELS,
'status_map': SOFTWARE_STATUS_MAP,
'sort': sort,
'query_string': query_string,
}
return render(request, 'assetapp/software_list.html', context)
@login_required
def software_detail(request, pk):
sw_asset = get_object_or_404(
SoftwareAsset.objects.select_related('category', 'created_by'), pk=pk)
change_logs = sw_asset.change_logs.select_related('operator')[:20]
context = {
'sw_asset': sw_asset,
'change_logs': change_logs,
'status_map': SOFTWARE_STATUS_MAP,
'license_type_map': SOFTWARE_LICENSE_TYPE_LABELS,
}
return render(request, 'assetapp/software_detail.html', context)
@login_required
def software_create(request):
if request.method == 'POST':
form = SoftwareAssetForm(request.POST)
if form.is_valid():
sw_asset = form.save(commit=False)
sw_asset.created_by = request.user
sw_asset.save()
SoftwareChangeLog.objects.create(
software_asset=sw_asset,
asset_number=sw_asset.asset_number,
action='create',
description='创建软件资产',
operator=request.user,
)
messages.success(request, f'软件资产 {sw_asset.asset_number} 创建成功!')
return redirect('software_detail', pk=sw_asset.pk)
else:
form = SoftwareAssetForm()
context = {'form': form, 'action': 'create'}
return render(request, 'assetapp/software_form.html', context)
@login_required
def software_update(request, pk):
sw_asset = get_object_or_404(SoftwareAsset, pk=pk)
if request.method == 'POST':
form = SoftwareAssetForm(request.POST, instance=sw_asset)
if form.is_valid():
# 记录变更
for field in form.changed_data:
SoftwareChangeLog.objects.create(
software_asset=sw_asset,
asset_number=sw_asset.asset_number,
action='update',
field_name=field,
old_value=str(form.initial.get(field, '')),
new_value=str(form.cleaned_data.get(field, '')),
operator=request.user,
)
sw_asset = form.save()
if form.changed_data:
messages.success(request, f'已更新 {len(form.changed_data)} 个字段')
return redirect('software_detail', pk=sw_asset.pk)
else:
form = SoftwareAssetForm(instance=sw_asset)
context = {'form': form, 'action': 'update', 'sw_asset': sw_asset}
return render(request, 'assetapp/software_form.html', context)
@login_required
def software_delete(request, pk):
sw_asset = get_object_or_404(SoftwareAsset, pk=pk)
if request.method == 'POST':
SoftwareChangeLog.objects.create(
asset_number=sw_asset.asset_number,
action='delete',
description=f'删除软件资产: {sw_asset.name}',
operator=request.user,
)
sw_asset.delete()
messages.success(request, f'软件资产 {sw_asset.asset_number} 已删除')
return redirect('software_list')
context = {'sw_asset': sw_asset}
return render(request, 'assetapp/software_confirm_delete.html', context)
@login_required
def software_export(request):
queryset = SoftwareAsset.objects.select_related('category')
category_id = request.GET.get('category')
if category_id:
queryset = queryset.filter(category_id=category_id)
status = request.GET.get('status')
if status:
queryset = queryset.filter(status=status)
wb = export_software_assets_to_excel(queryset)
output = BytesIO()
wb.save(output)
output.seek(0)
SoftwareChangeLog.objects.create(
asset_number='-',
action='export',
description=f'导出 {queryset.count()} 条软件资产记录',
operator=request.user,
)
today_str = date.today().strftime('%Y%m%d')
response = HttpResponse(
output.read(),
content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
)
response['Content-Disposition'] = f'attachment; filename=软件资产_{today_str}.xlsx'
return response
@login_required
def software_import(request):
if request.method == 'POST':
form = AssetImportForm(request.POST, request.FILES)
if form.is_valid():
try:
wb = load_workbook(request.FILES['excel_file'])
ws = wb.active
category_map = {c.name: c for c in SoftwareCategory.objects.all()}
results = import_software_from_excel(ws, category_map, operator=request.user)
if results['success'] > 0:
messages.success(request, f"成功导入 {results['success']} 条软件资产")
if results['skipped'] > 0:
messages.warning(request, f"跳过 {results['skipped']} 条")
if results['errors']:
for error in results['errors'][:10]:
messages.error(request, error)
if len(results['errors']) > 10:
messages.error(request, f"...还有 {len(results['errors']) - 10} 条错误")
except Exception as e:
messages.error(request, f'导入失败: {str(e)}')
return redirect('software_list')
else:
form = AssetImportForm()
return render(request, 'assetapp/software_import.html', {'form': form})
@login_required
def download_software_template(request):
wb = generate_software_import_template()
output = BytesIO()
wb.save(output)
output.seek(0)
response = HttpResponse(
output.read(),
content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
)
response['Content-Disposition'] = 'attachment; filename=软件资产导入模板.xlsx'
return response
@login_required
def software_change_log_list(request):
logs = SoftwareChangeLog.objects.select_related('operator', 'software_asset')
asset_number = request.GET.get('asset_number', '').strip()
if asset_number:
logs = logs.filter(asset_number__icontains=asset_number)
action = request.GET.get('action')
if action:
logs = logs.filter(action=action)
paginator = Paginator(logs, 30)
page_obj = paginator.get_page(request.GET.get('page', 1))
context = {
'page_obj': page_obj,
'asset_number': asset_number,
'current_action': action,
}
return render(request, 'assetapp/software_changelog.html', context)
# ─── 软件分类管理 ──────────────────────────────────
@login_required
def software_category_list(request):
categories = SoftwareCategory.objects.annotate(
sw_count=Count('software_assets')).order_by('name')
return render(request, 'assetapp/software_category_list.html', {'categories': categories})
@login_required
def software_category_create(request):
if request.method == 'POST':
form = SoftwareCategoryForm(request.POST)
if form.is_valid():
form.save()
messages.success(request, f'软件分类 "{form.instance.name}" 创建成功')
return redirect('software_category_list')
else:
form = SoftwareCategoryForm()
return render(request, 'assetapp/software_category_form.html', {'form': form, 'action': 'create'})
@login_required
def software_category_update(request, pk):
category = get_object_or_404(SoftwareCategory, pk=pk)
if request.method == 'POST':
form = SoftwareCategoryForm(request.POST, instance=category)
if form.is_valid():
form.save()
messages.success(request, f'软件分类 "{category.name}" 已更新')
return redirect('software_category_list')
else:
form = SoftwareCategoryForm(instance=category)
return render(request, 'assetapp/software_category_form.html',
{'form': form, 'action': 'update', 'category': category})
@login_required
def software_category_delete(request, pk):
category = get_object_or_404(SoftwareCategory, pk=pk)
sw_count = category.software_assets.count()
if sw_count > 0:
messages.error(request, f'软件分类 "{category.name}" 下还有 {sw_count} 个软件资产,无法删除')
return redirect('software_category_list')
if request.method == 'POST':
category.delete()
messages.success(request, f'软件分类 "{category.name}" 已删除')
return redirect('software_category_list')
return render(request, 'assetapp/software_category_confirm_delete.html', {'category': category})