From 2072003ebd2e620f3ab9c22a87a6515684b0cb8d Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Mon, 11 May 2026 09:50:09 +0800
Subject: [PATCH] 功能增加
---
src/main/java/com/gkhy/labRiskManage/domain/basic/model/dto/OldRiskAssessImport.java | 50 +++++++++++++++++++++++++
src/main/java/com/gkhy/labRiskManage/api/controller/basic/OldRiskAssessController.java | 3 +
pom.xml | 7 +++
src/main/java/com/gkhy/labRiskManage/domain/basic/service/OldRiskAssessService.java | 3 +
src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/OldRiskAssessServiceImpl.java | 10 ++++
5 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4c32cd8..de09554 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.gkhy</groupId>
<artifactId>LaboratoryRiskManage.Server</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>V1.0.11</version>
<properties>
<springboot.version>2.7.5</springboot.version>
@@ -56,6 +56,11 @@
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>3.3.2</version> <!-- 使用最新版本 -->
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>5.3.23</version>
diff --git a/src/main/java/com/gkhy/labRiskManage/api/controller/basic/OldRiskAssessController.java b/src/main/java/com/gkhy/labRiskManage/api/controller/basic/OldRiskAssessController.java
index a3acaa4..77583dd 100644
--- a/src/main/java/com/gkhy/labRiskManage/api/controller/basic/OldRiskAssessController.java
+++ b/src/main/java/com/gkhy/labRiskManage/api/controller/basic/OldRiskAssessController.java
@@ -22,6 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.FileInputStream;
+import java.io.IOException;
/**
* 风险评价因子
@@ -111,7 +112,7 @@
}
@PostMapping("/insert/importOldRiskAssess")
- public Result importOldRiskAssess(@RequestParam("file") MultipartFile file){
+ public Result importOldRiskAssess(@RequestParam("file") MultipartFile file) throws IOException {
Result result = new Result();
result.setCode(ResultCode.OK);
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/basic/model/dto/OldRiskAssessImport.java b/src/main/java/com/gkhy/labRiskManage/domain/basic/model/dto/OldRiskAssessImport.java
new file mode 100644
index 0000000..c10a91c
--- /dev/null
+++ b/src/main/java/com/gkhy/labRiskManage/domain/basic/model/dto/OldRiskAssessImport.java
@@ -0,0 +1,50 @@
+package com.gkhy.labRiskManage.domain.basic.model.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import javax.persistence.Entity;
+
+@Data
+public class OldRiskAssessImport {
+ @ExcelProperty("序号")
+ private String serialNumber;
+
+ @ExcelProperty("区域")
+ private String region;
+
+ @ExcelProperty("潜在事故")
+ private String potentialAccident;
+
+ @ExcelProperty("危险、有害因素")
+ private String dangerReason;
+
+ @ExcelProperty("触发条件")
+ private String triggerFactor;
+
+ @ExcelProperty("事故后果")
+ private String accidentResult;
+
+ @ExcelProperty("L")
+ private String l;
+
+ @ExcelProperty("E")
+ private String e;
+
+ @ExcelProperty("C")
+ private String c;
+
+ @ExcelProperty("D")
+ private String d;
+
+ @ExcelProperty("危险等级")
+ private String dangerLevel;
+
+ @ExcelProperty("现有安全控制措施（工程技术、管理、培训教育、个体防护、应急处置）")
+ private String controlMeasure;
+
+ @ExcelProperty("管控层级（公司级、部门级、岗位即）")
+ private String controlLevel;
+
+
+}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/basic/service/OldRiskAssessService.java b/src/main/java/com/gkhy/labRiskManage/domain/basic/service/OldRiskAssessService.java
index 25c8bae..79a1f43 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/basic/service/OldRiskAssessService.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/basic/service/OldRiskAssessService.java
@@ -11,6 +11,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.List;
public interface OldRiskAssessService {
@@ -23,7 +24,7 @@
int deleteOldRiskAssess(Long currentUserId, Long id);
- int importOldRiskAssess(Long currentUserId, MultipartFile file);
+ int importOldRiskAssess(Long currentUserId, MultipartFile file) throws IOException;
Result<OldRiskAssessExportRespDTO> exportOldRiskAssess(Long currentUserId, OldRiskAssessQueryReqBO queryReqDO, HttpServletResponse response, HttpServletRequest request);
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/OldRiskAssessServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/OldRiskAssessServiceImpl.java
index e1256ab..66d5c9a 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/OldRiskAssessServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/basic/service/impl/OldRiskAssessServiceImpl.java
@@ -1,5 +1,6 @@
package com.gkhy.labRiskManage.domain.basic.service.impl;
+import com.alibaba.excel.EasyExcel;
import com.gkhy.labRiskManage.api.controller.basic.dto.repDto.OldRiskAssessQueryReqBO;
import com.gkhy.labRiskManage.api.controller.basic.dto.respDto.OldRiskAssessExportRespDTO;
import com.gkhy.labRiskManage.api.controller.basic.dto.respDto.OldRiskAssessQueryRespDTO;
@@ -213,11 +214,18 @@
@Transactional
@Override
- public int importOldRiskAssess(Long currentUserId, MultipartFile file) {
+ public int importOldRiskAssess(Long currentUserId, MultipartFile file) throws IOException {
if (currentUserId < 0){
throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"当前用户无效，请重新登陆");
}
+
+
+ // List<OldRiskAssessImport> objects = EasyExcel.read(file.getInputStream()).head(OldRiskAssessImport.class).sheet().headRowNumber(1).doReadSync();
+
+
+
+
//根据路径获取这个操作excel的实例
HSSFWorkbook wb = null;
List<OldRiskAssess> list = new ArrayList<>();
--
Gitblit v1.9.2