b24014/ITAM-test
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 동적 디스크 확장 기능 및 하드웨어 카테고리 필터링 고도화

Browse Source
This commit is contained in:
이태훈
2026-06-09 16:29:54 +09:00
parent 4b408b0640
commit 2b9c965c91
9 changed files with 275 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
server.js
View File

@@ -116,11 +116,10 @@ app.get('/api/assets/master', async (req, res) => {
s.monitoring, s.price, s.monitor_inch, s.serial_num,
l.location, l.location_detail, l.location_photo, l.loc_x, l.loc_y,
n.ip_address, n.mac_address, n.remote_tool, n.remote_id, n.remote_pw,
(SELECT CONCAT(capacity, unit) FROM asset_volume WHERE asset_id = c.id AND disk_type = 'SSD' AND slot_no = 1 LIMIT 1) as ssd_1,
(SELECT CONCAT(capacity, unit) FROM asset_volume WHERE asset_id = c.id AND disk_type = 'SSD' AND slot_no = 2 LIMIT 1) as ssd_2,
(SELECT CONCAT(capacity, unit) FROM asset_volume WHERE asset_id = c.id AND disk_type = 'HDD' AND slot_no = 1 LIMIT 1) as hdd_1,
(SELECT CONCAT(capacity, unit) FROM asset_volume WHERE asset_id = c.id AND disk_type = 'HDD' AND slot_no = 2 LIMIT 1) as hdd_2,
(SELECT GROUP_CONCAT(CONCAT(disk_type, ': ', capacity, unit) SEPARATOR ', ') FROM asset_volume WHERE asset_id = c.id) as volume_summary
(
SELECT JSON_ARRAYAGG(JSON_OBJECT('type', disk_type, 'capacity', capacity, 'unit', unit, 'slot', slot_no))
FROM asset_volume WHERE asset_id = c.id
) as volumes
FROM asset_core c
LEFT JOIN asset_spec s ON c.id = s.asset_id
LEFT JOIN asset_location l ON l.id = (
@@ -194,26 +193,23 @@ app.post('/api/asset/:category/save', async (req, res) => {
await connection.query(`INSERT INTO asset_spec (${specKeys.join(', ')}) VALUES (${specKeys.map(() => '?').join(', ')})`, Object.values(specData));
}
// 3.3 asset_volume (Legacy Parser)
const parseCapacity = (str) => {
if (!str || str.trim() === '' || str.toLowerCase() === 'null') return null;
const match = str.match(/(\d+(?:\.\d+)?)\s*([GT]B)?/i);
if (match) return { value: parseFloat(match[1]), unit: (match[2] || 'GB').toUpperCase() };
return null;
};
const storages = [
{ val: asset.ssd_1, type: 'SSD', slot: 1 },
{ val: asset.ssd_2, type: 'SSD', slot: 2 },
{ val: asset.hdd_1, type: 'HDD', slot: 1 },
{ val: asset.hdd_2, type: 'HDD', slot: 2 }
];
// 3.3 asset_volume
await connection.query('DELETE FROM asset_volume WHERE asset_id = ?', [asset.id]);
for (const s of storages) {
const parsed = parseCapacity(s.val);
if (parsed) {
await connection.query('INSERT INTO asset_volume (asset_id, disk_type, capacity, unit, slot_no) VALUES (?, ?, ?, ?, ?)',
[asset.id, s.type, parsed.value, parsed.unit, s.slot]);
}
if (asset.volumes) {
try {
let vols = typeof asset.volumes === 'string' ? JSON.parse(asset.volumes) : asset.volumes;
if (Array.isArray(vols)) {
for (let i = 0; i < vols.length; i++) {
const v = vols[i];
if (v.type && v.capacity) {
await connection.query(
'INSERT INTO asset_volume (asset_id, disk_type, capacity, unit, slot_no) VALUES (?, ?, ?, ?, ?)',
[asset.id, v.type, v.capacity, v.unit || 'GB', v.slot || (i + 1)]
);
}
}
}
} catch(e) { console.error('Volume parse error', e); }
}
// 3.4 asset_location