feat(线缆管理): 新增向导式接线创建功能

- 新增四步向导流程，简化接线创建过程 - 添加线缆标签、颜色、安装信息等新字段 - 实现端口可视化面板和冲突检测功能 - 新增耗材日志设备关联字段 - 添加耗材导入后台任务管理 - 更新线缆管理文档和使用指南
2026-03-31 14:34:34 +08:00
parent 5d972799f2
commit 06e3b56469
16 changed files with 3914 additions and 105 deletions
@@ -257,6 +257,11 @@ router.post('/', async (req, res) => {
      cableLength,
      status,
      description,
+      cableLabel,
+      cableColor,
+      installedBy,
+      installedAt,
+      lastTestedAt,
      force,
    } = req.body;

@@ -321,6 +326,11 @@ router.post('/', async (req, res) => {
      cableLength,
      status: status || 'normal',
      description,
+      cableLabel: cableLabel || null,
+      cableColor: cableColor || null,
+      installedBy: installedBy || null,
+      installedAt: installedAt || null,
+      lastTestedAt: lastTestedAt || null,
    });

    const createdCable = await Cable.findByPk(cable.cableId, {
@@ -0,0 +1,328 @@
+const express = require('express');
+const router = express.Router();
+const { Op } = require('sequelize');
+const { sequelize } = require('../db');
+const Consumable = require('../models/Consumable');
+const ConsumableLog = require('../models/ConsumableLog');
+const { importJobManager } = require('../utils/importJobManager');
+
+const SUPPORTED_FIELDS = [
+  'consumableId',
+  'name',
+  'category',
+  'unit',
+  'currentStock',
+  'minStock',
+  'maxStock',
+  'unitPrice',
+  'supplier',
+  'location',
+  'description',
+  'snList',
+  'status',
+];
+
+const FIELD_ALIASES = {
+  耗材ID: 'consumableId',
+  名称: 'name',
+  分类: 'category',
+  单位: 'unit',
+  当前库存: 'currentStock',
+  最小库存: 'minStock',
+  最大库存: 'maxStock',
+  单价: 'unitPrice',
+  供应商: 'supplier',
+  存放位置: 'location',
+  描述: 'description',
+  SN序列号: 'snList',
+  状态: 'status',
+};
+
+const normalizeFieldName = fieldName => {
+  if (!fieldName) return null;
+  const trimmed = String(fieldName).trim();
+  if (FIELD_ALIASES[trimmed]) {
+    return FIELD_ALIASES[trimmed];
+  }
+  if (SUPPORTED_FIELDS.includes(trimmed)) {
+    return trimmed;
+  }
+  return null;
+};
+
+const parseSnList = snStr => {
+  if (!snStr) return [];
+  if (Array.isArray(snStr)) return snStr;
+  if (typeof snStr === 'string') {
+    return snStr.split(/[,，;；\n]/).map(s => s.trim()).filter(Boolean);
+  }
+  return [];
+};
+
+router.post('/consumables/background', async (req, res) => {
+  const { items, operator = '系统', mode = 'create', fieldMapping = {} } = req.body;
+
+  if (!items || !Array.isArray(items) || items.length === 0) {
+    return res.status(400).json({ error: '没有导入数据' });
+  }
+
+  const jobId = `IMP_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
+  const job = importJobManager.createJob(jobId, 'consumable_import', items.length);
+
+  importJobManager.startJob(jobId);
+
+  setImmediate(async () => {
+    const transaction = await sequelize.transaction();
+    try {
+      const results = {
+        success: 0,
+        failed: 0,
+        updated: 0,
+        skipped: 0,
+        errors: [],
+        details: [],
+      };
+
+      for (let i = 0; i < items.length; i++) {
+        const currentJob = importJobManager.getJob(jobId);
+        if (currentJob && currentJob.status === 'cancelled') {
+          await transaction.rollback();
+          return;
+        }
+
+        const item = items[i];
+        const rowNumber = i + 1;
+
+        try {
+          const mappedItem = {};
+          for (const [sourceField, targetField] of Object.entries(fieldMapping)) {
+            if (sourceField && targetField && item[sourceField] !== undefined) {
+              mappedItem[targetField] = item[sourceField];
+            }
+          }
+
+          for (const [key, value] of Object.entries(item)) {
+            const normalizedField = normalizeFieldName(key);
+            if (normalizedField && mappedItem[normalizedField] === undefined) {
+              mappedItem[normalizedField] = value;
+            }
+          }
+
+          const consumableId =
+            mappedItem.consumableId || mappedItem.name + `_${Date.now()}`;
+          const name = mappedItem.name;
+          const category = mappedItem.category;
+
+          if (!name || !category) {
+            throw new Error('名称和分类为必填项');
+          }
+
+          let snList = [];
+          if (mappedItem.snList) {
+            snList = parseSnList(mappedItem.snList);
+          }
+
+          const consumableData = {
+            consumableId: consumableId || `CON${Date.now()}${i}`,
+            name,
+            category,
+            unit: mappedItem.unit || '个',
+            currentStock:
+              snList.length > 0
+                ? snList.length
+                : parseInt(mappedItem.currentStock) || 0,
+            minStock: parseInt(mappedItem.minStock) || 10,
+            maxStock: parseInt(mappedItem.maxStock) || 0,
+            unitPrice: parseFloat(mappedItem.unitPrice) || 0,
+            supplier: mappedItem.supplier || '',
+            location: mappedItem.location || '',
+            description: mappedItem.description || '',
+            status: mappedItem.status || 'active',
+            snList,
+          };
+
+          let existingConsumable = null;
+          if (consumableData.consumableId) {
+            existingConsumable = await Consumable.findByPk(consumableData.consumableId, {
+              transaction,
+            });
+          }
+
+          let operationType;
+          let previousStock = 0;
+
+          if (existingConsumable) {
+            if (mode === 'update') {
+              previousStock = existingConsumable.currentStock;
+              await existingConsumable.update(consumableData, { transaction });
+              operationType = 'import_update';
+              results.updated++;
+              results.details.push({
+                row: rowNumber,
+                status: 'updated',
+                consumableId: existingConsumable.consumableId,
+                name: existingConsumable.name,
+              });
+            } else {
+              results.skipped++;
+              results.details.push({
+                row: rowNumber,
+                status: 'skipped',
+                reason: '耗材已存在',
+                consumableId: consumableData.consumableId,
+              });
+              importJobManager.incrementProgress(jobId, 0, 0, 1, 0);
+              continue;
+            }
+          } else {
+            await Consumable.create(consumableData, { transaction });
+            operationType = 'import';
+            results.success++;
+            results.details.push({
+              row: rowNumber,
+              status: 'created',
+              consumableId: consumableData.consumableId,
+              name: consumableData.name,
+            });
+          }
+
+          await ConsumableLog.create(
+            {
+              consumableId: consumableData.consumableId,
+              consumableName: consumableData.name,
+              operationType,
+              quantity: consumableData.currentStock,
+              previousStock,
+              currentStock: consumableData.currentStock,
+              operator,
+              reason: '后台批量导入',
+              notes: existingConsumable ? '更新现有耗材' : '',
+              consumableSnapshot: {
+                category: consumableData.category,
+                unit: consumableData.unit,
+                unitPrice: consumableData.unitPrice,
+                supplier: consumableData.supplier,
+                location: consumableData.location,
+                minStock: consumableData.minStock,
+                maxStock: consumableData.maxStock,
+              },
+            },
+            { transaction }
+          );
+
+          importJobManager.incrementProgress(jobId, existingConsumable && mode === 'update' ? 0 : 1, 0, 0, existingConsumable ? 1 : 0);
+        } catch (error) {
+          results.failed++;
+          results.errors.push(`第 ${rowNumber} 行: ${error.message}`);
+          results.details.push({
+            row: rowNumber,
+            status: 'failed',
+            error: error.message,
+          });
+          importJobManager.incrementProgress(jobId, 0, 1, 0, 0);
+        }
+      }
+
+      await transaction.commit();
+      importJobManager.completeJob(jobId, results);
+    } catch (error) {
+      await transaction.rollback();
+      importJobManager.failJob(jobId, error.message);
+    }
+  });
+
+  res.json({
+    jobId,
+    message: '导入任务已创建，正在后台执行',
+    totalItems: items.length,
+  });
+});
+
+router.get('/consumables/progress/:jobId', async (req, res) => {
+  const { jobId } = req.params;
+
+  const progress = importJobManager.getJobProgress(jobId);
+  if (!progress) {
+    return res.status(404).json({ error: '任务不存在' });
+  }
+
+  res.json(progress);
+});
+
+router.post('/consumables/cancel/:jobId', async (req, res) => {
+  const { jobId } = req.params;
+
+  const job = importJobManager.getJob(jobId);
+  if (!job) {
+    return res.status(404).json({ error: '任务不存在' });
+  }
+
+  if (!job.canCancel) {
+    return res.status(400).json({ error: '该任务无法取消' });
+  }
+
+  importJobManager.cancelJob(jobId);
+  res.json({ message: '任务已取消' });
+});
+
+router.get('/consumables/result/:jobId', async (req, res) => {
+  const { jobId } = req.params;
+
+  const job = importJobManager.getJob(jobId);
+  if (!job) {
+    return res.status(404).json({ error: '任务不存在' });
+  }
+
+  if (job.status !== 'completed' && job.status !== 'failed') {
+    return res.status(400).json({ error: '任务尚未完成' });
+  }
+
+  res.json({
+    jobId: job.jobId,
+    status: job.status,
+    result: job.result,
+    error: job.error,
+    completedAt: job.endTime,
+  });
+});
+
+router.get('/consumables/field-mappings', async (req, res) => {
+  const mappings = [
+    { source: '耗材ID', target: 'consumableId', required: false, description: '耗材唯一标识符' },
+    { source: '名称', target: 'name', required: true, description: '耗材名称' },
+    { source: '分类', target: 'category', required: true, description: '耗材分类' },
+    { source: '单位', target: 'unit', required: false, description: '计量单位，默认"个"' },
+    { source: '当前库存', target: 'currentStock', required: false, description: '当前库存数量' },
+    { source: '最小库存', target: 'minStock', required: false, description: '安全库存预警值' },
+    { source: '最大库存', target: 'maxStock', required: false, description: '最大库存限制，0表示无限制' },
+    { source: '单价', target: 'unitPrice', required: false, description: '耗材单价' },
+    { source: '供应商', target: 'supplier', required: false, description: '供应商名称' },
+    { source: '存放位置', target: 'location', required: false, description: '仓库内存放位置' },
+    { source: '描述', target: 'description', required: false, description: '耗材详细描述' },
+    { source: 'SN序列号', target: 'snList', required: false, description: '序列号列表，用逗号分隔' },
+    { source: '状态', target: 'status', required: false, description: '状态：active启用，inactive停用' },
+  ];
+
+  const systemFields = [
+    { name: 'consumableId', type: 'string', description: '耗材唯一标识符' },
+    { name: 'name', type: 'string', description: '耗材名称' },
+    { name: 'category', type: 'string', description: '耗材分类' },
+    { name: 'unit', type: 'string', description: '计量单位' },
+    { name: 'currentStock', type: 'number', description: '当前库存数量' },
+    { name: 'minStock', type: 'number', description: '最小库存（预警线）' },
+    { name: 'maxStock', type: 'number', description: '最大库存限制' },
+    { name: 'unitPrice', type: 'number', description: '单价' },
+    { name: 'supplier', type: 'string', description: '供应商' },
+    { name: 'location', type: 'string', description: '存放位置' },
+    { name: 'description', type: 'text', description: '描述' },
+    { name: 'snList', type: 'array', description: 'SN序列号数组' },
+    { name: 'status', type: 'string', description: '状态' },
+  ];
+
+  res.json({
+    aliases: mappings,
+    systemFields,
+  });
+});
+
+module.exports = router;
@@ -459,7 +459,16 @@ router.post('/quick-inout', async (req, res) => {
  while (attempt < RETRY.MAX_RETRIES) {
    const transaction = await sequelize.transaction();
    try {
-      const { consumableId, type, quantity, operator, reason, notes, snList } = req.body;
+      const {
+        consumableId,
+        type,
+        quantity,
+        operator,
+        reason,
+        notes,
+        snList,
+        deviceId,
+      } = req.body;

      const consumable = await Consumable.findByPk(consumableId, { transaction });
      if (!consumable) {
@@ -467,6 +476,39 @@ router.post('/quick-inout', async (req, res) => {
        return res.status(404).json({ error: '耗材不存在' });
      }

+      let deviceInfo = {};
+      if (deviceId && type === 'out') {
+        const Device = require('../models/Device');
+        const Rack = require('../models/Rack');
+        const Room = require('../models/Room');
+
+        const device = await Device.findByPk(deviceId, { transaction });
+        if (device) {
+          deviceInfo = {
+            deviceId: device.deviceId,
+            deviceName: device.name,
+            rackId: device.rackId,
+            rackName: null,
+            roomId: null,
+            roomName: null,
+          };
+
+          if (device.rackId) {
+            const rack = await Rack.findByPk(device.rackId, { transaction });
+            if (rack) {
+              deviceInfo.rackName = rack.name;
+              if (rack.roomId) {
+                const room = await Room.findByPk(rack.roomId, { transaction });
+                if (room) {
+                  deviceInfo.roomId = room.roomId;
+                  deviceInfo.roomName = room.name;
+                }
+              }
+            }
+          }
+        }
+      }
+
      const previousStock = parseFloat(consumable.currentStock);
      let newStock;
      const currentSnList = consumable.snList || [];
@@ -554,6 +596,12 @@ router.post('/quick-inout', async (req, res) => {
          notes,
          isEditable: false,
          snList: operationSnList,
+          deviceId: deviceInfo.deviceId || null,
+          deviceName: deviceInfo.deviceName || null,
+          rackId: deviceInfo.rackId || null,
+          rackName: deviceInfo.rackName || null,
+          roomId: deviceInfo.roomId || null,
+          roomName: deviceInfo.roomName || null,
          consumableSnapshot: {
            category: consumable.category,
            unit: consumable.unit,
@@ -571,6 +619,7 @@ router.post('/quick-inout', async (req, res) => {
        message: '操作成功',
        record,
        consumable: await Consumable.findByPk(consumableId),
+        deviceInfo: Object.keys(deviceInfo).length > 0 ? deviceInfo : null,
      });
      return;
    } catch (error) {
@@ -589,7 +638,18 @@ router.post('/inout', async (req, res) => {
  while (attempt < RETRY.MAX_RETRIES) {
    const transaction = await sequelize.transaction();
    try {
-      const { consumableId, type, quantity, operator, reason, recipient, notes, snList } = req.body;
+      const {
+        consumableId,
+        type,
+        quantity,
+        operator,
+        reason,
+        recipient,
+        notes,
+        snList,
+        deviceId,
+        deviceName,
+      } = req.body;

      const consumable = await Consumable.findByPk(consumableId, { transaction });
      if (!consumable) {
@@ -597,6 +657,39 @@ router.post('/inout', async (req, res) => {
        return res.status(404).json({ error: '耗材不存在' });
      }

+      let deviceInfo = {};
+      if (deviceId && type === 'out') {
+        const Device = require('../models/Device');
+        const Rack = require('../models/Rack');
+        const Room = require('../models/Room');
+
+        const device = await Device.findByPk(deviceId, { transaction });
+        if (device) {
+          deviceInfo = {
+            deviceId: device.deviceId,
+            deviceName: device.name,
+            rackId: device.rackId,
+            rackName: null,
+            roomId: null,
+            roomName: null,
+          };
+
+          if (device.rackId) {
+            const rack = await Rack.findByPk(device.rackId, { transaction });
+            if (rack) {
+              deviceInfo.rackName = rack.name;
+              if (rack.roomId) {
+                const room = await Room.findByPk(rack.roomId, { transaction });
+                if (room) {
+                  deviceInfo.roomId = room.roomId;
+                  deviceInfo.roomName = room.name;
+                }
+              }
+            }
+          }
+        }
+      }
+
      const previousStock = parseFloat(consumable.currentStock);
      let newStock;
      const currentSnList = consumable.snList || [];
@@ -682,6 +775,12 @@ router.post('/inout', async (req, res) => {
          notes,
          isEditable: false,
          snList: operationSnList,
+          deviceId: deviceInfo.deviceId || null,
+          deviceName: deviceInfo.deviceName || null,
+          rackId: deviceInfo.rackId || null,
+          rackName: deviceInfo.rackName || null,
+          roomId: deviceInfo.roomId || null,
+          roomName: deviceInfo.roomName || null,
          consumableSnapshot: {
            category: consumable.category,
            unit: consumable.unit,
@@ -699,6 +798,7 @@ router.post('/inout', async (req, res) => {
        message: '操作成功',
        record,
        consumable: await Consumable.findByPk(consumableId),
+        deviceInfo: Object.keys(deviceInfo).length > 0 ? deviceInfo : null,
      });
      return;
    } catch (error) {
@@ -1314,4 +1414,97 @@ router.get('/logs/:id/history', async (req, res) => {
  }
 });

+router.get('/devices/search', async (req, res) => {
+  try {
+    const { keyword, limit = 20 } = req.query;
+
+    if (!keyword) {
+      return res.json({ devices: [] });
+    }
+
+    const Device = require('../models/Device');
+    const Rack = require('../models/Rack');
+    const Room = require('../models/Room');
+
+    const escapedKeyword = keyword.replace(/'/g, "''");
+
+    const devices = await Device.findAll({
+      where: {
+        [Op.or]: [
+          { deviceId: { [Op.like]: `%${escapedKeyword}%` } },
+          { name: { [Op.like]: `%${escapedKeyword}%` } },
+          { serialNumber: { [Op.like]: `%${escapedKeyword}%` } },
+        ],
+      },
+      include: [
+        {
+          model: Rack,
+          as: 'rack',
+          include: [{ model: Room, as: 'room' }],
+        },
+      ],
+      limit: parseInt(limit),
+      order: [['name', 'ASC']],
+    });
+
+    const result = devices.map(device => ({
+      deviceId: device.deviceId,
+      name: device.name,
+      type: device.type,
+      model: device.model,
+      serialNumber: device.serialNumber,
+      status: device.status,
+      location: device.rack
+        ? {
+            rackId: device.rack.rackId,
+            rackName: device.rack.name,
+            roomId: device.rack.room ? device.rack.room.roomId : null,
+            roomName: device.rack.room ? device.rack.room.name : null,
+          }
+        : null,
+    }));
+
+    res.json({ devices: result });
+  } catch (error) {
+    console.error('搜索设备失败:', error);
+    res.status(500).json({ error: error.message });
+  }
+});
+
+router.get('/devices/by-sn/:sn', async (req, res) => {
+  try {
+    const { sn } = req.params;
+    const Device = require('../models/Device');
+
+    const device = await Device.findOne({
+      where: {
+        [Op.or]: [
+          { deviceId: { [Op.like]: `%${sn}%` } },
+          { serialNumber: { [Op.like]: `%${sn}%` } },
+          { name: { [Op.like]: `%${sn}%` } },
+        ],
+      },
+    });
+
+    if (!device) {
+      return res.json({ found: false, device: null });
+    }
+
+    res.json({
+      found: true,
+      device: {
+        deviceId: device.deviceId,
+        name: device.name,
+        type: device.type,
+        model: device.model,
+        serialNumber: device.serialNumber,
+        status: device.status,
+      },
+    });
+  } catch (error) {
+    console.error('查询设备失败:', error);
+    res.status(500).json({ error: error.message });
+  }
+});
+
 module.exports = router;