From e2339db8255e350596310ab27bebe5b4a014d5aa Mon Sep 17 00:00:00 2001
From: lead <lead@local>
Date: 星期二, 03 十一月 2026 11:04:36 +0800
Subject: [PATCH] feat(safety): 从长辉分支移植安全生产模块
---
sql/mysql/safety_module_tables_20261029.sql | 343 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java | 74
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockPageReqVO.java | 30
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPageReqVO.java | 30
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java | 220 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOverviewService.java | 138 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java | 223 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java | 50
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java | 233 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java | 45
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java | 187 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyMaterialCategoryEnum.java | 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointPageReqVO.java | 24
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyFileService.java | 99
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyDrillTypeEnum.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitPageReqVO.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockRespVO.java | 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgSaveReqVO.java | 51
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentPageReqVO.java | 31
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java | 99
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOrgService.java | 157 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitStatusEnum.java | 35
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardLevelEnum.java | 30
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java | 98
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorRespVO.java | 28
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentLevelEnum.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java | 77
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMonitorMapper.java | 28
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java | 57
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java | 67
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointRespVO.java | 40
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectionPointTypeEnum.java | 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyTrainingService.java | 273 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java | 118
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java | 138 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java | 37
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialStockDO.java | 48
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java | 47
sql/mysql/safety_module_menu_20261029.sql | 125
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingSaveReqVO.java | 71
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardStatusEnum.java | 40
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMapper.java | 37
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyOverviewRespVO.java | 62
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyFileController.java | 53
yudao-module-mes/pom.xml | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectCycleEnum.java | 32
sql/mysql/safety_fix_code_index_20261029.sql | 54
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockSaveReqVO.java | 56
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java | 64
sql/mysql/safety_master_data_link_20261029.sql | 102
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyRiskLevelEnum.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyLedgerController.java | 53
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialSaveReqVO.java | 76
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyCertificateMapper.java | 46
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyDrillDO.java | 51
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateTypeEnum.java | 37
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java | 50
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorSaveReqVO.java | 47
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentSaveReqVO.java | 91
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitRespVO.java | 58
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardSourceEnum.java | 32
sql/mysql/safety_certificate_employee_20261029.sql | 42
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateSaveReqVO.java | 73
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardPageReqVO.java | 48
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyMaterialService.java | 192 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitApproveReqVO.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java | 147 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyWorkPermitService.java | 286 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java | 84
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyHazardController.java | 106
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitMonitorDO.java | 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyTrainingMapper.java | 37
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateStatusEnum.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionRespVO.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointSaveReqVO.java | 59
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentStatusEnum.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingRespVO.java | 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyDrillMapper.java | 37
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyAccidentMapper.java | 44
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentRespVO.java | 49
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRespVO.java | 62
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRecheckReqVO.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRectifyReqVO.java | 31
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionMapper.java | 51
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyOrgMapper.java | 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialPageReqVO.java | 24
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentTypeEnum.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyInspectionController.java | 162 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java | 334 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardSaveReqVO.java | 73
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialDO.java | 54
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyTrainingTypeEnum.java | 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionPointMapper.java | 40
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyLedgerExportReqVO.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitTypeEnum.java | 41
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionSaveReqVO.java | 54
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialStockMapper.java | 29
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyHazardMapper.java | 49
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingPageReqVO.java | 29
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialMapper.java | 57
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillRespVO.java | 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyOrgDO.java | 41
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialRespVO.java | 43
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionDO.java | 45
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillPageReqVO.java | 29
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java | 82
107 files changed, 7,631 insertions(+), 0 deletions(-)
diff --git a/sql/mysql/safety_certificate_employee_20261029.sql b/sql/mysql/safety_certificate_employee_20261029.sql
new file mode 100644
index 0000000..7b030c0
--- /dev/null
+++ b/sql/mysql/safety_certificate_employee_20261029.sql
@@ -0,0 +1,42 @@
+-- ============================================================
+-- 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佹寔璇佷汉鏀逛负鍏宠仈鍛樺伐妗f
+-- 鐢熸垚鏃堕棿锛�2026-10-29
+-- 鑳屾櫙锛氬師璁捐鎶婃寔璇佷汉鍋氭垚绾枃鏈鍚嶏紙employee_name / employee_no / dept_name锛夛紝
+-- 鏃犳硶涓庝汉鍔涜祫婧愮殑鍛樺伐妗f銆佺郴缁熺敤鎴锋墦閫氥��
+-- 鍋氭硶锛氭柊澧� employee_id 鍏宠仈 hrm_employee.id锛屽鍚�/宸ュ彿/閮ㄩ棬鏀逛负鍛樺伐妗f甯﹀嚭锛�
+-- 鏃ф枃鏈瓧娈典繚鐣欎负蹇収锛屼究浜庡憳宸ユ。妗堝彉鏇村悗浠嶅彲杩芥函寮�璇佹椂鐨勪汉浜嬩俊鎭��
+-- 璇存槑锛氬箓绛夛紝鍙噸澶嶆墽琛�
+-- ============================================================
+
+-- ---------- 1. 鏂板 employee_id 瀛楁 ----------
+SET @exist_col = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'safety_certificate' AND column_name = 'employee_id');
+SET @sql = IF(@exist_col = 0,
+ 'ALTER TABLE `safety_certificate` ADD COLUMN `employee_id` bigint NULL COMMENT ''鎸佽瘉浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�'' AFTER `id`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- ---------- 2. 绱㈠紩 ----------
+SET @exist_idx = (SELECT COUNT(*) FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = 'safety_certificate' AND index_name = 'idx_employee_id');
+SET @sql2 = IF(@exist_idx = 0,
+ 'CREATE INDEX `idx_employee_id` ON `safety_certificate` (`employee_id`)',
+ 'SELECT 1');
+PREPARE stmt2 FROM @sql2;
+EXECUTE stmt2;
+DEALLOCATE PREPARE stmt2;
+
+-- ---------- 3. 鍘熶笁鍒楁敼涓哄揩鐓ц涔夛紙淇濈暀锛屼笉鍐嶄綔涓哄敮涓�鏉ユ簮锛� ----------
+ALTER TABLE `safety_certificate`
+ MODIFY COLUMN `employee_name` varchar(50) NULL COMMENT '鎸佽瘉浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�',
+ MODIFY COLUMN `employee_no` varchar(50) NULL COMMENT '宸ュ彿锛堝揩鐓э紝鐢卞憳宸ユ。妗堝甫鍑猴級',
+ MODIFY COLUMN `dept_name` varchar(100) NULL COMMENT '鎵�灞為儴闂紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+
+-- ---------- 4. 鏍¢獙 ----------
+SELECT COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_COMMENT
+ FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'safety_certificate'
+ AND COLUMN_NAME IN ('employee_id', 'employee_name', 'employee_no', 'dept_name')
+ ORDER BY ORDINAL_POSITION;
diff --git a/sql/mysql/safety_fix_code_index_20261029.sql b/sql/mysql/safety_fix_code_index_20261029.sql
new file mode 100644
index 0000000..c6bddfa
--- /dev/null
+++ b/sql/mysql/safety_fix_code_index_20261029.sql
@@ -0,0 +1,54 @@
+-- ============================================================
+-- 瀹夊叏鐢熶骇 - 淇 uk_code 鍞竴绱㈠紩瀵艰嚧銆岀浜屾杞垹闄ゅ悓缂栫爜銆嶆姤閿�
+-- 鐢熸垚鏃堕棿锛�2026-10-29
+--
+-- 鐜拌薄锛氬贰妫�鐐逛綅 PD-001 鍏堣杞垹涓�娆★紝涔嬪悗鏂板缓鍚岀紪鐮� PD-001 鍐嶅垹闄ゆ椂鎶�
+-- Duplicate entry 'PD-001-\x01' for key 'safety_inspection_point.uk_code'
+-- 鎺ュ彛杩斿洖銆岀郴缁熷紓甯搞��(500)
+--
+-- 鍘熷洜锛歶k_code 寤哄湪 (code, deleted) 涓婏紝deleted 鏄� bit(1)銆�
+-- 杞垹闄ゅ悗 deleted=b'1'锛岃嫢鍘嗗彶涓婂凡鏈変竴鏉″悓缂栫爜涓斿凡杞垹鐨勮褰曪紝
+-- 绗簩娆¤蒋鍒犻櫎灏变細鎻掑叆閲嶅鐨� (code, b'1') 缁勫悎锛屾挒鍞竴閿��
+--
+-- 淇锛氬幓鎺� (code, deleted) 鍞竴绾︽潫锛屾敼鎴愭櫘閫氱储寮� idx_code 鐢ㄤ簬鏌ヨ锛�
+-- 缂栫爜鍞竴鎬х敱 Service 灞備繚璇侊紙鏂板/淇敼鏃� selectByCode 鏌ユ椿璺冭褰曞垽閲嶏紝
+-- 涓� yudao 鍏跺畠涓氬姟琛ㄤ竴鑷达紝渚嬪 mes_dv_machinery 灏辨病鏈� code 鍞竴閿級銆�
+--
+-- 骞傜瓑锛氬厛鍒ゆ柇绱㈠紩鏄惁瀛樺湪鍐嶆搷浣滐紝鍙噸澶嶆墽琛�
+-- ============================================================
+
+DROP PROCEDURE IF EXISTS sp_safety_fix_code_index;
+DELIMITER $$
+CREATE PROCEDURE sp_safety_fix_code_index(IN p_table VARCHAR(64))
+BEGIN
+ -- 1. 鍒犳帀鏃х殑 (code, deleted) 鍞竴閿�
+ IF EXISTS (SELECT 1 FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = p_table AND index_name = 'uk_code') THEN
+ SET @s = CONCAT('ALTER TABLE `', p_table, '` DROP INDEX `uk_code`');
+ PREPARE st FROM @s; EXECUTE st; DEALLOCATE PREPARE st;
+ END IF;
+ -- 2. 琛ヤ竴涓櫘閫氱储寮曪紝淇濊瘉鎸夌紪鐮佹煡璇㈢殑鎬ц兘
+ IF NOT EXISTS (SELECT 1 FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = p_table AND index_name = 'idx_code') THEN
+ SET @s2 = CONCAT('CREATE INDEX `idx_code` ON `', p_table, '` (`code`)');
+ PREPARE st2 FROM @s2; EXECUTE st2; DEALLOCATE PREPARE st2;
+ END IF;
+END$$
+DELIMITER ;
+
+CALL sp_safety_fix_code_index('safety_inspection_point');
+CALL sp_safety_fix_code_index('safety_hazard');
+CALL sp_safety_fix_code_index('safety_material');
+CALL sp_safety_fix_code_index('safety_work_permit');
+CALL sp_safety_fix_code_index('safety_accident');
+
+DROP PROCEDURE IF EXISTS sp_safety_fix_code_index;
+
+-- ---------- 鏍¢獙锛氱‘璁ゅ凡鏃� uk_code锛屼笖鏈� idx_code ----------
+SELECT TABLE_NAME, INDEX_NAME, NON_UNIQUE,
+ GROUP_CONCAT(COLUMN_NAME ORDER BY SEQ_IN_INDEX) AS cols
+ FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND TABLE_NAME LIKE 'safety%'
+ AND INDEX_NAME IN ('uk_code', 'idx_code')
+ GROUP BY TABLE_NAME, INDEX_NAME, NON_UNIQUE
+ ORDER BY TABLE_NAME;
diff --git a/sql/mysql/safety_master_data_link_20261029.sql b/sql/mysql/safety_master_data_link_20261029.sql
new file mode 100644
index 0000000..fddba90
--- /dev/null
+++ b/sql/mysql/safety_master_data_link_20261029.sql
@@ -0,0 +1,102 @@
+-- ============================================================
+-- 瀹夊叏鐢熶骇 - 浜哄憳涓庤溅闂村瓧娈靛叏闈㈡敼涓轰富鏁版嵁鍏宠仈
+-- 鐢熸垚鏃堕棿锛�2026-10-29
+--
+-- 鑳屾櫙锛氭ā鍧楀垵鐗堟妸銆岃礋璐d汉 / 宸℃浜� / 涓婃姤浜� / 鏁存敼浜� / 澶嶆煡浜� / 鐢宠浜� /
+-- 瀹℃壒浜� / 鐩戞姢浜� / 淇濈浜� / 璁插笀 / 缁勭粐浜� / 杞﹂棿銆嶅叏閮ㄥ仛鎴愪簡绾枃鏈紝
+-- 涓庝汉鍔涜祫婧愬憳宸ユ。妗堛�丮ES 杞﹂棿涓绘暟鎹畬鍏ㄨ劚鑺傦紝浜哄悕闈犳墜鎵撱�佽溅闂撮潬鎵嬭緭銆�
+--
+-- 鍋氭硶锛堢粺涓�妯″紡锛屼笌 safety_certificate 涓�鑷达級锛�
+-- 1. 鏂板 xxx_id 鍏宠仈涓绘暟鎹細employee 鍏宠仈 hrm_employee.id锛寃orkshop 鍏宠仈 mes_md_workshop.id
+-- 2. 鍘熸枃鏈垪淇濈暀锛岄檷绾т负銆屽揩鐓с�嶏細淇濆瓨鏃朵粠涓绘暟鎹甫鍑猴紝鏌ヨ鏃剁敤涓绘暟鎹渶鏂板�艰鐩栵紱
+-- 涓绘暟鎹鍒犳垨鍘嗗彶鑴忔暟鎹椂鍥為��鍒板揩鐓э紝淇濊瘉鑰佽褰曚粛鍙锛堝嵆銆岀壒鍒殑鍙互鎵嬫墦銆嶏級
+-- 3. id 鍒椾竴寰� NULL 鍏佽锛岄伩鍏嶈縼绉诲崱浣忓巻鍙叉暟鎹�
+--
+-- 骞傜瓑锛氬叏閮ㄧ敤 information_schema 鍒ゆ柇鍚庡啀 ALTER锛屽彲閲嶅鎵ц
+-- ============================================================
+
+-- ---------- 閫氱敤锛氭柊澧炲垪鐨勮繃绋嬪紡鍐欐硶锛圡ySQL 鏃� ADD COLUMN IF NOT EXISTS锛� ----------
+DROP PROCEDURE IF EXISTS sp_safety_add_col;
+DELIMITER $$
+CREATE PROCEDURE sp_safety_add_col(IN p_table VARCHAR(64), IN p_col VARCHAR(64),
+ IN p_def VARCHAR(255), IN p_comment VARCHAR(255), IN p_after VARCHAR(64))
+BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = p_table AND column_name = p_col) THEN
+ SET @s = CONCAT('ALTER TABLE `', p_table, '` ADD COLUMN `', p_col, '` ', p_def,
+ ' COMMENT ''', p_comment, ''' AFTER `', p_after, '`');
+ PREPARE st FROM @s; EXECUTE st; DEALLOCATE PREPARE st;
+ END IF;
+ IF NOT EXISTS (SELECT 1 FROM information_schema.statistics
+ WHERE table_schema = DATABASE() AND table_name = p_table AND index_name = CONCAT('idx_', p_col)) THEN
+ SET @s2 = CONCAT('CREATE INDEX `idx_', p_col, '` ON `', p_table, '` (`', p_col, '`)');
+ PREPARE st2 FROM @s2; EXECUTE st2; DEALLOCATE PREPARE st2;
+ END IF;
+END$$
+DELIMITER ;
+
+-- ---------- 1. 瀹夊叏缁勭粐鏋舵瀯锛氳礋璐d汉 ----------
+CALL sp_safety_add_col('safety_org', 'leader_id', 'bigint NULL', '璐熻矗浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'name');
+
+-- ---------- 2. 宸℃鐐逛綅锛氭墍灞炶溅闂� + 璐d换浜� ----------
+CALL sp_safety_add_col('safety_inspection_point', 'workshop_id', 'bigint NULL', '鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop.id锛�', 'point_type');
+CALL sp_safety_add_col('safety_inspection_point', 'owner_id', 'bigint NULL', '璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'inspect_cycle');
+
+-- ---------- 3. 宸℃璁板綍锛氬贰妫�浜� ----------
+CALL sp_safety_add_col('safety_inspection', 'inspector_id', 'bigint NULL', '宸℃浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'inspector');
+
+-- ---------- 4. 闅愭偅锛氫笂鎶ヤ汉 / 鏁存敼璐d换浜� / 澶嶆煡浜� ----------
+CALL sp_safety_add_col('safety_hazard', 'reporter_id', 'bigint NULL', '涓婃姤浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'reporter');
+CALL sp_safety_add_col('safety_hazard', 'assignee_id', 'bigint NULL', '鏁存敼璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'assignee');
+CALL sp_safety_add_col('safety_hazard', 'rechecker_id', 'bigint NULL', '澶嶆煡浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'rechecker');
+
+-- ---------- 5. 楂樺嵄浣滀笟绁細浣滀笟杞﹂棿 / 鐢宠浜� / 瀹℃壒浜� / 鐩戞姢浜� ----------
+CALL sp_safety_add_col('safety_work_permit', 'workshop_id', 'bigint NULL', '浣滀笟杞﹂棿锛堝叧鑱� mes_md_workshop.id锛�', 'permit_type');
+CALL sp_safety_add_col('safety_work_permit', 'applicant_id', 'bigint NULL', '鐢宠浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'applicant');
+CALL sp_safety_add_col('safety_work_permit', 'approver_id', 'bigint NULL', '瀹℃壒浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'approver');
+CALL sp_safety_add_col('safety_work_permit', 'guardian_id', 'bigint NULL', '鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'guardian');
+
+-- ---------- 6. 浣滀笟鐩戞姢璁板綍锛氱洃鎶や汉 ----------
+CALL sp_safety_add_col('safety_work_permit_monitor', 'guardian_id', 'bigint NULL', '鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'guardian');
+
+-- ---------- 7. 搴旀�ョ墿璧勶細淇濈浜� ----------
+CALL sp_safety_add_col('safety_material', 'manager_id', 'bigint NULL', '淇濈浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'manager');
+
+-- ---------- 8. 瀹夊叏鍩硅锛氳甯�/缁勭粐浜� ----------
+CALL sp_safety_add_col('safety_training', 'trainer_id', 'bigint NULL', '璁插笀/缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'trainer');
+
+-- ---------- 9. 娑堥槻婕旂粌锛氱粍缁囦汉 ----------
+CALL sp_safety_add_col('safety_drill', 'organizer_id', 'bigint NULL', '缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'organizer');
+
+-- ---------- 10. 浜嬫晠鐧昏锛氭墍灞炶溅闂� + 鐧昏浜� ----------
+CALL sp_safety_add_col('safety_accident', 'workshop_id', 'bigint NULL', '鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop.id锛�', 'accident_type');
+CALL sp_safety_add_col('safety_accident', 'reporter_id', 'bigint NULL', '鐧昏浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛�', 'reporter');
+
+-- ---------- 11. 鍘熸枃鏈垪娉ㄩ噴鏀逛负銆屽揩鐓с�嶈涔� ----------
+ALTER TABLE `safety_org` MODIFY COLUMN `leader_name` varchar(50) DEFAULT NULL COMMENT '璐熻矗浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_inspection_point` MODIFY COLUMN `workshop_name` varchar(100) DEFAULT NULL COMMENT '鎵�灞炶溅闂达紙蹇収锛岀敱杞﹂棿涓绘暟鎹甫鍑猴級',
+ MODIFY COLUMN `owner_name` varchar(50) DEFAULT NULL COMMENT '璐d换浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_inspection` MODIFY COLUMN `inspector` varchar(50) DEFAULT NULL COMMENT '宸℃浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_hazard` MODIFY COLUMN `reporter` varchar(50) DEFAULT NULL COMMENT '涓婃姤浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�',
+ MODIFY COLUMN `assignee` varchar(50) DEFAULT NULL COMMENT '鏁存敼璐d换浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�',
+ MODIFY COLUMN `rechecker` varchar(50) DEFAULT NULL COMMENT '澶嶆煡浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_work_permit` MODIFY COLUMN `workshop_name` varchar(100) DEFAULT NULL COMMENT '浣滀笟杞﹂棿锛堝揩鐓э紝鐢辫溅闂翠富鏁版嵁甯﹀嚭锛�',
+ MODIFY COLUMN `applicant` varchar(50) DEFAULT NULL COMMENT '鐢宠浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�',
+ MODIFY COLUMN `approver` varchar(50) DEFAULT NULL COMMENT '瀹℃壒浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�',
+ MODIFY COLUMN `guardian` varchar(50) DEFAULT NULL COMMENT '鐩戞姢浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_work_permit_monitor` MODIFY COLUMN `guardian` varchar(50) DEFAULT NULL COMMENT '鐩戞姢浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_material` MODIFY COLUMN `manager` varchar(50) DEFAULT NULL COMMENT '淇濈浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_training` MODIFY COLUMN `trainer` varchar(50) DEFAULT NULL COMMENT '璁插笀/缁勭粐浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_drill` MODIFY COLUMN `organizer` varchar(50) DEFAULT NULL COMMENT '缁勭粐浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+ALTER TABLE `safety_accident` MODIFY COLUMN `workshop_name` varchar(100) DEFAULT NULL COMMENT '鎵�灞炶溅闂达紙蹇収锛岀敱杞﹂棿涓绘暟鎹甫鍑猴級',
+ MODIFY COLUMN `reporter` varchar(50) DEFAULT NULL COMMENT '鐧昏浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛�';
+
+-- ---------- 12. 娓呯悊涓存椂杩囩▼ ----------
+DROP PROCEDURE IF EXISTS sp_safety_add_col;
+
+-- ---------- 13. 鏍¢獙 ----------
+SELECT TABLE_NAME, COLUMN_NAME, COLUMN_COMMENT
+ FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND TABLE_NAME LIKE 'safety%'
+ AND (COLUMN_NAME LIKE '%\_id' OR COLUMN_NAME IN ('inspector','reporter','assignee','rechecker','applicant','approver','guardian','manager','trainer','organizer','workshop_name','leader_name'))
+ ORDER BY TABLE_NAME, ORDINAL_POSITION;
diff --git a/sql/mysql/safety_module_menu_20261029.sql b/sql/mysql/safety_module_menu_20261029.sql
new file mode 100644
index 0000000..6ff1959
--- /dev/null
+++ b/sql/mysql/safety_module_menu_20261029.sql
@@ -0,0 +1,125 @@
+-- ============================================================
+-- 瀹夊叏鐢熶骇妯″潡 - 鑿滃崟 + 瑙掕壊鎺堟潈
+-- 鐢熸垚鏃堕棿锛�2026-10-29
+-- 璇存槑锛氶《绾ц彍鍗曘�屽畨鍏ㄧ敓浜с��/safety锛宻ort=67锛堟帓鍦ㄨ兘鑰楃鐞� 65 涓庡敭鍚庣鐞� 70 涔嬮棿锛�
+-- 鏈剼鏈箓绛夛紝鍙噸澶嶆墽琛�
+-- ============================================================
+
+-- ---------- 1. 椤剁骇鑿滃崟 ----------
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES (1075600, '瀹夊叏鐢熶骇', '', 1, 67, 0, '/safety', 'ep:first-aid-kit', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0')
+ON DUPLICATE KEY UPDATE `name`=VALUES(`name`), `sort`=VALUES(`sort`), `path`=VALUES(`path`), `icon`=VALUES(`icon`), `status`=0, `deleted`=b'0';
+
+-- ---------- 2. 浜岀骇鐩綍 ----------
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES
+(1075601, '瀹夊叏缁勭粐鏋舵瀯', '', 2, 1, 1075600, 'org', 'ep:user-filled', 'safety/org/index', 'SafetyOrg', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075602, '鐗圭浣滀笟璇�', '', 2, 2, 1075600, 'cert', 'ep:postcard', 'safety/cert/index', 'SafetyCert', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075603, '瀹夊叏宸℃', '', 1, 3, 1075600, 'inspection', 'ep:view', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075604, '闅愭偅闂幆', '', 1, 4, 1075600, 'hazard', 'ep:warning-filled', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075605, '楂樺嵄浣滀笟绁�', '', 2, 5, 1075600, 'permit', 'ep:document-checked', 'safety/permit/index', 'SafetyPermit', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075606, '搴旀�ョ墿璧�', '', 1, 6, 1075600, 'material', 'ep:box', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075607, '鍩硅婕旂粌', '', 1, 7, 1075600, 'training', 'ep:reading', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075608, '浜嬫晠鐧昏', '', 2, 8, 1075600, 'accident', 'ep:first-aid-kit', 'safety/accident/index', 'SafetyAccident', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075609, '鏍囧噯鍖栧彴璐�', '', 2, 9, 1075600, 'ledger', 'ep:files', 'safety/ledger/index', 'SafetyLedger', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0')
+ON DUPLICATE KEY UPDATE `name`=VALUES(`name`), `sort`=VALUES(`sort`), `path`=VALUES(`path`), `component`=VALUES(`component`), `component_name`=VALUES(`component_name`), `status`=0, `deleted`=b'0';
+
+-- ---------- 3. 涓夌骇椤甸潰 ----------
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES
+(1075610, '宸℃鐐逛綅', '', 2, 1, 1075603, 'point', 'ep:location', 'safety/inspection/point/index', 'SafetyInspectionPoint', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075611, '宸℃璁板綍', '', 2, 2, 1075603, 'record', 'ep:tickets', 'safety/inspection/record/index', 'SafetyInspectionRecord', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075612, '闅愭偅鍙拌处', '', 2, 1, 1075604, 'list', 'ep:list', 'safety/hazard/index', 'SafetyHazard', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075613, '鐗╄祫鍙拌处', '', 2, 1, 1075606, 'list', 'ep:goods', 'safety/material/index', 'SafetyMaterial', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075614, '鍑哄叆搴撴祦姘�', '', 2, 2, 1075606, 'stock', 'ep:sort', 'safety/material/stock/index', 'SafetyMaterialStock', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075615, '瀹夊叏鍩硅', '', 2, 1, 1075607, 'training', 'ep:notebook', 'safety/training/index', 'SafetyTraining', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075616, '娑堥槻婕旂粌', '', 2, 2, 1075607, 'drill', 'ep:alarm-clock', 'safety/drill/index', 'SafetyDrill', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0')
+ON DUPLICATE KEY UPDATE `name`=VALUES(`name`), `sort`=VALUES(`sort`), `path`=VALUES(`path`), `component`=VALUES(`component`), `component_name`=VALUES(`component_name`), `status`=0, `deleted`=b'0';
+
+-- ---------- 4. 鎸夐挳鏉冮檺 ----------
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES
+-- 缁勭粐鏋舵瀯
+(1075620, '缁勭粐鏌ヨ', 'safety:org:query', 3, 1, 1075601, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075621, '缁勭粐鏂板', 'safety:org:create', 3, 2, 1075601, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075622, '缁勭粐淇敼', 'safety:org:update', 3, 3, 1075601, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075623, '缁勭粐鍒犻櫎', 'safety:org:delete', 3, 4, 1075601, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+-- 鐗圭浣滀笟璇�
+(1075624, '璇佷欢鏌ヨ', 'safety:cert:query', 3, 1, 1075602, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075625, '璇佷欢鏂板', 'safety:cert:create', 3, 2, 1075602, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075626, '璇佷欢淇敼', 'safety:cert:update', 3, 3, 1075602, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075627, '璇佷欢鍒犻櫎', 'safety:cert:delete', 3, 4, 1075602, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075628, '璇佷欢瀵煎嚭', 'safety:cert:export', 3, 5, 1075602, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+-- 宸℃鐐逛綅
+(1075629, '鐐逛綅鏌ヨ', 'safety:inspection-point:query', 3, 1, 1075610, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075630, '鐐逛綅鏂板', 'safety:inspection-point:create', 3, 2, 1075610, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075631, '鐐逛綅淇敼', 'safety:inspection-point:update', 3, 3, 1075610, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075632, '鐐逛綅鍒犻櫎', 'safety:inspection-point:delete', 3, 4, 1075610, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+-- 宸℃璁板綍
+(1075633, '宸℃鏌ヨ', 'safety:inspection:query', 3, 1, 1075611, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075634, '宸℃鏂板', 'safety:inspection:create', 3, 2, 1075611, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075635, '宸℃淇敼', 'safety:inspection:update', 3, 3, 1075611, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075636, '宸℃鍒犻櫎', 'safety:inspection:delete', 3, 4, 1075611, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075637, '宸℃瀵煎嚭', 'safety:inspection:export', 3, 5, 1075611, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+-- 闅愭偅
+(1075638, '闅愭偅鏌ヨ', 'safety:hazard:query', 3, 1, 1075612, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075639, '闅愭偅涓婃姤', 'safety:hazard:create', 3, 2, 1075612, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075640, '闅愭偅淇敼', 'safety:hazard:update', 3, 3, 1075612, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075641, '闅愭偅鍒嗘淳', 'safety:hazard:assign', 3, 4, 1075612, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075642, '闅愭偅鏁存敼', 'safety:hazard:rectify', 3, 5, 1075612, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075643, '闅愭偅澶嶆煡', 'safety:hazard:recheck', 3, 6, 1075612, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075644, '闅愭偅鍒犻櫎', 'safety:hazard:delete', 3, 7, 1075612, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075645, '闅愭偅瀵煎嚭', 'safety:hazard:export', 3, 8, 1075612, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+-- 楂樺嵄浣滀笟绁�
+(1075646, '浣滀笟绁ㄦ煡璇�', 'safety:permit:query', 3, 1, 1075605, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075647, '浣滀笟绁ㄧ敵璇�', 'safety:permit:create', 3, 2, 1075605, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075648, '浣滀笟绁ㄤ慨鏀�', 'safety:permit:update', 3, 3, 1075605, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075649, '浣滀笟绁ㄥ鎵�', 'safety:permit:approve', 3, 4, 1075605, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075650, '浣滀笟绁ㄥ垹闄�', 'safety:permit:delete', 3, 5, 1075605, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075651, '浣滀笟绁ㄥ鍑�', 'safety:permit:export', 3, 6, 1075605, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+-- 鐗╄祫鍙拌处
+(1075652, '鐗╄祫鏌ヨ', 'safety:material:query', 3, 1, 1075613, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075653, '鐗╄祫鏂板', 'safety:material:create', 3, 2, 1075613, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075654, '鐗╄祫淇敼', 'safety:material:update', 3, 3, 1075613, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075655, '鐗╄祫鍒犻櫎', 'safety:material:delete', 3, 4, 1075613, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075656, '鐗╄祫瀵煎嚭', 'safety:material:export', 3, 5, 1075613, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+-- 鍑哄叆搴撴祦姘�
+(1075657, '娴佹按鏌ヨ', 'safety:material-stock:query', 3, 1, 1075614, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075658, '鍏ュ簱鐧昏', 'safety:material-stock:in', 3, 2, 1075614, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075659, '鍑哄簱鐧昏', 'safety:material-stock:out', 3, 3, 1075614, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075660, '娴佹按瀵煎嚭', 'safety:material-stock:export', 3, 4, 1075614, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+-- 鍩硅
+(1075661, '鍩硅鏌ヨ', 'safety:training:query', 3, 1, 1075615, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075662, '鍩硅鏂板', 'safety:training:create', 3, 2, 1075615, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075663, '鍩硅淇敼', 'safety:training:update', 3, 3, 1075615, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075664, '鍩硅鍒犻櫎', 'safety:training:delete', 3, 4, 1075615, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075665, '鍩硅瀵煎嚭', 'safety:training:export', 3, 5, 1075615, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+-- 婕旂粌
+(1075666, '婕旂粌鏌ヨ', 'safety:drill:query', 3, 1, 1075616, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075667, '婕旂粌鏂板', 'safety:drill:create', 3, 2, 1075616, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075668, '婕旂粌淇敼', 'safety:drill:update', 3, 3, 1075616, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075669, '婕旂粌鍒犻櫎', 'safety:drill:delete', 3, 4, 1075616, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075670, '婕旂粌瀵煎嚭', 'safety:drill:export', 3, 5, 1075616, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+-- 浜嬫晠
+(1075671, '浜嬫晠鏌ヨ', 'safety:accident:query', 3, 1, 1075608, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075672, '浜嬫晠鐧昏', 'safety:accident:create', 3, 2, 1075608, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075673, '浜嬫晠淇敼', 'safety:accident:update', 3, 3, 1075608, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075674, '浜嬫晠鍒犻櫎', 'safety:accident:delete', 3, 4, 1075608, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075675, '浜嬫晠瀵煎嚭', 'safety:accident:export', 3, 5, 1075608, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+-- 鏍囧噯鍖栧彴璐�
+(1075676, '鍙拌处鏌ヨ', 'safety:ledger:query', 3, 1, 1075609, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075677, '鍙拌处瀵煎嚭', 'safety:ledger:export', 3, 2, 1075609, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+-- 闄勪欢涓婁紶锛堢Щ鍔ㄧ鎷嶇収锛�
+(1075678, '闄勪欢涓婁紶', 'safety:file:upload', 3, 1, 1075600, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0')
+ON DUPLICATE KEY UPDATE `name`=VALUES(`name`), `permission`=VALUES(`permission`), `status`=0, `deleted`=b'0';
+
+-- ---------- 5. 瓒呯瑙掕壊鎺堟潈锛坮ole_id=1 涓鸿秴绾х鐞嗗憳锛屽疄闄呯敱 hasAnySuperAdmin 鍏滃簳锛涙澶勬巿鏉冪粰鏅�氳鑹� 2锛� ----------
+INSERT INTO `system_role_menu` (`role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`)
+SELECT 2, m.`id`, '1', NOW(), '1', NOW(), b'0', 1
+FROM `system_menu` m
+LEFT JOIN `system_role_menu` rm ON rm.`role_id` = 2 AND rm.`menu_id` = m.`id` AND rm.`deleted` = b'0' AND rm.`tenant_id` = 1
+WHERE m.`id` BETWEEN 1075600 AND 1075678 AND m.`deleted` = b'0' AND rm.`id` IS NULL;
+
+-- ---------- 6. 鏍¢獙 ----------
+SELECT COUNT(*) AS safety_menus FROM `system_menu` WHERE `id` BETWEEN 1075600 AND 1075678 AND `deleted` = b'0';
+SELECT `id`, `name`, `parent_id`, `path`, `component` FROM `system_menu` WHERE `id` BETWEEN 1075600 AND 1075616 AND `deleted` = b'0' ORDER BY `id`;
diff --git a/sql/mysql/safety_module_tables_20261029.sql b/sql/mysql/safety_module_tables_20261029.sql
new file mode 100644
index 0000000..c615789
--- /dev/null
+++ b/sql/mysql/safety_module_tables_20261029.sql
@@ -0,0 +1,343 @@
+-- ============================================================
+-- 瀹夊叏鐢熶骇妯″潡 - 琛ㄧ粨鏋� + 鑿滃崟锛堢數鍔涜涓氬畨鍏ㄧ敓浜ф爣鍑嗗寲锛�
+-- 鐢熸垚鏃堕棿锛�2026-10-29
+-- 閫傜敤锛歁ySQL 8.4+
+-- 鍐呭锛�
+-- 1. 瀹夊叏缁勭粐鏋舵瀯 safety_org
+-- 2. 鐗圭浣滀笟璇佸彴璐� safety_certificate锛堢數宸ヨ瘉/楂樺帇鎿嶄綔璇佺瓑锛屽埌鏈熼璀︼級
+-- 3. 瀹夊叏宸℃鐐逛綅 safety_inspection_point
+-- 4. 瀹夊叏宸℃璁板綍 safety_inspection
+-- 5. 闅愭偅鐧昏涓庨棴鐜� safety_hazard锛堜笂鎶�-鍒嗘淳-鏁存敼-澶嶆煡锛�
+-- 6. 楂樺嵄浣滀笟绁� safety_work_permit锛堝姩鐏�/楂樺帇甯︾數/鏈夐檺绌洪棿绛夛級
+-- 7. 浣滀笟鐩戞姢璁板綍 safety_work_permit_monitor
+-- 8. 搴旀�ョ墿璧勫彴璐� safety_material锛堢粷缂�/鍗卞寲/娑堥槻锛�
+-- 9. 鐗╄祫鍑哄叆搴撴祦姘� safety_material_stock
+-- 10. 瀹夊叏鍩硅璁板綍 safety_training
+-- 11. 娑堥槻婕旂粌璁板綍 safety_drill
+-- 12. 浜嬫晠鐧昏 safety_accident
+-- 璇存槑锛氭湰鑴氭湰骞傜瓑锛圛F NOT EXISTS / ON DUPLICATE KEY UPDATE锛夛紝鍙噸澶嶆墽琛�
+-- ============================================================
+
+-- ---------- 1. 瀹夊叏缁勭粐鏋舵瀯 ----------
+CREATE TABLE IF NOT EXISTS `safety_org` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `parent_id` bigint NOT NULL DEFAULT 0 COMMENT '鐖剁骇缂栧彿锛�0 涓洪《绾э級',
+ `name` varchar(100) NOT NULL COMMENT '缁勭粐鍚嶇О',
+ `leader_name` varchar(50) DEFAULT NULL COMMENT '璐熻矗浜哄鍚�',
+ `leader_phone` varchar(30) DEFAULT NULL COMMENT '璐熻矗浜虹數璇�',
+ `member_names` varchar(500) DEFAULT NULL COMMENT '鎴愬憳濮撳悕锛岄�楀彿鍒嗛殧',
+ `duty` varchar(500) DEFAULT NULL COMMENT '瀹夊叏鑱岃矗',
+ `sort` int NOT NULL DEFAULT 0 COMMENT '鏄剧ず椤哄簭',
+ `status` tinyint NOT NULL DEFAULT 0 COMMENT '鐘舵�侊細0-鍚敤锛�1-鍋滅敤',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`),
+ KEY `idx_parent_id` (`parent_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹夊叏鐢熶骇-缁勭粐鏋舵瀯';
+
+-- ---------- 2. 鐗圭浣滀笟璇佸彴璐︼紙鍒版湡鑷姩棰勮锛� ----------
+CREATE TABLE IF NOT EXISTS `safety_certificate` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `employee_name` varchar(50) NOT NULL COMMENT '鎸佽瘉浜哄鍚�',
+ `employee_no` varchar(50) DEFAULT NULL COMMENT '宸ュ彿',
+ `dept_name` varchar(100) DEFAULT NULL COMMENT '鎵�灞為儴闂�',
+ `cert_type` varchar(50) NOT NULL COMMENT '璇佷欢绫诲瀷锛歀OW_VOLTAGE_ELECTRICIAN/HIGH_VOLTAGE_OPERATION/WELDING/HOIST/HEIGHT/LIMITED_SPACE/WORK_AT_HEIGHT/OTHER',
+ `cert_no` varchar(64) NOT NULL COMMENT '璇佷欢缂栧彿',
+ `issuer` varchar(100) DEFAULT NULL COMMENT '鍙戣瘉鏈哄叧',
+ `issue_date` date DEFAULT NULL COMMENT '鍙戣瘉鏃ユ湡',
+ `expire_date` date NOT NULL COMMENT '鏈夋晥鏈熻嚦',
+ `review_date` date DEFAULT NULL COMMENT '涓嬫澶嶅鏃ユ湡',
+ `warn_days` int NOT NULL DEFAULT 30 COMMENT '鍒版湡棰勮鎻愬墠澶╂暟',
+ `status` varchar(20) NOT NULL DEFAULT 'VALID' COMMENT '鐘舵�侊細VALID-鏈夋晥锛孍XPIRING-鍗冲皢鍒版湡锛孍XPIRED-宸茶繃鏈燂紝REVOKED-宸叉敞閿�',
+ `attachment` varchar(500) DEFAULT NULL COMMENT '璇佷欢鎵弿浠� URL锛岄�楀彿鍒嗛殧',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`),
+ KEY `idx_employee_name` (`employee_name`),
+ KEY `idx_cert_type` (`cert_type`),
+ KEY `idx_expire_date` (`expire_date`),
+ KEY `idx_status` (`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹夊叏鐢熶骇-鐗圭浣滀笟璇佸彴璐�';
+
+-- ---------- 3. 瀹夊叏宸℃鐐逛綅 ----------
+CREATE TABLE IF NOT EXISTS `safety_inspection_point` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `code` varchar(64) NOT NULL COMMENT '鐐逛綅缂栫爜',
+ `name` varchar(100) NOT NULL COMMENT '鐐逛綅鍚嶇О',
+ `point_type` varchar(30) NOT NULL COMMENT '鐐逛綅绫诲瀷锛欻IGH_VOLTAGE_ROOM-楂樺帇閰嶇數瀹わ紝UNIT_AREA-鏈虹粍鍖猴紝DANGER_CHEMICAL-鍗卞寲鍝佸簱锛孎IRE_AREA-娑堥槻閲嶇偣閮ㄤ綅锛孫THER-鍏朵粬',
+ `workshop_name` varchar(100) DEFAULT NULL COMMENT '鎵�灞炶溅闂�/鍖哄煙',
+ `location` varchar(200) DEFAULT NULL COMMENT '鍏蜂綋浣嶇疆',
+ `inspect_items` varchar(2000) DEFAULT NULL COMMENT '宸℃椤圭洰娓呭崟锛屾寜琛屽垎闅�',
+ `inspect_cycle` varchar(20) NOT NULL DEFAULT 'DAILY' COMMENT '宸℃鍛ㄦ湡锛歋HIFT-姣忕彮锛孌AILY-姣忔棩锛學EEKLY-姣忓懆锛孧ONTHLY-姣忔湀',
+ `owner_name` varchar(50) DEFAULT NULL COMMENT '璐d换浜�',
+ `status` tinyint NOT NULL DEFAULT 0 COMMENT '鐘舵�侊細0-鍚敤锛�1-鍋滅敤',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_code` (`code`, `deleted`),
+ KEY `idx_point_type` (`point_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹夊叏鐢熶骇-宸℃鐐逛綅';
+
+-- ---------- 4. 瀹夊叏宸℃璁板綍 ----------
+CREATE TABLE IF NOT EXISTS `safety_inspection` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `point_id` bigint DEFAULT NULL COMMENT '宸℃鐐逛綅缂栧彿',
+ `point_name` varchar(100) DEFAULT NULL COMMENT '鐐逛綅鍚嶇О锛堝揩鐓э級',
+ `point_type` varchar(30) DEFAULT NULL COMMENT '鐐逛綅绫诲瀷锛堝揩鐓э級',
+ `inspect_time` datetime NOT NULL COMMENT '宸℃鏃堕棿',
+ `inspector` varchar(50) NOT NULL COMMENT '宸℃浜�',
+ `result` varchar(20) NOT NULL DEFAULT 'NORMAL' COMMENT '宸℃缁撴灉锛歂ORMAL-姝e父锛孉BNORMAL-寮傚父',
+ `content` varchar(2000) DEFAULT NULL COMMENT '宸℃鍐呭涓庢儏鍐�',
+ `photo_urls` varchar(2000) DEFAULT NULL COMMENT '鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧',
+ `hazard_count` int NOT NULL DEFAULT 0 COMMENT '鏈鍙戠幇鐨勯殣鎮f暟',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`),
+ KEY `idx_point_id` (`point_id`),
+ KEY `idx_inspect_time` (`inspect_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹夊叏鐢熶骇-宸℃璁板綍';
+
+-- ---------- 5. 闅愭偅鐧昏涓庨棴鐜紙涓婃姤-鍒嗘淳-鏁存敼-澶嶆煡锛� ----------
+CREATE TABLE IF NOT EXISTS `safety_hazard` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `code` varchar(64) NOT NULL COMMENT '闅愭偅缂栧彿',
+ `title` varchar(200) NOT NULL COMMENT '闅愭偅鏍囬',
+ `level` varchar(20) NOT NULL DEFAULT 'GENERAL' COMMENT '闅愭偅绛夌骇锛欸ENERAL-涓�鑸紝MAJOR-閲嶅ぇ',
+ `source` varchar(30) NOT NULL DEFAULT 'INSPECTION' COMMENT '鏉ユ簮锛欼NSPECTION-宸℃鍙戠幇锛孲ELF_CHECK-鑷煡涓婃姤锛孯EPORT-鍛樺伐涓婃姤锛孍XTERNAL-澶栭儴妫�鏌�',
+ `inspection_id` bigint DEFAULT NULL COMMENT '鍏宠仈宸℃璁板綍缂栧彿',
+ `point_id` bigint DEFAULT NULL COMMENT '鍏宠仈宸℃鐐逛綅缂栧彿',
+ `point_name` varchar(100) DEFAULT NULL COMMENT '鐐逛綅鍚嶇О',
+ `location` varchar(200) DEFAULT NULL COMMENT '闅愭偅浣嶇疆',
+ `description` varchar(2000) DEFAULT NULL COMMENT '闅愭偅鎻忚堪',
+ `photo_urls` varchar(2000) DEFAULT NULL COMMENT '鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧锛堢Щ鍔ㄧ鎷嶇収涓婁紶锛�',
+ `reporter` varchar(50) NOT NULL COMMENT '涓婃姤浜�',
+ `report_time` datetime NOT NULL COMMENT '涓婃姤鏃堕棿',
+ `assignee` varchar(50) DEFAULT NULL COMMENT '鏁存敼璐d换浜猴紙鍒嗘淳锛�',
+ `assign_time` datetime DEFAULT NULL COMMENT '鍒嗘淳鏃堕棿',
+ `rectify_deadline` date DEFAULT NULL COMMENT '鏁存敼鏈熼檺',
+ `rectify_desc` varchar(2000) DEFAULT NULL COMMENT '鏁存敼鎺柦涓庣粨鏋�',
+ `rectify_photo_urls` varchar(2000) DEFAULT NULL COMMENT '鏁存敼鍚庣収鐗� URL锛岄�楀彿鍒嗛殧',
+ `rectify_time` datetime DEFAULT NULL COMMENT '鏁存敼瀹屾垚鏃堕棿',
+ `rechecker` varchar(50) DEFAULT NULL COMMENT '澶嶆煡浜�',
+ `recheck_time` datetime DEFAULT NULL COMMENT '澶嶆煡鏃堕棿',
+ `recheck_result` varchar(20) DEFAULT NULL COMMENT '澶嶆煡缁撹锛歅ASSED-閫氳繃锛孯EJECTED-涓嶉�氳繃閫�鍥炴暣鏀�',
+ `recheck_remark` varchar(500) DEFAULT NULL COMMENT '澶嶆煡鎰忚',
+ `status` varchar(20) NOT NULL DEFAULT 'REPORTED' COMMENT '鐘舵�侊細REPORTED-宸蹭笂鎶ワ紝ASSIGNED-宸插垎娲撅紝RECTIFYING-鏁存敼涓紝RECHECKING-寰呭鏌ワ紝CLOSED-宸查棴鐜紝REJECTED-澶嶆煡涓嶉�氳繃',
+ `close_time` datetime DEFAULT NULL COMMENT '闂幆鏃堕棿',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_code` (`code`, `deleted`),
+ KEY `idx_status` (`status`),
+ KEY `idx_report_time` (`report_time`),
+ KEY `idx_inspection_id` (`inspection_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹夊叏鐢熶骇-闅愭偅鐧昏涓庨棴鐜�';
+
+-- ---------- 6. 楂樺嵄浣滀笟绁� ----------
+CREATE TABLE IF NOT EXISTS `safety_work_permit` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `code` varchar(64) NOT NULL COMMENT '浣滀笟绁ㄧ紪鍙�',
+ `permit_type` varchar(30) NOT NULL COMMENT '浣滀笟绫诲瀷锛欻OT_WORK-鍔ㄧ伀浣滀笟锛孡IVE_HIGH_VOLTAGE-楂樺帇甯︾數浣滀笟锛孡IMITED_SPACE-鏈夐檺绌洪棿浣滀笟锛學ORK_AT_HEIGHT-楂樺浣滀笟锛孡IFTING-鍚婅浣滀笟锛孴EMP_ELECTRIC-涓存椂鐢ㄧ數浣滀笟锛孫THER-鍏朵粬',
+ `title` varchar(200) NOT NULL COMMENT '浣滀笟鍚嶇О',
+ `workshop_name` varchar(100) DEFAULT NULL COMMENT '浣滀笟鍖哄煙/杞﹂棿',
+ `location` varchar(200) DEFAULT NULL COMMENT '浣滀笟鍦扮偣',
+ `work_content` varchar(2000) DEFAULT NULL COMMENT '浣滀笟鍐呭涓庤寖鍥�',
+ `applicant` varchar(50) NOT NULL COMMENT '鐢宠浜�',
+ `apply_time` datetime NOT NULL COMMENT '鐢宠鏃堕棿',
+ `plan_start_time` datetime NOT NULL COMMENT '璁″垝寮�濮嬫椂闂�',
+ `plan_end_time` datetime NOT NULL COMMENT '璁″垝缁撴潫鏃堕棿',
+ `actual_start_time` datetime DEFAULT NULL COMMENT '瀹為檯寮�濮嬫椂闂�',
+ `actual_end_time` datetime DEFAULT NULL COMMENT '瀹為檯缁撴潫鏃堕棿',
+ `risk_level` varchar(20) NOT NULL DEFAULT 'NORMAL' COMMENT '椋庨櫓绛夌骇锛歀OW-浣庯紝NORMAL-涓�鑸紝HIGH-楂橈紝VERY_HIGH-鏋侀珮',
+ `safety_measures` varchar(2000) DEFAULT NULL COMMENT '瀹夊叏鎺柦',
+ `approver` varchar(50) DEFAULT NULL COMMENT '瀹℃壒浜�',
+ `approve_time` datetime DEFAULT NULL COMMENT '瀹℃壒鏃堕棿',
+ `approve_comment` varchar(500) DEFAULT NULL COMMENT '瀹℃壒鎰忚',
+ `guardian` varchar(50) DEFAULT NULL COMMENT '鐩戞姢浜�',
+ `status` varchar(20) NOT NULL DEFAULT 'DRAFT' COMMENT '鐘舵�侊細DRAFT-鑽夌锛孭ENDING-寰呭鎵癸紝APPROVED-宸叉壒鍑嗭紝REJECTED-宸查┏鍥烇紝IN_PROGRESS-浣滀笟涓紝CLOSED-宸插畬缁擄紝CANCELLED-宸蹭綔搴�',
+ `attachment` varchar(2000) DEFAULT NULL COMMENT '浣滀笟绁ㄩ檮浠� URL锛岄�楀彿鍒嗛殧',
+ `photo_urls` varchar(2000) DEFAULT NULL COMMENT '鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_code` (`code`, `deleted`),
+ KEY `idx_permit_type` (`permit_type`),
+ KEY `idx_status` (`status`),
+ KEY `idx_plan_start_time` (`plan_start_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹夊叏鐢熶骇-楂樺嵄浣滀笟绁�';
+
+-- ---------- 7. 浣滀笟鐩戞姢璁板綍 ----------
+CREATE TABLE IF NOT EXISTS `safety_work_permit_monitor` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `permit_id` bigint NOT NULL COMMENT '浣滀笟绁ㄧ紪鍙�',
+ `monitor_time` datetime NOT NULL COMMENT '鐩戞姢鏃堕棿',
+ `guardian` varchar(50) NOT NULL COMMENT '鐩戞姢浜�',
+ `monitor_content` varchar(1000) DEFAULT NULL COMMENT '鐩戞姢鍐呭涓庢儏鍐�',
+ `abnormal` varchar(500) DEFAULT NULL COMMENT '寮傚父鎯呭喌涓庡缃�',
+ `photo_urls` varchar(2000) DEFAULT NULL COMMENT '鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`),
+ KEY `idx_permit_id` (`permit_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹夊叏鐢熶骇-浣滀笟鐩戞姢璁板綍';
+
+-- ---------- 8. 搴旀��/瀹夊叏鐗╄祫鍙拌处 ----------
+CREATE TABLE IF NOT EXISTS `safety_material` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `code` varchar(64) NOT NULL COMMENT '鐗╄祫缂栫爜',
+ `name` varchar(100) NOT NULL COMMENT '鐗╄祫鍚嶇О',
+ `category` varchar(30) NOT NULL COMMENT '绫诲埆锛欼NSULATING-鐢靛姏缁濈紭锛孒AZARD_CHEMICAL-鍗卞寲鍝侊紝FIRE-娑堥槻鐗╄祫锛孭PE-鍔充繚鐢ㄥ搧锛孫THER-鍏朵粬',
+ `spec` varchar(100) DEFAULT NULL COMMENT '瑙勬牸鍨嬪彿',
+ `unit` varchar(20) NOT NULL DEFAULT '涓�' COMMENT '璁¢噺鍗曚綅',
+ `stock_qty` decimal(18,3) NOT NULL DEFAULT 0 COMMENT '褰撳墠搴撳瓨鏁伴噺',
+ `safe_stock` decimal(18,3) NOT NULL DEFAULT 0 COMMENT '瀹夊叏搴撳瓨锛堜綆浜庡垯棰勮锛�',
+ `storage_location` varchar(100) DEFAULT NULL COMMENT '瀛樻斁浣嶇疆',
+ `expire_date` date DEFAULT NULL COMMENT '鏈夋晥鏈熻嚦锛堢粷缂�/鍗卞寲鍝佸繀濉級',
+ `validity_months` int DEFAULT NULL COMMENT '鏈夋晥鏈熸湀鏁帮紙濡傜粷缂樻墜濂� 6 涓湀锛�',
+ `manager` varchar(50) DEFAULT NULL COMMENT '淇濈浜�',
+ `status` tinyint NOT NULL DEFAULT 0 COMMENT '鐘舵�侊細0-鍚敤锛�1-鍋滅敤',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_code` (`code`, `deleted`),
+ KEY `idx_category` (`category`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹夊叏鐢熶骇-搴旀�ョ墿璧勫彴璐�';
+
+-- ---------- 9. 鐗╄祫鍑哄叆搴撴祦姘� ----------
+CREATE TABLE IF NOT EXISTS `safety_material_stock` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `material_id` bigint NOT NULL COMMENT '鐗╄祫缂栧彿',
+ `material_name` varchar(100) DEFAULT NULL COMMENT '鐗╄祫鍚嶇О锛堝揩鐓э級',
+ `category` varchar(30) DEFAULT NULL COMMENT '鐗╄祫绫诲埆锛堝揩鐓э級',
+ `biz_type` varchar(20) NOT NULL COMMENT '涓氬姟绫诲瀷锛欼N-鍏ュ簱锛孫UT-鍑哄簱',
+ `quantity` decimal(18,3) NOT NULL COMMENT '鏁伴噺',
+ `stock_before` decimal(18,3) NOT NULL DEFAULT 0 COMMENT '鎿嶄綔鍓嶅簱瀛�',
+ `stock_after` decimal(18,3) NOT NULL DEFAULT 0 COMMENT '鎿嶄綔鍚庡簱瀛�',
+ `biz_date` date NOT NULL COMMENT '涓氬姟鏃ユ湡',
+ `operator` varchar(50) NOT NULL COMMENT '缁忓姙浜�',
+ `receiver` varchar(50) DEFAULT NULL COMMENT '棰嗙敤浜猴紙鍑哄簱锛�',
+ `purpose` varchar(200) DEFAULT NULL COMMENT '鐢ㄩ��/鍘诲悜',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`),
+ KEY `idx_material_id` (`material_id`),
+ KEY `idx_biz_date` (`biz_date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹夊叏鐢熶骇-鐗╄祫鍑哄叆搴撴祦姘�';
+
+-- ---------- 10. 瀹夊叏鍩硅璁板綍 ----------
+CREATE TABLE IF NOT EXISTS `safety_training` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `title` varchar(200) NOT NULL COMMENT '鍩硅涓婚',
+ `training_type` varchar(30) NOT NULL DEFAULT 'SAFETY' COMMENT '鍩硅绫诲瀷锛歋AFETY-瀹夊叏鍩硅锛孲KILL-鎶�鑳藉煿璁紝LAW-娉曡瀹h疮锛孍MERGENCY-搴旀�ユ紨缁冨煿璁紝OTHER-鍏朵粬',
+ `train_date` date NOT NULL COMMENT '鍩硅鏃ユ湡',
+ `duration_hours` decimal(8,1) DEFAULT NULL COMMENT '鍩硅瀛︽椂',
+ `trainer` varchar(50) DEFAULT NULL COMMENT '璁插笀/缁勭粐浜�',
+ `location` varchar(200) DEFAULT NULL COMMENT '鍩硅鍦扮偣',
+ `participants` varchar(2000) DEFAULT NULL COMMENT '鍙傚姞浜哄憳濮撳悕锛岄�楀彿鍒嗛殧',
+ `participant_count` int NOT NULL DEFAULT 0 COMMENT '鍙傚姞浜烘暟',
+ `content` varchar(2000) DEFAULT NULL COMMENT '鍩硅鍐呭',
+ `exam_result` varchar(2000) DEFAULT NULL COMMENT '鑰冩牳鎯呭喌',
+ `attachment` varchar(2000) DEFAULT NULL COMMENT '绛惧埌琛�/璇句欢/鐓х墖 URL锛岄�楀彿鍒嗛殧',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`),
+ KEY `idx_train_date` (`train_date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹夊叏鐢熶骇-鍩硅璁板綍';
+
+-- ---------- 11. 娑堥槻婕旂粌璁板綍 ----------
+CREATE TABLE IF NOT EXISTS `safety_drill` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `title` varchar(200) NOT NULL COMMENT '婕旂粌鍚嶇О',
+ `drill_type` varchar(30) NOT NULL DEFAULT 'FIRE' COMMENT '婕旂粌绫诲瀷锛欶IRE-娑堥槻婕旂粌锛孍MERGENCY_EVAC-搴旀�ョ枏鏁o紝ELECTRIC_ACCIDENT-瑙︾數浜嬫晠锛孋HEMICAL_LEAK-鍗卞寲鍝佹硠婕忥紝OTHER-鍏朵粬',
+ `drill_date` date NOT NULL COMMENT '婕旂粌鏃ユ湡',
+ `location` varchar(200) DEFAULT NULL COMMENT '婕旂粌鍦扮偣',
+ `organizer` varchar(50) DEFAULT NULL COMMENT '缁勭粐浜�',
+ `participants` varchar(2000) DEFAULT NULL COMMENT '鍙傚姞浜哄憳濮撳悕锛岄�楀彿鍒嗛殧',
+ `participant_count` int NOT NULL DEFAULT 0 COMMENT '鍙傚姞浜烘暟',
+ `plan_desc` varchar(2000) DEFAULT NULL COMMENT '婕旂粌鏂规',
+ `process_desc` varchar(2000) DEFAULT NULL COMMENT '婕旂粌杩囩▼璁板綍',
+ `summary` varchar(2000) DEFAULT NULL COMMENT '婕旂粌鎬荤粨涓庢敼杩�',
+ `duration_minutes` int DEFAULT NULL COMMENT '婕旂粌鏃堕暱锛堝垎閽燂級',
+ `attachment` varchar(2000) DEFAULT NULL COMMENT '婕旂粌鐓х墖/璁板綍琛� URL锛岄�楀彿鍒嗛殧',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`),
+ KEY `idx_drill_date` (`drill_date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹夊叏鐢熶骇-娑堥槻婕旂粌璁板綍';
+
+-- ---------- 12. 瀹夊叏浜嬫晠鐧昏 ----------
+CREATE TABLE IF NOT EXISTS `safety_accident` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `code` varchar(64) NOT NULL COMMENT '浜嬫晠缂栧彿',
+ `title` varchar(200) NOT NULL COMMENT '浜嬫晠鍚嶇О',
+ `accident_type` varchar(30) NOT NULL COMMENT '浜嬫晠绫诲瀷锛欵LECTRIC_SHOCK-瑙︾數锛孎IRE-鐏伨锛孎ALL-楂樺鍧犺惤锛孫BJECT_STRIKE-鐗╀綋鎵撳嚮锛孧ECHANICAL-鏈烘浼ゅ锛孋HEMICAL-涓瘨绐掓伅锛孫THER-鍏朵粬',
+ `level` varchar(20) NOT NULL DEFAULT 'GENERAL' COMMENT '浜嬫晠绛夌骇锛歋LIGHT-杞讳激锛孏ENERAL-涓�鑸紝SEVERE-閲嶄激锛孧AJOR-閲嶅ぇ',
+ `occur_time` datetime NOT NULL COMMENT '鍙戠敓鏃堕棿',
+ `location` varchar(200) DEFAULT NULL COMMENT '鍙戠敓鍦扮偣',
+ `workshop_name` varchar(100) DEFAULT NULL COMMENT '鎵�灞炶溅闂�/鍖哄煙',
+ `casualty_desc` varchar(500) DEFAULT NULL COMMENT '浼や骸鎯呭喌',
+ `economic_loss` decimal(18,2) DEFAULT NULL COMMENT '鐩存帴缁忔祹鎹熷け锛堝厓锛�',
+ `involved_persons` varchar(500) DEFAULT NULL COMMENT '娑変簨浜哄憳濮撳悕锛岄�楀彿鍒嗛殧',
+ `description` varchar(2000) DEFAULT NULL COMMENT '浜嬫晠缁忚繃',
+ `cause_analysis` varchar(2000) DEFAULT NULL COMMENT '鍘熷洜鍒嗘瀽',
+ `measures` varchar(2000) DEFAULT NULL COMMENT '澶勭悊鎺柦涓庢暣鏀硅姹�',
+ `reporter` varchar(50) DEFAULT NULL COMMENT '鐧昏浜�',
+ `report_time` datetime DEFAULT NULL COMMENT '鐧昏鏃堕棿',
+ `status` varchar(20) NOT NULL DEFAULT 'REPORTED' COMMENT '鐘舵�侊細REPORTED-宸茬櫥璁帮紝INVESTIGATING-璋冩煡涓紝HANDLED-宸插鐞嗭紝CLOSED-宸茬粨妗�',
+ `attachment` varchar(2000) DEFAULT NULL COMMENT '鐜板満鐓х墖/璋冩煡鎶ュ憡 URL锛岄�楀彿鍒嗛殧',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_code` (`code`, `deleted`),
+ KEY `idx_occur_time` (`occur_time`),
+ KEY `idx_accident_type` (`accident_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹夊叏鐢熶骇-浜嬫晠鐧昏';
+
+SELECT '瀹夊叏鐢熶骇妯″潡琛ㄧ粨鏋勫垱寤哄畬鎴�' AS result;
diff --git a/yudao-module-mes/pom.xml b/yudao-module-mes/pom.xml
index 3234b8e..1d8be1b 100644
--- a/yudao-module-mes/pom.xml
+++ b/yudao-module-mes/pom.xml
@@ -38,6 +38,13 @@
<version>${revision}</version>
</dependency>
+ <!-- HRM 浜鸿祫 API锛氬畨鍏ㄧ敓浜фā鍧楅渶瑕佹寜鍛樺伐妗f瑙f瀽鎸佽瘉浜�/璐熻矗浜� -->
+ <dependency>
+ <groupId>cn.iocoder.boot</groupId>
+ <artifactId>yudao-module-hrm-api</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
<!-- CRM 瀹㈡埛绠$悊 API -->
<dependency>
<groupId>cn.iocoder.boot</groupId>
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java
new file mode 100644
index 0000000..5ad6c65
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyCertificateController.java
@@ -0,0 +1,98 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificatePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificateRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificateSaveReqVO;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyCertificateService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佸彴璐︼紙鍚埌鏈熻嚜鍔ㄩ璀︼級
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-鐗圭浣滀笟璇�")
+@RestController
+@RequestMapping("/safety/certificate")
+@Validated
+public class SafetyCertificateController {
+
+ @Resource
+ private SafetyCertificateService certificateService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鏂板鐗圭浣滀笟璇�")
+ @PreAuthorize("@ss.hasPermission('safety:cert:create')")
+ public CommonResult<Long> create(@Valid @RequestBody SafetyCertificateSaveReqVO reqVO) {
+ return success(certificateService.createCertificate(reqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼鐗圭浣滀笟璇�")
+ @PreAuthorize("@ss.hasPermission('safety:cert:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody SafetyCertificateSaveReqVO reqVO) {
+ certificateService.updateCertificate(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎鐗圭浣滀笟璇�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:cert:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+ certificateService.deleteCertificate(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱鐗圭浣滀笟璇�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:cert:query')")
+ public CommonResult<SafetyCertificateRespVO> get(@RequestParam("id") Long id) {
+ var cert = certificateService.getCertificate(id);
+ var resp = BeanUtils.toBean(cert, SafetyCertificateRespVO.class);
+ certificateService.fillDisplayFields(cert, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱鐗圭浣滀笟璇佸垎椤�")
+ @PreAuthorize("@ss.hasPermission('safety:cert:query')")
+ public CommonResult<PageResult<SafetyCertificateRespVO>> page(@Valid SafetyCertificatePageReqVO reqVO) {
+ var page = certificateService.getCertificatePage(reqVO);
+ // 鎵归噺琛ュ叏鎸佽瘉浜烘渶鏂版。妗堬紙濮撳悕/宸ュ彿/閮ㄩ棬锛夛紝涓�娆℃�ф煡濂介伩鍏� N+1
+ certificateService.fillEmployeeInfo(page.getList());
+ var result = BeanUtils.toBean(page, SafetyCertificateRespVO.class);
+ certificateService.fillDisplayFieldsBatch(page.getList(), result.getList());
+ return success(result);
+ }
+
+ @GetMapping("/expiring-list")
+ @Operation(summary = "鑾峰緱鍗冲皢鍒版湡/宸茶繃鏈熺殑鐗圭浣滀笟璇侊紙鍒版湡鑷姩棰勮锛�")
+ @Parameter(name = "days", description = "鎻愬墠棰勮澶╂暟锛岄粯璁� 30 澶�")
+ @PreAuthorize("@ss.hasPermission('safety:cert:query')")
+ public CommonResult<List<SafetyCertificateRespVO>> expiringList(
+ @RequestParam(value = "days", required = false) Integer days) {
+ List<cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyCertificateDO> certs =
+ certificateService.getExpiringCertificates(days);
+ certificateService.fillEmployeeInfo(certs);
+ var resps = BeanUtils.toBean(certs, SafetyCertificateRespVO.class);
+ certificateService.fillDisplayFieldsBatch(certs, resps);
+ return success(resps);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyFileController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyFileController.java
new file mode 100644
index 0000000..f2b6c07
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyFileController.java
@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyFileService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 绉诲姩绔幇鍦烘媿鐓т笂浼�
+ *
+ * <p>宸℃銆侀殣鎮d笂鎶ャ�佷綔涓氱エ銆佹紨缁冪瓑鐜妭鐨勭収鐗囩粺涓�璧版鎺ュ彛锛�
+ * 杩斿洖鍙闂� URL锛屽墠绔嫾鎴愰�楀彿涓插啓鍏ヤ笟鍔¤〃銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-闄勪欢涓婁紶")
+@RestController
+@RequestMapping("/safety/file")
+@Validated
+public class SafetyFileController {
+
+ @Resource
+ private SafetyFileService fileService;
+
+ @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ @Operation(summary = "涓婁紶鍗曚釜闄勪欢锛堢Щ鍔ㄧ鎷嶇収锛�")
+ @Parameter(name = "file", description = "鏂囦欢", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:file:upload')")
+ public CommonResult<String> upload(@RequestPart("file") MultipartFile file,
+ @RequestParam(value = "bizType", required = false) String bizType) {
+ return success(fileService.upload(file, bizType));
+ }
+
+ @PostMapping(value = "/upload-batch", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ @Operation(summary = "鎵归噺涓婁紶闄勪欢锛堢Щ鍔ㄧ涓�娆″寮狅級")
+ @PreAuthorize("@ss.hasPermission('safety:file:upload')")
+ public CommonResult<List<String>> uploadBatch(@RequestPart("files") List<MultipartFile> files,
+ @RequestParam(value = "bizType", required = false) String bizType) {
+ return success(fileService.uploadBatch(files, bizType));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyHazardController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyHazardController.java
new file mode 100644
index 0000000..a959252
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyHazardController.java
@@ -0,0 +1,106 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.*;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyHazardService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅涓婃姤涓庨棴鐜紙涓婃姤-鍒嗘淳-鏁存敼-澶嶆煡锛�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-闅愭偅闂幆")
+@RestController
+@RequestMapping("/safety/hazard")
+@Validated
+public class SafetyHazardController {
+
+ @Resource
+ private SafetyHazardService hazardService;
+
+ @PostMapping("/create")
+ @Operation(summary = "闅愭偅涓婃姤锛堟敮鎸佺Щ鍔ㄧ鎷嶇収涓婁紶鐨� photoUrls锛�")
+ @PreAuthorize("@ss.hasPermission('safety:hazard:create')")
+ public CommonResult<Long> create(@Valid @RequestBody SafetyHazardSaveReqVO reqVO) {
+ return success(hazardService.createHazard(reqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼闅愭偅鍩虹淇℃伅")
+ @PreAuthorize("@ss.hasPermission('safety:hazard:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody SafetyHazardSaveReqVO reqVO) {
+ hazardService.updateHazard(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎闅愭偅")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:hazard:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+ hazardService.deleteHazard(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱闅愭偅")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:hazard:query')")
+ public CommonResult<SafetyHazardRespVO> get(@RequestParam("id") Long id) {
+ var hazard = hazardService.getHazard(id);
+ hazardService.fillPersonNames(java.util.List.of(hazard));
+ var resp = BeanUtils.toBean(hazard, SafetyHazardRespVO.class);
+ SafetyHazardService.fillHazardDisplay(hazard, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱闅愭偅鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:hazard:query')")
+ public CommonResult<PageResult<SafetyHazardRespVO>> page(@Valid SafetyHazardPageReqVO reqVO) {
+ var page = hazardService.getHazardPage(reqVO);
+ hazardService.fillPersonNames(page.getList());
+ var result = BeanUtils.toBean(page, SafetyHazardRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyHazardService.fillHazardDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+ @PutMapping("/assign")
+ @Operation(summary = "鍒嗘淳闅愭偅鏁存敼璐d换浜�")
+ @PreAuthorize("@ss.hasPermission('safety:hazard:assign')")
+ public CommonResult<Boolean> assign(@Valid @RequestBody SafetyHazardAssignReqVO reqVO) {
+ hazardService.assignHazard(reqVO);
+ return success(true);
+ }
+
+ @PutMapping("/rectify")
+ @Operation(summary = "鎻愪氦闅愭偅鏁存敼缁撴灉")
+ @PreAuthorize("@ss.hasPermission('safety:hazard:rectify')")
+ public CommonResult<Boolean> rectify(@Valid @RequestBody SafetyHazardRectifyReqVO reqVO) {
+ hazardService.rectifyHazard(reqVO);
+ return success(true);
+ }
+
+ @PutMapping("/recheck")
+ @Operation(summary = "闅愭偅澶嶆煡锛堥�氳繃鍒欓棴鐜紝涓嶉�氳繃閫�鍥炴暣鏀癸級")
+ @PreAuthorize("@ss.hasPermission('safety:hazard:recheck')")
+ public CommonResult<Boolean> recheck(@Valid @RequestBody SafetyHazardRecheckReqVO reqVO) {
+ hazardService.recheckHazard(reqVO);
+ return success(true);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyInspectionController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyInspectionController.java
new file mode 100644
index 0000000..f66b4da
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyInspectionController.java
@@ -0,0 +1,162 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection.*;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyInspectionService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅涓庡贰妫�璁板綍
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-瀹夊叏宸℃")
+@RestController
+@RequestMapping("/safety/inspection")
+@Validated
+public class SafetyInspectionController {
+
+ @Resource
+ private SafetyInspectionService inspectionService;
+
+ // ==================== 宸℃鐐逛綅 ====================
+
+ @PostMapping("/point/create")
+ @Operation(summary = "鏂板宸℃鐐逛綅")
+ @PreAuthorize("@ss.hasPermission('safety:inspection-point:create')")
+ public CommonResult<Long> createPoint(@Valid @RequestBody SafetyInspectionPointSaveReqVO reqVO) {
+ return success(inspectionService.createPoint(reqVO));
+ }
+
+ @PutMapping("/point/update")
+ @Operation(summary = "淇敼宸℃鐐逛綅")
+ @PreAuthorize("@ss.hasPermission('safety:inspection-point:update')")
+ public CommonResult<Boolean> updatePoint(@Valid @RequestBody SafetyInspectionPointSaveReqVO reqVO) {
+ inspectionService.updatePoint(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/point/delete")
+ @Operation(summary = "鍒犻櫎宸℃鐐逛綅")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:inspection-point:delete')")
+ public CommonResult<Boolean> deletePoint(@RequestParam("id") Long id) {
+ inspectionService.deletePoint(id);
+ return success(true);
+ }
+
+ @GetMapping("/point/get")
+ @Operation(summary = "鑾峰緱宸℃鐐逛綅")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:inspection-point:query')")
+ public CommonResult<SafetyInspectionPointRespVO> getPoint(@RequestParam("id") Long id) {
+ var point = inspectionService.getPoint(id);
+ // 鍗曟潯鏌ヨ涔熻鍥炲~涓绘暟鎹渶鏂板�硷紝涓嶈兘鍙繑鍥炲揩鐓�
+ inspectionService.fillPointRefs(java.util.List.of(point));
+ var resp = BeanUtils.toBean(point, SafetyInspectionPointRespVO.class);
+ SafetyInspectionService.fillPointDisplay(point, resp);
+ resp.setLastInspectTime(inspectionService.getLastInspectTime(id));
+ return success(resp);
+ }
+
+ @GetMapping("/point/page")
+ @Operation(summary = "鑾峰緱宸℃鐐逛綅鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:inspection-point:query')")
+ public CommonResult<PageResult<SafetyInspectionPointRespVO>> getPointPage(
+ @Valid SafetyInspectionPointPageReqVO reqVO) {
+ var page = inspectionService.getPointPage(reqVO);
+ inspectionService.fillPointRefs(page.getList());
+ var result = BeanUtils.toBean(page, SafetyInspectionPointRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyInspectionService.fillPointDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+ @GetMapping("/point/simple-list")
+ @Operation(summary = "鑾峰緱鍚敤涓殑宸℃鐐逛綅绮剧畝鍒楄〃锛堢Щ鍔ㄧ宸℃閫夋嫨锛�")
+ @PreAuthorize("@ss.hasPermission('safety:inspection-point:query')")
+ public CommonResult<List<SafetyInspectionPointRespVO>> getPointSimpleList() {
+ var points = inspectionService.getEnabledPointList();
+ inspectionService.fillPointRefs(points);
+ List<SafetyInspectionPointRespVO> list = points.stream()
+ .map(point -> {
+ var resp = BeanUtils.toBean(point, SafetyInspectionPointRespVO.class);
+ SafetyInspectionService.fillPointDisplay(point, resp);
+ return resp;
+ }).toList();
+ return success(list);
+ }
+
+ // ==================== 宸℃璁板綍 ====================
+
+ @PostMapping("/record/create")
+ @Operation(summary = "鏂板宸℃璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:inspection:create')")
+ public CommonResult<Long> createRecord(@Valid @RequestBody SafetyInspectionSaveReqVO reqVO) {
+ return success(inspectionService.createInspection(reqVO));
+ }
+
+ @PutMapping("/record/update")
+ @Operation(summary = "淇敼宸℃璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:inspection:update')")
+ public CommonResult<Boolean> updateRecord(@Valid @RequestBody SafetyInspectionSaveReqVO reqVO) {
+ inspectionService.updateInspection(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/record/delete")
+ @Operation(summary = "鍒犻櫎宸℃璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:inspection:delete')")
+ public CommonResult<Boolean> deleteRecord(@RequestParam("id") Long id) {
+ inspectionService.deleteInspection(id);
+ return success(true);
+ }
+
+ @GetMapping("/record/get")
+ @Operation(summary = "鑾峰緱宸℃璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:inspection:query')")
+ public CommonResult<SafetyInspectionRespVO> getRecord(@RequestParam("id") Long id) {
+ var record = inspectionService.getInspection(id);
+ inspectionService.fillInspectorNames(java.util.List.of(record));
+ var resp = BeanUtils.toBean(record, SafetyInspectionRespVO.class);
+ resp.setPointTypeName(cn.iocoder.yudao.module.mes.enums.safety.SafetyInspectionPointTypeEnum
+ .getNameByType(record.getPointType()));
+ resp.setResultName("NORMAL".equals(record.getResult()) ? "姝e父" : "寮傚父");
+ return success(resp);
+ }
+
+ @GetMapping("/record/page")
+ @Operation(summary = "鑾峰緱宸℃璁板綍鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:inspection:query')")
+ public CommonResult<PageResult<SafetyInspectionRespVO>> getRecordPage(
+ @Valid SafetyInspectionPageReqVO reqVO) {
+ var page = inspectionService.getInspectionPage(reqVO);
+ inspectionService.fillInspectorNames(page.getList());
+ var result = BeanUtils.toBean(page, SafetyInspectionRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ var record = page.getList().get(i);
+ var resp = result.getList().get(i);
+ resp.setPointTypeName(cn.iocoder.yudao.module.mes.enums.safety.SafetyInspectionPointTypeEnum
+ .getNameByType(record.getPointType()));
+ resp.setResultName("NORMAL".equals(record.getResult()) ? "姝e父" : "寮傚父");
+ }
+ return success(result);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyLedgerController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyLedgerController.java
new file mode 100644
index 0000000..b2ea3ae
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyLedgerController.java
@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ledger.SafetyLedgerExportReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ledger.SafetyOverviewRespVO;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyLedgerExportService;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyOverviewService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鎬昏缁熻涓庢爣鍑嗗寲鍙拌处瀵煎嚭
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-鍙拌处涓庣粺璁�")
+@RestController
+@RequestMapping("/safety/ledger")
+@Validated
+public class SafetyLedgerController {
+
+ @Resource
+ private SafetyOverviewService overviewService;
+ @Resource
+ private SafetyLedgerExportService ledgerExportService;
+
+ @GetMapping("/overview")
+ @Operation(summary = "鑾峰緱瀹夊叏鐢熶骇鎬昏缁熻")
+ @PreAuthorize("@ss.hasPermission('safety:ledger:query')")
+ public CommonResult<SafetyOverviewRespVO> overview() {
+ return success(overviewService.getOverview());
+ }
+
+ @GetMapping("/export")
+ @Operation(summary = "瀵煎嚭鐢靛姏琛屼笟瀹夊叏鏍囧噯鍖栧彴璐︼紙鍏ㄥ鎴栧閫夊叾涓�锛�")
+ @PreAuthorize("@ss.hasPermission('safety:ledger:export')")
+ public void export(@Valid SafetyLedgerExportReqVO reqVO, HttpServletResponse response) throws IOException {
+ ledgerExportService.export(reqVO, response);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java
new file mode 100644
index 0000000..3bed64b
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java
@@ -0,0 +1,138 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material.*;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyMaterialService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 搴旀�ョ墿璧勫彴璐︿笌鍑哄叆搴擄紙缁濈紭鐢ㄥ叿 / 鍗卞寲鍝� / 娑堥槻鐗╄祫锛�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-搴旀�ョ墿璧�")
+@RestController
+@RequestMapping("/safety/material")
+@Validated
+public class SafetyMaterialController {
+
+ @Resource
+ private SafetyMaterialService materialService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鏂板鐗╄祫")
+ @PreAuthorize("@ss.hasPermission('safety:material:create')")
+ public CommonResult<Long> create(@Valid @RequestBody SafetyMaterialSaveReqVO reqVO) {
+ return success(materialService.createMaterial(reqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼鐗╄祫锛堝簱瀛樻暟閲忓彧鑳介�氳繃鍑哄叆搴撳彉鍔級")
+ @PreAuthorize("@ss.hasPermission('safety:material:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody SafetyMaterialSaveReqVO reqVO) {
+ materialService.updateMaterial(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎鐗╄祫")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:material:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+ materialService.deleteMaterial(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱鐗╄祫")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:material:query')")
+ public CommonResult<SafetyMaterialRespVO> get(@RequestParam("id") Long id) {
+ var material = materialService.getMaterial(id);
+ materialService.fillManagers(java.util.List.of(material));
+ var resp = BeanUtils.toBean(material, SafetyMaterialRespVO.class);
+ SafetyMaterialService.fillMaterialDisplay(material, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱鐗╄祫鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:material:query')")
+ public CommonResult<PageResult<SafetyMaterialRespVO>> page(@Valid SafetyMaterialPageReqVO reqVO) {
+ var page = materialService.getMaterialPage(reqVO);
+ materialService.fillManagers(page.getList());
+ var result = BeanUtils.toBean(page, SafetyMaterialRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyMaterialService.fillMaterialDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+ @GetMapping("/below-safe-stock")
+ @Operation(summary = "鑾峰緱浣庝簬瀹夊叏搴撳瓨鐨勭墿璧勫垪琛紙棰勮锛�")
+ @PreAuthorize("@ss.hasPermission('safety:material:query')")
+ public CommonResult<List<SafetyMaterialRespVO>> belowSafeStock() {
+ var materials = materialService.getBelowSafeStockList();
+ materialService.fillManagers(materials);
+ List<SafetyMaterialRespVO> list = materials.stream()
+ .map(material -> {
+ var resp = BeanUtils.toBean(material, SafetyMaterialRespVO.class);
+ SafetyMaterialService.fillMaterialDisplay(material, resp);
+ return resp;
+ }).toList();
+ return success(list);
+ }
+
+ @GetMapping("/expiring-list")
+ @Operation(summary = "鑾峰緱鍗冲皢鍒版湡鐨勭墿璧勫垪琛紙棰勮锛�")
+ @Parameter(name = "days", description = "鎻愬墠棰勮澶╂暟锛岄粯璁� 30 澶�")
+ @PreAuthorize("@ss.hasPermission('safety:material:query')")
+ public CommonResult<List<SafetyMaterialRespVO>> expiringList(
+ @RequestParam(value = "days", required = false) Integer days) {
+ var materials = materialService.getExpiringList(days);
+ materialService.fillManagers(materials);
+ List<SafetyMaterialRespVO> list = materials.stream()
+ .map(material -> {
+ var resp = BeanUtils.toBean(material, SafetyMaterialRespVO.class);
+ SafetyMaterialService.fillMaterialDisplay(material, resp);
+ return resp;
+ }).toList();
+ return success(list);
+ }
+
+ // ==================== 鍑哄叆搴� ====================
+
+ @PostMapping("/stock/create")
+ @Operation(summary = "鍑哄叆搴撶櫥璁帮紙鑷姩鏇存柊搴撳瓨锛�")
+ @PreAuthorize("@ss.hasPermission('safety:material-stock:in') or @ss.hasPermission('safety:material-stock:out')")
+ public CommonResult<Long> createStock(@Valid @RequestBody SafetyMaterialStockSaveReqVO reqVO) {
+ return success(materialService.createStock(reqVO));
+ }
+
+ @GetMapping("/stock/page")
+ @Operation(summary = "鑾峰緱鍑哄叆搴撴祦姘村垎椤�")
+ @PreAuthorize("@ss.hasPermission('safety:material-stock:query')")
+ public CommonResult<PageResult<SafetyMaterialStockRespVO>> stockPage(
+ @Valid SafetyMaterialStockPageReqVO reqVO) {
+ var page = materialService.getStockPage(reqVO);
+ var result = BeanUtils.toBean(page, SafetyMaterialStockRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyMaterialService.fillStockDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java
new file mode 100644
index 0000000..60bbf5a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java
@@ -0,0 +1,99 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.org.SafetyOrgRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.org.SafetyOrgSaveReqVO;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyOrgService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏缁勭粐鏋舵瀯
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-缁勭粐鏋舵瀯")
+@RestController
+@RequestMapping("/safety/org")
+@Validated
+public class SafetyOrgController {
+
+ @Resource
+ private SafetyOrgService orgService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鏂板瀹夊叏缁勭粐")
+ @PreAuthorize("@ss.hasPermission('safety:org:create')")
+ public CommonResult<Long> create(@Valid @RequestBody SafetyOrgSaveReqVO reqVO) {
+ return success(orgService.createOrg(reqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼瀹夊叏缁勭粐")
+ @PreAuthorize("@ss.hasPermission('safety:org:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody SafetyOrgSaveReqVO reqVO) {
+ orgService.updateOrg(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎瀹夊叏缁勭粐")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:org:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+ orgService.deleteOrg(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱瀹夊叏缁勭粐")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:org:query')")
+ public CommonResult<SafetyOrgRespVO> get(@RequestParam("id") Long id) {
+ var org = orgService.getOrg(id);
+ var resp = new SafetyOrgRespVO();
+ org2resp(org, resp);
+ // 璐熻矗浜虹敤鍛樺伐妗f鏈�鏂板鍚嶈鐩栧揩鐓�
+ if (org.getLeaderId() != null) {
+ var employee = orgService.getLeader(org.getLeaderId());
+ if (employee != null) {
+ resp.setLeaderName(employee.getName());
+ resp.setLeaderPhone(employee.getPhone());
+ }
+ }
+ return success(resp);
+ }
+
+ @GetMapping("/tree")
+ @Operation(summary = "鑾峰緱瀹夊叏缁勭粐鏍�")
+ @PreAuthorize("@ss.hasPermission('safety:org:query')")
+ public CommonResult<List<SafetyOrgRespVO>> tree() {
+ return success(orgService.getOrgTree());
+ }
+
+ private static void org2resp(cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyOrgDO org,
+ SafetyOrgRespVO resp) {
+ resp.setId(org.getId());
+ resp.setParentId(org.getParentId());
+ resp.setName(org.getName());
+ resp.setLeaderName(org.getLeaderName());
+ resp.setLeaderPhone(org.getLeaderPhone());
+ resp.setMemberNames(org.getMemberNames());
+ resp.setDuty(org.getDuty());
+ resp.setSort(org.getSort());
+ resp.setStatus(org.getStatus());
+ resp.setRemark(org.getRemark());
+ resp.setCreateTime(org.getCreateTime());
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java
new file mode 100644
index 0000000..9664231
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyTrainingController.java
@@ -0,0 +1,187 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train.*;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyTrainingService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅銆佹紨缁冦�佷簨鏁呯櫥璁扮數瀛愬寲褰掓。
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-鍩硅涓庝簨鏁�")
+@RestController
+@RequestMapping("/safety/training")
+@Validated
+public class SafetyTrainingController {
+
+ @Resource
+ private SafetyTrainingService trainingService;
+
+ // ==================== 鍩硅 ====================
+
+ @PostMapping("/create")
+ @Operation(summary = "鏂板瀹夊叏鍩硅璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:training:create')")
+ public CommonResult<Long> create(@Valid @RequestBody SafetyTrainingSaveReqVO reqVO) {
+ return success(trainingService.createTraining(reqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼瀹夊叏鍩硅璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:training:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody SafetyTrainingSaveReqVO reqVO) {
+ trainingService.updateTraining(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎瀹夊叏鍩硅璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:training:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+ trainingService.deleteTraining(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱瀹夊叏鍩硅璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:training:query')")
+ public CommonResult<SafetyTrainingRespVO> get(@RequestParam("id") Long id) {
+ var training = trainingService.getTraining(id);
+ trainingService.fillTrainers(java.util.List.of(training));
+ var resp = BeanUtils.toBean(training, SafetyTrainingRespVO.class);
+ SafetyTrainingService.fillTrainingDisplay(training, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱瀹夊叏鍩硅璁板綍鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:training:query')")
+ public CommonResult<PageResult<SafetyTrainingRespVO>> page(@Valid SafetyTrainingPageReqVO reqVO) {
+ var page = trainingService.getTrainingPage(reqVO);
+ trainingService.fillTrainers(page.getList());
+ var result = BeanUtils.toBean(page, SafetyTrainingRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyTrainingService.fillTrainingDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+ // ==================== 婕旂粌 ====================
+
+ @PostMapping("/drill/create")
+ @Operation(summary = "鏂板娑堥槻婕旂粌璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:drill:create')")
+ public CommonResult<Long> createDrill(@Valid @RequestBody SafetyDrillSaveReqVO reqVO) {
+ return success(trainingService.createDrill(reqVO));
+ }
+
+ @PutMapping("/drill/update")
+ @Operation(summary = "淇敼娑堥槻婕旂粌璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:drill:update')")
+ public CommonResult<Boolean> updateDrill(@Valid @RequestBody SafetyDrillSaveReqVO reqVO) {
+ trainingService.updateDrill(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/drill/delete")
+ @Operation(summary = "鍒犻櫎娑堥槻婕旂粌璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:drill:delete')")
+ public CommonResult<Boolean> deleteDrill(@RequestParam("id") Long id) {
+ trainingService.deleteDrill(id);
+ return success(true);
+ }
+
+ @GetMapping("/drill/get")
+ @Operation(summary = "鑾峰緱娑堥槻婕旂粌璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:drill:query')")
+ public CommonResult<SafetyDrillRespVO> getDrill(@RequestParam("id") Long id) {
+ var drill = trainingService.getDrill(id);
+ trainingService.fillOrganizers(java.util.List.of(drill));
+ var resp = BeanUtils.toBean(drill, SafetyDrillRespVO.class);
+ SafetyTrainingService.fillDrillDisplay(drill, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/drill/page")
+ @Operation(summary = "鑾峰緱娑堥槻婕旂粌璁板綍鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:drill:query')")
+ public CommonResult<PageResult<SafetyDrillRespVO>> drillPage(@Valid SafetyDrillPageReqVO reqVO) {
+ var page = trainingService.getDrillPage(reqVO);
+ trainingService.fillOrganizers(page.getList());
+ var result = BeanUtils.toBean(page, SafetyDrillRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyTrainingService.fillDrillDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+ // ==================== 浜嬫晠 ====================
+
+ @PostMapping("/accident/create")
+ @Operation(summary = "鏂板浜嬫晠鐧昏")
+ @PreAuthorize("@ss.hasPermission('safety:accident:create')")
+ public CommonResult<Long> createAccident(@Valid @RequestBody SafetyAccidentSaveReqVO reqVO) {
+ return success(trainingService.createAccident(reqVO));
+ }
+
+ @PutMapping("/accident/update")
+ @Operation(summary = "淇敼浜嬫晠鐧昏")
+ @PreAuthorize("@ss.hasPermission('safety:accident:update')")
+ public CommonResult<Boolean> updateAccident(@Valid @RequestBody SafetyAccidentSaveReqVO reqVO) {
+ trainingService.updateAccident(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/accident/delete")
+ @Operation(summary = "鍒犻櫎浜嬫晠鐧昏")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:accident:delete')")
+ public CommonResult<Boolean> deleteAccident(@RequestParam("id") Long id) {
+ trainingService.deleteAccident(id);
+ return success(true);
+ }
+
+ @GetMapping("/accident/get")
+ @Operation(summary = "鑾峰緱浜嬫晠鐧昏")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:accident:query')")
+ public CommonResult<SafetyAccidentRespVO> getAccident(@RequestParam("id") Long id) {
+ var accident = trainingService.getAccident(id);
+ trainingService.fillAccidentRefs(java.util.List.of(accident));
+ var resp = BeanUtils.toBean(accident, SafetyAccidentRespVO.class);
+ SafetyTrainingService.fillAccidentDisplay(accident, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/accident/page")
+ @Operation(summary = "鑾峰緱浜嬫晠鐧昏鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('safety:accident:query')")
+ public CommonResult<PageResult<SafetyAccidentRespVO>> accidentPage(
+ @Valid SafetyAccidentPageReqVO reqVO) {
+ var page = trainingService.getAccidentPage(reqVO);
+ trainingService.fillAccidentRefs(page.getList());
+ var result = BeanUtils.toBean(page, SafetyAccidentRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyTrainingService.fillAccidentDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java
new file mode 100644
index 0000000..3119ae0
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyWorkPermitController.java
@@ -0,0 +1,147 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit.*;
+import cn.iocoder.yudao.module.mes.service.safety.SafetyWorkPermitService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁紙鍔ㄧ伀 / 楂樺帇甯︾數 / 鏈夐檺绌洪棿绛夛級瀹℃壒涓庣數瀛愮暀瀛�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-楂樺嵄浣滀笟绁�")
+@RestController
+@RequestMapping("/safety/permit")
+@Validated
+public class SafetyWorkPermitController {
+
+ @Resource
+ private SafetyWorkPermitService permitService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鎻愪氦楂樺嵄浣滀笟鐢宠")
+ @PreAuthorize("@ss.hasPermission('safety:permit:create')")
+ public CommonResult<Long> create(@Valid @RequestBody SafetyWorkPermitSaveReqVO reqVO) {
+ return success(permitService.createPermit(reqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼浣滀笟绁�")
+ @PreAuthorize("@ss.hasPermission('safety:permit:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody SafetyWorkPermitSaveReqVO reqVO) {
+ permitService.updatePermit(reqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎浣滀笟绁紙杩炲悓鐩戞姢璁板綍锛�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+ permitService.deletePermit(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱浣滀笟绁�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:query')")
+ public CommonResult<SafetyWorkPermitRespVO> get(@RequestParam("id") Long id) {
+ var permit = permitService.getPermit(id);
+ permitService.fillPermitRefs(java.util.List.of(permit));
+ var resp = BeanUtils.toBean(permit, SafetyWorkPermitRespVO.class);
+ SafetyWorkPermitService.fillPermitDisplay(permit, resp);
+ return success(resp);
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱浣滀笟绁ㄥ垎椤�")
+ @PreAuthorize("@ss.hasPermission('safety:permit:query')")
+ public CommonResult<PageResult<SafetyWorkPermitRespVO>> page(@Valid SafetyWorkPermitPageReqVO reqVO) {
+ var page = permitService.getPermitPage(reqVO);
+ permitService.fillPermitRefs(page.getList());
+ var result = BeanUtils.toBean(page, SafetyWorkPermitRespVO.class);
+ for (int i = 0; i < page.getList().size(); i++) {
+ SafetyWorkPermitService.fillPermitDisplay(page.getList().get(i), result.getList().get(i));
+ }
+ return success(result);
+ }
+
+ @PutMapping("/approve")
+ @Operation(summary = "瀹℃壒浣滀笟绁紙閫氳繃/椹冲洖锛�")
+ @PreAuthorize("@ss.hasPermission('safety:permit:approve')")
+ public CommonResult<Boolean> approve(@Valid @RequestBody SafetyWorkPermitApproveReqVO reqVO) {
+ permitService.approvePermit(reqVO);
+ return success(true);
+ }
+
+ @PutMapping("/start")
+ @Operation(summary = "寮�濮嬩綔涓�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:update')")
+ public CommonResult<Boolean> start(@RequestParam("id") Long id) {
+ permitService.startPermit(id);
+ return success(true);
+ }
+
+ @PutMapping("/close")
+ @Operation(summary = "缁撴潫浣滀笟骞跺綊妗�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:update')")
+ public CommonResult<Boolean> close(@RequestParam("id") Long id) {
+ permitService.closePermit(id);
+ return success(true);
+ }
+
+ @PutMapping("/cancel")
+ @Operation(summary = "浣滃簾浣滀笟绁�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:update')")
+ public CommonResult<Boolean> cancel(@RequestParam("id") Long id) {
+ permitService.cancelPermit(id);
+ return success(true);
+ }
+
+ // ==================== 鐩戞姢璁板綍 ====================
+
+ @GetMapping("/monitor/list")
+ @Operation(summary = "鑾峰緱浣滀笟鐩戞姢璁板綍鍒楄〃")
+ @Parameter(name = "permitId", description = "浣滀笟绁ㄧ紪鍙�", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:query')")
+ public CommonResult<List<SafetyWorkPermitMonitorRespVO>> monitorList(@RequestParam("permitId") Long permitId) {
+ var monitors = permitService.getMonitorList(permitId);
+ permitService.fillMonitorGuardians(monitors);
+ return success(BeanUtils.toBean(monitors, SafetyWorkPermitMonitorRespVO.class));
+ }
+
+ @PostMapping("/monitor/create")
+ @Operation(summary = "鏂板浣滀笟鐩戞姢璁板綍")
+ @PreAuthorize("@ss.hasPermission('safety:permit:update')")
+ public CommonResult<Long> createMonitor(@Valid @RequestBody SafetyWorkPermitMonitorSaveReqVO reqVO) {
+ return success(permitService.createMonitor(reqVO));
+ }
+
+ @DeleteMapping("/monitor/delete")
+ @Operation(summary = "鍒犻櫎浣滀笟鐩戞姢璁板綍")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('safety:permit:update')")
+ public CommonResult<Boolean> deleteMonitor(@RequestParam("id") Long id) {
+ permitService.deleteMonitor(id);
+ return success(true);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java
new file mode 100644
index 0000000..6281635
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佸垎椤� Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗圭浣滀笟璇佸垎椤� Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyCertificatePageReqVO extends PageParam {
+
+ @Schema(description = "鎸佽瘉浜猴紙鍛樺伐缂栧彿锛�")
+ private Long employeeId;
+
+ @Schema(description = "鎸佽瘉浜哄鍚嶏紙妯$硦鍖归厤锛�")
+ private String employeeName;
+
+ @Schema(description = "宸ュ彿")
+ private String employeeNo;
+
+ @Schema(description = "鎵�灞為儴闂�")
+ private String deptName;
+
+ @Schema(description = "璇佷欢绫诲瀷")
+ private String certType;
+
+ @Schema(description = "璇佷欢缂栧彿")
+ private String certNo;
+
+ @Schema(description = "鐘舵��")
+ private String status;
+
+ @Schema(description = "鏈夋晥鏈熷紑濮�")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate expireDateStart;
+
+ @Schema(description = "鏈夋晥鏈熸埅姝�")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate expireDateEnd;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java
new file mode 100644
index 0000000..5f3d8f8
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇� Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗圭浣滀笟璇� Response VO")
+@Data
+public class SafetyCertificateRespVO {
+
+ private Long id;
+ @Schema(description = "鎸佽瘉浜猴紙鍛樺伐缂栧彿锛�")
+ private Long employeeId;
+ @Schema(description = "鎸佽瘉浜哄叧鑱旂殑绯荤粺鐢ㄦ埛缂栧彿")
+ private Long userId;
+ private String employeeName;
+ private String employeeNo;
+ private String deptName;
+ private String phone;
+ private String certType;
+ @Schema(description = "璇佷欢绫诲瀷鍚嶇О")
+ private String certTypeName;
+ private String certNo;
+ private String issuer;
+ private LocalDate issueDate;
+ private LocalDate expireDate;
+ private LocalDate reviewDate;
+ private Integer warnDays;
+ private String status;
+ @Schema(description = "鐘舵�佸悕绉�")
+ private String statusName;
+ @Schema(description = "璺濆埌鏈熷ぉ鏁帮紝璐熸暟琛ㄧず宸茶繃鏈�")
+ private Long remainingDays;
+ private String attachment;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateSaveReqVO.java
new file mode 100644
index 0000000..b6881a7
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateSaveReqVO.java
@@ -0,0 +1,73 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佹柊澧�/淇敼 Request VO
+ *
+ * <p>鎸佽瘉浜洪�氳繃 employeeId 鍏宠仈鍛樺伐妗f锛屽鍚嶄笌閮ㄩ棬鐢卞悗绔粠妗f甯﹀嚭锛�
+ * 鍓嶇鍙渶閫変汉锛屼笉鎵嬪伐濉啓锛岄伩鍏嶄笌浜哄姏璧勬簮鏁版嵁涓嶄竴鑷淬��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗圭浣滀笟璇佹柊澧�/淇敼 Request VO")
+@Data
+public class SafetyCertificateSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "鎸佽瘉浜猴紙鍛樺伐缂栧彿锛�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "璇烽�夋嫨鎸佽瘉浜�")
+ private Long employeeId;
+
+ @Schema(description = "璇佷欢绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "HIGH_VOLTAGE_OPERATION")
+ @NotBlank(message = "璇佷欢绫诲瀷涓嶈兘涓虹┖")
+ @Pattern(regexp = "LOW_VOLTAGE_ELECTRICIAN|HIGH_VOLTAGE_OPERATION|WELDING|HOIST|HEIGHT_WORK|LIMITED_SPACE|FORKLIFT|BOILER|OTHER",
+ message = "璇佷欢绫诲瀷涓嶅悎娉�")
+ private String certType;
+
+ @Schema(description = "璇佷欢缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "T330102199001011234")
+ @NotBlank(message = "璇佷欢缂栧彿涓嶈兘涓虹┖")
+ @Size(max = 64)
+ private String certNo;
+
+ @Schema(description = "鍙戣瘉鏈哄叧")
+ @Size(max = 100)
+ private String issuer;
+
+ @Schema(description = "鍙戣瘉鏃ユ湡")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate issueDate;
+
+ @Schema(description = "鏈夋晥鏈熻嚦", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鏈夋晥鏈熶笉鑳戒负绌�")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate expireDate;
+
+ @Schema(description = "涓嬫澶嶅鏃ユ湡")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate reviewDate;
+
+ @Schema(description = "鍒版湡棰勮鎻愬墠澶╂暟", example = "30")
+ @Min(value = 0, message = "棰勮澶╂暟涓嶈兘涓鸿礋鏁�")
+ @Max(value = 365, message = "棰勮澶╂暟涓嶈兘瓒呰繃 365 澶�")
+ private Integer warnDays;
+
+ @Schema(description = "鐘舵��", example = "VALID")
+ @Pattern(regexp = "VALID|EXPIRING|EXPIRED|REVOKED", message = "鐘舵�佷笉鍚堟硶")
+ private String status;
+
+ @Schema(description = "璇佷欢鎵弿浠� URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 500)
+ private String attachment;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java
new file mode 100644
index 0000000..f763d0f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardAssignReqVO.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鍒嗘淳 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 闅愭偅鍒嗘淳 Request VO")
+@Data
+public class SafetyHazardAssignReqVO {
+
+ @Schema(description = "闅愭偅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "闅愭偅缂栧彿涓嶈兘涓虹┖")
+ private Long id;
+
+ @Schema(description = "鏁存敼璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨鏁存敼璐d换浜�")
+ private Long assigneeId;
+
+ @Schema(description = "鏁存敼鏈熼檺")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate rectifyDeadline;
+
+ @Schema(description = "鍒嗘淳璇存槑")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardPageReqVO.java
new file mode 100644
index 0000000..e6da28e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardPageReqVO.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 闅愭偅鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyHazardPageReqVO extends PageParam {
+
+ private String code;
+ private String title;
+ private String level;
+ private String source;
+ private String status;
+ private String assignee;
+ private String location;
+
+ @Schema(description = "涓婃姤鏃堕棿鑼冨洿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime[] reportTime;
+
+ @Schema(description = "涓婃姤鏃堕棿寮�濮嬶紙鍐呴儴浣跨敤锛�", hidden = true)
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime reportTimeStart;
+
+ @Schema(description = "涓婃姤鏃堕棿缁撴潫锛堝唴閮ㄤ娇鐢級", hidden = true)
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime reportTimeEnd;
+
+ public void normalizeTimeRange() {
+ if (reportTime != null && reportTime.length == 2) {
+ this.reportTimeStart = reportTime[0];
+ this.reportTimeEnd = reportTime[1];
+ }
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRecheckReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRecheckReqVO.java
new file mode 100644
index 0000000..0230fb6
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRecheckReqVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅澶嶆煡 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 闅愭偅澶嶆煡 Request VO")
+@Data
+public class SafetyHazardRecheckReqVO {
+
+ @Schema(description = "闅愭偅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "闅愭偅缂栧彿涓嶈兘涓虹┖")
+ private Long id;
+
+ @Schema(description = "澶嶆煡浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨澶嶆煡浜�")
+ private Long recheckerId;
+
+ @Schema(description = "澶嶆煡缁撹锛歅ASSED-閫氳繃锛孯EJECTED-涓嶉�氳繃", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "澶嶆煡缁撹涓嶈兘涓虹┖")
+ @Pattern(regexp = "PASSED|REJECTED", message = "澶嶆煡缁撹鍙兘涓洪�氳繃鎴栦笉閫氳繃")
+ private String recheckResult;
+
+ @Schema(description = "澶嶆煡鎰忚")
+ @Size(max = 500)
+ private String recheckRemark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRectifyReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRectifyReqVO.java
new file mode 100644
index 0000000..d1eb19d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRectifyReqVO.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鏁存敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 闅愭偅鏁存敼 Request VO")
+@Data
+public class SafetyHazardRectifyReqVO {
+
+ @Schema(description = "闅愭偅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "闅愭偅缂栧彿涓嶈兘涓虹┖")
+ private Long id;
+
+ @Schema(description = "鏁存敼鎺柦涓庣粨鏋�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "鏁存敼鎺柦涓庣粨鏋滀笉鑳戒负绌�")
+ @Size(max = 2000)
+ private String rectifyDesc;
+
+ @Schema(description = "鏁存敼鍚庣収鐗� URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String rectifyPhotoUrls;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRespVO.java
new file mode 100644
index 0000000..4ae9ea9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardRespVO.java
@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 闅愭偅 Response VO")
+@Data
+public class SafetyHazardRespVO {
+
+ private Long id;
+ private String code;
+ private String title;
+ private String level;
+ @Schema(description = "闅愭偅绛夌骇鍚嶇О")
+ private String levelName;
+ private String source;
+ @Schema(description = "鏉ユ簮鍚嶇О")
+ private String sourceName;
+ private Long inspectionId;
+ private Long pointId;
+ private String pointName;
+ private String location;
+ private String description;
+ private String photoUrls;
+ @Schema(description = "涓婃姤浜虹紪鍙�")
+ private Long reporterId;
+ private String reporter;
+ private LocalDateTime reportTime;
+ @Schema(description = "鏁存敼璐d换浜虹紪鍙�")
+ private Long assigneeId;
+ private String assignee;
+ private LocalDateTime assignTime;
+ private LocalDate rectifyDeadline;
+ @Schema(description = "鏄惁宸茶秴鏈�")
+ private Boolean overdue;
+ private String rectifyDesc;
+ private String rectifyPhotoUrls;
+ private LocalDateTime rectifyTime;
+ @Schema(description = "澶嶆煡浜虹紪鍙�")
+ private Long recheckerId;
+ private String rechecker;
+ private LocalDateTime recheckTime;
+ private String recheckResult;
+ @Schema(description = "澶嶆煡缁撹鍚嶇О")
+ private String recheckResultName;
+ private String recheckRemark;
+ private String status;
+ @Schema(description = "鐘舵�佸悕绉�")
+ private String statusName;
+ private LocalDateTime closeTime;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardSaveReqVO.java
new file mode 100644
index 0000000..ecd21ec
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/SafetyHazardSaveReqVO.java
@@ -0,0 +1,73 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅涓婃姤/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 闅愭偅涓婃姤/淇敼 Request VO")
+@Data
+public class SafetyHazardSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "闅愭偅鏍囬", requiredMode = Schema.RequiredMode.REQUIRED, example = "閰嶇數瀹ら棬鏈笂閿�")
+ @NotBlank(message = "闅愭偅鏍囬涓嶈兘涓虹┖")
+ @Size(max = 200)
+ private String title;
+
+ @Schema(description = "闅愭偅绛夌骇", example = "GENERAL")
+ @Pattern(regexp = "GENERAL|MAJOR", message = "闅愭偅绛夌骇涓嶅悎娉�")
+ private String level;
+
+ @Schema(description = "鏉ユ簮", example = "INSPECTION")
+ @Pattern(regexp = "INSPECTION|SELF_CHECK|REPORT|EXTERNAL", message = "闅愭偅鏉ユ簮涓嶅悎娉�")
+ private String source;
+
+ @Schema(description = "鍏宠仈宸℃璁板綍缂栧彿")
+ private Long inspectionId;
+
+ @Schema(description = "鍏宠仈宸℃鐐逛綅缂栧彿")
+ private Long pointId;
+
+ @Schema(description = "鐐逛綅鍚嶇О")
+ @Size(max = 100)
+ private String pointName;
+
+ @Schema(description = "闅愭偅浣嶇疆")
+ @Size(max = 200)
+ private String location;
+
+ @Schema(description = "闅愭偅鎻忚堪")
+ @Size(max = 2000)
+ private String description;
+
+ @Schema(description = "鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧锛堢Щ鍔ㄧ鎷嶇収涓婁紶锛�")
+ @Size(max = 2000)
+ private String photoUrls;
+
+ @Schema(description = "涓婃姤浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨涓婃姤浜�")
+ private Long reporterId;
+
+ @Schema(description = "涓婃姤鏃堕棿")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime reportTime;
+
+ @Schema(description = "鏁存敼鏈熼檺")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate rectifyDeadline;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPageReqVO.java
new file mode 100644
index 0000000..ef565c5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPageReqVO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃璁板綍鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 宸℃璁板綍鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyInspectionPageReqVO extends PageParam {
+
+ private Long pointId;
+ private String pointType;
+ private String inspector;
+ private String result;
+
+ @Schema(description = "宸℃鏃堕棿鑼冨洿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime[] inspectTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointPageReqVO.java
new file mode 100644
index 0000000..b4d3097
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointPageReqVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 宸℃鐐逛綅鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyInspectionPointPageReqVO extends PageParam {
+
+ private String code;
+ private String name;
+ private String pointType;
+ private String workshopName;
+ private Integer status;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointRespVO.java
new file mode 100644
index 0000000..81926e9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointRespVO.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 宸℃鐐逛綅 Response VO")
+@Data
+public class SafetyInspectionPointRespVO {
+
+ private Long id;
+ private String code;
+ private String name;
+ private String pointType;
+ @Schema(description = "鐐逛綅绫诲瀷鍚嶇О")
+ private String pointTypeName;
+ @Schema(description = "鎵�灞炶溅闂寸紪鍙�")
+ private Long workshopId;
+ private String workshopName;
+ private String location;
+ private String inspectItems;
+ private String inspectCycle;
+ @Schema(description = "宸℃鍛ㄦ湡鍚嶇О")
+ private String inspectCycleName;
+ @Schema(description = "璐d换浜虹紪鍙�")
+ private Long ownerId;
+ private String ownerName;
+ private Integer status;
+ @Schema(description = "鏈�杩戜竴娆″贰妫�鏃堕棿")
+ private LocalDateTime lastInspectTime;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointSaveReqVO.java
new file mode 100644
index 0000000..0d86357
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionPointSaveReqVO.java
@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 宸℃鐐逛綅鏂板/淇敼 Request VO")
+@Data
+public class SafetyInspectionPointSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "鐐逛綅缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "PD-001")
+ @NotBlank(message = "鐐逛綅缂栫爜涓嶈兘涓虹┖")
+ @Size(max = 64)
+ private String code;
+
+ @Schema(description = "鐐逛綅鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "1#楂樺帇閰嶇數瀹�")
+ @NotBlank(message = "鐐逛綅鍚嶇О涓嶈兘涓虹┖")
+ @Size(max = 100)
+ private String name;
+
+ @Schema(description = "鐐逛綅绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "HIGH_VOLTAGE_ROOM")
+ @NotBlank(message = "鐐逛綅绫诲瀷涓嶈兘涓虹┖")
+ @Pattern(regexp = "HIGH_VOLTAGE_ROOM|UNIT_AREA|DANGER_CHEMICAL|FIRE_AREA|WORKSHOP|OTHER", message = "鐐逛綅绫诲瀷涓嶅悎娉�")
+ private String pointType;
+
+ @Schema(description = "鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop锛�")
+ private Long workshopId;
+
+ @Schema(description = "鍏蜂綋浣嶇疆")
+ @Size(max = 200)
+ private String location;
+
+ @Schema(description = "宸℃椤圭洰娓呭崟锛屾寜琛屽垎闅�")
+ @Size(max = 2000)
+ private String inspectItems;
+
+ @Schema(description = "宸℃鍛ㄦ湡", example = "DAILY")
+ @Pattern(regexp = "SHIFT|DAILY|WEEKLY|MONTHLY", message = "宸℃鍛ㄦ湡涓嶅悎娉�")
+ private String inspectCycle;
+
+ @Schema(description = "璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long ownerId;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤锛�1-鍋滅敤", example = "0")
+ @NotNull(message = "鐘舵�佷笉鑳戒负绌�")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionRespVO.java
new file mode 100644
index 0000000..f3d93ad
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionRespVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃璁板綍 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 宸℃璁板綍 Response VO")
+@Data
+public class SafetyInspectionRespVO {
+
+ private Long id;
+ private Long pointId;
+ private String pointName;
+ private String pointType;
+ @Schema(description = "鐐逛綅绫诲瀷鍚嶇О")
+ private String pointTypeName;
+ private LocalDateTime inspectTime;
+ @Schema(description = "宸℃浜虹紪鍙�")
+ private Long inspectorId;
+ private String inspector;
+ private String result;
+ @Schema(description = "宸℃缁撴灉鍚嶇О")
+ private String resultName;
+ private String content;
+ private String photoUrls;
+ private Integer hazardCount;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionSaveReqVO.java
new file mode 100644
index 0000000..df34455
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/inspection/SafetyInspectionSaveReqVO.java
@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃璁板綍鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 宸℃璁板綍鏂板/淇敼 Request VO")
+@Data
+public class SafetyInspectionSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "宸℃鐐逛綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "宸℃鐐逛綅涓嶈兘涓虹┖")
+ private Long pointId;
+
+ @Schema(description = "宸℃鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "宸℃鏃堕棿涓嶈兘涓虹┖")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime inspectTime;
+
+ @Schema(description = "宸℃浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨宸℃浜�")
+ private Long inspectorId;
+
+ @Schema(description = "宸℃缁撴灉", example = "NORMAL")
+ @Pattern(regexp = "NORMAL|ABNORMAL", message = "宸℃缁撴灉鍙兘涓烘甯告垨寮傚父")
+ private String result;
+
+ @Schema(description = "宸℃鍐呭涓庢儏鍐�")
+ @Size(max = 2000)
+ private String content;
+
+ @Schema(description = "鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String photoUrls;
+
+ @Schema(description = "鏈鍙戠幇鐨勯殣鎮f暟", example = "0")
+ @Min(value = 0, message = "闅愭偅鏁颁笉鑳戒负璐熸暟")
+ private Integer hazardCount;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyLedgerExportReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyLedgerExportReqVO.java
new file mode 100644
index 0000000..5768372
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyLedgerExportReqVO.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ledger;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Pattern;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鏍囧噯鍖栧彴璐﹀鍑� Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鏍囧噯鍖栧彴璐﹀鍑� Request VO")
+@Data
+public class SafetyLedgerExportReqVO {
+
+ @Schema(description = "鍙拌处绫诲瀷锛欰LL-鍏ㄥ锛孋ERT-鐗圭浣滀笟璇侊紝HAZARD-闅愭偅锛孭ERMIT-浣滀笟绁紝MATERIAL-鐗╄祫锛孴RAINING-鍩硅锛孌RILL-婕旂粌锛孉CCIDENT-浜嬫晠锛孖NSPECTION-宸℃",
+ example = "ALL")
+ @Pattern(regexp = "ALL|CERT|HAZARD|PERMIT|MATERIAL|TRAINING|DRILL|ACCIDENT|INSPECTION", message = "鍙拌处绫诲瀷涓嶅悎娉�")
+ private String type;
+
+ @Schema(description = "寮�濮嬫棩鏈�")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate startDate;
+
+ @Schema(description = "缁撴潫鏃ユ湡")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate endDate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyOverviewRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyOverviewRespVO.java
new file mode 100644
index 0000000..3538659
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyOverviewRespVO.java
@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ledger;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鎬昏缁熻 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇鎬昏缁熻 Response VO")
+@Data
+public class SafetyOverviewRespVO {
+
+ @Schema(description = "鐗圭浣滀笟璇佹�绘暟")
+ private Long certTotal;
+ @Schema(description = "鍗冲皢鍒版湡璇佷欢鏁�")
+ private Long certExpiring;
+ @Schema(description = "宸茶繃鏈熻瘉浠舵暟")
+ private Long certExpired;
+ @Schema(description = "闅愭偅鎬绘暟")
+ private Long hazardTotal;
+ @Schema(description = "鏈棴鐜殣鎮f暟")
+ private Long hazardOpen;
+ @Schema(description = "宸茶秴鏈熸湭闂幆闅愭偅鏁�")
+ private Long hazardOverdue;
+ @Schema(description = "闅愭偅闂幆鐜囷紙0-100锛�")
+ private Integer hazardCloseRate;
+ @Schema(description = "寰呭鎵逛綔涓氱エ鏁�")
+ private Long permitPending;
+ @Schema(description = "杩涜涓綔涓氱エ鏁�")
+ private Long permitInProgress;
+ @Schema(description = "鐗╄祫浣庝簬瀹夊叏搴撳瓨鏁�")
+ private Long materialBelowSafeStock;
+ @Schema(description = "鐗╄祫涓磋繎鏈夋晥鏈熸暟")
+ private Long materialExpiring;
+ @Schema(description = "鏈湀鍩硅鍦烘")
+ private Long trainingThisMonth;
+ @Schema(description = "鏈湀婕旂粌鍦烘")
+ private Long drillThisMonth;
+ @Schema(description = "鏈湀浜嬫晠鏁�")
+ private Long accidentThisMonth;
+
+ @Schema(description = "闅愭偅瓒嬪娍锛堣繎 6 涓湀锛屾寜鏈堬級")
+ private List<MonthlyCount> hazardTrend;
+ @Schema(description = "浜嬫晠瓒嬪娍锛堣繎 6 涓湀锛屾寜鏈堬級")
+ private List<MonthlyCount> accidentTrend;
+
+ /**
+ * 鎸夋湀璁℃暟
+ */
+ @Data
+ public static class MonthlyCount {
+ @Schema(description = "鏈堜唤锛屾牸寮� yyyy-MM", example = "2026-10")
+ private String month;
+ @Schema(description = "鏁伴噺")
+ private Long count;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialPageReqVO.java
new file mode 100644
index 0000000..61ab520
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialPageReqVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍙拌处鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗╄祫鍙拌处鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyMaterialPageReqVO extends PageParam {
+
+ private String code;
+ private String name;
+ private String category;
+ private String storageLocation;
+ private Integer status;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialRespVO.java
new file mode 100644
index 0000000..fef6976
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialRespVO.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍙拌处 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗╄祫鍙拌处 Response VO")
+@Data
+public class SafetyMaterialRespVO {
+
+ private Long id;
+ private String code;
+ private String name;
+ private String category;
+ @Schema(description = "绫诲埆鍚嶇О")
+ private String categoryName;
+ private String spec;
+ private String unit;
+ private BigDecimal stockQty;
+ private BigDecimal safeStock;
+ @Schema(description = "鏄惁浣庝簬瀹夊叏搴撳瓨")
+ private Boolean belowSafeStock;
+ private String storageLocation;
+ private LocalDate expireDate;
+ @Schema(description = "璺濇湁鏁堟湡澶╂暟锛岃礋鏁拌〃绀哄凡杩囨湡")
+ private Long expireRemainingDays;
+ private Integer validityMonths;
+ @Schema(description = "淇濈浜虹紪鍙�")
+ private Long managerId;
+ private String manager;
+ private Integer status;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialSaveReqVO.java
new file mode 100644
index 0000000..f9d112f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialSaveReqVO.java
@@ -0,0 +1,76 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍙拌处鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗╄祫鍙拌处鏂板/淇敼 Request VO")
+@Data
+public class SafetyMaterialSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "鐗╄祫缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "PM-001")
+ @NotBlank(message = "鐗╄祫缂栫爜涓嶈兘涓虹┖")
+ @Size(max = 64)
+ private String code;
+
+ @Schema(description = "鐗╄祫鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "10kV 缁濈紭鎵嬪")
+ @NotBlank(message = "鐗╄祫鍚嶇О涓嶈兘涓虹┖")
+ @Size(max = 100)
+ private String name;
+
+ @Schema(description = "绫诲埆", requiredMode = Schema.RequiredMode.REQUIRED, example = "INSULATING")
+ @NotBlank(message = "鐗╄祫绫诲埆涓嶈兘涓虹┖")
+ @Pattern(regexp = "INSULATING|HAZARD_CHEMICAL|FIRE|PPE|OTHER", message = "鐗╄祫绫诲埆涓嶅悎娉�")
+ private String category;
+
+ @Schema(description = "瑙勬牸鍨嬪彿")
+ @Size(max = 100)
+ private String spec;
+
+ @Schema(description = "璁¢噺鍗曚綅", example = "鍙�")
+ @Size(max = 20)
+ private String unit;
+
+ @Schema(description = "褰撳墠搴撳瓨鏁伴噺")
+ @DecimalMin(value = "0", message = "搴撳瓨鏁伴噺涓嶈兘涓鸿礋鏁�")
+ private BigDecimal stockQty;
+
+ @Schema(description = "瀹夊叏搴撳瓨")
+ @DecimalMin(value = "0", message = "瀹夊叏搴撳瓨涓嶈兘涓鸿礋鏁�")
+ private BigDecimal safeStock;
+
+ @Schema(description = "瀛樻斁浣嶇疆")
+ @Size(max = 100)
+ private String storageLocation;
+
+ @Schema(description = "鏈夋晥鏈熻嚦")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate expireDate;
+
+ @Schema(description = "鏈夋晥鏈熸湀鏁�")
+ @Min(value = 0, message = "鏈夋晥鏈熸湀鏁颁笉鑳戒负璐熸暟")
+ private Integer validityMonths;
+
+ @Schema(description = "淇濈浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long managerId;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤锛�1-鍋滅敤", example = "0")
+ @NotNull(message = "鐘舵�佷笉鑳戒负绌�")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockPageReqVO.java
new file mode 100644
index 0000000..df65b79
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockPageReqVO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍑哄叆搴撴祦姘村垎椤� Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗╄祫鍑哄叆搴撴祦姘村垎椤� Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyMaterialStockPageReqVO extends PageParam {
+
+ private Long materialId;
+ private String materialName;
+ private String category;
+ private String bizType;
+
+ @Schema(description = "涓氬姟鏃ユ湡鑼冨洿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate[] bizDate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockRespVO.java
new file mode 100644
index 0000000..9e2fd5c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockRespVO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍑哄叆搴撴祦姘� Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗╄祫鍑哄叆搴撴祦姘� Response VO")
+@Data
+public class SafetyMaterialStockRespVO {
+
+ private Long id;
+ private Long materialId;
+ private String materialName;
+ private String category;
+ @Schema(description = "绫诲埆鍚嶇О")
+ private String categoryName;
+ private String bizType;
+ @Schema(description = "涓氬姟绫诲瀷鍚嶇О")
+ private String bizTypeName;
+ private BigDecimal quantity;
+ private BigDecimal stockBefore;
+ private BigDecimal stockAfter;
+ private LocalDate bizDate;
+ private String operator;
+ private String receiver;
+ private String purpose;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockSaveReqVO.java
new file mode 100644
index 0000000..e045108
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/material/SafetyMaterialStockSaveReqVO.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍑哄叆搴撶櫥璁� Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐗╄祫鍑哄叆搴撶櫥璁� Request VO")
+@Data
+public class SafetyMaterialStockSaveReqVO {
+
+ @Schema(description = "鐗╄祫缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鐗╄祫涓嶈兘涓虹┖")
+ private Long materialId;
+
+ @Schema(description = "涓氬姟绫诲瀷锛欼N-鍏ュ簱锛孫UT-鍑哄簱", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "涓氬姟绫诲瀷涓嶈兘涓虹┖")
+ @Pattern(regexp = "IN|OUT", message = "涓氬姟绫诲瀷鍙兘涓哄叆搴撴垨鍑哄簱")
+ private String bizType;
+
+ @Schema(description = "鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+ @NotNull(message = "鏁伴噺涓嶈兘涓虹┖")
+ @DecimalMin(value = "0", inclusive = false, message = "鏁伴噺蹇呴』澶т簬闆�")
+ @Digits(integer = 15, fraction = 3)
+ private BigDecimal quantity;
+
+ @Schema(description = "涓氬姟鏃ユ湡")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate bizDate;
+
+ @Schema(description = "缁忓姙浜�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "缁忓姙浜轰笉鑳戒负绌�")
+ @Size(max = 50)
+ private String operator;
+
+ @Schema(description = "棰嗙敤浜猴紙鍑哄簱濉啓锛�")
+ @Size(max = 50)
+ private String receiver;
+
+ @Schema(description = "鐢ㄩ��/鍘诲悜")
+ @Size(max = 200)
+ private String purpose;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java
new file mode 100644
index 0000000..cc587cd
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.org;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏缁勭粐 Response VO锛堟爲褰級
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏缁勭粐 Response VO")
+@Data
+public class SafetyOrgRespVO {
+
+ private Long id;
+ private Long parentId;
+ private String name;
+ @Schema(description = "璐熻矗浜猴紙鍛樺伐缂栧彿锛�")
+ private Long leaderId;
+ @Schema(description = "璐熻矗浜哄鍚嶏紙蹇収锛�")
+ private String leaderName;
+ private String leaderPhone;
+ private String memberNames;
+ private String duty;
+ private Integer sort;
+ private Integer status;
+ private String remark;
+ private LocalDateTime createTime;
+
+ @Schema(description = "瀛愮粍缁�")
+ private List<SafetyOrgRespVO> children;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgSaveReqVO.java
new file mode 100644
index 0000000..6694c0a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgSaveReqVO.java
@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.org;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏缁勭粐鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏缁勭粐鏂板/淇敼 Request VO")
+@Data
+public class SafetyOrgSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "鐖剁骇缂栧彿锛�0 涓洪《绾�", example = "0")
+ private Long parentId;
+
+ @Schema(description = "缁勭粐鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "瀹夊叏鐢熶骇濮斿憳浼�")
+ @NotBlank(message = "缁勭粐鍚嶇О涓嶈兘涓虹┖")
+ @Size(max = 100, message = "缁勭粐鍚嶇О闀垮害涓嶈兘瓒呰繃 100 瀛�")
+ private String name;
+
+ @Schema(description = "璐熻矗浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long leaderId;
+
+ @Schema(description = "鎴愬憳濮撳悕锛岄�楀彿鍒嗛殧")
+ @Size(max = 500)
+ private String memberNames;
+
+ @Schema(description = "瀹夊叏鑱岃矗")
+ @Size(max = 500)
+ private String duty;
+
+ @Schema(description = "鏄剧ず椤哄簭", example = "1")
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private Integer sort;
+
+ @Schema(description = "鐘舵�侊細0-鍚敤锛�1-鍋滅敤", example = "0")
+ @NotNull(message = "鐘舵�佷笉鑳戒负绌�")
+ private Integer status;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitApproveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitApproveReqVO.java
new file mode 100644
index 0000000..bca98c7
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitApproveReqVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁ㄥ鎵� Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 楂樺嵄浣滀笟绁ㄥ鎵� Request VO")
+@Data
+public class SafetyWorkPermitApproveReqVO {
+
+ @Schema(description = "浣滀笟绁ㄧ紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "浣滀笟绁ㄧ紪鍙蜂笉鑳戒负绌�")
+ private Long id;
+
+ @Schema(description = "瀹℃壒浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨瀹℃壒浜�")
+ private Long approverId;
+
+ @Schema(description = "瀹℃壒缁撹锛欰PPROVED-閫氳繃锛孯EJECTED-椹冲洖", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotBlank(message = "瀹℃壒缁撹涓嶈兘涓虹┖")
+ @Pattern(regexp = "APPROVED|REJECTED", message = "瀹℃壒缁撹鍙兘涓洪�氳繃鎴栭┏鍥�")
+ private String decision;
+
+ @Schema(description = "瀹℃壒鎰忚")
+ @Size(max = 500)
+ private String approveComment;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorRespVO.java
new file mode 100644
index 0000000..a279ef9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorRespVO.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浣滀笟鐩戞姢璁板綍 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 浣滀笟鐩戞姢璁板綍 Response VO")
+@Data
+public class SafetyWorkPermitMonitorRespVO {
+
+ private Long id;
+ private Long permitId;
+ private LocalDateTime monitorTime;
+ @Schema(description = "鐩戞姢浜虹紪鍙�")
+ private Long guardianId;
+ private String guardian;
+ private String monitorContent;
+ private String abnormal;
+ private String photoUrls;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorSaveReqVO.java
new file mode 100644
index 0000000..697f70d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitMonitorSaveReqVO.java
@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浣滀笟鐩戞姢璁板綍鏂板 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 浣滀笟鐩戞姢璁板綍鏂板 Request VO")
+@Data
+public class SafetyWorkPermitMonitorSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "浣滀笟绁ㄧ紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "浣滀笟绁ㄧ紪鍙蜂笉鑳戒负绌�")
+ private Long permitId;
+
+ @Schema(description = "鐩戞姢鏃堕棿")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime monitorTime;
+
+ @Schema(description = "鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨鐩戞姢浜�")
+ private Long guardianId;
+
+ @Schema(description = "鐩戞姢鍐呭涓庢儏鍐�")
+ @Size(max = 1000)
+ private String monitorContent;
+
+ @Schema(description = "寮傚父鎯呭喌涓庡缃�")
+ @Size(max = 500)
+ private String abnormal;
+
+ @Schema(description = "鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String photoUrls;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitPageReqVO.java
new file mode 100644
index 0000000..dc92c21
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitPageReqVO.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁ㄥ垎椤� Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 楂樺嵄浣滀笟绁ㄥ垎椤� Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyWorkPermitPageReqVO extends PageParam {
+
+ private String code;
+ private String title;
+ private String permitType;
+ private String status;
+ private String riskLevel;
+ private String applicant;
+ private String workshopName;
+
+ @Schema(description = "璁″垝寮�濮嬫椂闂磋寖鍥�")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime[] planStartTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitRespVO.java
new file mode 100644
index 0000000..c01439f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitRespVO.java
@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁� Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 楂樺嵄浣滀笟绁� Response VO")
+@Data
+public class SafetyWorkPermitRespVO {
+
+ private Long id;
+ private String code;
+ private String permitType;
+ @Schema(description = "浣滀笟绫诲瀷鍚嶇О")
+ private String permitTypeName;
+ private String title;
+ @Schema(description = "浣滀笟杞﹂棿缂栧彿")
+ private Long workshopId;
+ private String workshopName;
+ private String location;
+ private String workContent;
+ @Schema(description = "鐢宠浜虹紪鍙�")
+ private Long applicantId;
+ private String applicant;
+ private LocalDateTime applyTime;
+ private LocalDateTime planStartTime;
+ private LocalDateTime planEndTime;
+ private LocalDateTime actualStartTime;
+ private LocalDateTime actualEndTime;
+ private String riskLevel;
+ @Schema(description = "椋庨櫓绛夌骇鍚嶇О")
+ private String riskLevelName;
+ private String safetyMeasures;
+ @Schema(description = "瀹℃壒浜虹紪鍙�")
+ private Long approverId;
+ private String approver;
+ private LocalDateTime approveTime;
+ private String approveComment;
+ @Schema(description = "鐩戞姢浜虹紪鍙�")
+ private Long guardianId;
+ private String guardian;
+ private String status;
+ @Schema(description = "鐘舵�佸悕绉�")
+ private String statusName;
+ private String attachment;
+ private String photoUrls;
+ @Schema(description = "鐩戞姢浜烘槸鍚﹀繀濉紙鍔ㄧ伀/楂樺帇甯︾數/鏈夐檺绌洪棿锛�")
+ private Boolean guardianRequired;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java
new file mode 100644
index 0000000..92abbf2
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java
@@ -0,0 +1,84 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁ㄧ敵璇�/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 楂樺嵄浣滀笟绁ㄧ敵璇�/淇敼 Request VO")
+@Data
+public class SafetyWorkPermitSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "浣滀笟绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "HOT_WORK")
+ @NotBlank(message = "浣滀笟绫诲瀷涓嶈兘涓虹┖")
+ @Pattern(regexp = "HOT_WORK|LIVE_HIGH_VOLTAGE|LIMITED_SPACE|WORK_AT_HEIGHT|LIFTING|TEMP_ELECTRIC|OTHER",
+ message = "浣滀笟绫诲瀷涓嶅悎娉�")
+ private String permitType;
+
+ @Schema(description = "浣滀笟鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "2#涓诲彉妫�淇姩鐏�")
+ @NotBlank(message = "浣滀笟鍚嶇О涓嶈兘涓虹┖")
+ @Size(max = 200)
+ private String title;
+
+ @Schema(description = "浣滀笟杞﹂棿锛堝叧鑱� mes_md_workshop锛�")
+ private Long workshopId;
+
+ @Schema(description = "浣滀笟鍦扮偣")
+ @Size(max = 200)
+ private String location;
+
+ @Schema(description = "浣滀笟鍐呭涓庤寖鍥�")
+ @Size(max = 2000)
+ private String workContent;
+
+ @Schema(description = "鐢宠浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇烽�夋嫨鐢宠浜�")
+ private Long applicantId;
+
+ @Schema(description = "鐢宠鏃堕棿")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime applyTime;
+
+ @Schema(description = "璁″垝寮�濮嬫椂闂�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璁″垝寮�濮嬫椂闂翠笉鑳戒负绌�")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime planStartTime;
+
+ @Schema(description = "璁″垝缁撴潫鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璁″垝缁撴潫鏃堕棿涓嶈兘涓虹┖")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime planEndTime;
+
+ @Schema(description = "椋庨櫓绛夌骇", example = "HIGH")
+ @Pattern(regexp = "LOW|NORMAL|HIGH|VERY_HIGH", message = "椋庨櫓绛夌骇涓嶅悎娉�")
+ private String riskLevel;
+
+ @Schema(description = "瀹夊叏鎺柦")
+ @Size(max = 2000)
+ private String safetyMeasures;
+
+ @Schema(description = "鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long guardianId;
+
+ @Schema(description = "浣滀笟绁ㄩ檮浠� URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String attachment;
+
+ @Schema(description = "鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String photoUrls;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentPageReqVO.java
new file mode 100644
index 0000000..0719cf2
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentPageReqVO.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠鐧昏鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 浜嬫晠鐧昏鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyAccidentPageReqVO extends PageParam {
+
+ private String code;
+ private String title;
+ private String accidentType;
+ private String level;
+ private String status;
+
+ @Schema(description = "鍙戠敓鏃堕棿鑼冨洿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime[] occurTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentRespVO.java
new file mode 100644
index 0000000..ac50c83
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentRespVO.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠鐧昏 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 浜嬫晠鐧昏 Response VO")
+@Data
+public class SafetyAccidentRespVO {
+
+ private Long id;
+ private String code;
+ private String title;
+ private String accidentType;
+ @Schema(description = "浜嬫晠绫诲瀷鍚嶇О")
+ private String accidentTypeName;
+ private String level;
+ @Schema(description = "浜嬫晠绛夌骇鍚嶇О")
+ private String levelName;
+ private LocalDateTime occurTime;
+ private String location;
+ @Schema(description = "鎵�灞炶溅闂寸紪鍙�")
+ private Long workshopId;
+ private String workshopName;
+ private String casualtyDesc;
+ private BigDecimal economicLoss;
+ private String involvedPersons;
+ private String description;
+ private String causeAnalysis;
+ private String measures;
+ @Schema(description = "鐧昏浜虹紪鍙�")
+ private Long reporterId;
+ private String reporter;
+ private LocalDateTime reportTime;
+ private String status;
+ @Schema(description = "鐘舵�佸悕绉�")
+ private String statusName;
+ private String attachment;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentSaveReqVO.java
new file mode 100644
index 0000000..3623785
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyAccidentSaveReqVO.java
@@ -0,0 +1,91 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠鐧昏鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 浜嬫晠鐧昏鏂板/淇敼 Request VO")
+@Data
+public class SafetyAccidentSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "浜嬫晠鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "10kV 寮�鍏虫煖璇搷浣滆Е鐢�")
+ @NotBlank(message = "浜嬫晠鍚嶇О涓嶈兘涓虹┖")
+ @Size(max = 200)
+ private String title;
+
+ @Schema(description = "浜嬫晠绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "ELECTRIC_SHOCK")
+ @NotBlank(message = "浜嬫晠绫诲瀷涓嶈兘涓虹┖")
+ @Pattern(regexp = "ELECTRIC_SHOCK|FIRE|FALL|OBJECT_STRIKE|MECHANICAL|CHEMICAL|VEHICLE|OTHER", message = "浜嬫晠绫诲瀷涓嶅悎娉�")
+ private String accidentType;
+
+ @Schema(description = "浜嬫晠绛夌骇", example = "GENERAL")
+ @Pattern(regexp = "SLIGHT|GENERAL|SEVERE|MAJOR", message = "浜嬫晠绛夌骇涓嶅悎娉�")
+ private String level;
+
+ @Schema(description = "鍙戠敓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鍙戠敓鏃堕棿涓嶈兘涓虹┖")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime occurTime;
+
+ @Schema(description = "鍙戠敓鍦扮偣")
+ @Size(max = 200)
+ private String location;
+
+ @Schema(description = "鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop锛�")
+ private Long workshopId;
+
+ @Schema(description = "浼や骸鎯呭喌")
+ @Size(max = 500)
+ private String casualtyDesc;
+
+ @Schema(description = "鐩存帴缁忔祹鎹熷け锛堝厓锛�")
+ @DecimalMin(value = "0", message = "缁忔祹鎹熷け涓嶈兘涓鸿礋鏁�")
+ private BigDecimal economicLoss;
+
+ @Schema(description = "娑変簨浜哄憳濮撳悕锛岄�楀彿鍒嗛殧")
+ @Size(max = 500)
+ private String involvedPersons;
+
+ @Schema(description = "浜嬫晠缁忚繃")
+ @Size(max = 2000)
+ private String description;
+
+ @Schema(description = "鍘熷洜鍒嗘瀽")
+ @Size(max = 2000)
+ private String causeAnalysis;
+
+ @Schema(description = "澶勭悊鎺柦涓庢暣鏀硅姹�")
+ @Size(max = 2000)
+ private String measures;
+
+ @Schema(description = "鐧昏浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long reporterId;
+
+ @Schema(description = "鐧昏鏃堕棿")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+ private LocalDateTime reportTime;
+
+ @Schema(description = "鐘舵��", example = "REPORTED")
+ @Pattern(regexp = "REPORTED|INVESTIGATING|HANDLED|CLOSED", message = "鐘舵�佷笉鍚堟硶")
+ private String status;
+
+ @Schema(description = "鐜板満鐓х墖/璋冩煡鎶ュ憡 URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String attachment;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillPageReqVO.java
new file mode 100644
index 0000000..56b134a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillPageReqVO.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 婕旂粌璁板綍鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 婕旂粌璁板綍鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyDrillPageReqVO extends PageParam {
+
+ private String title;
+ private String drillType;
+ private String organizer;
+
+ @Schema(description = "婕旂粌鏃ユ湡鑼冨洿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate[] drillDate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillRespVO.java
new file mode 100644
index 0000000..8483740
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillRespVO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 婕旂粌璁板綍 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 婕旂粌璁板綍 Response VO")
+@Data
+public class SafetyDrillRespVO {
+
+ private Long id;
+ private String title;
+ private String drillType;
+ @Schema(description = "婕旂粌绫诲瀷鍚嶇О")
+ private String drillTypeName;
+ private LocalDate drillDate;
+ private String location;
+ @Schema(description = "缁勭粐浜虹紪鍙�")
+ private Long organizerId;
+ private String organizer;
+ private String participants;
+ private Integer participantCount;
+ private String planDesc;
+ private String processDesc;
+ private String summary;
+ private Integer durationMinutes;
+ private String attachment;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java
new file mode 100644
index 0000000..cf90a08
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java
@@ -0,0 +1,74 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 娑堥槻婕旂粌璁板綍鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 娑堥槻婕旂粌璁板綍鏂板/淇敼 Request VO")
+@Data
+public class SafetyDrillSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "婕旂粌鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "2026 骞村害娑堥槻鐤忔暎婕旂粌")
+ @NotBlank(message = "婕旂粌鍚嶇О涓嶈兘涓虹┖")
+ @Size(max = 200)
+ private String title;
+
+ @Schema(description = "婕旂粌绫诲瀷", example = "FIRE")
+ @Pattern(regexp = "FIRE|EMERGENCY_EVAC|ELECTRIC_ACCIDENT|CHEMICAL_LEAK|OTHER", message = "婕旂粌绫诲瀷涓嶅悎娉�")
+ private String drillType;
+
+ @Schema(description = "婕旂粌鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "婕旂粌鏃ユ湡涓嶈兘涓虹┖")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate drillDate;
+
+ @Schema(description = "婕旂粌鍦扮偣")
+ @Size(max = 200)
+ private String location;
+
+ @Schema(description = "缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long organizerId;
+
+ @Schema(description = "鍙傚姞浜哄憳濮撳悕锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String participants;
+
+ @Schema(description = "鍙傚姞浜烘暟")
+ @Min(value = 0, message = "鍙傚姞浜烘暟涓嶈兘涓鸿礋鏁�")
+ private Integer participantCount;
+
+ @Schema(description = "婕旂粌鏂规")
+ @Size(max = 2000)
+ private String planDesc;
+
+ @Schema(description = "婕旂粌杩囩▼璁板綍")
+ @Size(max = 2000)
+ private String processDesc;
+
+ @Schema(description = "婕旂粌鎬荤粨涓庢敼杩�")
+ @Size(max = 2000)
+ private String summary;
+
+ @Schema(description = "婕旂粌鏃堕暱锛堝垎閽燂級")
+ @Min(value = 0, message = "婕旂粌鏃堕暱涓嶈兘涓鸿礋鏁�")
+ private Integer durationMinutes;
+
+ @Schema(description = "婕旂粌鐓х墖/璁板綍琛� URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String attachment;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingPageReqVO.java
new file mode 100644
index 0000000..938efe1
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingPageReqVO.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅璁板綍鍒嗛〉 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鍩硅璁板綍鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyTrainingPageReqVO extends PageParam {
+
+ private String title;
+ private String trainingType;
+ private String trainer;
+
+ @Schema(description = "鍩硅鏃ユ湡鑼冨洿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate[] trainDate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingRespVO.java
new file mode 100644
index 0000000..e79feb9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingRespVO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅璁板綍 Response VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鍩硅璁板綍 Response VO")
+@Data
+public class SafetyTrainingRespVO {
+
+ private Long id;
+ private String title;
+ private String trainingType;
+ @Schema(description = "鍩硅绫诲瀷鍚嶇О")
+ private String trainingTypeName;
+ private LocalDate trainDate;
+ private BigDecimal durationHours;
+ @Schema(description = "璁插笀/缁勭粐浜虹紪鍙�")
+ private Long trainerId;
+ private String trainer;
+ private String location;
+ private String participants;
+ private Integer participantCount;
+ private String content;
+ private String examResult;
+ private String attachment;
+ private String remark;
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingSaveReqVO.java
new file mode 100644
index 0000000..9818d6a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyTrainingSaveReqVO.java
@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅璁板綍鏂板/淇敼 Request VO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鍩硅璁板綍鏂板/淇敼 Request VO")
+@Data
+public class SafetyTrainingSaveReqVO {
+
+ private Long id;
+
+ @Schema(description = "鍩硅涓婚", requiredMode = Schema.RequiredMode.REQUIRED, example = "骞村害瀹夊叏瑙勭▼鍩硅")
+ @NotBlank(message = "鍩硅涓婚涓嶈兘涓虹┖")
+ @Size(max = 200)
+ private String title;
+
+ @Schema(description = "鍩硅绫诲瀷", example = "SAFETY")
+ @Pattern(regexp = "SAFETY|SKILL|LAW|EMERGENCY|INDUCTION|OTHER", message = "鍩硅绫诲瀷涓嶅悎娉�")
+ private String trainingType;
+
+ @Schema(description = "鍩硅鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鍩硅鏃ユ湡涓嶈兘涓虹┖")
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate trainDate;
+
+ @Schema(description = "鍩硅瀛︽椂", example = "2.0")
+ @DecimalMin(value = "0", message = "鍩硅瀛︽椂涓嶈兘涓鸿礋鏁�")
+ private BigDecimal durationHours;
+
+ @Schema(description = "璁插笀/缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee锛�")
+ private Long trainerId;
+
+ @Schema(description = "鍩硅鍦扮偣")
+ @Size(max = 200)
+ private String location;
+
+ @Schema(description = "鍙傚姞浜哄憳濮撳悕锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String participants;
+
+ @Schema(description = "鍙傚姞浜烘暟")
+ @Min(value = 0, message = "鍙傚姞浜烘暟涓嶈兘涓鸿礋鏁�")
+ private Integer participantCount;
+
+ @Schema(description = "鍩硅鍐呭")
+ @Size(max = 2000)
+ private String content;
+
+ @Schema(description = "鑰冩牳鎯呭喌")
+ @Size(max = 2000)
+ private String examResult;
+
+ @Schema(description = "绛惧埌琛�/璇句欢/鐓х墖 URL锛岄�楀彿鍒嗛殧")
+ @Size(max = 2000)
+ private String attachment;
+
+ @Schema(description = "澶囨敞")
+ @Size(max = 500)
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java
new file mode 100644
index 0000000..925beba
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java
@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠鐧昏 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_accident")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyAccidentDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 浜嬫晠缂栧彿 */
+ private String code;
+ /** 浜嬫晠鍚嶇О */
+ private String title;
+ /** 浜嬫晠绫诲瀷锛岃 SafetyAccidentTypeEnum */
+ private String accidentType;
+ /** 浜嬫晠绛夌骇锛岃 SafetyAccidentLevelEnum */
+ private String level;
+ /** 鍙戠敓鏃堕棿 */
+ private LocalDateTime occurTime;
+ /** 鍙戠敓鍦扮偣 */
+ private String location;
+ /** 鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop.id锛� */
+ private Long workshopId;
+ /** 鎵�灞炶溅闂村悕绉帮紙蹇収锛岀敱杞﹂棿涓绘暟鎹甫鍑猴級 */
+ private String workshopName;
+ /** 浼や骸鎯呭喌 */
+ private String casualtyDesc;
+ /** 鐩存帴缁忔祹鎹熷け锛堝厓锛� */
+ private BigDecimal economicLoss;
+ /** 娑変簨浜哄憳濮撳悕锛岄�楀彿鍒嗛殧 */
+ private String involvedPersons;
+ /** 浜嬫晠缁忚繃 */
+ private String description;
+ /** 鍘熷洜鍒嗘瀽 */
+ private String causeAnalysis;
+ /** 澶勭悊鎺柦涓庢暣鏀硅姹� */
+ private String measures;
+ /** 鐧昏浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long reporterId;
+ /** 鐧昏浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String reporter;
+ /** 鐧昏鏃堕棿 */
+ private LocalDateTime reportTime;
+ /** 鐘舵�侊紝瑙� SafetyAccidentStatusEnum */
+ private String status;
+ /** 鐜板満鐓х墖/璋冩煡鎶ュ憡 URL锛岄�楀彿鍒嗛殧 */
+ private String attachment;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java
new file mode 100644
index 0000000..8eb951c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佸彴璐� DO
+ *
+ * <p>瑕嗙洊鐢靛伐璇併�侀珮鍘嬫搷浣滆瘉绛夌壒绉嶄綔涓氳祫鏍艰瘉浠讹紝鎸夋湁鏁堟湡鑷姩鍒ゆ柇鐘舵�佸苟棰勮銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_certificate")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyCertificateDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /**
+ * 鎸佽瘉浜猴紙鍛樺伐缂栧彿锛�
+ *
+ * 鍏宠仈 HrmEmployeeDO#getId()锛屽鍚�/宸ュ彿/閮ㄩ棬鍧囩敱姝ゅ叧鑱斿甫鍑�
+ */
+ private Long employeeId;
+ /** 鎸佽瘉浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛岀敤浜庡憳宸ユ。妗堝彉鏇村悗杩芥函寮�璇佹椂淇℃伅锛� */
+ private String employeeName;
+ /** 宸ュ彿锛堝揩鐓э級 */
+ private String employeeNo;
+ /** 鎵�灞為儴闂紙蹇収锛� */
+ private String deptName;
+ /** 璇佷欢绫诲瀷锛岃 SafetyCertificateTypeEnum */
+ private String certType;
+ /** 璇佷欢缂栧彿 */
+ private String certNo;
+ /** 鍙戣瘉鏈哄叧 */
+ private String issuer;
+ /** 鍙戣瘉鏃ユ湡 */
+ private LocalDate issueDate;
+ /** 鏈夋晥鏈熻嚦 */
+ private LocalDate expireDate;
+ /** 涓嬫澶嶅鏃ユ湡 */
+ private LocalDate reviewDate;
+ /** 鍒版湡棰勮鎻愬墠澶╂暟 */
+ private Integer warnDays;
+ /** 鐘舵�侊紝瑙� SafetyCertificateStatusEnum */
+ private String status;
+ /** 璇佷欢鎵弿浠� URL锛岄�楀彿鍒嗛殧 */
+ private String attachment;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyDrillDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyDrillDO.java
new file mode 100644
index 0000000..55f560d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyDrillDO.java
@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 娑堥槻婕旂粌璁板綍 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_drill")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyDrillDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 婕旂粌鍚嶇О */
+ private String title;
+ /** 婕旂粌绫诲瀷锛岃 SafetyDrillTypeEnum */
+ private String drillType;
+ /** 婕旂粌鏃ユ湡 */
+ private LocalDate drillDate;
+ /** 婕旂粌鍦扮偣 */
+ private String location;
+ /** 缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long organizerId;
+ /** 缁勭粐浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String organizer;
+ /** 鍙傚姞浜哄憳濮撳悕锛岄�楀彿鍒嗛殧 */
+ private String participants;
+ /** 鍙傚姞浜烘暟 */
+ private Integer participantCount;
+ /** 婕旂粌鏂规 */
+ private String planDesc;
+ /** 婕旂粌杩囩▼璁板綍 */
+ private String processDesc;
+ /** 婕旂粌鎬荤粨涓庢敼杩� */
+ private String summary;
+ /** 婕旂粌鏃堕暱锛堝垎閽燂級 */
+ private Integer durationMinutes;
+ /** 婕旂粌鐓х墖/璁板綍琛� URL锛岄�楀彿鍒嗛殧 */
+ private String attachment;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java
new file mode 100644
index 0000000..2e5eb9c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java
@@ -0,0 +1,82 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鐧昏涓庨棴鐜� DO
+ *
+ * <p>瀹屾暣闂幆锛氫笂鎶� 鈫� 鍒嗘淳 鈫� 鏁存敼 鈫� 澶嶆煡锛堥�氳繃鍒欓棴鐜紝涓嶉�氳繃閫�鍥炴暣鏀癸級銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_hazard")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyHazardDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 闅愭偅缂栧彿 */
+ private String code;
+ /** 闅愭偅鏍囬 */
+ private String title;
+ /** 闅愭偅绛夌骇锛岃 SafetyHazardLevelEnum */
+ private String level;
+ /** 鏉ユ簮锛岃 SafetyHazardSourceEnum */
+ private String source;
+ /** 鍏宠仈宸℃璁板綍缂栧彿 */
+ private Long inspectionId;
+ /** 鍏宠仈宸℃鐐逛綅缂栧彿 */
+ private Long pointId;
+ /** 鐐逛綅鍚嶇О */
+ private String pointName;
+ /** 闅愭偅浣嶇疆 */
+ private String location;
+ /** 闅愭偅鎻忚堪 */
+ private String description;
+ /** 鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧锛堢Щ鍔ㄧ鎷嶇収涓婁紶锛� */
+ private String photoUrls;
+ /** 涓婃姤浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long reporterId;
+ /** 涓婃姤浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String reporter;
+ /** 涓婃姤鏃堕棿 */
+ private LocalDateTime reportTime;
+ /** 鏁存敼璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long assigneeId;
+ /** 鏁存敼璐d换浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String assignee;
+ /** 鍒嗘淳鏃堕棿 */
+ private LocalDateTime assignTime;
+ /** 鏁存敼鏈熼檺 */
+ private LocalDate rectifyDeadline;
+ /** 鏁存敼鎺柦涓庣粨鏋� */
+ private String rectifyDesc;
+ /** 鏁存敼鍚庣収鐗� URL锛岄�楀彿鍒嗛殧 */
+ private String rectifyPhotoUrls;
+ /** 鏁存敼瀹屾垚鏃堕棿 */
+ private LocalDateTime rectifyTime;
+ /** 澶嶆煡浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long recheckerId;
+ /** 澶嶆煡浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String rechecker;
+ /** 澶嶆煡鏃堕棿 */
+ private LocalDateTime recheckTime;
+ /** 澶嶆煡缁撹锛歅ASSED-閫氳繃锛孯EJECTED-涓嶉�氳繃 */
+ private String recheckResult;
+ /** 澶嶆煡鎰忚 */
+ private String recheckRemark;
+ /** 鐘舵�侊紝瑙� SafetyHazardStatusEnum */
+ private String status;
+ /** 闂幆鏃堕棿 */
+ private LocalDateTime closeTime;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionDO.java
new file mode 100644
index 0000000..6e59aba
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionDO.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃璁板綍 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_inspection")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyInspectionDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 宸℃鐐逛綅缂栧彿 */
+ private Long pointId;
+ /** 鐐逛綅鍚嶇О锛堝揩鐓э級 */
+ private String pointName;
+ /** 鐐逛綅绫诲瀷锛堝揩鐓э級 */
+ private String pointType;
+ /** 宸℃鏃堕棿 */
+ private LocalDateTime inspectTime;
+ /** 宸℃浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long inspectorId;
+ /** 宸℃浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String inspector;
+ /** 宸℃缁撴灉锛歂ORMAL-姝e父锛孉BNORMAL-寮傚父 */
+ private String result;
+ /** 宸℃鍐呭涓庢儏鍐� */
+ private String content;
+ /** 鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧 */
+ private String photoUrls;
+ /** 鏈鍙戠幇鐨勯殣鎮f暟 */
+ private Integer hazardCount;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java
new file mode 100644
index 0000000..a9f0302
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java
@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅 DO
+ *
+ * <p>楂樺帇閰嶇數瀹ゃ�佹満缁勫尯绛夋棩甯稿畨鍏ㄥ贰妫�鐐逛綅銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_inspection_point")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyInspectionPointDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 鐐逛綅缂栫爜 */
+ private String code;
+ /** 鐐逛綅鍚嶇О */
+ private String name;
+ /** 鐐逛綅绫诲瀷锛岃 SafetyInspectionPointTypeEnum */
+ private String pointType;
+ /** 鎵�灞炶溅闂达紙鍏宠仈 mes_md_workshop.id锛� */
+ private Long workshopId;
+ /** 鎵�灞炶溅闂村悕绉帮紙蹇収锛岀敱杞﹂棿涓绘暟鎹甫鍑猴級 */
+ private String workshopName;
+ /** 鍏蜂綋浣嶇疆 */
+ private String location;
+ /** 宸℃椤圭洰娓呭崟锛屾寜琛屽垎闅� */
+ private String inspectItems;
+ /** 宸℃鍛ㄦ湡锛岃 SafetyInspectCycleEnum */
+ private String inspectCycle;
+ /** 璐d换浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long ownerId;
+ /** 璐d换浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String ownerName;
+ /** 鐘舵�侊細0-鍚敤锛�1-鍋滅敤 */
+ private Integer status;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialDO.java
new file mode 100644
index 0000000..e9a5f7e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialDO.java
@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 搴旀��/瀹夊叏鐗╄祫鍙拌处 DO
+ *
+ * <p>鐢靛姏缁濈紭鐢ㄥ叿銆佸嵄鍖栧搧銆佹秷闃茬墿璧勭瓑銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_material")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyMaterialDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 鐗╄祫缂栫爜 */
+ private String code;
+ /** 鐗╄祫鍚嶇О */
+ private String name;
+ /** 绫诲埆锛岃 SafetyMaterialCategoryEnum */
+ private String category;
+ /** 瑙勬牸鍨嬪彿 */
+ private String spec;
+ /** 璁¢噺鍗曚綅 */
+ private String unit;
+ /** 褰撳墠搴撳瓨鏁伴噺 */
+ private BigDecimal stockQty;
+ /** 瀹夊叏搴撳瓨锛堜綆浜庡垯棰勮锛� */
+ private BigDecimal safeStock;
+ /** 瀛樻斁浣嶇疆 */
+ private String storageLocation;
+ /** 鏈夋晥鏈熻嚦锛堢粷缂�/鍗卞寲鍝佸繀濉級 */
+ private LocalDate expireDate;
+ /** 鏈夋晥鏈熸湀鏁� */
+ private Integer validityMonths;
+ /** 淇濈浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long managerId;
+ /** 淇濈浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String manager;
+ /** 鐘舵�侊細0-鍚敤锛�1-鍋滅敤 */
+ private Integer status;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialStockDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialStockDO.java
new file mode 100644
index 0000000..15bf901
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyMaterialStockDO.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍑哄叆搴撴祦姘� DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_material_stock")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyMaterialStockDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 鐗╄祫缂栧彿 */
+ private Long materialId;
+ /** 鐗╄祫鍚嶇О锛堝揩鐓э級 */
+ private String materialName;
+ /** 鐗╄祫绫诲埆锛堝揩鐓э級 */
+ private String category;
+ /** 涓氬姟绫诲瀷锛欼N-鍏ュ簱锛孫UT-鍑哄簱 */
+ private String bizType;
+ /** 鏁伴噺 */
+ private BigDecimal quantity;
+ /** 鎿嶄綔鍓嶅簱瀛� */
+ private BigDecimal stockBefore;
+ /** 鎿嶄綔鍚庡簱瀛� */
+ private BigDecimal stockAfter;
+ /** 涓氬姟鏃ユ湡 */
+ private LocalDate bizDate;
+ /** 缁忓姙浜� */
+ private String operator;
+ /** 棰嗙敤浜猴紙鍑哄簱锛� */
+ private String receiver;
+ /** 鐢ㄩ��/鍘诲悜 */
+ private String purpose;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyOrgDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyOrgDO.java
new file mode 100644
index 0000000..118e977
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyOrgDO.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏缁勭粐鏋舵瀯 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_org")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyOrgDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 鐖剁骇缂栧彿锛�0 涓洪《绾� */
+ private Long parentId;
+ /** 缁勭粐鍚嶇О锛屽瀹夊叏鐢熶骇濮斿憳浼氥�佸畨鍏ㄧ鐞嗛儴 */
+ private String name;
+ /** 璐熻矗浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long leaderId;
+ /** 璐熻矗浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String leaderName;
+ /** 璐熻矗浜虹數璇� */
+ private String leaderPhone;
+ /** 鎴愬憳濮撳悕锛岄�楀彿鍒嗛殧 */
+ private String memberNames;
+ /** 瀹夊叏鑱岃矗 */
+ private String duty;
+ /** 鏄剧ず椤哄簭 */
+ private Integer sort;
+ /** 鐘舵�侊細0-鍚敤锛�1-鍋滅敤 */
+ private Integer status;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java
new file mode 100644
index 0000000..4b782d9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏鍩硅璁板綍 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_training")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyTrainingDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 鍩硅涓婚 */
+ private String title;
+ /** 鍩硅绫诲瀷锛岃 SafetyTrainingTypeEnum */
+ private String trainingType;
+ /** 鍩硅鏃ユ湡 */
+ private LocalDate trainDate;
+ /** 鍩硅瀛︽椂 */
+ private BigDecimal durationHours;
+ /** 璁插笀/缁勭粐浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long trainerId;
+ /** 璁插笀/缁勭粐浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String trainer;
+ /** 鍩硅鍦扮偣 */
+ private String location;
+ /** 鍙傚姞浜哄憳濮撳悕锛岄�楀彿鍒嗛殧 */
+ private String participants;
+ /** 鍙傚姞浜烘暟 */
+ private Integer participantCount;
+ /** 鍩硅鍐呭 */
+ private String content;
+ /** 鑰冩牳鎯呭喌 */
+ private String examResult;
+ /** 绛惧埌琛�/璇句欢/鐓х墖 URL锛岄�楀彿鍒嗛殧 */
+ private String attachment;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java
new file mode 100644
index 0000000..02fa4cd
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitDO.java
@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁� DO
+ *
+ * <p>鍔ㄧ伀銆侀珮鍘嬪甫鐢点�佹湁闄愮┖闂寸瓑浣滀笟鐨勭嚎涓婂鎵逛笌鐢靛瓙鐣欏瓨銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_work_permit")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyWorkPermitDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 浣滀笟绁ㄧ紪鍙� */
+ private String code;
+ /** 浣滀笟绫诲瀷锛岃 SafetyPermitTypeEnum */
+ private String permitType;
+ /** 浣滀笟鍚嶇О */
+ private String title;
+ /** 浣滀笟杞﹂棿锛堝叧鑱� mes_md_workshop.id锛� */
+ private Long workshopId;
+ /** 浣滀笟杞﹂棿鍚嶇О锛堝揩鐓э紝鐢辫溅闂翠富鏁版嵁甯﹀嚭锛� */
+ private String workshopName;
+ /** 浣滀笟鍦扮偣 */
+ private String location;
+ /** 浣滀笟鍐呭涓庤寖鍥� */
+ private String workContent;
+ /** 鐢宠浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long applicantId;
+ /** 鐢宠浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String applicant;
+ /** 鐢宠鏃堕棿 */
+ private LocalDateTime applyTime;
+ /** 璁″垝寮�濮嬫椂闂� */
+ private LocalDateTime planStartTime;
+ /** 璁″垝缁撴潫鏃堕棿 */
+ private LocalDateTime planEndTime;
+ /** 瀹為檯寮�濮嬫椂闂� */
+ private LocalDateTime actualStartTime;
+ /** 瀹為檯缁撴潫鏃堕棿 */
+ private LocalDateTime actualEndTime;
+ /** 椋庨櫓绛夌骇锛岃 SafetyRiskLevelEnum */
+ private String riskLevel;
+ /** 瀹夊叏鎺柦 */
+ private String safetyMeasures;
+ /** 瀹℃壒浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long approverId;
+ /** 瀹℃壒浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String approver;
+ /** 瀹℃壒鏃堕棿 */
+ private LocalDateTime approveTime;
+ /** 瀹℃壒鎰忚 */
+ private String approveComment;
+ /** 鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long guardianId;
+ /** 鐩戞姢浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String guardian;
+ /** 鐘舵�侊紝瑙� SafetyPermitStatusEnum */
+ private String status;
+ /** 浣滀笟绁ㄩ檮浠� URL锛岄�楀彿鍒嗛殧 */
+ private String attachment;
+ /** 鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧 */
+ private String photoUrls;
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitMonitorDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitMonitorDO.java
new file mode 100644
index 0000000..fb4d375
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyWorkPermitMonitorDO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浣滀笟鐩戞姢璁板綍 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("safety_work_permit_monitor")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SafetyWorkPermitMonitorDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ /** 浣滀笟绁ㄧ紪鍙� */
+ private Long permitId;
+ /** 鐩戞姢鏃堕棿 */
+ private LocalDateTime monitorTime;
+ /** 鐩戞姢浜猴紙鍛樺伐缂栧彿锛屽叧鑱� hrm_employee.id锛� */
+ private Long guardianId;
+ /** 鐩戞姢浜哄鍚嶏紙蹇収锛岀敱鍛樺伐妗f甯﹀嚭锛� */
+ private String guardian;
+ /** 鐩戞姢鍐呭涓庢儏鍐� */
+ private String monitorContent;
+ /** 寮傚父鎯呭喌涓庡缃� */
+ private String abnormal;
+ /** 鐜板満鐓х墖 URL锛岄�楀彿鍒嗛殧 */
+ private String photoUrls;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyAccidentMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyAccidentMapper.java
new file mode 100644
index 0000000..4510bfd
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyAccidentMapper.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train.SafetyAccidentPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyAccidentDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠鐧昏 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyAccidentMapper extends BaseMapperX<SafetyAccidentDO> {
+
+ default PageResult<SafetyAccidentDO> selectPage(SafetyAccidentPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyAccidentDO>()
+ .likeIfPresent(SafetyAccidentDO::getCode, reqVO.getCode())
+ .likeIfPresent(SafetyAccidentDO::getTitle, reqVO.getTitle())
+ .eqIfPresent(SafetyAccidentDO::getAccidentType, reqVO.getAccidentType())
+ .eqIfPresent(SafetyAccidentDO::getLevel, reqVO.getLevel())
+ .eqIfPresent(SafetyAccidentDO::getStatus, reqVO.getStatus())
+ .betweenIfPresent(SafetyAccidentDO::getOccurTime, reqVO.getOccurTime())
+ .orderByDesc(SafetyAccidentDO::getOccurTime)
+ .orderByDesc(SafetyAccidentDO::getId));
+ }
+
+ default List<SafetyAccidentDO> selectListBetween(java.time.LocalDateTime begin, java.time.LocalDateTime end) {
+ return selectList(new LambdaQueryWrapperX<SafetyAccidentDO>()
+ .geIfPresent(SafetyAccidentDO::getOccurTime, begin)
+ .leIfPresent(SafetyAccidentDO::getOccurTime, end)
+ .orderByAsc(SafetyAccidentDO::getOccurTime));
+ }
+
+ @Select("SELECT CONCAT(#{prefix}, LPAD(COUNT(*) + 1, 4, '0')) FROM safety_accident WHERE code LIKE CONCAT(#{prefix}, '%')")
+ String selectNextCode(@Param("prefix") String prefix);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyCertificateMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyCertificateMapper.java
new file mode 100644
index 0000000..a889686
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyCertificateMapper.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificatePageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyCertificateDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇� Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyCertificateMapper extends BaseMapperX<SafetyCertificateDO> {
+
+ default PageResult<SafetyCertificateDO> selectPage(SafetyCertificatePageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyCertificateDO>()
+ .likeIfPresent(SafetyCertificateDO::getEmployeeName, reqVO.getEmployeeName())
+ .likeIfPresent(SafetyCertificateDO::getEmployeeNo, reqVO.getEmployeeNo())
+ .likeIfPresent(SafetyCertificateDO::getDeptName, reqVO.getDeptName())
+ .eqIfPresent(SafetyCertificateDO::getCertType, reqVO.getCertType())
+ .eqIfPresent(SafetyCertificateDO::getStatus, reqVO.getStatus())
+ .likeIfPresent(SafetyCertificateDO::getCertNo, reqVO.getCertNo())
+ .geIfPresent(SafetyCertificateDO::getExpireDate, reqVO.getExpireDateStart())
+ .leIfPresent(SafetyCertificateDO::getExpireDate, reqVO.getExpireDateEnd())
+ .orderByAsc(SafetyCertificateDO::getExpireDate)
+ .orderByDesc(SafetyCertificateDO::getId));
+ }
+
+ default SafetyCertificateDO selectByCertNo(String certNo) {
+ return selectOne(SafetyCertificateDO::getCertNo, certNo);
+ }
+
+ /** 鏌ヨ鍗冲皢鍒版湡鎴栧凡杩囨湡鐨勮瘉浠讹紙expireDate <= 鎴鏃ユ湡锛� */
+ default List<SafetyCertificateDO> selectExpiringBefore(LocalDate deadline) {
+ return selectList(new LambdaQueryWrapperX<SafetyCertificateDO>()
+ .le(SafetyCertificateDO::getExpireDate, deadline)
+ .orderByAsc(SafetyCertificateDO::getExpireDate));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyDrillMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyDrillMapper.java
new file mode 100644
index 0000000..6d47be5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyDrillMapper.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train.SafetyDrillPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyDrillDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 婕旂粌璁板綍 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyDrillMapper extends BaseMapperX<SafetyDrillDO> {
+
+ default PageResult<SafetyDrillDO> selectPage(SafetyDrillPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyDrillDO>()
+ .likeIfPresent(SafetyDrillDO::getTitle, reqVO.getTitle())
+ .eqIfPresent(SafetyDrillDO::getDrillType, reqVO.getDrillType())
+ .likeIfPresent(SafetyDrillDO::getOrganizer, reqVO.getOrganizer())
+ .betweenIfPresent(SafetyDrillDO::getDrillDate, reqVO.getDrillDate())
+ .orderByDesc(SafetyDrillDO::getDrillDate)
+ .orderByDesc(SafetyDrillDO::getId));
+ }
+
+ default List<SafetyDrillDO> selectListBetween(java.time.LocalDate begin, java.time.LocalDate end) {
+ return selectList(new LambdaQueryWrapperX<SafetyDrillDO>()
+ .geIfPresent(SafetyDrillDO::getDrillDate, begin)
+ .leIfPresent(SafetyDrillDO::getDrillDate, end)
+ .orderByAsc(SafetyDrillDO::getDrillDate));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyHazardMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyHazardMapper.java
new file mode 100644
index 0000000..cf2bd48
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyHazardMapper.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.SafetyHazardPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyHazardDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyHazardMapper extends BaseMapperX<SafetyHazardDO> {
+
+ default PageResult<SafetyHazardDO> selectPage(SafetyHazardPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyHazardDO>()
+ .likeIfPresent(SafetyHazardDO::getCode, reqVO.getCode())
+ .likeIfPresent(SafetyHazardDO::getTitle, reqVO.getTitle())
+ .eqIfPresent(SafetyHazardDO::getLevel, reqVO.getLevel())
+ .eqIfPresent(SafetyHazardDO::getSource, reqVO.getSource())
+ .eqIfPresent(SafetyHazardDO::getStatus, reqVO.getStatus())
+ .likeIfPresent(SafetyHazardDO::getAssignee, reqVO.getAssignee())
+ .likeIfPresent(SafetyHazardDO::getLocation, reqVO.getLocation())
+ .geIfPresent(SafetyHazardDO::getReportTime, reqVO.getReportTimeStart())
+ .leIfPresent(SafetyHazardDO::getReportTime, reqVO.getReportTimeEnd())
+ .orderByDesc(SafetyHazardDO::getReportTime)
+ .orderByDesc(SafetyHazardDO::getId));
+ }
+
+ /** 瓒呰繃鏁存敼鏈熼檺涓旀湭闂幆鐨勯殣鎮� */
+ default List<SafetyHazardDO> selectOverdue(java.time.LocalDate today) {
+ return selectList(new LambdaQueryWrapperX<SafetyHazardDO>()
+ .lt(SafetyHazardDO::getRectifyDeadline, today)
+ .notIn(SafetyHazardDO::getStatus, "CLOSED")
+ .orderByAsc(SafetyHazardDO::getRectifyDeadline));
+ }
+
+ /** 鐢熸垚闅愭偅缂栧彿锛欻Z + yyyyMMdd + 4 浣嶆祦姘� */
+ @Select("SELECT CONCAT(#{prefix}, LPAD(COUNT(*) + 1, 4, '0')) FROM safety_hazard WHERE code LIKE CONCAT(#{prefix}, '%')")
+ String selectNextCode(@Param("prefix") String prefix);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionMapper.java
new file mode 100644
index 0000000..c1ba9fb
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionMapper.java
@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection.SafetyInspectionPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyInspectionDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃璁板綍 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyInspectionMapper extends BaseMapperX<SafetyInspectionDO> {
+
+ default PageResult<SafetyInspectionDO> selectPage(SafetyInspectionPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyInspectionDO>()
+ .eqIfPresent(SafetyInspectionDO::getPointId, reqVO.getPointId())
+ .eqIfPresent(SafetyInspectionDO::getPointType, reqVO.getPointType())
+ .likeIfPresent(SafetyInspectionDO::getInspector, reqVO.getInspector())
+ .eqIfPresent(SafetyInspectionDO::getResult, reqVO.getResult())
+ .betweenIfPresent(SafetyInspectionDO::getInspectTime, reqVO.getInspectTime())
+ .orderByDesc(SafetyInspectionDO::getInspectTime)
+ .orderByDesc(SafetyInspectionDO::getId));
+ }
+
+ default List<SafetyInspectionDO> selectListByTimeRange(LocalDateTime begin, LocalDateTime end) {
+ return selectList(new LambdaQueryWrapperX<SafetyInspectionDO>()
+ .geIfPresent(SafetyInspectionDO::getInspectTime, begin)
+ .leIfPresent(SafetyInspectionDO::getInspectTime, end)
+ .orderByAsc(SafetyInspectionDO::getInspectTime));
+ }
+
+ default Long selectCountByPointId(Long pointId) {
+ return selectCount(SafetyInspectionDO::getPointId, pointId);
+ }
+
+ /** 鏌ヨ鏌愮偣浣嶆渶杩戜竴娆″贰妫�璁板綍 */
+ default SafetyInspectionDO selectLatestByPointId(Long pointId) {
+ return selectOne(new LambdaQueryWrapperX<SafetyInspectionDO>()
+ .eq(SafetyInspectionDO::getPointId, pointId)
+ .orderByDesc(SafetyInspectionDO::getInspectTime)
+ .last("LIMIT 1"));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionPointMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionPointMapper.java
new file mode 100644
index 0000000..144985d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionPointMapper.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection.SafetyInspectionPointPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyInspectionPointDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyInspectionPointMapper extends BaseMapperX<SafetyInspectionPointDO> {
+
+ default PageResult<SafetyInspectionPointDO> selectPage(SafetyInspectionPointPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyInspectionPointDO>()
+ .likeIfPresent(SafetyInspectionPointDO::getCode, reqVO.getCode())
+ .likeIfPresent(SafetyInspectionPointDO::getName, reqVO.getName())
+ .eqIfPresent(SafetyInspectionPointDO::getPointType, reqVO.getPointType())
+ .likeIfPresent(SafetyInspectionPointDO::getWorkshopName, reqVO.getWorkshopName())
+ .eqIfPresent(SafetyInspectionPointDO::getStatus, reqVO.getStatus())
+ .orderByAsc(SafetyInspectionPointDO::getCode));
+ }
+
+ default SafetyInspectionPointDO selectByCode(String code) {
+ return selectOne(SafetyInspectionPointDO::getCode, code);
+ }
+
+ default List<SafetyInspectionPointDO> selectListByStatus(Integer status) {
+ return selectList(new LambdaQueryWrapperX<SafetyInspectionPointDO>()
+ .eq(SafetyInspectionPointDO::getStatus, status)
+ .orderByAsc(SafetyInspectionPointDO::getCode));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialMapper.java
new file mode 100644
index 0000000..5cdfaf5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialMapper.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material.SafetyMaterialPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyMaterialDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍙拌处 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyMaterialMapper extends BaseMapperX<SafetyMaterialDO> {
+
+ default PageResult<SafetyMaterialDO> selectPage(SafetyMaterialPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyMaterialDO>()
+ .likeIfPresent(SafetyMaterialDO::getCode, reqVO.getCode())
+ .likeIfPresent(SafetyMaterialDO::getName, reqVO.getName())
+ .eqIfPresent(SafetyMaterialDO::getCategory, reqVO.getCategory())
+ .eqIfPresent(SafetyMaterialDO::getStatus, reqVO.getStatus())
+ .likeIfPresent(SafetyMaterialDO::getStorageLocation, reqVO.getStorageLocation())
+ .orderByAsc(SafetyMaterialDO::getCategory)
+ .orderByAsc(SafetyMaterialDO::getCode));
+ }
+
+ default SafetyMaterialDO selectByCode(String code) {
+ return selectOne(SafetyMaterialDO::getCode, code);
+ }
+
+ /** 閿佸畾搴撳瓨琛岋紝閬垮厤骞跺彂鍑哄叆搴撳鑷村簱瀛橀敊涔� */
+ @Select("SELECT * FROM safety_material WHERE id = #{id} AND deleted = b'0' FOR UPDATE")
+ SafetyMaterialDO selectByIdForUpdate(@Param("id") Long id);
+
+ /** 浣庝簬瀹夊叏搴撳瓨鐨勭墿璧� */
+ default List<SafetyMaterialDO> selectBelowSafeStock() {
+ return selectList(new LambdaQueryWrapperX<SafetyMaterialDO>()
+ .apply("stock_qty < safe_stock")
+ .orderByAsc(SafetyMaterialDO::getCode));
+ }
+
+ /** 鏈夋晥鏈熶复杩戠殑鐗╄祫 */
+ default List<SafetyMaterialDO> selectExpiringBefore(LocalDate deadline) {
+ return selectList(new LambdaQueryWrapperX<SafetyMaterialDO>()
+ .isNotNull(SafetyMaterialDO::getExpireDate)
+ .le(SafetyMaterialDO::getExpireDate, deadline)
+ .orderByAsc(SafetyMaterialDO::getExpireDate));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialStockMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialStockMapper.java
new file mode 100644
index 0000000..46120d4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyMaterialStockMapper.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material.SafetyMaterialStockPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyMaterialStockDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫鍑哄叆搴撴祦姘� Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyMaterialStockMapper extends BaseMapperX<SafetyMaterialStockDO> {
+
+ default PageResult<SafetyMaterialStockDO> selectPage(SafetyMaterialStockPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyMaterialStockDO>()
+ .eqIfPresent(SafetyMaterialStockDO::getMaterialId, reqVO.getMaterialId())
+ .likeIfPresent(SafetyMaterialStockDO::getMaterialName, reqVO.getMaterialName())
+ .eqIfPresent(SafetyMaterialStockDO::getCategory, reqVO.getCategory())
+ .eqIfPresent(SafetyMaterialStockDO::getBizType, reqVO.getBizType())
+ .betweenIfPresent(SafetyMaterialStockDO::getBizDate, reqVO.getBizDate())
+ .orderByDesc(SafetyMaterialStockDO::getBizDate)
+ .orderByDesc(SafetyMaterialStockDO::getId));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyOrgMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyOrgMapper.java
new file mode 100644
index 0000000..6a98fd5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyOrgMapper.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyOrgDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 缁勭粐鏋舵瀯 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyOrgMapper extends BaseMapperX<SafetyOrgDO> {
+
+ default List<SafetyOrgDO> selectListOrdered() {
+ return selectList(new LambdaQueryWrapperX<SafetyOrgDO>()
+ .orderByAsc(SafetyOrgDO::getSort)
+ .orderByAsc(SafetyOrgDO::getId));
+ }
+
+ default List<SafetyOrgDO> selectListByParentId(Long parentId) {
+ return selectList(new LambdaQueryWrapperX<SafetyOrgDO>()
+ .eq(SafetyOrgDO::getParentId, parentId)
+ .orderByAsc(SafetyOrgDO::getSort));
+ }
+
+ default Long selectCountByParentId(Long parentId) {
+ return selectCount(SafetyOrgDO::getParentId, parentId);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyTrainingMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyTrainingMapper.java
new file mode 100644
index 0000000..303a5ac
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyTrainingMapper.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train.SafetyTrainingPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyTrainingDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅璁板綍 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyTrainingMapper extends BaseMapperX<SafetyTrainingDO> {
+
+ default PageResult<SafetyTrainingDO> selectPage(SafetyTrainingPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyTrainingDO>()
+ .likeIfPresent(SafetyTrainingDO::getTitle, reqVO.getTitle())
+ .eqIfPresent(SafetyTrainingDO::getTrainingType, reqVO.getTrainingType())
+ .likeIfPresent(SafetyTrainingDO::getTrainer, reqVO.getTrainer())
+ .betweenIfPresent(SafetyTrainingDO::getTrainDate, reqVO.getTrainDate())
+ .orderByDesc(SafetyTrainingDO::getTrainDate)
+ .orderByDesc(SafetyTrainingDO::getId));
+ }
+
+ default List<SafetyTrainingDO> selectListBetween(java.time.LocalDate begin, java.time.LocalDate end) {
+ return selectList(new LambdaQueryWrapperX<SafetyTrainingDO>()
+ .geIfPresent(SafetyTrainingDO::getTrainDate, begin)
+ .leIfPresent(SafetyTrainingDO::getTrainDate, end)
+ .orderByAsc(SafetyTrainingDO::getTrainDate));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMapper.java
new file mode 100644
index 0000000..a7885d5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMapper.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit.SafetyWorkPermitPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyWorkPermitDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁� Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyWorkPermitMapper extends BaseMapperX<SafetyWorkPermitDO> {
+
+ default PageResult<SafetyWorkPermitDO> selectPage(SafetyWorkPermitPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SafetyWorkPermitDO>()
+ .likeIfPresent(SafetyWorkPermitDO::getCode, reqVO.getCode())
+ .likeIfPresent(SafetyWorkPermitDO::getTitle, reqVO.getTitle())
+ .eqIfPresent(SafetyWorkPermitDO::getPermitType, reqVO.getPermitType())
+ .eqIfPresent(SafetyWorkPermitDO::getStatus, reqVO.getStatus())
+ .eqIfPresent(SafetyWorkPermitDO::getRiskLevel, reqVO.getRiskLevel())
+ .likeIfPresent(SafetyWorkPermitDO::getApplicant, reqVO.getApplicant())
+ .likeIfPresent(SafetyWorkPermitDO::getWorkshopName, reqVO.getWorkshopName())
+ .betweenIfPresent(SafetyWorkPermitDO::getPlanStartTime, reqVO.getPlanStartTime())
+ .orderByDesc(SafetyWorkPermitDO::getApplyTime)
+ .orderByDesc(SafetyWorkPermitDO::getId));
+ }
+
+ @Select("SELECT CONCAT(#{prefix}, LPAD(COUNT(*) + 1, 4, '0')) FROM safety_work_permit WHERE code LIKE CONCAT(#{prefix}, '%')")
+ String selectNextCode(@Param("prefix") String prefix);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMonitorMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMonitorMapper.java
new file mode 100644
index 0000000..1a9c0d5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyWorkPermitMonitorMapper.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyWorkPermitMonitorDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浣滀笟鐩戞姢璁板綍 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SafetyWorkPermitMonitorMapper extends BaseMapperX<SafetyWorkPermitMonitorDO> {
+
+ default List<SafetyWorkPermitMonitorDO> selectListByPermitId(Long permitId) {
+ return selectList(new LambdaQueryWrapperX<SafetyWorkPermitMonitorDO>()
+ .eq(SafetyWorkPermitMonitorDO::getPermitId, permitId)
+ .orderByDesc(SafetyWorkPermitMonitorDO::getMonitorTime));
+ }
+
+ default int deleteByPermitId(Long permitId) {
+ return delete(SafetyWorkPermitMonitorDO::getPermitId, permitId);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java
new file mode 100644
index 0000000..c7647c4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.mes.enums;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+
+/**
+ * MES 妯″潡閿欒鐮� - 瀹夊叏鐢熶骇瀛愭ā鍧�
+ *
+ * 瀹夊叏鐢熶骇妯″潡閿欒鐮佸尯闂达細1_040_960_xxx
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface SafetyErrorCodeConstants {
+
+ // ========== 瀹夊叏缁勭粐鏋舵瀯 1_040_961_xxx ==========
+ ErrorCode SAFETY_ORG_NOT_EXISTS = new ErrorCode(1_040_961_000, "瀹夊叏缁勭粐涓嶅瓨鍦�");
+ ErrorCode SAFETY_ORG_PARENT_NOT_EXISTS = new ErrorCode(1_040_961_001, "鐖剁骇瀹夊叏缁勭粐涓嶅瓨鍦�");
+ ErrorCode SAFETY_ORG_PARENT_IS_SELF = new ErrorCode(1_040_961_002, "涓婄骇缁勭粐涓嶈兘閫夋嫨鑷繁");
+ ErrorCode SAFETY_ORG_PARENT_IS_CHILD = new ErrorCode(1_040_961_003, "涓婄骇缁勭粐涓嶈兘閫夋嫨鑷繁鐨勫瓙缁勭粐");
+ ErrorCode SAFETY_ORG_HAS_CHILDREN = new ErrorCode(1_040_961_004, "瀛樺湪瀛愮粍缁囷紝鏃犳硶鍒犻櫎");
+
+ // ========== 鐗圭浣滀笟璇� 1_040_962_xxx ==========
+ ErrorCode SAFETY_CERT_NOT_EXISTS = new ErrorCode(1_040_962_000, "鐗圭浣滀笟璇佷笉瀛樺湪");
+ ErrorCode SAFETY_CERT_NO_DUPLICATE = new ErrorCode(1_040_962_001, "璇佷欢缂栧彿宸插瓨鍦�");
+ ErrorCode SAFETY_CERT_EXPIRE_BEFORE_ISSUE = new ErrorCode(1_040_962_002, "鏈夋晥鏈熶笉鑳芥棭浜庡彂璇佹棩鏈�");
+ ErrorCode SAFETY_CERT_EMPLOYEE_NOT_EXISTS = new ErrorCode(1_040_962_003, "鎸佽瘉浜轰笉瀛樺湪锛岃浠庡憳宸ユ。妗堜腑閫夋嫨");
+
+ // ========== 宸℃鐐逛綅 / 宸℃璁板綍 1_040_963_xxx ==========
+ ErrorCode SAFETY_POINT_NOT_EXISTS = new ErrorCode(1_040_963_000, "宸℃鐐逛綅涓嶅瓨鍦�");
+ ErrorCode SAFETY_POINT_CODE_DUPLICATE = new ErrorCode(1_040_963_001, "鐐逛綅缂栫爜宸插瓨鍦�");
+ ErrorCode SAFETY_POINT_DISABLED = new ErrorCode(1_040_963_002, "宸℃鐐逛綅宸插仠鐢�");
+ ErrorCode SAFETY_INSPECTION_NOT_EXISTS = new ErrorCode(1_040_963_010, "宸℃璁板綍涓嶅瓨鍦�");
+
+ // ========== 闅愭偅闂幆 1_040_964_xxx ==========
+ ErrorCode SAFETY_HAZARD_NOT_EXISTS = new ErrorCode(1_040_964_000, "闅愭偅璁板綍涓嶅瓨鍦�");
+ ErrorCode SAFETY_HAZARD_STATUS_ERROR = new ErrorCode(1_040_964_001, "褰撳墠闅愭偅鐘舵�佷笉鍏佽璇ユ搷浣�");
+ ErrorCode SAFETY_HAZARD_ASSIGNEE_REQUIRED = new ErrorCode(1_040_964_002, "鍒嗘淳蹇呴』鎸囧畾鏁存敼璐d换浜�");
+ ErrorCode SAFETY_HAZARD_SAME_OPERATOR = new ErrorCode(1_040_964_003, "鏁存敼浜轰笌澶嶆煡浜轰笉鑳芥槸鍚屼竴浜�");
+
+ // ========== 楂樺嵄浣滀笟绁� 1_040_965_xxx ==========
+ ErrorCode SAFETY_PERMIT_NOT_EXISTS = new ErrorCode(1_040_965_000, "浣滀笟绁ㄤ笉瀛樺湪");
+ ErrorCode SAFETY_PERMIT_STATUS_ERROR = new ErrorCode(1_040_965_001, "褰撳墠浣滀笟绁ㄧ姸鎬佷笉鍏佽璇ユ搷浣�");
+ ErrorCode SAFETY_PERMIT_TIME_INVALID = new ErrorCode(1_040_965_002, "璁″垝缁撴潫鏃堕棿蹇呴』鏅氫簬寮�濮嬫椂闂�");
+ ErrorCode SAFETY_PERMIT_NOT_APPROVED = new ErrorCode(1_040_965_003, "浣滀笟绁ㄦ湭瀹℃壒閫氳繃锛屼笉鑳藉紑濮嬩綔涓�");
+ ErrorCode SAFETY_PERMIT_GUARDIAN_REQUIRED = new ErrorCode(1_040_965_004, "楂樺嵄浣滀笟蹇呴』鎸囧畾鐩戞姢浜�");
+ ErrorCode SAFETY_PERMIT_SELF_APPROVE = new ErrorCode(1_040_965_005, "鐢宠浜轰笉鑳藉鎵硅嚜宸辩殑浣滀笟绁�");
+ ErrorCode SAFETY_PERMIT_MONITOR_NOT_EXISTS = new ErrorCode(1_040_965_010, "鐩戞姢璁板綍涓嶅瓨鍦�");
+
+ // ========== 鐗╄祫鍙拌处 1_040_966_xxx ==========
+ ErrorCode SAFETY_MATERIAL_NOT_EXISTS = new ErrorCode(1_040_966_000, "鐗╄祫涓嶅瓨鍦�");
+ ErrorCode SAFETY_MATERIAL_CODE_DUPLICATE = new ErrorCode(1_040_966_001, "鐗╄祫缂栫爜宸插瓨鍦�");
+ ErrorCode SAFETY_MATERIAL_STOCK_NOT_ENOUGH = new ErrorCode(1_040_966_002, "搴撳瓨涓嶈冻锛屾棤娉曞嚭搴�");
+ ErrorCode SAFETY_MATERIAL_STOCK_RECORD_NOT_EXISTS = new ErrorCode(1_040_966_010, "鍑哄叆搴撴祦姘翠笉瀛樺湪");
+
+ // ========== 鍩硅 / 婕旂粌 / 浜嬫晠 1_040_967_xxx ==========
+ ErrorCode SAFETY_TRAINING_NOT_EXISTS = new ErrorCode(1_040_967_000, "鍩硅璁板綍涓嶅瓨鍦�");
+ ErrorCode SAFETY_DRILL_NOT_EXISTS = new ErrorCode(1_040_967_010, "婕旂粌璁板綍涓嶅瓨鍦�");
+ ErrorCode SAFETY_ACCIDENT_NOT_EXISTS = new ErrorCode(1_040_967_020, "浜嬫晠璁板綍涓嶅瓨鍦�");
+
+ // ========== 涓绘暟鎹紩鐢� 1_040_969_xxx ==========
+ ErrorCode SAFETY_WORKSHOP_NOT_EXISTS = new ErrorCode(1_040_969_000, "杞﹂棿涓嶅瓨鍦紝璇蜂粠杞﹂棿涓绘暟鎹腑閫夋嫨");
+ ErrorCode SAFETY_EMPLOYEE_REQUIRED = new ErrorCode(1_040_969_001, "璇烽�夋嫨鍛樺伐");
+
+ // ========== 鍙拌处瀵煎嚭 1_040_968_xxx ==========
+ ErrorCode SAFETY_LEDGER_EXPORT_ITEM_UNKNOWN = new ErrorCode(1_040_968_000, "鏈煡鐨勫彴璐﹀鍑洪」");
+ ErrorCode SAFETY_LEDGER_DATE_RANGE_INVALID = new ErrorCode(1_040_968_001, "寮�濮嬫棩鏈熶笉鑳芥櫄浜庣粨鏉熸棩鏈�");
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentLevelEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentLevelEnum.java
new file mode 100644
index 0000000..83fa149
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentLevelEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠绛夌骇鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyAccidentLevelEnum {
+
+ SLIGHT("SLIGHT", "杞讳激浜嬫晠"),
+ GENERAL("GENERAL", "涓�鑸簨鏁�"),
+ SEVERE("SEVERE", "閲嶄激浜嬫晠"),
+ MAJOR("MAJOR", "閲嶅ぇ浜嬫晠");
+
+ private final String level;
+ private final String name;
+
+ public static String getNameByLevel(String level) {
+ for (SafetyAccidentLevelEnum value : values()) {
+ if (value.getLevel().equals(level)) {
+ return value.getName();
+ }
+ }
+ return level;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentStatusEnum.java
new file mode 100644
index 0000000..5740185
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentStatusEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠澶勭悊鐘舵�佹灇涓�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyAccidentStatusEnum {
+
+ REPORTED("REPORTED", "宸茬櫥璁�"),
+ INVESTIGATING("INVESTIGATING", "璋冩煡涓�"),
+ HANDLED("HANDLED", "宸插鐞�"),
+ CLOSED("CLOSED", "宸茬粨妗�");
+
+ private final String status;
+ private final String name;
+
+ public static String getNameByStatus(String status) {
+ for (SafetyAccidentStatusEnum value : values()) {
+ if (value.getStatus().equals(status)) {
+ return value.getName();
+ }
+ }
+ return status;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentTypeEnum.java
new file mode 100644
index 0000000..9a75e71
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyAccidentTypeEnum.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 浜嬫晠绫诲瀷鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyAccidentTypeEnum {
+
+ ELECTRIC_SHOCK("ELECTRIC_SHOCK", "瑙︾數"),
+ FIRE("FIRE", "鐏伨"),
+ FALL("FALL", "楂樺鍧犺惤"),
+ OBJECT_STRIKE("OBJECT_STRIKE", "鐗╀綋鎵撳嚮"),
+ MECHANICAL("MECHANICAL", "鏈烘浼ゅ"),
+ CHEMICAL("CHEMICAL", "涓瘨绐掓伅"),
+ VEHICLE("VEHICLE", "杞﹁締浼ゅ"),
+ OTHER("OTHER", "鍏朵粬");
+
+ private final String type;
+ private final String name;
+
+ public static String getNameByType(String type) {
+ for (SafetyAccidentTypeEnum value : values()) {
+ if (value.getType().equals(type)) {
+ return value.getName();
+ }
+ }
+ return type;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateStatusEnum.java
new file mode 100644
index 0000000..26af9fa
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateStatusEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佺姸鎬佹灇涓�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyCertificateStatusEnum {
+
+ VALID("VALID", "鏈夋晥"),
+ EXPIRING("EXPIRING", "鍗冲皢鍒版湡"),
+ EXPIRED("EXPIRED", "宸茶繃鏈�"),
+ REVOKED("REVOKED", "宸叉敞閿�");
+
+ private final String status;
+ private final String name;
+
+ public static String getNameByStatus(String status) {
+ for (SafetyCertificateStatusEnum value : values()) {
+ if (value.getStatus().equals(status)) {
+ return value.getName();
+ }
+ }
+ return status;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateTypeEnum.java
new file mode 100644
index 0000000..26ba238
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyCertificateTypeEnum.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佺被鍨嬫灇涓�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyCertificateTypeEnum {
+
+ LOW_VOLTAGE_ELECTRICIAN("LOW_VOLTAGE_ELECTRICIAN", "浣庡帇鐢靛伐璇�"),
+ HIGH_VOLTAGE_OPERATION("HIGH_VOLTAGE_OPERATION", "楂樺帇鎿嶄綔璇�"),
+ WELDING("WELDING", "鐒婃帴涓庣儹鍒囧壊浣滀笟璇�"),
+ HOIST("HOIST", "璧烽噸鏈烘浣滀笟璇�"),
+ HEIGHT_WORK("HEIGHT_WORK", "楂樺浣滀笟璇�"),
+ LIMITED_SPACE("LIMITED_SPACE", "鏈夐檺绌洪棿浣滀笟璇�"),
+ FORKLIFT("FORKLIFT", "鍙夎溅浣滀笟璇�"),
+ BOILER("BOILER", "閿呯倝浣滀笟璇�"),
+ OTHER("OTHER", "鍏朵粬鐗圭浣滀笟璇�");
+
+ private final String type;
+ private final String name;
+
+ public static String getNameByType(String type) {
+ for (SafetyCertificateTypeEnum value : values()) {
+ if (value.getType().equals(type)) {
+ return value.getName();
+ }
+ }
+ return type;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyDrillTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyDrillTypeEnum.java
new file mode 100644
index 0000000..e49eb76
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyDrillTypeEnum.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 婕旂粌绫诲瀷鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyDrillTypeEnum {
+
+ FIRE("FIRE", "娑堥槻婕旂粌"),
+ EMERGENCY_EVAC("EMERGENCY_EVAC", "搴旀�ョ枏鏁f紨缁�"),
+ ELECTRIC_ACCIDENT("ELECTRIC_ACCIDENT", "瑙︾數浜嬫晠婕旂粌"),
+ CHEMICAL_LEAK("CHEMICAL_LEAK", "鍗卞寲鍝佹硠婕忔紨缁�"),
+ OTHER("OTHER", "鍏朵粬婕旂粌");
+
+ private final String type;
+ private final String name;
+
+ public static String getNameByType(String type) {
+ for (SafetyDrillTypeEnum value : values()) {
+ if (value.getType().equals(type)) {
+ return value.getName();
+ }
+ }
+ return type;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardLevelEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardLevelEnum.java
new file mode 100644
index 0000000..ddb9945
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardLevelEnum.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅绛夌骇鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyHazardLevelEnum {
+
+ GENERAL("GENERAL", "涓�鑸殣鎮�"),
+ MAJOR("MAJOR", "閲嶅ぇ闅愭偅");
+
+ private final String level;
+ private final String name;
+
+ public static String getNameByLevel(String level) {
+ for (SafetyHazardLevelEnum value : values()) {
+ if (value.getLevel().equals(level)) {
+ return value.getName();
+ }
+ }
+ return level;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardSourceEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardSourceEnum.java
new file mode 100644
index 0000000..44cc510
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardSourceEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鏉ユ簮鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyHazardSourceEnum {
+
+ INSPECTION("INSPECTION", "宸℃鍙戠幇"),
+ SELF_CHECK("SELF_CHECK", "鑷煡涓婃姤"),
+ REPORT("REPORT", "鍛樺伐涓婃姤"),
+ EXTERNAL("EXTERNAL", "澶栭儴妫�鏌�");
+
+ private final String source;
+ private final String name;
+
+ public static String getNameBySource(String source) {
+ for (SafetyHazardSourceEnum value : values()) {
+ if (value.getSource().equals(source)) {
+ return value.getName();
+ }
+ }
+ return source;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardStatusEnum.java
new file mode 100644
index 0000000..300926a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyHazardStatusEnum.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鐘舵�佹灇涓�
+ *
+ * <p>娴佽浆椤哄簭锛氫笂鎶� 鈫� 鍒嗘淳 鈫� 鏁存敼涓� 鈫� 寰呭鏌� 鈫� 宸查棴鐜� / 澶嶆煡涓嶉�氳繃锛堥��鍥炴暣鏀癸級銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyHazardStatusEnum {
+
+ REPORTED("REPORTED", "宸蹭笂鎶�"),
+ ASSIGNED("ASSIGNED", "宸插垎娲�"),
+ RECTIFYING("RECTIFYING", "鏁存敼涓�"),
+ RECHECKING("RECHECKING", "寰呭鏌�"),
+ REJECTED("REJECTED", "澶嶆煡涓嶉�氳繃"),
+ CLOSED("CLOSED", "宸查棴鐜�");
+
+ private final String status;
+ private final String name;
+
+ public static String getNameByStatus(String status) {
+ for (SafetyHazardStatusEnum value : values()) {
+ if (value.getStatus().equals(status)) {
+ return value.getName();
+ }
+ }
+ return status;
+ }
+
+ public static boolean isFinished(String status) {
+ return CLOSED.getStatus().equals(status);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectCycleEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectCycleEnum.java
new file mode 100644
index 0000000..adb7654
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectCycleEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鍛ㄦ湡鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyInspectCycleEnum {
+
+ SHIFT("SHIFT", "姣忕彮"),
+ DAILY("DAILY", "姣忔棩"),
+ WEEKLY("WEEKLY", "姣忓懆"),
+ MONTHLY("MONTHLY", "姣忔湀");
+
+ private final String cycle;
+ private final String name;
+
+ public static String getNameByCycle(String cycle) {
+ for (SafetyInspectCycleEnum value : values()) {
+ if (value.getCycle().equals(cycle)) {
+ return value.getName();
+ }
+ }
+ return cycle;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectionPointTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectionPointTypeEnum.java
new file mode 100644
index 0000000..a0e94f9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectionPointTypeEnum.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅绫诲瀷鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyInspectionPointTypeEnum {
+
+ HIGH_VOLTAGE_ROOM("HIGH_VOLTAGE_ROOM", "楂樺帇閰嶇數瀹�"),
+ UNIT_AREA("UNIT_AREA", "鏈虹粍鍖�"),
+ DANGER_CHEMICAL("DANGER_CHEMICAL", "鍗卞寲鍝佸簱"),
+ FIRE_AREA("FIRE_AREA", "娑堥槻閲嶇偣閮ㄤ綅"),
+ WORKSHOP("WORKSHOP", "鐢熶骇杞﹂棿"),
+ OTHER("OTHER", "鍏朵粬");
+
+ private final String type;
+ private final String name;
+
+ public static String getNameByType(String type) {
+ for (SafetyInspectionPointTypeEnum value : values()) {
+ if (value.getType().equals(type)) {
+ return value.getName();
+ }
+ }
+ return type;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyMaterialCategoryEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyMaterialCategoryEnum.java
new file mode 100644
index 0000000..bdfb0f6
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyMaterialCategoryEnum.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗╄祫绫诲埆鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyMaterialCategoryEnum {
+
+ INSULATING("INSULATING", "鐢靛姏缁濈紭鐢ㄥ叿"),
+ HAZARD_CHEMICAL("HAZARD_CHEMICAL", "鍗卞寲鍝�"),
+ FIRE("FIRE", "娑堥槻鐗╄祫"),
+ PPE("PPE", "鍔充繚鐢ㄥ搧"),
+ OTHER("OTHER", "鍏朵粬");
+
+ private final String category;
+ private final String name;
+
+ public static String getNameByCategory(String category) {
+ for (SafetyMaterialCategoryEnum value : values()) {
+ if (value.getCategory().equals(category)) {
+ return value.getName();
+ }
+ }
+ return category;
+ }
+
+ /** 鏄惁闇�瑕佹湁鏁堟湡绠$悊锛堢粷缂樼敤鍏蜂笌鍗卞寲鍝佹湁淇濊川鏈燂級 */
+ public static boolean requiresExpireDate(String category) {
+ return INSULATING.getCategory().equals(category) || HAZARD_CHEMICAL.getCategory().equals(category);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitStatusEnum.java
new file mode 100644
index 0000000..6ce6ab7
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitStatusEnum.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁ㄧ姸鎬佹灇涓�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyPermitStatusEnum {
+
+ DRAFT("DRAFT", "鑽夌"),
+ PENDING("PENDING", "寰呭鎵�"),
+ APPROVED("APPROVED", "宸叉壒鍑�"),
+ REJECTED("REJECTED", "宸查┏鍥�"),
+ IN_PROGRESS("IN_PROGRESS", "浣滀笟涓�"),
+ CLOSED("CLOSED", "宸插畬缁�"),
+ CANCELLED("CANCELLED", "宸蹭綔搴�");
+
+ private final String status;
+ private final String name;
+
+ public static String getNameByStatus(String status) {
+ for (SafetyPermitStatusEnum value : values()) {
+ if (value.getStatus().equals(status)) {
+ return value.getName();
+ }
+ }
+ return status;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitTypeEnum.java
new file mode 100644
index 0000000..4717df9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyPermitTypeEnum.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁ㄧ被鍨嬫灇涓�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyPermitTypeEnum {
+
+ HOT_WORK("HOT_WORK", "鍔ㄧ伀浣滀笟"),
+ LIVE_HIGH_VOLTAGE("LIVE_HIGH_VOLTAGE", "楂樺帇甯︾數浣滀笟"),
+ LIMITED_SPACE("LIMITED_SPACE", "鏈夐檺绌洪棿浣滀笟"),
+ WORK_AT_HEIGHT("WORK_AT_HEIGHT", "楂樺浣滀笟"),
+ LIFTING("LIFTING", "鍚婅浣滀笟"),
+ TEMP_ELECTRIC("TEMP_ELECTRIC", "涓存椂鐢ㄧ數浣滀笟"),
+ OTHER("OTHER", "鍏朵粬浣滀笟");
+
+ private final String type;
+ private final String name;
+
+ public static String getNameByType(String type) {
+ for (SafetyPermitTypeEnum value : values()) {
+ if (value.getType().equals(type)) {
+ return value.getName();
+ }
+ }
+ return type;
+ }
+
+ /** 鏄惁蹇呴』鎸囧畾鐩戞姢浜� */
+ public static boolean requiresGuardian(String type) {
+ return HOT_WORK.getType().equals(type) || LIVE_HIGH_VOLTAGE.getType().equals(type)
+ || LIMITED_SPACE.getType().equals(type);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyRiskLevelEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyRiskLevelEnum.java
new file mode 100644
index 0000000..676b413
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyRiskLevelEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 椋庨櫓绛夌骇鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyRiskLevelEnum {
+
+ LOW("LOW", "浣�"),
+ NORMAL("NORMAL", "涓�鑸�"),
+ HIGH("HIGH", "楂�"),
+ VERY_HIGH("VERY_HIGH", "鏋侀珮");
+
+ private final String level;
+ private final String name;
+
+ public static String getNameByLevel(String level) {
+ for (SafetyRiskLevelEnum value : values()) {
+ if (value.getLevel().equals(level)) {
+ return value.getName();
+ }
+ }
+ return level;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyTrainingTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyTrainingTypeEnum.java
new file mode 100644
index 0000000..71396c5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyTrainingTypeEnum.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.mes.enums.safety;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅绫诲瀷鏋氫妇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum SafetyTrainingTypeEnum {
+
+ SAFETY("SAFETY", "瀹夊叏鍩硅"),
+ SKILL("SKILL", "鎶�鑳藉煿璁�"),
+ LAW("LAW", "娉曡瀹h疮"),
+ EMERGENCY("EMERGENCY", "搴旀�ユ紨缁冨煿璁�"),
+ INDUCTION("INDUCTION", "涓夌骇瀹夊叏鏁欒偛"),
+ OTHER("OTHER", "鍏朵粬");
+
+ private final String type;
+ private final String name;
+
+ public static String getNameByType(String type) {
+ for (SafetyTrainingTypeEnum value : values()) {
+ if (value.getType().equals(type)) {
+ return value.getName();
+ }
+ }
+ return type;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java
new file mode 100644
index 0000000..caf3d84
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java
@@ -0,0 +1,233 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.hrm.api.employee.HrmEmployeeApi;
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificatePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificateRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificateSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyCertificateDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyCertificateMapper;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyCertificateStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyCertificateTypeEnum;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐗圭浣滀笟璇佸彴璐� Service
+ *
+ * <p>鏍稿績鑳藉姏锛氳瘉涔﹀埌鏈熻嚜鍔ㄩ璀︺�傜姸鎬佺敱 {@link #resolveStatus} 鏍规嵁鏈夋晥鏈熷疄鏃舵帹瀵硷紝
+ * 涓嶄緷璧栨墜宸ョ淮鎶わ紝閬垮厤杩囨湡鏈強鏃舵洿鏂扮姸鎬併��</p>
+ *
+ * <p>鎸佽瘉浜洪�氳繃 employeeId 鍏宠仈浜哄姏璧勬簮鐨勫憳宸ユ。妗堬細
+ * 鏂板/淇敼鏃朵粠妗f甯﹀嚭濮撳悕銆佸伐鍙枫�侀儴闂ㄥ苟钀戒负蹇収锛涙煡璇㈡椂瀹炴椂鍥炲~鏈�鏂版。妗堜俊鎭紝
+ * 鍛樺伐璋冨矖鍚庤瘉浠跺垪琛ㄤ篃浼氳窡鐫�鏄剧ず鏂伴儴闂ㄣ��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyCertificateService {
+
+ /** 榛樿鎻愬墠棰勮澶╂暟 */
+ public static final int DEFAULT_WARN_DAYS = 30;
+
+ @Resource
+ private SafetyCertificateMapper certificateMapper;
+ @Resource
+ private HrmEmployeeApi hrmEmployeeApi;
+ @Resource
+ private SafetyRefResolver refResolver;
+
+ public Long createCertificate(SafetyCertificateSaveReqVO reqVO) {
+ reqVO.setId(null);
+ validateCertificateForCreate(reqVO);
+ SafetyCertificateDO cert = buildCertificate(reqVO, null);
+ certificateMapper.insert(cert);
+ return cert.getId();
+ }
+
+ public void updateCertificate(SafetyCertificateSaveReqVO reqVO) {
+ SafetyCertificateDO old = validateCertificateExists(reqVO.getId());
+ validateCertificateForUpdate(reqVO, old);
+ SafetyCertificateDO cert = buildCertificate(reqVO, old);
+ certificateMapper.updateById(cert);
+ }
+
+ public void deleteCertificate(Long id) {
+ validateCertificateExists(id);
+ certificateMapper.deleteById(id);
+ }
+
+ public SafetyCertificateDO getCertificate(Long id) {
+ return validateCertificateExists(id);
+ }
+
+ public PageResult<SafetyCertificateDO> getCertificatePage(SafetyCertificatePageReqVO reqVO) {
+ return certificateMapper.selectPage(reqVO);
+ }
+
+ /**
+ * 鏌ヨ鍗冲皢鍒版湡 / 宸茶繃鏈熺殑璇佷欢鍒楄〃
+ *
+ * @param days 鎻愬墠棰勮澶╂暟锛屼负绌轰娇鐢ㄩ粯璁� 30 澶�
+ */
+ public List<SafetyCertificateDO> getExpiringCertificates(Integer days) {
+ int warnDays = days == null || days <= 0 ? DEFAULT_WARN_DAYS : days;
+ return certificateMapper.selectExpiringBefore(LocalDate.now().plusDays(warnDays));
+ }
+
+ /**
+ * 鎵归噺琛ュ叏鎸佽瘉浜虹殑鏈�鏂板憳宸ユ。妗堜俊鎭紙濮撳悕銆佸伐鍙枫�侀儴闂ㄣ�佹墜鏈恒�佸叧鑱旂敤鎴凤級
+ *
+ * <p>鏌ヨ鏃剁敤妗f瀹炴椂鍊艰鐩栧揩鐓у�硷紝淇濊瘉鍛樺伐璋冨矖鍚庡彴璐﹀悓姝ワ紱
+ * 鍛樺伐妗f宸茶鍒犻櫎鏃跺洖閫�鍒板揩鐓у�硷紝淇濊瘉鍘嗗彶璇佷欢浠嶅彲灞曠ず銆�</p>
+ */
+ public void fillEmployeeInfo(List<SafetyCertificateDO> certs) {
+ List<Long> employeeIds = certs.stream()
+ .map(SafetyCertificateDO::getEmployeeId)
+ .filter(Objects::nonNull).distinct().toList();
+ // 娉ㄦ剰锛歟mployeeMap 鍚庣画浼氱敤 cert.getEmployeeId()锛堝彲鑳戒负 null锛夊幓 get锛�
+ // 鑰� Map.of() 涓嶆帴鍙� null key銆乬et(null) 浼氭姏 NPE锛屾墍浠ョ┖闆嗗悎蹇呴』杩斿洖 HashMap
+ Map<Long, HrmEmployeeSimpleDTO> employeeMap = employeeIds.isEmpty() ? new HashMap<>()
+ : hrmEmployeeApi.getEmployeeList(employeeIds).stream()
+ .collect(Collectors.toMap(HrmEmployeeSimpleDTO::getId, e -> e, (a, b) -> a));
+ certs.forEach(cert -> {
+ HrmEmployeeSimpleDTO employee = employeeMap.get(cert.getEmployeeId());
+ if (employee != null) {
+ cert.setEmployeeName(employee.getName());
+ cert.setEmployeeNo(employee.getEmployeeNo());
+ cert.setDeptName(employee.getDeptName());
+ }
+ });
+ }
+
+ /**
+ * 鎵归噺琛ュ叏灞曠ず瀛楁锛屾寔璇佷汉妗f涓�娆℃�ф煡濂斤紝閬垮厤閫愭潯鏌ヨ
+ */
+ public void fillDisplayFieldsBatch(List<SafetyCertificateDO> certs, List<SafetyCertificateRespVO> resps) {
+ var employeeMap = refResolver.employeeMap(certs.stream().map(SafetyCertificateDO::getEmployeeId).toList());
+ for (int i = 0; i < certs.size(); i++) {
+ fillDisplayFields(certs.get(i), resps.get(i), employeeMap.get(certs.get(i).getEmployeeId()));
+ }
+ }
+
+ /**
+ * 鍗曚釜璇佷欢鐨勫睍绀哄瓧娈佃ˉ鍏紙绫诲瀷鍚嶇О銆佺姸鎬佸悕绉般�佸墿浣欏ぉ鏁般�佹寔璇佷汉妗f锛�
+ */
+ public void fillDisplayFields(SafetyCertificateDO cert, SafetyCertificateRespVO respVO) {
+ fillDisplayFields(cert, respVO, cert.getEmployeeId() == null ? null
+ : hrmEmployeeApi.getEmployee(cert.getEmployeeId()));
+ }
+
+ private void fillDisplayFields(SafetyCertificateDO cert, SafetyCertificateRespVO respVO,
+ HrmEmployeeSimpleDTO employee) {
+ respVO.setCertTypeName(SafetyCertificateTypeEnum.getNameByType(cert.getCertType()));
+ String status = resolveStatus(cert.getExpireDate(), cert.getWarnDays(), cert.getStatus());
+ respVO.setStatus(status);
+ respVO.setStatusName(SafetyCertificateStatusEnum.getNameByStatus(status));
+ if (cert.getExpireDate() != null) {
+ respVO.setRemainingDays(ChronoUnit.DAYS.between(LocalDate.now(), cert.getExpireDate()));
+ }
+ if (employee != null) {
+ respVO.setEmployeeName(employee.getName());
+ respVO.setEmployeeNo(employee.getEmployeeNo());
+ respVO.setDeptName(employee.getDeptName());
+ respVO.setPhone(employee.getPhone());
+ respVO.setUserId(employee.getUserId());
+ }
+ }
+
+ /**
+ * 鏍规嵁鏈夋晥鏈熸帹瀵肩姸鎬侊細宸叉敞閿�淇濇寔涓嶅彉锛涜繃鏈� 鈫� EXPIRED锛涘湪棰勮鏈熷唴 鈫� EXPIRING锛涘惁鍒� VALID
+ *
+ * @param expireDate 鏈夋晥鏈�
+ * @param warnDays 鎻愬墠棰勮澶╂暟
+ * @param current 褰撳墠鐘舵�侊紝鐢ㄤ簬淇濇姢 REVOKED
+ */
+ public static String resolveStatus(LocalDate expireDate, Integer warnDays, String current) {
+ if (SafetyCertificateStatusEnum.REVOKED.getStatus().equals(current)) {
+ return SafetyCertificateStatusEnum.REVOKED.getStatus();
+ }
+ if (expireDate == null) {
+ return SafetyCertificateStatusEnum.VALID.getStatus();
+ }
+ LocalDate today = LocalDate.now();
+ if (expireDate.isBefore(today)) {
+ return SafetyCertificateStatusEnum.EXPIRED.getStatus();
+ }
+ int days = warnDays == null || warnDays <= 0 ? DEFAULT_WARN_DAYS : warnDays;
+ if (!expireDate.isAfter(today.plusDays(days))) {
+ return SafetyCertificateStatusEnum.EXPIRING.getStatus();
+ }
+ return SafetyCertificateStatusEnum.VALID.getStatus();
+ }
+
+ /**
+ * 鏋勫缓 DO锛氭寔璇佷汉濮撳悕/宸ュ彿/閮ㄩ棬浠庡憳宸ユ。妗堝甫鍑哄苟钀戒负蹇収
+ */
+ private SafetyCertificateDO buildCertificate(SafetyCertificateSaveReqVO reqVO, SafetyCertificateDO old) {
+ HrmEmployeeSimpleDTO employee = hrmEmployeeApi.getEmployee(reqVO.getEmployeeId());
+ if (employee == null) {
+ throw exception(SAFETY_CERT_EMPLOYEE_NOT_EXISTS);
+ }
+ SafetyCertificateDO cert = BeanUtils.toBean(reqVO, SafetyCertificateDO.class);
+ cert.setEmployeeId(employee.getId());
+ cert.setEmployeeName(employee.getName());
+ cert.setEmployeeNo(employee.getEmployeeNo());
+ cert.setDeptName(employee.getDeptName());
+ cert.setCertNo(StrUtil.trim(reqVO.getCertNo()));
+ cert.setWarnDays(reqVO.getWarnDays() == null ? DEFAULT_WARN_DAYS : reqVO.getWarnDays());
+ // 宸叉敞閿�鐘舵�佷笉鍏佽閫氳繃缂栬緫鏀瑰洖
+ String currentStatus = old == null ? reqVO.getStatus() : old.getStatus();
+ cert.setStatus(resolveStatus(reqVO.getExpireDate(), cert.getWarnDays(), currentStatus));
+ cert.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ return cert;
+ }
+
+ private void validateCertificateForCreate(SafetyCertificateSaveReqVO reqVO) {
+ validateExpireAfterIssue(reqVO);
+ if (certificateMapper.selectByCertNo(StrUtil.trim(reqVO.getCertNo())) != null) {
+ throw exception(SAFETY_CERT_NO_DUPLICATE);
+ }
+ }
+
+ private void validateCertificateForUpdate(SafetyCertificateSaveReqVO reqVO, SafetyCertificateDO old) {
+ validateExpireAfterIssue(reqVO);
+ SafetyCertificateDO byCertNo = certificateMapper.selectByCertNo(StrUtil.trim(reqVO.getCertNo()));
+ if (byCertNo != null && !byCertNo.getId().equals(old.getId())) {
+ throw exception(SAFETY_CERT_NO_DUPLICATE);
+ }
+ }
+
+ private void validateExpireAfterIssue(SafetyCertificateSaveReqVO reqVO) {
+ if (reqVO.getIssueDate() != null && reqVO.getExpireDate() != null
+ && !Objects.requireNonNull(reqVO.getExpireDate()).isAfter(reqVO.getIssueDate())) {
+ throw exception(SAFETY_CERT_EXPIRE_BEFORE_ISSUE);
+ }
+ }
+
+ private SafetyCertificateDO validateCertificateExists(Long id) {
+ SafetyCertificateDO cert = id == null ? null : certificateMapper.selectById(id);
+ if (cert == null) {
+ throw exception(SAFETY_CERT_NOT_EXISTS);
+ }
+ return cert;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyFileService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyFileService.java
new file mode 100644
index 0000000..e1724a9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyFileService.java
@@ -0,0 +1,99 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.infra.api.file.FileApi;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 绉诲姩绔檮浠朵笂浼� Service
+ *
+ * <p>宸℃銆侀殣鎮c�佷綔涓氱エ銆佹紨缁冪瓑鐜妭鐨勭幇鍦烘媿鐓х粺涓�璧拌繖閲岋細
+ * 钀藉埌 infra 鏂囦欢瀛樺偍锛岃繑鍥炲彲璁块棶 URL锛屽涓檮浠堕�楀彿鎷兼帴鍚庡瓨鍏ヤ笟鍔¤〃銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Slf4j
+public class SafetyFileService {
+
+ /** 鍗曚釜鏂囦欢鏈�澶� 20MB锛屾墜鏈哄師鍥捐鍒囧悗瓒冲 */
+ private static final long MAX_SIZE = 20L * 1024 * 1024;
+ /** 鍏佽鐨勫浘鐗囩被鍨� */
+ private static final List<String> ALLOWED_EXT = List.of(
+ "jpg", "jpeg", "png", "webp", "heic", "gif", "bmp", "pdf", "doc", "docx", "xls", "xlsx");
+
+ @Resource
+ private FileApi fileApi;
+
+ /**
+ * 涓婁紶鍗曚釜鏂囦欢
+ *
+ * @param file 鏂囦欢
+ * @param bizType 涓氬姟绫诲瀷锛坰afety/inspection銆乻afety/hazard 绛夛級锛岀敤浣滃瓨鍌ㄧ洰褰�
+ * @return 鏂囦欢璁块棶 URL
+ */
+ public String upload(MultipartFile file, String bizType) {
+ if (file == null || file.isEmpty()) {
+ throw new IllegalArgumentException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
+ }
+ if (file.getSize() > MAX_SIZE) {
+ throw new IllegalArgumentException("鍗曚釜鏂囦欢涓嶈兘瓒呰繃 20MB");
+ }
+ String originalName = StrUtil.blankToDefault(file.getOriginalFilename(), "photo.jpg");
+ String ext = StrUtil.subAfter(originalName, ".", true).toLowerCase();
+ if (StrUtil.isNotBlank(ext) && !ALLOWED_EXT.contains(ext)) {
+ throw new IllegalArgumentException("涓嶆敮鎸佺殑鏂囦欢绫诲瀷锛�" + ext);
+ }
+ byte[] content;
+ try {
+ content = IoUtil.readBytes(file.getInputStream());
+ } catch (IOException e) {
+ throw new IllegalStateException("璇诲彇涓婁紶鏂囦欢澶辫触", e);
+ }
+ String directory = StrUtil.blankToDefault(bizType, "safety") + "/" + java.time.LocalDate.now();
+ return fileApi.createFile(content, originalName, directory, file.getContentType());
+ }
+
+ /**
+ * 鎵归噺涓婁紶锛堢Щ鍔ㄧ涓�娆℃媿澶氬紶锛�
+ *
+ * @return 鏂囦欢 URL 鍒楄〃
+ */
+ public List<String> uploadBatch(List<MultipartFile> files, String bizType) {
+ if (files == null || files.isEmpty()) {
+ return List.of();
+ }
+ if (files.size() > 9) {
+ throw new IllegalArgumentException("鍗曟鏈�澶氫笂浼� 9 寮�");
+ }
+ List<String> urls = new ArrayList<>();
+ for (MultipartFile file : files) {
+ urls.add(upload(file, bizType));
+ }
+ return urls;
+ }
+
+ /**
+ * 鍒犻櫎闄勪欢锛堜粠閫楀彿涓查噷鍓旈櫎鏌愪釜 URL锛�
+ */
+ public String removeUrl(String urls, String target) {
+ if (StrUtil.isBlank(urls) || StrUtil.isBlank(target)) {
+ return urls;
+ }
+ return Arrays.stream(urls.split(","))
+ .map(String::trim)
+ .filter(url -> !url.equals(target.trim()))
+ .reduce((a, b) -> a + "," + b)
+ .orElse("");
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java
new file mode 100644
index 0000000..255d851
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java
@@ -0,0 +1,220 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyHazardDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyHazardMapper;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyHazardLevelEnum;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyHazardSourceEnum;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyHazardStatusEnum;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鐧昏涓庨棴鐜� Service
+ *
+ * <p>瀹屾暣闂幆锛氫笂鎶� 鈫� 鍒嗘淳 鈫� 鏁存敼 鈫� 澶嶆煡锛堥�氳繃鍒欓棴鐜紝涓嶉�氳繃閫�鍥炴暣鏀癸級銆�
+ * 姣忎釜鐜妭閮芥牎楠屽綋鍓嶇姸鎬侊紝闃叉璺虫鎴栭噸澶嶆搷浣溿��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyHazardService {
+
+ private static final DateTimeFormatter CODE_DATE = DateTimeFormatter.ofPattern("yyyyMMdd");
+
+ @Resource
+ private SafetyHazardMapper hazardMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
+
+ /**
+ * 闅愭偅涓婃姤锛堝惈绉诲姩绔媿鐓т笂浼犵殑 photoUrls锛�
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Long createHazard(SafetyHazardSaveReqVO reqVO) {
+ reqVO.setId(null);
+ SafetyHazardDO hazard = BeanUtils.toBean(reqVO, SafetyHazardDO.class);
+ hazard.setCode(hazardMapper.selectNextCode("HZ" + LocalDate.now().format(CODE_DATE)));
+ hazard.setTitle(StrUtil.trim(reqVO.getTitle()));
+ hazard.setReporterId(reqVO.getReporterId());
+ hazard.setReporter(refResolver.requireEmployee(reqVO.getReporterId(), SAFETY_EMPLOYEE_REQUIRED).getName());
+ hazard.setLevel(StrUtil.blankToDefault(reqVO.getLevel(), SafetyHazardLevelEnum.GENERAL.getLevel()));
+ hazard.setSource(StrUtil.blankToDefault(reqVO.getSource(), SafetyHazardSourceEnum.SELF_CHECK.getSource()));
+ hazard.setReportTime(reqVO.getReportTime() == null ? LocalDateTime.now() : reqVO.getReportTime());
+ hazard.setStatus(SafetyHazardStatusEnum.REPORTED.getStatus());
+ hazard.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ hazardMapper.insert(hazard);
+ return hazard.getId();
+ }
+
+ /**
+ * 淇敼闅愭偅鍩虹淇℃伅锛堜粎鏈垎娲惧墠鍏佽鏀瑰叧閿瓧娈碉級
+ */
+ public void updateHazard(SafetyHazardSaveReqVO reqVO) {
+ SafetyHazardDO old = validateHazardExists(reqVO.getId());
+ if (!SafetyHazardStatusEnum.REPORTED.getStatus().equals(old.getStatus())
+ && !SafetyHazardStatusEnum.ASSIGNED.getStatus().equals(old.getStatus())) {
+ throw exception(SAFETY_HAZARD_STATUS_ERROR);
+ }
+ SafetyHazardDO update = BeanUtils.toBean(reqVO, SafetyHazardDO.class);
+ // 缂栧彿涓庣姸鎬佷笉鍏佽閫氳繃鏅�氱紪杈戜慨鏀�
+ update.setCode(null);
+ update.setStatus(null);
+ hazardMapper.updateById(update);
+ }
+
+ /**
+ * 鍒嗘淳鏁存敼璐d换浜�
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void assignHazard(SafetyHazardAssignReqVO reqVO) {
+ SafetyHazardDO hazard = validateHazardExists(reqVO.getId());
+ if (!SafetyHazardStatusEnum.REPORTED.getStatus().equals(hazard.getStatus())
+ && !SafetyHazardStatusEnum.REJECTED.getStatus().equals(hazard.getStatus())) {
+ throw exception(SAFETY_HAZARD_STATUS_ERROR);
+ }
+ if (reqVO.getAssigneeId() == null) {
+ throw exception(SAFETY_HAZARD_ASSIGNEE_REQUIRED);
+ }
+ var assignee = refResolver.requireEmployee(reqVO.getAssigneeId(), SAFETY_HAZARD_ASSIGNEE_REQUIRED);
+ SafetyHazardDO update = new SafetyHazardDO();
+ update.setId(hazard.getId());
+ update.setAssigneeId(assignee.getId());
+ update.setAssignee(assignee.getName());
+ update.setAssignTime(LocalDateTime.now());
+ update.setRectifyDeadline(reqVO.getRectifyDeadline());
+ update.setStatus(SafetyHazardStatusEnum.RECTIFYING.getStatus());
+ if (StrUtil.isNotBlank(reqVO.getRemark())) {
+ update.setRemark(reqVO.getRemark().trim());
+ }
+ hazardMapper.updateById(update);
+ }
+
+ /**
+ * 鎻愪氦鏁存敼缁撴灉
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void rectifyHazard(SafetyHazardRectifyReqVO reqVO) {
+ SafetyHazardDO hazard = validateHazardExists(reqVO.getId());
+ if (!SafetyHazardStatusEnum.RECTIFYING.getStatus().equals(hazard.getStatus())
+ && !SafetyHazardStatusEnum.REJECTED.getStatus().equals(hazard.getStatus())) {
+ throw exception(SAFETY_HAZARD_STATUS_ERROR);
+ }
+ SafetyHazardDO update = new SafetyHazardDO();
+ update.setId(hazard.getId());
+ update.setRectifyDesc(reqVO.getRectifyDesc().trim());
+ update.setRectifyPhotoUrls(reqVO.getRectifyPhotoUrls());
+ update.setRectifyTime(LocalDateTime.now());
+ update.setStatus(SafetyHazardStatusEnum.RECHECKING.getStatus());
+ hazardMapper.updateById(update);
+ }
+
+ /**
+ * 澶嶆煡锛氶�氳繃鍒欓棴鐜紝涓嶉�氳繃閫�鍥炴暣鏀广��
+ *
+ * <p>鏍¢獙鏁存敼浜轰笌澶嶆煡浜轰笉鑳芥槸鍚屼竴浜猴紝淇濊瘉闂幆鐨勪袱绾у垎绂汇��</p>
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void recheckHazard(SafetyHazardRecheckReqVO reqVO) {
+ SafetyHazardDO hazard = validateHazardExists(reqVO.getId());
+ if (!SafetyHazardStatusEnum.RECHECKING.getStatus().equals(hazard.getStatus())) {
+ throw exception(SAFETY_HAZARD_STATUS_ERROR);
+ }
+ var rechecker = refResolver.requireEmployee(reqVO.getRecheckerId(), SAFETY_EMPLOYEE_REQUIRED);
+ // 鐢ㄥ憳宸ョ紪鍙锋瘮杈冿紝姣斿鍚嶆瘮杈冨彲闈狅紙鍚屽悕涓嶅悓浜� / 鏀瑰悕閮戒笉浼氳鍒わ級
+ if (hazard.getAssigneeId() != null && hazard.getAssigneeId().equals(rechecker.getId())) {
+ throw exception(SAFETY_HAZARD_SAME_OPERATOR);
+ }
+ boolean passed = "PASSED".equals(reqVO.getRecheckResult());
+ SafetyHazardDO update = new SafetyHazardDO();
+ update.setId(hazard.getId());
+ update.setRecheckerId(rechecker.getId());
+ update.setRechecker(rechecker.getName());
+ update.setRecheckTime(LocalDateTime.now());
+ update.setRecheckResult(reqVO.getRecheckResult());
+ update.setRecheckRemark(reqVO.getRecheckRemark());
+ if (passed) {
+ update.setStatus(SafetyHazardStatusEnum.CLOSED.getStatus());
+ update.setCloseTime(LocalDateTime.now());
+ } else {
+ update.setStatus(SafetyHazardStatusEnum.REJECTED.getStatus());
+ }
+ hazardMapper.updateById(update);
+ }
+
+ public void deleteHazard(Long id) {
+ validateHazardExists(id);
+ hazardMapper.deleteById(id);
+ }
+
+ public SafetyHazardDO getHazard(Long id) {
+ return validateHazardExists(id);
+ }
+
+ public PageResult<SafetyHazardDO> getHazardPage(SafetyHazardPageReqVO reqVO) {
+ reqVO.normalizeTimeRange();
+ return hazardMapper.selectPage(reqVO);
+ }
+
+ /**
+ * 鎵归噺鍥炲~涓婃姤浜� / 鏁存敼璐d换浜� / 澶嶆煡浜虹殑鏈�鏂板鍚�
+ */
+ public void fillPersonNames(List<SafetyHazardDO> hazards) {
+ if (CollUtil.isEmpty(hazards)) {
+ return;
+ }
+ var ids = new java.util.ArrayList<Long>(hazards.size() * 3);
+ hazards.forEach(h -> { ids.add(h.getReporterId()); ids.add(h.getAssigneeId()); ids.add(h.getRecheckerId()); });
+ var employeeMap = refResolver.employeeMap(ids);
+ hazards.forEach(hazard -> {
+ var reporter = employeeMap.get(hazard.getReporterId());
+ if (reporter != null) hazard.setReporter(reporter.getName());
+ var assignee = employeeMap.get(hazard.getAssigneeId());
+ if (assignee != null) hazard.setAssignee(assignee.getName());
+ var rechecker = employeeMap.get(hazard.getRecheckerId());
+ if (rechecker != null) hazard.setRechecker(rechecker.getName());
+ });
+ }
+
+ /**
+ * 灞曠ず瀛楁琛ュ叏锛堢瓑绾�/鏉ユ簮/鐘舵�佸悕绉般�佽秴鏈熸爣璁帮級
+ */
+ public static void fillHazardDisplay(SafetyHazardDO hazard, SafetyHazardRespVO respVO) {
+ respVO.setLevelName(SafetyHazardLevelEnum.getNameByLevel(hazard.getLevel()));
+ respVO.setSourceName(SafetyHazardSourceEnum.getNameBySource(hazard.getSource()));
+ respVO.setStatusName(SafetyHazardStatusEnum.getNameByStatus(hazard.getStatus()));
+ respVO.setRecheckResultName(switch (StrUtil.blankToDefault(hazard.getRecheckResult(), "")) {
+ case "PASSED" -> "閫氳繃";
+ case "REJECTED" -> "涓嶉�氳繃";
+ default -> "";
+ });
+ boolean overdue = hazard.getRectifyDeadline() != null
+ && hazard.getRectifyDeadline().isBefore(LocalDate.now())
+ && !SafetyHazardStatusEnum.isFinished(hazard.getStatus());
+ respVO.setOverdue(overdue);
+ }
+
+ private SafetyHazardDO validateHazardExists(Long id) {
+ SafetyHazardDO hazard = id == null ? null : hazardMapper.selectById(id);
+ if (hazard == null) {
+ throw exception(SAFETY_HAZARD_NOT_EXISTS);
+ }
+ return hazard;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java
new file mode 100644
index 0000000..aa4df41
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java
@@ -0,0 +1,223 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyInspectionDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyInspectionPointDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyInspectionMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyInspectionPointMapper;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyInspectCycleEnum;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyInspectionPointTypeEnum;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 宸℃鐐逛綅涓庡贰妫�璁板綍 Service
+ *
+ * <p>瑕嗙洊楂樺帇閰嶇數瀹ゃ�佹満缁勫尯绛夋棩甯稿畨鍏ㄥ贰妫�銆傚贰妫�鍙戠幇寮傚父鏃跺彲鐩存帴杞殣鎮d笂鎶ャ��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyInspectionService {
+
+ @Resource
+ private SafetyInspectionPointMapper pointMapper;
+ @Resource
+ private SafetyInspectionMapper inspectionMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
+
+ // ==================== 宸℃鐐逛綅 ====================
+
+ public Long createPoint(SafetyInspectionPointSaveReqVO reqVO) {
+ reqVO.setId(null);
+ String code = StrUtil.trim(reqVO.getCode());
+ if (pointMapper.selectByCode(code) != null) {
+ throw exception(SAFETY_POINT_CODE_DUPLICATE);
+ }
+ SafetyInspectionPointDO point = BeanUtils.toBean(reqVO, SafetyInspectionPointDO.class);
+ point.setCode(code);
+ point.setName(StrUtil.trim(reqVO.getName()));
+ point.setInspectCycle(StrUtil.blankToDefault(reqVO.getInspectCycle(), SafetyInspectCycleEnum.DAILY.getCycle()));
+ applyPointRefs(point, reqVO.getWorkshopId(), reqVO.getOwnerId());
+ pointMapper.insert(point);
+ return point.getId();
+ }
+
+ public void updatePoint(SafetyInspectionPointSaveReqVO reqVO) {
+ SafetyInspectionPointDO old = validatePointExists(reqVO.getId());
+ String code = StrUtil.trim(reqVO.getCode());
+ SafetyInspectionPointDO byCode = pointMapper.selectByCode(code);
+ if (byCode != null && !byCode.getId().equals(old.getId())) {
+ throw exception(SAFETY_POINT_CODE_DUPLICATE);
+ }
+ SafetyInspectionPointDO point = BeanUtils.toBean(reqVO, SafetyInspectionPointDO.class);
+ point.setCode(code);
+ point.setName(StrUtil.trim(reqVO.getName()));
+ applyPointRefs(point, reqVO.getWorkshopId(), reqVO.getOwnerId());
+ pointMapper.updateById(point);
+ }
+
+ public void deletePoint(Long id) {
+ validatePointExists(id);
+ pointMapper.deleteById(id);
+ }
+
+ public SafetyInspectionPointDO getPoint(Long id) {
+ return validatePointExists(id);
+ }
+
+ public PageResult<SafetyInspectionPointDO> getPointPage(SafetyInspectionPointPageReqVO reqVO) {
+ return pointMapper.selectPage(reqVO);
+ }
+
+ /**
+ * 鍚敤涓殑宸℃鐐逛綅鍒楄〃锛堢Щ鍔ㄧ宸℃閫夋嫨鐢級
+ */
+ public List<SafetyInspectionPointDO> getEnabledPointList() {
+ return pointMapper.selectListByStatus(0);
+ }
+
+ /**
+ * 鐐逛綅鐨勪富鏁版嵁寮曠敤锛氳溅闂� + 璐d换浜猴紝浠庝富鏁版嵁甯﹀嚭鍚嶇О钀藉揩鐓�
+ */
+ private void applyPointRefs(SafetyInspectionPointDO point, Long workshopId, Long ownerId) {
+ point.setWorkshopId(workshopId);
+ if (workshopId == null) {
+ point.setWorkshopName("");
+ } else {
+ point.setWorkshopName(refResolver.requireWorkshop(workshopId).getName());
+ }
+ point.setOwnerId(ownerId);
+ if (ownerId == null) {
+ point.setOwnerName("");
+ } else {
+ point.setOwnerName(refResolver.requireEmployee(ownerId, SAFETY_EMPLOYEE_REQUIRED).getName());
+ }
+ }
+
+ /**
+ * 鎵归噺鍥炲~鐐逛綅鐨勮溅闂村悕涓庤矗浠讳汉濮撳悕锛堢敤涓绘暟鎹渶鏂板�艰鐩栧揩鐓э級
+ */
+ public void fillPointRefs(List<SafetyInspectionPointDO> points) {
+ if (CollUtil.isEmpty(points)) {
+ return;
+ }
+ var workshopMap = refResolver.workshopMap(points.stream().map(SafetyInspectionPointDO::getWorkshopId).toList());
+ var employeeMap = refResolver.employeeMap(points.stream().map(SafetyInspectionPointDO::getOwnerId).toList());
+ points.forEach(point -> {
+ var workshop = workshopMap.get(point.getWorkshopId());
+ if (workshop != null) {
+ point.setWorkshopName(workshop.getName());
+ }
+ var employee = employeeMap.get(point.getOwnerId());
+ if (employee != null) {
+ point.setOwnerName(employee.getName());
+ }
+ });
+ }
+
+ public static void fillPointDisplay(SafetyInspectionPointDO point, SafetyInspectionPointRespVO respVO) {
+ respVO.setPointTypeName(SafetyInspectionPointTypeEnum.getNameByType(point.getPointType()));
+ respVO.setInspectCycleName(SafetyInspectCycleEnum.getNameByCycle(point.getInspectCycle()));
+ }
+
+ // ==================== 宸℃璁板綍 ====================
+
+ public Long createInspection(SafetyInspectionSaveReqVO reqVO) {
+ reqVO.setId(null);
+ SafetyInspectionPointDO point = validatePointExists(reqVO.getPointId());
+ if (Integer.valueOf(1).equals(point.getStatus())) {
+ throw exception(SAFETY_POINT_DISABLED);
+ }
+ SafetyInspectionDO inspection = buildInspection(reqVO, point);
+ inspectionMapper.insert(inspection);
+ return inspection.getId();
+ }
+
+ public void updateInspection(SafetyInspectionSaveReqVO reqVO) {
+ SafetyInspectionDO old = validateInspectionExists(reqVO.getId());
+ SafetyInspectionPointDO point = validatePointExists(reqVO.getPointId());
+ SafetyInspectionDO inspection = buildInspection(reqVO, point);
+ inspection.setId(old.getId());
+ inspectionMapper.updateById(inspection);
+ }
+
+ public void deleteInspection(Long id) {
+ validateInspectionExists(id);
+ inspectionMapper.deleteById(id);
+ }
+
+ public SafetyInspectionDO getInspection(Long id) {
+ return validateInspectionExists(id);
+ }
+
+ public PageResult<SafetyInspectionDO> getInspectionPage(SafetyInspectionPageReqVO reqVO) {
+ return inspectionMapper.selectPage(reqVO);
+ }
+
+ private SafetyInspectionDO buildInspection(SafetyInspectionSaveReqVO reqVO, SafetyInspectionPointDO point) {
+ SafetyInspectionDO inspection = BeanUtils.toBean(reqVO, SafetyInspectionDO.class);
+ inspection.setPointId(point.getId());
+ inspection.setPointName(point.getName());
+ inspection.setPointType(point.getPointType());
+ inspection.setInspectorId(reqVO.getInspectorId());
+ inspection.setInspector(refResolver.requireEmployee(reqVO.getInspectorId(), SAFETY_EMPLOYEE_REQUIRED).getName());
+ inspection.setResult(StrUtil.blankToDefault(reqVO.getResult(), "NORMAL"));
+ inspection.setInspectTime(reqVO.getInspectTime() == null ? LocalDateTime.now() : reqVO.getInspectTime());
+ inspection.setHazardCount(reqVO.getHazardCount() == null ? 0 : reqVO.getHazardCount());
+ inspection.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ return inspection;
+ }
+
+ /**
+ * 鎵归噺鍥炲~宸℃浜烘渶鏂板鍚�
+ */
+ public void fillInspectorNames(List<SafetyInspectionDO> records) {
+ if (CollUtil.isEmpty(records)) {
+ return;
+ }
+ var employeeMap = refResolver.employeeMap(records.stream().map(SafetyInspectionDO::getInspectorId).toList());
+ records.forEach(record -> {
+ var employee = employeeMap.get(record.getInspectorId());
+ if (employee != null) {
+ record.setInspector(employee.getName());
+ }
+ });
+ }
+
+ /** 鏈�杩戜竴娆″贰妫�鏃堕棿锛堢敤浜庣偣浣嶅垪琛ㄥ睍绀猴級 */
+ public LocalDateTime getLastInspectTime(Long pointId) {
+ SafetyInspectionDO latest = inspectionMapper.selectLatestByPointId(pointId);
+ return latest == null ? null : latest.getInspectTime();
+ }
+
+ private SafetyInspectionPointDO validatePointExists(Long id) {
+ SafetyInspectionPointDO point = id == null ? null : pointMapper.selectById(id);
+ if (point == null) {
+ throw exception(SAFETY_POINT_NOT_EXISTS);
+ }
+ return point;
+ }
+
+ private SafetyInspectionDO validateInspectionExists(Long id) {
+ SafetyInspectionDO inspection = id == null ? null : inspectionMapper.selectById(id);
+ if (inspection == null) {
+ throw exception(SAFETY_INSPECTION_NOT_EXISTS);
+ }
+ return inspection;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java
new file mode 100644
index 0000000..dea71a1
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyLedgerExportService.java
@@ -0,0 +1,334 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.idev.excel.FastExcelFactory;
+import cn.iocoder.yudao.framework.common.util.http.HttpUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ledger.SafetyLedgerExportReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.*;
+import cn.iocoder.yudao.module.mes.enums.safety.*;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.SAFETY_LEDGER_DATE_RANGE_INVALID;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鐢靛姏琛屼笟鏍囧噯鍖栧彴璐﹀鍑� Service
+ *
+ * <p>鎸夈�屽叏濂椼�嶅鍑烘椂涓�娆$敓鎴愬 Sheet 宸ヤ綔绨匡紝瑕嗙洊瀹夊叏鏍囧噯鍖栨鏌ユ墍闇�鐨勫叏閮ㄥ彴璐︼細
+ * 缁勭粐鏋舵瀯銆佺壒绉嶄綔涓氳瘉銆佸贰妫�璁板綍銆侀殣鎮e彴璐︺�佷綔涓氱エ銆佺洃鎶よ褰曘�佺墿璧勫彴璐︺��
+ * 鍑哄叆搴撴祦姘淬�佸煿璁褰曘�佹紨缁冭褰曘�佷簨鏁呯櫥璁般��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class SafetyLedgerExportService {
+
+ @Resource
+ private SafetyOrgService orgService;
+ @Resource
+ private SafetyCertificateService certificateService;
+ @Resource
+ private SafetyInspectionService inspectionService;
+ @Resource
+ private SafetyHazardService hazardService;
+ @Resource
+ private SafetyWorkPermitService permitService;
+ @Resource
+ private SafetyMaterialService materialService;
+ @Resource
+ private SafetyTrainingService trainingService;
+
+ /**
+ * 瀵煎嚭鏍囧噯鍖栧彴璐�
+ */
+ public void export(SafetyLedgerExportReqVO reqVO, HttpServletResponse response) throws IOException {
+ LocalDate start = reqVO.getStartDate();
+ LocalDate end = reqVO.getEndDate();
+ if (start != null && end != null && start.isAfter(end)) {
+ throw exception(SAFETY_LEDGER_DATE_RANGE_INVALID);
+ }
+ String type = reqVO.getType() == null ? "ALL" : reqVO.getType();
+ List<Sheet> sheets = new ArrayList<>();
+ if ("ALL".equals(type) || "CERT".equals(type)) {
+ sheets.add(certSheet());
+ }
+ if ("ALL".equals(type) || "INSPECTION".equals(type)) {
+ sheets.add(inspectionSheet(start, end));
+ }
+ if ("ALL".equals(type) || "HAZARD".equals(type)) {
+ sheets.add(hazardSheet(start, end));
+ }
+ if ("ALL".equals(type) || "PERMIT".equals(type)) {
+ sheets.add(permitSheet(start, end));
+ sheets.add(monitorSheet());
+ }
+ if ("ALL".equals(type) || "MATERIAL".equals(type)) {
+ sheets.add(materialSheet());
+ sheets.add(stockSheet(start, end));
+ }
+ if ("ALL".equals(type) || "TRAINING".equals(type)) {
+ sheets.add(trainingSheet(start, end));
+ }
+ if ("ALL".equals(type) || "DRILL".equals(type)) {
+ sheets.add(drillSheet(start, end));
+ }
+ if ("ALL".equals(type) || "ACCIDENT".equals(type)) {
+ sheets.add(accidentSheet(start, end));
+ }
+ String filename = switch (type) {
+ case "CERT" -> "鐗圭浣滀笟璇佸彴璐�.xlsx";
+ case "INSPECTION" -> "瀹夊叏宸℃鍙拌处.xlsx";
+ case "HAZARD" -> "闅愭偅鍙拌处.xlsx";
+ case "PERMIT" -> "楂樺嵄浣滀笟绁ㄥ彴璐�.xlsx";
+ case "MATERIAL" -> "搴旀�ョ墿璧勫彴璐�.xlsx";
+ case "TRAINING" -> "瀹夊叏鍩硅鍙拌处.xlsx";
+ case "DRILL" -> "娑堥槻婕旂粌鍙拌处.xlsx";
+ case "ACCIDENT" -> "浜嬫晠鐧昏鍙拌处.xlsx";
+ default -> "瀹夊叏鐢熶骇鏍囧噯鍖栧彴璐�.xlsx";
+ };
+ write(response, filename, sheets);
+ }
+
+ // ==================== 鍚� Sheet ====================
+
+ private Sheet certSheet() {
+ List<String> headers = List.of("鎸佽瘉浜�", "宸ュ彿", "閮ㄩ棬", "璇佷欢绫诲瀷", "璇佷欢缂栧彿", "鍙戣瘉鏈哄叧",
+ "鍙戣瘉鏃ユ湡", "鏈夋晥鏈熻嚦", "涓嬫澶嶅", "鐘舵��", "棰勮澶╂暟", "澶囨敞");
+ var pageReqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.cert.SafetyCertificatePageReqVO();
+ pageReqVO.setPageNo(1);
+ pageReqVO.setPageSize(50_000);
+ var certs = certificateService.getCertificatePage(pageReqVO).getList();
+ // 瀵煎嚭鏃剁敤鍛樺伐妗f鐨勬渶鏂板鍚�/宸ュ彿/閮ㄩ棬
+ certificateService.fillEmployeeInfo(certs);
+ List<List<Object>> rows = certs.stream()
+ .map(c -> Arrays.<Object>asList(
+ str(c.getEmployeeName()), str(c.getEmployeeNo()), str(c.getDeptName()),
+ SafetyCertificateTypeEnum.getNameByType(c.getCertType()), str(c.getCertNo()),
+ str(c.getIssuer()), date(c.getIssueDate()), date(c.getExpireDate()),
+ date(c.getReviewDate()),
+ SafetyCertificateStatusEnum.getNameByStatus(SafetyCertificateService.resolveStatus(
+ c.getExpireDate(), c.getWarnDays(), c.getStatus())),
+ Objects.toString(c.getWarnDays(), ""), str(c.getRemark())))
+ .toList();
+ return new Sheet("鐗圭浣滀笟璇佸彴璐�", headers, rows);
+ }
+
+ private Sheet inspectionSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("宸℃鏃堕棿", "鐐逛綅鍚嶇О", "鐐逛綅绫诲瀷", "宸℃浜�", "缁撴灉", "宸℃鎯呭喌", "鍙戠幇闅愭偅鏁�");
+ var reqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.inspection.SafetyInspectionPageReqVO();
+ reqVO.setPageNo(1);
+ reqVO.setPageSize(50_000);
+ if (start != null && end != null) {
+ reqVO.setInspectTime(new java.time.LocalDateTime[]{start.atStartOfDay(), end.atTime(23, 59, 59)});
+ }
+ var inspections = inspectionService.getInspectionPage(reqVO).getList();
+ inspectionService.fillInspectorNames(inspections);
+ List<List<Object>> rows = inspections.stream()
+ .map(i -> Arrays.<Object>asList(
+ dateTime(i.getInspectTime()), str(i.getPointName()),
+ SafetyInspectionPointTypeEnum.getNameByType(i.getPointType()),
+ str(i.getInspector()),
+ "NORMAL".equals(i.getResult()) ? "姝e父" : "寮傚父",
+ str(i.getContent()), Objects.toString(i.getHazardCount(), "0")))
+ .toList();
+ return new Sheet("瀹夊叏宸℃鍙拌处", headers, rows);
+ }
+
+ private Sheet hazardSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("闅愭偅缂栧彿", "鏍囬", "绛夌骇", "鏉ユ簮", "浣嶇疆", "涓婃姤浜�", "涓婃姤鏃堕棿",
+ "鏁存敼璐d换浜�", "鏁存敼鏈熼檺", "鏁存敼鎺柦", "鏁存敼鏃堕棿", "澶嶆煡浜�", "澶嶆煡鏃堕棿", "澶嶆煡缁撹", "鐘舵��", "闂幆鏃堕棿");
+ var reqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.SafetyHazardPageReqVO();
+ reqVO.setPageNo(1);
+ reqVO.setPageSize(50_000);
+ if (start != null && end != null) {
+ reqVO.setReportTime(new java.time.LocalDateTime[]{start.atStartOfDay(), end.atTime(23, 59, 59)});
+ }
+ var hazards = hazardService.getHazardPage(reqVO).getList();
+ hazardService.fillPersonNames(hazards);
+ List<List<Object>> rows = hazards.stream()
+ .map(h -> Arrays.<Object>asList(
+ str(h.getCode()), str(h.getTitle()),
+ SafetyHazardLevelEnum.getNameByLevel(h.getLevel()),
+ SafetyHazardSourceEnum.getNameBySource(h.getSource()),
+ str(h.getLocation()), str(h.getReporter()), dateTime(h.getReportTime()),
+ str(h.getAssignee()), date(h.getRectifyDeadline()), str(h.getRectifyDesc()),
+ dateTime(h.getRectifyTime()), str(h.getRechecker()), dateTime(h.getRecheckTime()),
+ "PASSED".equals(str(h.getRecheckResult())) ? "閫氳繃"
+ : "REJECTED".equals(str(h.getRecheckResult())) ? "涓嶉�氳繃" : "",
+ SafetyHazardStatusEnum.getNameByStatus(h.getStatus()), dateTime(h.getCloseTime())))
+ .toList();
+ return new Sheet("闅愭偅鍙拌处", headers, rows);
+ }
+
+ private Sheet permitSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("浣滀笟绁ㄧ紪鍙�", "浣滀笟绫诲瀷", "浣滀笟鍚嶇О", "浣滀笟鍖哄煙", "浣滀笟鍦扮偣", "鐢宠浜�",
+ "鐢宠鏃堕棿", "璁″垝寮�濮�", "璁″垝缁撴潫", "瀹為檯寮�濮�", "瀹為檯缁撴潫", "椋庨櫓绛夌骇", "鐩戞姢浜�",
+ "瀹℃壒浜�", "瀹℃壒鏃堕棿", "瀹℃壒鎰忚", "鐘舵��");
+ var reqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit.SafetyWorkPermitPageReqVO();
+ reqVO.setPageNo(1);
+ reqVO.setPageSize(50_000);
+ if (start != null && end != null) {
+ reqVO.setPlanStartTime(new java.time.LocalDateTime[]{start.atStartOfDay(), end.atTime(23, 59, 59)});
+ }
+ var permits = permitService.getPermitPage(reqVO).getList();
+ permitService.fillPermitRefs(permits);
+ List<List<Object>> rows = permits.stream()
+ .map(p -> Arrays.<Object>asList(
+ str(p.getCode()), SafetyPermitTypeEnum.getNameByType(p.getPermitType()),
+ str(p.getTitle()), str(p.getWorkshopName()), str(p.getLocation()),
+ str(p.getApplicant()), dateTime(p.getApplyTime()), dateTime(p.getPlanStartTime()),
+ dateTime(p.getPlanEndTime()), dateTime(p.getActualStartTime()), dateTime(p.getActualEndTime()),
+ SafetyRiskLevelEnum.getNameByLevel(p.getRiskLevel()), str(p.getGuardian()),
+ str(p.getApprover()), dateTime(p.getApproveTime()), str(p.getApproveComment()),
+ SafetyPermitStatusEnum.getNameByStatus(p.getStatus())))
+ .toList();
+ return new Sheet("楂樺嵄浣滀笟绁ㄥ彴璐�", headers, rows);
+ }
+
+ private Sheet monitorSheet() {
+ List<String> headers = List.of("浣滀笟绁ㄧ紪鍙�", "鐩戞姢鏃堕棿", "鐩戞姢浜�", "鐩戞姢鍐呭", "寮傚父鎯呭喌");
+ var reqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit.SafetyWorkPermitPageReqVO();
+ reqVO.setPageNo(1);
+ reqVO.setPageSize(5_000);
+ List<List<Object>> rows = new ArrayList<>();
+ for (SafetyWorkPermitDO permit : permitService.getPermitPage(reqVO).getList()) {
+ var monitors = permitService.getMonitorList(permit.getId());
+ permitService.fillMonitorGuardians(monitors);
+ for (SafetyWorkPermitMonitorDO monitor : monitors) {
+ rows.add(Arrays.asList(str(permit.getCode()), dateTime(monitor.getMonitorTime()),
+ str(monitor.getGuardian()), str(monitor.getMonitorContent()), str(monitor.getAbnormal())));
+ }
+ }
+ return new Sheet("浣滀笟鐩戞姢璁板綍", headers, rows);
+ }
+
+ private Sheet materialSheet() {
+ List<String> headers = List.of("鐗╄祫缂栫爜", "鐗╄祫鍚嶇О", "绫诲埆", "瑙勬牸鍨嬪彿", "鍗曚綅", "搴撳瓨鏁伴噺",
+ "瀹夊叏搴撳瓨", "瀛樻斁浣嶇疆", "鏈夋晥鏈熻嚦", "淇濈浜�", "鐘舵��");
+ var reqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material.SafetyMaterialPageReqVO();
+ reqVO.setPageNo(1);
+ reqVO.setPageSize(50_000);
+ var materials = materialService.getMaterialPage(reqVO).getList();
+ materialService.fillManagers(materials);
+ List<List<Object>> rows = materials.stream()
+ .map(m -> Arrays.<Object>asList(
+ str(m.getCode()), str(m.getName()),
+ SafetyMaterialCategoryEnum.getNameByCategory(m.getCategory()),
+ str(m.getSpec()), str(m.getUnit()), number(m.getStockQty()), number(m.getSafeStock()),
+ str(m.getStorageLocation()), date(m.getExpireDate()), str(m.getManager()),
+ Integer.valueOf(0).equals(m.getStatus()) ? "鍚敤" : "鍋滅敤"))
+ .toList();
+ return new Sheet("搴旀�ョ墿璧勫彴璐�", headers, rows);
+ }
+
+ private Sheet stockSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("涓氬姟鏃ユ湡", "鐗╄祫鍚嶇О", "绫诲埆", "涓氬姟绫诲瀷", "鏁伴噺",
+ "鎿嶄綔鍓嶅簱瀛�", "鎿嶄綔鍚庡簱瀛�", "缁忓姙浜�", "棰嗙敤浜�", "鐢ㄩ��/鍘诲悜");
+ var reqVO = new cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material.SafetyMaterialStockPageReqVO();
+ reqVO.setPageNo(1);
+ reqVO.setPageSize(50_000);
+ if (start != null && end != null) {
+ reqVO.setBizDate(new LocalDate[]{start, end});
+ }
+ List<List<Object>> rows = materialService.getStockPage(reqVO).getList().stream()
+ .map(s -> Arrays.<Object>asList(
+ date(s.getBizDate()), str(s.getMaterialName()),
+ SafetyMaterialCategoryEnum.getNameByCategory(s.getCategory()),
+ "IN".equals(s.getBizType()) ? "鍏ュ簱" : "鍑哄簱",
+ number(s.getQuantity()), number(s.getStockBefore()), number(s.getStockAfter()),
+ str(s.getOperator()), str(s.getReceiver()), str(s.getPurpose())))
+ .toList();
+ return new Sheet("鐗╄祫鍑哄叆搴撴祦姘�", headers, rows);
+ }
+
+ private Sheet trainingSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("鍩硅鏃ユ湡", "鍩硅涓婚", "鍩硅绫诲瀷", "瀛︽椂", "璁插笀/缁勭粐浜�",
+ "鍩硅鍦扮偣", "鍙傚姞浜烘暟", "鍩硅鍐呭", "鑰冩牳鎯呭喌");
+ var trainings = trainingService.listTrainingBetween(start, end);
+ trainingService.fillTrainers(trainings);
+ List<List<Object>> rows = trainings.stream()
+ .map(t -> Arrays.<Object>asList(
+ date(t.getTrainDate()), str(t.getTitle()),
+ SafetyTrainingTypeEnum.getNameByType(t.getTrainingType()),
+ number(t.getDurationHours()), str(t.getTrainer()), str(t.getLocation()),
+ Objects.toString(t.getParticipantCount(), "0"),
+ str(t.getContent()), str(t.getExamResult())))
+ .toList();
+ return new Sheet("瀹夊叏鍩硅鍙拌处", headers, rows);
+ }
+
+ private Sheet drillSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("婕旂粌鏃ユ湡", "婕旂粌鍚嶇О", "婕旂粌绫诲瀷", "鍦扮偣", "缁勭粐浜�",
+ "鍙傚姞浜烘暟", "鏃堕暱(鍒嗛挓)", "婕旂粌杩囩▼", "鎬荤粨涓庢敼杩�");
+ var drills = trainingService.listDrillBetween(start, end);
+ trainingService.fillOrganizers(drills);
+ List<List<Object>> rows = drills.stream()
+ .map(d -> Arrays.<Object>asList(
+ date(d.getDrillDate()), str(d.getTitle()),
+ SafetyDrillTypeEnum.getNameByType(d.getDrillType()), str(d.getLocation()),
+ str(d.getOrganizer()), Objects.toString(d.getParticipantCount(), "0"),
+ Objects.toString(d.getDurationMinutes(), ""),
+ str(d.getProcessDesc()), str(d.getSummary())))
+ .toList();
+ return new Sheet("娑堥槻婕旂粌鍙拌处", headers, rows);
+ }
+
+ private Sheet accidentSheet(LocalDate start, LocalDate end) {
+ List<String> headers = List.of("浜嬫晠缂栧彿", "浜嬫晠鍚嶇О", "浜嬫晠绫诲瀷", "绛夌骇", "鍙戠敓鏃堕棿", "鍙戠敓鍦扮偣",
+ "浼や骸鎯呭喌", "缁忔祹鎹熷け(鍏�)", "浜嬫晠缁忚繃", "鍘熷洜鍒嗘瀽", "澶勭悊鎺柦", "鐘舵��");
+ var accidents = trainingService.listAccidentBetween(start, end);
+ trainingService.fillAccidentRefs(accidents);
+ List<List<Object>> rows = accidents.stream()
+ .map(a -> Arrays.<Object>asList(
+ str(a.getCode()), str(a.getTitle()),
+ SafetyAccidentTypeEnum.getNameByType(a.getAccidentType()),
+ SafetyAccidentLevelEnum.getNameByLevel(a.getLevel()),
+ dateTime(a.getOccurTime()), str(a.getLocation()), str(a.getCasualtyDesc()),
+ number(a.getEconomicLoss()), str(a.getDescription()), str(a.getCauseAnalysis()),
+ str(a.getMeasures()), SafetyAccidentStatusEnum.getNameByStatus(a.getStatus())))
+ .toList();
+ return new Sheet("浜嬫晠鐧昏鍙拌处", headers, rows);
+ }
+
+ // ==================== 宸ュ叿鏂规硶 ====================
+
+ private static String str(String value) {
+ return value == null ? "" : value;
+ }
+
+ private static String date(LocalDate value) {
+ return value == null ? "" : value.toString();
+ }
+
+ private static String dateTime(java.time.LocalDateTime value) {
+ return value == null ? "" : value.toString().replace('T', ' ');
+ }
+
+ private static String number(java.math.BigDecimal value) {
+ return value == null ? "" : value.stripTrailingZeros().toPlainString();
+ }
+
+ private record Sheet(String name, List<String> headers, List<List<Object>> rows) {
+ }
+
+ private void write(HttpServletResponse response, String filename, List<Sheet> sheets) throws IOException {
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setHeader("Content-Disposition", "attachment;filename=" + HttpUtils.encodeUtf8(filename));
+ try (var writer = FastExcelFactory.write(response.getOutputStream()).autoCloseStream(false).build()) {
+ for (int i = 0; i < sheets.size(); i++) {
+ Sheet sheet = sheets.get(i);
+ writer.write(sheet.rows(), FastExcelFactory.writerSheet(i, sheet.name())
+ .head(sheet.headers().stream().map(List::of).toList()).build());
+ }
+ }
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyMaterialService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyMaterialService.java
new file mode 100644
index 0000000..7b9f0b5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyMaterialService.java
@@ -0,0 +1,192 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.material.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyMaterialDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyMaterialStockDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyMaterialMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyMaterialStockMapper;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyMaterialCategoryEnum;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 搴旀�ョ墿璧勫彴璐︿笌鍑哄叆搴� Service
+ *
+ * <p>瑕嗙洊鐢靛姏缁濈紭鐢ㄥ叿銆佸嵄鍖栧搧銆佹秷闃茬墿璧勩�傚嚭搴撴椂琛岄攣鏍¢獙搴撳瓨锛岄伩鍏嶅苟鍙戞墸鍑忎负璐熴��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyMaterialService {
+
+ @Resource
+ private SafetyMaterialMapper materialMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
+ @Resource
+ private SafetyMaterialStockMapper stockMapper;
+
+ // ==================== 鐗╄祫鍙拌处 ====================
+
+ public Long createMaterial(SafetyMaterialSaveReqVO reqVO) {
+ reqVO.setId(null);
+ String code = StrUtil.trim(reqVO.getCode());
+ if (materialMapper.selectByCode(code) != null) {
+ throw exception(SAFETY_MATERIAL_CODE_DUPLICATE);
+ }
+ SafetyMaterialDO material = BeanUtils.toBean(reqVO, SafetyMaterialDO.class);
+ material.setCode(code);
+ material.setName(StrUtil.trim(reqVO.getName()));
+ material.setUnit(StrUtil.blankToDefault(reqVO.getUnit(), "涓�"));
+ applyManager(material, reqVO.getManagerId());
+ material.setStockQty(reqVO.getStockQty() == null ? BigDecimal.ZERO : reqVO.getStockQty());
+ material.setSafeStock(reqVO.getSafeStock() == null ? BigDecimal.ZERO : reqVO.getSafeStock());
+ materialMapper.insert(material);
+ return material.getId();
+ }
+
+ public void updateMaterial(SafetyMaterialSaveReqVO reqVO) {
+ SafetyMaterialDO old = validateMaterialExists(reqVO.getId());
+ String code = StrUtil.trim(reqVO.getCode());
+ SafetyMaterialDO byCode = materialMapper.selectByCode(code);
+ if (byCode != null && !byCode.getId().equals(old.getId())) {
+ throw exception(SAFETY_MATERIAL_CODE_DUPLICATE);
+ }
+ SafetyMaterialDO material = BeanUtils.toBean(reqVO, SafetyMaterialDO.class);
+ material.setCode(code);
+ material.setName(StrUtil.trim(reqVO.getName()));
+ applyManager(material, reqVO.getManagerId());
+ // 搴撳瓨鏁伴噺鍙兘閫氳繃鍑哄叆搴撳崟鍙樺姩锛岀姝㈢洿鎺ョ紪杈�
+ material.setStockQty(null);
+ materialMapper.updateById(material);
+ }
+
+ public void deleteMaterial(Long id) {
+ validateMaterialExists(id);
+ materialMapper.deleteById(id);
+ }
+
+ public SafetyMaterialDO getMaterial(Long id) {
+ return validateMaterialExists(id);
+ }
+
+ public PageResult<SafetyMaterialDO> getMaterialPage(SafetyMaterialPageReqVO reqVO) {
+ return materialMapper.selectPage(reqVO);
+ }
+
+ /**
+ * 淇濈浜猴細浠庡憳宸ユ。妗堝甫鍑哄鍚嶈惤蹇収
+ */
+ private void applyManager(SafetyMaterialDO material, Long managerId) {
+ material.setManagerId(managerId);
+ material.setManager(managerId == null ? ""
+ : refResolver.requireEmployee(managerId, SAFETY_EMPLOYEE_REQUIRED).getName());
+ }
+
+ /**
+ * 鎵归噺鍥炲~淇濈浜烘渶鏂板鍚�
+ */
+ public void fillManagers(List<SafetyMaterialDO> materials) {
+ if (CollUtil.isEmpty(materials)) {
+ return;
+ }
+ var employeeMap = refResolver.employeeMap(materials.stream().map(SafetyMaterialDO::getManagerId).toList());
+ materials.forEach(material -> {
+ var employee = employeeMap.get(material.getManagerId());
+ if (employee != null) material.setManager(employee.getName());
+ });
+ }
+
+ public static void fillMaterialDisplay(SafetyMaterialDO material, SafetyMaterialRespVO respVO) {
+ respVO.setCategoryName(SafetyMaterialCategoryEnum.getNameByCategory(material.getCategory()));
+ BigDecimal stock = material.getStockQty() == null ? BigDecimal.ZERO : material.getStockQty();
+ BigDecimal safe = material.getSafeStock() == null ? BigDecimal.ZERO : material.getSafeStock();
+ respVO.setBelowSafeStock(safe.signum() > 0 && stock.compareTo(safe) < 0);
+ if (material.getExpireDate() != null) {
+ respVO.setExpireRemainingDays(ChronoUnit.DAYS.between(LocalDate.now(), material.getExpireDate()));
+ }
+ }
+
+ // ==================== 鍑哄叆搴� ====================
+
+ /**
+ * 鍑哄叆搴撶櫥璁帮細琛岄攣璇诲彇搴撳瓨 鈫� 璁$畻鍙樺姩 鈫� 鍐欐祦姘� 鈫� 鍥炲啓搴撳瓨
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Long createStock(SafetyMaterialStockSaveReqVO reqVO) {
+ SafetyMaterialDO material = materialMapper.selectByIdForUpdate(reqVO.getMaterialId());
+ if (material == null) {
+ throw exception(SAFETY_MATERIAL_NOT_EXISTS);
+ }
+ BigDecimal before = material.getStockQty() == null ? BigDecimal.ZERO : material.getStockQty();
+ boolean inbound = "IN".equals(reqVO.getBizType());
+ BigDecimal after = inbound ? before.add(reqVO.getQuantity()) : before.subtract(reqVO.getQuantity());
+ if (!inbound && after.signum() < 0) {
+ throw exception(SAFETY_MATERIAL_STOCK_NOT_ENOUGH);
+ }
+ SafetyMaterialStockDO stock = BeanUtils.toBean(reqVO, SafetyMaterialStockDO.class);
+ stock.setId(null);
+ stock.setMaterialName(material.getName());
+ stock.setCategory(material.getCategory());
+ stock.setQuantity(reqVO.getQuantity());
+ stock.setStockBefore(before);
+ stock.setStockAfter(after);
+ stock.setBizDate(reqVO.getBizDate() == null ? LocalDate.now() : reqVO.getBizDate());
+ stock.setOperator(StrUtil.trim(reqVO.getOperator()));
+ stockMapper.insert(stock);
+
+ SafetyMaterialDO update = new SafetyMaterialDO();
+ update.setId(material.getId());
+ update.setStockQty(after);
+ materialMapper.updateById(update);
+ return stock.getId();
+ }
+
+ public PageResult<SafetyMaterialStockDO> getStockPage(SafetyMaterialStockPageReqVO reqVO) {
+ return stockMapper.selectPage(reqVO);
+ }
+
+ public static void fillStockDisplay(SafetyMaterialStockDO stock, SafetyMaterialStockRespVO respVO) {
+ respVO.setCategoryName(SafetyMaterialCategoryEnum.getNameByCategory(stock.getCategory()));
+ respVO.setBizTypeName("IN".equals(stock.getBizType()) ? "鍏ュ簱" : "鍑哄簱");
+ }
+
+ /**
+ * 棰勮娓呭崟锛氫綆浜庡畨鍏ㄥ簱瀛樼殑鐗╄祫
+ */
+ public List<SafetyMaterialDO> getBelowSafeStockList() {
+ return materialMapper.selectBelowSafeStock();
+ }
+
+ /**
+ * 棰勮娓呭崟锛氭湁鏁堟湡涓磋繎锛堥粯璁� 30 澶╁唴锛夌殑鐗╄祫
+ */
+ public List<SafetyMaterialDO> getExpiringList(Integer days) {
+ int warnDays = days == null || days <= 0 ? 30 : days;
+ return materialMapper.selectExpiringBefore(LocalDate.now().plusDays(warnDays));
+ }
+
+ private SafetyMaterialDO validateMaterialExists(Long id) {
+ SafetyMaterialDO material = id == null ? null : materialMapper.selectById(id);
+ if (material == null) {
+ throw exception(SAFETY_MATERIAL_NOT_EXISTS);
+ }
+ return material;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOrgService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOrgService.java
new file mode 100644
index 0000000..c9594a8
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOrgService.java
@@ -0,0 +1,157 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.org.SafetyOrgRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.org.SafetyOrgSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyOrgDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyOrgMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 瀹夊叏缁勭粐鏋舵瀯 Service
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyOrgService {
+
+ @Resource
+ private SafetyOrgMapper safetyOrgMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
+
+ public Long createOrg(SafetyOrgSaveReqVO reqVO) {
+ reqVO.setId(null);
+ validateParent(reqVO.getParentId(), null);
+ SafetyOrgDO org = BeanUtils.toBean(reqVO, SafetyOrgDO.class);
+ org.setParentId(reqVO.getParentId() == null ? 0L : reqVO.getParentId());
+ applyLeader(org, reqVO.getLeaderId());
+ safetyOrgMapper.insert(org);
+ return org.getId();
+ }
+
+ public void updateOrg(SafetyOrgSaveReqVO reqVO) {
+ validateOrgExists(reqVO.getId());
+ validateParent(reqVO.getParentId(), reqVO.getId());
+ SafetyOrgDO org = BeanUtils.toBean(reqVO, SafetyOrgDO.class);
+ org.setParentId(reqVO.getParentId() == null ? 0L : reqVO.getParentId());
+ applyLeader(org, reqVO.getLeaderId());
+ safetyOrgMapper.updateById(org);
+ }
+
+ /**
+ * 璐熻矗浜猴細浠庡憳宸ユ。妗堝甫鍑哄鍚嶄笌鐢佃瘽骞惰惤蹇収
+ */
+ private void applyLeader(SafetyOrgDO org, Long leaderId) {
+ org.setLeaderId(leaderId);
+ if (leaderId == null) {
+ org.setLeaderName("");
+ return;
+ }
+ var employee = refResolver.requireEmployee(leaderId, SAFETY_EMPLOYEE_REQUIRED);
+ org.setLeaderName(employee.getName());
+ org.setLeaderPhone(employee.getPhone());
+ }
+
+ public void deleteOrg(Long id) {
+ validateOrgExists(id);
+ if (safetyOrgMapper.selectCountByParentId(id) > 0) {
+ throw exception(SAFETY_ORG_HAS_CHILDREN);
+ }
+ safetyOrgMapper.deleteById(id);
+ }
+
+ public SafetyOrgDO getOrg(Long id) {
+ return validateOrgExists(id);
+ }
+
+ /**
+ * 鍙栬礋璐d汉鏈�鏂版。妗堬紙渚涘崟鏉℃煡璇㈠洖濉敤锛�
+ */
+ public cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO getLeader(Long leaderId) {
+ return refResolver.findEmployee(leaderId);
+ }
+
+ /**
+ * 鏌ヨ缁勭粐鏍�
+ */
+ public List<SafetyOrgRespVO> getOrgTree() {
+ List<SafetyOrgDO> all = safetyOrgMapper.selectListOrdered();
+ List<SafetyOrgRespVO> nodes = BeanUtils.toBean(all, SafetyOrgRespVO.class);
+ // 璐熻矗浜虹敤鍛樺伐妗f鏈�鏂板鍚嶈鐩栧揩鐓э紝鍛樺伐鏀瑰悕/璋冨矖鍚庢爲涔熷悓姝�
+ var employeeMap = refResolver.employeeMap(
+ all.stream().map(SafetyOrgDO::getLeaderId).toList());
+ nodes.forEach(node -> {
+ var employee = employeeMap.get(node.getLeaderId());
+ if (employee != null) {
+ node.setLeaderName(employee.getName());
+ }
+ });
+ Map<Long, List<SafetyOrgRespVO>> grouped = nodes.stream()
+ .collect(Collectors.groupingBy(SafetyOrgRespVO::getParentId, Collectors.toList()));
+ nodes.forEach(node -> node.setChildren(grouped.getOrDefault(node.getId(), new ArrayList<>())));
+ List<SafetyOrgRespVO> roots = grouped.getOrDefault(0L, new ArrayList<>());
+ if (CollUtil.isEmpty(roots)) {
+ // 鍏煎 parentId 涓虹┖鐨勮剰鏁版嵁
+ roots = nodes.stream().filter(n -> n.getParentId() == null || n.getParentId() == 0L).toList();
+ }
+ return roots;
+ }
+
+ private void validateParent(Long parentId, Long selfId) {
+ if (parentId == null || parentId == 0L) {
+ return;
+ }
+ if (parentId.equals(selfId)) {
+ throw exception(SAFETY_ORG_PARENT_IS_SELF);
+ }
+ SafetyOrgDO parent = safetyOrgMapper.selectById(parentId);
+ if (parent == null) {
+ throw exception(SAFETY_ORG_PARENT_NOT_EXISTS);
+ }
+ // 闃叉鎶婄埗鑺傜偣鎸傚埌鑷繁鐨勫瓙瀛欎笅锛屽舰鎴愮幆
+ if (selfId != null && isDescendant(parentId, selfId)) {
+ throw exception(SAFETY_ORG_PARENT_IS_CHILD);
+ }
+ }
+
+ private boolean isDescendant(Long candidateId, Long ancestorId) {
+ Long current = candidateId;
+ int guard = 0;
+ while (current != null && current != 0L && guard++ < 100) {
+ if (current.equals(ancestorId)) {
+ return true;
+ }
+ SafetyOrgDO node = safetyOrgMapper.selectById(current);
+ if (node == null) {
+ return false;
+ }
+ current = node.getParentId();
+ }
+ return false;
+ }
+
+ private SafetyOrgDO validateOrgExists(Long id) {
+ if (id == null) {
+ throw exception(SAFETY_ORG_NOT_EXISTS);
+ }
+ SafetyOrgDO org = safetyOrgMapper.selectById(id);
+ if (org == null) {
+ throw exception(SAFETY_ORG_NOT_EXISTS);
+ }
+ return org;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOverviewService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOverviewService.java
new file mode 100644
index 0000000..9e1faf5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyOverviewService.java
@@ -0,0 +1,138 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.*;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.*;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.ledger.SafetyOverviewRespVO;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鎬昏缁熻 Service
+ *
+ * <p>鎻愪緵棣栭〉 KPI 涓庤秼鍔挎暟鎹紝鍏ㄩ儴鍩轰簬鐜版湁鍙拌处瀹炴椂璁$畻锛屼笉鍋氬啑浣欑粺璁¤〃銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class SafetyOverviewService {
+
+ private static final DateTimeFormatter MONTH_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM");
+ /** 瓒嬪娍灞曠ず鏈堟暟 */
+ private static final int TREND_MONTHS = 6;
+
+ @Resource
+ private SafetyCertificateMapper certificateMapper;
+ @Resource
+ private SafetyHazardMapper hazardMapper;
+ @Resource
+ private SafetyWorkPermitMapper permitMapper;
+ @Resource
+ private SafetyMaterialMapper materialMapper;
+ @Resource
+ private SafetyTrainingMapper trainingMapper;
+ @Resource
+ private SafetyDrillMapper drillMapper;
+ @Resource
+ private SafetyAccidentMapper accidentMapper;
+
+ public SafetyOverviewRespVO getOverview() {
+ SafetyOverviewRespVO overview = new SafetyOverviewRespVO();
+ LocalDate today = LocalDate.now();
+
+ // ---------- 鐗圭浣滀笟璇� ----------
+ List<SafetyCertificateDO> certs = certificateMapper.selectList();
+ long expiring = 0;
+ long expired = 0;
+ for (SafetyCertificateDO cert : certs) {
+ String status = SafetyCertificateService.resolveStatus(
+ cert.getExpireDate(), cert.getWarnDays(), cert.getStatus());
+ if ("EXPIRED".equals(status)) {
+ expired++;
+ } else if ("EXPIRING".equals(status)) {
+ expiring++;
+ }
+ }
+ overview.setCertTotal((long) certs.size());
+ overview.setCertExpiring(expiring);
+ overview.setCertExpired(expired);
+
+ // ---------- 闅愭偅 ----------
+ List<SafetyHazardDO> hazards = hazardMapper.selectList();
+ long hazardOpen = hazards.stream()
+ .filter(h -> !"CLOSED".equals(h.getStatus())).count();
+ long hazardOverdue = hazardMapper.selectOverdue(today).size();
+ long hazardClosed = hazards.size() - hazardOpen;
+ overview.setHazardTotal((long) hazards.size());
+ overview.setHazardOpen(hazardOpen);
+ overview.setHazardOverdue(hazardOverdue);
+ overview.setHazardCloseRate(hazards.isEmpty() ? 0
+ : (int) Math.round(hazardClosed * 100.0 / hazards.size()));
+
+ // ---------- 浣滀笟绁� ----------
+ List<SafetyWorkPermitDO> permits = permitMapper.selectList();
+ overview.setPermitPending(permits.stream()
+ .filter(p -> "PENDING".equals(p.getStatus())).count());
+ overview.setPermitInProgress(permits.stream()
+ .filter(p -> "IN_PROGRESS".equals(p.getStatus())).count());
+
+ // ---------- 鐗╄祫 ----------
+ overview.setMaterialBelowSafeStock((long) materialMapper.selectBelowSafeStock().size());
+ overview.setMaterialExpiring((long) materialMapper.selectExpiringBefore(today.plusDays(30)).size());
+
+ // ---------- 鏈湀娲诲姩 ----------
+ YearMonth currentMonth = YearMonth.from(today);
+ LocalDate monthStart = currentMonth.atDay(1);
+ LocalDate monthEnd = currentMonth.atEndOfMonth();
+ overview.setTrainingThisMonth((long) trainingMapper.selectListBetween(monthStart, monthEnd).size());
+ overview.setDrillThisMonth((long) drillMapper.selectListBetween(monthStart, monthEnd).size());
+ overview.setAccidentThisMonth((long) accidentMapper.selectListBetween(
+ monthStart.atStartOfDay(), monthEnd.atTime(23, 59, 59)).size());
+
+ // ---------- 瓒嬪娍锛堣繎 6 涓湀锛� ----------
+ overview.setHazardTrend(buildTrend(hazards.stream().map(SafetyHazardDO::getReportTime).toList()));
+ overview.setAccidentTrend(buildTrend(hazards.isEmpty() ? List.of()
+ : accidentMapper.selectList().stream().map(SafetyAccidentDO::getOccurTime).toList()));
+
+ return overview;
+ }
+
+ /**
+ * 鎸夋湀鑱氬悎鏃堕棿鐐癸紝杈撳嚭杩� N 涓湀鐨勮繛缁簭鍒楋紙鏃犳暟鎹殑鏈堜唤琛� 0锛�
+ */
+ private List<SafetyOverviewRespVO.MonthlyCount> buildTrend(List<LocalDateTime> times) {
+ Map<String, Long> counts = new LinkedHashMap<>();
+ YearMonth current = YearMonth.from(LocalDate.now());
+ List<YearMonth> months = new ArrayList<>();
+ for (int i = TREND_MONTHS - 1; i >= 0; i--) {
+ YearMonth month = current.minusMonths(i);
+ months.add(month);
+ counts.put(month.format(MONTH_FORMAT), 0L);
+ }
+ for (LocalDateTime time : times) {
+ if (time == null) {
+ continue;
+ }
+ String key = YearMonth.from(time).format(MONTH_FORMAT);
+ if (counts.containsKey(key)) {
+ counts.put(key, counts.get(key) + 1);
+ }
+ }
+ return months.stream().map(month -> {
+ SafetyOverviewRespVO.MonthlyCount item = new SafetyOverviewRespVO.MonthlyCount();
+ item.setMonth(month.format(MONTH_FORMAT));
+ item.setCount(counts.get(month.format(MONTH_FORMAT)));
+ return item;
+ }).toList();
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java
new file mode 100644
index 0000000..f647e8e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java
@@ -0,0 +1,118 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.hrm.api.employee.HrmEmployeeApi;
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkshopDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.md.workstation.MesMdWorkshopMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 涓绘暟鎹紩鐢ㄨВ鏋愬櫒
+ *
+ * <p>妯″潡鍐呮墍鏈夈�屼汉鍛樸�嶄笌銆岃溅闂淬�嶅瓧娈电粺涓�璧拌繖閲岃В鏋愶紝閬垮厤姣忎釜 Service 閲嶅鍐欎竴閬嶃��</p>
+ *
+ * <p>缁熶竴绾﹀畾锛氫笟鍔¤〃瀛� {@code xxxId} 鍏宠仈涓绘暟鎹紝鍚屾椂淇濈暀 {@code xxxName} 浣滀负蹇収銆�
+ * 淇濆瓨鏃朵粠涓绘暟鎹妸鍚嶇О甯﹀嚭鍐欏揩鐓э紱鏌ヨ鏃剁敤涓绘暟鎹渶鏂板�艰鐩栧揩鐓э紝
+ * 杩欐牱鍛樺伐璋冨矖銆佽溅闂存敼鍚嶅悗鍙拌处浼氳嚜鍔ㄨ窡鐫�鍙橈紝鑰屼富鏁版嵁琚垹鏃惰�佽褰曚粛鑳介潬蹇収灞曠ず銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+public class SafetyRefResolver {
+
+ @Resource
+ private HrmEmployeeApi hrmEmployeeApi;
+ @Resource
+ private MesMdWorkshopMapper workshopMapper;
+
+ // ==================== 鍛樺伐 ====================
+
+ /**
+ * 鎸夊憳宸ョ紪鍙峰彇鍛樺伐锛屽繀椤诲瓨鍦�
+ *
+ * @throws cn.iocoder.yudao.framework.common.exception.ServiceException 鍛樺伐涓嶅瓨鍦ㄦ椂鎶涘嚭
+ */
+ public HrmEmployeeSimpleDTO requireEmployee(Long employeeId, cn.iocoder.yudao.framework.common.exception.ErrorCode errorCode) {
+ if (employeeId == null) {
+ throw exception(errorCode);
+ }
+ HrmEmployeeSimpleDTO employee = hrmEmployeeApi.getEmployee(employeeId);
+ if (employee == null) {
+ throw exception(errorCode);
+ }
+ return employee;
+ }
+
+ /**
+ * 鍙┖鐨勫憳宸ヨВ鏋愶細id 涓虹┖杩斿洖 null锛屼笉鏍¢獙瀛樺湪鎬э紙鐢ㄤ簬闈炲繀濉瓧娈碉級
+ */
+ public HrmEmployeeSimpleDTO findEmployee(Long employeeId) {
+ return employeeId == null ? null : hrmEmployeeApi.getEmployee(employeeId);
+ }
+
+ /**
+ * 鎵归噺鍙栧憳宸ワ紝杩斿洖 id -> 鍛樺伐 鐨� Map
+ */
+ public Map<Long, HrmEmployeeSimpleDTO> employeeMap(Collection<Long> employeeIds) {
+ if (CollUtil.isEmpty(employeeIds)) {
+ return new HashMap<>();
+ }
+ List<Long> ids = employeeIds.stream().filter(Objects::nonNull).distinct().toList();
+ if (ids.isEmpty()) {
+ return new HashMap<>();
+ }
+ return hrmEmployeeApi.getEmployeeList(ids).stream()
+ .collect(Collectors.toMap(HrmEmployeeSimpleDTO::getId, e -> e, (a, b) -> a));
+ }
+
+ // ==================== 杞﹂棿 ====================
+
+ /**
+ * 鎸夎溅闂寸紪鍙峰彇杞﹂棿锛屽繀椤诲瓨鍦�
+ */
+ public MesMdWorkshopDO requireWorkshop(Long workshopId) {
+ if (workshopId == null) {
+ throw exception(SAFETY_WORKSHOP_NOT_EXISTS);
+ }
+ MesMdWorkshopDO workshop = workshopMapper.selectById(workshopId);
+ if (workshop == null) {
+ throw exception(SAFETY_WORKSHOP_NOT_EXISTS);
+ }
+ return workshop;
+ }
+
+ /**
+ * 鍙┖鐨勮溅闂磋В鏋�
+ */
+ public MesMdWorkshopDO findWorkshop(Long workshopId) {
+ return workshopId == null ? null : workshopMapper.selectById(workshopId);
+ }
+
+ /**
+ * 鎵归噺鍙栬溅闂达紝杩斿洖 id -> 杞﹂棿 鐨� Map
+ */
+ public Map<Long, MesMdWorkshopDO> workshopMap(Collection<Long> workshopIds) {
+ if (CollUtil.isEmpty(workshopIds)) {
+ return new HashMap<>();
+ }
+ List<Long> ids = workshopIds.stream().filter(Objects::nonNull).distinct().toList();
+ if (ids.isEmpty()) {
+ return new HashMap<>();
+ }
+ return workshopMapper.selectBatchIds(ids).stream()
+ .collect(Collectors.toMap(MesMdWorkshopDO::getId, w -> w, (a, b) -> a));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyTrainingService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyTrainingService.java
new file mode 100644
index 0000000..bd857fb
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyTrainingService.java
@@ -0,0 +1,273 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.train.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyAccidentDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyDrillDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyTrainingDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyAccidentMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyDrillMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyTrainingMapper;
+import cn.iocoder.yudao.module.mes.enums.safety.*;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 鍩硅銆佹紨缁冦�佷簨鏁呯櫥璁� Service
+ *
+ * <p>涓夌被璁板綍缁熶竴褰掓。锛屼緵鏍囧噯鍖栧彴璐﹀鍑轰娇鐢ㄣ��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyTrainingService {
+
+ private static final DateTimeFormatter CODE_DATE = DateTimeFormatter.ofPattern("yyyyMMdd");
+
+ @Resource
+ private SafetyTrainingMapper trainingMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
+ @Resource
+ private SafetyDrillMapper drillMapper;
+ @Resource
+ private SafetyAccidentMapper accidentMapper;
+
+ // ==================== 鍩硅 ====================
+
+ public Long createTraining(SafetyTrainingSaveReqVO reqVO) {
+ reqVO.setId(null);
+ SafetyTrainingDO training = BeanUtils.toBean(reqVO, SafetyTrainingDO.class);
+ training.setTitle(StrUtil.trim(reqVO.getTitle()));
+ training.setTrainingType(StrUtil.blankToDefault(reqVO.getTrainingType(), SafetyTrainingTypeEnum.SAFETY.getType()));
+ training.setTrainerId(reqVO.getTrainerId());
+ training.setTrainer(reqVO.getTrainerId() == null ? ""
+ : refResolver.requireEmployee(reqVO.getTrainerId(), SAFETY_EMPLOYEE_REQUIRED).getName());
+ training.setParticipantCount(resolveCount(reqVO.getParticipantCount(), reqVO.getParticipants()));
+ training.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ trainingMapper.insert(training);
+ return training.getId();
+ }
+
+ public void updateTraining(SafetyTrainingSaveReqVO reqVO) {
+ validateTrainingExists(reqVO.getId());
+ SafetyTrainingDO training = BeanUtils.toBean(reqVO, SafetyTrainingDO.class);
+ training.setTitle(StrUtil.trim(reqVO.getTitle()));
+ training.setParticipantCount(resolveCount(reqVO.getParticipantCount(), reqVO.getParticipants()));
+ trainingMapper.updateById(training);
+ }
+
+ public void deleteTraining(Long id) {
+ validateTrainingExists(id);
+ trainingMapper.deleteById(id);
+ }
+
+ public SafetyTrainingDO getTraining(Long id) {
+ return validateTrainingExists(id);
+ }
+
+ public PageResult<SafetyTrainingDO> getTrainingPage(SafetyTrainingPageReqVO reqVO) {
+ return trainingMapper.selectPage(reqVO);
+ }
+
+ /**
+ * 浜嬫晠鐨勪富鏁版嵁寮曠敤锛氭墍灞炶溅闂� + 鐧昏浜�
+ */
+ private void applyAccidentRefs(SafetyAccidentDO accident, SafetyAccidentSaveReqVO reqVO) {
+ accident.setWorkshopId(reqVO.getWorkshopId());
+ accident.setWorkshopName(reqVO.getWorkshopId() == null ? ""
+ : refResolver.requireWorkshop(reqVO.getWorkshopId()).getName());
+ accident.setReporterId(reqVO.getReporterId());
+ accident.setReporter(reqVO.getReporterId() == null ? ""
+ : refResolver.requireEmployee(reqVO.getReporterId(), SAFETY_EMPLOYEE_REQUIRED).getName());
+ }
+
+ /** 鎵归噺鍥炲~鍩硅璁插笀鏈�鏂板鍚� */
+ public void fillTrainers(List<SafetyTrainingDO> trainings) {
+ if (CollUtil.isEmpty(trainings)) return;
+ var employeeMap = refResolver.employeeMap(trainings.stream().map(SafetyTrainingDO::getTrainerId).toList());
+ trainings.forEach(t -> {
+ var e = employeeMap.get(t.getTrainerId());
+ if (e != null) t.setTrainer(e.getName());
+ });
+ }
+
+ /** 鎵归噺鍥炲~婕旂粌缁勭粐浜烘渶鏂板鍚� */
+ public void fillOrganizers(List<SafetyDrillDO> drills) {
+ if (CollUtil.isEmpty(drills)) return;
+ var employeeMap = refResolver.employeeMap(drills.stream().map(SafetyDrillDO::getOrganizerId).toList());
+ drills.forEach(d -> {
+ var e = employeeMap.get(d.getOrganizerId());
+ if (e != null) d.setOrganizer(e.getName());
+ });
+ }
+
+ /** 鎵归噺鍥炲~浜嬫晠鐨勮溅闂村悕涓庣櫥璁颁汉濮撳悕 */
+ public void fillAccidentRefs(List<SafetyAccidentDO> accidents) {
+ if (CollUtil.isEmpty(accidents)) return;
+ var workshopMap = refResolver.workshopMap(accidents.stream().map(SafetyAccidentDO::getWorkshopId).toList());
+ var employeeMap = refResolver.employeeMap(accidents.stream().map(SafetyAccidentDO::getReporterId).toList());
+ accidents.forEach(a -> {
+ var w = workshopMap.get(a.getWorkshopId());
+ if (w != null) a.setWorkshopName(w.getName());
+ var e = employeeMap.get(a.getReporterId());
+ if (e != null) a.setReporter(e.getName());
+ });
+ }
+
+ public static void fillTrainingDisplay(SafetyTrainingDO training, SafetyTrainingRespVO respVO) {
+ respVO.setTrainingTypeName(SafetyTrainingTypeEnum.getNameByType(training.getTrainingType()));
+ }
+
+ // ==================== 婕旂粌 ====================
+
+ public Long createDrill(SafetyDrillSaveReqVO reqVO) {
+ reqVO.setId(null);
+ SafetyDrillDO drill = BeanUtils.toBean(reqVO, SafetyDrillDO.class);
+ drill.setTitle(StrUtil.trim(reqVO.getTitle()));
+ drill.setDrillType(StrUtil.blankToDefault(reqVO.getDrillType(), SafetyDrillTypeEnum.FIRE.getType()));
+ drill.setOrganizerId(reqVO.getOrganizerId());
+ drill.setOrganizer(reqVO.getOrganizerId() == null ? ""
+ : refResolver.requireEmployee(reqVO.getOrganizerId(), SAFETY_EMPLOYEE_REQUIRED).getName());
+ drill.setParticipantCount(resolveCount(reqVO.getParticipantCount(), reqVO.getParticipants()));
+ drill.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ drillMapper.insert(drill);
+ return drill.getId();
+ }
+
+ public void updateDrill(SafetyDrillSaveReqVO reqVO) {
+ validateDrillExists(reqVO.getId());
+ SafetyDrillDO drill = BeanUtils.toBean(reqVO, SafetyDrillDO.class);
+ drill.setTitle(StrUtil.trim(reqVO.getTitle()));
+ drill.setParticipantCount(resolveCount(reqVO.getParticipantCount(), reqVO.getParticipants()));
+ drillMapper.updateById(drill);
+ }
+
+ public void deleteDrill(Long id) {
+ validateDrillExists(id);
+ drillMapper.deleteById(id);
+ }
+
+ public SafetyDrillDO getDrill(Long id) {
+ return validateDrillExists(id);
+ }
+
+ public PageResult<SafetyDrillDO> getDrillPage(SafetyDrillPageReqVO reqVO) {
+ return drillMapper.selectPage(reqVO);
+ }
+
+ public static void fillDrillDisplay(SafetyDrillDO drill, SafetyDrillRespVO respVO) {
+ respVO.setDrillTypeName(SafetyDrillTypeEnum.getNameByType(drill.getDrillType()));
+ }
+
+ // ==================== 浜嬫晠 ====================
+
+ public Long createAccident(SafetyAccidentSaveReqVO reqVO) {
+ reqVO.setId(null);
+ SafetyAccidentDO accident = BeanUtils.toBean(reqVO, SafetyAccidentDO.class);
+ accident.setCode(accidentMapper.selectNextCode("AC" + LocalDate.now().format(CODE_DATE)));
+ accident.setTitle(StrUtil.trim(reqVO.getTitle()));
+ accident.setLevel(StrUtil.blankToDefault(reqVO.getLevel(), SafetyAccidentLevelEnum.GENERAL.getLevel()));
+ accident.setStatus(StrUtil.blankToDefault(reqVO.getStatus(), SafetyAccidentStatusEnum.REPORTED.getStatus()));
+ applyAccidentRefs(accident, reqVO);
+ accident.setReportTime(reqVO.getReportTime() == null ? LocalDateTime.now() : reqVO.getReportTime());
+ accident.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ accidentMapper.insert(accident);
+ return accident.getId();
+ }
+
+ public void updateAccident(SafetyAccidentSaveReqVO reqVO) {
+ validateAccidentExists(reqVO.getId());
+ SafetyAccidentDO accident = BeanUtils.toBean(reqVO, SafetyAccidentDO.class);
+ accident.setCode(null);
+ applyAccidentRefs(accident, reqVO);
+ accidentMapper.updateById(accident);
+ }
+
+ public void deleteAccident(Long id) {
+ validateAccidentExists(id);
+ accidentMapper.deleteById(id);
+ }
+
+ public SafetyAccidentDO getAccident(Long id) {
+ return validateAccidentExists(id);
+ }
+
+ public PageResult<SafetyAccidentDO> getAccidentPage(SafetyAccidentPageReqVO reqVO) {
+ return accidentMapper.selectPage(reqVO);
+ }
+
+ public static void fillAccidentDisplay(SafetyAccidentDO accident, SafetyAccidentRespVO respVO) {
+ respVO.setAccidentTypeName(SafetyAccidentTypeEnum.getNameByType(accident.getAccidentType()));
+ respVO.setLevelName(SafetyAccidentLevelEnum.getNameByLevel(accident.getLevel()));
+ respVO.setStatusName(SafetyAccidentStatusEnum.getNameByStatus(accident.getStatus()));
+ }
+
+ // ==================== 鍙拌处瀵煎嚭鐢ㄦ煡璇� ====================
+
+ public List<SafetyTrainingDO> listTrainingBetween(LocalDate begin, LocalDate end) {
+ return trainingMapper.selectListBetween(begin, end);
+ }
+
+ public List<SafetyDrillDO> listDrillBetween(LocalDate begin, LocalDate end) {
+ return drillMapper.selectListBetween(begin, end);
+ }
+
+ public List<SafetyAccidentDO> listAccidentBetween(LocalDate begin, LocalDate end) {
+ return accidentMapper.selectListBetween(
+ begin == null ? null : begin.atStartOfDay(),
+ end == null ? null : end.atTime(23, 59, 59));
+ }
+
+ // ==================== 绉佹湁 ====================
+
+ /** 鍙傚姞浜烘暟鏈~鏃讹紝鎸夊鍚嶉�楀彿鍒嗛殧鏁伴噺鎺ㄦ柇 */
+ private static int resolveCount(Integer count, String participants) {
+ if (count != null && count > 0) {
+ return count;
+ }
+ if (StrUtil.isBlank(participants)) {
+ return 0;
+ }
+ return (int) java.util.Arrays.stream(participants.split("[,锛屻�乚"))
+ .map(String::trim).filter(StrUtil::isNotBlank).count();
+ }
+
+ private SafetyTrainingDO validateTrainingExists(Long id) {
+ SafetyTrainingDO training = id == null ? null : trainingMapper.selectById(id);
+ if (training == null) {
+ throw exception(SAFETY_TRAINING_NOT_EXISTS);
+ }
+ return training;
+ }
+
+ private SafetyDrillDO validateDrillExists(Long id) {
+ SafetyDrillDO drill = id == null ? null : drillMapper.selectById(id);
+ if (drill == null) {
+ throw exception(SAFETY_DRILL_NOT_EXISTS);
+ }
+ return drill;
+ }
+
+ private SafetyAccidentDO validateAccidentExists(Long id) {
+ SafetyAccidentDO accident = id == null ? null : accidentMapper.selectById(id);
+ if (accident == null) {
+ throw exception(SAFETY_ACCIDENT_NOT_EXISTS);
+ }
+ return accident;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyWorkPermitService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyWorkPermitService.java
new file mode 100644
index 0000000..3899bc6
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyWorkPermitService.java
@@ -0,0 +1,286 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.permit.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyWorkPermitDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyWorkPermitMonitorDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyWorkPermitMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyWorkPermitMonitorMapper;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyPermitStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyPermitTypeEnum;
+import cn.iocoder.yudao.module.mes.enums.safety.SafetyRiskLevelEnum;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.SafetyErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 楂樺嵄浣滀笟绁� Service
+ *
+ * <p>鍔ㄧ伀銆侀珮鍘嬪甫鐢点�佹湁闄愮┖闂寸瓑浣滀笟鐨勭嚎涓婂鎵逛笌鐢靛瓙鐣欏瓨銆�
+ * 鐘舵�佹祦杞細鑽夌 鈫� 寰呭鎵� 鈫� 宸叉壒鍑� 鈫� 浣滀笟涓� 鈫� 宸插畬缁擄紱椹冲洖/浣滃簾涓虹粓姝㈡�併��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class SafetyWorkPermitService {
+
+ private static final DateTimeFormatter CODE_DATE = DateTimeFormatter.ofPattern("yyyyMMdd");
+
+ @Resource
+ private SafetyWorkPermitMapper permitMapper;
+ @Resource
+ private SafetyRefResolver refResolver;
+ @Resource
+ private SafetyWorkPermitMonitorMapper monitorMapper;
+
+ /**
+ * 鎻愪氦浣滀笟鐢宠锛堣崏绋挎垨寰呭鎵癸級
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public Long createPermit(SafetyWorkPermitSaveReqVO reqVO) {
+ reqVO.setId(null);
+ validateTimeRange(reqVO);
+ SafetyWorkPermitDO permit = BeanUtils.toBean(reqVO, SafetyWorkPermitDO.class);
+ permit.setCode(permitMapper.selectNextCode("WP" + LocalDate.now().format(CODE_DATE)));
+ permit.setTitle(StrUtil.trim(reqVO.getTitle()));
+ applyPermitRefs(permit, reqVO);
+ permit.setApplyTime(reqVO.getApplyTime() == null ? LocalDateTime.now() : reqVO.getApplyTime());
+ permit.setRiskLevel(StrUtil.blankToDefault(reqVO.getRiskLevel(), SafetyRiskLevelEnum.NORMAL.getLevel()));
+ permit.setStatus(SafetyPermitStatusEnum.PENDING.getStatus());
+ permit.setRemark(reqVO.getRemark() == null ? "" : reqVO.getRemark().trim());
+ permitMapper.insert(permit);
+ return permit.getId();
+ }
+
+ /**
+ * 淇敼浣滀笟绁紙浠呰崏绋�/寰呭鎵瑰彲鏀癸級
+ */
+ public void updatePermit(SafetyWorkPermitSaveReqVO reqVO) {
+ SafetyWorkPermitDO old = validatePermitExists(reqVO.getId());
+ ensureStatus(old, SafetyPermitStatusEnum.DRAFT, SafetyPermitStatusEnum.PENDING);
+ validateTimeRange(reqVO);
+ SafetyWorkPermitDO update = BeanUtils.toBean(reqVO, SafetyWorkPermitDO.class);
+ update.setCode(null);
+ update.setStatus(null);
+ applyPermitRefs(update, reqVO);
+ permitMapper.updateById(update);
+ }
+
+ /**
+ * 浣滀笟绁ㄧ殑涓绘暟鎹紩鐢細浣滀笟杞﹂棿 + 鐢宠浜� + 鐩戞姢浜猴紝浠庝富鏁版嵁甯﹀嚭鍚嶇О钀藉揩鐓�
+ */
+ private void applyPermitRefs(SafetyWorkPermitDO permit, SafetyWorkPermitSaveReqVO reqVO) {
+ permit.setWorkshopId(reqVO.getWorkshopId());
+ permit.setWorkshopName(reqVO.getWorkshopId() == null ? ""
+ : refResolver.requireWorkshop(reqVO.getWorkshopId()).getName());
+ var applicant = refResolver.requireEmployee(reqVO.getApplicantId(), SAFETY_EMPLOYEE_REQUIRED);
+ permit.setApplicantId(applicant.getId());
+ permit.setApplicant(applicant.getName());
+ permit.setGuardianId(reqVO.getGuardianId());
+ permit.setGuardian(reqVO.getGuardianId() == null ? ""
+ : refResolver.requireEmployee(reqVO.getGuardianId(), SAFETY_EMPLOYEE_REQUIRED).getName());
+ }
+
+ /**
+ * 瀹℃壒浣滀笟绁�
+ *
+ * <p>鎵瑰噯鏃舵牎楠岄珮鍗变綔涓氾紙鍔ㄧ伀/楂樺帇甯︾數/鏈夐檺绌洪棿锛夊繀椤绘寚瀹氱洃鎶や汉锛�
+ * 淇濊瘉浣滀笟绁ㄧ數瀛愮暀瀛樼殑瀹屾暣鎬с��</p>
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void approvePermit(SafetyWorkPermitApproveReqVO reqVO) {
+ SafetyWorkPermitDO permit = validatePermitExists(reqVO.getId());
+ ensureStatus(permit, SafetyPermitStatusEnum.PENDING);
+ var approver = refResolver.requireEmployee(reqVO.getApproverId(), SAFETY_EMPLOYEE_REQUIRED);
+ // 鐢宠浜轰笉鑳藉鎵硅嚜宸辩殑浣滀笟绁紙鎸夊憳宸ョ紪鍙锋瘮杈冿紝閬垮厤鍚屽悕璇垽锛�
+ if (permit.getApplicantId() != null && permit.getApplicantId().equals(approver.getId())) {
+ throw exception(SAFETY_PERMIT_SELF_APPROVE);
+ }
+ boolean approved = "APPROVED".equals(reqVO.getDecision());
+ if (approved && SafetyPermitTypeEnum.requiresGuardian(permit.getPermitType())
+ && permit.getGuardianId() == null) {
+ throw exception(SAFETY_PERMIT_GUARDIAN_REQUIRED);
+ }
+ SafetyWorkPermitDO update = new SafetyWorkPermitDO();
+ update.setId(permit.getId());
+ update.setApproverId(approver.getId());
+ update.setApprover(approver.getName());
+ update.setApproveTime(LocalDateTime.now());
+ update.setApproveComment(reqVO.getApproveComment());
+ update.setStatus(approved ? SafetyPermitStatusEnum.APPROVED.getStatus()
+ : SafetyPermitStatusEnum.REJECTED.getStatus());
+ permitMapper.updateById(update);
+ }
+
+ /**
+ * 寮�濮嬩綔涓氾紙椤诲凡鎵瑰噯锛�
+ */
+ public void startPermit(Long id) {
+ SafetyWorkPermitDO permit = validatePermitExists(id);
+ if (!SafetyPermitStatusEnum.APPROVED.getStatus().equals(permit.getStatus())) {
+ throw exception(SAFETY_PERMIT_NOT_APPROVED);
+ }
+ SafetyWorkPermitDO update = new SafetyWorkPermitDO();
+ update.setId(id);
+ update.setActualStartTime(LocalDateTime.now());
+ update.setStatus(SafetyPermitStatusEnum.IN_PROGRESS.getStatus());
+ permitMapper.updateById(update);
+ }
+
+ /**
+ * 缁撴潫浣滀笟骞跺綊妗�
+ */
+ public void closePermit(Long id) {
+ SafetyWorkPermitDO permit = validatePermitExists(id);
+ ensureStatus(permit, SafetyPermitStatusEnum.IN_PROGRESS);
+ SafetyWorkPermitDO update = new SafetyWorkPermitDO();
+ update.setId(id);
+ update.setActualEndTime(LocalDateTime.now());
+ update.setStatus(SafetyPermitStatusEnum.CLOSED.getStatus());
+ permitMapper.updateById(update);
+ }
+
+ /**
+ * 浣滃簾浣滀笟绁紙鏈畬缁撳墠鍧囧彲浣滃簾锛�
+ */
+ public void cancelPermit(Long id) {
+ SafetyWorkPermitDO permit = validatePermitExists(id);
+ if (SafetyPermitStatusEnum.CLOSED.getStatus().equals(permit.getStatus())
+ || SafetyPermitStatusEnum.CANCELLED.getStatus().equals(permit.getStatus())) {
+ throw exception(SAFETY_PERMIT_STATUS_ERROR);
+ }
+ SafetyWorkPermitDO update = new SafetyWorkPermitDO();
+ update.setId(id);
+ update.setStatus(SafetyPermitStatusEnum.CANCELLED.getStatus());
+ permitMapper.updateById(update);
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void deletePermit(Long id) {
+ validatePermitExists(id);
+ monitorMapper.deleteByPermitId(id);
+ permitMapper.deleteById(id);
+ }
+
+ public SafetyWorkPermitDO getPermit(Long id) {
+ return validatePermitExists(id);
+ }
+
+ public PageResult<SafetyWorkPermitDO> getPermitPage(SafetyWorkPermitPageReqVO reqVO) {
+ return permitMapper.selectPage(reqVO);
+ }
+
+ // ==================== 鐩戞姢璁板綍 ====================
+
+ public Long createMonitor(SafetyWorkPermitMonitorSaveReqVO reqVO) {
+ SafetyWorkPermitDO permit = validatePermitExists(reqVO.getPermitId());
+ if (!SafetyPermitStatusEnum.IN_PROGRESS.getStatus().equals(permit.getStatus())
+ && !SafetyPermitStatusEnum.APPROVED.getStatus().equals(permit.getStatus())) {
+ throw exception(SAFETY_PERMIT_STATUS_ERROR);
+ }
+ SafetyWorkPermitMonitorDO monitor = BeanUtils.toBean(reqVO, SafetyWorkPermitMonitorDO.class);
+ monitor.setId(null);
+ var guardian = refResolver.requireEmployee(reqVO.getGuardianId(), SAFETY_EMPLOYEE_REQUIRED);
+ monitor.setGuardianId(guardian.getId());
+ monitor.setGuardian(guardian.getName());
+ monitor.setMonitorTime(reqVO.getMonitorTime() == null ? LocalDateTime.now() : reqVO.getMonitorTime());
+ monitorMapper.insert(monitor);
+ return monitor.getId();
+ }
+
+ public void deleteMonitor(Long id) {
+ if (id == null || monitorMapper.selectById(id) == null) {
+ throw exception(SAFETY_PERMIT_MONITOR_NOT_EXISTS);
+ }
+ monitorMapper.deleteById(id);
+ }
+
+ public List<SafetyWorkPermitMonitorDO> getMonitorList(Long permitId) {
+ return monitorMapper.selectListByPermitId(permitId);
+ }
+
+ // ==================== 灞曠ず瀛楁 ====================
+
+ /**
+ * 鎵归噺鍥炲~浣滀笟绁ㄧ殑杞﹂棿鍚嶄笌涓変釜浜哄憳濮撳悕锛堢敵璇蜂汉/瀹℃壒浜�/鐩戞姢浜猴級
+ */
+ public void fillPermitRefs(List<SafetyWorkPermitDO> permits) {
+ if (CollUtil.isEmpty(permits)) {
+ return;
+ }
+ var workshopMap = refResolver.workshopMap(permits.stream().map(SafetyWorkPermitDO::getWorkshopId).toList());
+ var ids = new java.util.ArrayList<Long>(permits.size() * 3);
+ permits.forEach(p -> { ids.add(p.getApplicantId()); ids.add(p.getApproverId()); ids.add(p.getGuardianId()); });
+ var employeeMap = refResolver.employeeMap(ids);
+ permits.forEach(permit -> {
+ var workshop = workshopMap.get(permit.getWorkshopId());
+ if (workshop != null) permit.setWorkshopName(workshop.getName());
+ var applicant = employeeMap.get(permit.getApplicantId());
+ if (applicant != null) permit.setApplicant(applicant.getName());
+ var approver = employeeMap.get(permit.getApproverId());
+ if (approver != null) permit.setApprover(approver.getName());
+ var guardian = employeeMap.get(permit.getGuardianId());
+ if (guardian != null) permit.setGuardian(guardian.getName());
+ });
+ }
+
+ /**
+ * 鎵归噺鍥炲~鐩戞姢璁板綍鐨勭洃鎶や汉鏈�鏂板鍚�
+ */
+ public void fillMonitorGuardians(List<SafetyWorkPermitMonitorDO> monitors) {
+ if (CollUtil.isEmpty(monitors)) {
+ return;
+ }
+ var employeeMap = refResolver.employeeMap(
+ monitors.stream().map(SafetyWorkPermitMonitorDO::getGuardianId).toList());
+ monitors.forEach(monitor -> {
+ var employee = employeeMap.get(monitor.getGuardianId());
+ if (employee != null) monitor.setGuardian(employee.getName());
+ });
+ }
+
+ public static void fillPermitDisplay(SafetyWorkPermitDO permit, SafetyWorkPermitRespVO respVO) {
+ respVO.setPermitTypeName(SafetyPermitTypeEnum.getNameByType(permit.getPermitType()));
+ respVO.setRiskLevelName(SafetyRiskLevelEnum.getNameByLevel(permit.getRiskLevel()));
+ respVO.setStatusName(SafetyPermitStatusEnum.getNameByStatus(permit.getStatus()));
+ respVO.setGuardianRequired(SafetyPermitTypeEnum.requiresGuardian(permit.getPermitType()));
+ }
+
+ private void validateTimeRange(SafetyWorkPermitSaveReqVO reqVO) {
+ if (reqVO.getPlanStartTime() != null && reqVO.getPlanEndTime() != null
+ && !reqVO.getPlanEndTime().isAfter(reqVO.getPlanStartTime())) {
+ throw exception(SAFETY_PERMIT_TIME_INVALID);
+ }
+ }
+
+ private void ensureStatus(SafetyWorkPermitDO permit, SafetyPermitStatusEnum... allowed) {
+ for (SafetyPermitStatusEnum status : allowed) {
+ if (status.getStatus().equals(permit.getStatus())) {
+ return;
+ }
+ }
+ throw exception(SAFETY_PERMIT_STATUS_ERROR);
+ }
+
+ private SafetyWorkPermitDO validatePermitExists(Long id) {
+ SafetyWorkPermitDO permit = id == null ? null : permitMapper.selectById(id);
+ if (permit == null) {
+ throw exception(SAFETY_PERMIT_NOT_EXISTS);
+ }
+ return permit;
+ }
+
+}
--
Gitblit v1.9.3