From d55278560d29562b341aafa1652209a8aae0af33 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:08:16 +0800
Subject: [PATCH] 计量器具台账附件修改
---
src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 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
index 9e4aa57..7aead53 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
@@ -3,16 +3,15 @@
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 com.ruoyi.project.system.domain.SysNotice;
+import com.ruoyi.project.system.service.ISysDictDataService;
+import com.ruoyi.project.system.service.ISysNoticeService;
+import com.ruoyi.safe.dto.SafeHiddenDto;
+import com.ruoyi.safe.mapper.SafeHiddenMapper;
+import com.ruoyi.safe.pojo.SafeHidden;
+import com.ruoyi.safe.service.SafeHiddenService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -31,12 +30,13 @@
*/
@Service
@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
public class SafeHiddenServiceImpl extends ServiceImpl<SafeHiddenMapper, SafeHidden> implements SafeHiddenService {
- @Autowired
- private SafeHiddenMapper safeHiddenMapper;
- @Autowired
- private ISysNoticeService sysNoticeService;
+ private final SafeHiddenMapper safeHiddenMapper;
+ private final ISysNoticeService sysNoticeService;
+
+ private final ISysDictDataService sysDictDataService;
@Override
@@ -47,16 +47,18 @@
@Override
public int add(SafeHidden safeHidden) {
safeHiddenMapper.insert(safeHidden);
- String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
String no = "YH" + String.format("%s%03d", datePrefix, safeHidden.getId());
safeHidden.setHiddenCode(no);
safeHiddenMapper.updateById(safeHidden);
+ //鑾峰彇闅愭偅绫诲瀷鐨勫瓧鍏�
+ String type = sysDictDataService.selectDictLabel("hidden_danger_type", safeHidden.getType());
//娑堟伅閫氱煡
sysNoticeService.simpleNoticeByUser("闅愭偅鎺掓煡涓婃姤鏁存敼",
- "闅愭偅绫诲瀷锛�"+safeHidden.getType()+"\n"+
- "闅愭偅椋庨櫓绛夌骇锛�"+safeHidden.getRiskLevel()+"\n"+
- "闅愭偅鍏蜂綋浣嶇疆锛�"+safeHidden.getLocation()+"\n"+
- "闅愭偅鎻忚堪锛�"+safeHidden.getHiddenDesc()+"\n"+
+ "闅愭偅绫诲瀷锛�"+type+"\t"+
+ "闅愭偅椋庨櫓绛夌骇锛�"+safeHidden.getRiskLevel()+"\t"+
+ "闅愭偅鍏蜂綋浣嶇疆锛�"+safeHidden.getLocation()+"\t"+
+ "闅愭偅鎻忚堪锛�"+safeHidden.getHiddenDesc()+"\t"+
"鏁存敼瀹屾垚鏈熼檺(鏃ユ湡)锛�"+safeHidden.getRectifyTime(),
Arrays.asList(Long.valueOf(safeHidden.getRectifyUserId())),
"/safeProduction/dangerInvestigation?id=" + safeHidden.getId());
--
Gitblit v1.9.3