diff --git a/gateway/html/login.html b/gateway/html/login.html
index b275384..ccd0ba3 100644
--- a/gateway/html/login.html
+++ b/gateway/html/login.html
@@ -171,11 +171,30 @@
}
}
- // 이미 로그인 되어있으면 포털로 (쿠키 또는 localStorage 체크)
+ // 토큰 만료 확인
+ function isTokenValid(token) {
+ try {
+ var payload = JSON.parse(atob(token.split('.')[1]));
+ return payload.exp > Math.floor(Date.now() / 1000);
+ } catch (e) {
+ return false;
+ }
+ }
+
+ // 이미 로그인 되어있으면 포털로 (쿠키 또는 localStorage 체크 + 만료 확인)
var existingToken = ssoCookie.get('sso_token') || localStorage.getItem('sso_token');
if (existingToken && existingToken !== 'undefined' && existingToken !== 'null') {
- var redirect = new URLSearchParams(location.search).get('redirect');
- window.location.href = redirect || '/';
+ if (isTokenValid(existingToken)) {
+ var redirect = new URLSearchParams(location.search).get('redirect');
+ window.location.href = redirect || '/';
+ } else {
+ // 만료된 토큰 정리
+ ssoCookie.remove('sso_token');
+ ssoCookie.remove('sso_user');
+ ssoCookie.remove('sso_refresh_token');
+ localStorage.removeItem('sso_token');
+ localStorage.removeItem('sso_user');
+ }
}
diff --git a/system1-factory/api/config/routes.js b/system1-factory/api/config/routes.js
index 7a084e2..faef062 100644
--- a/system1-factory/api/config/routes.js
+++ b/system1-factory/api/config/routes.js
@@ -48,7 +48,7 @@ function setupRoutes(app) {
const vacationTypeRoutes = require('../routes/vacationTypeRoutes');
const vacationBalanceRoutes = require('../routes/vacationBalanceRoutes');
const visitRequestRoutes = require('../routes/visitRequestRoutes');
- // workIssueRoutes removed - moved to System 2 (신고 시스템)
+ const workIssueRoutes = require('../routes/workIssueRoutes');
const departmentRoutes = require('../routes/departmentRoutes');
const patrolRoutes = require('../routes/patrolRoutes');
const notificationRoutes = require('../routes/notificationRoutes');
@@ -159,14 +159,7 @@ function setupRoutes(app) {
app.use('/api/workplace-visits', visitRequestRoutes); // 출입 신청 및 안전교육 관리
app.use('/api', pageAccessRoutes); // 페이지 접근 권한 관리
app.use('/api/tbm', tbmRoutes); // TBM 시스템
- // work-issues moved to System 2 - redirect
- app.use('/api/work-issues', (req, res) => {
- res.status(301).json({
- success: false,
- error: '신고 시스템이 분리되었습니다',
- redirect: '/report/api/work-issues' + req.url
- });
- });
+ app.use('/api/work-issues', workIssueRoutes); // 카테고리/아이템 + 신고 조회 (같은 MariaDB 공유)
app.use('/api/departments', departmentRoutes); // 부서 관리
app.use('/api/patrol', patrolRoutes); // 일일순회점검 시스템
app.use('/api/notifications', notificationRoutes); // 알림 시스템
diff --git a/system1-factory/api/controllers/tbmController.js b/system1-factory/api/controllers/tbmController.js
index dd6fd39..5ab7dc6 100644
--- a/system1-factory/api/controllers/tbmController.js
+++ b/system1-factory/api/controllers/tbmController.js
@@ -176,6 +176,36 @@ const TbmController = {
});
},
+ /**
+ * TBM 세션 삭제 (draft 상태만)
+ */
+ deleteSession: (req, res) => {
+ const { sessionId } = req.params;
+
+ TbmModel.deleteSession(sessionId, (err, result) => {
+ if (err) {
+ console.error('TBM 세션 삭제 오류:', err);
+ return res.status(500).json({
+ success: false,
+ message: 'TBM 세션 삭제 중 오류가 발생했습니다.',
+ error: err.message
+ });
+ }
+
+ if (result.affectedRows === 0) {
+ return res.status(404).json({
+ success: false,
+ message: 'TBM 세션을 찾을 수 없거나 이미 완료된 세션입니다.'
+ });
+ }
+
+ res.json({
+ success: true,
+ message: 'TBM 세션이 삭제되었습니다.'
+ });
+ });
+ },
+
// ==================== 팀 구성 관련 ====================
/**
diff --git a/system1-factory/api/controllers/workIssueController.js b/system1-factory/api/controllers/workIssueController.js
index 0811be6..54b472b 100644
--- a/system1-factory/api/controllers/workIssueController.js
+++ b/system1-factory/api/controllers/workIssueController.js
@@ -26,7 +26,7 @@ exports.getAllCategories = (req, res) => {
exports.getCategoriesByType = (req, res) => {
const { type } = req.params;
- if (!['nonconformity', 'safety'].includes(type)) {
+ if (!['nonconformity', 'safety', 'facility'].includes(type)) {
return res.status(400).json({ success: false, error: '유효하지 않은 카테고리 타입입니다.' });
}
diff --git a/system1-factory/api/models/tbmModel.js b/system1-factory/api/models/tbmModel.js
index a191243..6100b4b 100644
--- a/system1-factory/api/models/tbmModel.js
+++ b/system1-factory/api/models/tbmModel.js
@@ -97,22 +97,36 @@ const TbmModel = {
w.worker_name as leader_name,
w.job_type as leader_job_type,
w.phone_number as leader_phone,
- p.project_name,
- p.job_no,
- p.site,
- wt.name as work_type_name,
- wt.category as work_type_category,
- t.task_name,
- t.description as task_description,
u.username as created_by_username,
- u.name as created_by_name
+ u.name as created_by_name,
+ COUNT(DISTINCT ta.worker_id) as team_member_count,
+ first_p.project_name,
+ first_p.job_no,
+ first_wt.name as work_type_name,
+ first_wt.category as work_type_category,
+ first_t.task_name,
+ first_t.description as task_description,
+ first_wp.workplace_name as work_location,
+ first_wc.category_name as workplace_category_name
FROM tbm_sessions s
LEFT JOIN workers w ON s.leader_id = w.worker_id
- LEFT JOIN projects p ON s.project_id = p.project_id
- LEFT JOIN work_types wt ON s.work_type_id = wt.id
- LEFT JOIN tasks t ON s.task_id = t.task_id
LEFT JOIN users u ON s.created_by = u.user_id
+ LEFT JOIN tbm_team_assignments ta ON s.session_id = ta.session_id
+ LEFT JOIN (
+ SELECT * FROM tbm_team_assignments
+ WHERE (session_id, assignment_id) IN (
+ SELECT session_id, MIN(assignment_id)
+ FROM tbm_team_assignments
+ GROUP BY session_id
+ )
+ ) first_ta ON s.session_id = first_ta.session_id
+ LEFT JOIN projects first_p ON first_ta.project_id = first_p.project_id
+ LEFT JOIN work_types first_wt ON first_ta.work_type_id = first_wt.id
+ LEFT JOIN tasks first_t ON first_ta.task_id = first_t.task_id
+ LEFT JOIN workplaces first_wp ON first_ta.workplace_id = first_wp.workplace_id
+ LEFT JOIN workplace_categories first_wc ON first_ta.workplace_category_id = first_wc.category_id
WHERE s.session_id = ?
+ GROUP BY s.session_id
`;
const [rows] = await db.query(sql, [sessionId]);
@@ -174,6 +188,23 @@ const TbmModel = {
}
},
+ /**
+ * TBM 세션 삭제 (draft 상태만 가능)
+ */
+ deleteSession: async (sessionId, callback) => {
+ try {
+ const db = await getDb();
+ // draft 상태인 세션만 삭제 허용
+ const [result] = await db.query(
+ `DELETE FROM tbm_sessions WHERE session_id = ? AND status = 'draft'`,
+ [sessionId]
+ );
+ callback(null, result);
+ } catch (err) {
+ callback(err);
+ }
+ },
+
// ==================== 팀 구성 관련 ====================
/**
diff --git a/system1-factory/api/routes/tbmRoutes.js b/system1-factory/api/routes/tbmRoutes.js
index 5e22a7a..aa7e8eb 100644
--- a/system1-factory/api/routes/tbmRoutes.js
+++ b/system1-factory/api/routes/tbmRoutes.js
@@ -24,6 +24,9 @@ router.put('/sessions/:sessionId', requireAuth, TbmController.updateSession);
// TBM 세션 완료 처리
router.post('/sessions/:sessionId/complete', requireAuth, TbmController.completeSession);
+// TBM 세션 삭제 (draft 상태만)
+router.delete('/sessions/:sessionId', requireAuth, TbmController.deleteSession);
+
// ==================== 팀 구성 관련 ====================
// 팀원 추가 (단일)
diff --git a/system1-factory/web/components/mobile-nav.html b/system1-factory/web/components/mobile-nav.html
index edd2765..a525486 100644
--- a/system1-factory/web/components/mobile-nav.html
+++ b/system1-factory/web/components/mobile-nav.html
@@ -1,26 +1,37 @@
-
+