From b0978a62cf2050170793e87fbd01db1760808043 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 09:50:30 +0800
Subject: [PATCH] feat: 从长辉移植新高缺失的六个业务模块(安全生产/能耗/数采/备件/质检台账/售后问题回访)
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/train/SafetyDrillSaveReqVO.java | 74
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitServiceImpl.java | 106
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectOperateModeEnum.java | 36
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/enums/collect/MesCollectRunStatusEnum.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyHazardService.java | 220
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupServiceImpl.java | 460 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/mqtt/MesCollectMqttClient.java | 198
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/controller/admin/energy/vo/EnergyRecordRespVO.java | 22
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectMsgTypeEnum.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificatePageReqVO.java | 50
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleProblemStatusEnum.java | 43
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/cert/SafetyCertificateRespVO.java | 45
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitPageReqVO.java | 27
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/service/energy/EnergyRecordChangedEvent.java | 6
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/enums/safety/SafetyDrillTypeEnum.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogRespVO.java | 35
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java | 204
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyRecordService.java | 127
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/dal/mysql/collect/MesCollectOperateLogMapper.java | 28
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertLogMapper.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectTechDO.java | 33
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/enums/safety/SafetyAccidentLevelEnum.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordPageReqVO.java | 27
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/service/energy/EnergyAlertListener.java | 22
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcQualityExportVO.java | 92
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareMovementRespVO.java | 10
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectTechMapper.java | 19
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeHistoryMapper.java | 36
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/controller/admin/qc/ledger/vo/MesQcInspectionLedgerRespVO.java | 102
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupService.java | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/SafetyErrorCodeConstants.java | 67
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/visit/AfterSaleVisitDO.java | 67
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java | 80
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/dal/mysql/collect/MesCollectRealtimeMapper.java | 19
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyInspectionPointDO.java | 47
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDeviceRespVO.java | 65
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSpareMovementDO.java | 31
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/dataobject/collect/MesCollectMessageDO.java | 36
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/companyconfig/SystemCompanyConfigMapper.java | 15
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/ledger/SafetyOverviewRespVO.java | 62
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java | 5
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectCycleDO.java | 48
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyFileController.java | 53
yudao-module-mes/pom.xml | 13
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcImportRespVO.java | 26
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareActionReqVO.java | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/spare/MesDvSpareMovementMapper.java | 30
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeRespVO.java | 42
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeHistoryDO.java | 39
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/MesCollectController.java | 103
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/MesDvSpareController.java | 39
yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/dto/HrmEmployeeSimpleDTO.java | 57
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/controller/admin/energy/EnergyAlertController.java | 49
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyAccidentDO.java | 64
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisReqVO.java | 31
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/dal/mysql/safety/SafetyCertificateMapper.java | 46
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/spare/MesDvSpareService.java | 189
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyTrainingDO.java | 50
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/companyconfig/SystemCompanyConfigDO.java | 47
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordSaveReqVO.java | 42
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleVisitStatusEnum.java | 44
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/enums/safety/SafetyHazardSourceEnum.java | 32
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitRespVO.java | 56
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/dal/mysql/qc/ledger/MesQcInspectionLedgerMapper.java | 20
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertLogDO.java | 26
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertRuleDO.java | 20
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/permit/SafetyWorkPermitSaveReqVO.java | 84
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitService.java | 52
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 4
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/dal/mysql/collect/MesCollectMessageMapper.java | 24
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/config/MesCollectProperties.java | 93
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectTechRespVO.java | 27
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/dv/machinery/MesDvMachineryMapper.java | 16
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-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/AfterSaleProblemController.java | 141
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/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/qc/ledger/MesQcInspectionLedgerServiceImpl.java | 75
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/enums/safety/SafetyTrainingTypeEnum.java | 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/SafetyInspectionPointMapper.java | 40
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/problem/AfterSaleProblemDO.java | 118
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/dal/mysql/dv/spare/MesDvSparePartMapper.java | 21
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitCreateReqVO.java | 41
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/service/qc/ledger/MesQcInspectionLedgerService.java | 22
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/controller/admin/safety/vo/train/SafetyDrillRespVO.java | 38
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/problem/AfterSaleProblemMapper.java | 101
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectMessageDispatcher.java | 204
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectTaskResolver.java | 45
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-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/SystemCompanyConfigController.java | 59
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyHazardDO.java | 82
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/machinery/MesDvMachineryDO.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectAlarmDO.java | 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataService.java | 188
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/dal/mysql/pro/task/MesProTaskMapper.java | 15
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigRespVO.java | 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertRuleMapper.java | 12
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyInspectionService.java | 223
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemPageReqVO.java | 45
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeDO.java | 39
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerPageReqVO.java | 41
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/AfterSaleVisitController.java | 96
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCycleRespVO.java | 56
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/database/DatabaseBackupController.java | 29
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java | 234 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/job/collect/MesCollectCleanupJob.java | 58
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/controller/admin/collect/vo/MesCollectAlarmRespVO.java | 39
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/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/dal/mysql/collect/MesCollectAlarmMapper.java | 45
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/org/SafetyOrgRespVO.java | 36
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemService.java | 95
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyCertificateDO.java | 57
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemServiceImpl.java | 211
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigServiceImpl.java | 50
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java | 28
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-dependencies/pom.xml | 7
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 | 122
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/controller/admin/collect/vo/MesCollectRealtimeHistoryPageReqVO.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerExportVO.java | 70
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyExportService.java | 58
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/controller/admin/collect/vo/MesCollectCyclePageReqVO.java | 36
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/dal/mysql/collect/MesCollectCycleMapper.java | 28
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSparePartDO.java | 20
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSparePageReqVO.java | 16
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/safety/SafetyInspectCycleEnum.java | 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyRecordMapper.java | 67
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/vo/material/SafetyMaterialSaveReqVO.java | 76
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectAlarmStatusEnum.java | 21
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisRespVO.java | 29
yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApi.java | 42
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-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigService.java | 28
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/permit/SafetyWorkPermitRespVO.java | 58
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemSaveReqVO.java | 71
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/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/service/energy/EnergyAlertService.java | 123
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-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/visit/AfterSaleVisitMapper.java | 33
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/dal/dataobject/collect/MesCollectOperateLogDO.java | 37
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/SafetyInspectionMapper.java | 51
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java | 85
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmPageReqVO.java | 36
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/dal/dataobject/safety/SafetyMaterialDO.java | 54
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataParser.java | 237 +
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigSaveReqVO.java | 35
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/controller/admin/dv/spare/vo/MesDvSparePartSaveReqVO.java | 17
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-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemRespVO.java | 104
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/collect/vo/MesCollectOperateLogPageReqVO.java | 36
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyRecordDO.java | 29
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java | 8
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/MesQcInspectionLedgerController.java | 113
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/controller/admin/energy/vo/EnergyAlertRuleSaveReqVO.java | 20
217 files changed, 13,563 insertions(+), 0 deletions(-)
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 8c9a6be..68b2ae8 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -606,6 +606,13 @@
<version>${vertx.version}</version>
</dependency>
+ <!-- MQTT锛歁ES 鏁伴噰瀹㈡埛绔娇鐢� paho -->
+ <dependency>
+ <groupId>org.eclipse.paho</groupId>
+ <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+ <version>${mqtt.version}</version>
+ </dependency>
+
<!-- MQTT -->
<dependency>
<groupId>org.eclipse.paho</groupId>
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/AfterSaleProblemController.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/AfterSaleProblemController.java
new file mode 100644
index 0000000..af999db
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/AfterSaleProblemController.java
@@ -0,0 +1,141 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.problem;
+
+import cn.hutool.core.collection.CollUtil;
+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.aftersales.controller.admin.problem.vo.AfterSaleProblemPageReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo.AfterSaleProblemRespVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo.AfterSaleProblemSaveReqVO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.problem.AfterSaleProblemDO;
+import cn.iocoder.yudao.module.aftersales.service.problem.AfterSaleProblemService;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+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.*;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+@Tag(name = "绠$悊鍚庡彴 - 鍞悗闂搴�")
+@RestController
+@RequestMapping("/aftersales/problem")
+@Validated
+public class AfterSaleProblemController {
+
+ @Resource
+ private AfterSaleProblemService problemService;
+
+ @Resource
+ private CrmCustomerApi customerApi;
+ @Resource
+ private AdminUserApi adminUserApi;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓鍞悗闂")
+ @PreAuthorize("@ss.hasPermission('aftersales:problem:create')")
+ public CommonResult<Long> createProblem(@Valid @RequestBody AfterSaleProblemSaveReqVO createReqVO) {
+ return success(problemService.createProblem(createReqVO, getLoginUserId()));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊鍞悗闂")
+ @PreAuthorize("@ss.hasPermission('aftersales:problem:update')")
+ public CommonResult<Boolean> updateProblem(@Valid @RequestBody AfterSaleProblemSaveReqVO updateReqVO) {
+ problemService.updateProblem(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎鍞悗闂")
+ @Parameter(name = "id", description = "闂缂栧彿", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('aftersales:problem:delete')")
+ public CommonResult<Boolean> deleteProblem(@RequestParam("id") Long id) {
+ problemService.deleteProblem(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱鍞悗闂")
+ @Parameter(name = "id", description = "闂缂栧彿", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('aftersales:problem:query')")
+ public CommonResult<AfterSaleProblemRespVO> getProblem(@RequestParam("id") Long id) {
+ AfterSaleProblemDO problemDO = problemService.getProblem(id);
+ AfterSaleProblemRespVO respVO = buildProblemDetailList(List.of(problemDO)).get(0);
+ respVO.setAttachmentList(storageAttachmentApi.listAttachments("aftersales_after_sale_problem", id));
+ return success(respVO);
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱鍞悗闂鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('aftersales:problem:query')")
+ public CommonResult<PageResult<AfterSaleProblemRespVO>> getProblemPage(@Valid AfterSaleProblemPageReqVO pageReqVO) {
+ PageResult<AfterSaleProblemDO> pageResult = problemService.getProblemPage(pageReqVO);
+ return success(new PageResult<>(buildProblemDetailList(pageResult.getList()), pageResult.getTotal()));
+ }
+
+ @PutMapping("/publish")
+ @Operation(summary = "鍙戝竷鍞悗闂")
+ @Parameter(name = "id", description = "闂缂栧彿", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('aftersales:problem:publish')")
+ public CommonResult<Boolean> publishProblem(@RequestParam("id") Long id) {
+ problemService.publishProblem(id);
+ return success(true);
+ }
+
+ @PutMapping("/disable")
+ @Operation(summary = "鍋滅敤鍞悗闂")
+ @Parameter(name = "id", description = "闂缂栧彿", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('aftersales:problem:disable')")
+ public CommonResult<Boolean> disableProblem(@RequestParam("id") Long id) {
+ problemService.disableProblem(id);
+ return success(true);
+ }
+
+ @GetMapping("/reference")
+ @Operation(summary = "鏂板伐鍗曞彈鐞嗗弬鑰冩绱�(宸插彂甯冮棶棰�)")
+ @PreAuthorize("@ss.hasPermission('aftersales:problem:query')")
+ public CommonResult<List<AfterSaleProblemRespVO>> getReferenceList(@Valid AfterSaleProblemPageReqVO pageReqVO) {
+ return success(buildProblemDetailList(problemService.getReferenceList(pageReqVO)));
+ }
+
+ // ========== 鍐呴儴鏂规硶锛氭壒閲忔嫾瑁呭叧鑱斿悕绉� ==========
+
+ private List<AfterSaleProblemRespVO> buildProblemDetailList(List<AfterSaleProblemDO> problemList) {
+ if (CollUtil.isEmpty(problemList)) {
+ return Collections.emptyList();
+ }
+ // 1. 鎵归噺鍔犺浇瀹㈡埛鍚嶇О
+ Set<Long> customerIds = convertSet(problemList, AfterSaleProblemDO::getCustomerId);
+ Map<Long, CrmCustomerRespDTO> customerMap = customerApi.getCustomerMap(customerIds);
+ // 2. 鎵归噺鍔犺浇娌夋穩浜哄悕绉�
+ Set<Long> userIds = convertSet(problemList, AfterSaleProblemDO::getOwnerUserId);
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
+ // 3. 鎷艰鍚嶇О瀛楁
+ return BeanUtils.toBean(problemList, AfterSaleProblemRespVO.class, vo -> {
+ CrmCustomerRespDTO customer = customerMap.get(vo.getCustomerId());
+ if (customer != null) {
+ vo.setCustomerName(customer.getName());
+ }
+ AdminUserRespDTO ownerUser = userMap.get(vo.getOwnerUserId());
+ if (ownerUser != null) {
+ vo.setOwnerUserName(ownerUser.getNickname());
+ }
+ });
+ }
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemPageReqVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemPageReqVO.java
new file mode 100644
index 0000000..55fc93a
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemPageReqVO.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * 鍞悗闂搴� - 鍒嗛〉鏌ヨ Request VO
+ */
+@Schema(description = "鍞悗闂搴� - 鍒嗛〉鏌ヨ Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class AfterSaleProblemPageReqVO extends PageParam {
+
+ @Schema(description = "闂鍗曞彿", example = "AP20260813000001")
+ private String no;
+
+ @Schema(description = "鍏抽敭瀛�(鍗曞彿/鏍囬/鎻忚堪/瑙e喅鏂规)", example = "浼犳劅鍣�")
+ private String keyword;
+
+ @Schema(description = "鏉ユ簮宸ュ崟缂栧彿", example = "1")
+ private Long sourceTicketId;
+
+ @Schema(description = "鐗╂枡缂栧彿", example = "1")
+ private Long itemId;
+
+ @Schema(description = "鐗╂枡缂栫爜(妯$硦)", example = "MAT-001")
+ private String itemCode;
+
+ @Schema(description = "闂鍒嗙被", example = "鍔熻兘鏁呴殰")
+ private String issueCategory;
+
+ @Schema(description = "闂绫诲瀷", example = "1")
+ private Integer issueType;
+
+ @Schema(description = "鏍瑰洜鍒嗙被", example = "3")
+ private Integer rootCauseCategory;
+
+ @Schema(description = "鐘舵��: 0-鑽夌 1-宸插彂甯� 2-宸插仠鐢�", example = "1")
+ private Integer status;
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemRespVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemRespVO.java
new file mode 100644
index 0000000..2d10593
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemRespVO.java
@@ -0,0 +1,104 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo;
+
+import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 鍞悗闂搴� - 鍝嶅簲 VO
+ */
+@Schema(description = "鍞悗闂搴� - 鍝嶅簲 VO")
+@Data
+public class AfterSaleProblemRespVO {
+
+ @Schema(description = "闂缂栧彿", example = "1")
+ private Long id;
+
+ @Schema(description = "闂鍗曞彿", example = "AP20260813000001")
+ private String no;
+
+ @Schema(description = "闂鏍囬", example = "鎷夊姏鏈轰紶鎰熷櫒鏃犺緭鍑�")
+ private String title;
+
+ @Schema(description = "鏉ユ簮宸ュ崟缂栧彿", example = "1")
+ private Long sourceTicketId;
+
+ @Schema(description = "鏉ユ簮宸ュ崟鍗曞彿(鍐椾綑)", example = "AS20260813000001")
+ private String sourceTicketNo;
+
+ @Schema(description = "瀹㈡埛缂栧彿", example = "1")
+ private Long customerId;
+
+ @Schema(description = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @Schema(description = "鐗╂枡缂栧彿", example = "1")
+ private Long itemId;
+
+ @Schema(description = "鐗╂枡缂栫爜", example = "MAT-001")
+ private String itemCode;
+
+ @Schema(description = "鐗╂枡鍚嶇О", example = "鐢靛瓙鍏冨櫒浠�")
+ private String itemName;
+
+ @Schema(description = "鐢熶骇鎵规缂栧彿", example = "1")
+ private Long batchId;
+
+ @Schema(description = "鐢熶骇鎵规鍙�", example = "BATCH-2024-001")
+ private String batchCode;
+
+ @Schema(description = "闂绫诲瀷", example = "1")
+ private Integer issueType;
+
+ @Schema(description = "闂鍒嗙被", example = "鍔熻兘鏁呴殰")
+ private String issueCategory;
+
+ @Schema(description = "涓ラ噸绋嬪害", example = "2")
+ private Integer severityLevel;
+
+ @Schema(description = "闂鎻忚堪")
+ private String description;
+
+ @Schema(description = "鏍瑰洜鍒嗙被", example = "3")
+ private Integer rootCauseCategory;
+
+ @Schema(description = "鏍瑰洜鍒嗘瀽")
+ private String rootCause;
+
+ @Schema(description = "瑙e喅鏂规")
+ private String solution;
+
+ @Schema(description = "鐘舵��: 0-鑽夌 1-宸插彂甯� 2-宸插仠鐢�", example = "1")
+ private Integer status;
+
+ @Schema(description = "娌夋穩浜虹敤鎴风紪鍙�", example = "1")
+ private Long ownerUserId;
+
+ @Schema(description = "娌夋穩浜哄悕绉�")
+ private String ownerUserName;
+
+ @Schema(description = "鍙戝竷鏃堕棿")
+ private LocalDateTime publishTime;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鑰�")
+ private String creator;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ @Schema(description = "鏇存柊鑰�")
+ private String updater;
+
+ @Schema(description = "鏇存柊鏃堕棿")
+ private LocalDateTime updateTime;
+
+ @Schema(description = "闄勪欢鍒楄〃")
+ private List<StorageBlobRespDTO> attachmentList;
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemSaveReqVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemSaveReqVO.java
new file mode 100644
index 0000000..46ea45b
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemSaveReqVO.java
@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍞悗闂搴� - 淇濆瓨 Request VO
+ */
+@Schema(description = "鍞悗闂搴� - 淇濆瓨 Request VO")
+@Data
+public class AfterSaleProblemSaveReqVO {
+
+ @Schema(description = "闂缂栧彿", example = "1")
+ private Long id;
+
+ @Schema(description = "闂鏍囬", requiredMode = Schema.RequiredMode.REQUIRED, example = "鎷夊姏鏈轰紶鎰熷櫒鏃犺緭鍑�")
+ @NotEmpty(message = "闂鏍囬涓嶈兘涓虹┖")
+ private String title;
+
+ @Schema(description = "鏉ユ簮宸ュ崟缂栧彿(鍙�夛紝渚夸簬杩芥函)", example = "1")
+ private Long sourceTicketId;
+
+ @Schema(description = "瀹㈡埛缂栧彿", example = "1")
+ private Long customerId;
+
+ @Schema(description = "鐗╂枡缂栧彿", example = "1")
+ private Long itemId;
+
+ @Schema(description = "鐗╂枡缂栫爜", example = "MAT-001")
+ private String itemCode;
+
+ @Schema(description = "鐗╂枡鍚嶇О", example = "鐢靛瓙鍏冨櫒浠�")
+ private String itemName;
+
+ @Schema(description = "鐢熶骇鎵规缂栧彿", example = "1")
+ private Long batchId;
+
+ @Schema(description = "鐢熶骇鎵规鍙�", example = "BATCH-2024-001")
+ private String batchCode;
+
+ @Schema(description = "闂绫诲瀷: 0-鏈垽瀹� 1-涓�鑸棶棰� 2-缁翠慨闂 3-閫�璐ч棶棰�", example = "1")
+ private Integer issueType;
+
+ @Schema(description = "闂鍒嗙被", example = "鍔熻兘鏁呴殰")
+ private String issueCategory;
+
+ @Schema(description = "涓ラ噸绋嬪害: 0-杞诲井 1-涓�鑸� 2-涓ラ噸 3-鑷村懡", example = "2")
+ private Integer severityLevel;
+
+ @Schema(description = "闂鎻忚堪")
+ private String description;
+
+ @Schema(description = "鏍瑰洜鍒嗙被: 1-璁捐 2-鐗╂枡 3-宸ヨ壓 4-瑁呴厤 5-杩愯緭 6-鍖呰 7-浣跨敤 8-杞欢 9-鍏朵粬", example = "3")
+ private Integer rootCauseCategory;
+
+ @Schema(description = "鏍瑰洜鍒嗘瀽")
+ private String rootCause;
+
+ @Schema(description = "瑙e喅鏂规")
+ private String solution;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "闄勪欢 blobId 鍒楄〃")
+ private List<Long> blobIds;
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/AfterSaleVisitController.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/AfterSaleVisitController.java
new file mode 100644
index 0000000..e168ea8
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/AfterSaleVisitController.java
@@ -0,0 +1,96 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.visit;
+
+import cn.hutool.core.collection.CollUtil;
+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.aftersales.controller.admin.visit.vo.AfterSaleVisitCreateReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo.AfterSaleVisitPageReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo.AfterSaleVisitRespVO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.visit.AfterSaleVisitDO;
+import cn.iocoder.yudao.module.aftersales.service.visit.AfterSaleVisitService;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+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.*;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+@Tag(name = "绠$悊鍚庡彴 - 鍞悗鍥炶璁板綍")
+@RestController
+@RequestMapping("/aftersales/visit")
+@Validated
+public class AfterSaleVisitController {
+
+ @Resource
+ private AfterSaleVisitService visitService;
+
+ @Resource
+ private AdminUserApi adminUserApi;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
+
+ @PostMapping("/create")
+ @Operation(summary = "鐧昏鍞悗鍥炶")
+ @PreAuthorize("@ss.hasPermission('aftersales:visit:create')")
+ public CommonResult<Long> createVisit(@Valid @RequestBody AfterSaleVisitCreateReqVO createReqVO) {
+ return success(visitService.createVisit(createReqVO, getLoginUserId()));
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱鍞悗鍥炶璁板綍")
+ @Parameter(name = "id", description = "鍥炶璁板綍缂栧彿", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('aftersales:visit:query')")
+ public CommonResult<AfterSaleVisitRespVO> getVisit(@RequestParam("id") Long id) {
+ AfterSaleVisitDO visitDO = visitService.getVisit(id);
+ AfterSaleVisitRespVO respVO = buildVisitDetailList(List.of(visitDO)).get(0);
+ respVO.setAttachmentList(storageAttachmentApi.listAttachments("aftersales_after_sale_visit", id));
+ return success(respVO);
+ }
+
+ @GetMapping("/list")
+ @Operation(summary = "鑾峰緱鏌愬伐鍗曠殑鍥炶璁板綍鍒楄〃")
+ @Parameter(name = "ticketId", description = "宸ュ崟缂栧彿", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('aftersales:visit:query')")
+ public CommonResult<List<AfterSaleVisitRespVO>> getVisitListByTicketId(@RequestParam("ticketId") Long ticketId) {
+ List<AfterSaleVisitDO> visitList = visitService.getVisitListByTicketId(ticketId);
+ return success(buildVisitDetailList(visitList));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱鍞悗鍥炶璁板綍鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('aftersales:visit:query')")
+ public CommonResult<PageResult<AfterSaleVisitRespVO>> getVisitPage(@Valid AfterSaleVisitPageReqVO pageReqVO) {
+ PageResult<AfterSaleVisitDO> pageResult = visitService.getVisitPage(pageReqVO);
+ return success(new PageResult<>(buildVisitDetailList(pageResult.getList()), pageResult.getTotal()));
+ }
+
+ // ========== 鍐呴儴鏂规硶锛氭壒閲忔嫾瑁呭叧鑱斿悕绉� ==========
+
+ private List<AfterSaleVisitRespVO> buildVisitDetailList(List<AfterSaleVisitDO> visitList) {
+ if (CollUtil.isEmpty(visitList)) {
+ return Collections.emptyList();
+ }
+ // 鎵归噺鍔犺浇鍥炶浜哄悕绉�
+ Set<Long> userIds = convertSet(visitList, AfterSaleVisitDO::getVisitorUserId);
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
+ return BeanUtils.toBean(visitList, AfterSaleVisitRespVO.class, vo -> {
+ AdminUserRespDTO visitorUser = userMap.get(vo.getVisitorUserId());
+ if (visitorUser != null) {
+ vo.setVisitorUserName(visitorUser.getNickname());
+ }
+ });
+ }
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitCreateReqVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitCreateReqVO.java
new file mode 100644
index 0000000..423fc34
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitCreateReqVO.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍞悗鍥炶璁板綍 - 鐧昏 Request VO
+ */
+@Schema(description = "鍞悗鍥炶璁板綍 - 鐧昏 Request VO")
+@Data
+public class AfterSaleVisitCreateReqVO {
+
+ @Schema(description = "宸ュ崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "宸ュ崟涓嶈兘涓虹┖")
+ private Long ticketId;
+
+ @Schema(description = "鍥炶鏂瑰紡: 0-鐢佃瘽 1-涓婇棬 2-杩滅▼ 3-鍏朵粬", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
+ @NotNull(message = "鍥炶鏂瑰紡涓嶈兘涓虹┖")
+ private Integer visitType;
+
+ @Schema(description = "鍥炶鍐呭", example = "瀹㈡埛鍙嶉宸叉甯镐娇鐢�")
+ private String content;
+
+ @Schema(description = "鏄惁婊℃剰", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+ @NotNull(message = "鏄惁婊℃剰涓嶈兘涓虹┖")
+ private Boolean satisfied;
+
+ @Schema(description = "闂鏄惁澶嶅彂", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
+ @NotNull(message = "闂鏄惁澶嶅彂涓嶈兘涓虹┖")
+ private Boolean recurred;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "闄勪欢 blobId 鍒楄〃")
+ private List<Long> blobIds;
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitPageReqVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitPageReqVO.java
new file mode 100644
index 0000000..627cf22
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitPageReqVO.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * 鍞悗鍥炶璁板綍 - 鍒嗛〉鏌ヨ Request VO
+ */
+@Schema(description = "鍞悗鍥炶璁板綍 - 鍒嗛〉鏌ヨ Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class AfterSaleVisitPageReqVO extends PageParam {
+
+ @Schema(description = "宸ュ崟缂栧彿", example = "1")
+ private Long ticketId;
+
+ @Schema(description = "鍥炶鏂瑰紡", example = "0")
+ private Integer visitType;
+
+ @Schema(description = "鏄惁婊℃剰", example = "true")
+ private Boolean satisfied;
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitRespVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitRespVO.java
new file mode 100644
index 0000000..9299605
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/visit/vo/AfterSaleVisitRespVO.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo;
+
+import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 鍞悗鍥炶璁板綍 - 鍝嶅簲 VO
+ */
+@Schema(description = "鍞悗鍥炶璁板綍 - 鍝嶅簲 VO")
+@Data
+public class AfterSaleVisitRespVO {
+
+ @Schema(description = "鍥炶璁板綍缂栧彿", example = "1")
+ private Long id;
+
+ @Schema(description = "宸ュ崟缂栧彿", example = "1")
+ private Long ticketId;
+
+ @Schema(description = "鍥炶鏂瑰紡: 0-鐢佃瘽 1-涓婇棬 2-杩滅▼ 3-鍏朵粬", example = "0")
+ private Integer visitType;
+
+ @Schema(description = "鍥炶浜虹敤鎴风紪鍙�", example = "1")
+ private Long visitorUserId;
+
+ @Schema(description = "鍥炶浜哄悕绉�")
+ private String visitorUserName;
+
+ @Schema(description = "鍥炶鍐呭")
+ private String content;
+
+ @Schema(description = "鏄惁婊℃剰", example = "true")
+ private Boolean satisfied;
+
+ @Schema(description = "闂鏄惁澶嶅彂", example = "false")
+ private Boolean recurred;
+
+ @Schema(description = "鍥炶鏃堕棿")
+ private LocalDateTime visitTime;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鑰�")
+ private String creator;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ @Schema(description = "闄勪欢鍒楄〃")
+ private List<StorageBlobRespDTO> attachmentList;
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/problem/AfterSaleProblemDO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/problem/AfterSaleProblemDO.java
new file mode 100644
index 0000000..dfd6b07
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/problem/AfterSaleProblemDO.java
@@ -0,0 +1,118 @@
+package cn.iocoder.yudao.module.aftersales.dal.dataobject.problem;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.aftersales.enums.AfterSaleProblemStatusEnum;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * 鍞悗闂搴� DO
+ * <p>
+ * 鐙珛鐨勭煡璇嗘矇娣�瀹炰綋锛氬伐鍗曞綊妗f椂鎸夊伐鍗曞揩鐓ц嚜鍔ㄧ敓鎴愯崏绋匡紝浜哄伐琛ュ厖鏍瑰洜/鏂规鍚庡彂甯冿紱
+ * 鏂板伐鍗曞彈鐞嗘椂鍙寜鐗╂枡/鍒嗙被/鍏抽敭瀛楀懡涓凡鍙戝竷闂浣滃弬鑰冦��
+ */
+@TableName("after_sale_problem")
+@KeySequence("after_sale_problem_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AfterSaleProblemDO extends BaseDO {
+
+ /**
+ * 闂缂栧彿
+ */
+ @TableId
+ private Long id;
+ /**
+ * 闂鍗曞彿锛屾牸寮� AP+yyyyMMdd+6浣�
+ */
+ private String no;
+ /**
+ * 闂鏍囬
+ */
+ private String title;
+ /**
+ * 鏉ユ簮宸ュ崟缂栧彿锛屽叧鑱� after_sale_ticket.id
+ */
+ private Long sourceTicketId;
+ /**
+ * 鏉ユ簮宸ュ崟鍗曞彿(鍐椾綑)
+ */
+ private String sourceTicketNo;
+ /**
+ * 瀹㈡埛缂栧彿(鏉ユ簮宸ュ崟甯﹀叆)
+ */
+ private Long customerId;
+ /**
+ * 鐗╂枡缂栧彿(榛樿鍙栨潵婧愬伐鍗曢鏉℃槑缁�)
+ */
+ private Long itemId;
+ /**
+ * 鐗╂枡缂栫爜(鍐椾綑)
+ */
+ private String itemCode;
+ /**
+ * 鐗╂枡鍚嶇О(鍐椾綑)
+ */
+ private String itemName;
+ /**
+ * 鐢熶骇鎵规缂栧彿(鍙��)
+ */
+ private Long batchId;
+ /**
+ * 鐢熶骇鎵规鍙�(鍙��)
+ */
+ private String batchCode;
+ /**
+ * 闂绫诲瀷锛屾灇涓� {@link cn.iocoder.yudao.module.aftersales.enums.AfterSaleIssueTypeEnum}
+ */
+ private Integer issueType;
+ /**
+ * 闂鍒嗙被
+ */
+ private String issueCategory;
+ /**
+ * 涓ラ噸绋嬪害: 0-杞诲井 1-涓�鑸� 2-涓ラ噸 3-鑷村懡
+ */
+ private Integer severityLevel;
+ /**
+ * 闂鎻忚堪
+ */
+ private String description;
+ /**
+ * 鏍瑰洜鍒嗙被锛屾灇涓� {@link cn.iocoder.yudao.module.aftersales.enums.AfterSaleRootCauseCategoryEnum}
+ */
+ private Integer rootCauseCategory;
+ /**
+ * 鏍瑰洜鍒嗘瀽
+ */
+ private String rootCause;
+ /**
+ * 瑙e喅鏂规
+ */
+ private String solution;
+ /**
+ * 鐘舵�侊紝鏋氫妇 {@link AfterSaleProblemStatusEnum}
+ */
+ private Integer status;
+ /**
+ * 娌夋穩浜虹敤鎴风紪鍙�
+ */
+ private Long ownerUserId;
+ /**
+ * 鍙戝竷鏃堕棿
+ */
+ private LocalDateTime publishTime;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java
index a2eee67..c546553 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java
@@ -112,5 +112,33 @@
* 澶囨敞
*/
private String remark;
+ /**
+ * 鍥炶鐘舵��
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.aftersales.enums.AfterSaleVisitStatusEnum}
+ */
+ private Integer visitStatus;
+ /**
+ * 鏈�鍚庡洖璁挎椂闂�
+ */
+ private LocalDateTime lastVisitTime;
+ /**
+ * 鏈�鍚庡洖璁挎槸鍚︽弧鎰�
+ */
+ private Boolean lastVisitSatisfied;
+ /**
+ * 鏈�鍚庡洖璁挎槸鍚﹀鍙�
+ */
+ private Boolean lastVisitRecurred;
+ /**
+ * 鍏宠仈闂璁板綍缂栧彿
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.aftersales.dal.dataobject.problem.AfterSaleProblemDO#getId()}
+ */
+ private Long problemId;
+ /**
+ * 鍏宠仈闂鍗曞彿
+ */
+ private String problemNo;
}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/visit/AfterSaleVisitDO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/visit/AfterSaleVisitDO.java
new file mode 100644
index 0000000..87b5363
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/visit/AfterSaleVisitDO.java
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.aftersales.dal.dataobject.visit;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * 鍞悗鍥炶璁板綍 DO
+ * <p>
+ * 鎸傚湪鍞悗宸ュ崟涓嬬殑鍥炶瀛愯褰曪紝鍙鏉★紱鐧昏鍥炶鏃跺悓姝ユ帹杩涘伐鍗曞洖璁跨姸鎬併��
+ */
+@TableName("after_sale_visit")
+@KeySequence("after_sale_visit_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AfterSaleVisitDO extends BaseDO {
+
+ /**
+ * 鍥炶璁板綍缂栧彿
+ */
+ @TableId
+ private Long id;
+ /**
+ * 宸ュ崟缂栧彿锛屽叧鑱� after_sale_ticket.id
+ */
+ private Long ticketId;
+ /**
+ * 鍥炶鏂瑰紡: 0-鐢佃瘽 1-涓婇棬 2-杩滅▼ 3-鍏朵粬
+ */
+ private Integer visitType;
+ /**
+ * 鍥炶浜虹敤鎴风紪鍙�
+ */
+ private Long visitorUserId;
+ /**
+ * 鍥炶鍐呭
+ */
+ private String content;
+ /**
+ * 鏄惁婊℃剰: 0-鍚� 1-鏄�
+ */
+ @TableField("is_satisfied")
+ private Boolean satisfied;
+ /**
+ * 闂鏄惁澶嶅彂: 0-鍚� 1-鏄�
+ */
+ @TableField("is_recurred")
+ private Boolean recurred;
+ /**
+ * 鍥炶鏃堕棿(鐧昏鍗冲綋鏃�)
+ */
+ private LocalDateTime visitTime;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/problem/AfterSaleProblemMapper.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/problem/AfterSaleProblemMapper.java
new file mode 100644
index 0000000..db9efec
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/problem/AfterSaleProblemMapper.java
@@ -0,0 +1,101 @@
+package cn.iocoder.yudao.module.aftersales.dal.mysql.problem;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+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.aftersales.dal.dataobject.problem.AfterSaleProblemDO;
+import cn.iocoder.yudao.module.aftersales.enums.AfterSaleProblemStatusEnum;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鍞悗闂搴� Mapper
+ */
+@Mapper
+public interface AfterSaleProblemMapper extends BaseMapperX<AfterSaleProblemDO> {
+
+ default AfterSaleProblemDO selectByNo(String no) {
+ return selectOne(AfterSaleProblemDO::getNo, no);
+ }
+
+ default AfterSaleProblemDO selectBySourceTicketId(Long sourceTicketId) {
+ return selectOne(AfterSaleProblemDO::getSourceTicketId, sourceTicketId);
+ }
+
+ default PageResult<AfterSaleProblemDO> selectPage(PageParam pageParam, String no, String keyword,
+ Long sourceTicketId, Long itemId, String itemCode,
+ String issueCategory,
+ Integer issueType, Integer rootCauseCategory, Integer status) {
+ LambdaQueryWrapperX<AfterSaleProblemDO> query = new LambdaQueryWrapperX<AfterSaleProblemDO>()
+ .eqIfPresent(AfterSaleProblemDO::getNo, no)
+ .eqIfPresent(AfterSaleProblemDO::getSourceTicketId, sourceTicketId)
+ .eqIfPresent(AfterSaleProblemDO::getItemId, itemId)
+ .likeIfPresent(AfterSaleProblemDO::getItemCode, itemCode)
+ .eqIfPresent(AfterSaleProblemDO::getIssueCategory, issueCategory)
+ .eqIfPresent(AfterSaleProblemDO::getIssueType, issueType)
+ .eqIfPresent(AfterSaleProblemDO::getRootCauseCategory, rootCauseCategory)
+ .eqIfPresent(AfterSaleProblemDO::getStatus, status);
+ // 鍏抽敭瀛楁绱細鍗曞彿/鏍囬/鎻忚堪/瑙e喅鏂规
+ if (StrUtil.isNotBlank(keyword)) {
+ query.and(w -> w.like(AfterSaleProblemDO::getNo, keyword)
+ .or().like(AfterSaleProblemDO::getTitle, keyword)
+ .or().like(AfterSaleProblemDO::getDescription, keyword)
+ .or().like(AfterSaleProblemDO::getSolution, keyword));
+ }
+ query.orderByDesc(AfterSaleProblemDO::getUpdateTime);
+ return selectPage(pageParam, query);
+ }
+
+ /**
+ * 鏂板伐鍗曞彈鐞嗗弬鑰冩绱細鍙繑鍥炲凡鍙戝竷锛屾寜鐗╂枡/鍒嗙被/鍏抽敭瀛楀懡涓紝鍙栨渶杩戞洿鏂� 10 鏉�
+ */
+ default List<AfterSaleProblemDO> selectReferenceList(Long itemId, String issueCategory, Integer issueType,
+ Integer rootCauseCategory, String keyword) {
+ LambdaQueryWrapperX<AfterSaleProblemDO> query = new LambdaQueryWrapperX<AfterSaleProblemDO>()
+ .eq(AfterSaleProblemDO::getStatus, AfterSaleProblemStatusEnum.PUBLISHED.getStatus());
+ query.and(w -> {
+ boolean hasCond = false;
+ if (itemId != null) {
+ w.eq(AfterSaleProblemDO::getItemId, itemId);
+ hasCond = true;
+ }
+ if (StrUtil.isNotBlank(issueCategory)) {
+ if (hasCond) {
+ w.or();
+ }
+ w.eq(AfterSaleProblemDO::getIssueCategory, issueCategory);
+ hasCond = true;
+ }
+ if (issueType != null) {
+ if (hasCond) {
+ w.or();
+ }
+ w.eq(AfterSaleProblemDO::getIssueType, issueType);
+ hasCond = true;
+ }
+ if (rootCauseCategory != null) {
+ if (hasCond) {
+ w.or();
+ }
+ w.eq(AfterSaleProblemDO::getRootCauseCategory, rootCauseCategory);
+ hasCond = true;
+ }
+ if (StrUtil.isNotBlank(keyword)) {
+ if (hasCond) {
+ w.or();
+ }
+ w.like(AfterSaleProblemDO::getTitle, keyword);
+ hasCond = true;
+ }
+ if (!hasCond) {
+ w.eq(AfterSaleProblemDO::getId, -1L); // 鏃犳潯浠舵椂杩斿洖绌猴紝閬垮厤鍏ㄨ〃鎷夊彇
+ }
+ });
+ query.orderByDesc(AfterSaleProblemDO::getUpdateTime).last("LIMIT 10");
+ return selectList(query);
+ }
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/visit/AfterSaleVisitMapper.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/visit/AfterSaleVisitMapper.java
new file mode 100644
index 0000000..060adcb
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/visit/AfterSaleVisitMapper.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.aftersales.dal.mysql.visit;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+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.aftersales.dal.dataobject.visit.AfterSaleVisitDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鍞悗鍥炶璁板綍 Mapper
+ */
+@Mapper
+public interface AfterSaleVisitMapper extends BaseMapperX<AfterSaleVisitDO> {
+
+ default List<AfterSaleVisitDO> selectListByTicketId(Long ticketId) {
+ return selectList(new LambdaQueryWrapperX<AfterSaleVisitDO>()
+ .eq(AfterSaleVisitDO::getTicketId, ticketId)
+ .orderByDesc(AfterSaleVisitDO::getVisitTime));
+ }
+
+ default PageResult<AfterSaleVisitDO> selectPage(PageParam pageParam, Long ticketId, Integer visitType,
+ Boolean satisfied) {
+ return selectPage(pageParam, new LambdaQueryWrapperX<AfterSaleVisitDO>()
+ .eqIfPresent(AfterSaleVisitDO::getTicketId, ticketId)
+ .eqIfPresent(AfterSaleVisitDO::getVisitType, visitType)
+ .eqIfPresent(AfterSaleVisitDO::getSatisfied, satisfied)
+ .orderByDesc(AfterSaleVisitDO::getVisitTime));
+ }
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java
index 856c862..85cf24a 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java
@@ -26,6 +26,11 @@
*/
public static final String RETURN_NO_PREFIX = "RT";
+ /**
+ * 闂璁板綍缂栧彿鍓嶇紑
+ */
+ public static final String PROBLEM_NO_PREFIX = "AP";
+
@Resource
private StringRedisTemplate stringRedisTemplate;
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleProblemStatusEnum.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleProblemStatusEnum.java
new file mode 100644
index 0000000..c90eb7e
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleProblemStatusEnum.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.aftersales.enums;
+
+import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 鍞悗闂搴撶姸鎬佹灇涓�
+ */
+@Getter
+@AllArgsConstructor
+public enum AfterSaleProblemStatusEnum implements ArrayValuable<Integer> {
+
+ DRAFT(0, "鑽夌"),
+ PUBLISHED(1, "宸插彂甯�"),
+ DISABLED(2, "宸插仠鐢�");
+
+ public static final Integer[] ARRAYS = Arrays.stream(values()).map(AfterSaleProblemStatusEnum::getStatus).toArray(Integer[]::new);
+
+ /**
+ * 闂鐘舵��
+ */
+ private final Integer status;
+ /**
+ * 闂鐘舵�佸悕绉�
+ */
+ private final String name;
+
+ @Override
+ public Integer[] array() {
+ return ARRAYS;
+ }
+
+ public static String getNameByStatus(Integer status) {
+ return Arrays.stream(values())
+ .filter(item -> item.getStatus().equals(status))
+ .map(AfterSaleProblemStatusEnum::getName)
+ .findFirst().orElse(null);
+ }
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleVisitStatusEnum.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleVisitStatusEnum.java
new file mode 100644
index 0000000..8c08872
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleVisitStatusEnum.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.aftersales.enums;
+
+import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 鍞悗宸ュ崟鍥炶鐘舵�佹灇涓�
+ * <p>
+ * 宸ュ崟瀹岀粨(COMPLETED)鍚庤繘鍏ャ�屽緟鍥炶銆嶏紱鐧昏銆屾弧鎰忎笖鏈鍙戙�嶇殑鍥炶鍚庣疆涓恒�屽凡鍥炶閫氳繃銆嶏紝鏂瑰彲褰掓。銆�
+ */
+@Getter
+@AllArgsConstructor
+public enum AfterSaleVisitStatusEnum implements ArrayValuable<Integer> {
+
+ WAITING(0, "寰呭洖璁�"),
+ PASSED(1, "宸插洖璁块�氳繃");
+
+ public static final Integer[] ARRAYS = Arrays.stream(values()).map(AfterSaleVisitStatusEnum::getStatus).toArray(Integer[]::new);
+
+ /**
+ * 鍥炶鐘舵��
+ */
+ private final Integer status;
+ /**
+ * 鍥炶鐘舵�佸悕绉�
+ */
+ private final String name;
+
+ @Override
+ public Integer[] array() {
+ return ARRAYS;
+ }
+
+ public static String getNameByStatus(Integer status) {
+ return Arrays.stream(values())
+ .filter(item -> item.getStatus().equals(status))
+ .map(AfterSaleVisitStatusEnum::getName)
+ .findFirst().orElse(null);
+ }
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
index 7e73cf9..48fe34b 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
@@ -52,4 +52,16 @@
ErrorCode COMPENSATION_AUDIT_REJECT_REASON_REQUIRED = new ErrorCode(1_022_004_006, "瀹℃牳涓嶉�氳繃鏃跺繀椤诲~鍐欎笉閫氳繃鍘熷洜");
ErrorCode COMPENSATION_UPDATE_FAIL_NOT_EDITABLE = new ErrorCode(1_022_004_007, "鍙湁鏈彁浜ゆ垨瀹℃牳涓嶉�氳繃鐘舵�佺殑璧斾粯鍗曟墠鑳戒慨鏀�");
+ // ========== 鍞悗鏈嶅姟-闂璁板綍锛�1-022-005-000锛� ==========
+ ErrorCode PROBLEM_NOT_EXISTS = new ErrorCode(1_022_005_000, "闂璁板綍涓嶅瓨鍦�");
+ ErrorCode PROBLEM_NO_EXISTS = new ErrorCode(1_022_005_001, "闂鍗曞彿閲嶅锛岃閲嶈瘯");
+ ErrorCode PROBLEM_UPDATE_FAIL_STATUS = new ErrorCode(1_022_005_002, "闂淇敼澶辫触锛屽師鍥狅細浠呰崏绋跨姸鎬佸彲缂栬緫");
+ ErrorCode PROBLEM_DELETE_FAIL_STATUS = new ErrorCode(1_022_005_003, "闂鍒犻櫎澶辫触锛屽師鍥狅細浠呰崏绋跨姸鎬佸彲鍒犻櫎");
+ ErrorCode PROBLEM_PUBLISH_FAIL_STATUS = new ErrorCode(1_022_005_004, "闂鍙戝竷澶辫触锛屽師鍥狅細褰撳墠鐘舵�佷笉鍙彂甯�");
+ ErrorCode PROBLEM_DISABLE_FAIL_STATUS = new ErrorCode(1_022_005_005, "闂鍋滅敤澶辫触锛屽師鍥狅細褰撳墠鐘舵�佷笉鍙仠鐢�");
+
+ // ========== 鍞悗鏈嶅姟-鍥炶锛�1-022-006-000锛� ==========
+ ErrorCode VISIT_NOT_EXISTS = new ErrorCode(1_022_006_000, "鍥炶璁板綍涓嶅瓨鍦�");
+ ErrorCode VISIT_CREATE_FAIL_STATUS = new ErrorCode(1_022_006_001, "鐧昏鍥炶澶辫触锛屽師鍥狅細宸ュ崟涓嶆槸宸插畬缁�(寰呭洖璁�)鐘舵��");
+
}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemService.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemService.java
new file mode 100644
index 0000000..3decdb2
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemService.java
@@ -0,0 +1,95 @@
+package cn.iocoder.yudao.module.aftersales.service.problem;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo.AfterSaleProblemPageReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo.AfterSaleProblemSaveReqVO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.problem.AfterSaleProblemDO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
+import jakarta.validation.Valid;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 鍞悗闂搴� Service 鎺ュ彛
+ */
+public interface AfterSaleProblemService {
+
+ /**
+ * 鍒涘缓闂(浜哄伐寤烘。)锛屽垵濮嬬姸鎬佽崏绋�
+ *
+ * @param createReqVO 鍒涘缓淇℃伅
+ * @param userId 褰撳墠鐢ㄦ埛缂栧彿(娌夋穩浜�)
+ * @return 闂缂栧彿
+ */
+ Long createProblem(@Valid AfterSaleProblemSaveReqVO createReqVO, Long userId);
+
+ /**
+ * 鏇存柊闂
+ *
+ * @param updateReqVO 鏇存柊淇℃伅
+ */
+ void updateProblem(@Valid AfterSaleProblemSaveReqVO updateReqVO);
+
+ /**
+ * 鍒犻櫎闂(浠呰崏绋�)
+ *
+ * @param id 闂缂栧彿
+ */
+ void deleteProblem(Long id);
+
+ /**
+ * 鑾峰緱闂
+ *
+ * @param id 闂缂栧彿
+ * @return 闂
+ */
+ AfterSaleProblemDO getProblem(Long id);
+
+ /**
+ * 鑾峰緱闂鍒楄〃
+ *
+ * @param ids 缂栧彿鍒楄〃
+ * @return 闂鍒楄〃
+ */
+ List<AfterSaleProblemDO> getProblemList(Collection<Long> ids);
+
+ /**
+ * 鑾峰緱闂鍒嗛〉
+ *
+ * @param pageReqVO 鍒嗛〉鏌ヨ
+ * @return 闂鍒嗛〉
+ */
+ PageResult<AfterSaleProblemDO> getProblemPage(AfterSaleProblemPageReqVO pageReqVO);
+
+ /**
+ * 鍙戝竷闂
+ *
+ * @param id 闂缂栧彿
+ */
+ void publishProblem(Long id);
+
+ /**
+ * 鍋滅敤闂
+ *
+ * @param id 闂缂栧彿
+ */
+ void disableProblem(Long id);
+
+ /**
+ * 鏂板伐鍗曞彈鐞嗗弬鑰冩绱細鍛戒腑宸插彂甯冨巻鍙查棶棰�
+ *
+ * @param pageReqVO 鍙傝�冩绱㈡潯浠�(鍙� itemId/issueCategory/issueType/rootCauseCategory/keyword)
+ * @return 宸插彂甯冮棶棰樺垪琛�(鑷冲10鏉�)
+ */
+ List<AfterSaleProblemDO> getReferenceList(AfterSaleProblemPageReqVO pageReqVO);
+
+ /**
+ * 宸ュ崟褰掓。鏃惰嚜鍔ㄦ矇娣�闂(鑽夌鎬�)锛涘悓涓�宸ュ崟浠呮矇娣�涓�娆�(骞傜瓑)
+ *
+ * @param ticket 鍞悗宸ュ崟
+ * @return 娌夋穩鍑虹殑闂
+ */
+ AfterSaleProblemDO createProblemFromTicket(AfterSaleTicketDO ticket);
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemServiceImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemServiceImpl.java
new file mode 100644
index 0000000..022162b
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemServiceImpl.java
@@ -0,0 +1,211 @@
+package cn.iocoder.yudao.module.aftersales.service.problem;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo.AfterSaleProblemPageReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo.AfterSaleProblemSaveReqVO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.problem.AfterSaleProblemDO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketItemDO;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.problem.AfterSaleProblemMapper;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.ticket.AfterSaleTicketItemMapper;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.ticket.AfterSaleTicketMapper;
+import cn.iocoder.yudao.module.aftersales.dal.redis.no.AfterSaleNoRedisDAO;
+import cn.iocoder.yudao.module.aftersales.enums.AfterSaleProblemStatusEnum;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.module.aftersales.enums.ErrorCodeConstants.*;
+
+/**
+ * 鍞悗闂搴� Service 瀹炵幇绫�
+ */
+@Service
+@Validated
+@Slf4j
+public class AfterSaleProblemServiceImpl implements AfterSaleProblemService {
+
+ @Resource
+ private AfterSaleProblemMapper problemMapper;
+ @Resource
+ private AfterSaleTicketMapper ticketMapper;
+ @Resource
+ private AfterSaleTicketItemMapper ticketItemMapper;
+ @Resource
+ private AfterSaleNoRedisDAO noRedisDAO;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createProblem(AfterSaleProblemSaveReqVO createReqVO, Long userId) {
+ AfterSaleProblemDO problem = BeanUtils.toBean(createReqVO, AfterSaleProblemDO.class);
+ // 鏉ユ簮宸ュ崟瀛樺湪鏃惰ˉ鍏ㄥ啑浣欏崟鍙蜂笌榛樿瀹㈡埛
+ if (createReqVO.getSourceTicketId() != null) {
+ AfterSaleTicketDO ticket = ticketMapper.selectById(createReqVO.getSourceTicketId());
+ if (ticket == null) {
+ throw exception(TICKET_NOT_EXISTS);
+ }
+ problem.setSourceTicketNo(ticket.getNo());
+ if (problem.getCustomerId() == null) {
+ problem.setCustomerId(ticket.getCustomerId());
+ }
+ }
+ problem.setNo(generateNo())
+ .setStatus(AfterSaleProblemStatusEnum.DRAFT.getStatus())
+ .setOwnerUserId(userId);
+ problemMapper.insert(problem);
+ // 缁戝畾闄勪欢
+ if (CollUtil.isNotEmpty(createReqVO.getBlobIds())) {
+ storageAttachmentApi.bindAttachments("file", "aftersales_after_sale_problem",
+ problem.getId(), createReqVO.getBlobIds());
+ }
+ return problem.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateProblem(AfterSaleProblemSaveReqVO updateReqVO) {
+ AfterSaleProblemDO problem = validateProblemExists(updateReqVO.getId());
+ if (!AfterSaleProblemStatusEnum.DRAFT.getStatus().equals(problem.getStatus())) {
+ throw exception(PROBLEM_UPDATE_FAIL_STATUS);
+ }
+ AfterSaleProblemDO update = BeanUtils.toBean(updateReqVO, AfterSaleProblemDO.class);
+ problemMapper.updateById(update);
+ if (CollUtil.isNotEmpty(updateReqVO.getBlobIds())) {
+ storageAttachmentApi.updateAttachments("file", "aftersales_after_sale_problem",
+ updateReqVO.getId(), updateReqVO.getBlobIds());
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteProblem(Long id) {
+ AfterSaleProblemDO problem = validateProblemExists(id);
+ if (!AfterSaleProblemStatusEnum.DRAFT.getStatus().equals(problem.getStatus())) {
+ throw exception(PROBLEM_DELETE_FAIL_STATUS);
+ }
+ problemMapper.deleteById(id);
+ storageAttachmentApi.deleteAttachmentsByRecord("aftersales_after_sale_problem", id);
+ // 瑙i櫎宸ュ崟瀵归棶棰樼殑鍏宠仈
+ ticketMapper.update(null, new LambdaUpdateWrapper<AfterSaleTicketDO>()
+ .eq(AfterSaleTicketDO::getProblemId, id)
+ .set(AfterSaleTicketDO::getProblemId, null)
+ .set(AfterSaleTicketDO::getProblemNo, null));
+ }
+
+ @Override
+ public AfterSaleProblemDO getProblem(Long id) {
+ return validateProblemExists(id);
+ }
+
+ @Override
+ public List<AfterSaleProblemDO> getProblemList(Collection<Long> ids) {
+ if (CollUtil.isEmpty(ids)) {
+ return List.of();
+ }
+ return problemMapper.selectBatchIds(ids);
+ }
+
+ @Override
+ public PageResult<AfterSaleProblemDO> getProblemPage(AfterSaleProblemPageReqVO pageReqVO) {
+ return problemMapper.selectPage(pageReqVO, pageReqVO.getNo(), pageReqVO.getKeyword(),
+ pageReqVO.getSourceTicketId(), pageReqVO.getItemId(), pageReqVO.getItemCode(),
+ pageReqVO.getIssueCategory(),
+ pageReqVO.getIssueType(), pageReqVO.getRootCauseCategory(), pageReqVO.getStatus());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void publishProblem(Long id) {
+ AfterSaleProblemDO problem = validateProblemExists(id);
+ if (!(AfterSaleProblemStatusEnum.DRAFT.getStatus().equals(problem.getStatus())
+ || AfterSaleProblemStatusEnum.DISABLED.getStatus().equals(problem.getStatus()))) {
+ throw exception(PROBLEM_PUBLISH_FAIL_STATUS);
+ }
+ problemMapper.updateById(new AfterSaleProblemDO().setId(id)
+ .setStatus(AfterSaleProblemStatusEnum.PUBLISHED.getStatus())
+ .setPublishTime(LocalDateTime.now()));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void disableProblem(Long id) {
+ AfterSaleProblemDO problem = validateProblemExists(id);
+ if (!AfterSaleProblemStatusEnum.PUBLISHED.getStatus().equals(problem.getStatus())) {
+ throw exception(PROBLEM_DISABLE_FAIL_STATUS);
+ }
+ problemMapper.updateById(new AfterSaleProblemDO().setId(id)
+ .setStatus(AfterSaleProblemStatusEnum.DISABLED.getStatus()));
+ }
+
+ @Override
+ public List<AfterSaleProblemDO> getReferenceList(AfterSaleProblemPageReqVO pageReqVO) {
+ return problemMapper.selectReferenceList(pageReqVO.getItemId(), pageReqVO.getIssueCategory(),
+ pageReqVO.getIssueType(), pageReqVO.getRootCauseCategory(), pageReqVO.getKeyword());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public AfterSaleProblemDO createProblemFromTicket(AfterSaleTicketDO ticket) {
+ // 骞傜瓑锛氬悓涓�宸ュ崟宸叉矇娣�杩囧垯鐩存帴澶嶇敤
+ AfterSaleProblemDO exist = problemMapper.selectBySourceTicketId(ticket.getId());
+ if (exist != null) {
+ return exist;
+ }
+ AfterSaleProblemDO problem = new AfterSaleProblemDO()
+ .setNo(generateNo())
+ .setTitle(ticket.getName())
+ .setSourceTicketId(ticket.getId())
+ .setSourceTicketNo(ticket.getNo())
+ .setCustomerId(ticket.getCustomerId())
+ .setIssueType(ticket.getIssueType())
+ .setIssueCategory(ticket.getIssueCategory())
+ .setSeverityLevel(ticket.getSeverityLevel())
+ .setDescription(ticket.getIssueDescription())
+ .setStatus(AfterSaleProblemStatusEnum.DRAFT.getStatus())
+ .setOwnerUserId(getLoginUserId());
+ // 鍙栧伐鍗曢鏉℃槑缁嗕綔涓虹墿鏂欏揩鐓�(鍏佽鏃犳槑缁嗚)
+ AfterSaleTicketItemDO firstItem = CollUtil.getFirst(ticketItemMapper.selectListByTicketId(ticket.getId()));
+ if (firstItem != null) {
+ problem.setItemId(firstItem.getItemId())
+ .setItemCode(firstItem.getItemCode())
+ .setItemName(firstItem.getItemName())
+ .setBatchId(firstItem.getBatchId())
+ .setBatchCode(firstItem.getBatchCode());
+ }
+ problemMapper.insert(problem);
+ return problem;
+ }
+
+ // ========== 鍐呴儴鏂规硶 ==========
+
+ private AfterSaleProblemDO validateProblemExists(Long id) {
+ AfterSaleProblemDO problem = problemMapper.selectById(id);
+ if (problem == null) {
+ throw exception(PROBLEM_NOT_EXISTS);
+ }
+ return problem;
+ }
+
+ private String generateNo() {
+ String no = noRedisDAO.generate(AfterSaleNoRedisDAO.PROBLEM_NO_PREFIX);
+ if (problemMapper.selectByNo(no) != null) {
+ throw exception(PROBLEM_NO_EXISTS);
+ }
+ return no;
+ }
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitService.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitService.java
new file mode 100644
index 0000000..68a8082
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitService.java
@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.aftersales.service.visit;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo.AfterSaleVisitCreateReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo.AfterSaleVisitPageReqVO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.visit.AfterSaleVisitDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * 鍞悗鍥炶璁板綍 Service 鎺ュ彛
+ */
+public interface AfterSaleVisitService {
+
+ /**
+ * 鐧昏鍥炶
+ * <p>
+ * 宸ュ崟椤诲浜庡凡瀹岀粨(寰呭洖璁�)鐘舵�併�傜櫥璁版椂鍚屾鎺ㄨ繘宸ュ崟锛�
+ * 婊℃剰涓旀湭澶嶅彂 鈫� 宸ュ崟鍥炶閫氳繃(鍙綊妗�)锛涗笉婊℃剰鎴栧鍙� 鈫� 宸ュ崟鍥為��澶勭悊涓噸鏂板鐞嗐��
+ *
+ * @param createReqVO 鐧昏淇℃伅
+ * @param userId 褰撳墠鐢ㄦ埛缂栧彿(鍥炶浜�)
+ * @return 鍥炶璁板綍缂栧彿
+ */
+ Long createVisit(@Valid AfterSaleVisitCreateReqVO createReqVO, Long userId);
+
+ /**
+ * 鑾峰緱鍥炶璁板綍
+ *
+ * @param id 缂栧彿
+ * @return 鍥炶璁板綍
+ */
+ AfterSaleVisitDO getVisit(Long id);
+
+ /**
+ * 鑾峰緱鏌愬伐鍗曠殑鍥炶璁板綍鍒楄〃
+ *
+ * @param ticketId 宸ュ崟缂栧彿
+ * @return 鍥炶璁板綍鍒楄〃
+ */
+ List<AfterSaleVisitDO> getVisitListByTicketId(Long ticketId);
+
+ /**
+ * 鑾峰緱鍥炶璁板綍鍒嗛〉
+ *
+ * @param pageReqVO 鍒嗛〉鏌ヨ
+ * @return 鍥炶璁板綍鍒嗛〉
+ */
+ PageResult<AfterSaleVisitDO> getVisitPage(AfterSaleVisitPageReqVO pageReqVO);
+
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitServiceImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitServiceImpl.java
new file mode 100644
index 0000000..f30f75c
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/visit/AfterSaleVisitServiceImpl.java
@@ -0,0 +1,106 @@
+package cn.iocoder.yudao.module.aftersales.service.visit;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo.AfterSaleVisitCreateReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.visit.vo.AfterSaleVisitPageReqVO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.visit.AfterSaleVisitDO;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.ticket.AfterSaleTicketMapper;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.visit.AfterSaleVisitMapper;
+import cn.iocoder.yudao.module.aftersales.enums.AfterSaleTicketStatusEnum;
+import cn.iocoder.yudao.module.aftersales.enums.AfterSaleVisitStatusEnum;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+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.aftersales.enums.ErrorCodeConstants.TICKET_NOT_EXISTS;
+import static cn.iocoder.yudao.module.aftersales.enums.ErrorCodeConstants.VISIT_CREATE_FAIL_STATUS;
+import static cn.iocoder.yudao.module.aftersales.enums.ErrorCodeConstants.VISIT_NOT_EXISTS;
+
+/**
+ * 鍞悗鍥炶璁板綍 Service 瀹炵幇绫�
+ */
+@Service
+@Validated
+@Slf4j
+public class AfterSaleVisitServiceImpl implements AfterSaleVisitService {
+
+ @Resource
+ private AfterSaleVisitMapper visitMapper;
+ @Resource
+ private AfterSaleTicketMapper ticketMapper;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createVisit(AfterSaleVisitCreateReqVO createReqVO, Long userId) {
+ // 1. 鏍¢獙宸ュ崟锛氬繀椤诲瓨鍦ㄤ笖澶勪簬宸插畬缁�(寰呭洖璁�)鐘舵��
+ AfterSaleTicketDO ticket = ticketMapper.selectById(createReqVO.getTicketId());
+ if (ticket == null) {
+ throw exception(TICKET_NOT_EXISTS);
+ }
+ if (!AfterSaleTicketStatusEnum.COMPLETED.getStatus().equals(ticket.getStatus())) {
+ throw exception(VISIT_CREATE_FAIL_STATUS);
+ }
+
+ // 2. 鎻掑叆鍥炶璁板綍
+ AfterSaleVisitDO visitDO = BeanUtils.toBean(createReqVO, AfterSaleVisitDO.class)
+ .setVisitorUserId(userId)
+ .setVisitTime(LocalDateTime.now());
+ visitMapper.insert(visitDO);
+
+ // 3. 缁戝畾闄勪欢
+ if (CollUtil.isNotEmpty(createReqVO.getBlobIds())) {
+ storageAttachmentApi.bindAttachments("file", "aftersales_after_sale_visit",
+ visitDO.getId(), createReqVO.getBlobIds());
+ }
+
+ // 4. 鎺ㄨ繘宸ュ崟鍥炶鐘舵�侊細婊℃剰涓旀湭澶嶅彂 鈫� 閫氳繃锛涗笉婊℃剰鎴栧鍙� 鈫� 鍥為��澶勭悊涓噸鏂板鐞�
+ boolean satisfied = Boolean.TRUE.equals(createReqVO.getSatisfied());
+ boolean recurred = Boolean.TRUE.equals(createReqVO.getRecurred());
+ AfterSaleTicketDO update = new AfterSaleTicketDO().setId(ticket.getId())
+ .setLastVisitTime(visitDO.getVisitTime())
+ .setLastVisitSatisfied(satisfied)
+ .setLastVisitRecurred(recurred);
+ if (satisfied && !recurred) {
+ update.setVisitStatus(AfterSaleVisitStatusEnum.PASSED.getStatus());
+ } else {
+ update.setStatus(AfterSaleTicketStatusEnum.PROCESSING.getStatus())
+ .setResolvedTime(null)
+ .setVisitStatus(AfterSaleVisitStatusEnum.WAITING.getStatus());
+ }
+ ticketMapper.updateById(update);
+ return visitDO.getId();
+ }
+
+ @Override
+ public AfterSaleVisitDO getVisit(Long id) {
+ AfterSaleVisitDO visitDO = visitMapper.selectById(id);
+ if (visitDO == null) {
+ throw exception(VISIT_NOT_EXISTS);
+ }
+ return visitDO;
+ }
+
+ @Override
+ public List<AfterSaleVisitDO> getVisitListByTicketId(Long ticketId) {
+ return visitMapper.selectListByTicketId(ticketId);
+ }
+
+ @Override
+ public PageResult<AfterSaleVisitDO> getVisitPage(AfterSaleVisitPageReqVO pageReqVO) {
+ return visitMapper.selectPage(pageReqVO, pageReqVO.getTicketId(),
+ pageReqVO.getVisitType(), pageReqVO.getSatisfied());
+ }
+
+}
diff --git a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApi.java b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApi.java
new file mode 100644
index 0000000..0f28474
--- /dev/null
+++ b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApi.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.hrm.api.employee;
+
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 鍛樺伐妗f API 鎺ュ彛
+ *
+ * <p>鎻愪緵缁欏叾浠栨ā鍧楄法妯″潡鏌ヨ鍛樺伐绮剧畝淇℃伅锛�
+ * 渚嬪瀹夊叏鐢熶骇妯″潡鐨勭壒绉嶄綔涓氳瘉闇�瑕佸叧鑱旀寔璇佷汉銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface HrmEmployeeApi {
+
+ /**
+ * 鑾峰彇鍛樺伐绮剧畝淇℃伅
+ *
+ * @param id 鍛樺伐缂栧彿
+ * @return 鍛樺伐淇℃伅锛屼笉瀛樺湪杩斿洖 null
+ */
+ HrmEmployeeSimpleDTO getEmployee(Long id);
+
+ /**
+ * 鎵归噺鑾峰彇鍛樺伐绮剧畝淇℃伅
+ *
+ * @param ids 鍛樺伐缂栧彿闆嗗悎
+ * @return 鍛樺伐淇℃伅鍒楄〃
+ */
+ List<HrmEmployeeSimpleDTO> getEmployeeList(Collection<Long> ids);
+
+ /**
+ * 鏍¢獙鍛樺伐鏄惁瀛樺湪锛堜笖鏈垹闄わ級
+ *
+ * @param id 鍛樺伐缂栧彿
+ * @return 鏄惁瀛樺湪
+ */
+ boolean validateEmployeeExists(Long id);
+
+}
diff --git a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/dto/HrmEmployeeSimpleDTO.java b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/dto/HrmEmployeeSimpleDTO.java
new file mode 100644
index 0000000..f934b8c
--- /dev/null
+++ b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/dto/HrmEmployeeSimpleDTO.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.hrm.api.employee.dto;
+
+import lombok.Data;
+
+/**
+ * 鍛樺伐绮剧畝淇℃伅 DTO
+ *
+ * <p>渚涘叾浠栨ā鍧楋紙濡傚畨鍏ㄧ敓浜фā鍧楃殑鐗圭浣滀笟璇侊級鍏宠仈鍛樺伐妗f鏃朵娇鐢ㄣ��</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Data
+public class HrmEmployeeSimpleDTO {
+
+ /**
+ * 鍛樺伐缂栧彿
+ */
+ private Long id;
+
+ /**
+ * 鍏宠仈鐨勭郴缁熺敤鎴风紪鍙�
+ *
+ * 鍏宠仈 AdminUserDO#getId()
+ */
+ private Long userId;
+
+ /**
+ * 鍛樺伐缂栧彿锛堝伐鍙凤級
+ */
+ private String employeeNo;
+
+ /**
+ * 鍛樺伐濮撳悕
+ */
+ private String name;
+
+ /**
+ * 閮ㄩ棬缂栧彿
+ */
+ private Long deptId;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ private String deptName;
+
+ /**
+ * 鎵嬫満鍙风爜
+ */
+ private String phone;
+
+ /**
+ * 鍛樺伐鐘舵�侊細1-鍦ㄨ亴锛�2-璇曠敤锛�3-绂昏亴
+ */
+ private Integer employeeStatus;
+
+}
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java
new file mode 100644
index 0000000..8528486
--- /dev/null
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java
@@ -0,0 +1,85 @@
+package cn.iocoder.yudao.module.hrm.api.employee;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
+import cn.iocoder.yudao.module.hrm.dal.mysql.employee.HrmEmployeeMapper;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 鍛樺伐妗f API 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class HrmEmployeeApiImpl implements HrmEmployeeApi {
+
+ @Resource
+ private HrmEmployeeMapper employeeMapper;
+ @Resource
+ private DeptApi deptApi;
+
+ @Override
+ public HrmEmployeeSimpleDTO getEmployee(Long id) {
+ if (id == null) {
+ return null;
+ }
+ HrmEmployeeDO employee = employeeMapper.selectById(id);
+ if (employee == null) {
+ return null;
+ }
+ return build(employee, getDeptName(employee.getDeptId()));
+ }
+
+ @Override
+ public List<HrmEmployeeSimpleDTO> getEmployeeList(Collection<Long> ids) {
+ if (ids == null || ids.isEmpty()) {
+ return List.of();
+ }
+ List<HrmEmployeeDO> employees = employeeMapper.selectBatchIds(ids);
+ if (employees.isEmpty()) {
+ return List.of();
+ }
+ // 鎵归噺鏌ラ儴闂紝閬垮厤 N+1
+ List<Long> deptIds = employees.stream().map(HrmEmployeeDO::getDeptId)
+ .filter(Objects::nonNull).distinct().toList();
+ // 鐢� new HashMap<>() 鑰岄潪 Map.of()锛氬憳宸ョ殑 deptId 鍏佽涓虹┖锛�
+ // 鍚庨潰 deptMap.get(e.getDeptId()) 浼� get(null)锛孧ap.of() 鐨� get(null) 鎶� NPE銆�
+ Map<Long, DeptRespDTO> deptMap = deptIds.isEmpty() ? new HashMap<>() : deptApi.getDeptMap(deptIds);
+ return employees.stream()
+ .map(e -> {
+ DeptRespDTO dept = deptMap.get(e.getDeptId());
+ return build(e, dept == null ? null : dept.getName());
+ })
+ .toList();
+ }
+
+ @Override
+ public boolean validateEmployeeExists(Long id) {
+ return id != null && employeeMapper.selectById(id) != null;
+ }
+
+ private String getDeptName(Long deptId) {
+ if (deptId == null) {
+ return null;
+ }
+ DeptRespDTO dept = deptApi.getDept(deptId);
+ return dept == null ? null : dept.getName();
+ }
+
+ private static HrmEmployeeSimpleDTO build(HrmEmployeeDO employee, String deptName) {
+ HrmEmployeeSimpleDTO dto = BeanUtils.toBean(employee, HrmEmployeeSimpleDTO.class);
+ dto.setDeptName(deptName);
+ return dto;
+ }
+
+}
diff --git a/yudao-module-mes/pom.xml b/yudao-module-mes/pom.xml
index 989e0c1..2ce9f2d 100644
--- a/yudao-module-mes/pom.xml
+++ b/yudao-module-mes/pom.xml
@@ -31,6 +31,13 @@
<version>${revision}</version>
</dependency>
+ <!-- HRM 浜哄姏璧勬簮 API锛氬畨鍏ㄧ敓浜фā鍧楃殑鐗圭浣滀笟璇侀渶鍏宠仈鍛樺伐妗f -->
+ <dependency>
+ <groupId>cn.iocoder.boot</groupId>
+ <artifactId>yudao-module-hrm-api</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
<!-- MDM 涓绘暟鎹鐞� API -->
<dependency>
<groupId>cn.iocoder.boot</groupId>
@@ -115,6 +122,12 @@
<version>3.3.3</version>
</dependency>
+ <!-- MQTT 瀹㈡埛绔細MES 鏁伴噰锛坈ollect锛夋ā鍧楄繛鎺ヨ澶囩綉鍏� -->
+ <dependency>
+ <groupId>org.eclipse.paho</groupId>
+ <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+ </dependency>
+
<!-- Test 娴嬭瘯鐩稿叧 -->
<dependency>
<groupId>cn.iocoder.boot</groupId>
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/MesCollectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/MesCollectController.java
new file mode 100644
index 0000000..8e0edd1
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/MesCollectController.java
@@ -0,0 +1,103 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.collect.vo.*;
+import cn.iocoder.yudao.module.mes.service.collect.MesCollectQueryService;
+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.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "绠$悊鍚庡彴 - MES 鏁伴噰鐩戞帶")
+@RestController
+@RequestMapping("/mes/collect")
+@Validated
+public class MesCollectController {
+
+ @Resource
+ private MesCollectQueryService queryService;
+
+ @GetMapping("/device/list")
+ @Operation(summary = "鑾峰彇鏁伴噰璁惧鐘舵�佸垪琛�")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<List<MesCollectDeviceRespVO>> getDeviceList() {
+ return success(queryService.getDeviceList());
+ }
+
+ @GetMapping("/realtime/get")
+ @Operation(summary = "鑾峰彇璁惧鏈�鏂板疄鏃剁姸鎬�")
+ @Parameter(name = "deviceCode", description = "鏁伴噰璁惧缂栧彿", required = true, example = "C01")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<MesCollectRealtimeRespVO> getRealtime(@RequestParam("deviceCode") String deviceCode) {
+ return success(queryService.getRealtime(deviceCode));
+ }
+
+ @GetMapping("/realtime/history-page")
+ @Operation(summary = "鍒嗛〉鏌ヨ瀹炴椂鐘舵�佸巻鍙�")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<PageResult<MesCollectRealtimeRespVO>> getRealtimeHistoryPage(
+ @Valid MesCollectRealtimeHistoryPageReqVO reqVO) {
+ return success(queryService.getRealtimeHistoryPage(reqVO));
+ }
+
+ @GetMapping("/cycle/page")
+ @Operation(summary = "鍒嗛〉鏌ヨ鍛ㄦ湡杩囩▼鏁版嵁")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<PageResult<MesCollectCycleRespVO>> getCyclePage(@Valid MesCollectCyclePageReqVO reqVO) {
+ return success(queryService.getCyclePage(reqVO));
+ }
+
+ @GetMapping("/cycle/get")
+ @Operation(summary = "鑾峰彇鍛ㄦ湡杩囩▼鏁版嵁鏄庣粏")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<MesCollectCycleRespVO> getCycle(@RequestParam("id") Long id) {
+ return success(queryService.getCycle(id));
+ }
+
+ @GetMapping("/tech/get")
+ @Operation(summary = "鑾峰彇璁惧鏈�鏂板伐鑹哄弬鏁板揩鐓�")
+ @Parameter(name = "deviceCode", description = "鏁伴噰璁惧缂栧彿", required = true, example = "C01")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<MesCollectTechRespVO> getTech(@RequestParam("deviceCode") String deviceCode) {
+ return success(queryService.getTech(deviceCode));
+ }
+
+ @GetMapping("/operate-log/page")
+ @Operation(summary = "鍒嗛〉鏌ヨ鍙傛暟鍙樻洿鏃ュ織")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<PageResult<MesCollectOperateLogRespVO>> getOperateLogPage(
+ @Valid MesCollectOperateLogPageReqVO reqVO) {
+ return success(queryService.getOperateLogPage(reqVO));
+ }
+
+ @GetMapping("/alarm/page")
+ @Operation(summary = "鍒嗛〉鏌ヨ鎶ヨ璁板綍")
+ @PreAuthorize("@ss.hasPermission('mes:collect:query')")
+ public CommonResult<PageResult<MesCollectAlarmRespVO>> getAlarmPage(@Valid MesCollectAlarmPageReqVO reqVO) {
+ return success(queryService.getAlarmPage(reqVO));
+ }
+
+ @PutMapping("/alarm/ack")
+ @Operation(summary = "浜哄伐纭娑堥櫎鎶ヨ")
+ @Parameter(name = "id", description = "鎶ヨ璁板綍缂栧彿", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('mes:collect-alarm:ack')")
+ public CommonResult<Boolean> ackAlarm(@RequestParam("id") Long id) {
+ queryService.ackAlarm(id);
+ return success(true);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmPageReqVO.java
new file mode 100644
index 0000000..41b5c70
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmPageReqVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰鎶ヨ鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesCollectAlarmPageReqVO extends PageParam {
+
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+
+ @Schema(description = "鐘舵�侊細0鏈秷闄� 1宸叉秷闄�", example = "0")
+ private Integer status;
+
+ @Schema(description = "鎶ヨ鏃堕棿")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] wmTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmRespVO.java
new file mode 100644
index 0000000..22bc693
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectAlarmRespVO.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰鎶ヨ Response VO")
+@Data
+public class MesCollectAlarmRespVO {
+
+ @Schema(description = "缂栧彿", example = "1")
+ private Long id;
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+ @Schema(description = "鎶ヨ鏍囪瘑锛�2浜х敓 0娑堝け", example = "2")
+ private Integer wmId;
+ @Schema(description = "鎶ヨ鍐呭", example = "瀹夊叏闂ㄦ湭鍏�")
+ private String wmMsg;
+ @Schema(description = "鎶ヨ鏃堕棿")
+ private LocalDateTime wmTime;
+ @Schema(description = "鐘舵�侊細0鏈秷闄� 1宸叉秷闄�", example = "0")
+ private Integer status;
+ @Schema(description = "鐘舵�佸悕绉�", example = "鏈秷闄�")
+ private String statusName;
+ @Schema(description = "娑堥櫎鏃堕棿")
+ private LocalDateTime clearTime;
+ @Schema(description = "鎶ユ枃閲囬泦鏃堕棿")
+ private LocalDateTime collectTime;
+ @Schema(description = "瀹屾暣鏁版嵁 JSON")
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCyclePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCyclePageReqVO.java
new file mode 100644
index 0000000..da6ad44
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCyclePageReqVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰鍛ㄦ湡杩囩▼鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesCollectCyclePageReqVO extends PageParam {
+
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+
+ @Schema(description = "閲囬泦鏃堕棿")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] collectTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCycleRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCycleRespVO.java
new file mode 100644
index 0000000..9a9b5bb
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectCycleRespVO.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰鍛ㄦ湡杩囩▼鏁版嵁 Response VO")
+@Data
+public class MesCollectCycleRespVO {
+
+ @Schema(description = "缂栧彿", example = "1")
+ private Long id;
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+ @Schema(description = "鍛ㄦ湡搴忓彿锛圕YCN锛�", example = "100")
+ private Long cycleNo;
+ @Schema(description = "閲囬泦鏃堕棿")
+ private LocalDateTime collectTime;
+ @Schema(description = "鍛ㄦ湡鏃堕棿锛圗CYCT锛�")
+ private BigDecimal ecyct;
+ @Schema(description = "灏勫嚭璧风偣锛圗ISS锛�")
+ private BigDecimal eiss;
+ @Schema(description = "鏈�澶у皠閫燂紙EIVM锛�")
+ private BigDecimal eivm;
+ @Schema(description = "鏈�澶у皠鍘嬶紙EIPM锛�")
+ private BigDecimal eipm;
+ @Schema(description = "杞繚鍘嬫椂闂达紙ESIPT锛�")
+ private BigDecimal esipt;
+ @Schema(description = "杞繚鍘嬪帇鍔涳紙ESIPP锛�")
+ private BigDecimal esipp;
+ @Schema(description = "杞繚鍘嬩綅缃紙ESIPS锛�")
+ private BigDecimal esips;
+ @Schema(description = "灏勫嚭鏃堕棿锛圗IPT锛�")
+ private BigDecimal eipt;
+ @Schema(description = "灏勫嚭缁堢偣浣嶇疆锛圗IPSE锛�")
+ private BigDecimal eipse;
+ @Schema(description = "鍌ㄦ枡鏃堕棿锛圗PLST锛�")
+ private BigDecimal eplst;
+ @Schema(description = "鍌ㄦ枡缁堢偣锛圗PLSSE锛�")
+ private BigDecimal eplsse;
+ @Schema(description = "鏈�澶у偍鏂欏帇鍔涳紙EPLSPM锛�")
+ private BigDecimal eplspm;
+ @Schema(description = "鐢熶骇娓╁害 JSON锛圗T1..ETn锛�")
+ private String etTemps;
+ @Schema(description = "瀹屾暣鏁版嵁 JSON")
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDeviceRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDeviceRespVO.java
new file mode 100644
index 0000000..13554aa
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDeviceRespVO.java
@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰璁惧鐘舵�� Response VO")
+@Data
+public class MesCollectDeviceRespVO {
+
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+ @Schema(description = "璁惧缂栫爜", example = "MC_20260818001")
+ private String machineryCode;
+ @Schema(description = "璁惧鍚嶇О", example = "娉ㄥ鏈� 1 鍙�")
+ private String machineryName;
+ @Schema(description = "宸ヤ綔绔欑紪鍙�", example = "1")
+ private Long workstationId;
+ @Schema(description = "宸ヤ綔绔欏悕绉�", example = "娉ㄥ宸ヤ綔绔�")
+ private String workstationName;
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String collectDeviceCode;
+ @Schema(description = "鏄惁鍚敤鏁伴噰", example = "true")
+ private Boolean collectEnabled;
+ @Schema(description = "鏈�杩戦噰闆嗘椂闂�")
+ private LocalDateTime lastCollectTime;
+ @Schema(description = "鏄惁鍦ㄧ嚎锛�5 鍒嗛挓鍐呮湁鏁版嵁锛�", example = "true")
+ private Boolean online;
+ @Schema(description = "杩愯鐘舵�侊細1寰呮満 2鐢熶骇", example = "2")
+ private Integer sts;
+ @Schema(description = "杩愯鐘舵�佸悕绉�", example = "鐢熶骇")
+ private String stsName;
+ @Schema(description = "杩愯妯″紡锛�0鎵嬪姩 1鍗婅嚜鍔� 2鐢电溂鑷姩 3鏃堕棿鑷姩 4璋冩ā浣跨敤", example = "2")
+ private Integer opm;
+ @Schema(description = "杩愯妯″紡鍚嶇О", example = "鐢电溂鑷姩")
+ private String opmName;
+ @Schema(description = "娌规俯", example = "26.5")
+ private BigDecimal ot;
+ @Schema(description = "鍚勬娓╁害 JSON")
+ private String temps;
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+ @Schema(description = "鐢熶骇浠诲姟缂栫爜", example = "PT202610200001")
+ private String taskCode;
+ @Schema(description = "鐢熶骇浠诲姟鍚嶇О", example = "娉ㄥ浠诲姟")
+ private String taskName;
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+ @Schema(description = "鐢熶骇宸ュ崟缂栫爜", example = "PO202610200001")
+ private String workOrderCode;
+ @Schema(description = "鏈秷闄ゆ姤璀︽暟閲�", example = "1")
+ private Long activeAlarmCount;
+ /**
+ * 鏈�杩戜竴娆¢噰闆嗙殑瀹屾暣鏁版嵁 JSON銆�
+ *
+ * <p>璁惧缃戝叧涓婃姤鐨勬槸涓枃閿殑鐬椂鍊硷紙濡� {"璁$背":268.35,"绾块�熷害":0.0}锛夛紝
+ * 涓庢敞濉戞満鍗忚鐨� STS/OPM/OT 缁撴瀯涓嶅悓锛岀粨鏋勫寲瀛楁锛坰ts/opm/ot/temps锛変細鏄┖鐨勶紝
+ * 鍓嶇灞曠ず銆屽綋鍓嶆暟鎹�嶉渶瑕佽繖涓師濮� JSON銆�</p>
+ */
+ @Schema(description = "鏈�杩戦噰闆嗘暟鎹� JSON", example = "{\"璁$背\":268.35}")
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogPageReqVO.java
new file mode 100644
index 0000000..1f84d39
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogPageReqVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰鍙傛暟鍙樻洿鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesCollectOperateLogPageReqVO extends PageParam {
+
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+
+ @Schema(description = "鍙橀噺缂栫爜", example = "SIPS")
+ private String varId;
+
+ @Schema(description = "淇敼鏃堕棿")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] modifyTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogRespVO.java
new file mode 100644
index 0000000..88598b4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectOperateLogRespVO.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰鍙傛暟鍙樻洿 Response VO")
+@Data
+public class MesCollectOperateLogRespVO {
+
+ @Schema(description = "缂栧彿", example = "1")
+ private Long id;
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+ @Schema(description = "鍙橀噺缂栫爜", example = "SIPS")
+ private String varId;
+ @Schema(description = "淇敼鍓嶇殑鍊�", example = "37")
+ private String oldValue;
+ @Schema(description = "淇敼鍚庣殑鍊�", example = "37.5")
+ private String newValue;
+ @Schema(description = "鍙傛暟淇敼鏃堕棿")
+ private LocalDateTime modifyTime;
+ @Schema(description = "鎶ユ枃閲囬泦鏃堕棿")
+ private LocalDateTime collectTime;
+ @Schema(description = "瀹屾暣鏁版嵁 JSON")
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeHistoryPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeHistoryPageReqVO.java
new file mode 100644
index 0000000..c5a5cee
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeHistoryPageReqVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰瀹炴椂鍘嗗彶鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesCollectRealtimeHistoryPageReqVO extends PageParam {
+
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+
+ @Schema(description = "閲囬泦鏃堕棿")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] collectTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeRespVO.java
new file mode 100644
index 0000000..7097653
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectRealtimeRespVO.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰瀹炴椂鏁版嵁 Response VO")
+@Data
+public class MesCollectRealtimeRespVO {
+
+ @Schema(description = "缂栧彿", example = "1")
+ private Long id;
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+ @Schema(description = "閲囬泦鏃堕棿")
+ private LocalDateTime collectTime;
+ @Schema(description = "杩愯鐘舵�侊細1寰呮満 2鐢熶骇", example = "2")
+ private Integer sts;
+ @Schema(description = "杩愯鐘舵�佸悕绉�", example = "鐢熶骇")
+ private String stsName;
+ @Schema(description = "杩愯妯″紡锛�0鎵嬪姩 1鍗婅嚜鍔� 2鐢电溂鑷姩 3鏃堕棿鑷姩 4璋冩ā浣跨敤", example = "2")
+ private Integer opm;
+ @Schema(description = "杩愯妯″紡鍚嶇О", example = "鐢电溂鑷姩")
+ private String opmName;
+ @Schema(description = "闄勫姞鐘舵��", example = "0")
+ private Integer asts;
+ @Schema(description = "娌规俯", example = "26.5")
+ private BigDecimal ot;
+ @Schema(description = "鍚勬娓╁害 JSON")
+ private String temps;
+ @Schema(description = "瀹屾暣鏁版嵁 JSON")
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectTechRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectTechRespVO.java
new file mode 100644
index 0000000..ce043c4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectTechRespVO.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 鏁伴噰宸ヨ壓鍙傛暟 Response VO")
+@Data
+public class MesCollectTechRespVO {
+
+ @Schema(description = "缂栧彿", example = "1")
+ private Long id;
+ @Schema(description = "璁惧鍙拌处缂栧彿", example = "1")
+ private Long machineryId;
+ @Schema(description = "鏁伴噰璁惧缂栧彿", example = "C01")
+ private String deviceCode;
+ @Schema(description = "鐢熶骇浠诲姟缂栧彿", example = "1")
+ private Long taskId;
+ @Schema(description = "鐢熶骇宸ュ崟缂栧彿", example = "1")
+ private Long workOrderId;
+ @Schema(description = "閲囬泦鏃堕棿")
+ private LocalDateTime collectTime;
+ @Schema(description = "宸ヨ壓鍙傛暟瀹屾暣蹇収 JSON")
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/MesDvSpareController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/MesDvSpareController.java
new file mode 100644
index 0000000..501def9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/MesDvSpareController.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.mes.controller.admin.dv.spare;
+import cn.iocoder.yudao.framework.common.pojo.*;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare.MesDvSparePartDO;
+import cn.iocoder.yudao.module.mes.service.dv.spare.MesDvSpareService;
+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 io.swagger.v3.oas.annotations.tags.Tag;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+@Tag(name="绠$悊鍚庡彴 - 璁惧澶囦欢绠$悊")
+@RestController @RequestMapping("/mes/dv/spare") @Validated
+public class MesDvSpareController {
+ @Resource private MesDvSpareService service;
+ @GetMapping("/page") @PreAuthorize("@ss.hasPermission('mes:dv-spare:query')")
+ public CommonResult<PageResult<MesDvSparePartDO>> page(@Valid MesDvSparePageReqVO req) { return success(service.page(req)); }
+ @GetMapping("/get") @PreAuthorize("@ss.hasPermission('mes:dv-spare:query')")
+ public CommonResult<MesDvSparePartDO> get(@RequestParam Long id) { return success(service.get(id)); }
+ @PostMapping("/create") @PreAuthorize("@ss.hasPermission('mes:dv-spare:create')")
+ public CommonResult<Long> create(@Valid @RequestBody MesDvSparePartSaveReqVO req) {
+ req.setId(null); return success(service.create(req,getLoginUserId()));
+ }
+ @PutMapping("/update") @PreAuthorize("@ss.hasPermission('mes:dv-spare:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody MesDvSparePartSaveReqVO req) { service.update(req); return success(true); }
+ @DeleteMapping("/delete") @PreAuthorize("@ss.hasPermission('mes:dv-spare:delete')")
+ public CommonResult<Boolean> delete(@RequestParam Long id) { service.delete(id); return success(true); }
+ @GetMapping("/movement-page") @PreAuthorize("@ss.hasPermission('mes:dv-spare:record')")
+ public CommonResult<PageResult<MesDvSpareMovementRespVO>> movements(@Valid MesDvSparePageReqVO req) { return success(service.movements(req)); }
+ @PostMapping("/receive") @PreAuthorize("@ss.hasPermission('mes:dv-spare:receive')")
+ public CommonResult<Long> receive(@Valid @RequestBody MesDvSpareActionReqVO req) { return success(service.receive(req,getLoginUserId())); }
+ @PostMapping("/issue") @PreAuthorize("@ss.hasPermission('mes:dv-spare:issue')")
+ public CommonResult<Long> issue(@Valid @RequestBody MesDvSpareActionReqVO req) { return success(service.issue(req,getLoginUserId())); }
+ @PostMapping("/return") @PreAuthorize("@ss.hasPermission('mes:dv-spare:return')")
+ public CommonResult<Long> returnPart(@Valid @RequestBody MesDvSpareActionReqVO req) { return success(service.returnPart(req,getLoginUserId())); }
+}
+
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareActionReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareActionReqVO.java
new file mode 100644
index 0000000..0f3be0a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareActionReqVO.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import java.math.BigDecimal;
+@Data
+public class MesDvSpareActionReqVO {
+ @NotBlank @Pattern(regexp="[a-zA-Z0-9-]{16,64}") private String requestKey;
+ @Positive private Long sparePartId;
+ @Positive private Long repairId;
+ @Positive private Long originalId;
+ @Positive private Long receiverUserId;
+ @NotNull @DecimalMin(value="0",inclusive=false) @Digits(integer=15,fraction=3) private BigDecimal quantity;
+ @NotBlank @Size(max=500) private String remark;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareMovementRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareMovementRespVO.java
new file mode 100644
index 0000000..3fd107d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareMovementRespVO.java
@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare.MesDvSpareMovementDO;
+import java.math.BigDecimal;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+@Data @EqualsAndHashCode(callSuper=true)
+public class MesDvSpareMovementRespVO extends MesDvSpareMovementDO {
+ private BigDecimal returnedQuantity;
+ private BigDecimal returnableQuantity;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSparePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSparePageReqVO.java
new file mode 100644
index 0000000..304e89a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSparePageReqVO.java
@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+@Data @EqualsAndHashCode(callSuper=true)
+public class MesDvSparePageReqVO extends PageParam {
+ private String code;
+ private String name;
+ private Integer status;
+ private Boolean shortageOnly;
+ private Long sparePartId;
+ private Long repairId;
+ private String repairCode;
+ @Min(1) @Max(4) private Integer type;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSparePartSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSparePartSaveReqVO.java
new file mode 100644
index 0000000..ed8b996
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSparePartSaveReqVO.java
@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import java.math.BigDecimal;
+@Data
+public class MesDvSparePartSaveReqVO {
+ private Long id;
+ @NotBlank @Size(max=64) private String code;
+ @NotBlank @Size(max=128) private String name;
+ @Size(max=255) private String specification;
+ @NotBlank @Size(max=32) private String unit;
+ @Size(max=128) private String location;
+ @NotNull @DecimalMin("0") @Digits(integer=15,fraction=3) private BigDecimal initialQuantity;
+ @NotNull @DecimalMin("0") @Digits(integer=15,fraction=3) private BigDecimal safetyQuantity;
+ @NotNull @Min(0) @Max(1) private Integer status;
+ @Size(max=500) private String remark;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyAlertController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyAlertController.java
new file mode 100644
index 0000000..1a170ec
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyAlertController.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.mes.controller.admin.energy;
+
+import cn.iocoder.yudao.framework.common.pojo.*;
+import cn.iocoder.yudao.module.mes.controller.admin.energy.vo.EnergyAlertRuleSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.energy.*;
+import cn.iocoder.yudao.module.mes.service.energy.EnergyAlertService;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import java.time.LocalDate;
+import java.util.*;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@RestController @RequestMapping("/energy/alert") @Validated
+public class EnergyAlertController {
+ @Resource private EnergyAlertService energyAlertService;
+ @Resource private AdminUserService adminUserService;
+ @GetMapping("/page") @PreAuthorize("@ss.hasPermission('energy:alert:query')")
+ public CommonResult<PageResult<EnergyAlertRuleDO>> page(@Valid PageParam page) { return success(energyAlertService.page(page)); }
+ @GetMapping("/logs") @PreAuthorize("@ss.hasPermission('energy:alert:query')")
+ public CommonResult<PageResult<EnergyAlertLogDO>> logs(@Valid PageParam page,
+ @RequestParam(required=false) @DateTimeFormat(iso=DateTimeFormat.ISO.DATE) LocalDate date,
+ @RequestParam(required=false) @Pattern(regexp="SENT|FAILED") String status) {
+ return success(energyAlertService.logs(page, date, status));
+ }
+ @GetMapping("/recipients") @PreAuthorize("@ss.hasPermission('energy:alert:query')")
+ public CommonResult<List<Map<String, Object>>> recipients() {
+ return success(adminUserService.getUserListByStatus(0).stream()
+ .map(user -> Map.<String,Object>of("id", user.getId(), "nickname", user.getNickname())).toList());
+ }
+ @PostMapping("/create") @PreAuthorize("@ss.hasPermission('energy:alert:create')")
+ public CommonResult<Long> create(@Valid @RequestBody EnergyAlertRuleSaveReqVO req) { req.setId(null); return success(energyAlertService.save(req)); }
+ @PutMapping("/update") @PreAuthorize("@ss.hasPermission('energy:alert:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody EnergyAlertRuleSaveReqVO req) {
+ if (req.getId() == null) throw cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception(
+ new cn.iocoder.yudao.framework.common.exception.ErrorCode(1_040_951_001, "淇敼棰勮瑙勫垯蹇呴』鎻愪緵缂栧彿"));
+ energyAlertService.save(req); return success(true);
+ }
+ @DeleteMapping("/delete") @PreAuthorize("@ss.hasPermission('energy:alert:delete')")
+ public CommonResult<Boolean> delete(@RequestParam Long id) { energyAlertService.delete(id); return success(true); }
+ @PostMapping("/check") @PreAuthorize("@ss.hasPermission('energy:alert:check')")
+ public CommonResult<Map<String,Integer>> check(@RequestParam @NotNull @PastOrPresent
+ @DateTimeFormat(iso=DateTimeFormat.ISO.DATE) LocalDate date) { return success(energyAlertService.check(date)); }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java
new file mode 100644
index 0000000..34b1934
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java
@@ -0,0 +1,80 @@
+package cn.iocoder.yudao.module.mes.controller.admin.energy;
+
+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.energy.vo.*;
+import cn.iocoder.yudao.module.mes.service.energy.EnergyRecordService;
+import io.swagger.v3.oas.annotations.Operation;
+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;
+
+@Tag(name = "绠$悊鍚庡彴 - 鐙珛鑳借�楃鐞�")
+@RestController
+@RequestMapping("/energy/record")
+@Validated
+public class EnergyRecordController {
+ @Resource private cn.iocoder.yudao.module.mes.service.energy.EnergyExportService energyExportService;
+ @Resource(name = "energyRecordService")
+ private EnergyRecordService energyRecordService;
+
+ @GetMapping("/export-excel")
+ @PreAuthorize("@ss.hasPermission('energy:record:export')")
+ public void export(@Valid EnergyRecordPageReqVO req, jakarta.servlet.http.HttpServletResponse response) throws java.io.IOException {
+ energyExportService.records(req, response);
+ }
+ @GetMapping("/analysis-export")
+ @PreAuthorize("@ss.hasPermission('energy:analysis:export')")
+ public void exportAnalysis(@Valid EnergyAnalysisReqVO req, jakarta.servlet.http.HttpServletResponse response) throws java.io.IOException {
+ energyExportService.analysis(req, response);
+ }
+
+ @PostMapping("/create")
+ @Operation(summary = "鎵嬪姩鏂板鑳借�楄褰�")
+ @PreAuthorize("@ss.hasPermission('energy:record:create')")
+ public CommonResult<Long> create(@Valid @RequestBody EnergyRecordSaveReqVO req) {
+ return success(energyRecordService.create(req));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "淇敼鑳借�楄褰�")
+ @PreAuthorize("@ss.hasPermission('energy:record:update')")
+ public CommonResult<Boolean> update(@Valid @RequestBody EnergyRecordSaveReqVO req) {
+ energyRecordService.update(req);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎鑳借�楄褰�")
+ @PreAuthorize("@ss.hasPermission('energy:record:delete')")
+ public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+ energyRecordService.delete(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鏌ョ湅鑳借�楄褰�")
+ @PreAuthorize("@ss.hasPermission('energy:record:query')")
+ public CommonResult<EnergyRecordRespVO> get(@RequestParam("id") Long id) {
+ return success(BeanUtils.toBean(energyRecordService.get(id), EnergyRecordRespVO.class));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鍒嗛〉鏌ヨ鑳借�楄褰�")
+ @PreAuthorize("@ss.hasPermission('energy:record:query')")
+ public CommonResult<PageResult<EnergyRecordRespVO>> page(@Valid EnergyRecordPageReqVO req) {
+ return success(BeanUtils.toBean(energyRecordService.page(req), EnergyRecordRespVO.class));
+ }
+
+ @GetMapping("/analysis")
+ @Operation(summary = "鑳借�楁暟鎹垎鏋愶紙鎸夎兘婧愬垎鍒眹鎬荤敤閲忥級")
+ @PreAuthorize("@ss.hasPermission('energy:analysis:query')")
+ public CommonResult<EnergyAnalysisRespVO> analysis(@Valid EnergyAnalysisReqVO req) {
+ return success(energyRecordService.analysis(req));
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAlertRuleSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAlertRuleSaveReqVO.java
new file mode 100644
index 0000000..d81a13b
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAlertRuleSaveReqVO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.mes.controller.admin.energy.vo;
+
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class EnergyAlertRuleSaveReqVO {
+ private Long id;
+ @NotBlank @Size(max = 100) private String name;
+ @NotNull @Pattern(regexp = "WATER|ELECTRICITY|STEAM") private String energyType;
+ @Size(max = 100) private String usageArea;
+ @Size(max = 50) private String productCategory;
+ @NotNull @Pattern(regexp = "QUANTITY|AMOUNT|MONTH_QUANTITY|MONTH_AMOUNT") private String metric;
+ @NotNull @DecimalMin(value = "0", inclusive = false) @Digits(integer = 26, fraction = 3)
+ private BigDecimal threshold;
+ @NotNull private Boolean enabled;
+ @NotEmpty @Size(max = 50) private List<@NotNull @Positive Long> recipientIds;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisReqVO.java
new file mode 100644
index 0000000..66df378
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisReqVO.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.mes.controller.admin.energy.vo;
+
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDate;
+
+@Data
+public class EnergyAnalysisReqVO {
+ @NotNull
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate startDate;
+ @NotNull
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate endDate;
+ @Pattern(regexp = "WATER|ELECTRICITY|STEAM")
+ private String energyType;
+ private String usageArea;
+ private String productCategory;
+ @NotNull
+ @Pattern(regexp = "DAY|MONTH")
+ private String groupBy = "DAY";
+
+ @AssertTrue(message = "缁熻鏃ユ湡鑼冨洿蹇呴』鍦ㄤ袱骞翠互鍐咃紝涓斿紑濮嬫棩鏈熶笉鑳芥櫄浜庣粨鏉熸棩鏈�")
+ public boolean isDateRangeValid() {
+ return startDate == null || endDate == null
+ || (!startDate.isAfter(endDate) && !endDate.isAfter(startDate.plusYears(2)));
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisRespVO.java
new file mode 100644
index 0000000..1606754
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisRespVO.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.mes.controller.admin.energy.vo;
+
+import lombok.Data;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class EnergyAnalysisRespVO {
+ private BigDecimal totalAmount = BigDecimal.ZERO;
+ private long recordCount;
+ private List<Summary> summary = new ArrayList<>();
+ private List<Bucket> trend = new ArrayList<>();
+ private List<Bucket> areas = new ArrayList<>();
+
+ @Data
+ public static class Summary {
+ private String energyType;
+ private BigDecimal quantity = BigDecimal.ZERO;
+ private BigDecimal amount = BigDecimal.ZERO;
+ private long recordCount;
+ }
+
+ @Data
+ public static class Bucket extends Summary {
+ /** 瓒嬪娍涓烘棩鏈�/鏈堬紝鍖哄煙鍒嗗竷涓哄尯鍩熷悕绉般�� */
+ private String label;
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordPageReqVO.java
new file mode 100644
index 0000000..45de23c
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordPageReqVO.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.mes.controller.admin.energy.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.Pattern;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDate;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EnergyRecordPageReqVO extends PageParam {
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate startDate;
+ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+ private LocalDate endDate;
+ @Pattern(regexp = "WATER|ELECTRICITY|STEAM")
+ private String energyType;
+ private String usageArea;
+ private String productCategory;
+
+ @AssertTrue(message = "寮�濮嬫棩鏈熶笉鑳芥櫄浜庣粨鏉熸棩鏈�")
+ public boolean isDateRangeValid() {
+ return startDate == null || endDate == null || !startDate.isAfter(endDate);
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordRespVO.java
new file mode 100644
index 0000000..4c9c526
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordRespVO.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.mes.controller.admin.energy.vo;
+
+import lombok.Data;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+public class EnergyRecordRespVO {
+ private Long id;
+ private LocalDate recordDate;
+ private String energyType;
+ private String usageArea;
+ private String productCategory;
+ private String usagePurpose;
+ private BigDecimal quantity;
+ private BigDecimal unitPrice;
+ private BigDecimal amount;
+ private String recorder;
+ private String remark;
+ private LocalDateTime createTime;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordSaveReqVO.java
new file mode 100644
index 0000000..a6508d3
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordSaveReqVO.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.mes.controller.admin.energy.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+@Schema(description = "绠$悊鍚庡彴 - 鑳借�楄褰曟柊澧�/淇敼")
+public class EnergyRecordSaveReqVO {
+ @Positive
+ private Long id;
+ @NotNull(message = "缁熻鏃ユ湡涓嶈兘涓虹┖")
+ @PastOrPresent(message = "缁熻鏃ユ湡涓嶈兘鏅氫簬浠婂ぉ")
+ private LocalDate recordDate;
+ @NotBlank
+ @Pattern(regexp = "WATER|ELECTRICITY|STEAM", message = "鑳芥簮绫诲瀷鍙兘涓烘按銆佺數銆佽捀姹�")
+ private String energyType;
+ @NotBlank(message = "浣跨敤鍖哄煙涓嶈兘涓虹┖")
+ @Size(max = 100)
+ private String usageArea;
+ @NotBlank(message = "浜у搧绫诲埆涓嶈兘涓虹┖")
+ @Size(max = 50)
+ private String productCategory;
+ @NotBlank(message = "鐢ㄩ�斾笉鑳戒负绌�")
+ @Size(max = 100)
+ private String usagePurpose;
+ @NotNull
+ @DecimalMin(value = "0", inclusive = false, message = "鐢ㄩ噺蹇呴』澶т簬闆�")
+ @Digits(integer = 15, fraction = 3, message = "鐢ㄩ噺鏈�澶�15浣嶆暣鏁般��3浣嶅皬鏁�")
+ private BigDecimal quantity;
+ @NotNull
+ @DecimalMin(value = "0", message = "鍗曚环涓嶈兘涓鸿礋鏁�")
+ @Digits(integer = 8, fraction = 4, message = "鍗曚环鏈�澶�8浣嶆暣鏁般��4浣嶅皬鏁�")
+ private BigDecimal unitPrice;
+ @NotBlank(message = "褰曞叆浜轰笉鑳戒负绌�")
+ @Size(max = 50)
+ private String recorder;
+ @Size(max = 500)
+ private String remark;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/MesQcInspectionLedgerController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/MesQcInspectionLedgerController.java
new file mode 100644
index 0000000..6a43a0b
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/MesQcInspectionLedgerController.java
@@ -0,0 +1,113 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.ledger;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerExportVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcQualityExportVO;
+import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
+import cn.iocoder.yudao.module.mes.service.qc.ledger.MesQcInspectionLedgerService;
+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 java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "绠$悊鍚庡彴 - MES 妫�娴嬬粨鏋滃彴璐�")
+@RestController
+@RequestMapping("/mes/qc/inspection-ledger")
+@Validated
+public class MesQcInspectionLedgerController {
+
+ @Resource
+ private MesQcInspectionLedgerService ledgerService;
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱妫�娴嬬粨鏋滃彴璐﹀垎椤碉紙鍥涚被妫�楠屽崟缁熶竴鏌ヨ锛�")
+ @PreAuthorize("@ss.hasPermission('mes:qc-inspection-ledger:query')")
+ public CommonResult<PageResult<MesQcInspectionLedgerRespVO>> getInspectionLedgerPage(
+ @Valid MesQcInspectionLedgerPageReqVO pageReqVO) {
+ return success(ledgerService.getInspectionLedgerPage(pageReqVO));
+ }
+
+ @GetMapping("/export-excel")
+ @Operation(summary = "瀵煎嚭妫�娴嬬粨鏋滃彴璐� Excel")
+ @PreAuthorize("@ss.hasPermission('mes:qc-inspection-ledger:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportInspectionLedgerExcel(@Valid MesQcInspectionLedgerPageReqVO pageReqVO,
+ HttpServletResponse response) throws IOException {
+ pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ List<MesQcInspectionLedgerRespVO> list = ledgerService.getInspectionLedgerPage(pageReqVO).getList();
+ ExcelUtils.write(response, "妫�娴嬬粨鏋滃彴璐�.xls", "妫�娴嬬粨鏋滃彴璐�",
+ MesQcInspectionLedgerExportVO.class, buildExportList(list));
+ }
+
+ private List<MesQcInspectionLedgerExportVO> buildExportList(List<MesQcInspectionLedgerRespVO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return new ArrayList<>();
+ }
+ List<MesQcInspectionLedgerExportVO> exportList = new ArrayList<>(list.size());
+ for (MesQcInspectionLedgerRespVO vo : list) {
+ MesQcInspectionLedgerExportVO export = new MesQcInspectionLedgerExportVO();
+ export.setQcTypeName(qcTypeName(vo.getQcType()));
+ export.setCode(vo.getCode());
+ export.setName(vo.getName());
+ export.setItemCode(vo.getItemCode());
+ export.setItemName(vo.getItemName());
+ export.setItemSpecification(vo.getItemSpecification());
+ export.setBatchNo(vo.getBatchNo());
+ export.setIndicatorName(vo.getIndicatorName());
+ export.setIndicatorValue(vo.getIndicatorValue());
+ export.setJudgementBasis(vo.getJudgementBasis());
+ export.setCheckResultText(parseDictLabel(DictTypeConstants.MES_QC_CHECK_RESULT, vo.getCheckResult()));
+ export.setCheckQuantity(MesQcQualityExportVO.formatDecimal(vo.getCheckQuantity()));
+ export.setQualifiedQuantity(MesQcQualityExportVO.formatDecimal(vo.getQualifiedQuantity()));
+ export.setUnqualifiedQuantity(MesQcQualityExportVO.formatDecimal(vo.getUnqualifiedQuantity()));
+ export.setInspectorName(vo.getInspectorName());
+ export.setInspectDate(MesQcQualityExportVO.formatDateTime(vo.getInspectDate()));
+ export.setStatusText(parseDictLabel(DictTypeConstants.MES_ORDER_STATUS, vo.getStatus()));
+ export.setRemark(vo.getRemark());
+ exportList.add(export);
+ }
+ return exportList;
+ }
+
+ private static String qcTypeName(Integer qcType) {
+ for (MesQcTypeEnum e : MesQcTypeEnum.values()) {
+ if (Objects.equals(e.getType(), qcType)) {
+ return e.getName();
+ }
+ }
+ return "";
+ }
+
+ private static String parseDictLabel(String dictType, Integer value) {
+ if (value == null) {
+ return "";
+ }
+ String label = DictFrameworkUtils.parseDictDataLabel(dictType, String.valueOf(value));
+ return StrUtil.nullToEmpty(label);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerExportVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerExportVO.java
new file mode 100644
index 0000000..6ea2e96
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerExportVO.java
@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * MES 妫�娴嬬粨鏋滃彴璐﹀鍑� Excel VO
+ *
+ * <p>涓�琛� = 涓�涓娴嬮」缁撴灉锛堟楠屽崟鏈綍鍏ユ娴嬮」鏃惰鍗曞崰涓�琛岋紝妫�娴嬮」鐩稿叧鍒椾负绌猴級锛岀敤浜庢煡璇€�佹墦鍗颁笌瀛樻。銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Data
+public class MesQcInspectionLedgerExportVO {
+
+ @ExcelProperty("鍒嗙被")
+ private String qcTypeName;
+
+ @ExcelProperty("妫�楠屽崟缂栧彿")
+ private String code;
+
+ @ExcelProperty("妫�楠屽崟鍚嶇О")
+ private String name;
+
+ @ExcelProperty("鐗╂枡缂栫爜")
+ private String itemCode;
+
+ @ExcelProperty("鐗╂枡鍚嶇О")
+ private String itemName;
+
+ @ExcelProperty("瑙勬牸鍨嬪彿")
+ private String itemSpecification;
+
+ @ExcelProperty("鎵规鍙�")
+ private String batchNo;
+
+ @ExcelProperty("妫�娴嬮」")
+ private String indicatorName;
+
+ @ExcelProperty("妫�娴嬪��")
+ private String indicatorValue;
+
+ @ExcelProperty("鍒ゅ畾渚濇嵁")
+ private String judgementBasis;
+
+ @ExcelProperty("妫�娴嬬粨鏋�")
+ private String checkResultText;
+
+ @ExcelProperty("妫�娴嬫暟閲�")
+ private String checkQuantity;
+
+ @ExcelProperty("鍚堟牸鏁伴噺")
+ private String qualifiedQuantity;
+
+ @ExcelProperty("涓嶅悎鏍兼暟閲�")
+ private String unqualifiedQuantity;
+
+ @ExcelProperty("妫�娴嬩汉鍛�")
+ private String inspectorName;
+
+ @ExcelProperty("妫�娴嬫棩鏈�")
+ private String inspectDate;
+
+ @ExcelProperty("鍗曟嵁鐘舵��")
+ private String statusText;
+
+ @ExcelProperty("澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerPageReqVO.java
new file mode 100644
index 0000000..515b4a3
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerPageReqVO.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo;
+
+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;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 妫�娴嬬粨鏋滃彴璐﹀垎椤� Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MesQcInspectionLedgerPageReqVO extends PageParam {
+
+ @Schema(description = "鍒嗙被锛堟楠岀被鍨嬶級锛�1 鏉ユ枡妫�楠� / 2 杩囩▼妫�楠� / 3 鍑鸿揣妫�楠� / 4 閫�璐ф楠岋紝涓嶄紶涓哄叏閮�", example = "1")
+ private Integer qcType;
+
+ @Schema(description = "妫�娴嬫棩鏈熷尯闂达紝浼� [寮�濮嬫椂闂�, 缁撴潫鏃堕棿]",
+ example = "[\"2026-01-01 00:00:00\", \"2026-12-31 23:59:59\"]")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] inspectDate;
+
+ @Schema(description = "妫�楠屽崟缂栧彿锛堟ā绯婂尮閰嶏級", example = "IQC1787563511197")
+ private String code;
+
+ @Schema(description = "鐗╂枡缂栧彿", example = "28")
+ private Long itemId;
+
+ @Schema(description = "鎵规鍙凤紙妯$硦鍖归厤锛涙潵鏂欐楠屽彇渚涘簲鍟嗘壒娆″彿锛屽嚭璐�/閫�璐ф楠屽彇鎵规鍙凤級", example = "20260920a")
+ private String batchNo;
+
+ @Schema(description = "妫�娴嬬粨鏋�", example = "1")
+ private Integer checkResult;
+
+ @Schema(description = "妫�娴嬩汉鍛樼紪鍙�", example = "1")
+ private Long inspectorUserId;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerRespVO.java
new file mode 100644
index 0000000..5973032
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ledger/vo/MesQcInspectionLedgerRespVO.java
@@ -0,0 +1,102 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 妫�娴嬬粨鏋滃彴璐� Response VO")
+@Data
+public class MesQcInspectionLedgerRespVO {
+
+ // ========== 妫�楠屽崟 ==========
+
+ @Schema(description = "鍒嗙被锛堟楠岀被鍨嬶級锛�1 鏉ユ枡妫�楠� / 2 杩囩▼妫�楠� / 3 鍑鸿揣妫�楠� / 4 閫�璐ф楠岋紱瀛楀吀 mes_qc_type", example = "1")
+ private Integer qcType;
+
+ @Schema(description = "妫�楠屽崟 ID", example = "1")
+ private Long qcId;
+
+ @Schema(description = "妫�楠屽崟缂栧彿", example = "IQC1787563511197")
+ private String code;
+
+ @Schema(description = "妫�楠屽崟鍚嶇О", example = "AN1787563511157-鐗╂枡妫�楠�")
+ private String name;
+
+ @Schema(description = "鍗曟嵁鐘舵�侊紱瀛楀吀 mes_order_status", example = "4")
+ private Integer status;
+
+ // ========== 鐗╂枡 ==========
+
+ @Schema(description = "鐗╂枡缂栧彿", example = "28")
+ private Long itemId;
+
+ @Schema(description = "鐗╂枡缂栫爜", example = "WL0001")
+ private String itemCode;
+
+ @Schema(description = "鐗╂枡鍚嶇О", example = "鐗╂枡A")
+ private String itemName;
+
+ @Schema(description = "瑙勬牸鍨嬪彿", example = "100mm*50mm")
+ private String itemSpecification;
+
+ @Schema(description = "璁¢噺鍗曚綅鍚嶇О", example = "涓�")
+ private String unitName;
+
+ @Schema(description = "鎵规鍙�", example = "20260920a")
+ private String batchNo;
+
+ // ========== 鏁伴噺涓庣粨鏋� ==========
+
+ @Schema(description = "妫�娴嬫暟閲�", example = "100.00")
+ private BigDecimal checkQuantity;
+
+ @Schema(description = "鍚堟牸鏁伴噺", example = "99.00")
+ private BigDecimal qualifiedQuantity;
+
+ @Schema(description = "涓嶅悎鏍兼暟閲�", example = "1.00")
+ private BigDecimal unqualifiedQuantity;
+
+ @Schema(description = "妫�娴嬬粨鏋滐紱瀛楀吀 mes_qc_check_result", example = "1")
+ private Integer checkResult;
+
+ @Schema(description = "妫�娴嬫棩鏈�")
+ private LocalDateTime inspectDate;
+
+ @Schema(description = "妫�娴嬩汉鍛樼紪鍙�", example = "1")
+ private Long inspectorUserId;
+
+ @Schema(description = "妫�娴嬩汉鍛樻樀绉�", example = "寮犱笁")
+ private String inspectorName;
+
+ // ========== 妫�娴嬮」缁撴灉锛堜竴鏉℃槑缁嗕竴琛岋紱妫�楠屽崟鏈綍鍏ユ娴嬮」鏃惰缁勫瓧娈典负绌猴級 ==========
+
+ @Schema(description = "妫�娴嬮」缂栧彿", example = "2")
+ private Long indicatorId;
+
+ @Schema(description = "妫�娴嬮」鍚嶇О", example = "闀垮害")
+ private String indicatorName;
+
+ @Schema(description = "妫�娴嬪��", example = "15")
+ private String indicatorValue;
+
+ @Schema(description = "妫�娴嬮」澶囨敞", example = "鎶芥")
+ private String indicatorRemark;
+
+ @Schema(description = "鍒ゅ畾渚濇嵁锛岀敱妫�娴嬮」鏍囧噯鍊�/璇樊涓婁笅闄愭嫾瑁�", example = "10~20")
+ private String judgementBasis;
+
+ @Schema(description = "妫�娴嬮」鏍囧噯鍊硷紙鍒ゅ畾渚濇嵁鍘熷鍊硷紝鍓嶇灞曠ず鐢� judgementBasis 鍗冲彲锛�", example = "15")
+ private BigDecimal standardValue;
+
+ @Schema(description = "妫�娴嬮」璇樊涓嬮檺锛堝垽瀹氫緷鎹師濮嬪�硷級", example = "10")
+ private BigDecimal minThreshold;
+
+ @Schema(description = "妫�娴嬮」璇樊涓婇檺锛堝垽瀹氫緷鎹師濮嬪�硷級", example = "20")
+ private BigDecimal maxThreshold;
+
+ @Schema(description = "妫�楠屽崟澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcImportRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcImportRespVO.java
new file mode 100644
index 0000000..273b3e6
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcImportRespVO.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 绠$悊鍚庡彴 - 璐ㄦ鍗曞鍏� Response VO锛圛QC / IPQC / OQC 鍏辩敤锛�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 璐ㄦ鍗曞鍏� Response VO")
+@Data
+@Builder
+public class MesQcImportRespVO {
+
+ @Schema(description = "瀵煎叆鎴愬姛鐨勬楠屽崟缂栧彿鏁扮粍", example = "IQC20260101000001")
+ private List<String> createList;
+
+ @Schema(description = "瀵煎叆澶辫触闆嗗悎锛宬ey 涓鸿鏍囪瘑锛堟楠屽崟缂栧彿鎴栫 N 琛岋級锛寁alue 涓哄け璐ュ師鍥�")
+ private Map<String, String> failureList;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcQualityExportVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcQualityExportVO.java
new file mode 100644
index 0000000..26ee09a
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcQualityExportVO.java
@@ -0,0 +1,92 @@
+package cn.iocoder.yudao.module.mes.controller.admin.qc.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * MES 璐ㄦ妫�楠屽崟瀵煎嚭 Excel VO锛圛QC/IPQC/OQC/RQC 鍏辩敤锛�
+ *
+ * <p>瀵煎嚭鍒楋細妫�楠屽崟鍚嶇О / 鐗╂枡鍚嶇О / 鎵瑰彿 / 妫�娴嬫棩鏈� / 妫�楠屾寚鏍� / 鍒ゅ畾渚濇嵁 / 妫�楠岀粨鏋� / 妫�楠屼汉 / 瀹℃牳浜� / 澶囨敞銆�
+ * 妫�楠屾寚鏍囥�佸垽瀹氫緷鎹彇鑷楠屽崟琛屾槑缁嗭紱瀹℃牳浜烘殏鏃犳暟鎹潵婧愶紝瀵煎嚭涓虹┖鍒椼��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Data
+public class MesQcQualityExportVO {
+
+ @ExcelProperty("妫�楠屽崟鍚嶇О")
+ private String docName;
+
+ @ExcelProperty("鐗╂枡鍚嶇О")
+ private String itemName;
+
+ @ExcelProperty("鎵瑰彿")
+ private String batchNo;
+
+ @ExcelProperty("妫�娴嬫棩鏈�")
+ private String inspectDate;
+
+ @ExcelProperty("妫�楠屾寚鏍�")
+ private String indicatorNames;
+
+ @ExcelProperty("鍒ゅ畾渚濇嵁")
+ private String judgementBasis;
+
+ @ExcelProperty("妫�楠岀粨鏋�")
+ private String checkResultText;
+
+ @ExcelProperty("妫�楠屼汉")
+ private String inspectorName;
+
+ @ExcelProperty("瀹℃牳浜�")
+ private String auditorName;
+
+ @ExcelProperty("澶囨敞")
+ private String remark;
+
+ /**
+ * 鏍煎紡鍖栨娴嬫棩鏈燂紙浠呮棩鏈燂級锛宯ull 杩斿洖绌轰覆
+ */
+ public static String formatDateTime(LocalDateTime dateTime) {
+ if (dateTime == null) {
+ return "";
+ }
+ return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ }
+
+ /**
+ * 鍘绘帀鏁板�煎熬閮ㄦ棤鎰忎箟鐨� 0锛屽 35.000000 -> 35銆�2.500000 -> 2.5
+ */
+ public static String formatDecimal(BigDecimal value) {
+ if (value == null) {
+ return "";
+ }
+ return value.stripTrailingZeros().toPlainString();
+ }
+
+ /**
+ * 缁勮鍗曚釜妫�娴嬮」鐨勫垽瀹氫緷鎹枃鏈細
+ * 涓婁笅闄愬潎鏈� -> "涓嬮檺~涓婇檺"锛涗粎鏈変笂闄� -> "鈮や笂闄�"锛涗粎鏈変笅闄� -> "鈮ヤ笅闄�"锛�
+ * 鍧囨棤浣嗙粰浜嗘爣鍑嗗�� -> "鏍囧噯鍊� 鏍囧噯鍊�"锛涘惁鍒欒繑鍥炵┖涓层��
+ */
+ public static String buildRangeText(BigDecimal standardValue, BigDecimal minThreshold, BigDecimal maxThreshold) {
+ if (maxThreshold != null && minThreshold != null) {
+ return formatDecimal(minThreshold) + "~" + formatDecimal(maxThreshold);
+ }
+ if (maxThreshold != null) {
+ return "鈮�" + formatDecimal(maxThreshold);
+ }
+ if (minThreshold != null) {
+ return "鈮�" + formatDecimal(minThreshold);
+ }
+ if (standardValue != null) {
+ return "鏍囧噯鍊� " + formatDecimal(standardValue);
+ }
+ return "";
+ }
+
+}
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/collect/MesCollectAlarmDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectAlarmDO.java
new file mode 100644
index 0000000..8bbcd57
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectAlarmDO.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-鎶ヨ璁板綍 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_alarm")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectAlarmDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private Long taskId;
+ private Long workOrderId;
+ private Integer wmId;
+ private String wmMsg;
+ private LocalDateTime wmTime;
+ private Integer status;
+ private LocalDateTime clearTime;
+ private LocalDateTime collectTime;
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectCycleDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectCycleDO.java
new file mode 100644
index 0000000..a7e218f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectCycleDO.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-鍛ㄦ湡杩囩▼鏁版嵁 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_cycle")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectCycleDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private Long taskId;
+ private Long workOrderId;
+ private Long cycleNo;
+ private LocalDateTime collectTime;
+ private BigDecimal ecyct;
+ private BigDecimal eiss;
+ private BigDecimal eivm;
+ private BigDecimal eipm;
+ private BigDecimal esipt;
+ private BigDecimal esipp;
+ private BigDecimal esips;
+ private BigDecimal eipt;
+ private BigDecimal eipse;
+ private BigDecimal eplst;
+ private BigDecimal eplsse;
+ private BigDecimal eplspm;
+ private String etTemps;
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectMessageDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectMessageDO.java
new file mode 100644
index 0000000..ab7d1dc
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectMessageDO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-鍘熷鎶ユ枃 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_message")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectMessageDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private String mqttTopic;
+ private String msgType;
+ private LocalDateTime eventTime;
+ private String rawPayload;
+ private Integer processStatus;
+ private String errorMsg;
+ private LocalDateTime receiveTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectOperateLogDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectOperateLogDO.java
new file mode 100644
index 0000000..1b2a21f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectOperateLogDO.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-鍙傛暟鍙樻洿鏃ュ織 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_operate_log")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectOperateLogDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private Long taskId;
+ private Long workOrderId;
+ private String varId;
+ private String oldValue;
+ private String newValue;
+ private LocalDateTime modifyTime;
+ private LocalDateTime collectTime;
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeDO.java
new file mode 100644
index 0000000..f663f9e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeDO.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-璁惧瀹炴椂鐘舵�� DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_realtime")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectRealtimeDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private Long taskId;
+ private Long workOrderId;
+ private LocalDateTime collectTime;
+ private Integer sts;
+ private Integer opm;
+ private Integer asts;
+ private BigDecimal ot;
+ private String temps;
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeHistoryDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeHistoryDO.java
new file mode 100644
index 0000000..301e2c4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectRealtimeHistoryDO.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-瀹炴椂鐘舵�佸巻鍙� DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_realtime_history")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectRealtimeHistoryDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private Long taskId;
+ private Long workOrderId;
+ private LocalDateTime collectTime;
+ private Integer sts;
+ private Integer opm;
+ private Integer asts;
+ private BigDecimal ot;
+ private String temps;
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectTechDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectTechDO.java
new file mode 100644
index 0000000..59ba7bb
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/collect/MesCollectTechDO.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-宸ヨ壓鍙傛暟蹇収 DO
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_collect_tech")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesCollectTechDO extends BaseDO {
+
+ @TableId
+ private Long id;
+ private Long machineryId;
+ private String deviceCode;
+ private Long taskId;
+ private Long workOrderId;
+ private LocalDateTime collectTime;
+ private String dataJson;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/machinery/MesDvMachineryDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/machinery/MesDvMachineryDO.java
index ad74141..8215fc0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/machinery/MesDvMachineryDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/machinery/MesDvMachineryDO.java
@@ -101,5 +101,13 @@
* 璁惧鍒涘缓鏃惰嚜鍔ㄥ垱寤哄搴旂墿鏂欙紝骞朵互姝ゅ叧鑱旇澶囦粨搴撳瓨
*/
private Long itemId;
+ /**
+ * 鏁伴噰璁惧缂栧彿锛圡QTT devId锛屽 C01锛�
+ */
+ private String collectDeviceCode;
+ /**
+ * 鏄惁鍚敤鏁伴噰
+ */
+ private Boolean collectEnabled;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSpareMovementDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSpareMovementDO.java
new file mode 100644
index 0000000..f47b8cf
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSpareMovementDO.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
+import java.math.BigDecimal;
+@TableName("mes_dv_spare_movement")
+@KeySequence("mes_dv_spare_movement_seq")
+@Data @EqualsAndHashCode(callSuper = true)
+public class MesDvSpareMovementDO extends BaseDO {
+ @TableId private Long id;
+ private String requestKey;
+ private Long sparePartId;
+ private String sparePartCode;
+ private String sparePartName;
+ private String specification;
+ private String unit;
+ /** 1 鍒濆搴撳瓨锛�2 鍏ュ簱锛�3 缁翠慨棰嗙敤锛�4 閫�鍥� */
+ private Integer type;
+ private BigDecimal quantity;
+ private BigDecimal beforeQuantity;
+ private BigDecimal afterQuantity;
+ private Long repairId;
+ private String repairCode;
+ private Long machineryId;
+ private String machineryName;
+ private Long originalId;
+ private Long receiverUserId;
+ private String receiverName;
+ private Long operatorUserId;
+ private String remark;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSparePartDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSparePartDO.java
new file mode 100644
index 0000000..916d841
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSparePartDO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
+import java.math.BigDecimal;
+@TableName("mes_dv_spare_part")
+@KeySequence("mes_dv_spare_part_seq")
+@Data @EqualsAndHashCode(callSuper = true)
+public class MesDvSparePartDO extends BaseDO {
+ @TableId private Long id;
+ private String code;
+ private String name;
+ private String specification;
+ private String unit;
+ private String location;
+ private BigDecimal stockQuantity;
+ private BigDecimal safetyQuantity;
+ private Integer status;
+ private String remark;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertLogDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertLogDO.java
new file mode 100644
index 0000000..d58970b
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertLogDO.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.energy;
+
+import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@TableName("mes_energy_alert_log") @Data @EqualsAndHashCode(callSuper = true)
+public class EnergyAlertLogDO extends TenantBaseDO {
+ @TableId private Long id;
+ private Long ruleId;
+ private String ruleName;
+ private LocalDate recordDate;
+ private String periodType;
+ private String energyType;
+ private String scope;
+ private String metric;
+ private BigDecimal actualValue;
+ private BigDecimal threshold;
+ private Long recipientId;
+ private String recipientName;
+ private Long messageId;
+ private String status;
+ private String errorMessage;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertRuleDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertRuleDO.java
new file mode 100644
index 0000000..5b8301f
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertRuleDO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.energy;
+
+import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
+import java.math.BigDecimal;
+
+@TableName("mes_energy_alert_rule") @Data @EqualsAndHashCode(callSuper = true)
+public class EnergyAlertRuleDO extends TenantBaseDO {
+ @TableId private Long id;
+ private String name;
+ private String energyType;
+ private String usageArea;
+ private String productCategory;
+ private String metric;
+ private BigDecimal threshold;
+ private Boolean enabled;
+ /** Comma-separated validated administrator IDs, at most 50. */
+ private String recipientIds;
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyRecordDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyRecordDO.java
new file mode 100644
index 0000000..74860fe
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyRecordDO.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.energy;
+
+import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
+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;
+
+/** 鐙珛鑳借�楀彴璐︼紝涓嶅叧鑱旇澶囥�佸伐鍗曘�佷骇鍝佹垨閮ㄩ棬涓绘暟鎹�� */
+@TableName("mes_energy_record")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EnergyRecordDO extends TenantBaseDO {
+ @TableId
+ private Long id;
+ private LocalDate recordDate;
+ /** WATER / ELECTRICITY / STEAM锛屽崟浣嶅垎鍒负 m鲁 / kWh / t銆� */
+ private String energyType;
+ private String usageArea;
+ private String productCategory;
+ private String usagePurpose;
+ private BigDecimal quantity;
+ private BigDecimal unitPrice;
+ private BigDecimal amount;
+ private String recorder;
+ 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/collect/MesCollectAlarmMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectAlarmMapper.java
new file mode 100644
index 0000000..8de8008
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectAlarmMapper.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+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.collect.vo.MesCollectAlarmPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectAlarmDO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-鎶ヨ璁板綍 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectAlarmMapper extends BaseMapperX<MesCollectAlarmDO> {
+
+ default PageResult<MesCollectAlarmDO> selectPage(MesCollectAlarmPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesCollectAlarmDO>()
+ .eqIfPresent(MesCollectAlarmDO::getDeviceCode, reqVO.getDeviceCode())
+ .eqIfPresent(MesCollectAlarmDO::getMachineryId, reqVO.getMachineryId())
+ .eqIfPresent(MesCollectAlarmDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .eqIfPresent(MesCollectAlarmDO::getStatus, reqVO.getStatus())
+ .betweenIfPresent(MesCollectAlarmDO::getWmTime, reqVO.getWmTime())
+ .orderByDesc(MesCollectAlarmDO::getWmTime));
+ }
+
+ default Long selectActiveCountByDeviceCode(String deviceCode) {
+ return selectCount(new LambdaQueryWrapperX<MesCollectAlarmDO>()
+ .eq(MesCollectAlarmDO::getDeviceCode, deviceCode)
+ .eq(MesCollectAlarmDO::getStatus, 0));
+ }
+
+ default int clearActiveByDeviceCode(String deviceCode, LocalDateTime clearTime) {
+ return update(null, new LambdaUpdateWrapper<MesCollectAlarmDO>()
+ .eq(MesCollectAlarmDO::getDeviceCode, deviceCode)
+ .eq(MesCollectAlarmDO::getStatus, 0)
+ .set(MesCollectAlarmDO::getStatus, 1)
+ .set(MesCollectAlarmDO::getClearTime, clearTime));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectCycleMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectCycleMapper.java
new file mode 100644
index 0000000..bc05297
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectCycleMapper.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+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.collect.vo.MesCollectCyclePageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectCycleDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * MES 鏁伴噰-鍛ㄦ湡杩囩▼鏁版嵁 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectCycleMapper extends BaseMapperX<MesCollectCycleDO> {
+
+ default PageResult<MesCollectCycleDO> selectPage(MesCollectCyclePageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesCollectCycleDO>()
+ .eqIfPresent(MesCollectCycleDO::getDeviceCode, reqVO.getDeviceCode())
+ .eqIfPresent(MesCollectCycleDO::getMachineryId, reqVO.getMachineryId())
+ .eqIfPresent(MesCollectCycleDO::getTaskId, reqVO.getTaskId())
+ .eqIfPresent(MesCollectCycleDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .betweenIfPresent(MesCollectCycleDO::getCollectTime, reqVO.getCollectTime())
+ .orderByDesc(MesCollectCycleDO::getCollectTime));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectMessageMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectMessageMapper.java
new file mode 100644
index 0000000..714b3ea
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectMessageMapper.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+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.collect.MesCollectMessageDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-鍘熷鎶ユ枃 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectMessageMapper extends BaseMapperX<MesCollectMessageDO> {
+
+ default int deleteBefore(LocalDateTime before, int limit) {
+ return delete(new LambdaQueryWrapperX<MesCollectMessageDO>()
+ .lt(MesCollectMessageDO::getReceiveTime, before)
+ .last("LIMIT " + limit));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectOperateLogMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectOperateLogMapper.java
new file mode 100644
index 0000000..81073c0
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectOperateLogMapper.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+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.collect.vo.MesCollectOperateLogPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectOperateLogDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * MES 鏁伴噰-鍙傛暟鍙樻洿鏃ュ織 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectOperateLogMapper extends BaseMapperX<MesCollectOperateLogDO> {
+
+ default PageResult<MesCollectOperateLogDO> selectPage(MesCollectOperateLogPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesCollectOperateLogDO>()
+ .eqIfPresent(MesCollectOperateLogDO::getDeviceCode, reqVO.getDeviceCode())
+ .eqIfPresent(MesCollectOperateLogDO::getMachineryId, reqVO.getMachineryId())
+ .eqIfPresent(MesCollectOperateLogDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .eqIfPresent(MesCollectOperateLogDO::getVarId, reqVO.getVarId())
+ .betweenIfPresent(MesCollectOperateLogDO::getModifyTime, reqVO.getModifyTime())
+ .orderByDesc(MesCollectOperateLogDO::getModifyTime));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeHistoryMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeHistoryMapper.java
new file mode 100644
index 0000000..9162195
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeHistoryMapper.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+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.collect.vo.MesCollectRealtimeHistoryPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectRealtimeHistoryDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰-瀹炴椂鐘舵�佸巻鍙� Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectRealtimeHistoryMapper extends BaseMapperX<MesCollectRealtimeHistoryDO> {
+
+ default PageResult<MesCollectRealtimeHistoryDO> selectPage(MesCollectRealtimeHistoryPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesCollectRealtimeHistoryDO>()
+ .eqIfPresent(MesCollectRealtimeHistoryDO::getDeviceCode, reqVO.getDeviceCode())
+ .eqIfPresent(MesCollectRealtimeHistoryDO::getMachineryId, reqVO.getMachineryId())
+ .eqIfPresent(MesCollectRealtimeHistoryDO::getTaskId, reqVO.getTaskId())
+ .eqIfPresent(MesCollectRealtimeHistoryDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .betweenIfPresent(MesCollectRealtimeHistoryDO::getCollectTime, reqVO.getCollectTime())
+ .orderByDesc(MesCollectRealtimeHistoryDO::getCollectTime));
+ }
+
+ default int deleteBefore(LocalDateTime before, int limit) {
+ return delete(new LambdaQueryWrapperX<MesCollectRealtimeHistoryDO>()
+ .lt(MesCollectRealtimeHistoryDO::getCollectTime, before)
+ .last("LIMIT " + limit));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeMapper.java
new file mode 100644
index 0000000..fd019b3
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectRealtimeMapper.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectRealtimeDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * MES 鏁伴噰-璁惧瀹炴椂鐘舵�� Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectRealtimeMapper extends BaseMapperX<MesCollectRealtimeDO> {
+
+ default MesCollectRealtimeDO selectByDeviceCode(String deviceCode) {
+ return selectOne(MesCollectRealtimeDO::getDeviceCode, deviceCode);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectTechMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectTechMapper.java
new file mode 100644
index 0000000..f77f844
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/collect/MesCollectTechMapper.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.collect;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectTechDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * MES 鏁伴噰-宸ヨ壓鍙傛暟蹇収 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesCollectTechMapper extends BaseMapperX<MesCollectTechDO> {
+
+ default MesCollectTechDO selectByDeviceCode(String deviceCode) {
+ return selectOne(MesCollectTechDO::getDeviceCode, deviceCode);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
index 56c2161..2ec5c50 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/machinery/MesDvMachineryMapper.java
@@ -37,4 +37,20 @@
return selectCount(MesDvMachineryDO::getMachineryTypeId, machineryTypeId);
}
+ /**
+ * 鎸夋暟閲囪澶囩紪鍙锋煡璇㈣澶囷紙MQTT devId锛�
+ */
+ default MesDvMachineryDO selectByCollectDeviceCode(String collectDeviceCode) {
+ return selectOne(MesDvMachineryDO::getCollectDeviceCode, collectDeviceCode);
+ }
+
+ /**
+ * 鏌ヨ鎵�鏈夊凡閰嶇疆鏁伴噰璁惧缂栧彿鐨勮澶�
+ */
+ default java.util.List<MesDvMachineryDO> selectListWithCollectDeviceCode() {
+ return selectList(new LambdaQueryWrapperX<MesDvMachineryDO>()
+ .isNotNull(MesDvMachineryDO::getCollectDeviceCode)
+ .orderByAsc(MesDvMachineryDO::getId));
+ }
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java
index 8605e9c..75fb140 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/repair/MesDvRepairMapper.java
@@ -15,6 +15,14 @@
@Mapper
public interface MesDvRepairMapper extends BaseMapperX<MesDvRepairDO> {
+ /**
+ * 鍔犺閿佹煡璇㈢淮淇伐鍗曪細澶囦欢鍑哄簱鏃堕槻姝㈠苟鍙戞墸鍑�
+ */
+ default MesDvRepairDO lockForSpare(Long id) {
+ return selectOne(new LambdaQueryWrapperX<MesDvRepairDO>()
+ .eq(MesDvRepairDO::getId, id).last("FOR UPDATE"));
+ }
+
default PageResult<MesDvRepairDO> selectPage(MesDvRepairPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<MesDvRepairDO>()
.likeIfPresent(MesDvRepairDO::getCode, reqVO.getCode())
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/spare/MesDvSpareMovementMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/spare/MesDvSpareMovementMapper.java
new file mode 100644
index 0000000..e8d3981
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/spare/MesDvSpareMovementMapper.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.dv.spare;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare.MesDvSpareMovementDO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo.MesDvSparePageReqVO;
+import org.apache.ibatis.annotations.Mapper;
+import java.util.*;
+@Mapper
+public interface MesDvSpareMovementMapper extends BaseMapperX<MesDvSpareMovementDO> {
+ default MesDvSpareMovementDO byKey(String key) {
+ return selectOne(MesDvSpareMovementDO::getRequestKey,key);
+ }
+ default MesDvSpareMovementDO lock(Long id) {
+ return selectOne(new LambdaQueryWrapperX<MesDvSpareMovementDO>().eq(MesDvSpareMovementDO::getId,id).last("FOR UPDATE"));
+ }
+ default List<MesDvSpareMovementDO> returns(Collection<Long> ids) {
+ if (ids.isEmpty()) return List.of();
+ return selectList(new LambdaQueryWrapperX<MesDvSpareMovementDO>()
+ .eq(MesDvSpareMovementDO::getType,4).in(MesDvSpareMovementDO::getOriginalId,ids));
+ }
+ default PageResult<MesDvSpareMovementDO> page(MesDvSparePageReqVO req) {
+ return selectPage(req,new LambdaQueryWrapperX<MesDvSpareMovementDO>()
+ .eqIfPresent(MesDvSpareMovementDO::getSparePartId,req.getSparePartId())
+ .eqIfPresent(MesDvSpareMovementDO::getRepairId,req.getRepairId())
+ .eqIfPresent(MesDvSpareMovementDO::getRepairCode,req.getRepairCode())
+ .eqIfPresent(MesDvSpareMovementDO::getType,req.getType())
+ .orderByDesc(MesDvSpareMovementDO::getId));
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/spare/MesDvSparePartMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/spare/MesDvSparePartMapper.java
new file mode 100644
index 0000000..cdb07e7
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/spare/MesDvSparePartMapper.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.dv.spare;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare.MesDvSparePartDO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo.MesDvSparePageReqVO;
+import org.apache.ibatis.annotations.Mapper;
+@Mapper
+public interface MesDvSparePartMapper extends BaseMapperX<MesDvSparePartDO> {
+ default MesDvSparePartDO lock(Long id) {
+ return selectOne(new LambdaQueryWrapperX<MesDvSparePartDO>().eq(MesDvSparePartDO::getId,id).last("FOR UPDATE"));
+ }
+ default PageResult<MesDvSparePartDO> page(MesDvSparePageReqVO req) {
+ return selectPage(req,new LambdaQueryWrapperX<MesDvSparePartDO>()
+ .eqIfPresent(MesDvSparePartDO::getCode,req.getCode())
+ .likeIfPresent(MesDvSparePartDO::getName,req.getName())
+ .eqIfPresent(MesDvSparePartDO::getStatus,req.getStatus())
+ .apply(Boolean.TRUE.equals(req.getShortageOnly()),"stock_quantity < safety_quantity")
+ .orderByDesc(MesDvSparePartDO::getId));
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertLogMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertLogMapper.java
new file mode 100644
index 0000000..4dcf0e9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertLogMapper.java
@@ -0,0 +1,8 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.energy;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.energy.EnergyAlertLogDO;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface EnergyAlertLogMapper extends BaseMapperX<EnergyAlertLogDO> {}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertRuleMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertRuleMapper.java
new file mode 100644
index 0000000..7d7d1b9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertRuleMapper.java
@@ -0,0 +1,12 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.energy;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.energy.EnergyAlertRuleDO;
+import org.apache.ibatis.annotations.*;
+
+@Mapper
+public interface EnergyAlertRuleMapper extends BaseMapperX<EnergyAlertRuleDO> {
+ // Serialize checks for one rule, including concurrent record submissions.
+ @Select("SELECT * FROM mes_energy_alert_rule WHERE id=#{id} AND deleted=0 FOR UPDATE")
+ EnergyAlertRuleDO lock(@Param("id") Long id);
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyRecordMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyRecordMapper.java
new file mode 100644
index 0000000..9bc4d83
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyRecordMapper.java
@@ -0,0 +1,67 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.energy;
+
+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.energy.vo.EnergyRecordPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.energy.vo.EnergyAnalysisReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.energy.EnergyRecordDO;
+import lombok.Data;
+import org.apache.ibatis.annotations.*;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Mapper
+public interface EnergyRecordMapper extends BaseMapperX<EnergyRecordDO> {
+ @Select("""
+ <script>
+ SELECT COALESCE(SUM(<choose><when test="rule.metric == 'AMOUNT' or rule.metric == 'MONTH_AMOUNT'">amount</when><otherwise>quantity</otherwise></choose>),0)
+ FROM mes_energy_record WHERE deleted=0 AND energy_type=#{rule.energyType}
+ <choose><when test="rule.metric == 'MONTH_QUANTITY' or rule.metric == 'MONTH_AMOUNT'">
+ AND record_date >= #{date} AND record_date < DATE_ADD(#{date}, INTERVAL 1 MONTH)
+ </when><otherwise>AND record_date=#{date}</otherwise></choose>
+ <if test="rule.usageArea != null and rule.usageArea != ''">AND usage_area=#{rule.usageArea}</if>
+ <if test="rule.productCategory != null and rule.productCategory != ''">AND product_category=#{rule.productCategory}</if>
+ </script>
+ """)
+ BigDecimal selectDailyValue(@Param("date") java.time.LocalDate date,
+ @Param("rule") cn.iocoder.yudao.module.mes.dal.dataobject.energy.EnergyAlertRuleDO rule);
+ default PageResult<EnergyRecordDO> selectPage(EnergyRecordPageReqVO req) {
+ return selectPage(req, new LambdaQueryWrapperX<EnergyRecordDO>()
+ .geIfPresent(EnergyRecordDO::getRecordDate, req.getStartDate())
+ .leIfPresent(EnergyRecordDO::getRecordDate, req.getEndDate())
+ .eqIfPresent(EnergyRecordDO::getEnergyType, req.getEnergyType())
+ .likeIfPresent(EnergyRecordDO::getUsageArea, req.getUsageArea())
+ .eqIfPresent(EnergyRecordDO::getProductCategory, req.getProductCategory())
+ .orderByDesc(EnergyRecordDO::getRecordDate, EnergyRecordDO::getId));
+ }
+
+ // 鎸夋暟鎹簱鍒嗙粍锛岄伩鍏嶅姞杞藉叏閮ㄥ彴璐︼紱绉熸埛鎷︽埅鍣ㄨ嚜鍔ㄦ坊鍔� tenant_id 鏉′欢銆�
+ @Select("""
+ <script>
+ SELECT energy_type AS energyType,
+ <choose><when test="req.groupBy == 'MONTH'">DATE_FORMAT(record_date, '%Y-%m')</when>
+ <otherwise>DATE_FORMAT(record_date, '%Y-%m-%d')</otherwise></choose> AS period,
+ usage_area AS usageArea, SUM(quantity) AS quantity, SUM(amount) AS amount,
+ COUNT(*) AS recordCount
+ FROM mes_energy_record
+ WHERE deleted = 0 AND record_date BETWEEN #{req.startDate} AND #{req.endDate}
+ <if test="req.energyType != null and req.energyType != ''">AND energy_type = #{req.energyType}</if>
+ <if test="req.usageArea != null and req.usageArea != ''">AND usage_area LIKE CONCAT('%', #{req.usageArea}, '%')</if>
+ <if test="req.productCategory != null and req.productCategory != ''">AND product_category = #{req.productCategory}</if>
+ GROUP BY energy_type, period, usage_area
+ ORDER BY period, energy_type, usage_area
+ </script>
+ """)
+ List<Aggregate> selectAnalysis(@Param("req") EnergyAnalysisReqVO req);
+
+ @Data
+ class Aggregate {
+ private String energyType;
+ private String period;
+ private String usageArea;
+ private BigDecimal quantity;
+ private BigDecimal amount;
+ private long recordCount;
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
index 1cf3bf0..0aa45c9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
@@ -133,4 +133,19 @@
.setSql("last_feedback_time = NOW()"));
}
+ /**
+ * 鏌ヨ宸ヤ綔绔欎笂姝e湪杩愯鐨勪换鍔★細鐢熶骇涓�侀儴鍒嗗畬鎴愩�佸凡鍋滃伐
+ *
+ * <p>鏁伴噰妯″潡鏍规嵁璁惧涓婃姤鐨勬暟鎹畾浣嶅綋鍓嶄换鍔℃椂浣跨敤銆�</p>
+ */
+ default MesProTaskDO selectRunningTaskByWorkstationId(Long workstationId) {
+ return selectOne(new LambdaQueryWrapperX<MesProTaskDO>()
+ .eq(MesProTaskDO::getWorkstationId, workstationId)
+ .in(MesProTaskDO::getStatus, MesProTaskStatusEnum.PRODUCING.getStatus(),
+ MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus(), MesProTaskStatusEnum.PAUSED.getStatus())
+ .orderByDesc(MesProTaskDO::getLastFeedbackTime)
+ .orderByDesc(MesProTaskDO::getId)
+ .last("LIMIT 1"));
+ }
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ledger/MesQcInspectionLedgerMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ledger/MesQcInspectionLedgerMapper.java
new file mode 100644
index 0000000..3a27ea3
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ledger/MesQcInspectionLedgerMapper.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.qc.ledger;
+
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerRespVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * MES 妫�娴嬬粨鏋滃彴璐� Mapper
+ *
+ * 浣跨敤 UNION ALL SQL 浠庡洓绫绘楠屽崟锛圛QC/IPQC/OQC/RQC锛夋媺鍙栨楠屽崟锛屽啀鍏宠仈妫�楠岀粨鏋滄槑缁嗕笌妫�娴嬮」锛屼竴琛屼竴涓娴嬮」缁撴灉
+ */
+@Mapper
+public interface MesQcInspectionLedgerMapper {
+
+ IPage<MesQcInspectionLedgerRespVO> selectInspectionLedgerPage(IPage<MesQcInspectionLedgerRespVO> page,
+ @Param("reqVO") MesQcInspectionLedgerPageReqVO reqVO);
+
+}
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/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index 67dbcd6..8f24866 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -1001,4 +1001,8 @@
ErrorCode PD_CTC_REEL_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_040_960_010, "瀵煎叆鐩樺叿璁$畻鏁版嵁涓嶈兘涓虹┖锛�");
ErrorCode PD_TECH_CONFIRM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_040_960_011, "瀵煎叆鎶�鏈‘璁ゅ嚱鏁版嵁涓嶈兘涓虹┖锛�");
+ // ========== MES 鏁伴噰-鎶ヨ锛�1-040-920-000锛� ==========
+ ErrorCode COLLECT_ALARM_NOT_EXISTS = new ErrorCode(1_040_920_001, "鎶ヨ璁板綍涓嶅瓨鍦�");
+ ErrorCode COLLECT_ALARM_ALREADY_CLEARED = new ErrorCode(1_040_920_002, "璇ユ姤璀﹀凡娑堥櫎锛屾棤闇�閲嶅纭");
+
}
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/collect/MesCollectAlarmStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectAlarmStatusEnum.java
new file mode 100644
index 0000000..3ebab17
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectAlarmStatusEnum.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.mes.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * MES 鏁伴噰鎶ヨ鐘舵��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum MesCollectAlarmStatusEnum {
+
+ ACTIVE(0, "鏈秷闄�"),
+ CLEARED(1, "宸叉秷闄�");
+
+ private final Integer status;
+ private final String name;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectMsgTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectMsgTypeEnum.java
new file mode 100644
index 0000000..a86a59e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectMsgTypeEnum.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * MES 鏁伴噰鎶ユ枃绫诲瀷
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum MesCollectMsgTypeEnum {
+
+ REALTIME("realtime", "瀹炴椂鏁版嵁"),
+ SPC("spc", "鍛ㄦ湡杩囩▼鏁版嵁"),
+ TECH("tech", "宸ヨ壓鍙傛暟"),
+ OP_LOG("opLog", "鍙傛暟鍙樻洿鏃ュ織"),
+ ALARM("alarm", "鎶ヨ"),
+ CONNECT("connect", "璁惧涓婄嚎"),
+ DISCONNECT("disconnect", "璁惧绂荤嚎"),
+ UNKNOWN("unknown", "鏈煡绫诲瀷");
+
+ private final String type;
+ private final String name;
+
+ public static MesCollectMsgTypeEnum getByType(String type) {
+ for (MesCollectMsgTypeEnum value : values()) {
+ if (value.type.equalsIgnoreCase(type)) {
+ return value;
+ }
+ }
+ return UNKNOWN;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectOperateModeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectOperateModeEnum.java
new file mode 100644
index 0000000..b12bc34
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectOperateModeEnum.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.mes.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * MES 鏁伴噰璁惧杩愯妯″紡
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum MesCollectOperateModeEnum {
+
+ MANUAL(0, "鎵嬪姩"),
+ SEMI_AUTO(1, "鍗婅嚜鍔�"),
+ EYE_AUTO(2, "鐢电溂鑷姩"),
+ TIME_AUTO(3, "鏃堕棿鑷姩"),
+ MOLD_ADJUST(4, "璋冩ā浣跨敤");
+
+ private final Integer mode;
+ private final String name;
+
+ public static String getNameByMode(Integer mode) {
+ if (mode == null) {
+ return null;
+ }
+ for (MesCollectOperateModeEnum value : values()) {
+ if (value.mode.equals(mode)) {
+ return value.name;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectRunStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectRunStatusEnum.java
new file mode 100644
index 0000000..d8e4949
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/collect/MesCollectRunStatusEnum.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.mes.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * MES 鏁伴噰璁惧杩愯鐘舵��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Getter
+@AllArgsConstructor
+public enum MesCollectRunStatusEnum {
+
+ STANDBY(1, "寰呮満"),
+ PRODUCING(2, "鐢熶骇");
+
+ private final Integer status;
+ private final String name;
+
+ public static String getNameByStatus(Integer status) {
+ if (status == null) {
+ return null;
+ }
+ for (MesCollectRunStatusEnum value : values()) {
+ if (value.status.equals(status)) {
+ return value.name;
+ }
+ }
+ return null;
+ }
+
+}
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/framework/collect/config/MesCollectProperties.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/config/MesCollectProperties.java
new file mode 100644
index 0000000..c4ef755
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/config/MesCollectProperties.java
@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.mes.framework.collect.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * MES 鏁伴噰閰嶇疆
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+@ConfigurationProperties(prefix = "yudao.mes.collect")
+@Data
+public class MesCollectProperties {
+
+ /**
+ * 鎶ユ枃鏍煎紡锛氭敞濉戞満 /YLCY/IMM 鍗忚锛堟姤鏂囧甫 topic 瀛楁锛屼富棰樻湯娈典负鎶ユ枃绫诲瀷锛�
+ */
+ public static final String FORMAT_YLCY = "ylcy";
+ /**
+ * 鎶ユ枃鏍煎紡锛氳澶囩綉鍏冲崗璁紙涓婚鍥哄畾 gateway/xxx锛屾姤鏂囬灞� key 涓鸿澶囧悕锛屽�间负灞炴�у瓧鍏革級
+ */
+ public static final String FORMAT_GATEWAY = "gateway";
+
+ private Mqtt mqtt = new Mqtt();
+ private Retention retention = new Retention();
+
+ @Data
+ public static class Mqtt {
+
+ /**
+ * 鏄惁鍚敤鏁伴噰 MQTT 璁㈤槄
+ */
+ private Boolean enabled = false;
+ /**
+ * Broker 鍦板潃锛屼緥濡� tcp://36.213.90.123:1883
+ */
+ private String url;
+ private String username;
+ private String password;
+ /**
+ * 瀹㈡埛绔� ID 鍓嶇紑
+ */
+ private String clientIdPrefix = "mes-collect";
+ /**
+ * 涓婚鍓嶇紑锛屼緥濡� /YLCY/IMM銆乬ateway
+ */
+ private String topicPrefix = "/YLCY/IMM";
+ /**
+ * 鎶ユ枃鏍煎紡锛岃 {@link MesCollectProperties#FORMAT_YLCY}銆亄@link MesCollectProperties#FORMAT_GATEWAY}
+ */
+ private String format = FORMAT_YLCY;
+ /**
+ * 鏄惧紡鎸囧畾璁㈤槄涓婚锛屽涓敤閫楀彿鍒嗛殧锛涗负绌烘椂鎸� format + topicPrefix 鑷姩鎺ㄥ
+ */
+ private String topics;
+ private Integer qos = 0;
+ private Integer keepAlive = 65;
+ private Integer connectionTimeout = 10;
+ /**
+ * 鎶ヨ涓婚鍚庣紑锛屾姤鏂� topic 瀛楁鎴栦富棰樻湯娈靛懡涓椂鎸夋姤璀﹀鐞�
+ */
+ private String alarmTopicSuffix = "wm";
+
+ /**
+ * 鏄惁涓鸿澶囩綉鍏虫牸寮忔姤鏂�
+ */
+ public boolean isGatewayFormat() {
+ return FORMAT_GATEWAY.equalsIgnoreCase(format == null ? "" : format.trim());
+ }
+
+ }
+
+ @Data
+ public static class Retention {
+
+ /**
+ * 鍘熷鎶ユ枃淇濈暀澶╂暟
+ */
+ private Integer rawDays = 7;
+ /**
+ * 瀹炴椂鍘嗗彶淇濈暀澶╂暟
+ */
+ private Integer realtimeDays = 30;
+ /**
+ * 鍗曟娓呯悊鏉℃暟
+ */
+ private Integer batchSize = 50000;
+
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/mqtt/MesCollectMqttClient.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/mqtt/MesCollectMqttClient.java
new file mode 100644
index 0000000..6cb6818
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/collect/mqtt/MesCollectMqttClient.java
@@ -0,0 +1,198 @@
+package cn.iocoder.yudao.module.mes.framework.collect.mqtt;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.mes.framework.collect.config.MesCollectProperties;
+import cn.iocoder.yudao.module.mes.service.collect.MesCollectMessageDispatcher;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.*;
+import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import org.springframework.context.SmartLifecycle;
+import org.springframework.stereotype.Component;
+
+import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * MES 鏁伴噰 MQTT 瀹㈡埛绔�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+@Slf4j
+public class MesCollectMqttClient implements SmartLifecycle {
+
+ private static final long RECONNECT_DELAY_SECONDS = 30L;
+
+ @Resource
+ private MesCollectProperties properties;
+ @Resource
+ private MesCollectMessageDispatcher dispatcher;
+
+ private volatile boolean running = false;
+ private MqttClient client;
+ private ScheduledExecutorService scheduler;
+
+ @Override
+ public void start() {
+ MesCollectProperties.Mqtt mqtt = properties.getMqtt();
+ if (!Boolean.TRUE.equals(mqtt.getEnabled())) {
+ log.info("[start][鏁伴噰 MQTT 鏈惎鐢╙");
+ return;
+ }
+ if (StrUtil.isBlank(mqtt.getUrl())) {
+ log.warn("[start][鏁伴噰 MQTT 宸插惎鐢ㄤ絾 url 涓虹┖锛岃烦杩囪繛鎺");
+ return;
+ }
+ running = true;
+ scheduler = Executors.newSingleThreadScheduledExecutor(runnable -> {
+ Thread thread = new Thread(runnable, "mes-collect-mqtt-reconnect");
+ thread.setDaemon(true);
+ return thread;
+ });
+ scheduler.scheduleWithFixedDelay(this::ensureConnected, 0, RECONNECT_DELAY_SECONDS, TimeUnit.SECONDS);
+ }
+
+ private void ensureConnected() {
+ if (!running) {
+ return;
+ }
+ MesCollectProperties.Mqtt mqtt = properties.getMqtt();
+ try {
+ if (client == null) {
+ client = new MqttClient(mqtt.getUrl(), buildClientId(), new MemoryPersistence());
+ client.setCallback(new MqttCallbackExtended() {
+ @Override
+ public void connectComplete(boolean reconnect, String serverURI) {
+ subscribe();
+ }
+
+ @Override
+ public void connectionLost(Throwable cause) {
+ log.warn("[connectionLost][鏁伴噰 MQTT 杩炴帴鏂紑锛歿}]", cause == null ? "鏈煡鍘熷洜" : cause.getMessage());
+ }
+
+ @Override
+ public void messageArrived(String topic, MqttMessage message) {
+ String payload = new String(message.getPayload(), StandardCharsets.UTF_8);
+ try {
+ dispatcher.dispatch(topic, payload);
+ } catch (Exception e) {
+ log.error("[messageArrived][涓婚({}) 鍏ラ槦澶辫触]", topic, e);
+ }
+ }
+
+ @Override
+ public void deliveryComplete(IMqttDeliveryToken token) {
+ // 褰撳墠鍙闃咃紝涓嶅彂甯�
+ }
+ });
+ }
+ if (!client.isConnected()) {
+ MqttConnectOptions options = new MqttConnectOptions();
+ options.setAutomaticReconnect(true);
+ options.setCleanSession(true);
+ options.setKeepAliveInterval(mqtt.getKeepAlive());
+ options.setConnectionTimeout(mqtt.getConnectionTimeout());
+ if (StrUtil.isNotBlank(mqtt.getUsername())) {
+ options.setUserName(mqtt.getUsername());
+ }
+ if (mqtt.getPassword() != null) {
+ options.setPassword(mqtt.getPassword().toCharArray());
+ }
+ client.connect(options);
+ log.info("[ensureConnected][鏁伴噰 MQTT 宸茶繛鎺ワ細{}]", mqtt.getUrl());
+ }
+ } catch (Exception e) {
+ log.warn("[ensureConnected][鏁伴噰 MQTT 杩炴帴/璁㈤槄澶辫触锛寋} 绉掑悗閲嶈瘯锛歿}]",
+ RECONNECT_DELAY_SECONDS, e.getMessage());
+ }
+ }
+
+ private void subscribe() {
+ MesCollectProperties.Mqtt mqtt = properties.getMqtt();
+ for (String topic : resolveSubscribeTopics(mqtt)) {
+ try {
+ client.subscribe(topic, mqtt.getQos());
+ log.info("[subscribe][鏁伴噰 MQTT 璁㈤槄鎴愬姛锛歿}]", topic);
+ } catch (Exception e) {
+ log.error("[subscribe][鏁伴噰 MQTT 璁㈤槄澶辫触锛歿}]", topic, e);
+ }
+ }
+ }
+
+ /**
+ * 瑙f瀽闇�瑕佽闃呯殑涓婚銆�
+ *
+ * <p>鏄惧紡閰嶇疆 topics 浼樺厛锛涚綉鍏虫牸寮忚闃呮暣涓墠缂�锛坓ateway/#锛夛紝
+ * 鍥犱负缃戝叧闄� attributes 澶栬繕浼氬彂 connect / disconnect锛屽悗缁篃鍙兘鏂板涓婚锛�
+ * 鍏朵綑鏍煎紡娌跨敤 /YLCY/IMM/+/+ 涓ょ骇閫氶厤銆�</p>
+ */
+ private List<String> resolveSubscribeTopics(MesCollectProperties.Mqtt mqtt) {
+ if (StrUtil.isNotBlank(mqtt.getTopics())) {
+ return Arrays.stream(mqtt.getTopics().split(","))
+ .map(String::trim)
+ .filter(StrUtil::isNotBlank)
+ .toList();
+ }
+ String prefix = normalizeTopicPrefix(mqtt.getTopicPrefix());
+ return Collections.singletonList(mqtt.isGatewayFormat() ? prefix + "#" : prefix + "+/+");
+ }
+
+ private String normalizeTopicPrefix(String prefix) {
+ if (StrUtil.isBlank(prefix)) {
+ return "";
+ }
+ return prefix.endsWith("/") ? prefix : prefix + "/";
+ }
+
+ private String buildClientId() {
+ String host;
+ try {
+ host = InetAddress.getLocalHost().getHostName();
+ } catch (Exception e) {
+ host = "host";
+ }
+ host = host.replaceAll("[^a-zA-Z0-9_-]", "_");
+ String clientId = properties.getMqtt().getClientIdPrefix() + "-" + host + "-"
+ + Long.toHexString(System.nanoTime());
+ return StrUtil.maxLength(clientId, 64);
+ }
+
+ @Override
+ public void stop() {
+ running = false;
+ if (scheduler != null) {
+ scheduler.shutdownNow();
+ scheduler = null;
+ }
+ if (client != null) {
+ try {
+ if (client.isConnected()) {
+ client.disconnect();
+ }
+ } catch (Exception e) {
+ log.warn("[stop][鏁伴噰 MQTT 鏂紑澶辫触锛歿}]", e.getMessage());
+ }
+ try {
+ client.close(true);
+ } catch (Exception e) {
+ log.warn("[stop][鏁伴噰 MQTT 鍏抽棴澶辫触锛歿}]", e.getMessage());
+ }
+ client = null;
+ }
+ log.info("[stop][鏁伴噰 MQTT 宸插仠姝");
+ }
+
+ @Override
+ public boolean isRunning() {
+ return running;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/job/collect/MesCollectCleanupJob.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/job/collect/MesCollectCleanupJob.java
new file mode 100644
index 0000000..82101e3
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/job/collect/MesCollectCleanupJob.java
@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.mes.job.collect;
+
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.MesCollectMessageMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.MesCollectRealtimeHistoryMapper;
+import cn.iocoder.yudao.module.mes.framework.collect.config.MesCollectProperties;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰鍘嗗彶鏁版嵁娓呯悊浠诲姟
+ *
+ * <p>鍘熷鎶ユ枃淇濈暀 7 澶╋紝瀹炴椂鍘嗗彶淇濈暀 30 澶╋紝姣忔棩 03:30 鎵ц銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+@Slf4j
+public class MesCollectCleanupJob {
+
+ @Resource
+ private MesCollectProperties properties;
+ @Resource
+ private MesCollectMessageMapper messageMapper;
+ @Resource
+ private MesCollectRealtimeHistoryMapper realtimeHistoryMapper;
+
+ @Scheduled(cron = "0 30 3 * * ?")
+ public void execute() {
+ MesCollectProperties.Retention retention = properties.getRetention();
+ int batchSize = retention.getBatchSize() == null || retention.getBatchSize() <= 0
+ ? 50000 : retention.getBatchSize();
+ int rawDeleted = deleteInBatches(() -> messageMapper.deleteBefore(
+ LocalDateTime.now().minusDays(retention.getRawDays()), batchSize), batchSize);
+ int realtimeDeleted = deleteInBatches(() -> realtimeHistoryMapper.deleteBefore(
+ LocalDateTime.now().minusDays(retention.getRealtimeDays()), batchSize), batchSize);
+ log.info("[execute][鏁伴噰鍘嗗彶娓呯悊瀹屾垚锛氬師濮嬫姤鏂� {} 鏉★紝瀹炴椂鍘嗗彶 {} 鏉", rawDeleted, realtimeDeleted);
+ }
+
+ private int deleteInBatches(DeleteAction action, int batchSize) {
+ int total = 0;
+ int deleted;
+ do {
+ deleted = action.delete();
+ total += deleted;
+ } while (deleted >= batchSize);
+ return total;
+ }
+
+ @FunctionalInterface
+ private interface DeleteAction {
+ int delete();
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataParser.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataParser.java
new file mode 100644
index 0000000..2215a08
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataParser.java
@@ -0,0 +1,237 @@
+package cn.iocoder.yudao.module.mes.service.collect;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectMsgTypeEnum;
+import tools.jackson.databind.JsonNode;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * MES 鏁伴噰鎶ユ枃瑙f瀽宸ュ叿
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+@Slf4j
+public class MesCollectDataParser {
+
+ private static final DateTimeFormatter DATE_TIME_FORMATTER =
+ DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss[.SSS]");
+
+ public JsonNode parsePayload(String payload) {
+ return JsonUtils.parseTree(payload);
+ }
+
+ public JsonNode parseData(JsonNode root) {
+ JsonNode data = root.get("Data");
+ if (data != null && data.isTextual()) {
+ try {
+ data = JsonUtils.parseTree(data.asText());
+ } catch (Exception e) {
+ log.warn("[parseData][Data 瀛楁涓嶆槸鍚堟硶 JSON锛屾寜鍘熸枃澶勭悊锛歿}]", StrUtil.maxLength(data.asText(), 200));
+ return root;
+ }
+ }
+ return data != null && data.isObject() ? data : root;
+ }
+
+ public String getText(JsonNode node, String field) {
+ JsonNode value = node.get(field);
+ return value == null || value.isNull() ? null : value.asText();
+ }
+
+ public Integer getInteger(JsonNode node, String field) {
+ JsonNode value = node.get(field);
+ if (value == null || value.isNull()) {
+ return null;
+ }
+ if (value.isNumber()) {
+ return value.intValue();
+ }
+ try {
+ return Integer.valueOf(value.asText().trim());
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }
+
+ public Long getLong(JsonNode node, String field) {
+ JsonNode value = node.get(field);
+ if (value == null || value.isNull()) {
+ return null;
+ }
+ if (value.isNumber()) {
+ return value.longValue();
+ }
+ try {
+ return Long.valueOf(value.asText().trim());
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }
+
+ public BigDecimal getDecimal(JsonNode node, String field) {
+ JsonNode value = node.get(field);
+ if (value == null || value.isNull()) {
+ return null;
+ }
+ if (value.isNumber()) {
+ return value.decimalValue();
+ }
+ try {
+ return new BigDecimal(value.asText().trim());
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }
+
+ /**
+ * 鎻愬彇鎸囧畾鍓嶇紑 + 鏁板瓧鐨勫瓧娈碉紝濡� T1..Tn銆丒T1..ETn
+ */
+ public String extractNumberedFields(JsonNode data, String prefix) {
+ Map<String, Object> result = new LinkedHashMap<>();
+ data.properties().forEach(entry -> {
+ String name = entry.getKey();
+ if (!name.startsWith(prefix) || name.length() == prefix.length()) {
+ return;
+ }
+ String suffix = name.substring(prefix.length());
+ if (!suffix.chars().allMatch(Character::isDigit)) {
+ return;
+ }
+ JsonNode value = entry.getValue();
+ result.put(name, value != null && value.isNumber() ? value.decimalValue() : value == null ? null : value.asText());
+ });
+ if (result.isEmpty()) {
+ return null;
+ }
+ return JsonUtils.toJsonString(result);
+ }
+
+ public LocalDateTime parseEventTime(JsonNode root) {
+ LocalDateTime time = parseTimeText(getText(root, "time"));
+ if (time != null) {
+ return time;
+ }
+ Long timestamp = getLong(root, "timestamp");
+ if (timestamp == null) {
+ timestamp = getLong(root, "sendStamp");
+ }
+ if (timestamp != null && timestamp > 0) {
+ Instant instant = timestamp > 1_000_000_000_000L
+ ? Instant.ofEpochMilli(timestamp) : Instant.ofEpochSecond(timestamp);
+ return LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
+ }
+ return LocalDateTime.now();
+ }
+
+ public LocalDateTime parseTimeText(String text) {
+ if (StrUtil.isBlank(text)) {
+ return null;
+ }
+ try {
+ return LocalDateTime.parse(text.trim(), DATE_TIME_FORMATTER);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ public String valueToString(JsonNode value) {
+ if (value == null || value.isNull()) {
+ return null;
+ }
+ return value.isValueNode() ? value.asText() : value.toString();
+ }
+
+ public MesCollectMsgTypeEnum resolveMsgType(String topicField, String mqttTopic,
+ JsonNode data, String alarmTopicSuffix) {
+ MesCollectMsgTypeEnum type = MesCollectMsgTypeEnum.getByType(topicField);
+ if (type != MesCollectMsgTypeEnum.UNKNOWN) {
+ return type;
+ }
+ if (StrUtil.isNotBlank(topicField) && StrUtil.equalsIgnoreCase(topicField, alarmTopicSuffix)) {
+ return MesCollectMsgTypeEnum.ALARM;
+ }
+ String suffix = extractTopicSuffix(mqttTopic);
+ if (StrUtil.isNotBlank(suffix)) {
+ type = MesCollectMsgTypeEnum.getByType(suffix);
+ if (type != MesCollectMsgTypeEnum.UNKNOWN) {
+ return type;
+ }
+ if (StrUtil.equalsIgnoreCase(suffix, alarmTopicSuffix)) {
+ return MesCollectMsgTypeEnum.ALARM;
+ }
+ }
+ if (data == null) {
+ return MesCollectMsgTypeEnum.UNKNOWN;
+ }
+ if (data.has("wmId")) {
+ return MesCollectMsgTypeEnum.ALARM;
+ }
+ if (data.has("varId")) {
+ return MesCollectMsgTypeEnum.OP_LOG;
+ }
+ if (data.has("CYCN")) {
+ return MesCollectMsgTypeEnum.SPC;
+ }
+ if (data.has("STS") || data.has("OPM")) {
+ return MesCollectMsgTypeEnum.REALTIME;
+ }
+ if (data.has("TS1") || data.has("CP1M")) {
+ return MesCollectMsgTypeEnum.TECH;
+ }
+ return MesCollectMsgTypeEnum.UNKNOWN;
+ }
+
+ public String resolveDeviceId(JsonNode root, String mqttTopic) {
+ String deviceId = getText(root, "devId");
+ if (StrUtil.isNotBlank(deviceId)) {
+ return deviceId.trim();
+ }
+ String[] parts = mqttTopic == null ? new String[0] : mqttTopic.split("/");
+ return parts.length >= 2 ? parts[parts.length - 2] : null;
+ }
+
+ /**
+ * 缃戝叧鏍煎紡鎶ユ枃鎷嗗寘锛氭姤鏂囬灞� key 鏄澶囧悕锛寁alue 鏄璁惧鐨勫睘鎬у瓧鍏搞��
+ *
+ * <p>渚嬪 {"630妗嗙粸鏈�2":{"璁$背":268.3499}} 鎷嗘垚 {630妗嗙粸鏈�2 -> {"璁$背":268.3499}}锛�
+ * 杩炴帴浜嬩欢 {"device":"澶ф媺"} 杩欑被鎵佸钩鎶ユ枃娌℃湁宓屽瀵硅薄锛岃繑鍥炵┖ Map 鐢辫皟鐢ㄦ柟鍙﹁澶勭悊銆�</p>
+ */
+ public Map<String, JsonNode> splitGatewayDevices(JsonNode root) {
+ Map<String, JsonNode> devices = new LinkedHashMap<>();
+ if (root == null || !root.isObject()) {
+ return devices;
+ }
+ root.properties().forEach(entry -> {
+ String deviceCode = StrUtil.trim(entry.getKey());
+ JsonNode data = entry.getValue();
+ if (StrUtil.isBlank(deviceCode) || data == null || !data.isObject()) {
+ return;
+ }
+ devices.put(deviceCode, data);
+ });
+ return devices;
+ }
+
+ /**
+ * 鍙栦富棰樻湯娈典綔涓烘姤鏂囩被鍨嬶紝濡� gateway/attributes -> attributes銆乬ateway/disconnect -> disconnect
+ */
+ public String extractTopicSuffix(String mqttTopic) {
+ if (StrUtil.isBlank(mqttTopic)) {
+ return null;
+ }
+ String[] parts = mqttTopic.split("/");
+ return parts.length == 0 ? null : parts[parts.length - 1];
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataService.java
new file mode 100644
index 0000000..b1624a4
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectDataService.java
@@ -0,0 +1,188 @@
+package cn.iocoder.yudao.module.mes.service.collect;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.*;
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.*;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectAlarmStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectMsgTypeEnum;
+import tools.jackson.databind.JsonNode;
+import jakarta.annotation.Resource;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * MES 鏁伴噰鏁版嵁钀藉簱 Service
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class MesCollectDataService {
+
+ @Resource
+ private MesCollectDataParser parser;
+ @Resource
+ private MesCollectMessageMapper messageMapper;
+ @Resource
+ private MesCollectRealtimeMapper realtimeMapper;
+ @Resource
+ private MesCollectRealtimeHistoryMapper realtimeHistoryMapper;
+ @Resource
+ private MesCollectCycleMapper cycleMapper;
+ @Resource
+ private MesCollectTechMapper techMapper;
+ @Resource
+ private MesCollectOperateLogMapper collectOperateLogMapper;
+ @Resource
+ private MesCollectAlarmMapper alarmMapper;
+
+ public Long saveRawMessage(String deviceCode, Long machineryId, String mqttTopic,
+ MesCollectMsgTypeEnum msgType, LocalDateTime eventTime, String payload) {
+ MesCollectMessageDO message = MesCollectMessageDO.builder()
+ .deviceCode(deviceCode).machineryId(machineryId).mqttTopic(mqttTopic)
+ .msgType(msgType.getType()).eventTime(eventTime).rawPayload(payload)
+ .processStatus(0).receiveTime(LocalDateTime.now()).build();
+ messageMapper.insert(message);
+ return message.getId();
+ }
+
+ public void markRawMessageFailed(Long id, String error) {
+ if (id == null) {
+ return;
+ }
+ messageMapper.updateById(MesCollectMessageDO.builder()
+ .id(id).processStatus(1).errorMsg(StrUtil.maxLength(error, 1000)).build());
+ }
+
+ public void saveRealtime(String deviceCode, Long machineryId, Long taskId, Long workOrderId,
+ LocalDateTime eventTime, JsonNode data) {
+ MesCollectRealtimeDO snapshot = MesCollectRealtimeDO.builder()
+ .machineryId(machineryId).deviceCode(deviceCode).taskId(taskId).workOrderId(workOrderId)
+ .collectTime(eventTime)
+ .sts(parser.getInteger(data, "STS"))
+ .opm(parser.getInteger(data, "OPM"))
+ .asts(parser.getInteger(data, "ASTS"))
+ .ot(parser.getDecimal(data, "OT"))
+ .temps(parser.extractNumberedFields(data, "T"))
+ .dataJson(data.toString())
+ .build();
+ MesCollectRealtimeDO existing = realtimeMapper.selectByDeviceCode(deviceCode);
+ if (existing != null) {
+ snapshot.setId(existing.getId());
+ realtimeMapper.updateById(snapshot);
+ } else {
+ try {
+ realtimeMapper.insert(snapshot);
+ } catch (DuplicateKeyException e) {
+ MesCollectRealtimeDO current = realtimeMapper.selectByDeviceCode(deviceCode);
+ if (current != null) {
+ snapshot.setId(current.getId());
+ realtimeMapper.updateById(snapshot);
+ }
+ }
+ }
+
+ MesCollectRealtimeHistoryDO history = MesCollectRealtimeHistoryDO.builder()
+ .machineryId(machineryId).deviceCode(deviceCode).taskId(taskId).workOrderId(workOrderId)
+ .collectTime(eventTime)
+ .sts(snapshot.getSts())
+ .opm(snapshot.getOpm())
+ .asts(snapshot.getAsts())
+ .ot(snapshot.getOt())
+ .temps(snapshot.getTemps())
+ .dataJson(snapshot.getDataJson())
+ .build();
+ try {
+ realtimeHistoryMapper.insert(history);
+ } catch (DuplicateKeyException ignored) {
+ // 鍚屼竴璁惧鍚屼竴绉掔殑閲嶅鎶ユ枃锛岀洿鎺ュ拷鐣�
+ }
+ }
+
+ public void saveCycle(String deviceCode, Long machineryId, Long taskId, Long workOrderId,
+ LocalDateTime eventTime, JsonNode data) {
+ Long cycleNo = parser.getLong(data, "CYCN");
+ MesCollectCycleDO cycle = MesCollectCycleDO.builder()
+ .machineryId(machineryId).deviceCode(deviceCode).taskId(taskId).workOrderId(workOrderId)
+ .cycleNo(cycleNo == null ? 0L : cycleNo)
+ .collectTime(eventTime)
+ .ecyct(parser.getDecimal(data, "ECYCT"))
+ .eiss(parser.getDecimal(data, "EISS"))
+ .eivm(parser.getDecimal(data, "EIVM"))
+ .eipm(parser.getDecimal(data, "EIPM"))
+ .esipt(parser.getDecimal(data, "ESIPT"))
+ .esipp(parser.getDecimal(data, "ESIPP"))
+ .esips(parser.getDecimal(data, "ESIPS"))
+ .eipt(parser.getDecimal(data, "EIPT"))
+ .eipse(parser.getDecimal(data, "EIPSE"))
+ .eplst(parser.getDecimal(data, "EPLST"))
+ .eplsse(parser.getDecimal(data, "EPLSSE"))
+ .eplspm(parser.getDecimal(data, "EPLSPM"))
+ .etTemps(parser.extractNumberedFields(data, "ET"))
+ .dataJson(data.toString())
+ .build();
+ try {
+ cycleMapper.insert(cycle);
+ } catch (DuplicateKeyException ignored) {
+ // 鍚屼竴鍛ㄦ湡閲嶅涓婃姤锛岀洿鎺ュ拷鐣�
+ }
+ }
+
+ public void saveTech(String deviceCode, Long machineryId, Long taskId, Long workOrderId,
+ LocalDateTime eventTime, JsonNode data) {
+ MesCollectTechDO tech = MesCollectTechDO.builder()
+ .machineryId(machineryId).deviceCode(deviceCode).taskId(taskId).workOrderId(workOrderId)
+ .collectTime(eventTime).dataJson(data.toString()).build();
+ MesCollectTechDO existing = techMapper.selectByDeviceCode(deviceCode);
+ if (existing != null) {
+ tech.setId(existing.getId());
+ techMapper.updateById(tech);
+ } else {
+ try {
+ techMapper.insert(tech);
+ } catch (DuplicateKeyException e) {
+ MesCollectTechDO current = techMapper.selectByDeviceCode(deviceCode);
+ if (current != null) {
+ tech.setId(current.getId());
+ techMapper.updateById(tech);
+ }
+ }
+ }
+ }
+
+ public void saveOperateLog(String deviceCode, Long machineryId, Long taskId, Long workOrderId,
+ LocalDateTime eventTime, JsonNode data) {
+ LocalDateTime modifyTime = parser.parseTimeText(parser.getText(data, "modifyTime"));
+ collectOperateLogMapper.insert(MesCollectOperateLogDO.builder()
+ .machineryId(machineryId).deviceCode(deviceCode).taskId(taskId).workOrderId(workOrderId)
+ .varId(parser.getText(data, "varId"))
+ .oldValue(StrUtil.maxLength(parser.valueToString(data.get("lastValue")), 500))
+ .newValue(StrUtil.maxLength(parser.valueToString(data.get("value")), 500))
+ .modifyTime(modifyTime == null ? eventTime : modifyTime)
+ .collectTime(eventTime).dataJson(data.toString())
+ .build());
+ }
+
+ public void saveAlarm(String deviceCode, Long machineryId, Long taskId, Long workOrderId,
+ LocalDateTime eventTime, JsonNode data) {
+ Integer wmId = parser.getInteger(data, "wmId");
+ LocalDateTime wmTime = parser.parseTimeText(parser.getText(data, "wmTime"));
+ if (wmTime == null) {
+ wmTime = eventTime;
+ }
+ if (wmId != null && wmId == 0) {
+ alarmMapper.clearActiveByDeviceCode(deviceCode, wmTime);
+ return;
+ }
+ alarmMapper.insert(MesCollectAlarmDO.builder()
+ .machineryId(machineryId).deviceCode(deviceCode).taskId(taskId).workOrderId(workOrderId)
+ .wmId(wmId)
+ .wmMsg(StrUtil.maxLength(parser.getText(data, "wmMsg"), 500))
+ .wmTime(wmTime)
+ .status(MesCollectAlarmStatusEnum.ACTIVE.getStatus())
+ .collectTime(eventTime).dataJson(data.toString())
+ .build());
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectMessageDispatcher.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectMessageDispatcher.java
new file mode 100644
index 0000000..5d58a8e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectMessageDispatcher.java
@@ -0,0 +1,204 @@
+package cn.iocoder.yudao.module.mes.service.collect;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.dv.machinery.MesDvMachineryMapper;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectMsgTypeEnum;
+import cn.iocoder.yudao.module.mes.framework.collect.config.MesCollectProperties;
+import tools.jackson.databind.JsonNode;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * MES 鏁伴噰鎶ユ枃鍒嗗彂鍣�
+ *
+ * <p>Paho 鍥炶皟绾跨▼鍙礋璐e叆闃燂紝瑙f瀽涓庤惤搴撳湪鍗曠嚎绋嬩腑涓茶鎵ц锛屼繚璇佸悓涓�璁惧鎶ヨ绛夌姸鎬佹寜椤哄簭澶勭悊銆�</p>
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Component
+@Slf4j
+public class MesCollectMessageDispatcher {
+
+ /**
+ * 缃戝叧鏍煎紡閲屾壙杞借澶囧睘鎬у揩鐓х殑涓婚鏈
+ */
+ private static final String ATTR_TOPIC_SUFFIX = "attributes";
+
+ @Resource
+ private MesCollectProperties properties;
+ @Resource
+ private MesCollectDataParser parser;
+ @Resource
+ private MesCollectDataService dataService;
+ @Resource
+ private MesDvMachineryMapper machineryMapper;
+ @Resource
+ private MesCollectTaskResolver taskResolver;
+
+ private final ExecutorService executor = new ThreadPoolExecutor(1, 1,
+ 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(10_000),
+ new ThreadFactory() {
+ private final AtomicInteger index = new AtomicInteger();
+
+ @Override
+ public Thread newThread(Runnable runnable) {
+ Thread thread = new Thread(runnable, "mes-collect-dispatch-" + index.incrementAndGet());
+ thread.setDaemon(true);
+ return thread;
+ }
+ }, new ThreadPoolExecutor.CallerRunsPolicy());
+
+ /**
+ * 璁惧鏈粦瀹氬彴璐︽椂鐨勫憡璀︾紦瀛橈紝閬垮厤姣忔潯鎶ユ枃閲嶅鍒锋棩蹇�
+ */
+ private final ConcurrentHashMap<String, Long> unboundWarnCache = new ConcurrentHashMap<>();
+
+ public void dispatch(String topic, String payload) {
+ executor.execute(() -> process(topic, payload));
+ }
+
+ private void process(String topic, String payload) {
+ // 缃戝叧鏍煎紡鎶ユ枃缁撴瀯瀹屽叏涓嶅悓锛堜富棰樺浐瀹氥�佽澶囦互鎶ユ枃棣栧眰 key 鍖哄垎锛夛紝鍗曠嫭澶勭悊
+ if (properties.getMqtt().isGatewayFormat()) {
+ processGateway(topic, payload);
+ return;
+ }
+ JsonNode root;
+ try {
+ root = parser.parsePayload(payload);
+ } catch (Exception e) {
+ log.warn("[process][涓婚({}) 鎶ユ枃涓嶆槸鍚堟硶 JSON锛歿}]", topic, StrUtil.maxLength(payload, 200));
+ dataService.markRawMessageFailed(
+ dataService.saveRawMessage(null, null, topic, MesCollectMsgTypeEnum.UNKNOWN,
+ LocalDateTime.now(), payload),
+ "鎶ユ枃涓嶆槸鍚堟硶 JSON锛�" + e.getMessage());
+ return;
+ }
+
+ JsonNode data = parser.parseData(root);
+ MesCollectMsgTypeEnum msgType = parser.resolveMsgType(parser.getText(root, "topic"), topic, data,
+ properties.getMqtt().getAlarmTopicSuffix());
+ String deviceCode = parser.resolveDeviceId(root, topic);
+ LocalDateTime eventTime = parser.parseEventTime(root);
+
+ MesDvMachineryDO machinery = StrUtil.isBlank(deviceCode) ? null
+ : machineryMapper.selectByCollectDeviceCode(deviceCode);
+ if (machinery == null && StrUtil.isNotBlank(deviceCode)) {
+ warnUnboundDevice(deviceCode);
+ }
+ Long machineryId = machinery == null ? null : machinery.getId();
+ Long taskId = null;
+ Long workOrderId = null;
+ if (machinery != null && machinery.getWorkstationId() != null) {
+ MesProTaskDO task = taskResolver.resolve(machinery.getWorkstationId());
+ if (task != null) {
+ taskId = task.getId();
+ workOrderId = task.getWorkOrderId();
+ }
+ }
+
+ Long rawId = dataService.saveRawMessage(deviceCode, machineryId, topic, msgType, eventTime, payload);
+ try {
+ switch (msgType) {
+ case REALTIME -> dataService.saveRealtime(deviceCode, machineryId, taskId, workOrderId, eventTime, data);
+ case SPC -> dataService.saveCycle(deviceCode, machineryId, taskId, workOrderId, eventTime, data);
+ case TECH -> dataService.saveTech(deviceCode, machineryId, taskId, workOrderId, eventTime, data);
+ case OP_LOG -> dataService.saveOperateLog(deviceCode, machineryId, taskId, workOrderId, eventTime, data);
+ case ALARM -> dataService.saveAlarm(deviceCode, machineryId, taskId, workOrderId, eventTime, data);
+ default -> log.debug("[process][蹇界暐鏈煡绫诲瀷鎶ユ枃锛屼富棰�({})]", topic);
+ }
+ } catch (Exception e) {
+ dataService.markRawMessageFailed(rawId, e.getMessage());
+ log.error("[process][涓婚({}) 璁惧({}) 澶勭悊澶辫触]", topic, deviceCode, e);
+ }
+ }
+
+ /**
+ * 缃戝叧鏍煎紡鎶ユ枃澶勭悊銆�
+ *
+ * <p>attributes锛氭姤鏂囬灞� key 鏄澶囧悕銆乿alue 鏄睘鎬у瓧鍏革紝鎸夎澶囬�愬彴钀藉疄鏃舵暟鎹紱
+ * connect / disconnect锛氳繛鎺ヤ簨浠讹紝鍙暀鐥曚笉钀藉疄鏃舵暟鎹紝渚夸簬鎺掓煡璁惧绂荤嚎銆�</p>
+ */
+ private void processGateway(String topic, String payload) {
+ JsonNode root;
+ try {
+ root = parser.parsePayload(payload);
+ } catch (Exception e) {
+ log.warn("[processGateway][涓婚({}) 鎶ユ枃涓嶆槸鍚堟硶 JSON锛歿}]", topic, StrUtil.maxLength(payload, 200));
+ dataService.markRawMessageFailed(
+ dataService.saveRawMessage(null, null, topic, MesCollectMsgTypeEnum.UNKNOWN,
+ LocalDateTime.now(), payload),
+ "鎶ユ枃涓嶆槸鍚堟硶 JSON锛�" + e.getMessage());
+ return;
+ }
+
+ // 杩炴帴浜嬩欢锛歿"device":"澶ф媺"}锛屾病鏈夊睘鎬у瓧鍏�
+ if (!ATTR_TOPIC_SUFFIX.equalsIgnoreCase(parser.extractTopicSuffix(topic))) {
+ String deviceCode = StrUtil.trim(parser.getText(root, "device"));
+ MesDvMachineryDO machinery = StrUtil.isBlank(deviceCode) ? null
+ : machineryMapper.selectByCollectDeviceCode(deviceCode);
+ dataService.saveRawMessage(deviceCode, machinery == null ? null : machinery.getId(), topic,
+ MesCollectMsgTypeEnum.getByType(parser.extractTopicSuffix(topic)),
+ LocalDateTime.now(), payload);
+ return;
+ }
+
+ Map<String, JsonNode> devices = parser.splitGatewayDevices(root);
+ if (devices.isEmpty()) {
+ log.debug("[processGateway][涓婚({}) 鎶ユ枃閲屾病鏈夎澶囧睘鎬э細{}]", topic, StrUtil.maxLength(payload, 200));
+ dataService.saveRawMessage(null, null, topic, MesCollectMsgTypeEnum.UNKNOWN, LocalDateTime.now(), payload);
+ return;
+ }
+ // 缃戝叧鎶ユ枃涓嶅甫鏃堕棿鎴筹紝缁熶竴鎸夋帴鏀舵椂闂磋惤搴�
+ LocalDateTime eventTime = parser.parseEventTime(root);
+ devices.forEach((deviceCode, data) -> {
+ MesDvMachineryDO machinery = machineryMapper.selectByCollectDeviceCode(deviceCode);
+ if (machinery == null) {
+ warnUnboundDevice(deviceCode);
+ }
+ Long machineryId = machinery == null ? null : machinery.getId();
+ Long taskId = null;
+ Long workOrderId = null;
+ if (machinery != null && machinery.getWorkstationId() != null) {
+ MesProTaskDO task = taskResolver.resolve(machinery.getWorkstationId());
+ if (task != null) {
+ taskId = task.getId();
+ workOrderId = task.getWorkOrderId();
+ }
+ }
+ Long rawId = dataService.saveRawMessage(deviceCode, machineryId, topic,
+ MesCollectMsgTypeEnum.REALTIME, eventTime, payload);
+ try {
+ dataService.saveRealtime(deviceCode, machineryId, taskId, workOrderId, eventTime, data);
+ } catch (Exception e) {
+ dataService.markRawMessageFailed(rawId, e.getMessage());
+ log.error("[processGateway][涓婚({}) 璁惧({}) 澶勭悊澶辫触]", topic, deviceCode, e);
+ }
+ });
+ }
+
+ private void warnUnboundDevice(String deviceCode) {
+ long now = System.currentTimeMillis();
+ Long last = unboundWarnCache.get(deviceCode);
+ if (last != null && now - last < 60_000L) {
+ return;
+ }
+ unboundWarnCache.put(deviceCode, now);
+ log.warn("[process][鏁伴噰璁惧({}) 鏈粦瀹氫换浣曡澶囧彴璐︼紝鏁版嵁灏嗘寜璁惧缂栧彿钀藉簱锛宮achineryId 涓虹┖]", deviceCode);
+ }
+
+ @PreDestroy
+ public void destroy() {
+ executor.shutdownNow();
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java
new file mode 100644
index 0000000..a99818e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java
@@ -0,0 +1,204 @@
+package cn.iocoder.yudao.module.mes.service.collect;
+
+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.collect.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.*;
+import cn.iocoder.yudao.module.mes.dal.mysql.dv.machinery.MesDvMachineryMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderMapper;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectAlarmStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectOperateModeEnum;
+import cn.iocoder.yudao.module.mes.enums.collect.MesCollectRunStatusEnum;
+import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.COLLECT_ALARM_ALREADY_CLEARED;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.COLLECT_ALARM_NOT_EXISTS;
+
+/**
+ * MES 鏁伴噰鏁版嵁鏌ヨ Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class MesCollectQueryService {
+
+ /**
+ * 瓒呰繃璇ユ椂闀挎湭閲囬泦鏁版嵁瑙嗕负绂荤嚎
+ */
+ private static final long ONLINE_TIMEOUT_MINUTES = 5L;
+
+ @Resource
+ private MesDvMachineryMapper machineryMapper;
+ @Resource
+ private MesCollectRealtimeMapper realtimeMapper;
+ @Resource
+ private MesCollectRealtimeHistoryMapper realtimeHistoryMapper;
+ @Resource
+ private MesCollectCycleMapper cycleMapper;
+ @Resource
+ private MesCollectTechMapper techMapper;
+ @Resource
+ private MesCollectOperateLogMapper collectOperateLogMapper;
+ @Resource
+ private MesCollectAlarmMapper alarmMapper;
+ @Resource
+ private MesProWorkOrderMapper workOrderMapper;
+ @Resource
+ private MesCollectTaskResolver taskResolver;
+ @Resource
+ private MesMdWorkstationService workstationService;
+
+ /**
+ * 鑾峰彇宸查厤缃暟閲囩紪鐮佺殑璁惧瀹炴椂鐘舵�佸垪琛�
+ */
+ public List<MesCollectDeviceRespVO> getDeviceList() {
+ List<MesDvMachineryDO> machineries = machineryMapper.selectListWithCollectDeviceCode();
+ Map<Long, MesMdWorkstationDO> workstationMap = workstationService.getWorkstationMap(
+ machineries.stream().map(MesDvMachineryDO::getWorkstationId).filter(Objects::nonNull).toList());
+ return machineries.stream().map(machinery -> {
+ MesCollectDeviceRespVO vo = new MesCollectDeviceRespVO();
+ vo.setMachineryId(machinery.getId());
+ vo.setMachineryCode(machinery.getCode());
+ vo.setMachineryName(machinery.getName());
+ vo.setCollectDeviceCode(machinery.getCollectDeviceCode());
+ vo.setCollectEnabled(Boolean.TRUE.equals(machinery.getCollectEnabled()));
+ MesMdWorkstationDO workstation = workstationMap.get(machinery.getWorkstationId());
+ if (workstation != null) {
+ vo.setWorkstationId(workstation.getId());
+ vo.setWorkstationName(workstation.getName());
+ }
+
+ MesCollectRealtimeDO realtime = realtimeMapper.selectByDeviceCode(machinery.getCollectDeviceCode());
+ if (realtime != null) {
+ vo.setLastCollectTime(realtime.getCollectTime());
+ vo.setOnline(realtime.getCollectTime() != null
+ && realtime.getCollectTime().isAfter(LocalDateTime.now().minusMinutes(ONLINE_TIMEOUT_MINUTES)));
+ vo.setSts(realtime.getSts());
+ vo.setStsName(MesCollectRunStatusEnum.getNameByStatus(realtime.getSts()));
+ vo.setOpm(realtime.getOpm());
+ vo.setOpmName(MesCollectOperateModeEnum.getNameByMode(realtime.getOpm()));
+ vo.setOt(realtime.getOt());
+ vo.setTemps(realtime.getTemps());
+ // 缃戝叧鏍煎紡鎶ユ枃鐨勭粨鏋勫寲瀛楁涓虹┖锛屽墠绔�屽綋鍓嶆暟鎹�嶅垪鐩存帴灞曠ず鍘熷 JSON
+ vo.setDataJson(realtime.getDataJson());
+ } else {
+ vo.setOnline(false);
+ }
+
+ MesProTaskDO task = taskResolver.resolve(machinery.getWorkstationId());
+ if (task != null) {
+ vo.setTaskId(task.getId());
+ vo.setTaskCode(task.getCode());
+ vo.setTaskName(task.getName());
+ vo.setWorkOrderId(task.getWorkOrderId());
+ MesProWorkOrderDO workOrder = task.getWorkOrderId() != null
+ ? workOrderMapper.selectById(task.getWorkOrderId()) : null;
+ if (workOrder != null) {
+ vo.setWorkOrderCode(workOrder.getCode());
+ }
+ }
+ vo.setActiveAlarmCount(alarmMapper.selectActiveCountByDeviceCode(machinery.getCollectDeviceCode()));
+ return vo;
+ }).toList();
+ }
+
+ /**
+ * 鑾峰彇鎸囧畾鏁伴噰璁惧鐨勫疄鏃剁姸鎬佸揩鐓�
+ */
+ public MesCollectRealtimeRespVO getRealtime(String deviceCode) {
+ MesCollectRealtimeDO realtime = realtimeMapper.selectByDeviceCode(deviceCode);
+ if (realtime == null) {
+ return null;
+ }
+ MesCollectRealtimeRespVO vo = BeanUtils.toBean(realtime, MesCollectRealtimeRespVO.class);
+ vo.setStsName(MesCollectRunStatusEnum.getNameByStatus(realtime.getSts()));
+ vo.setOpmName(MesCollectOperateModeEnum.getNameByMode(realtime.getOpm()));
+ return vo;
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ瀹炴椂鐘舵�佸巻鍙�
+ */
+ public PageResult<MesCollectRealtimeRespVO> getRealtimeHistoryPage(MesCollectRealtimeHistoryPageReqVO reqVO) {
+ PageResult<MesCollectRealtimeHistoryDO> pageResult = realtimeHistoryMapper.selectPage(reqVO);
+ PageResult<MesCollectRealtimeRespVO> result = BeanUtils.toBean(pageResult, MesCollectRealtimeRespVO.class);
+ result.getList().forEach(vo -> {
+ vo.setStsName(MesCollectRunStatusEnum.getNameByStatus(vo.getSts()));
+ vo.setOpmName(MesCollectOperateModeEnum.getNameByMode(vo.getOpm()));
+ });
+ return result;
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ鍛ㄦ湡杩囩▼鏁版嵁
+ */
+ public PageResult<MesCollectCycleRespVO> getCyclePage(MesCollectCyclePageReqVO reqVO) {
+ return BeanUtils.toBean(cycleMapper.selectPage(reqVO), MesCollectCycleRespVO.class);
+ }
+
+ /**
+ * 鑾峰彇鍗曟潯鍛ㄦ湡杩囩▼鏁版嵁
+ */
+ public MesCollectCycleRespVO getCycle(Long id) {
+ MesCollectCycleDO cycle = cycleMapper.selectById(id);
+ return cycle == null ? null : BeanUtils.toBean(cycle, MesCollectCycleRespVO.class);
+ }
+
+ /**
+ * 鑾峰彇鎸囧畾鏁伴噰璁惧鐨勬渶鏂板伐鑹哄弬鏁板揩鐓�
+ */
+ public MesCollectTechRespVO getTech(String deviceCode) {
+ MesCollectTechDO tech = techMapper.selectByDeviceCode(deviceCode);
+ return tech == null ? null : BeanUtils.toBean(tech, MesCollectTechRespVO.class);
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ鍙傛暟鍙樻洿鏃ュ織
+ */
+ public PageResult<MesCollectOperateLogRespVO> getOperateLogPage(MesCollectOperateLogPageReqVO reqVO) {
+ return BeanUtils.toBean(collectOperateLogMapper.selectPage(reqVO), MesCollectOperateLogRespVO.class);
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ鎶ヨ璁板綍
+ */
+ public PageResult<MesCollectAlarmRespVO> getAlarmPage(MesCollectAlarmPageReqVO reqVO) {
+ PageResult<MesCollectAlarmDO> pageResult = alarmMapper.selectPage(reqVO);
+ PageResult<MesCollectAlarmRespVO> result = BeanUtils.toBean(pageResult, MesCollectAlarmRespVO.class);
+ result.getList().forEach(vo -> vo.setStatusName(MesCollectAlarmStatusEnum.ACTIVE.getStatus().equals(vo.getStatus())
+ ? MesCollectAlarmStatusEnum.ACTIVE.getName() : MesCollectAlarmStatusEnum.CLEARED.getName()));
+ return result;
+ }
+
+ /**
+ * 浜哄伐纭娑堥櫎鎶ヨ
+ */
+ public void ackAlarm(Long id) {
+ MesCollectAlarmDO alarm = alarmMapper.selectById(id);
+ if (alarm == null) {
+ throw exception(COLLECT_ALARM_NOT_EXISTS);
+ }
+ if (MesCollectAlarmStatusEnum.CLEARED.getStatus().equals(alarm.getStatus())) {
+ throw exception(COLLECT_ALARM_ALREADY_CLEARED);
+ }
+ MesCollectAlarmDO updateObj = new MesCollectAlarmDO();
+ updateObj.setId(id);
+ updateObj.setStatus(MesCollectAlarmStatusEnum.CLEARED.getStatus());
+ updateObj.setClearTime(LocalDateTime.now());
+ alarmMapper.updateById(updateObj);
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectTaskResolver.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectTaskResolver.java
new file mode 100644
index 0000000..b6aff97
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectTaskResolver.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.mes.service.collect;
+
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * MES 鏁伴噰-鐢熶骇浠诲姟鍏宠仈瑙f瀽
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class MesCollectTaskResolver {
+
+ private static final long CACHE_MILLIS = 30_000L;
+
+ @Resource
+ private MesProTaskMapper taskMapper;
+
+ private final ConcurrentHashMap<Long, CachedTask> cache = new ConcurrentHashMap<>();
+
+ /**
+ * 鏌ヨ宸ヤ綔绔欎笂姝e湪杩愯鐨勭敓浜т换鍔★紙鐢熶骇涓�/閮ㄥ垎瀹屾垚/宸插仠宸ワ級
+ */
+ public MesProTaskDO resolve(Long workstationId) {
+ if (workstationId == null) {
+ return null;
+ }
+ long now = System.currentTimeMillis();
+ CachedTask cached = cache.get(workstationId);
+ if (cached != null && now - cached.time < CACHE_MILLIS) {
+ return cached.task;
+ }
+ MesProTaskDO task = taskMapper.selectRunningTaskByWorkstationId(workstationId);
+ cache.put(workstationId, new CachedTask(task, now));
+ return task;
+ }
+
+ private record CachedTask(MesProTaskDO task, long time) {
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/spare/MesDvSpareService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/spare/MesDvSpareService.java
new file mode 100644
index 0000000..8896de2
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/spare/MesDvSpareService.java
@@ -0,0 +1,189 @@
+package cn.iocoder.yudao.module.mes.service.dv.spare;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+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.dv.spare.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.repair.MesDvRepairDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.dv.spare.*;
+import cn.iocoder.yudao.module.mes.dal.mysql.dv.repair.MesDvRepairMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.dv.machinery.MesDvMachineryMapper;
+import cn.iocoder.yudao.module.mes.enums.dv.MesDvRepairStatusEnum;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.*;
+import java.math.BigDecimal;
+import java.util.*;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+
+/** 澶囦欢搴撳瓨鍙�氳繃鐣欑棔鐨勬祦姘村彉鏇达紝鍏冩暟鎹紪杈戜笉鍏佽瑕嗙洊搴撳瓨銆� */
+@Service
+public class MesDvSpareService {
+ private static final ErrorCode INVALID = new ErrorCode(1_040_807_001, "澶囦欢鎿嶄綔澶辫触锛歿}");
+ private static final BigDecimal MAX_QUANTITY = new BigDecimal("999999999999999.999");
+ @Resource private MesDvSparePartMapper partMapper;
+ @Resource private MesDvSpareMovementMapper movementMapper;
+ @Resource private MesDvRepairMapper repairMapper;
+ @Resource private MesDvMachineryMapper machineryMapper;
+ @Resource private AdminUserApi adminUserApi;
+
+ @Transactional(rollbackFor=Exception.class, isolation=Isolation.READ_COMMITTED)
+ public Long create(MesDvSparePartSaveReqVO req, Long operator) {
+ validateMetadata(req);
+ MesDvSparePartDO part = BeanUtils.toBean(req,MesDvSparePartDO.class);
+ part.setStockQuantity(req.getInitialQuantity());
+ partMapper.insert(part);
+ if (req.getInitialQuantity().signum()>0) {
+ writeMovement(part,1,req.getInitialQuantity(),BigDecimal.ZERO,null,null,null,operator,
+ "opening-"+UUID.randomUUID(),"鐧昏鍒濆搴撳瓨");
+ }
+ return part.getId();
+ }
+ @Transactional(rollbackFor=Exception.class, isolation=Isolation.READ_COMMITTED)
+ public void update(MesDvSparePartSaveReqVO req) {
+ MesDvSparePartDO part = requirePart(req.getId());
+ validateMetadata(req);
+ MesDvSparePartDO changes = BeanUtils.toBean(req,MesDvSparePartDO.class);
+ changes.setStockQuantity(part.getStockQuantity());
+ partMapper.updateById(changes);
+ }
+ private void validateMetadata(MesDvSparePartSaveReqVO req) {
+ req.setCode(req.getCode().trim());
+ req.setName(req.getName().trim());
+ req.setUnit(req.getUnit().trim());
+ if (req.getCode().isEmpty() || req.getName().isEmpty() || req.getUnit().isEmpty()) fail("缂栫爜銆佸悕绉板拰鍗曚綅涓嶈兘涓虹┖");
+ var old=partMapper.selectOne(MesDvSparePartDO::getCode,req.getCode());
+ if(old!=null&&!Objects.equals(old.getId(),req.getId())) fail("澶囦欢缂栫爜宸插瓨鍦�");
+ if(req.getId()!=null && movementMapper.selectCount(MesDvSpareMovementDO::getSparePartId,req.getId())>0) {
+ var saved=partMapper.selectById(req.getId());
+ if(!Objects.equals(saved.getUnit(),req.getUnit())) fail("宸叉湁搴撳瓨娴佹按鐨勫浠朵笉鑳戒慨鏀硅閲忓崟浣�");
+ }
+ }
+ @Transactional(rollbackFor=Exception.class, isolation=Isolation.READ_COMMITTED)
+ public void delete(Long id) {
+ var part=requirePart(id);
+ if(part.getStockQuantity().signum()!=0 || movementMapper.selectCount(MesDvSpareMovementDO::getSparePartId,id)>0)
+ fail("鏈夊簱瀛樻垨宸叉湁娴佹按鐨勫浠朵笉鑳藉垹闄わ紝璇峰仠鐢�");
+ partMapper.deleteById(id);
+ }
+ public MesDvSparePartDO get(Long id) { return partMapper.selectById(id); }
+ public PageResult<MesDvSparePartDO> page(MesDvSparePageReqVO req) { return partMapper.page(req); }
+ public PageResult<MesDvSpareMovementRespVO> movements(MesDvSparePageReqVO req) {
+ var page=movementMapper.page(req);
+ var ids=page.getList().stream().filter(m->m.getType()==3).map(MesDvSpareMovementDO::getId).toList();
+ Map<Long,BigDecimal> totals=new HashMap<>();
+ movementMapper.returns(ids).forEach(m->totals.merge(m.getOriginalId(),m.getQuantity(),BigDecimal::add));
+ return new PageResult<>(page.getList().stream().map(m-> {
+ var vo=BeanUtils.toBean(m,MesDvSpareMovementRespVO.class);
+ vo.setReturnedQuantity(totals.getOrDefault(m.getId(),BigDecimal.ZERO));
+ vo.setReturnableQuantity(m.getType()==3?m.getQuantity().subtract(vo.getReturnedQuantity()):BigDecimal.ZERO);
+ return vo;
+ }).toList(),page.getTotal());
+ }
+ @Transactional(rollbackFor=Exception.class, isolation=Isolation.READ_COMMITTED)
+ public Long receive(MesDvSpareActionReqVO req,Long operator) {
+ validateAction(req);
+ var part=requirePart(req.getSparePartId());
+ Long prior=duplicate(req,2,operator,part.getId(),null,null,null);
+ if(prior!=null)return prior;
+ requireEnabled(part);
+ var before=part.getStockQuantity();
+ changeStock(part,req.getQuantity());
+ return writeMovement(part,2,req.getQuantity(),before,null,null,null,operator,req.getRequestKey(),req.getRemark());
+ }
+ @Transactional(rollbackFor=Exception.class, isolation=Isolation.READ_COMMITTED)
+ public Long issue(MesDvSpareActionReqVO req,Long operator) {
+ validateAction(req);
+ if(req.getRepairId()==null || req.getSparePartId()==null || req.getReceiverUserId()==null) fail("璇烽�夋嫨缁翠慨鍗曘�佸浠跺拰棰嗙敤浜�");
+ // 涓庣淮淇姸鎬佹祦杞娇鐢ㄥ悓涓�琛岄攣锛涘厛缁翠慨鍗曞啀澶囦欢锛屼繚鎸佷竴鑷撮攣搴忋��
+ var repair=repairMapper.lockForSpare(req.getRepairId());
+ if(repair==null)fail("缁翠慨鍗曚笉瀛樺湪");
+ var part=requirePart(req.getSparePartId());
+ Long prior=duplicate(req,3,operator,part.getId(),repair.getId(),null,req.getReceiverUserId());
+ if(prior!=null)return prior;
+ if(!Objects.equals(repair.getStatus(),MesDvRepairStatusEnum.PREPARE.getStatus()) &&
+ !Objects.equals(repair.getStatus(),MesDvRepairStatusEnum.CONFIRMED.getStatus()))
+ fail("浠呰崏绋挎垨缁翠慨涓殑缁翠慨鍗曞彲浠ラ鐢ㄥ浠�");
+ requireEnabled(part);
+ var receiver=adminUserApi.getUser(req.getReceiverUserId());
+ if(receiver==null || !Objects.equals(receiver.getStatus(),0))fail("棰嗙敤浜轰笉瀛樺湪鎴栧凡鍋滅敤");
+ var before=part.getStockQuantity();
+ changeStock(part,req.getQuantity().negate());
+ return writeMovement(part,3,req.getQuantity(),before,repair,null,req.getReceiverUserId(),
+ operator,req.getRequestKey(),req.getRemark());
+ }
+ @Transactional(rollbackFor=Exception.class, isolation=Isolation.READ_COMMITTED)
+ public Long returnPart(MesDvSpareActionReqVO req,Long operator) {
+ validateAction(req);
+ if(req.getOriginalId()==null)fail("璇烽�夋嫨鍘熼鐢ㄨ褰�");
+ var original=movementMapper.lock(req.getOriginalId());
+ if(original==null || original.getType()!=3)fail("鍘熼鐢ㄨ褰曚笉瀛樺湪");
+ var part=requirePart(original.getSparePartId());
+ Long prior=duplicate(req,4,operator,part.getId(),original.getRepairId(),original.getId(),original.getReceiverUserId());
+ if(prior!=null)return prior;
+ BigDecimal returned=movementMapper.returns(List.of(original.getId())).stream()
+ .map(MesDvSpareMovementDO::getQuantity).reduce(BigDecimal.ZERO,BigDecimal::add);
+ if(returned.add(req.getQuantity()).compareTo(original.getQuantity())>0)fail("閫�鍥炴暟閲忚秴杩囧皻鏈��鍥炵殑棰嗙敤鏁伴噺");
+ var before=part.getStockQuantity();
+ changeStock(part,req.getQuantity()); // 宸插仠鐢ㄥ浠朵粛鍏佽閫�鍥炪��
+ var record=snapshot(part,4,req.getQuantity(),before,operator,req.getRequestKey(),req.getRemark());
+ record.setOriginalId(original.getId());
+ record.setRepairId(original.getRepairId()); record.setRepairCode(original.getRepairCode());
+ record.setMachineryId(original.getMachineryId()); record.setMachineryName(original.getMachineryName());
+ record.setReceiverUserId(original.getReceiverUserId()); record.setReceiverName(original.getReceiverName());
+ movementMapper.insert(record);
+ return record.getId();
+ }
+ private Long duplicate(MesDvSpareActionReqVO req,int type,Long operator,Long partId,Long repairId,Long originalId,Long receiverId) {
+ var old=movementMapper.byKey(req.getRequestKey());
+ if(old==null)return null;
+ if(old.getType()!=type || !Objects.equals(old.getOperatorUserId(),operator)
+ || !Objects.equals(old.getSparePartId(),partId) || !Objects.equals(old.getRepairId(),repairId)
+ || !Objects.equals(old.getOriginalId(),originalId) || !Objects.equals(old.getReceiverUserId(),receiverId)
+ || old.getQuantity().compareTo(req.getQuantity())!=0 || !Objects.equals(old.getRemark(),req.getRemark()))
+ fail("璇锋眰鏍囪瘑宸茬敤浜庡叾浠栨搷浣滐紝璇峰埛鏂板悗閲嶈瘯");
+ return old.getId();
+ }
+ private void validateAction(MesDvSpareActionReqVO req) {
+ if(req.getQuantity()==null || req.getQuantity().signum()<=0 || req.getQuantity().scale()>3
+ || req.getQuantity().compareTo(MAX_QUANTITY)>0)fail("鏁伴噺蹇呴』澶т簬0锛屾渶澶氫笁浣嶅皬鏁�");
+ if(req.getRemark()==null || req.getRemark().trim().isEmpty())fail("璇峰~鍐欐搷浣滆鏄�");
+ }
+ private MesDvSparePartDO requirePart(Long id) {
+ if(id==null)fail("璇烽�夋嫨澶囦欢");
+ var part=partMapper.lock(id);
+ if(part==null)fail("澶囦欢涓嶅瓨鍦�");
+ return part;
+ }
+ private void requireEnabled(MesDvSparePartDO part) { if(!Objects.equals(part.getStatus(),0))fail("澶囦欢宸插仠鐢�"); }
+ private void changeStock(MesDvSparePartDO part,BigDecimal delta) {
+ var after=part.getStockQuantity().add(delta);
+ if(after.signum()<0)fail("搴撳瓨涓嶈冻锛屽綋鍓嶅彲鐢細"+part.getStockQuantity()+part.getUnit());
+ if(after.compareTo(MAX_QUANTITY)>0)fail("搴撳瓨鏁伴噺瓒呭嚭绯荤粺鍏佽鑼冨洿");
+ part.setStockQuantity(after);
+ partMapper.updateById(new MesDvSparePartDO().setId(part.getId()).setStockQuantity(after));
+ }
+ private MesDvSpareMovementDO snapshot(MesDvSparePartDO part,int type,BigDecimal qty,BigDecimal before,
+ Long operator,String key,String remark) {
+ return new MesDvSpareMovementDO().setRequestKey(key).setSparePartId(part.getId())
+ .setSparePartCode(part.getCode()).setSparePartName(part.getName()).setSpecification(part.getSpecification())
+ .setUnit(part.getUnit()).setType(type).setQuantity(qty).setBeforeQuantity(before)
+ .setAfterQuantity(part.getStockQuantity()).setOperatorUserId(operator).setRemark(remark);
+ }
+ private Long writeMovement(MesDvSparePartDO part,int type,BigDecimal qty,BigDecimal before,MesDvRepairDO repair,
+ Long original,Long receiver,Long operator,String key,String remark) {
+ var record=snapshot(part,type,qty,before,operator,key,remark).setOriginalId(original).setReceiverUserId(receiver);
+ if(receiver!=null)record.setReceiverName(adminUserApi.getUser(receiver).getNickname());
+ if(repair!=null) {
+ var machine=machineryMapper.selectById(repair.getMachineryId());
+ if(machine==null)fail("缁翠慨璁惧涓嶅瓨鍦�");
+ record.setRepairId(repair.getId()).setRepairCode(repair.getCode()).setMachineryId(machine.getId()).setMachineryName(machine.getName());
+ }
+ movementMapper.insert(record);
+ return record.getId();
+ }
+ private static void fail(String reason) { throw exception(INVALID,reason); }
+}
+
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyAlertListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyAlertListener.java
new file mode 100644
index 0000000..3683d77
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyAlertListener.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.mes.service.energy;
+
+import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.*;
+
+@Component @Slf4j
+public class EnergyAlertListener {
+ @Resource private EnergyAlertService energyAlertService;
+
+ @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+ public void onRecordChanged(EnergyRecordChangedEvent event) {
+ TenantUtils.execute(event.tenantId(), () -> {
+ for (var date : event.dates()) {
+ try { energyAlertService.check(date); }
+ catch (Exception e) { log.error("鑳借�楅璀︽鏌ュけ璐� tenant={} date={}", event.tenantId(), date, e); }
+ }
+ });
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyAlertService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyAlertService.java
new file mode 100644
index 0000000..d9e11a0
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyAlertService.java
@@ -0,0 +1,123 @@
+package cn.iocoder.yudao.module.mes.service.energy;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.pojo.*;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.energy.vo.EnergyAlertRuleSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.energy.*;
+import cn.iocoder.yudao.module.mes.dal.mysql.energy.*;
+import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
+import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.*;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+
+@Service @Slf4j
+public class EnergyAlertService {
+ @Resource private EnergyAlertRuleMapper energyAlertRuleMapper;
+ @Resource private EnergyAlertLogMapper energyAlertLogMapper;
+ @Resource private EnergyRecordMapper energyRecordMapper;
+ @Resource private AdminUserService adminUserService;
+ @Resource private NotifyMessageSendApi notifyMessageSendApi;
+
+ public PageResult<EnergyAlertRuleDO> page(PageParam page) {
+ return energyAlertRuleMapper.selectPage(page, new LambdaQueryWrapperX<EnergyAlertRuleDO>().orderByDesc(EnergyAlertRuleDO::getId));
+ }
+ public PageResult<EnergyAlertLogDO> logs(PageParam page, LocalDate date, String status) {
+ return energyAlertLogMapper.selectPage(page, new LambdaQueryWrapperX<EnergyAlertLogDO>()
+ .eqIfPresent(EnergyAlertLogDO::getStatus, status)
+ .and(date != null, w -> w.and(day -> day.eq(EnergyAlertLogDO::getPeriodType, "DAY").eq(EnergyAlertLogDO::getRecordDate, date))
+ .or(month -> month.eq(EnergyAlertLogDO::getPeriodType, "MONTH").eq(EnergyAlertLogDO::getRecordDate, date.withDayOfMonth(1))))
+ .orderByDesc(EnergyAlertLogDO::getId));
+ }
+ public Long save(EnergyAlertRuleSaveReqVO req) {
+ if (req.getId() != null) get(req.getId());
+ adminUserService.validateUserList(req.getRecipientIds());
+ EnergyAlertRuleDO rule = BeanUtils.toBean(req, EnergyAlertRuleDO.class);
+ rule.setName(req.getName().trim());
+ rule.setUsageArea(req.getUsageArea() == null ? "" : req.getUsageArea().trim());
+ rule.setProductCategory(req.getProductCategory() == null ? "" : req.getProductCategory().trim());
+ rule.setRecipientIds(req.getRecipientIds().stream().distinct().map(String::valueOf).collect(Collectors.joining(",")));
+ if (rule.getId() == null) energyAlertRuleMapper.insert(rule);
+ else if (energyAlertRuleMapper.updateById(rule) == 0) throw missing();
+ return rule.getId();
+ }
+ public void delete(Long id) {
+ get(id);
+ if (energyAlertRuleMapper.deleteById(id) == 0) throw missing();
+ }
+ private EnergyAlertRuleDO get(Long id) {
+ var rule = energyAlertRuleMapper.selectById(id);
+ if (rule == null) throw missing();
+ return rule;
+ }
+ private RuntimeException missing() { return exception(new ErrorCode(1_040_951_000, "鑳借�楅璀﹁鍒欎笉瀛樺湪")); }
+
+ /** Check the selected day and its calendar month; successful sends commit with their history. */
+ @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
+ public Map<String, Integer> check(LocalDate date) {
+ int sent = 0, failed = 0;
+ var rules = energyAlertRuleMapper.selectList(new LambdaQueryWrapperX<EnergyAlertRuleDO>()
+ .eq(EnergyAlertRuleDO::getEnabled, true).orderByAsc(EnergyAlertRuleDO::getId));
+ for (var candidate : rules) {
+ var rule = energyAlertRuleMapper.lock(candidate.getId());
+ if (rule == null || !Boolean.TRUE.equals(rule.getEnabled())) continue;
+ boolean monthly = rule.getMetric().startsWith("MONTH_");
+ LocalDate periodDate = monthly ? date.withDayOfMonth(1) : date;
+ String periodType = monthly ? "MONTH" : "DAY";
+ boolean amount = rule.getMetric().endsWith("AMOUNT");
+ BigDecimal actual = energyRecordMapper.selectDailyValue(periodDate, rule);
+ if (!exceeds(actual, rule.getThreshold())) continue;
+ for (String id : rule.getRecipientIds().split(",")) {
+ long recipient = Long.parseLong(id);
+ var log = energyAlertLogMapper.selectOne(new LambdaQueryWrapperX<EnergyAlertLogDO>()
+ .eq(EnergyAlertLogDO::getRuleId, rule.getId()).eq(EnergyAlertLogDO::getRecordDate, periodDate)
+ .eq(EnergyAlertLogDO::getPeriodType, periodType)
+ .eq(EnergyAlertLogDO::getRecipientId, recipient));
+ if (log != null && "SENT".equals(log.getStatus())) continue;
+ if (log == null) log = new EnergyAlertLogDO();
+ log.setRuleId(rule.getId()); log.setRuleName(rule.getName()); log.setRecordDate(periodDate); log.setPeriodType(periodType);
+ log.setEnergyType(rule.getEnergyType()); log.setMetric(rule.getMetric());
+ log.setScope((rule.getUsageArea().isEmpty() ? "鍏ㄩ儴鍖哄煙" : rule.getUsageArea()) + " / "
+ + (rule.getProductCategory().isEmpty() ? "鍏ㄩ儴浜у搧" : rule.getProductCategory()));
+ log.setActualValue(actual); log.setThreshold(rule.getThreshold()); log.setRecipientId(recipient);
+ log.setRecipientName(String.valueOf(recipient));
+ try {
+ adminUserService.validateUserList(List.of(recipient));
+ log.setRecipientName(adminUserService.getUser(recipient).getNickname());
+ NotifySendSingleToUserReqDTO message = new NotifySendSingleToUserReqDTO();
+ message.setUserId(recipient); message.setTemplateCode(monthly ? "energy_monthly_warning" : "energy_daily_warning");
+ message.setTemplateParams(Map.of("ruleName", rule.getName(), "date", monthly ? java.time.YearMonth.from(date).toString() : date.toString(),
+ "energyName", energyName(rule.getEnergyType()), "scope", log.getScope(),
+ "metricName", amount ? "璐圭敤" : "鐢ㄩ噺",
+ "actual", actual.toPlainString(), "threshold", rule.getThreshold().toPlainString(),
+ "unit", amount ? "鍏�" : unit(rule.getEnergyType())));
+ Long messageId = notifyMessageSendApi.sendSingleMessageToAdmin(message);
+ if (messageId == null) throw new IllegalStateException("鑳借�楅璀﹂�氱煡妯℃澘宸插仠鐢�");
+ log.setMessageId(messageId); log.setStatus("SENT"); log.setErrorMessage(""); sent++;
+ } catch (Exception e) {
+ logFailure(rule.getId(), date, recipient, e);
+ log.setStatus("FAILED");
+ log.setErrorMessage("鍙戦�佸け璐ワ紝璇锋鏌ユ帴鏀朵汉鏄惁鍚敤浠ュ強閫氱煡妯℃澘 " + (monthly ? "energy_monthly_warning" : "energy_daily_warning") + " 鏄惁鍙敤锛岀劧鍚庨噸鏂版鏌ヨ鏃ユ湡銆�");
+ failed++;
+ }
+ if (log.getId() == null) energyAlertLogMapper.insert(log); else energyAlertLogMapper.updateById(log);
+ }
+ }
+ return Map.of("sent", sent, "failed", failed);
+ }
+ private void logFailure(Long ruleId, LocalDate date, long recipient, Exception cause) {
+ log.warn("鑳借�楅璀︾珯鍐呴�氱煡鍙戦�佸け璐� rule={} date={} recipient={}", ruleId, date, recipient, cause);
+ }
+ static boolean exceeds(BigDecimal actual, BigDecimal threshold) { return actual != null && actual.compareTo(threshold) > 0; }
+ public static String energyName(String type) { return switch (type) { case "WATER" -> "姘�"; case "ELECTRICITY" -> "鐢�"; default -> "钂告苯"; }; }
+ public static String unit(String type) { return switch (type) { case "WATER" -> "m鲁"; case "ELECTRICITY" -> "kWh"; default -> "t"; }; }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyExportService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyExportService.java
new file mode 100644
index 0000000..1f7e840
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyExportService.java
@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.mes.service.energy;
+
+import cn.idev.excel.FastExcelFactory;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.util.http.HttpUtils;
+import cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy;
+import cn.iocoder.yudao.module.mes.controller.admin.energy.vo.*;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.stereotype.Service;
+import java.io.IOException;
+import java.util.*;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+
+@Service
+public class EnergyExportService {
+ @Resource private EnergyRecordService energyRecordService;
+ public void records(EnergyRecordPageReqVO req, HttpServletResponse response) throws IOException {
+ req.setPageNo(1); req.setPageSize(50_001);
+ var page = energyRecordService.page(req);
+ if (page.getTotal() > 50_000) throw exception(new ErrorCode(1_040_952_000, "鍗曟鏈�澶氬鍑�50000鏉★紝璇风缉灏忔棩鏈熻寖鍥�"));
+ List<List<Object>> rows = page.getList().stream().map(r -> Arrays.<Object>asList(r.getRecordDate().toString(),
+ EnergyAlertService.energyName(r.getEnergyType()), r.getUsageArea(), r.getProductCategory(), r.getUsagePurpose(),
+ EnergyAlertService.unit(r.getEnergyType()), r.getQuantity(), r.getUnitPrice(), r.getAmount(), r.getRecorder(), r.getRemark())).toList();
+ write(response, "鑳借�楀彴璐�.xlsx", List.of(new Sheet("鑳借�楀彴璐�",
+ List.of("鏃ユ湡", "鑳芥簮", "浣跨敤鍖哄煙", "浜у搧绫诲埆", "鐢ㄩ��", "鐢ㄩ噺鍗曚綅", "鐢ㄩ噺", "鍗曚环锛堝厓/鍗曚綅锛�", "璐圭敤锛堝厓锛�", "褰曞叆浜�", "澶囨敞"), rows)));
+ }
+ public void analysis(EnergyAnalysisReqVO req, HttpServletResponse response) throws IOException {
+ var data = energyRecordService.analysis(req);
+ var head = List.of("缁熻椤�", "鑳芥簮", "鐢ㄩ噺鍗曚綅", "鐢ㄩ噺", "璐圭敤锛堝厓锛�", "褰曞叆鏉℃暟");
+ List<List<Object>> summary = data.getSummary().stream().map(r -> row("鍚堣", r)).toList();
+ List<List<Object>> trend = data.getTrend().stream().map(r -> row(r.getLabel(), r)).toList();
+ List<List<Object>> areas = data.getAreas().stream().map(r -> row(r.getLabel(), r)).toList();
+ List<List<Object>> scope = List.of(Arrays.asList("寮�濮嬫棩鏈�", req.getStartDate().toString()),
+ Arrays.asList("缁撴潫鏃ユ湡", req.getEndDate().toString()), Arrays.asList("姹囨�绘柟寮�", "MONTH".equals(req.getGroupBy()) ? "鎸夋湀" : "鎸夋棩"),
+ Arrays.asList("鑳芥簮", req.getEnergyType() == null || req.getEnergyType().isEmpty() ? "鍏ㄩ儴" : EnergyAlertService.energyName(req.getEnergyType())),
+ Arrays.asList("鍖哄煙鍏抽敭璇�", Objects.toString(req.getUsageArea(), "")), Arrays.asList("浜у搧绫诲埆", Objects.toString(req.getProductCategory(), "")),
+ Arrays.asList("鎬昏垂鐢紙鍏冿級", data.getTotalAmount()), Arrays.asList("褰曞叆鏉℃暟", data.getRecordCount()));
+ write(response, "鑳借�楀垎鏋�.xlsx", List.of(new Sheet("缁熻鍙e緞", List.of("椤圭洰", "鍐呭"), scope),
+ new Sheet("鑳芥簮姹囨��", head, summary), new Sheet("鏃ユ湡瓒嬪娍", head, trend), new Sheet("鍖哄煙姹囨��", head, areas)));
+ }
+ private List<Object> row(String label, EnergyAnalysisRespVO.Summary r) {
+ return Arrays.asList(label, EnergyAlertService.energyName(r.getEnergyType()), EnergyAlertService.unit(r.getEnergyType()), r.getQuantity(), r.getAmount(), r.getRecordCount());
+ }
+ 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)
+ .registerWriteHandler(new ColumnWidthMatchStyleStrategy()).build()) {
+ for (int i = 0; i < sheets.size(); i++) {
+ var 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/energy/EnergyRecordChangedEvent.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyRecordChangedEvent.java
new file mode 100644
index 0000000..b036132
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyRecordChangedEvent.java
@@ -0,0 +1,6 @@
+package cn.iocoder.yudao.module.mes.service.energy;
+
+import java.time.LocalDate;
+import java.util.Set;
+
+public record EnergyRecordChangedEvent(Long tenantId, Set<LocalDate> dates) {}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyRecordService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyRecordService.java
new file mode 100644
index 0000000..f9c6e16
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyRecordService.java
@@ -0,0 +1,127 @@
+package cn.iocoder.yudao.module.mes.service.energy;
+
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+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.energy.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.energy.EnergyRecordDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.energy.EnergyRecordMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.transaction.annotation.Transactional;
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
+import java.util.Set;
+import java.math.RoundingMode;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+
+@Service
+public class EnergyRecordService {
+ private static final ErrorCode NOT_EXISTS = new ErrorCode(1_040_950_000, "鑳借�楄褰曚笉瀛樺湪鎴栧凡鍒犻櫎");
+ private static final ErrorCode ID_REQUIRED = new ErrorCode(1_040_950_001, "淇敼鑳借�楄褰曞繀椤绘彁渚涚紪鍙�");
+ @Resource
+ private EnergyRecordMapper recordMapper;
+ @Resource private ApplicationEventPublisher applicationEventPublisher;
+
+ @Transactional(rollbackFor = Exception.class)
+ public Long create(EnergyRecordSaveReqVO req) {
+ EnergyRecordDO record = toRecord(req);
+ record.setId(null);
+ recordMapper.insert(record);
+ applicationEventPublisher.publishEvent(new EnergyRecordChangedEvent(TenantContextHolder.getTenantId(), Set.of(record.getRecordDate())));
+ return record.getId();
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void update(EnergyRecordSaveReqVO req) {
+ if (req.getId() == null) {
+ throw exception(ID_REQUIRED);
+ }
+ EnergyRecordDO old = get(req.getId());
+ if (recordMapper.updateById(toRecord(req)) == 0) {
+ throw exception(NOT_EXISTS);
+ }
+ var dates = new java.util.HashSet<>(Set.of(old.getRecordDate()));
+ dates.add(req.getRecordDate());
+ applicationEventPublisher.publishEvent(new EnergyRecordChangedEvent(TenantContextHolder.getTenantId(), Set.copyOf(dates)));
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(Long id) {
+ EnergyRecordDO old = get(id);
+ if (recordMapper.deleteById(id) == 0) {
+ throw exception(NOT_EXISTS);
+ }
+ applicationEventPublisher.publishEvent(new EnergyRecordChangedEvent(TenantContextHolder.getTenantId(), Set.of(old.getRecordDate())));
+ }
+
+ public EnergyRecordDO get(Long id) {
+ EnergyRecordDO record = recordMapper.selectById(id);
+ if (record == null) {
+ throw exception(NOT_EXISTS);
+ }
+ return record;
+ }
+
+ public PageResult<EnergyRecordDO> page(EnergyRecordPageReqVO req) {
+ return recordMapper.selectPage(req);
+ }
+
+ static EnergyRecordDO toRecord(EnergyRecordSaveReqVO req) {
+ EnergyRecordDO record = BeanUtils.toBean(req, EnergyRecordDO.class);
+ record.setUsageArea(req.getUsageArea().trim());
+ record.setProductCategory(req.getProductCategory().trim());
+ record.setUsagePurpose(req.getUsagePurpose().trim());
+ record.setRecorder(req.getRecorder().trim());
+ // 绌哄娉ㄤ篃鍙湪淇敼鏃舵竻闄ゃ��
+ record.setRemark(req.getRemark() == null ? "" : req.getRemark().trim());
+ record.setAmount(req.getQuantity().multiply(req.getUnitPrice()).setScale(2, RoundingMode.HALF_UP));
+ return record;
+ }
+
+ public EnergyAnalysisRespVO analysis(EnergyAnalysisReqVO req) {
+ return aggregate(recordMapper.selectAnalysis(req));
+ }
+
+ static EnergyAnalysisRespVO aggregate(List<EnergyRecordMapper.Aggregate> rows) {
+ EnergyAnalysisRespVO result = new EnergyAnalysisRespVO();
+ Map<String, EnergyAnalysisRespVO.Summary> summary = new LinkedHashMap<>();
+ for (String type : List.of("WATER", "ELECTRICITY", "STEAM")) {
+ EnergyAnalysisRespVO.Summary item = new EnergyAnalysisRespVO.Summary();
+ item.setEnergyType(type);
+ summary.put(type, item);
+ }
+ Map<List<String>, EnergyAnalysisRespVO.Bucket> trend = new LinkedHashMap<>();
+ Map<List<String>, EnergyAnalysisRespVO.Bucket> areas = new LinkedHashMap<>();
+ for (EnergyRecordMapper.Aggregate row : rows) {
+ add(summary.get(row.getEnergyType()), row);
+ add(bucket(trend, row.getPeriod(), row.getEnergyType()), row);
+ add(bucket(areas, row.getUsageArea(), row.getEnergyType()), row);
+ result.setTotalAmount(result.getTotalAmount().add(row.getAmount()));
+ result.setRecordCount(result.getRecordCount() + row.getRecordCount());
+ }
+ result.setSummary(List.copyOf(summary.values()));
+ result.setTrend(List.copyOf(trend.values()));
+ result.setAreas(List.copyOf(areas.values()));
+ return result;
+ }
+
+ private static EnergyAnalysisRespVO.Bucket bucket(Map<List<String>, EnergyAnalysisRespVO.Bucket> map,
+ String label, String type) {
+ return map.computeIfAbsent(List.of(label, type), key -> {
+ EnergyAnalysisRespVO.Bucket item = new EnergyAnalysisRespVO.Bucket();
+ item.setLabel(label);
+ item.setEnergyType(type);
+ return item;
+ });
+ }
+
+ private static void add(EnergyAnalysisRespVO.Summary item, EnergyRecordMapper.Aggregate row) {
+ item.setQuantity(item.getQuantity().add(row.getQuantity()));
+ item.setAmount(item.getAmount().add(row.getAmount()));
+ item.setRecordCount(item.getRecordCount() + row.getRecordCount());
+ }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerService.java
new file mode 100644
index 0000000..055f3a8
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerService.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.mes.service.qc.ledger;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerRespVO;
+
+/**
+ * MES 妫�娴嬬粨鏋滃彴璐� Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesQcInspectionLedgerService {
+
+ /**
+ * 鑾峰緱妫�娴嬬粨鏋滃彴璐﹀垎椤碉紙鍥涚被妫�楠屽崟缁熶竴鏌ヨ锛屼竴琛屼竴涓娴嬮」缁撴灉锛�
+ *
+ * @param pageReqVO 鍒嗛〉鏌ヨ
+ * @return 鍙拌处鍒嗛〉
+ */
+ PageResult<MesQcInspectionLedgerRespVO> getInspectionLedgerPage(MesQcInspectionLedgerPageReqVO pageReqVO);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerServiceImpl.java
new file mode 100644
index 0000000..8d94bf5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ledger/MesQcInspectionLedgerServiceImpl.java
@@ -0,0 +1,75 @@
+package cn.iocoder.yudao.module.mes.service.qc.ledger;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcQualityExportVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.qc.ledger.MesQcInspectionLedgerMapper;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
+
+/**
+ * MES 妫�娴嬬粨鏋滃彴璐� Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesQcInspectionLedgerServiceImpl implements MesQcInspectionLedgerService {
+
+ @Resource
+ private MesQcInspectionLedgerMapper ledgerMapper;
+
+ @Resource
+ private MesMdItemService itemService;
+ @Resource
+ private MesMdUnitMeasureService unitMeasureService;
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @Override
+ public PageResult<MesQcInspectionLedgerRespVO> getInspectionLedgerPage(MesQcInspectionLedgerPageReqVO pageReqVO) {
+ // 鍒嗛〉鏌ヨ锛堝洓绫绘楠屽崟 UNION ALL锛�
+ IPage<MesQcInspectionLedgerRespVO> page = MyBatisUtils.buildPage(pageReqVO);
+ ledgerMapper.selectInspectionLedgerPage(page, pageReqVO);
+ List<MesQcInspectionLedgerRespVO> list = page.getRecords();
+ if (CollUtil.isEmpty(list)) {
+ return PageResult.empty(page.getTotal());
+ }
+ // 鎵归噺鏌ヨ鐗╂枡銆佽閲忓崟浣嶃�佹娴嬩汉鍛橈紝骞舵嫾瑁呭垽瀹氫緷鎹�
+ Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(convertSet(list, MesQcInspectionLedgerRespVO::getItemId));
+ Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
+ convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+ convertSet(list, MesQcInspectionLedgerRespVO::getInspectorUserId));
+ for (MesQcInspectionLedgerRespVO vo : list) {
+ findAndThen(itemMap, vo.getItemId(), item -> {
+ vo.setItemCode(item.getCode());
+ vo.setItemName(item.getName());
+ vo.setItemSpecification(item.getSpecification());
+ findAndThen(unitMeasureMap, item.getUnitMeasureId(), unit -> vo.setUnitName(unit.getName()));
+ });
+ findAndThen(userMap, vo.getInspectorUserId(), user -> vo.setInspectorName(user.getNickname()));
+ vo.setJudgementBasis(MesQcQualityExportVO.buildRangeText(
+ vo.getStandardValue(), vo.getMinThreshold(), vo.getMaxThreshold()));
+ }
+ return new PageResult<>(list, page.getTotal());
+ }
+
+}
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..4c4ca18
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java
@@ -0,0 +1,234 @@
+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();
+ // 鐢� new HashMap<>() 鑰岄潪 Map.of()锛歟mployeeId 鍏佽涓� null锛�
+ // 鍚庨潰 employeeMap.get(cert.getEmployeeId()) 鍦ㄧ┖闆嗗悎鍦烘櫙浼� get(null)锛�
+ // Map.of() 鐨� get(null) 浼氭姏 NPE 瀵艰嚧璇佷欢鍒楄〃鎺ュ彛 500銆�
+ 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..702a2ff
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java
@@ -0,0 +1,122 @@
+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) {
+ // 娉ㄦ剰锛氳繖閲屽繀椤昏繑鍥炲彲鎺ュ彈 null key 鐨勭┖ Map銆�
+ // 璋冪敤鏂逛細鐩存帴 map.get(璁板綍閲岀殑 xxxId)锛岃�� xxxId 鍏佽涓� null锛堜緥濡傜粍缁囨湭璁捐礋璐d汉銆�
+ // 璇佷欢鏈叧鑱旀寔璇佷汉锛夛紝Map.of() 鐨� get(null) 浼氭姏 NPE锛屽鑷村垪琛ㄦ帴鍙� 500銆�
+ 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) {
+ // 鍚屼笂锛氳溅闂寸紪鍙峰厑璁镐负 null锛岀┖闆嗗悎蹇呴』杩斿洖鍙帴鍙� null key 鐨� Map
+ 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;
+ }
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/SystemCompanyConfigController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/SystemCompanyConfigController.java
new file mode 100644
index 0000000..5222170
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/SystemCompanyConfigController.java
@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.module.system.controller.admin.companyconfig;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.system.controller.admin.companyconfig.vo.SystemCompanyConfigRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.companyconfig.vo.SystemCompanyConfigSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.companyconfig.SystemCompanyConfigDO;
+import cn.iocoder.yudao.module.system.service.companyconfig.SystemCompanyConfigService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.annotation.security.PermitAll;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "绠$悊鍚庡彴 - 鍏徃鍝佺墝淇℃伅")
+@RestController
+@RequestMapping("/system/company-config")
+@Validated
+public class SystemCompanyConfigController {
+
+ @Resource
+ private SystemCompanyConfigService companyConfigService;
+
+ /**
+ * 鑾峰緱鍏徃鍝佺墝淇℃伅
+ *
+ * 鍏嶇櫥褰曞叕寮�鎺ュ彛锛屼緵鍓嶇鐧诲綍椤� / 搴旂敤鍚姩鏃惰鍙栧叕鍙稿悕绉般�乴ogo銆佺櫥褰曢〉鏍囬銆�
+ */
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱鍏徃鍝佺墝淇℃伅锛堝厤鐧诲綍鍏紑锛�")
+ @PermitAll
+ public CommonResult<SystemCompanyConfigRespVO> getCompanyConfig() {
+ SystemCompanyConfigDO config = companyConfigService.getCompanyConfig();
+ return success(BeanUtils.toBean(config, SystemCompanyConfigRespVO.class));
+ }
+
+ /**
+ * 淇濆瓨鍏徃鍝佺墝淇℃伅
+ *
+ * 鍗曡 upsert锛岄渶鐧诲綍涓旀嫢鏈� system:company-config:update 鏉冮檺銆�
+ * 鏉冮檺閫氳繃鑿滃崟銆屽叕鍙镐俊鎭厤缃� - 淇敼銆嶆巿鏉冿紙瑙� sql/mysql/system_company_config_menu.sql锛夈��
+ */
+ @PostMapping("/save")
+ @Operation(summary = "淇濆瓨鍏徃鍝佺墝淇℃伅")
+ @PreAuthorize("@ss.hasPermission('system:company-config:update')")
+ public CommonResult<Long> saveCompanyConfig(@Valid @RequestBody SystemCompanyConfigSaveReqVO reqVO) {
+ return success(companyConfigService.saveCompanyConfig(reqVO));
+ }
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigRespVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigRespVO.java
new file mode 100644
index 0000000..7faff1b
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigRespVO.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.system.controller.admin.companyconfig.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - 鍏徃鍝佺墝淇℃伅 Response VO")
+@Data
+public class SystemCompanyConfigRespVO {
+
+ @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ private Long id;
+
+ @Schema(description = "鍏徃鍚嶇О", example = "瀹佸涔濇硴鍖栧伐")
+ private String companyName;
+
+ @Schema(description = "logo 姘镐箙鍏紑閾炬帴锛坧reviewURL锛�", example = "http://domain/admin-api/system/storage-blob/preview/xxx?publicKey=xxx")
+ private String logoUrl;
+
+ @Schema(description = "logo 瀵瑰簲鐨� blob 璁板綍 ID", example = "86")
+ private Long logoBlobId;
+
+ @Schema(description = "鐧诲綍椤垫爣棰�", example = "鍒堕�犺繍钀ョ鐞嗗钩鍙�")
+ private String loginTitle;
+
+ @Schema(description = "鐧诲綍椤垫弿杩�", example = "宸ョ▼鍖栥�侀珮鎬ц兘銆佽法缁勪欢搴撶殑鍓嶇妯$増")
+ private String loginDescription;
+
+ @Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigSaveReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigSaveReqVO.java
new file mode 100644
index 0000000..76193e6
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigSaveReqVO.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.system.controller.admin.companyconfig.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+@Schema(description = "绠$悊鍚庡彴 - 鍏徃鍝佺墝淇℃伅淇濆瓨 Request VO")
+@Data
+public class SystemCompanyConfigSaveReqVO {
+
+ @Schema(description = "涓婚敭锛堝崟琛岄厤缃紝鍙笉浼狅級", example = "1")
+ private Long id;
+
+ @Schema(description = "鍏徃鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "瀹佸涔濇硴鍖栧伐")
+ @NotBlank(message = "鍏徃鍚嶇О涓嶈兘涓虹┖")
+ @Size(max = 128, message = "鍏徃鍚嶇О涓嶈兘瓒呰繃128涓瓧绗�")
+ private String companyName;
+
+ @Schema(description = "logo 姘镐箙鍏紑閾炬帴锛坧reviewURL锛�", example = "http://domain/admin-api/system/storage-blob/preview/xxx?publicKey=xxx")
+ @Size(max = 512, message = "logo 鍦板潃涓嶈兘瓒呰繃512涓瓧绗�")
+ private String logoUrl;
+
+ @Schema(description = "logo 瀵瑰簲鐨� blob 璁板綍 ID", example = "86")
+ private Long logoBlobId;
+
+ @Schema(description = "鐧诲綍椤垫爣棰�", example = "鍒堕�犺繍钀ョ鐞嗗钩鍙�")
+ @Size(max = 128, message = "鐧诲綍椤垫爣棰樹笉鑳借秴杩�128涓瓧绗�")
+ private String loginTitle;
+
+ @Schema(description = "鐧诲綍椤垫弿杩�", example = "宸ョ▼鍖栥�侀珮鎬ц兘銆佽法缁勪欢搴撶殑鍓嶇妯$増")
+ @Size(max = 128, message = "鐧诲綍椤垫弿杩颁笉鑳借秴杩�128涓瓧绗�")
+ private String loginDescription;
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/database/DatabaseBackupController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/database/DatabaseBackupController.java
new file mode 100644
index 0000000..51ed463
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/database/DatabaseBackupController.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.system.controller.admin.database;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.system.service.database.DatabaseBackupService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+
+@Tag(name = "绠$悊鍚庡彴 - 鏁版嵁搴撳浠�")
+@RestController
+@RequestMapping("/system/database")
+public class DatabaseBackupController {
+
+ @Resource
+ private DatabaseBackupService databaseBackupService;
+
+ @GetMapping("/backup")
+ @Operation(summary = "涓嬭浇鏁版嵁搴撳浠�")
+ @PreAuthorize("@ss.hasPermission('system:database:backup')")
+ public void backupDatabase(HttpServletResponse response) throws Exception {
+ databaseBackupService.backupDatabase(response);
+ }
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/companyconfig/SystemCompanyConfigDO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/companyconfig/SystemCompanyConfigDO.java
new file mode 100644
index 0000000..0f877f4
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/companyconfig/SystemCompanyConfigDO.java
@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.companyconfig;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 鍏徃鍝佺墝淇℃伅閰嶇疆 DO
+ *
+ * 鍗曡閰嶇疆锛氫繚瀛樺叕鍙稿悕绉�/logo/鐧诲綍椤垫爣棰橈紝鍓嶇鍚姩鏃惰鍙栧苟鑱斿姩鐧诲綍椤点�佽彍鍗曟爮銆佺綉椤垫爣棰樸��
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("system_company_config")
+@KeySequence("system_company_config_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SystemCompanyConfigDO extends BaseDO {
+
+ /**
+ * 涓婚敭
+ */
+ private Long id;
+ /**
+ * 鍏徃鍚嶇О
+ */
+ private String companyName;
+ /**
+ * logo 姘镐箙鍏紑閾炬帴锛坧ublic-upload 杩斿洖鐨� previewURL锛�
+ */
+ private String logoUrl;
+ /**
+ * logo 瀵瑰簲鐨� blob 璁板綍 ID
+ */
+ private Long logoBlobId;
+ /**
+ * 鐧诲綍椤垫爣棰�
+ */
+ private String loginTitle;
+ /**
+ * 鐧诲綍椤垫弿杩�
+ */
+ private String loginDescription;
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/companyconfig/SystemCompanyConfigMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/companyconfig/SystemCompanyConfigMapper.java
new file mode 100644
index 0000000..c098410
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/companyconfig/SystemCompanyConfigMapper.java
@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.system.dal.mysql.companyconfig;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.system.dal.dataobject.companyconfig.SystemCompanyConfigDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 鍏徃鍝佺墝淇℃伅閰嶇疆 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface SystemCompanyConfigMapper extends BaseMapperX<SystemCompanyConfigDO> {
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigService.java
new file mode 100644
index 0000000..e2483da
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigService.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.system.service.companyconfig;
+
+import cn.iocoder.yudao.module.system.controller.admin.companyconfig.vo.SystemCompanyConfigSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.companyconfig.SystemCompanyConfigDO;
+
+/**
+ * 鍏徃鍝佺墝淇℃伅閰嶇疆 Service 鎺ュ彛
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface SystemCompanyConfigService {
+
+ /**
+ * 鑾峰緱鍏徃鍝佺墝淇℃伅锛堝崟琛岄厤缃級
+ *
+ * @return 鍏徃鍝佺墝淇℃伅锛屾湭閰嶇疆鏃惰繑鍥� null
+ */
+ SystemCompanyConfigDO getCompanyConfig();
+
+ /**
+ * 淇濆瓨鍏徃鍝佺墝淇℃伅锛堝崟琛� upsert锛�
+ *
+ * @param reqVO 淇濆瓨璇锋眰
+ * @return 涓婚敭
+ */
+ Long saveCompanyConfig(SystemCompanyConfigSaveReqVO reqVO);
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigServiceImpl.java
new file mode 100644
index 0000000..c862d36
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigServiceImpl.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.system.service.companyconfig;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.system.controller.admin.companyconfig.vo.SystemCompanyConfigSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.companyconfig.SystemCompanyConfigDO;
+import cn.iocoder.yudao.module.system.dal.mysql.companyconfig.SystemCompanyConfigMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鍏徃鍝佺墝淇℃伅閰嶇疆 Service 瀹炵幇绫�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+public class SystemCompanyConfigServiceImpl implements SystemCompanyConfigService {
+
+ @Resource
+ private SystemCompanyConfigMapper companyConfigMapper;
+
+ @Override
+ public SystemCompanyConfigDO getCompanyConfig() {
+ // 鍗曡閰嶇疆锛氭寜涓婚敭鍗囧簭鍙栫涓�鏉�
+ List<SystemCompanyConfigDO> list = companyConfigMapper.selectList(new LambdaQueryWrapperX<SystemCompanyConfigDO>()
+ .orderByAsc(SystemCompanyConfigDO::getId)
+ .last("LIMIT 1"));
+ return CollUtil.getFirst(list);
+ }
+
+ @Override
+ public Long saveCompanyConfig(SystemCompanyConfigSaveReqVO reqVO) {
+ SystemCompanyConfigDO config = getCompanyConfig();
+ if (config == null) {
+ // 棣栨淇濆瓨锛氭彃鍏�
+ SystemCompanyConfigDO insertObj = BeanUtils.toBean(reqVO, SystemCompanyConfigDO.class);
+ companyConfigMapper.insert(insertObj);
+ return insertObj.getId();
+ }
+ // 宸插瓨鍦細鏇存柊鍗曡
+ SystemCompanyConfigDO updateObj = BeanUtils.toBean(reqVO, SystemCompanyConfigDO.class);
+ updateObj.setId(config.getId());
+ companyConfigMapper.updateById(updateObj);
+ return config.getId();
+ }
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupService.java
new file mode 100644
index 0000000..b48ac79
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupService.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.system.service.database;
+
+import jakarta.servlet.http.HttpServletResponse;
+
+public interface DatabaseBackupService {
+
+ /**
+ * 澶囦唤鏁版嵁搴擄紝骞跺皢 SQL 鏂囦欢鍐欏叆鍒� HTTP 鍝嶅簲涓�
+ *
+ * @param response HTTP 鍝嶅簲
+ */
+ void backupDatabase(HttpServletResponse response) throws Exception;
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupServiceImpl.java
new file mode 100644
index 0000000..0ff72a9
--- /dev/null
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupServiceImpl.java
@@ -0,0 +1,460 @@
+package cn.iocoder.yudao.module.system.service.database;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.sql.DataSource;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.Statement;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@Service
+@Slf4j
+public class DatabaseBackupServiceImpl implements DatabaseBackupService {
+
+ /** 澶囦唤瓒呮椂鏃堕棿锛堝垎閽燂級 */
+ private static final long BACKUP_TIMEOUT_MINUTES = 10;
+ /** MySQL 瀹瑰櫒鍐呴儴绔彛 */
+ private static final String DOCKER_MYSQL_PORT = "3306";
+
+ @Value("${spring.datasource.dynamic.datasource.master.url:}")
+ private String dbUrl;
+
+ @Value("${spring.datasource.dynamic.datasource.master.username:root}")
+ private String dbUsername;
+
+ @Value("${spring.datasource.dynamic.datasource.master.password:}")
+ private String dbPassword;
+
+ /** 澶囦唤鍛戒护锛屽彲鏄惧紡鎸囧畾锛堝 docker exec mysql8 mysqldump锛夛紱鐣欑┖鍒欒嚜鍔ㄦ娴嬫湰鍦� mysqldump 鎴� Docker MySQL 瀹瑰櫒 */
+ @Value("${yudao.database-backup.command:}")
+ private String backupCommand;
+
+ /** 澶囦唤鐩爣鏁版嵁搴� host锛岀暀绌哄垯浠庢暟鎹簮 JDBC URL 瑙f瀽 */
+ @Value("${yudao.database-backup.host:}")
+ private String backupHost;
+
+ /** 澶囦唤鐩爣鏁版嵁搴� port锛岀暀绌哄垯浠庢暟鎹簮 JDBC URL 瑙f瀽 */
+ @Value("${yudao.database-backup.port:}")
+ private String backupPort;
+
+ /** 澶囦唤鐩爣鏁版嵁搴撳悕锛岀暀绌哄垯浠庢暟鎹簮 JDBC URL 瑙f瀽 */
+ @Value("${yudao.database-backup.database:}")
+ private String backupDatabase;
+
+ /** 澶囦唤璐﹀彿锛岀暀绌哄垯浣跨敤鏁版嵁婧愯处鍙� */
+ @Value("${yudao.database-backup.username:}")
+ private String backupUsername;
+
+ /** 澶囦唤瀵嗙爜锛岀暀绌哄垯浣跨敤鏁版嵁婧愬瘑鐮� */
+ @Value("${yudao.database-backup.password:}")
+ private String backupPassword;
+
+ /** 涓绘暟鎹簮锛岀敤浜� JDBC 瀵煎嚭鍏滃簳 */
+ @Resource
+ private DataSource dataSource;
+
+ @Override
+ public void backupDatabase(HttpServletResponse response) throws Exception {
+ if (StrUtil.isEmpty(dbUrl)) {
+ throw new ServiceException(500, "鏈壘鍒版暟鎹簱杩炴帴閰嶇疆");
+ }
+
+ // 澶囦唤杩炴帴鐨勬暟鎹簱淇℃伅锛氫紭鍏堜娇鐢� yudao.database-backup 閰嶇疆锛屾湭閰嶇疆鐨勯儴鍒嗕粠鏁版嵁婧� JDBC URL 瑙f瀽鍏滃簳
+ String dbHost = backupHost;
+ String dbPort = backupPort;
+ String dbName = backupDatabase;
+ if (StrUtil.isEmpty(dbHost) || StrUtil.isEmpty(dbPort) || StrUtil.isEmpty(dbName)) {
+ Matcher matcher = Pattern.compile("jdbc:mysql://([^:]+):(\\d+)/([^?]+)").matcher(dbUrl);
+ if (matcher.find()) {
+ if (StrUtil.isEmpty(dbHost)) {
+ dbHost = matcher.group(1);
+ }
+ if (StrUtil.isEmpty(dbPort)) {
+ dbPort = matcher.group(2);
+ }
+ if (StrUtil.isEmpty(dbName)) {
+ dbName = matcher.group(3);
+ }
+ }
+ }
+ if (StrUtil.isEmpty(dbHost) || StrUtil.isEmpty(dbPort) || StrUtil.isEmpty(dbName)) {
+ log.warn("鏃犳硶浠庨厤缃垨 JDBC URL 瑙f瀽瀹屾暣鐨勬暟鎹簱淇℃伅: host={}, port={}, db={}", dbHost, dbPort, dbName);
+ throw new ServiceException(500, "鏃犳硶瑙f瀽鏁版嵁搴撳浠借繛鎺ヤ俊鎭紝璇峰湪 yudao.database-backup 涓厤缃� host/port/database");
+ }
+ // localhost 缁熶竴璧� TCP 127.0.0.1锛歮ysqldump 瀵� localhost 鍙兘璧� socket/loopback锛�
+ // 鑰屼笉鍚岀幆澧� root@localhost 鐨勮璇佽姹傚樊寮傚ぇ锛屽己鍒� TCP 鏇寸ǔ瀹�
+ if ("localhost".equalsIgnoreCase(dbHost)) {
+ dbHost = "127.0.0.1";
+ }
+ String username = StrUtil.isEmpty(backupUsername) ? dbUsername : backupUsername;
+ String password = StrUtil.isEmpty(backupPassword) ? dbPassword : backupPassword;
+
+ // 缁勮鍊欓�夊浠藉懡浠わ紝鎸変紭鍏堢骇渚濇灏濊瘯锛氭墜鍔ㄩ厤缃� > 鏈満 mysqldump > Docker 瀹瑰櫒 mysqldump
+ List<List<String>> candidates = new ArrayList<>();
+ List<String> labels = new ArrayList<>();
+ if (StrUtil.isNotEmpty(backupCommand)) {
+ candidates.add(splitCommand(backupCommand));
+ labels.add("鎵嬪姩閰嶇疆鍛戒护[" + backupCommand + "]");
+ }
+ if (isLocalMysqldumpAvailable()) {
+ candidates.add(buildLocalMysqldumpCommand(dbHost, dbPort, username, password, dbName));
+ labels.add("鏈満 mysqldump");
+ }
+ String container = findMysqlDockerContainer(dbPort);
+ if (StrUtil.isNotEmpty(container)) {
+ candidates.add(buildDockerExecCommand(container, username, password, dbName));
+ labels.add("Docker 瀹瑰櫒[" + container + "] mysqldump");
+ }
+ log.info("鏁版嵁搴撳浠藉�欓�夋柟寮忥細{}", labels);
+
+ // 渚濇灏濊瘯鎵�鏈夊閮ㄥ懡浠ゆ柟寮�
+ List<String> failures = new ArrayList<>();
+ String timestamp = DateUtil.format(new Date(), "yyyyMMdd_HHmmss");
+ String fileName = "backup_" + timestamp + ".sql";
+ for (int i = 0; i < candidates.size(); i++) {
+ File tempFile = File.createTempFile("backup_", ".sql");
+ try {
+ String error = runMysqldump(candidates.get(i), password, tempFile);
+ if (error == null) {
+ log.info("鏁版嵁搴撳浠芥垚鍔燂紝浣跨敤鏂瑰紡锛歿}", labels.get(i));
+ downloadAttachment(response, tempFile, fileName);
+ return;
+ }
+ log.warn("澶囦唤鏂瑰紡 [{}] 澶辫触锛歿}", labels.get(i), error);
+ failures.add(labels.get(i) + "锛�" + error);
+ } finally {
+ FileUtil.del(tempFile);
+ }
+ }
+
+ // 澶栭儴鍛戒护鍏ㄩ儴澶辫触鎴栦笉鍙敤鏃讹紝浣跨敤 JDBC 瀵煎嚭鍏滃簳锛屼繚璇佷换浣曢儴缃茬幆澧冿紙濡傚簲鐢ㄥ鍣ㄥ唴鏃� mysqldump/docker锛夐兘鑳藉浠�
+ File tempFile = File.createTempFile("backup_", ".sql");
+ try {
+ String error = exportByJdbc(tempFile);
+ if (error == null) {
+ log.info("鏁版嵁搴撳浠芥垚鍔燂紝浣跨敤鏂瑰紡锛欽DBC 瀵煎嚭鍏滃簳");
+ downloadAttachment(response, tempFile, fileName);
+ return;
+ }
+ log.warn("JDBC 瀵煎嚭鍏滃簳澶辫触锛歿}", error);
+ failures.add("JDBC 瀵煎嚭鍏滃簳锛�" + error);
+ } finally {
+ FileUtil.del(tempFile);
+ }
+ throw new ServiceException(500, "鏁版嵁搴撳浠藉け璐ワ細" + String.join(" 锝� ", failures));
+ }
+
+ /**
+ * 閫氳繃 JDBC 鐩磋繛鏁版嵁搴撳鍑哄缓琛ㄨ鍙ヤ笌鍏ㄩ噺鏁版嵁锛屼綔涓哄閮ㄥ懡浠や笉鍙敤鏃剁殑鍏滃簳澶囦唤鏂瑰紡
+ *
+ * @return 鎵ц鎴愬姛杩斿洖 null锛涘け璐ヨ繑鍥為敊璇弿杩�
+ */
+ private String exportByJdbc(File outputFile) {
+ try (Connection conn = dataSource.getConnection();
+ BufferedWriter writer = new BufferedWriter(
+ new OutputStreamWriter(new FileOutputStream(outputFile), StandardCharsets.UTF_8))) {
+ writer.write("/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;\n");
+ writer.write("/*!40101 SET NAMES utf8mb4 */;\n");
+ writer.write("SET TIME_ZONE='+00:00';\n");
+ writer.write("SET FOREIGN_KEY_CHECKS=0;\n");
+ writer.write("SET UNIQUE_CHECKS=0;\n");
+ writer.write("SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO';\n\n");
+ try (Statement st = conn.createStatement();
+ ResultSet rs = st.executeQuery("SHOW TABLES")) {
+ List<String> tables = new ArrayList<>();
+ while (rs.next()) {
+ tables.add(rs.getString(1));
+ }
+ for (String table : tables) {
+ exportTable(conn, writer, table);
+ }
+ }
+ writer.write("\nSET FOREIGN_KEY_CHECKS=1;\n");
+ writer.write("SET UNIQUE_CHECKS=1;\n");
+ writer.write("/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\n");
+ return null;
+ } catch (Exception e) {
+ log.error("JDBC 瀵煎嚭鍏滃簳澶辫触", e);
+ return "JDBC 瀵煎嚭寮傚父: " + e.getMessage();
+ }
+ }
+
+ /**
+ * 瀵煎嚭鍗曞紶琛ㄧ殑寤鸿〃璇彞涓庡叏閮ㄦ暟鎹�
+ */
+ private void exportTable(Connection conn, BufferedWriter writer, String table) throws Exception {
+ String quoted = "`" + table.replace("`", "``") + "`";
+ // 寤鸿〃璇彞
+ try (Statement st = conn.createStatement();
+ ResultSet rs = st.executeQuery("SHOW CREATE TABLE " + quoted)) {
+ if (rs.next()) {
+ writer.write(rs.getString(2));
+ writer.write(";\n\n");
+ }
+ }
+ // 鍏ㄩ噺鏁版嵁锛屾祦寮忚鍙栭伩鍏嶅ぇ琛ㄥ崰鐢ㄨ繃澶氬唴瀛�
+ try (Statement st = conn.createStatement()) {
+ st.setFetchSize(Integer.MIN_VALUE);
+ try (ResultSet rs = st.executeQuery("SELECT * FROM " + quoted)) {
+ ResultSetMetaData meta = rs.getMetaData();
+ int columnCount = meta.getColumnCount();
+ int[] types = new int[columnCount];
+ for (int i = 0; i < columnCount; i++) {
+ types[i] = meta.getColumnType(i + 1);
+ }
+ while (rs.next()) {
+ StringBuilder sb = new StringBuilder("INSERT INTO ").append(quoted).append(" VALUES (");
+ for (int i = 0; i < columnCount; i++) {
+ if (i > 0) {
+ sb.append(',');
+ }
+ if (rs.getObject(i + 1) == null) {
+ sb.append("NULL");
+ continue;
+ }
+ int type = types[i];
+ if (type == Types.BIT) {
+ sb.append(rs.getBoolean(i + 1) ? '1' : '0');
+ } else if (isBinaryType(type)) {
+ sb.append("X'").append(HexUtil.encodeHexStr(rs.getBytes(i + 1))).append("'");
+ } else {
+ sb.append('\'').append(escapeSql(rs.getString(i + 1))).append('\'');
+ }
+ }
+ sb.append(");\n");
+ writer.write(sb.toString());
+ }
+ }
+ }
+ writer.write('\n');
+ }
+
+ /**
+ * 鏄惁浜岃繘鍒跺垪绫诲瀷锛屼簩杩涘埗鏁版嵁浠ュ崄鍏繘鍒跺瓧闈㈤噺瀵煎嚭閬垮厤涔辩爜
+ */
+ private boolean isBinaryType(int type) {
+ return type == Types.BINARY || type == Types.VARBINARY
+ || type == Types.LONGVARBINARY || type == Types.BLOB;
+ }
+
+ /**
+ * SQL 瀛楃涓插瓧闈㈤噺杞箟
+ */
+ private String escapeSql(String value) {
+ return value.replace("\\", "\\\\").replace("'", "''").replace("\0", "\\0");
+ }
+
+ /**
+ * 鏋勫缓鏈満 mysqldump 澶囦唤鍛戒护
+ */
+ private List<String> buildLocalMysqldumpCommand(String host, String port, String username, String password, String dbName) {
+ List<String> command = new ArrayList<>();
+ command.add("mysqldump");
+ // MySQL 8 caching_sha2_password 璁よ瘉榛樿涓嶈姹傛湇鍔$鍏挜锛屼細鎶� Access denied (using password: YES)
+ command.add("--get-server-public-key");
+ command.add("-h" + host);
+ command.add("-P" + port);
+ command.add("-u" + username);
+ if (StrUtil.isEmpty(password)) {
+ command.add("--skip-password");
+ }
+ command.add(dbName);
+ return command;
+ }
+
+ /**
+ * 鏋勫缓閫氳繃 docker exec 璋冪敤瀹瑰櫒鍐� mysqldump 鐨勫浠藉懡浠�
+ */
+ private List<String> buildDockerExecCommand(String container, String username, String password, String dbName) {
+ List<String> command = new ArrayList<>();
+ command.add("docker");
+ command.add("exec");
+ // docker exec 涓嶄細杞彂瀹夸富鏈虹幆澧冨彉閲忥紝瀵嗙爜闇�閫氳繃 -e 鏄惧紡浼犲叆瀹瑰櫒
+ if (StrUtil.isNotEmpty(password)) {
+ command.add("-e");
+ command.add("MYSQL_PWD=" + password);
+ }
+ command.add(container);
+ command.add("mysqldump");
+ command.add("--get-server-public-key");
+ // 瀹瑰櫒鍐呭浐瀹氳蛋 127.0.0.1:3306 鐨� TCP 杩炴帴鑷韩锛岀粫寮� socket/loopback 璁よ瘉宸紓
+ command.add("-h127.0.0.1");
+ command.add("-P" + DOCKER_MYSQL_PORT);
+ command.add("-u" + username);
+ if (StrUtil.isEmpty(password)) {
+ command.add("--skip-password");
+ }
+ command.add(dbName);
+ return command;
+ }
+
+ /**
+ * 鎵ц mysqldump 鍛戒护锛屽皢 stdout 鍐欏叆涓存椂鏂囦欢
+ *
+ * @return 鎵ц鎴愬姛杩斿洖 null锛涘け璐ヨ繑鍥為敊璇弿杩�
+ */
+ private String runMysqldump(List<String> command, String password, File outputFile) {
+ try {
+ ProcessBuilder pb = new ProcessBuilder(command);
+ // 瀵嗙爜閫氳繃鐜鍙橀噺浼犻�掞紝閬垮厤鍑虹幇鍦ㄥ懡浠よ鍙婅繘绋嬪垪琛�
+ if (StrUtil.isNotEmpty(password)) {
+ pb.environment().put("MYSQL_PWD", password);
+ }
+ Process process = pb.start();
+
+ // 鍚庡彴璇诲彇 stderr锛岄槻姝㈢閬撶紦鍐插尯鍐欐弧瀵艰嚧杩涚▼闃诲
+ StringBuilder stderr = new StringBuilder();
+ Thread stderrThread = new Thread(() -> {
+ try (BufferedReader reader = new BufferedReader(
+ new InputStreamReader(process.getErrorStream(), StandardCharsets.UTF_8))) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ stderr.append(line).append(System.lineSeparator());
+ }
+ } catch (IOException ignored) {
+ }
+ });
+ stderrThread.start();
+
+ // mysqldump 杈撳嚭鍐欏叆鏈湴涓存椂鏂囦欢锛坉ocker exec 鍦烘櫙杈撳嚭涓嶄細钀藉湪瀹瑰櫒鍐呮枃浠剁郴缁燂級
+ try (InputStream in = process.getInputStream();
+ OutputStream out = new FileOutputStream(outputFile)) {
+ IoUtil.copy(in, out);
+ }
+
+ boolean finished = process.waitFor(BACKUP_TIMEOUT_MINUTES, TimeUnit.MINUTES);
+ stderrThread.join();
+ if (!finished) {
+ process.destroyForcibly();
+ return "鎵ц瓒呮椂锛堣秴杩� " + BACKUP_TIMEOUT_MINUTES + " 鍒嗛挓锛�";
+ }
+ if (process.exitValue() != 0) {
+ return "exitCode=" + process.exitValue() + "锛�" + stderr.toString().trim();
+ }
+ return null;
+ } catch (IOException e) {
+ return "鍚姩鍛戒护澶辫触: " + e.getMessage();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ return "鎵ц琚腑鏂�: " + e.getMessage();
+ }
+ }
+
+ /**
+ * 灏嗗浠芥枃浠朵綔涓洪檮浠惰緭鍑哄埌鍝嶅簲
+ */
+ private void downloadAttachment(HttpServletResponse response, File file, String fileName) throws IOException {
+ response.setContentType("application/octet-stream; charset=UTF-8");
+ response.setHeader("Content-Disposition", "attachment; filename=\"" + URLEncoder.encode(fileName, "UTF-8") + "\"");
+ response.setContentLengthLong(file.length());
+ try (FileInputStream fis = new FileInputStream(file);
+ OutputStream os = response.getOutputStream()) {
+ IoUtil.copy(fis, os);
+ }
+ }
+
+ /**
+ * 灏嗛厤缃殑鍛戒护瀛楃涓叉寜绌虹櫧鍒囧垎涓哄弬鏁板垪琛�
+ */
+ private List<String> splitCommand(String command) {
+ List<String> parts = new ArrayList<>();
+ for (String token : command.trim().split("\\s+")) {
+ parts.add(token);
+ }
+ return parts;
+ }
+
+ /**
+ * 妫�娴嬫湰鏈� mysqldump 鏄惁鍙敤
+ */
+ private boolean isLocalMysqldumpAvailable() {
+ try {
+ Process process = new ProcessBuilder("mysqldump", "--version").redirectErrorStream(true).start();
+ boolean finished = process.waitFor(5, TimeUnit.SECONDS);
+ if (!finished) {
+ process.destroyForcibly();
+ return false;
+ }
+ return process.exitValue() == 0;
+ } catch (IOException e) {
+ return false;
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ return false;
+ }
+ }
+
+ /**
+ * 鏌ユ壘杩愯涓殑 MySQL Docker 瀹瑰櫒锛屼紭鍏堥�夋嫨绔彛鏄犲皠涓庢暟鎹簮绔彛涓�鑷寸殑瀹瑰櫒
+ *
+ * @return 瀹瑰櫒鍚嶏紱鏈壘鍒拌繑鍥� null
+ */
+ private String findMysqlDockerContainer(String dbPort) {
+ try {
+ Process ps = new ProcessBuilder("docker", "ps", "--format", "{{.ID}}|{{.Names}}|{{.Image}}")
+ .redirectErrorStream(true).start();
+ String output = IoUtil.read(ps.getInputStream(), StandardCharsets.UTF_8);
+ if (!ps.waitFor(10, TimeUnit.SECONDS) || ps.exitValue() != 0) {
+ return null;
+ }
+ List<String[]> containers = new ArrayList<>();
+ for (String line : output.split("\n")) {
+ String[] parts = line.trim().split("\\|");
+ if (parts.length == 3 && parts[2].startsWith("mysql")) {
+ containers.add(parts);
+ }
+ }
+ if (containers.isEmpty()) {
+ return null;
+ }
+ // 浼樺厛閫夋嫨绔彛鏄犲皠涓庢暟鎹簮绔彛涓�鑷寸殑瀹瑰櫒
+ for (String[] container : containers) {
+ Process portProcess = new ProcessBuilder("docker", "port", container[0], "3306/tcp")
+ .redirectErrorStream(true).start();
+ String portOutput = IoUtil.read(portProcess.getInputStream(), StandardCharsets.UTF_8);
+ if (portProcess.waitFor(10, TimeUnit.SECONDS) && portProcess.exitValue() == 0
+ && portOutput.contains(dbPort)) {
+ return container[1];
+ }
+ }
+ log.warn("鏈尮閰嶅埌绔彛鏄犲皠鐨� MySQL 瀹瑰櫒锛屼娇鐢ㄧ涓�涓�: {}", containers.get(0)[1]);
+ return containers.get(0)[1];
+ } catch (IOException e) {
+ log.warn("妫�娴� Docker 鐜澶辫触: {}", e.getMessage());
+ return null;
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ return null;
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3