diff --git a/api.hyungi.net/config/routes.js b/api.hyungi.net/config/routes.js index c56ad62..44200ef 100644 --- a/api.hyungi.net/config/routes.js +++ b/api.hyungi.net/config/routes.js @@ -51,6 +51,8 @@ function setupRoutes(app) { const workIssueRoutes = require('../routes/workIssueRoutes'); const departmentRoutes = require('../routes/departmentRoutes'); const patrolRoutes = require('../routes/patrolRoutes'); + const notificationRoutes = require('../routes/notificationRoutes'); + const notificationRecipientRoutes = require('../routes/notificationRecipientRoutes'); // Rate Limiters 설정 const rateLimit = require('express-rate-limit'); @@ -157,6 +159,8 @@ function setupRoutes(app) { app.use('/api/work-issues', workIssueRoutes); // 문제 신고 시스템 app.use('/api/departments', departmentRoutes); // 부서 관리 app.use('/api/patrol', patrolRoutes); // 일일순회점검 시스템 + app.use('/api/notifications', notificationRoutes); // 알림 시스템 + app.use('/api/notification-recipients', notificationRecipientRoutes); // 알림 수신자 설정 app.use('/api', uploadBgRoutes); // Swagger API 문서 diff --git a/api.hyungi.net/controllers/equipmentController.js b/api.hyungi.net/controllers/equipmentController.js index 6ed666b..896eb75 100644 --- a/api.hyungi.net/controllers/equipmentController.js +++ b/api.hyungi.net/controllers/equipmentController.js @@ -903,6 +903,42 @@ const EquipmentController = { message: '서버 오류가 발생했습니다.' }); } + }, + + // ADD REPAIR CATEGORY - 새 수리 항목 추가 + addRepairCategory: (req, res) => { + try { + const { item_name } = req.body; + + if (!item_name || !item_name.trim()) { + return res.status(400).json({ + success: false, + message: '수리 유형 이름을 입력하세요.' + }); + } + + EquipmentModel.addRepairCategory(item_name.trim(), (error, result) => { + if (error) { + console.error('수리 항목 추가 오류:', error); + return res.status(500).json({ + success: false, + message: '수리 항목 추가 중 오류가 발생했습니다.' + }); + } + + res.status(201).json({ + success: true, + message: result.isNew ? '새 수리 유형이 추가되었습니다.' : '기존 수리 유형을 사용합니다.', + data: result + }); + }); + } catch (error) { + console.error('수리 항목 추가 오류:', error); + res.status(500).json({ + success: false, + message: '서버 오류가 발생했습니다.' + }); + } } }; diff --git a/api.hyungi.net/controllers/notificationController.js b/api.hyungi.net/controllers/notificationController.js new file mode 100644 index 0000000..2863a19 --- /dev/null +++ b/api.hyungi.net/controllers/notificationController.js @@ -0,0 +1,165 @@ +// controllers/notificationController.js +const notificationModel = require('../models/notificationModel'); + +const notificationController = { + // 읽지 않은 알림 조회 + async getUnread(req, res) { + try { + const userId = req.user?.id || null; + const notifications = await notificationModel.getUnread(userId); + + res.json({ + success: true, + data: notifications + }); + } catch (error) { + console.error('읽지 않은 알림 조회 오류:', error); + res.status(500).json({ + success: false, + message: '알림 조회 중 오류가 발생했습니다.' + }); + } + }, + + // 전체 알림 조회 + async getAll(req, res) { + try { + const userId = req.user?.id || null; + const page = parseInt(req.query.page) || 1; + const limit = parseInt(req.query.limit) || 20; + + const result = await notificationModel.getAll(userId, page, limit); + + res.json({ + success: true, + data: result.notifications, + pagination: { + total: result.total, + page: result.page, + limit: result.limit, + totalPages: Math.ceil(result.total / result.limit) + } + }); + } catch (error) { + console.error('알림 목록 조회 오류:', error); + res.status(500).json({ + success: false, + message: '알림 조회 중 오류가 발생했습니다.' + }); + } + }, + + // 읽지 않은 알림 개수 + async getUnreadCount(req, res) { + try { + const userId = req.user?.id || null; + const count = await notificationModel.getUnreadCount(userId); + + res.json({ + success: true, + data: { count } + }); + } catch (error) { + console.error('알림 개수 조회 오류:', error); + res.status(500).json({ + success: false, + message: '알림 개수 조회 중 오류가 발생했습니다.' + }); + } + }, + + // 알림 읽음 처리 + async markAsRead(req, res) { + try { + const { id } = req.params; + const success = await notificationModel.markAsRead(id); + + res.json({ + success, + message: success ? '알림을 읽음 처리했습니다.' : '알림을 찾을 수 없습니다.' + }); + } catch (error) { + console.error('알림 읽음 처리 오류:', error); + res.status(500).json({ + success: false, + message: '알림 처리 중 오류가 발생했습니다.' + }); + } + }, + + // 모든 알림 읽음 처리 + async markAllAsRead(req, res) { + try { + const userId = req.user?.id || null; + const count = await notificationModel.markAllAsRead(userId); + + res.json({ + success: true, + message: `${count}개의 알림을 읽음 처리했습니다.`, + data: { count } + }); + } catch (error) { + console.error('전체 읽음 처리 오류:', error); + res.status(500).json({ + success: false, + message: '알림 처리 중 오류가 발생했습니다.' + }); + } + }, + + // 알림 삭제 + async delete(req, res) { + try { + const { id } = req.params; + const success = await notificationModel.delete(id); + + res.json({ + success, + message: success ? '알림을 삭제했습니다.' : '알림을 찾을 수 없습니다.' + }); + } catch (error) { + console.error('알림 삭제 오류:', error); + res.status(500).json({ + success: false, + message: '알림 삭제 중 오류가 발생했습니다.' + }); + } + }, + + // 알림 생성 (시스템용) + async create(req, res) { + try { + const { type, title, message, link_url, user_id } = req.body; + + if (!title) { + return res.status(400).json({ + success: false, + message: '알림 제목은 필수입니다.' + }); + } + + const notificationId = await notificationModel.create({ + user_id, + type, + title, + message, + link_url, + created_by: req.user?.id + }); + + res.json({ + success: true, + message: '알림이 생성되었습니다.', + data: { notification_id: notificationId } + }); + } catch (error) { + console.error('알림 생성 오류:', error); + res.status(500).json({ + success: false, + message: '알림 생성 중 오류가 발생했습니다.' + }); + } + } +}; + +module.exports = notificationController; diff --git a/api.hyungi.net/controllers/notificationRecipientController.js b/api.hyungi.net/controllers/notificationRecipientController.js new file mode 100644 index 0000000..e3b4a00 --- /dev/null +++ b/api.hyungi.net/controllers/notificationRecipientController.js @@ -0,0 +1,91 @@ +// controllers/notificationRecipientController.js +const notificationRecipientModel = require('../models/notificationRecipientModel'); + +const notificationRecipientController = { + // 알림 유형 목록 + getTypes: async (req, res) => { + try { + const types = notificationRecipientModel.getTypes(); + res.json({ success: true, data: types }); + } catch (error) { + console.error('알림 유형 조회 오류:', error); + res.status(500).json({ success: false, error: '알림 유형 조회 실패' }); + } + }, + + // 전체 수신자 목록 (유형별 그룹화) + getAll: async (req, res) => { + try { + console.log('🔔 알림 수신자 목록 조회 시작'); + const recipients = await notificationRecipientModel.getAll(); + console.log('✅ 알림 수신자 목록 조회 완료:', recipients); + res.json({ success: true, data: recipients }); + } catch (error) { + console.error('❌ 수신자 목록 조회 오류:', error.message); + console.error('❌ 스택:', error.stack); + res.status(500).json({ success: false, error: '수신자 목록 조회 실패', detail: error.message }); + } + }, + + // 유형별 수신자 조회 + getByType: async (req, res) => { + try { + const { type } = req.params; + const recipients = await notificationRecipientModel.getByType(type); + res.json({ success: true, data: recipients }); + } catch (error) { + console.error('수신자 조회 오류:', error); + res.status(500).json({ success: false, error: '수신자 조회 실패' }); + } + }, + + // 수신자 추가 + add: async (req, res) => { + try { + const { notification_type, user_id } = req.body; + + if (!notification_type || !user_id) { + return res.status(400).json({ success: false, error: '알림 유형과 사용자 ID가 필요합니다.' }); + } + + await notificationRecipientModel.add(notification_type, user_id, req.user?.user_id); + res.json({ success: true, message: '수신자가 추가되었습니다.' }); + } catch (error) { + console.error('수신자 추가 오류:', error); + res.status(500).json({ success: false, error: '수신자 추가 실패' }); + } + }, + + // 수신자 제거 + remove: async (req, res) => { + try { + const { type, userId } = req.params; + + await notificationRecipientModel.remove(type, userId); + res.json({ success: true, message: '수신자가 제거되었습니다.' }); + } catch (error) { + console.error('수신자 제거 오류:', error); + res.status(500).json({ success: false, error: '수신자 제거 실패' }); + } + }, + + // 유형별 수신자 일괄 설정 + setRecipients: async (req, res) => { + try { + const { type } = req.params; + const { user_ids } = req.body; + + if (!Array.isArray(user_ids)) { + return res.status(400).json({ success: false, error: 'user_ids 배열이 필요합니다.' }); + } + + await notificationRecipientModel.setRecipients(type, user_ids, req.user?.user_id); + res.json({ success: true, message: '수신자가 설정되었습니다.' }); + } catch (error) { + console.error('수신자 설정 오류:', error); + res.status(500).json({ success: false, error: '수신자 설정 실패' }); + } + } +}; + +module.exports = notificationRecipientController; diff --git a/api.hyungi.net/db/migrations/20260204001000_create_notification_recipients.sql b/api.hyungi.net/db/migrations/20260204001000_create_notification_recipients.sql new file mode 100644 index 0000000..7c4e5e9 --- /dev/null +++ b/api.hyungi.net/db/migrations/20260204001000_create_notification_recipients.sql @@ -0,0 +1,23 @@ +-- 알림 수신자 설정 테이블 +-- 알림 유형별로 지정된 사용자에게만 알림이 전송됨 + +CREATE TABLE IF NOT EXISTS notification_recipients ( + id INT AUTO_INCREMENT PRIMARY KEY, + notification_type ENUM('repair', 'safety', 'nonconformity', 'equipment', 'maintenance', 'system') NOT NULL COMMENT '알림 유형', + user_id INT NOT NULL COMMENT '수신자 ID', + is_active BOOLEAN DEFAULT TRUE COMMENT '활성 여부', + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + created_by INT NULL COMMENT '등록자', + UNIQUE KEY unique_type_user (notification_type, user_id), + FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE, + INDEX idx_nr_type (notification_type), + INDEX idx_nr_active (is_active) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='알림 수신자 설정'; + +-- 알림 유형 설명: +-- repair: 설비 수리 신청 +-- safety: 안전 신고 +-- nonconformity: 부적합 신고 +-- equipment: 설비 관련 +-- maintenance: 정기점검 +-- system: 시스템 알림 diff --git a/api.hyungi.net/db/migrations/20260205004000_create_notifications.sql b/api.hyungi.net/db/migrations/20260205004000_create_notifications.sql new file mode 100644 index 0000000..a1ca15e --- /dev/null +++ b/api.hyungi.net/db/migrations/20260205004000_create_notifications.sql @@ -0,0 +1,46 @@ +-- 알림 시스템 테이블 생성 +-- 실행: docker exec -i tkfb_db mysql -u hyungi -p'your_password' hyungi < db/migrations/20260205004000_create_notifications.sql + +-- ============================================ +-- STEP 1: notifications 테이블 생성 +-- ============================================ + +CREATE TABLE IF NOT EXISTS notifications ( + notification_id INT AUTO_INCREMENT PRIMARY KEY, + user_id INT NULL COMMENT '특정 사용자에게만 표시 (NULL이면 전체)', + type ENUM('repair', 'safety', 'system', 'equipment', 'maintenance') NOT NULL DEFAULT 'system', + title VARCHAR(200) NOT NULL, + message TEXT, + link_url VARCHAR(500) COMMENT '클릭시 이동할 URL', + reference_type VARCHAR(50) COMMENT '연관 테이블 (equipment_repair_requests 등)', + reference_id INT COMMENT '연관 레코드 ID', + is_read BOOLEAN DEFAULT FALSE, + read_at DATETIME NULL, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + created_by INT NULL, + INDEX idx_notifications_user (user_id), + INDEX idx_notifications_type (type), + INDEX idx_notifications_is_read (is_read), + INDEX idx_notifications_created (created_at DESC) +); + +-- 수리 요청 테이블 수정 (알림 연동을 위해) +-- equipment_repair_requests 테이블이 없으면 생성 +CREATE TABLE IF NOT EXISTS equipment_repair_requests ( + request_id INT AUTO_INCREMENT PRIMARY KEY, + equipment_id INT UNSIGNED NOT NULL, + repair_type VARCHAR(100) NOT NULL, + description TEXT, + urgency ENUM('low', 'normal', 'high', 'urgent') DEFAULT 'normal', + status ENUM('pending', 'in_progress', 'completed', 'cancelled') DEFAULT 'pending', + requested_by INT, + assigned_to INT NULL, + completed_at DATETIME NULL, + notes TEXT, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + FOREIGN KEY (equipment_id) REFERENCES equipments(equipment_id) ON DELETE CASCADE, + INDEX idx_err_equipment (equipment_id), + INDEX idx_err_status (status), + INDEX idx_err_created (created_at DESC) +); diff --git a/api.hyungi.net/models/equipmentModel.js b/api.hyungi.net/models/equipmentModel.js index 424761a..ec0bd15 100644 --- a/api.hyungi.net/models/equipmentModel.js +++ b/api.hyungi.net/models/equipmentModel.js @@ -1,5 +1,6 @@ // models/equipmentModel.js const { getDb } = require('../dbPool'); +const notificationModel = require('./notificationModel'); const EquipmentModel = { // CREATE - 설비 생성 @@ -823,6 +824,20 @@ const EquipmentModel = { ['repair_needed', requestData.equipment_id] ); + // 알림 생성 + try { + await notificationModel.createRepairNotification({ + equipment_id: requestData.equipment_id, + equipment_name: requestData.equipment_name || '설비', + repair_type: requestData.repair_type || '일반 수리', + request_id: result.insertId, + created_by: requestData.reported_by + }); + } catch (notifError) { + console.error('알림 생성 실패:', notifError); + // 알림 생성 실패해도 수리 신청은 성공으로 처리 + } + callback(null, { report_id: result.insertId, equipment_id: requestData.equipment_id, @@ -881,6 +896,53 @@ const EquipmentModel = { } catch (error) { callback(error); } + }, + + // ADD REPAIR CATEGORY - 새 수리 항목 추가 + addRepairCategory: async (itemName, callback) => { + try { + const db = await getDb(); + + // 설비 수리 카테고리 ID 조회 + const [categories] = await db.query( + "SELECT category_id FROM issue_report_categories WHERE category_name = '설비 수리'" + ); + + if (categories.length === 0) { + return callback(new Error('설비 수리 카테고리가 없습니다.')); + } + + const categoryId = categories[0].category_id; + + // 중복 확인 + const [existing] = await db.query( + 'SELECT item_id FROM issue_report_items WHERE category_id = ? AND item_name = ?', + [categoryId, itemName] + ); + + if (existing.length > 0) { + // 이미 존재하면 해당 ID 반환 + return callback(null, { item_id: existing[0].item_id, item_name: itemName, isNew: false }); + } + + // 다음 display_order 구하기 + const [maxOrder] = await db.query( + 'SELECT MAX(display_order) as max_order FROM issue_report_items WHERE category_id = ?', + [categoryId] + ); + const nextOrder = (maxOrder[0].max_order || 0) + 1; + + // 새 항목 추가 + const [result] = await db.query( + `INSERT INTO issue_report_items (category_id, item_name, display_order, is_active) + VALUES (?, ?, ?, 1)`, + [categoryId, itemName, nextOrder] + ); + + callback(null, { item_id: result.insertId, item_name: itemName, isNew: true }); + } catch (error) { + callback(error); + } } }; diff --git a/api.hyungi.net/models/notificationModel.js b/api.hyungi.net/models/notificationModel.js new file mode 100644 index 0000000..a3a52af --- /dev/null +++ b/api.hyungi.net/models/notificationModel.js @@ -0,0 +1,197 @@ +// models/notificationModel.js +const { getDb } = require('../dbPool'); + +// 순환 참조를 피하기 위해 함수 내에서 require +async function getRecipientIds(notificationType) { + const db = await getDb(); + const [rows] = await db.query( + `SELECT user_id FROM notification_recipients + WHERE notification_type = ? AND is_active = 1`, + [notificationType] + ); + return rows.map(r => r.user_id); +} + +const notificationModel = { + // 알림 생성 + async create(notificationData) { + const db = await getDb(); + const { user_id, type, title, message, link_url, reference_type, reference_id, created_by } = notificationData; + + const [result] = await db.query( + `INSERT INTO notifications (user_id, type, title, message, link_url, reference_type, reference_id, created_by) + VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, + [user_id || null, type || 'system', title, message || null, link_url || null, reference_type || null, reference_id || null, created_by || null] + ); + + return result.insertId; + }, + + // 읽지 않은 알림 조회 (특정 사용자 또는 전체) + async getUnread(userId = null) { + const db = await getDb(); + const [rows] = await db.query( + `SELECT * FROM notifications + WHERE is_read = 0 + AND (user_id IS NULL OR user_id = ?) + ORDER BY created_at DESC + LIMIT 50`, + [userId || 0] + ); + return rows; + }, + + // 전체 알림 조회 (페이징) + async getAll(userId = null, page = 1, limit = 20) { + const db = await getDb(); + const offset = (page - 1) * limit; + + const [rows] = await db.query( + `SELECT * FROM notifications + WHERE (user_id IS NULL OR user_id = ?) + ORDER BY created_at DESC + LIMIT ? OFFSET ?`, + [userId || 0, limit, offset] + ); + + const [[{ total }]] = await db.query( + `SELECT COUNT(*) as total FROM notifications + WHERE (user_id IS NULL OR user_id = ?)`, + [userId || 0] + ); + + return { notifications: rows, total, page, limit }; + }, + + // 알림 읽음 처리 + async markAsRead(notificationId) { + const db = await getDb(); + const [result] = await db.query( + `UPDATE notifications SET is_read = 1, read_at = NOW() WHERE notification_id = ?`, + [notificationId] + ); + return result.affectedRows > 0; + }, + + // 모든 알림 읽음 처리 + async markAllAsRead(userId = null) { + const db = await getDb(); + const [result] = await db.query( + `UPDATE notifications SET is_read = 1, read_at = NOW() + WHERE is_read = 0 AND (user_id IS NULL OR user_id = ?)`, + [userId || 0] + ); + return result.affectedRows; + }, + + // 알림 삭제 + async delete(notificationId) { + const db = await getDb(); + const [result] = await db.query( + `DELETE FROM notifications WHERE notification_id = ?`, + [notificationId] + ); + return result.affectedRows > 0; + }, + + // 오래된 알림 삭제 (30일 이상) + async deleteOld(days = 30) { + const db = await getDb(); + const [result] = await db.query( + `DELETE FROM notifications WHERE created_at < DATE_SUB(NOW(), INTERVAL ? DAY)`, + [days] + ); + return result.affectedRows; + }, + + // 읽지 않은 알림 개수 + async getUnreadCount(userId = null) { + const db = await getDb(); + const [[{ count }]] = await db.query( + `SELECT COUNT(*) as count FROM notifications + WHERE is_read = 0 AND (user_id IS NULL OR user_id = ?)`, + [userId || 0] + ); + return count; + }, + + // 수리 신청 알림 생성 헬퍼 (지정된 수신자에게 전송) + async createRepairNotification(repairData) { + const { equipment_id, equipment_name, repair_type, request_id, created_by } = repairData; + + // 수리 알림 수신자 목록 가져오기 + const recipientIds = await getRecipientIds('repair'); + + if (recipientIds.length === 0) { + // 수신자가 지정되지 않은 경우 전체 알림 (user_id = null) + return await this.create({ + type: 'repair', + title: `수리 신청: ${equipment_name || '설비'}`, + message: `${repair_type} 수리가 신청되었습니다.`, + link_url: `/pages/admin/repair-management.html`, + reference_type: 'work_issue_reports', + reference_id: request_id, + created_by + }); + } + + // 지정된 수신자 각각에게 알림 생성 + const results = []; + for (const userId of recipientIds) { + const notificationId = await this.create({ + user_id: userId, + type: 'repair', + title: `수리 신청: ${equipment_name || '설비'}`, + message: `${repair_type} 수리가 신청되었습니다.`, + link_url: `/pages/admin/repair-management.html`, + reference_type: 'work_issue_reports', + reference_id: request_id, + created_by + }); + results.push(notificationId); + } + + return results; + }, + + // 일반 알림 생성 (유형별 지정된 수신자에게 전송) + async createTypedNotification(notificationData) { + const { type, title, message, link_url, reference_type, reference_id, created_by } = notificationData; + + // 해당 유형의 수신자 목록 가져오기 + const recipientIds = await getRecipientIds(type); + + if (recipientIds.length === 0) { + // 수신자가 지정되지 않은 경우 전체 알림 + return await this.create({ + type, + title, + message, + link_url, + reference_type, + reference_id, + created_by + }); + } + + // 지정된 수신자 각각에게 알림 생성 + const results = []; + for (const userId of recipientIds) { + const notificationId = await this.create({ + user_id: userId, + type, + title, + message, + link_url, + reference_type, + reference_id, + created_by + }); + results.push(notificationId); + } + + return results; + } +}; + +module.exports = notificationModel; diff --git a/api.hyungi.net/models/notificationRecipientModel.js b/api.hyungi.net/models/notificationRecipientModel.js new file mode 100644 index 0000000..0867e07 --- /dev/null +++ b/api.hyungi.net/models/notificationRecipientModel.js @@ -0,0 +1,146 @@ +// models/notificationRecipientModel.js +const { getDb } = require('../dbPool'); + +const NOTIFICATION_TYPES = { + repair: '설비 수리', + safety: '안전 신고', + nonconformity: '부적합 신고', + equipment: '설비 관련', + maintenance: '정기점검', + system: '시스템' +}; + +const notificationRecipientModel = { + // 알림 유형 목록 가져오기 + getTypes() { + return NOTIFICATION_TYPES; + }, + + // 유형별 수신자 목록 조회 + async getByType(notificationType) { + const db = await getDb(); + const [rows] = await db.query( + `SELECT nr.*, u.username, u.name as user_name, r.name as role + FROM notification_recipients nr + JOIN users u ON nr.user_id = u.user_id + LEFT JOIN roles r ON u.role_id = r.id + WHERE nr.notification_type = ? AND nr.is_active = 1 + ORDER BY u.name`, + [notificationType] + ); + return rows; + }, + + // 전체 수신자 목록 조회 (유형별 그룹화) + async getAll() { + const db = await getDb(); + const [rows] = await db.query( + `SELECT nr.*, u.username, u.name as user_name, r.name as role + FROM notification_recipients nr + JOIN users u ON nr.user_id = u.user_id + LEFT JOIN roles r ON u.role_id = r.id + WHERE nr.is_active = 1 + ORDER BY nr.notification_type, u.name` + ); + + // 유형별로 그룹화 + const grouped = {}; + for (const type in NOTIFICATION_TYPES) { + grouped[type] = { + label: NOTIFICATION_TYPES[type], + recipients: [] + }; + } + + rows.forEach(row => { + if (grouped[row.notification_type]) { + grouped[row.notification_type].recipients.push(row); + } + }); + + return grouped; + }, + + // 수신자 추가 + async add(notificationType, userId, createdBy = null) { + const db = await getDb(); + const [result] = await db.query( + `INSERT INTO notification_recipients (notification_type, user_id, created_by) + VALUES (?, ?, ?) + ON DUPLICATE KEY UPDATE is_active = 1`, + [notificationType, userId, createdBy] + ); + return result.insertId || result.affectedRows > 0; + }, + + // 수신자 제거 (soft delete) + async remove(notificationType, userId) { + const db = await getDb(); + const [result] = await db.query( + `UPDATE notification_recipients SET is_active = 0 + WHERE notification_type = ? AND user_id = ?`, + [notificationType, userId] + ); + return result.affectedRows > 0; + }, + + // 수신자 완전 삭제 + async delete(notificationType, userId) { + const db = await getDb(); + const [result] = await db.query( + `DELETE FROM notification_recipients + WHERE notification_type = ? AND user_id = ?`, + [notificationType, userId] + ); + return result.affectedRows > 0; + }, + + // 유형별 수신자 user_id 목록만 가져오기 (알림 생성용) + async getRecipientIds(notificationType) { + const db = await getDb(); + const [rows] = await db.query( + `SELECT user_id FROM notification_recipients + WHERE notification_type = ? AND is_active = 1`, + [notificationType] + ); + return rows.map(r => r.user_id); + }, + + // 사용자가 특정 유형의 수신자인지 확인 + async isRecipient(notificationType, userId) { + const db = await getDb(); + const [[row]] = await db.query( + `SELECT 1 FROM notification_recipients + WHERE notification_type = ? AND user_id = ? AND is_active = 1`, + [notificationType, userId] + ); + return !!row; + }, + + // 유형별 수신자 일괄 설정 + async setRecipients(notificationType, userIds, createdBy = null) { + const db = await getDb(); + + // 기존 수신자 비활성화 + await db.query( + `UPDATE notification_recipients SET is_active = 0 + WHERE notification_type = ?`, + [notificationType] + ); + + // 새 수신자 추가 + if (userIds && userIds.length > 0) { + const values = userIds.map(userId => [notificationType, userId, createdBy]); + await db.query( + `INSERT INTO notification_recipients (notification_type, user_id, created_by) + VALUES ? + ON DUPLICATE KEY UPDATE is_active = 1`, + [values] + ); + } + + return true; + } +}; + +module.exports = notificationRecipientModel; diff --git a/api.hyungi.net/routes/equipmentRoutes.js b/api.hyungi.net/routes/equipmentRoutes.js index b527799..53f16b9 100644 --- a/api.hyungi.net/routes/equipmentRoutes.js +++ b/api.hyungi.net/routes/equipmentRoutes.js @@ -43,6 +43,9 @@ router.post('/external-logs/:logId/return', equipmentController.returnEquipment) // 수리 항목 목록 조회 router.get('/repair-categories', equipmentController.getRepairCategories); +// 새 수리 항목 추가 +router.post('/repair-categories', equipmentController.addRepairCategory); + // ==================== 사진 관리 ==================== // 사진 삭제 (설비 ID 없이 photo_id만으로) diff --git a/api.hyungi.net/routes/notificationRecipientRoutes.js b/api.hyungi.net/routes/notificationRecipientRoutes.js new file mode 100644 index 0000000..ded32a5 --- /dev/null +++ b/api.hyungi.net/routes/notificationRecipientRoutes.js @@ -0,0 +1,28 @@ +// routes/notificationRecipientRoutes.js +const express = require('express'); +const router = express.Router(); +const notificationRecipientController = require('../controllers/notificationRecipientController'); +const { verifyToken, requireMinLevel } = require('../middlewares/authMiddleware'); + +// 모든 라우트에 인증 필요 +router.use(verifyToken); + +// 알림 유형 목록 +router.get('/types', notificationRecipientController.getTypes); + +// 전체 수신자 목록 (유형별 그룹화) +router.get('/', notificationRecipientController.getAll); + +// 유형별 수신자 조회 +router.get('/:type', notificationRecipientController.getByType); + +// 수신자 추가 (관리자만) +router.post('/', requireMinLevel('admin'), notificationRecipientController.add); + +// 유형별 수신자 일괄 설정 (관리자만) +router.put('/:type', requireMinLevel('admin'), notificationRecipientController.setRecipients); + +// 수신자 제거 (관리자만) +router.delete('/:type/:userId', requireMinLevel('admin'), notificationRecipientController.remove); + +module.exports = router; diff --git a/api.hyungi.net/routes/notificationRoutes.js b/api.hyungi.net/routes/notificationRoutes.js new file mode 100644 index 0000000..b36fc3f --- /dev/null +++ b/api.hyungi.net/routes/notificationRoutes.js @@ -0,0 +1,27 @@ +// routes/notificationRoutes.js +const express = require('express'); +const router = express.Router(); +const notificationController = require('../controllers/notificationController'); + +// 읽지 않은 알림 조회 +router.get('/unread', notificationController.getUnread); + +// 읽지 않은 알림 개수 +router.get('/unread/count', notificationController.getUnreadCount); + +// 전체 알림 조회 (페이징) +router.get('/', notificationController.getAll); + +// 알림 생성 (시스템/관리자용) +router.post('/', notificationController.create); + +// 모든 알림 읽음 처리 +router.post('/read-all', notificationController.markAllAsRead); + +// 특정 알림 읽음 처리 +router.post('/:id/read', notificationController.markAsRead); + +// 알림 삭제 +router.delete('/:id', notificationController.delete); + +module.exports = router; diff --git a/web-ui/components/navbar.html b/web-ui/components/navbar.html index 940abcd..4875afd 100644 --- a/web-ui/components/navbar.html +++ b/web-ui/components/navbar.html @@ -27,6 +27,26 @@
+ +
+ +
+
+

알림

+ 모두 보기 +
+
+
새 알림이 없습니다.
+
+
+
+ 📊 대시보드 @@ -376,6 +396,208 @@ body { font-family: inherit; } +/* 알림 버튼 스타일 */ +.notification-wrapper { + position: relative; +} + +.notification-btn { + display: flex; + align-items: center; + justify-content: center; + width: 44px; + height: 44px; + background: rgba(255, 255, 255, 0.15); + border: 1px solid rgba(255, 255, 255, 0.25); + border-radius: var(--radius-lg); + cursor: pointer; + transition: var(--transition-normal); + position: relative; +} + +.notification-btn:hover { + background: rgba(255, 255, 255, 0.25); + transform: translateY(-2px); +} + +.notification-icon-svg { + width: 20px; + height: 20px; + color: white; +} + +.notification-btn.has-notifications { + animation: pulse-btn 2s infinite; +} + +@keyframes pulse-btn { + 0%, 100% { box-shadow: 0 0 0 0 rgba(239, 68, 68, 0.4); } + 50% { box-shadow: 0 0 0 8px rgba(239, 68, 68, 0); } +} + +.notification-badge { + position: absolute; + top: -4px; + right: -4px; + min-width: 18px; + height: 18px; + padding: 0 5px; + background: var(--error-500); + color: white; + font-size: 11px; + font-weight: var(--font-bold); + border-radius: var(--radius-full); + display: flex; + align-items: center; + justify-content: center; + animation: pulse-badge 2s infinite; +} + +@keyframes pulse-badge { + 0%, 100% { transform: scale(1); } + 50% { transform: scale(1.1); } +} + +.notification-dropdown { + position: absolute; + top: 100%; + right: 0; + margin-top: var(--space-2); + width: 320px; + max-height: 400px; + background: var(--bg-primary); + border-radius: var(--radius-lg); + box-shadow: var(--shadow-xl); + border: 1px solid var(--border-light); + opacity: 0; + visibility: hidden; + transform: translateY(-10px); + transition: var(--transition-normal); + z-index: 1000; + overflow: hidden; +} + +.notification-dropdown.show { + opacity: 1; + visibility: visible; + transform: translateY(0); +} + +.notification-header { + display: flex; + align-items: center; + justify-content: space-between; + padding: var(--space-3) var(--space-4); + border-bottom: 1px solid var(--border-light); + background: var(--bg-secondary); +} + +.notification-header h4 { + margin: 0; + font-size: var(--text-base); + font-weight: var(--font-semibold); + color: var(--text-primary); +} + +.view-all-link { + font-size: var(--text-sm); + color: var(--primary-500); + text-decoration: none; + font-weight: var(--font-medium); +} + +.view-all-link:hover { + text-decoration: underline; +} + +.notification-list { + max-height: 320px; + overflow-y: auto; +} + +.notification-item { + display: flex; + gap: var(--space-3); + padding: var(--space-3) var(--space-4); + border-bottom: 1px solid var(--border-light); + cursor: pointer; + transition: var(--transition-fast); +} + +.notification-item:hover { + background: var(--bg-secondary); +} + +.notification-item.unread { + background: rgba(14, 165, 233, 0.05); +} + +.notification-item.unread::before { + content: ''; + position: absolute; + left: 0; + top: 0; + bottom: 0; + width: 3px; + background: var(--primary-500); +} + +.notification-item { + position: relative; +} + +.notification-item-icon { + width: 36px; + height: 36px; + border-radius: var(--radius-full); + background: var(--warning-100); + display: flex; + align-items: center; + justify-content: center; + font-size: 1rem; + flex-shrink: 0; +} + +.notification-item-icon.repair { + background: var(--warning-100); +} + +.notification-item-content { + flex: 1; + min-width: 0; +} + +.notification-item-title { + font-size: var(--text-sm); + font-weight: var(--font-medium); + color: var(--text-primary); + margin-bottom: 2px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.notification-item-desc { + font-size: var(--text-xs); + color: var(--text-tertiary); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.notification-item-time { + font-size: var(--text-xs); + color: var(--text-tertiary); + white-space: nowrap; +} + +.notification-empty { + padding: var(--space-6); + text-align: center; + color: var(--text-tertiary); + font-size: var(--text-sm); +} + /* 반응형 디자인 */ @media (max-width: 768px) { .dashboard-header { @@ -407,5 +629,10 @@ body { .report-btn { padding: var(--space-2) var(--space-3); } + + .notification-dropdown { + width: 280px; + right: -50px; + } } \ No newline at end of file diff --git a/web-ui/components/sidebar-nav.html b/web-ui/components/sidebar-nav.html index 83ea818..c85b827 100644 --- a/web-ui/components/sidebar-nav.html +++ b/web-ui/components/sidebar-nav.html @@ -38,14 +38,17 @@
- -
+ +
+ + 시설설비 관리 + 일일순회점검 diff --git a/web-ui/css/admin-settings.css b/web-ui/css/admin-settings.css index 477ca2f..8013870 100644 --- a/web-ui/css/admin-settings.css +++ b/web-ui/css/admin-settings.css @@ -1128,3 +1128,193 @@ padding: 0.375rem 0.75rem; font-size: 0.8rem; } + +/* ======================================== + 알림 수신자 설정 섹션 + ======================================== */ +#notificationRecipientsSection { + margin-top: 2rem; +} + +#notificationRecipientsSection .section-header { + flex-direction: column; + align-items: flex-start; + gap: 0.5rem; +} + +.section-description { + font-size: 0.875rem; + color: #6c757d; + margin: 0; +} + +.notification-recipients-container { + padding: 1.5rem 2rem; +} + +.notification-type-cards { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(280px, 1fr)); + gap: 1rem; +} + +.notification-type-card { + background: #f8f9fa; + border: 2px solid #e9ecef; + border-radius: 12px; + padding: 1.25rem; + transition: all 0.2s ease; +} + +.notification-type-card:hover { + border-color: #007bff; + box-shadow: 0 4px 12px rgba(0, 123, 255, 0.1); +} + +.notification-type-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 1rem; +} + +.notification-type-title { + display: flex; + align-items: center; + gap: 0.5rem; + font-weight: 600; + font-size: 1rem; + color: #1a1a1a; +} + +.notification-type-icon { + font-size: 1.25rem; +} + +.notification-type-card.repair .notification-type-icon { color: #fd7e14; } +.notification-type-card.safety .notification-type-icon { color: #dc3545; } +.notification-type-card.nonconformity .notification-type-icon { color: #6f42c1; } +.notification-type-card.equipment .notification-type-icon { color: #17a2b8; } +.notification-type-card.maintenance .notification-type-icon { color: #28a745; } +.notification-type-card.system .notification-type-icon { color: #6c757d; } + +.edit-recipients-btn { + padding: 0.375rem 0.75rem; + background: white; + border: 1px solid #dee2e6; + border-radius: 6px; + font-size: 0.75rem; + color: #495057; + cursor: pointer; + transition: all 0.2s ease; +} + +.edit-recipients-btn:hover { + background: #007bff; + border-color: #007bff; + color: white; +} + +.recipient-list { + display: flex; + flex-wrap: wrap; + gap: 0.5rem; + min-height: 32px; +} + +.recipient-tag { + display: inline-flex; + align-items: center; + gap: 0.25rem; + padding: 0.25rem 0.625rem; + background: white; + border: 1px solid #dee2e6; + border-radius: 16px; + font-size: 0.75rem; + color: #495057; +} + +.recipient-tag .tag-icon { + font-size: 0.875rem; +} + +.no-recipients { + font-size: 0.8rem; + color: #adb5bd; + font-style: italic; +} + +/* 알림 수신자 편집 모달 */ +.modal-description { + font-size: 0.875rem; + color: #6c757d; + margin-bottom: 1rem; +} + +.recipient-search-box { + margin-bottom: 1rem; +} + +.recipient-user-list { + max-height: 350px; + overflow-y: auto; + border: 1px solid #e9ecef; + border-radius: 8px; + background: #f8f9fa; +} + +.recipient-user-item { + display: flex; + align-items: center; + gap: 0.75rem; + padding: 0.75rem 1rem; + border-bottom: 1px solid #e9ecef; + cursor: pointer; + transition: all 0.15s ease; +} + +.recipient-user-item:last-child { + border-bottom: none; +} + +.recipient-user-item:hover { + background: #e9ecef; +} + +.recipient-user-item.selected { + background: #e7f3ff; +} + +.recipient-user-item input[type="checkbox"] { + width: 18px; + height: 18px; + cursor: pointer; + accent-color: #007bff; +} + +.recipient-user-item .user-avatar-small { + width: 32px; + height: 32px; + font-size: 0.8rem; +} + +.recipient-user-info { + flex: 1; +} + +.recipient-user-name { + font-weight: 500; + font-size: 0.875rem; + color: #1a1a1a; +} + +.recipient-user-role { + font-size: 0.75rem; + color: #6c757d; +} + +@media (max-width: 768px) { + .notification-type-cards { + grid-template-columns: 1fr; + } +} diff --git a/web-ui/js/admin-settings.js b/web-ui/js/admin-settings.js index 5e06c44..f768947 100644 --- a/web-ui/js/admin-settings.js +++ b/web-ui/js/admin-settings.js @@ -1074,3 +1074,190 @@ async function unlinkWorker() { } } window.unlinkWorker = unlinkWorker; + +// ========== 알림 수신자 관리 ========== // +let notificationRecipients = {}; +let allUsersForRecipient = []; +let currentNotificationType = null; + +const NOTIFICATION_TYPE_CONFIG = { + repair: { name: '설비 수리', icon: '🔧', description: '설비 수리 신청 시 알림을 받을 사용자' }, + safety: { name: '안전 신고', icon: '⚠️', description: '안전 관련 신고 시 알림을 받을 사용자' }, + nonconformity: { name: '부적합 신고', icon: '🚫', description: '부적합 사항 신고 시 알림을 받을 사용자' }, + equipment: { name: '설비 관련', icon: '🔩', description: '설비 관련 알림을 받을 사용자' }, + maintenance: { name: '정기점검', icon: '🛠️', description: '정기점검 알림을 받을 사용자' }, + system: { name: '시스템', icon: '📢', description: '시스템 알림을 받을 사용자' } +}; + +// 알림 수신자 목록 로드 +async function loadNotificationRecipients() { + try { + const response = await window.apiCall('/notification-recipients'); + if (response.success) { + notificationRecipients = response.data || {}; + renderNotificationTypeCards(); + } + } catch (error) { + console.error('알림 수신자 로드 오류:', error); + } +} + +// 알림 유형 카드 렌더링 +function renderNotificationTypeCards() { + const container = document.getElementById('notificationTypeCards'); + if (!container) return; + + let html = ''; + + Object.keys(NOTIFICATION_TYPE_CONFIG).forEach(type => { + const config = NOTIFICATION_TYPE_CONFIG[type]; + const recipients = notificationRecipients[type]?.recipients || []; + + html += ` +
+
+
+ ${config.icon} + ${config.name} +
+ +
+
+ ${recipients.length > 0 + ? recipients.map(r => ` + + 👤 + ${r.user_name || r.username} + + `).join('') + : '지정된 수신자 없음' + } +
+
+ `; + }); + + container.innerHTML = html; +} + +// 수신자 편집 모달 열기 +async function openRecipientModal(notificationType) { + currentNotificationType = notificationType; + const config = NOTIFICATION_TYPE_CONFIG[notificationType]; + + // 모달 정보 업데이트 + document.getElementById('recipientModalTitle').textContent = config.name + ' 알림 수신자'; + document.getElementById('recipientModalDesc').textContent = config.description; + + // 사용자 목록 로드 (users가 이미 로드되어 있으면 사용) + if (users.length === 0) { + await loadUsers(); + } + allUsersForRecipient = users.filter(u => u.is_active); + + // 현재 수신자 목록 + const currentRecipients = notificationRecipients[notificationType]?.recipients || []; + const currentRecipientIds = currentRecipients.map(r => r.user_id); + + // 사용자 목록 렌더링 + renderRecipientUserList(currentRecipientIds); + + // 검색 이벤트 + const searchInput = document.getElementById('recipientSearchInput'); + searchInput.value = ''; + searchInput.oninput = (e) => { + renderRecipientUserList(currentRecipientIds, e.target.value); + }; + + // 모달 표시 + document.getElementById('notificationRecipientModal').style.display = 'flex'; +} +window.openRecipientModal = openRecipientModal; + +// 수신자 사용자 목록 렌더링 +function renderRecipientUserList(selectedIds, searchTerm = '') { + const container = document.getElementById('recipientUserList'); + if (!container) return; + + let filteredUsers = allUsersForRecipient; + + if (searchTerm) { + const term = searchTerm.toLowerCase(); + filteredUsers = filteredUsers.filter(u => + (u.name && u.name.toLowerCase().includes(term)) || + (u.username && u.username.toLowerCase().includes(term)) + ); + } + + if (filteredUsers.length === 0) { + container.innerHTML = '
사용자가 없습니다
'; + return; + } + + container.innerHTML = filteredUsers.map(user => { + const isSelected = selectedIds.includes(user.user_id); + return ` +
+ +
${(user.name || user.username).charAt(0)}
+ +
+ `; + }).join(''); +} + +// 수신자 토글 +function toggleRecipientUser(userId, element) { + const checkbox = element.querySelector('input[type="checkbox"]'); + checkbox.checked = !checkbox.checked; + element.classList.toggle('selected', checkbox.checked); +} +window.toggleRecipientUser = toggleRecipientUser; + +// 수신자 모달 닫기 +function closeRecipientModal() { + document.getElementById('notificationRecipientModal').style.display = 'none'; + currentNotificationType = null; +} +window.closeRecipientModal = closeRecipientModal; + +// 알림 수신자 저장 +async function saveNotificationRecipients() { + if (!currentNotificationType) { + showToast('알림 유형이 선택되지 않았습니다.', 'error'); + return; + } + + try { + const checkboxes = document.querySelectorAll('#recipientUserList input[type="checkbox"]:checked'); + const userIds = Array.from(checkboxes).map(cb => parseInt(cb.dataset.userId)); + + const response = await window.apiCall(`/notification-recipients/${currentNotificationType}`, 'PUT', { + user_ids: userIds + }); + + if (response.success) { + showToast('알림 수신자가 저장되었습니다.', 'success'); + closeRecipientModal(); + await loadNotificationRecipients(); + } else { + throw new Error(response.message || '저장에 실패했습니다.'); + } + } catch (error) { + console.error('알림 수신자 저장 오류:', error); + showToast(`저장 중 오류가 발생했습니다: ${error.message}`, 'error'); + } +} +window.saveNotificationRecipients = saveNotificationRecipients; + +// 초기화 시 알림 수신자 로드 +const originalInitializePage = initializePage; +initializePage = async function() { + await originalInitializePage(); + await loadNotificationRecipients(); +}; diff --git a/web-ui/js/app-init.js b/web-ui/js/app-init.js index b757e5d..f6ce7e3 100644 --- a/web-ui/js/app-init.js +++ b/web-ui/js/app-init.js @@ -254,6 +254,114 @@ } }); } + + // 알림 버튼 이벤트 + const notificationBtn = document.getElementById('notificationBtn'); + const notificationDropdown = document.getElementById('notificationDropdown'); + const notificationWrapper = document.getElementById('notificationWrapper'); + + if (notificationBtn && notificationDropdown) { + notificationBtn.addEventListener('click', (e) => { + e.stopPropagation(); + notificationDropdown.classList.toggle('show'); + }); + + document.addEventListener('click', (e) => { + if (notificationWrapper && !notificationWrapper.contains(e.target)) { + notificationDropdown.classList.remove('show'); + } + }); + } + } + + // ===== 알림 로드 ===== + async function loadNotifications() { + try { + const token = localStorage.getItem('token'); + if (!token) return; + + const response = await fetch(`${window.API_BASE_URL}/notifications/unread`, { + headers: { 'Authorization': `Bearer ${token}` } + }); + if (!response.ok) return; + + const result = await response.json(); + if (result.success) { + const notifications = result.data || []; + updateNotificationBadge(notifications.length); + renderNotificationList(notifications); + } + } catch (error) { + console.warn('알림 로드 오류:', error.message); + } + } + + function updateNotificationBadge(count) { + const badge = document.getElementById('notificationBadge'); + const btn = document.getElementById('notificationBtn'); + if (!badge) return; + + if (count > 0) { + badge.textContent = count > 99 ? '99+' : count; + badge.style.display = 'flex'; + btn?.classList.add('has-notifications'); + } else { + badge.style.display = 'none'; + btn?.classList.remove('has-notifications'); + } + } + + function renderNotificationList(notifications) { + const list = document.getElementById('notificationList'); + if (!list) return; + + if (notifications.length === 0) { + list.innerHTML = '
새 알림이 없습니다.
'; + return; + } + + const icons = { repair: '🔧', safety: '⚠️', system: '📢', equipment: '🔩', maintenance: '🛠️' }; + + list.innerHTML = notifications.slice(0, 5).map(n => ` +
+
${icons[n.type] || '🔔'}
+
+
${escapeHtml(n.title)}
+
${escapeHtml(n.message || '')}
+
+
${formatTimeAgo(n.created_at)}
+
+ `).join(''); + + list.querySelectorAll('.notification-item').forEach(item => { + item.addEventListener('click', () => { + const url = item.dataset.url; + // 수리 알림은 클릭해도 읽음 처리 안함 (수리 처리 페이지에서 확인 처리해야 함) + window.location.href = url || '/pages/admin/notifications.html'; + }); + }); + } + + function formatTimeAgo(dateString) { + const date = new Date(dateString); + const now = new Date(); + const diffMs = now - date; + const diffMins = Math.floor(diffMs / 60000); + const diffHours = Math.floor(diffMs / 3600000); + const diffDays = Math.floor(diffMs / 86400000); + + if (diffMins < 1) return '방금 전'; + if (diffMins < 60) return `${diffMins}분 전`; + if (diffHours < 24) return `${diffHours}시간 전`; + if (diffDays < 7) return `${diffDays}일 전`; + return date.toLocaleDateString('ko-KR', { month: 'short', day: 'numeric' }); + } + + function escapeHtml(text) { + if (!text) return ''; + const div = document.createElement('div'); + div.textContent = text; + return div.innerHTML; } // ===== 날짜/시간 업데이트 ===== @@ -387,6 +495,10 @@ // 8. 날씨 (백그라운드) setTimeout(updateWeather, 100); + // 9. 알림 로드 (30초마다 갱신) + setTimeout(loadNotifications, 200); + setInterval(loadNotifications, 30000); + console.log('✅ app-init 완료'); } diff --git a/web-ui/js/component-loader.js b/web-ui/js/component-loader.js index 9819934..97eca11 100644 --- a/web-ui/js/component-loader.js +++ b/web-ui/js/component-loader.js @@ -2,7 +2,7 @@ import { config } from './config.js'; // 캐시 버전 (컴포넌트 변경 시 증가) -const CACHE_VERSION = 'v1'; +const CACHE_VERSION = 'v4'; /** * 컴포넌트 HTML을 캐시에서 가져오거나 fetch diff --git a/web-ui/js/load-navbar.js b/web-ui/js/load-navbar.js index 5589041..872c5d5 100644 --- a/web-ui/js/load-navbar.js +++ b/web-ui/js/load-navbar.js @@ -269,6 +269,151 @@ async function updateWeather() { } } +// ========================================== +// 알림 시스템 +// ========================================== + +/** + * 알림 관련 이벤트 설정 + */ +function setupNotificationEvents() { + const notificationBtn = document.getElementById('notificationBtn'); + const notificationDropdown = document.getElementById('notificationDropdown'); + const notificationWrapper = document.getElementById('notificationWrapper'); + + if (notificationBtn) { + notificationBtn.addEventListener('click', (e) => { + e.stopPropagation(); + notificationDropdown?.classList.toggle('show'); + }); + } + + // 외부 클릭시 드롭다운 닫기 + document.addEventListener('click', (e) => { + if (notificationWrapper && notificationDropdown && !notificationWrapper.contains(e.target)) { + notificationDropdown.classList.remove('show'); + } + }); +} + +/** + * 알림 목록 로드 + */ +async function loadNotifications() { + try { + const token = localStorage.getItem('token'); + if (!token) return; + + const response = await fetch(`${window.API_BASE_URL}/notifications/unread`, { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + 'Authorization': `Bearer ${token}` + } + }); + + if (!response.ok) return; + + const result = await response.json(); + if (result.success) { + const notifications = result.data || []; + updateNotificationBadge(notifications.length); + renderNotificationList(notifications); + } + } catch (error) { + console.warn('알림 로드 오류:', error.message); + } +} + +/** + * 배지 업데이트 + */ +function updateNotificationBadge(count) { + const badge = document.getElementById('notificationBadge'); + const btn = document.getElementById('notificationBtn'); + if (!badge) return; + + if (count > 0) { + badge.textContent = count > 99 ? '99+' : count; + badge.style.display = 'flex'; + btn?.classList.add('has-notifications'); + } else { + badge.style.display = 'none'; + btn?.classList.remove('has-notifications'); + } +} + +/** + * 알림 목록 렌더링 + */ +function renderNotificationList(notifications) { + const list = document.getElementById('notificationList'); + if (!list) return; + + if (notifications.length === 0) { + list.innerHTML = '
새 알림이 없습니다.
'; + return; + } + + const NOTIF_ICONS = { + repair: '🔧', + safety: '⚠️', + system: '📢', + equipment: '🔩', + maintenance: '🛠️' + }; + + list.innerHTML = notifications.slice(0, 5).map(n => ` +
+
+ ${NOTIF_ICONS[n.type] || '🔔'} +
+
+
${escapeHtml(n.title)}
+
${escapeHtml(n.message || '')}
+
+
${formatTimeAgo(n.created_at)}
+
+ `).join(''); + + // 클릭 이벤트 추가 + list.querySelectorAll('.notification-item').forEach(item => { + item.addEventListener('click', () => { + const linkUrl = item.dataset.url; + // 수리 알림은 클릭해도 읽음 처리 안함 (수리 처리 페이지에서 확인 처리) + window.location.href = linkUrl || '/pages/admin/notifications.html'; + }); + }); +} + +/** + * 시간 포맷팅 + */ +function formatTimeAgo(dateString) { + const date = new Date(dateString); + const now = new Date(); + const diffMs = now - date; + const diffMins = Math.floor(diffMs / 60000); + const diffHours = Math.floor(diffMs / 3600000); + const diffDays = Math.floor(diffMs / 86400000); + + if (diffMins < 1) return '방금 전'; + if (diffMins < 60) return `${diffMins}분 전`; + if (diffHours < 24) return `${diffHours}시간 전`; + if (diffDays < 7) return `${diffDays}일 전`; + return date.toLocaleDateString('ko-KR', { month: 'short', day: 'numeric' }); +} + +/** + * HTML 이스케이프 + */ +function escapeHtml(text) { + if (!text) return ''; + const div = document.createElement('div'); + div.textContent = text; + return div.innerHTML; +} + // 메인 로직: DOMContentLoaded 시 실행 document.addEventListener('DOMContentLoaded', async () => { if (getUser()) { @@ -285,5 +430,10 @@ document.addEventListener('DOMContentLoaded', async () => { // 4. 날씨 정보 로드 (10분마다 갱신) updateWeather(); setInterval(updateWeather, 10 * 60 * 1000); + + // 5. 알림 이벤트 설정 및 로드 (30초마다 갱신) + setupNotificationEvents(); + loadNotifications(); + setInterval(loadNotifications, 30000); } }); \ No newline at end of file diff --git a/web-ui/js/workplace-status.js b/web-ui/js/workplace-status.js index 13a5eca..1846f86 100644 --- a/web-ui/js/workplace-status.js +++ b/web-ui/js/workplace-status.js @@ -1398,27 +1398,73 @@ function openPanelRepairModal() { panelRepairCategories.forEach(item => { select.innerHTML += ``; }); + // 새로 추가 옵션 + select.innerHTML += ''; document.getElementById('panelRepairDesc').value = ''; document.getElementById('panelRepairPhotoInput').value = ''; + document.getElementById('newRepairTypeName').value = ''; + document.getElementById('newRepairTypeGroup').style.display = 'none'; panelRepairPhotoBases = []; document.getElementById('panelRepairModal').style.display = 'flex'; } +function onRepairTypeChange() { + const select = document.getElementById('panelRepairItem'); + const newTypeGroup = document.getElementById('newRepairTypeGroup'); + + if (select.value === '__new__') { + newTypeGroup.style.display = 'block'; + document.getElementById('newRepairTypeName').focus(); + } else { + newTypeGroup.style.display = 'none'; + } +} + function closePanelRepairModal() { document.getElementById('panelRepairModal').style.display = 'none'; } async function submitPanelRepair() { - const itemId = document.getElementById('panelRepairItem').value; + const selectValue = document.getElementById('panelRepairItem').value; const description = document.getElementById('panelRepairDesc').value; + const newTypeName = document.getElementById('newRepairTypeName').value.trim(); if (!description) { alert('수리 내용을 입력하세요.'); return; } + let itemId = selectValue; + + // 새 유형 추가하는 경우 + if (selectValue === '__new__') { + if (!newTypeName) { + alert('새 수리 유형 이름을 입력하세요.'); + return; + } + + try { + const addResponse = await window.apiCall('/equipments/repair-categories', 'POST', { + item_name: newTypeName + }); + + if (addResponse && addResponse.success) { + itemId = addResponse.data.item_id; + // 목록에 추가 + panelRepairCategories.push({ item_id: itemId, item_name: newTypeName }); + } else { + alert('새 유형 추가에 실패했습니다.'); + return; + } + } catch (error) { + console.error('새 유형 추가 실패:', error); + alert('새 유형 추가에 실패했습니다.'); + return; + } + } + // 사진 처리 const fileInput = document.getElementById('panelRepairPhotoInput'); const photos = []; @@ -1728,6 +1774,7 @@ window.confirmPanelMove = confirmPanelMove; window.openPanelRepairModal = openPanelRepairModal; window.closePanelRepairModal = closePanelRepairModal; window.submitPanelRepair = submitPanelRepair; +window.onRepairTypeChange = onRepairTypeChange; window.openPanelExportModal = openPanelExportModal; window.closePanelExportModal = closePanelExportModal; window.submitPanelExport = submitPanelExport; diff --git a/web-ui/pages/admin/accounts.html b/web-ui/pages/admin/accounts.html index 42187a5..622b723 100644 --- a/web-ui/pages/admin/accounts.html +++ b/web-ui/pages/admin/accounts.html @@ -6,7 +6,7 @@ 관리자 설정 | (주)테크니컬코리아 - + @@ -69,6 +69,20 @@
+ + +
+
+

알림 수신자 설정

+

알림 유형별 수신자를 지정합니다. 지정된 사용자에게만 알림이 전송됩니다.

+
+ +
+
+ +
+
+
@@ -233,6 +247,33 @@ + + +
@@ -240,6 +281,6 @@ - + diff --git a/web-ui/pages/admin/notifications.html b/web-ui/pages/admin/notifications.html new file mode 100644 index 0000000..42b3833 --- /dev/null +++ b/web-ui/pages/admin/notifications.html @@ -0,0 +1,554 @@ + + + + + + 알림 관리 | (주)테크니컬코리아 + + + + + + + + + + + + +
+
+
+

알림 관리

+
+ +
+
+ +
+
+
0
+
읽지 않은 알림
+
+
+
0
+
전체 알림
+
+
+ +
+
+

알림 목록

+
+ + + +
+
+ +
+
+
🔔
+

알림이 없습니다.

+
+
+ + +
+
+
+ + + + + diff --git a/web-ui/pages/admin/repair-management.html b/web-ui/pages/admin/repair-management.html new file mode 100644 index 0000000..89cd9be --- /dev/null +++ b/web-ui/pages/admin/repair-management.html @@ -0,0 +1,852 @@ + + + + + + 시설설비 관리 | (주)테크니컬코리아 + + + + + + + + + + + +
+
+
+

시설설비 관리

+
+ +
+
+
0
+
신청
+
+
+
0
+
접수
+
+
+
0
+
처리중
+
+
+
0
+
완료
+
+
+ +
+ + + + + + + + + + + + + + + + + +
신청일작업장유형설명담당자상태처리
로딩중...
+
+
+
+ + + + + + + + + + + + + diff --git a/web-ui/pages/dashboard.html b/web-ui/pages/dashboard.html index e78ab89..b8c9693 100644 --- a/web-ui/pages/dashboard.html +++ b/web-ui/pages/dashboard.html @@ -419,10 +419,14 @@
-
+