From 33fe3368c6692d67e1fae5d2922ff614e5f56404 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 02 十一月 2026 11:57:03 +0800
Subject: [PATCH] feat(safety): 安全生产三期 - 隐患排查治理
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyHazardDO.java | 164 +++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardPageReqVO.java | 52 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyHazardService.java | 41 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyHazardServiceImpl.java | 149 ++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyHazardController.java | 183 ++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyHazardMapper.java | 79 ++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardSaveReqVO.java | 73 ++++
sql/mysql/mes_safety_hazard_init.sql | 136 +++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardCheckReqVO.java | 25 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardRespVO.java | 109 ++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskServiceImpl.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardRectifyReqVO.java | 30 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java | 9
15 files changed, 1,071 insertions(+), 0 deletions(-)
diff --git a/sql/mysql/mes_safety_hazard_init.sql b/sql/mysql/mes_safety_hazard_init.sql
new file mode 100644
index 0000000..c595e9c
--- /dev/null
+++ b/sql/mysql/mes_safety_hazard_init.sql
@@ -0,0 +1,136 @@
+-- =====================================================================
+-- 瀹夊叏鐢熶骇妯″潡 鈥斺�� 涓夋湡锛氶殣鎮f帓鏌ユ不鐞�
+--
+-- 瀹氫綅锛氬弻閲嶉闃叉満鍒剁殑绗簩閲嶃�備笌涓�鏈熴�岄闄╁垎绾х鎺с�嶉厤濂椾娇鐢細
+-- 闅愭偅鍙叧鑱斿埌鍏蜂綋椋庨櫓鐐癸紝褰㈡垚銆岄闄╄瘑鍒� 鈫� 闅愭偅鎺掓煡 鈫� 鏁存敼闂幆銆嶇殑瀹屾暣閾捐矾銆�
+--
+-- 鐘舵�佹祦杞細
+-- 0 寰呮暣鏀� 鈹�鈹�鎻愪氦鏁存敼鈹�鈹�> 20 寰呴獙鏀� 鈹�鈹�楠屾敹閫氳繃鈹�鈹�> 30 宸查棴鐜�
+-- 鈹�
+-- 鈹斺攢鈹�楠屾敹椹冲洖鈹�鈹�> 10 鏁存敼涓紙閲嶆柊鏁存敼锛�
+--
+-- 鍐呭锛�
+-- 1. 寤鸿〃 mes_safety_hazard锛堥殣鎮e彴璐︼級
+-- 2. 瀛楀吀锛氶殣鎮f潵婧� / 闅愭偅绛夌骇 / 闅愭偅鐘舵��
+-- 3. 鑿滃崟锛氭寕鍦ㄣ�屽畨鍏ㄧ敓浜с�嶇洰褰曚笅
+-- 4. 鎺堟潈瓒呯骇绠$悊鍛�
+--
+-- 鐗规�э細鍙噸澶嶆墽琛�
+-- =====================================================================
+
+-- ---------------------------------------------------------------------
+-- 1. 闅愭偅鍙拌处
+-- ---------------------------------------------------------------------
+CREATE TABLE IF NOT EXISTS `mes_safety_hazard` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `code` varchar(64) NOT NULL COMMENT '闅愭偅缂栫爜',
+ `name` varchar(200) NOT NULL COMMENT '闅愭偅鍚嶇О/绠�杩�',
+
+ `source` tinyint DEFAULT NULL COMMENT '闅愭偅鏉ユ簮锛堝瓧鍏� mes_safety_hazard_source锛�',
+ `hazard_level` tinyint DEFAULT NULL COMMENT '闅愭偅绛夌骇锛堝瓧鍏� mes_safety_hazard_level锛�1涓�鑸� 2閲嶅ぇ锛�',
+ `category` tinyint DEFAULT NULL COMMENT '闅愭偅绫诲埆锛堝鐢� mes_safety_risk_category锛�',
+
+ `unit_id` bigint DEFAULT NULL COMMENT '鍏宠仈椋庨櫓鍗曞厓缂栧彿',
+ `risk_id` bigint DEFAULT NULL COMMENT '鍏宠仈椋庨櫓娓呭崟缂栧彿',
+ `workshop_id` bigint DEFAULT NULL COMMENT '鎵�灞炶溅闂寸紪鍙�',
+ `location` varchar(255) DEFAULT NULL COMMENT '鍏蜂綋浣嶇疆',
+
+ `description` varchar(1000) DEFAULT NULL COMMENT '闅愭偅鎻忚堪',
+ `found_date` date DEFAULT NULL COMMENT '鍙戠幇鏃ユ湡',
+ `founder_user_id` bigint DEFAULT NULL COMMENT '鍙戠幇浜虹紪鍙�',
+
+ `charge_user_id` bigint DEFAULT NULL COMMENT '鏁存敼璐d换浜虹紪鍙�',
+ `deadline` date DEFAULT NULL COMMENT '鏁存敼鏈熼檺',
+ `rectify_requirement` varchar(1000) DEFAULT NULL COMMENT '鏁存敼瑕佹眰',
+
+ `status` tinyint NOT NULL DEFAULT '0' COMMENT '鐘舵�侊細0寰呮暣鏀� 10鏁存敼涓� 20寰呴獙鏀� 30宸查棴鐜�',
+
+ `measure` varchar(1000) DEFAULT NULL COMMENT '鏁存敼鎺柦',
+ `finish_date` date DEFAULT NULL COMMENT '鏁存敼瀹屾垚鏃ユ湡',
+
+ `check_user_id` bigint DEFAULT NULL COMMENT '楠屾敹浜虹紪鍙�',
+ `check_time` datetime DEFAULT NULL COMMENT '楠屾敹鏃堕棿',
+ `check_result` varchar(500) DEFAULT NULL COMMENT '楠屾敹鎰忚/缁撹',
+ `reject_reason` varchar(500) DEFAULT NULL COMMENT '楠屾敹椹冲洖鍘熷洜',
+
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE KEY `uk_code` (`code`) USING BTREE,
+ KEY `idx_status` (`status`) USING BTREE,
+ KEY `idx_workshop` (`workshop_id`) USING BTREE,
+ KEY `idx_risk` (`risk_id`) USING BTREE,
+ KEY `idx_deadline` (`deadline`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='瀹夊叏鐢熶骇-闅愭偅鎺掓煡鍙拌处';
+
+-- ---------------------------------------------------------------------
+-- 2. 瀛楀吀
+-- ---------------------------------------------------------------------
+DELETE FROM system_dict_data WHERE dict_type IN
+ ('mes_safety_hazard_source', 'mes_safety_hazard_level', 'mes_safety_hazard_status');
+
+DELETE FROM system_dict_type WHERE type IN
+ ('mes_safety_hazard_source', 'mes_safety_hazard_level', 'mes_safety_hazard_status');
+
+INSERT INTO system_dict_type (name, type, status, remark, creator, create_time, updater, update_time, deleted)
+VALUES ('瀹夊叏鐢熶骇-闅愭偅鏉ユ簮', 'mes_safety_hazard_source', 0, '闅愭偅鍙戠幇鐨勯�斿緞', '1', NOW(), '1', NOW(), b'0'),
+ ('瀹夊叏鐢熶骇-闅愭偅绛夌骇', 'mes_safety_hazard_level', 0, '1涓�鑸殣鎮� 2閲嶅ぇ闅愭偅', '1', NOW(), '1', NOW(), b'0'),
+ ('瀹夊叏鐢熶骇-闅愭偅鐘舵��', 'mes_safety_hazard_status', 0, '鏁存敼闂幆鐘舵��', '1', NOW(), '1', NOW(), b'0');
+
+INSERT INTO system_dict_data (sort, label, value, dict_type, status, color_type, creator, create_time, updater, update_time, deleted)
+VALUES
+-- 闅愭偅鏉ユ簮
+(1, '鏃ュ父鎺掓煡', '1', 'mes_safety_hazard_source', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+(2, '涓撻」妫�鏌�', '2', 'mes_safety_hazard_source', 0, 'processing', '1', NOW(), '1', NOW(), b'0'),
+(3, '涓婄骇妫�鏌�', '3', 'mes_safety_hazard_source', 0, 'warning', '1', NOW(), '1', NOW(), b'0'),
+(4, '鍛樺伐涓婃姤', '4', 'mes_safety_hazard_source', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+(5, '鍏朵粬', '5', 'mes_safety_hazard_source', 0, 'default', '1', NOW(), '1', NOW(), b'0'),
+-- 闅愭偅绛夌骇
+(1, '涓�鑸殣鎮�', '1', 'mes_safety_hazard_level', 0, 'warning', '1', NOW(), '1', NOW(), b'0'),
+(2, '閲嶅ぇ闅愭偅', '2', 'mes_safety_hazard_level', 0, 'error', '1', NOW(), '1', NOW(), b'0'),
+-- 闅愭偅鐘舵��
+(1, '寰呮暣鏀�', '0', 'mes_safety_hazard_status', 0, 'error', '1', NOW(), '1', NOW(), b'0'),
+(2, '鏁存敼涓�', '10', 'mes_safety_hazard_status', 0, 'processing', '1', NOW(), '1', NOW(), b'0'),
+(3, '寰呴獙鏀�', '20', 'mes_safety_hazard_status', 0, 'warning', '1', NOW(), '1', NOW(), b'0'),
+(4, '宸查棴鐜�', '30', 'mes_safety_hazard_status', 0, 'success', '1', NOW(), '1', NOW(), b'0');
+
+-- ---------------------------------------------------------------------
+-- 3. 鑿滃崟锛堟寕鍦� 1065910 瀹夊叏鐢熶骇涓嬶級
+-- ---------------------------------------------------------------------
+DELETE FROM system_role_menu WHERE menu_id BETWEEN 1065927 AND 1065940;
+
+DELETE FROM system_menu WHERE id BETWEEN 1065927 AND 1065940;
+
+INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon,
+ component, component_name, status, visible, keep_alive, always_show,
+ creator, create_time, updater, update_time, deleted)
+VALUES
+(1065927, '闅愭偅鎺掓煡娌荤悊', '', 2, 4, 1065910, 'hazard', 'ep:search',
+ 'safety/hazard/index', 'SafetyHazard', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065928, '闅愭偅鏌ヨ', 'mes:safety-hazard:query', 3, 1, 1065927, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065929, '闅愭偅鐧昏', 'mes:safety-hazard:create', 3, 2, 1065927, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065930, '闅愭偅鏇存柊', 'mes:safety-hazard:update', 3, 3, 1065927, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065931, '闅愭偅鍒犻櫎', 'mes:safety-hazard:delete', 3, 4, 1065927, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065932, '鎻愪氦鏁存敼', 'mes:safety-hazard:rectify', 3, 5, 1065927, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1065933, '鏁存敼楠屾敹', 'mes:safety-hazard:check', 3, 6, 1065927, '', '', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+
+-- ---------------------------------------------------------------------
+-- 4. 鎺堟潈瓒呯骇绠$悊鍛�
+-- ---------------------------------------------------------------------
+INSERT INTO system_role_menu (role_id, menu_id, creator, create_time, updater, update_time, deleted)
+SELECT 1, m.id, '1', NOW(), '1', NOW(), b'0'
+FROM system_menu m
+WHERE m.id BETWEEN 1065927 AND 1065940;
+
+-- ---------------------------------------------------------------------
+-- 5. 楠岃瘉
+-- ---------------------------------------------------------------------
+SELECT id, parent_id, name, path, component, permission, type
+FROM system_menu WHERE id BETWEEN 1065910 AND 1065940 ORDER BY id;
+
+SELECT dict_type, label, value FROM system_dict_data
+WHERE dict_type LIKE 'mes_safety_hazard%' ORDER BY dict_type, sort;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyHazardController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyHazardController.java
new file mode 100644
index 0000000..a9674fc
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/MesSafetyHazardController.java
@@ -0,0 +1,183 @@
+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.MesSafetyHazardCheckReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.MesSafetyHazardPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.MesSafetyHazardRectifyReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.MesSafetyHazardRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.MesSafetyHazardSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkshopDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyHazardDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyRiskDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyRiskUnitDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.md.workstation.MesMdWorkshopMapper;
+import cn.iocoder.yudao.module.mes.service.safety.MesSafetyHazardService;
+import cn.iocoder.yudao.module.mes.service.safety.MesSafetyRiskService;
+import cn.iocoder.yudao.module.mes.service.safety.MesSafetyRiskUnitService;
+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.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅 Controller
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Tag(name = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-闅愭偅鎺掓煡娌荤悊")
+@RestController
+@RequestMapping("/mes/safety/hazard")
+@Validated
+public class MesSafetyHazardController {
+
+ @Resource
+ private MesSafetyHazardService hazardService;
+
+ @Resource
+ private MesSafetyRiskUnitService riskUnitService;
+
+ @Resource
+ private MesSafetyRiskService riskService;
+
+ @Resource
+ private MesMdWorkshopMapper workshopMapper;
+
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @PostMapping("/create")
+ @Operation(summary = "鐧昏闅愭偅")
+ @PreAuthorize("@ss.hasPermission('mes:safety-hazard:create')")
+ public CommonResult<Long> createHazard(@Valid @RequestBody MesSafetyHazardSaveReqVO createReqVO) {
+ return success(hazardService.createHazard(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊闅愭偅")
+ @PreAuthorize("@ss.hasPermission('mes:safety-hazard:update')")
+ public CommonResult<Boolean> updateHazard(@Valid @RequestBody MesSafetyHazardSaveReqVO updateReqVO) {
+ hazardService.updateHazard(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎闅愭偅")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:safety-hazard:delete')")
+ public CommonResult<Boolean> deleteHazard(@RequestParam("id") Long id) {
+ hazardService.deleteHazard(id);
+ return success(true);
+ }
+
+ @PutMapping("/rectify")
+ @Operation(summary = "鎻愪氦鏁存敼")
+ @PreAuthorize("@ss.hasPermission('mes:safety-hazard:rectify')")
+ public CommonResult<Boolean> rectifyHazard(@Valid @RequestBody MesSafetyHazardRectifyReqVO reqVO) {
+ hazardService.rectifyHazard(reqVO);
+ return success(true);
+ }
+
+ @PutMapping("/check")
+ @Operation(summary = "鏁存敼楠屾敹")
+ @PreAuthorize("@ss.hasPermission('mes:safety-hazard:check')")
+ public CommonResult<Boolean> checkHazard(@Valid @RequestBody MesSafetyHazardCheckReqVO reqVO) {
+ hazardService.checkHazard(reqVO);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱闅愭偅")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('mes:safety-hazard:query')")
+ public CommonResult<MesSafetyHazardRespVO> getHazard(@RequestParam("id") Long id) {
+ MesSafetyHazardDO hazard = hazardService.getHazard(id);
+ if (hazard == null) {
+ return success(null);
+ }
+ List<MesSafetyHazardRespVO> list = buildRespList(Collections.singletonList(hazard));
+ return success(list.isEmpty() ? null : list.get(0));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱闅愭偅鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('mes:safety-hazard:query')")
+ public CommonResult<PageResult<MesSafetyHazardRespVO>> getHazardPage(@Valid MesSafetyHazardPageReqVO pageReqVO) {
+ PageResult<MesSafetyHazardDO> pageResult = hazardService.getHazardPage(pageReqVO);
+ List<MesSafetyHazardRespVO> list = buildRespList(pageResult.getList());
+ return success(new PageResult<>(list, pageResult.getTotal()));
+ }
+
+ /**
+ * 杞崲涓� VO 骞跺~鍏呰溅闂淬�佷汉鍛樸�佸叧鑱旈闄╀俊鎭�佽秴鏈熸爣璁�
+ */
+ private List<MesSafetyHazardRespVO> buildRespList(List<MesSafetyHazardDO> list) {
+ if (list == null || list.isEmpty()) {
+ return Collections.emptyList();
+ }
+ List<MesSafetyHazardRespVO> respList = BeanUtils.toBean(list, MesSafetyHazardRespVO.class);
+
+ // 杞﹂棿鍚嶇О
+ Set<Long> workshopIds = list.stream().map(MesSafetyHazardDO::getWorkshopId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, String> workshopNameMap = new HashMap<>();
+ if (!workshopIds.isEmpty()) {
+ List<MesMdWorkshopDO> workshops = workshopMapper.selectByIds(workshopIds);
+ workshops.forEach(w -> workshopNameMap.put(w.getId(), w.getName()));
+ }
+
+ // 浜哄憳濮撳悕锛堝彂鐜颁汉 / 鏁存敼璐d换浜� / 楠屾敹浜猴級
+ Set<Long> userIds = new HashSet<>();
+ list.forEach(h -> {
+ if (h.getFounderUserId() != null) userIds.add(h.getFounderUserId());
+ if (h.getChargeUserId() != null) userIds.add(h.getChargeUserId());
+ if (h.getCheckUserId() != null) userIds.add(h.getCheckUserId());
+ });
+ Map<Long, AdminUserRespDTO> userMap = userIds.isEmpty()
+ ? Collections.emptyMap() : adminUserApi.getUserMap(userIds);
+
+ // 椋庨櫓鍗曞厓鍚嶇О
+ Set<Long> unitIds = list.stream().map(MesSafetyHazardDO::getUnitId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, MesSafetyRiskUnitDO> unitMap = riskUnitService.getRiskUnitMap(unitIds);
+
+ LocalDate today = LocalDate.now();
+ for (MesSafetyHazardRespVO vo : respList) {
+ vo.setWorkshopName(workshopNameMap.get(vo.getWorkshopId()));
+ AdminUserRespDTO founder = userMap.get(vo.getFounderUserId());
+ if (founder != null) vo.setFounderUserName(founder.getNickname());
+ AdminUserRespDTO charge = userMap.get(vo.getChargeUserId());
+ if (charge != null) vo.setChargeUserName(charge.getNickname());
+ AdminUserRespDTO checker = userMap.get(vo.getCheckUserId());
+ if (checker != null) vo.setCheckUserName(checker.getNickname());
+
+ MesSafetyRiskUnitDO unit = unitMap.get(vo.getUnitId());
+ if (unit != null) vo.setUnitName(unit.getName());
+
+ if (vo.getRiskId() != null) {
+ MesSafetyRiskDO risk = riskService.getRisk(vo.getRiskId());
+ if (risk != null) vo.setRiskName(risk.getName());
+ }
+
+ // 瓒呮湡鍒ゆ柇锛氭湁鏈熼檺銆佹湭闂幆銆佷笖鏈熼檺鏃╀簬浠婂ぉ
+ vo.setOverdue(vo.getDeadline() != null
+ && !MesSafetyHazardDO.STATUS_CLOSED.equals(vo.getStatus())
+ && vo.getDeadline().isBefore(today));
+ }
+ return respList;
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardCheckReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardCheckReqVO.java
new file mode 100644
index 0000000..b509b50
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardCheckReqVO.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-闅愭偅鏁存敼楠屾敹 Request VO")
+@Data
+public class MesSafetyHazardCheckReqVO {
+
+ @Schema(description = "闅愭偅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "闅愭偅缂栧彿涓嶈兘涓虹┖")
+ private Long id;
+
+ @Schema(description = "楠屾敹鏄惁閫氳繃", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+ @NotNull(message = "楠屾敹缁撹涓嶈兘涓虹┖")
+ private Boolean pass;
+
+ @Schema(description = "楠屾敹鎰忚锛堥�氳繃鏃跺~鍐欙級", example = "宸叉暣鏀瑰埌浣�")
+ private String checkResult;
+
+ @Schema(description = "椹冲洖鍘熷洜锛堜笉閫氳繃鏃跺繀濉級", example = "闃叉姢缃╁浐瀹氫笉鐗�")
+ private String rejectReason;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardPageReqVO.java
new file mode 100644
index 0000000..1a426bc
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardPageReqVO.java
@@ -0,0 +1,52 @@
+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 lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-闅愭偅鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MesSafetyHazardPageReqVO extends PageParam {
+
+ @Schema(description = "闅愭偅缂栫爜", example = "YH-001")
+ private String code;
+
+ @Schema(description = "闅愭偅鍚嶇О", example = "閰嶇數绠辩己闃叉姢缃�")
+ private String name;
+
+ @Schema(description = "闅愭偅鏉ユ簮", example = "1")
+ private Integer source;
+
+ @Schema(description = "闅愭偅绛夌骇", example = "1")
+ private Integer hazardLevel;
+
+ @Schema(description = "鐘舵��", example = "0")
+ private Integer status;
+
+ @Schema(description = "鎵�灞炶溅闂寸紪鍙�", example = "7")
+ private Long workshopId;
+
+ @Schema(description = "鏁存敼璐d换浜虹紪鍙�", example = "1")
+ private Long chargeUserId;
+
+ @Schema(description = "鍏宠仈椋庨櫓娓呭崟缂栧彿", example = "1")
+ private Long riskId;
+
+ @Schema(description = "鍙戠幇鏃ユ湡-璧�", example = "2026-11-01")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate foundDateStart;
+
+ @Schema(description = "鍙戠幇鏃ユ湡-姝�", example = "2026-11-30")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate foundDateEnd;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardRectifyReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardRectifyReqVO.java
new file mode 100644
index 0000000..3e3eff9
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardRectifyReqVO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-闅愭偅鎻愪氦鏁存敼 Request VO")
+@Data
+public class MesSafetyHazardRectifyReqVO {
+
+ @Schema(description = "闅愭偅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotNull(message = "闅愭偅缂栧彿涓嶈兘涓虹┖")
+ private Long id;
+
+ @Schema(description = "鏁存敼鎺柦", requiredMode = Schema.RequiredMode.REQUIRED,
+ example = "宸插姞瑁呴槻鎶ょ僵骞跺浐瀹�")
+ @NotEmpty(message = "鏁存敼鎺柦涓嶈兘涓虹┖")
+ private String measure;
+
+ @Schema(description = "鏁存敼瀹屾垚鏃ユ湡", example = "2026-11-05")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate finishDate;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardRespVO.java
new file mode 100644
index 0000000..7a8efe1
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardRespVO.java
@@ -0,0 +1,109 @@
+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;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-闅愭偅 Response VO")
+@Data
+public class MesSafetyHazardRespVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "闅愭偅缂栫爜", example = "YH-001")
+ private String code;
+
+ @Schema(description = "闅愭偅鍚嶇О", example = "閰嶇數绠辩己闃叉姢缃�")
+ private String name;
+
+ @Schema(description = "闅愭偅鏉ユ簮", example = "1")
+ private Integer source;
+
+ @Schema(description = "闅愭偅绛夌骇", example = "1")
+ private Integer hazardLevel;
+
+ @Schema(description = "闅愭偅绫诲埆", example = "1")
+ private Integer category;
+
+ @Schema(description = "鍏宠仈椋庨櫓鍗曞厓缂栧彿", example = "1")
+ private Long unitId;
+
+ @Schema(description = "鍏宠仈椋庨櫓鍗曞厓鍚嶇О")
+ private String unitName;
+
+ @Schema(description = "鍏宠仈椋庨櫓娓呭崟缂栧彿", example = "1")
+ private Long riskId;
+
+ @Schema(description = "鍏宠仈椋庨櫓鍚嶇О")
+ private String riskName;
+
+ @Schema(description = "鎵�灞炶溅闂寸紪鍙�", example = "7")
+ private Long workshopId;
+
+ @Schema(description = "鎵�灞炶溅闂村悕绉�")
+ private String workshopName;
+
+ @Schema(description = "鍏蜂綋浣嶇疆")
+ private String location;
+
+ @Schema(description = "闅愭偅鎻忚堪")
+ private String description;
+
+ @Schema(description = "鍙戠幇鏃ユ湡")
+ private LocalDate foundDate;
+
+ @Schema(description = "鍙戠幇浜虹紪鍙�", example = "1")
+ private Long founderUserId;
+
+ @Schema(description = "鍙戠幇浜哄鍚�")
+ private String founderUserName;
+
+ @Schema(description = "鏁存敼璐d换浜虹紪鍙�", example = "1")
+ private Long chargeUserId;
+
+ @Schema(description = "鏁存敼璐d换浜哄鍚�")
+ private String chargeUserName;
+
+ @Schema(description = "鏁存敼鏈熼檺")
+ private LocalDate deadline;
+
+ @Schema(description = "鏁存敼瑕佹眰")
+ private String rectifyRequirement;
+
+ @Schema(description = "鐘舵��", example = "0")
+ private Integer status;
+
+ @Schema(description = "鏄惁瓒呮湡", example = "false")
+ private Boolean overdue;
+
+ @Schema(description = "鏁存敼鎺柦")
+ private String measure;
+
+ @Schema(description = "鏁存敼瀹屾垚鏃ユ湡")
+ private LocalDate finishDate;
+
+ @Schema(description = "楠屾敹浜虹紪鍙�", example = "1")
+ private Long checkUserId;
+
+ @Schema(description = "楠屾敹浜哄鍚�")
+ private String checkUserName;
+
+ @Schema(description = "楠屾敹鏃堕棿")
+ private LocalDateTime checkTime;
+
+ @Schema(description = "楠屾敹鎰忚")
+ private String checkResult;
+
+ @Schema(description = "楠屾敹椹冲洖鍘熷洜")
+ private String rejectReason;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardSaveReqVO.java
new file mode 100644
index 0000000..07848bd
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/hazard/MesSafetyHazardSaveReqVO.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.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "绠$悊鍚庡彴 - 瀹夊叏鐢熶骇-闅愭偅鐧昏/淇敼 Request VO")
+@Data
+public class MesSafetyHazardSaveReqVO {
+
+ @Schema(description = "缂栧彿", example = "1024")
+ private Long id;
+
+ @Schema(description = "闅愭偅缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "YH-001")
+ @NotEmpty(message = "闅愭偅缂栫爜涓嶈兘涓虹┖")
+ private String code;
+
+ @Schema(description = "闅愭偅鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "閰嶇數绠辩己闃叉姢缃�")
+ @NotEmpty(message = "闅愭偅鍚嶇О涓嶈兘涓虹┖")
+ private String name;
+
+ @Schema(description = "闅愭偅鏉ユ簮", example = "1")
+ private Integer source;
+
+ @Schema(description = "闅愭偅绛夌骇", example = "1")
+ private Integer hazardLevel;
+
+ @Schema(description = "闅愭偅绫诲埆", example = "1")
+ private Integer category;
+
+ @Schema(description = "鍏宠仈椋庨櫓鍗曞厓缂栧彿", example = "1")
+ private Long unitId;
+
+ @Schema(description = "鍏宠仈椋庨櫓娓呭崟缂栧彿", example = "1")
+ private Long riskId;
+
+ @Schema(description = "鎵�灞炶溅闂寸紪鍙�", example = "7")
+ private Long workshopId;
+
+ @Schema(description = "鍏蜂綋浣嶇疆", example = "閫犵焊杞﹂棿閰嶇數鎴�")
+ private String location;
+
+ @Schema(description = "闅愭偅鎻忚堪")
+ private String description;
+
+ @Schema(description = "鍙戠幇鏃ユ湡")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate foundDate;
+
+ @Schema(description = "鍙戠幇浜虹紪鍙�", example = "1")
+ private Long founderUserId;
+
+ @Schema(description = "鏁存敼璐d换浜虹紪鍙�", example = "1")
+ @NotNull(message = "鏁存敼璐d换浜轰笉鑳戒负绌�")
+ private Long chargeUserId;
+
+ @Schema(description = "鏁存敼鏈熼檺")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate deadline;
+
+ @Schema(description = "鏁存敼瑕佹眰")
+ private String rectifyRequirement;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyHazardDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyHazardDO.java
new file mode 100644
index 0000000..76b212e
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/MesSafetyHazardDO.java
@@ -0,0 +1,164 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.safety;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鎺掓煡鍙拌处 DO
+ *
+ * 鐘舵�佹祦杞細
+ * 0 寰呮暣鏀� 鈹�鈹�鎻愪氦鏁存敼鈹�鈹�> 20 寰呴獙鏀� 鈹�鈹�楠屾敹閫氳繃鈹�鈹�> 30 宸查棴鐜�
+ * 鈹斺攢鈹�楠屾敹椹冲洖鈹�鈹�> 10 鏁存敼涓紙閲嶆柊鏁存敼锛�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_safety_hazard")
+@KeySequence("mes_safety_hazard_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesSafetyHazardDO extends BaseDO {
+
+ /** 鐘舵�侊細寰呮暣鏀� */
+ public static final Integer STATUS_PENDING = 0;
+ /** 鐘舵�侊細鏁存敼涓紙楠屾敹椹冲洖鍚庡洖鍒版鐘舵�侊級 */
+ public static final Integer STATUS_RECTIFYING = 10;
+ /** 鐘舵�侊細寰呴獙鏀� */
+ public static final Integer STATUS_TO_CHECK = 20;
+ /** 鐘舵�侊細宸查棴鐜� */
+ public static final Integer STATUS_CLOSED = 30;
+
+ @TableId
+ private Long id;
+
+ /**
+ * 闅愭偅缂栫爜
+ */
+ private String code;
+
+ /**
+ * 闅愭偅鍚嶇О / 绠�杩�
+ */
+ private String name;
+
+ /**
+ * 闅愭偅鏉ユ簮
+ *
+ * 瀛楀吀 mes_safety_hazard_source锛�1鏃ュ父鎺掓煡 2涓撻」妫�鏌� 3涓婄骇妫�鏌� 4鍛樺伐涓婃姤 5鍏朵粬
+ */
+ private Integer source;
+
+ /**
+ * 闅愭偅绛夌骇
+ *
+ * 瀛楀吀 mes_safety_hazard_level锛�1涓�鑸殣鎮� 2閲嶅ぇ闅愭偅
+ */
+ private Integer hazardLevel;
+
+ /**
+ * 闅愭偅绫诲埆
+ *
+ * 澶嶇敤 mes_safety_risk_category
+ */
+ private Integer category;
+
+ /**
+ * 鍏宠仈椋庨櫓鍗曞厓缂栧彿
+ */
+ private Long unitId;
+
+ /**
+ * 鍏宠仈椋庨櫓娓呭崟缂栧彿
+ */
+ private Long riskId;
+
+ /**
+ * 鎵�灞炶溅闂寸紪鍙�
+ */
+ private Long workshopId;
+
+ /**
+ * 鍏蜂綋浣嶇疆
+ */
+ private String location;
+
+ /**
+ * 闅愭偅鎻忚堪
+ */
+ private String description;
+
+ /**
+ * 鍙戠幇鏃ユ湡
+ */
+ private LocalDate foundDate;
+
+ /**
+ * 鍙戠幇浜虹紪鍙�
+ */
+ private Long founderUserId;
+
+ /**
+ * 鏁存敼璐d换浜虹紪鍙�
+ */
+ private Long chargeUserId;
+
+ /**
+ * 鏁存敼鏈熼檺
+ */
+ private LocalDate deadline;
+
+ /**
+ * 鏁存敼瑕佹眰
+ */
+ private String rectifyRequirement;
+
+ /**
+ * 鐘舵�侊細0寰呮暣鏀� 10鏁存敼涓� 20寰呴獙鏀� 30宸查棴鐜�
+ */
+ private Integer status;
+
+ /**
+ * 鏁存敼鎺柦
+ */
+ private String measure;
+
+ /**
+ * 鏁存敼瀹屾垚鏃ユ湡
+ */
+ private LocalDate finishDate;
+
+ /**
+ * 楠屾敹浜虹紪鍙�
+ */
+ private Long checkUserId;
+
+ /**
+ * 楠屾敹鏃堕棿
+ */
+ private LocalDateTime checkTime;
+
+ /**
+ * 楠屾敹鎰忚
+ */
+ private String checkResult;
+
+ /**
+ * 楠屾敹椹冲洖鍘熷洜
+ */
+ private String rejectReason;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyHazardMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyHazardMapper.java
new file mode 100644
index 0000000..fec4646
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/safety/MesSafetyHazardMapper.java
@@ -0,0 +1,79 @@
+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.MesSafetyHazardPageReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyHazardDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅鍙拌处 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesSafetyHazardMapper extends BaseMapperX<MesSafetyHazardDO> {
+
+ default PageResult<MesSafetyHazardDO> selectPage(MesSafetyHazardPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<MesSafetyHazardDO>()
+ .likeIfPresent(MesSafetyHazardDO::getCode, reqVO.getCode())
+ .likeIfPresent(MesSafetyHazardDO::getName, reqVO.getName())
+ .eqIfPresent(MesSafetyHazardDO::getSource, reqVO.getSource())
+ .eqIfPresent(MesSafetyHazardDO::getHazardLevel, reqVO.getHazardLevel())
+ .eqIfPresent(MesSafetyHazardDO::getStatus, reqVO.getStatus())
+ .eqIfPresent(MesSafetyHazardDO::getWorkshopId, reqVO.getWorkshopId())
+ .eqIfPresent(MesSafetyHazardDO::getChargeUserId, reqVO.getChargeUserId())
+ .eqIfPresent(MesSafetyHazardDO::getRiskId, reqVO.getRiskId())
+ .geIfPresent(MesSafetyHazardDO::getFoundDate, reqVO.getFoundDateStart())
+ .leIfPresent(MesSafetyHazardDO::getFoundDate, reqVO.getFoundDateEnd())
+ .orderByDesc(MesSafetyHazardDO::getId));
+ }
+
+ default MesSafetyHazardDO selectByCode(String code) {
+ return selectOne(MesSafetyHazardDO::getCode, code);
+ }
+
+ /**
+ * 鏌ヨ鏈棴鐜笖宸茶秴鏈熺殑闅愭偅锛堢敤浜庨�炬湡鎻愰啋/缁熻锛�
+ */
+ default List<MesSafetyHazardDO> selectOverdueList(LocalDate today) {
+ return selectList(new LambdaQueryWrapperX<MesSafetyHazardDO>()
+ .lt(MesSafetyHazardDO::getDeadline, today)
+ .ne(MesSafetyHazardDO::getStatus, MesSafetyHazardDO.STATUS_CLOSED)
+ .orderByAsc(MesSafetyHazardDO::getDeadline));
+ }
+
+ /**
+ * 鎸夌姸鎬佺粺璁℃暟閲�
+ */
+ default Long selectCountByStatus(Integer status) {
+ return selectCount(new LambdaQueryWrapperX<MesSafetyHazardDO>()
+ .eq(MesSafetyHazardDO::getStatus, status));
+ }
+
+ /**
+ * 椋庨櫓鍗曞厓琚紩鐢ㄦ暟閲忥紙鐢ㄤ簬鍒犻櫎鍗曞厓鍓嶇殑鏍¢獙锛�
+ */
+ default Long selectCountByUnitId(Long unitId) {
+ return selectCount(new LambdaQueryWrapperX<MesSafetyHazardDO>()
+ .eq(MesSafetyHazardDO::getUnitId, unitId));
+ }
+
+ /**
+ * 椋庨櫓娓呭崟琚紩鐢ㄦ暟閲�
+ */
+ default Long selectCountByRiskId(Long riskId) {
+ return selectCount(new LambdaQueryWrapperX<MesSafetyHazardDO>()
+ .eq(MesSafetyHazardDO::getRiskId, riskId));
+ }
+
+ default List<MesSafetyHazardDO> selectAllList() {
+ return selectList(new LambdaQueryWrapperX<MesSafetyHazardDO>()
+ .orderByDesc(MesSafetyHazardDO::getId));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
index 2d8f5b6..1bbc093 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
@@ -125,4 +125,9 @@
String MES_SAFETY_RISK_CATEGORY = "mes_safety_risk_category"; // 椋庨櫓绫诲埆
String MES_SAFETY_ACCIDENT_TYPE = "mes_safety_accident_type"; // 浜嬫晠绫诲瀷
String MES_SAFETY_UNIT_STATUS = "mes_safety_unit_status"; // 椋庨櫓鍗曞厓鐘舵��
+
+ // 闅愭偅鎺掓煡娌荤悊
+ String MES_SAFETY_HAZARD_SOURCE = "mes_safety_hazard_source"; // 闅愭偅鏉ユ簮
+ String MES_SAFETY_HAZARD_LEVEL = "mes_safety_hazard_level"; // 闅愭偅绛夌骇锛�1涓�鑸� 2閲嶅ぇ锛�
+ String MES_SAFETY_HAZARD_STATUS = "mes_safety_hazard_status"; // 闅愭偅鐘舵��
}
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 f51ddbd..265d7fe 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
@@ -854,4 +854,11 @@
ErrorCode MES_SAFETY_RISK_CODE_DUPLICATE = new ErrorCode(1_040_904_011, "椋庨櫓缂栫爜宸插瓨鍦�");
ErrorCode MES_SAFETY_RISK_LEC_INVALID = new ErrorCode(1_040_904_012, "LEC 璇勪及鍊间笉鍚堟硶锛歀銆丒銆丆 閮藉繀椤诲ぇ浜� 0");
+ // ========== MES 瀹夊叏鐢熶骇 - 闅愭偅鎺掓煡娌荤悊锛�1-040-905-000锛� ==========
+ ErrorCode MES_SAFETY_HAZARD_NOT_EXISTS = new ErrorCode(1_040_905_000, "闅愭偅璁板綍涓嶅瓨鍦�");
+ ErrorCode MES_SAFETY_HAZARD_CODE_DUPLICATE = new ErrorCode(1_040_905_001, "闅愭偅缂栫爜宸插瓨鍦�");
+ ErrorCode MES_SAFETY_HAZARD_STATUS_INVALID = new ErrorCode(1_040_905_002, "褰撳墠闅愭偅鐘舵�佷笉鍏佽璇ユ搷浣�");
+ ErrorCode MES_SAFETY_HAZARD_REJECT_REASON_REQUIRED = new ErrorCode(1_040_905_003, "楠屾敹涓嶉�氳繃鏃跺繀椤诲~鍐欓┏鍥炲師鍥�");
+ ErrorCode MES_SAFETY_HAZARD_HAS_REFERENCE = new ErrorCode(1_040_905_004, "璇ヨ褰曞凡琚殣鎮e紩鐢紝鏃犳硶鍒犻櫎");
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyHazardService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyHazardService.java
new file mode 100644
index 0000000..7a096bf
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyHazardService.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.MesSafetyHazardCheckReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.MesSafetyHazardPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.MesSafetyHazardRectifyReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.MesSafetyHazardSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyHazardDO;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅 Service 鎺ュ彛
+ *
+ * 鐘舵�佹祦杞細0 寰呮暣鏀� 鈫� 20 寰呴獙鏀� 鈫� 30 宸查棴鐜紱楠屾敹椹冲洖 鈫� 10 鏁存敼涓�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+public interface MesSafetyHazardService {
+
+ PageResult<MesSafetyHazardDO> getHazardPage(MesSafetyHazardPageReqVO pageReqVO);
+
+ MesSafetyHazardDO getHazard(Long id);
+
+ Long createHazard(MesSafetyHazardSaveReqVO createReqVO);
+
+ void updateHazard(MesSafetyHazardSaveReqVO updateReqVO);
+
+ void deleteHazard(Long id);
+
+ /**
+ * 鎻愪氦鏁存敼锛�0寰呮暣鏀� / 10鏁存敼涓� 鈫� 20寰呴獙鏀�
+ */
+ void rectifyHazard(MesSafetyHazardRectifyReqVO reqVO);
+
+ /**
+ * 鏁存敼楠屾敹锛�20寰呴獙鏀� 鈫� 30宸查棴鐜紙閫氳繃锛夋垨 10鏁存敼涓紙椹冲洖锛�
+ */
+ void checkHazard(MesSafetyHazardCheckReqVO reqVO);
+
+ MesSafetyHazardDO validateHazardExists(Long id);
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyHazardServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyHazardServiceImpl.java
new file mode 100644
index 0000000..6cac1af
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyHazardServiceImpl.java
@@ -0,0 +1,149 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+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.MesSafetyHazardCheckReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.MesSafetyHazardPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.MesSafetyHazardRectifyReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.hazard.MesSafetyHazardSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyHazardDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyHazardMapper;
+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.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+
+/**
+ * 瀹夊叏鐢熶骇 - 闅愭偅 Service 瀹炵幇
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Service
+@Validated
+public class MesSafetyHazardServiceImpl implements MesSafetyHazardService {
+
+ @Resource
+ private MesSafetyHazardMapper hazardMapper;
+
+ @Override
+ public PageResult<MesSafetyHazardDO> getHazardPage(MesSafetyHazardPageReqVO pageReqVO) {
+ return hazardMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ public MesSafetyHazardDO getHazard(Long id) {
+ return hazardMapper.selectById(id);
+ }
+
+ @Override
+ public Long createHazard(MesSafetyHazardSaveReqVO createReqVO) {
+ validateCodeUnique(null, createReqVO.getCode());
+ MesSafetyHazardDO hazard = BeanUtils.toBean(createReqVO, MesSafetyHazardDO.class);
+ // 鏂板缓鍗充负寰呮暣鏀�
+ hazard.setStatus(MesSafetyHazardDO.STATUS_PENDING);
+ if (hazard.getFoundDate() == null) {
+ hazard.setFoundDate(LocalDate.now());
+ }
+ hazardMapper.insert(hazard);
+ return hazard.getId();
+ }
+
+ @Override
+ public void updateHazard(MesSafetyHazardSaveReqVO updateReqVO) {
+ MesSafetyHazardDO exists = validateHazardExists(updateReqVO.getId());
+ // 宸查棴鐜殑闅愭偅涓嶅厑璁稿啀淇敼鍩烘湰淇℃伅
+ if (MesSafetyHazardDO.STATUS_CLOSED.equals(exists.getStatus())) {
+ throw exception(MES_SAFETY_HAZARD_STATUS_INVALID);
+ }
+ validateCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
+ MesSafetyHazardDO updateObj = BeanUtils.toBean(updateReqVO, MesSafetyHazardDO.class);
+ // 鐘舵�佷笌鏁存敼/楠屾敹淇℃伅涓嶉�氳繃姝ゆ帴鍙d慨鏀�
+ updateObj.setStatus(null);
+ updateObj.setMeasure(null);
+ updateObj.setFinishDate(null);
+ updateObj.setCheckUserId(null);
+ updateObj.setCheckTime(null);
+ updateObj.setCheckResult(null);
+ updateObj.setRejectReason(null);
+ hazardMapper.updateById(updateObj);
+ }
+
+ @Override
+ public void deleteHazard(Long id) {
+ validateHazardExists(id);
+ hazardMapper.deleteById(id);
+ }
+
+ @Override
+ public void rectifyHazard(MesSafetyHazardRectifyReqVO reqVO) {
+ MesSafetyHazardDO hazard = validateHazardExists(reqVO.getId());
+ // 鍙湁銆屽緟鏁存敼銆嶃�屾暣鏀逛腑銆嶅彲浠ユ彁浜ゆ暣鏀癸紱宸叉彁浜ゅ緟楠屾敹鎴栧凡闂幆涓嶅彲閲嶅鎻愪氦
+ if (!MesSafetyHazardDO.STATUS_PENDING.equals(hazard.getStatus())
+ && !MesSafetyHazardDO.STATUS_RECTIFYING.equals(hazard.getStatus())) {
+ throw exception(MES_SAFETY_HAZARD_STATUS_INVALID);
+ }
+ MesSafetyHazardDO updateObj = new MesSafetyHazardDO();
+ updateObj.setId(reqVO.getId());
+ updateObj.setMeasure(reqVO.getMeasure());
+ updateObj.setFinishDate(reqVO.getFinishDate() != null ? reqVO.getFinishDate() : LocalDate.now());
+ updateObj.setStatus(MesSafetyHazardDO.STATUS_TO_CHECK);
+ // 閲嶆柊鎻愪氦鏃舵竻绌轰笂涓�娆$殑椹冲洖鍘熷洜
+ updateObj.setRejectReason("");
+ hazardMapper.updateById(updateObj);
+ }
+
+ @Override
+ public void checkHazard(MesSafetyHazardCheckReqVO reqVO) {
+ MesSafetyHazardDO hazard = validateHazardExists(reqVO.getId());
+ // 鍙湁銆屽緟楠屾敹銆嶅彲浠ラ獙鏀�
+ if (!MesSafetyHazardDO.STATUS_TO_CHECK.equals(hazard.getStatus())) {
+ throw exception(MES_SAFETY_HAZARD_STATUS_INVALID);
+ }
+ MesSafetyHazardDO updateObj = new MesSafetyHazardDO();
+ updateObj.setId(reqVO.getId());
+ updateObj.setCheckResult(reqVO.getCheckResult());
+ updateObj.setCheckTime(LocalDateTime.now());
+ if (Boolean.TRUE.equals(reqVO.getPass())) {
+ // 楠屾敹閫氳繃 鈫� 闂幆
+ updateObj.setStatus(MesSafetyHazardDO.STATUS_CLOSED);
+ updateObj.setRejectReason("");
+ } else {
+ // 楠屾敹椹冲洖 鈫� 蹇呴』濉師鍥狅紝閫�鍥炴暣鏀逛腑
+ if (reqVO.getRejectReason() == null || reqVO.getRejectReason().trim().isEmpty()) {
+ throw exception(MES_SAFETY_HAZARD_REJECT_REASON_REQUIRED);
+ }
+ updateObj.setStatus(MesSafetyHazardDO.STATUS_RECTIFYING);
+ updateObj.setRejectReason(reqVO.getRejectReason());
+ }
+ hazardMapper.updateById(updateObj);
+ }
+
+ @Override
+ public MesSafetyHazardDO validateHazardExists(Long id) {
+ if (id == null) {
+ throw exception(MES_SAFETY_HAZARD_NOT_EXISTS);
+ }
+ MesSafetyHazardDO hazard = hazardMapper.selectById(id);
+ if (hazard == null) {
+ throw exception(MES_SAFETY_HAZARD_NOT_EXISTS);
+ }
+ return hazard;
+ }
+
+ private void validateCodeUnique(Long id, String code) {
+ MesSafetyHazardDO exists = hazardMapper.selectByCode(code);
+ if (exists == null) {
+ return;
+ }
+ if (id == null || !Objects.equals(exists.getId(), id)) {
+ throw exception(MES_SAFETY_HAZARD_CODE_DUPLICATE);
+ }
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskServiceImpl.java
index c31123b..fce4177 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskServiceImpl.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.risk.MesSafetyRiskPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.risk.MesSafetyRiskSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyRiskDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyHazardMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyRiskMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -40,6 +41,9 @@
@Resource
private MesSafetyRiskUnitService riskUnitService;
+
+ @Resource
+ private MesSafetyHazardMapper hazardMapper;
@Override
public PageResult<MesSafetyRiskDO> getRiskPage(MesSafetyRiskPageReqVO pageReqVO) {
@@ -77,6 +81,11 @@
@Override
public void deleteRisk(Long id) {
validateRiskExists(id);
+ // 宸茶闅愭偅寮曠敤鐨勯闄╀笉鍏佽鍒犻櫎
+ Long hazardCount = hazardMapper.selectCountByRiskId(id);
+ if (hazardCount != null && hazardCount > 0) {
+ throw exception(MES_SAFETY_HAZARD_HAS_REFERENCE);
+ }
riskMapper.deleteById(id);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java
index 2d22beb..43a7231 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/MesSafetyRiskUnitServiceImpl.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.unit.MesSafetyRiskUnitPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.unit.MesSafetyRiskUnitSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.safety.MesSafetyRiskUnitDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyHazardMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyRiskMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.safety.MesSafetyRiskUnitMapper;
import jakarta.annotation.Resource;
@@ -35,6 +36,9 @@
@Resource
private MesSafetyRiskMapper riskMapper;
+
+ @Resource
+ private MesSafetyHazardMapper hazardMapper;
@Override
public PageResult<MesSafetyRiskUnitDO> getRiskUnitPage(MesSafetyRiskUnitPageReqVO pageReqVO) {
@@ -71,6 +75,11 @@
if (riskCount != null && riskCount > 0) {
throw exception(MES_SAFETY_RISK_UNIT_HAS_RISK);
}
+ // 宸茶闅愭偅寮曠敤鐨勫崟鍏冧篃涓嶅厑璁稿垹闄�
+ Long hazardCount = hazardMapper.selectCountByUnitId(id);
+ if (hazardCount != null && hazardCount > 0) {
+ throw exception(MES_SAFETY_HAZARD_HAS_REFERENCE);
+ }
riskUnitMapper.deleteById(id);
}
--
Gitblit v1.9.3