From 94e23a3d587846f10ea9517bd2e6705093d6a99a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 28 一月 2026 17:57:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 79 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
new file mode 100644
index 0000000..9e4aa57
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
@@ -0,0 +1,79 @@
+package com.ruoyi.safe.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.project.system.domain.SysNotice;
+import com.ruoyi.project.system.mapper.SysNoticeMapper;
+import com.ruoyi.project.system.service.ISysNoticeService;
+import com.ruoyi.project.system.service.impl.SysNoticeServiceImpl;
+import com.ruoyi.safe.dto.SafeHiddenDto;
+import com.ruoyi.safe.pojo.SafeHidden;
+import com.ruoyi.safe.mapper.SafeHiddenMapper;
+import com.ruoyi.safe.service.SafeHiddenService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 11:10:54
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class SafeHiddenServiceImpl extends ServiceImpl<SafeHiddenMapper, SafeHidden> implements SafeHiddenService {
+
+ @Autowired
+ private SafeHiddenMapper safeHiddenMapper;
+ @Autowired
+ private ISysNoticeService sysNoticeService;
+
+
+ @Override
+ public IPage<SafeHiddenDto> pageSafeHidden(Page page, SafeHiddenDto safeHiddenDto) {
+ return safeHiddenMapper.pageSafeHidden(page, safeHiddenDto);
+ }
+
+ @Override
+ public int add(SafeHidden safeHidden) {
+ safeHiddenMapper.insert(safeHidden);
+ String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ String no = "YH" + String.format("%s%03d", datePrefix, safeHidden.getId());
+ safeHidden.setHiddenCode(no);
+ safeHiddenMapper.updateById(safeHidden);
+ //娑堟伅閫氱煡
+ sysNoticeService.simpleNoticeByUser("闅愭偅鎺掓煡涓婃姤鏁存敼",
+ "闅愭偅绫诲瀷锛�"+safeHidden.getType()+"\n"+
+ "闅愭偅椋庨櫓绛夌骇锛�"+safeHidden.getRiskLevel()+"\n"+
+ "闅愭偅鍏蜂綋浣嶇疆锛�"+safeHidden.getLocation()+"\n"+
+ "闅愭偅鎻忚堪锛�"+safeHidden.getHiddenDesc()+"\n"+
+ "鏁存敼瀹屾垚鏈熼檺(鏃ユ湡)锛�"+safeHidden.getRectifyTime(),
+ Arrays.asList(Long.valueOf(safeHidden.getRectifyUserId())),
+ "/safeProduction/dangerInvestigation?id=" + safeHidden.getId());
+ return 0;
+ }
+
+ @Override
+ public int delSafeHidden(List<Integer> ids) {
+ List<SafeHidden> safeHiddens = safeHiddenMapper.selectBatchIds(ids);
+ for (SafeHidden safeHidden : safeHiddens) {
+ // 鍒犻櫎瀵瑰簲鐨勬秷鎭�氱煡
+ sysNoticeService.remove(new LambdaQueryWrapper<SysNotice>()
+ .eq(SysNotice::getNoticeTitle, "闅愭偅鎺掓煡涓婃姤鏁存敼")
+ .eq(SysNotice::getSenderId, safeHidden.getCreateUser())
+ .apply("CAST(notice_content AS CHAR) LIKE CONCAT('%', {0}, '%')", safeHidden.getId()));
+ }
+ safeHiddenMapper.deleteBatchIds(ids);
+ return 0;
+ }
+}
--
Gitblit v1.9.3