From eca86aa3601ebb08c15abb90ce978eddd8dcf965 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 07 三月 2025 14:57:46 +0800
Subject: [PATCH] 调整上传通用接口
---
cnas-require/src/main/resources/mapper/FeCalibrationScheduleMapper.xml | 2 +-
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java | 4 ++--
ruoyi-common/src/main/java/com/ruoyi/common/utils/FileSaveUtil.java | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
index ec9b3d0..015621a 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
@@ -71,8 +71,8 @@
@ApiOperation(value = "涓婁紶鏂囦欢鎺ュ彛")
@PostMapping("/saveCNASFile")
public Result saveFile(@RequestPart("file") MultipartFile file) {
- String s = FileSaveUtil.StoreFile(file);
- return Result.success("涓婁紶鎴愬姛", s);
+ String s = FileSaveUtil.uploadWordFile(file);
+ return Result.success(s);
}
/**
diff --git a/cnas-require/src/main/resources/mapper/FeCalibrationScheduleMapper.xml b/cnas-require/src/main/resources/mapper/FeCalibrationScheduleMapper.xml
index bbdeeae..8485501 100644
--- a/cnas-require/src/main/resources/mapper/FeCalibrationScheduleMapper.xml
+++ b/cnas-require/src/main/resources/mapper/FeCalibrationScheduleMapper.xml
@@ -29,7 +29,7 @@
<if test="instrumentName != null and instrumentName != ''">
instrument_name like CONCAT('%', #{instrumentName}, '%')
</if>
- <if test="instrumentName != null and managementNumber != ''">
+ <if test="managementNumber != null and managementNumber != ''">
management_number like CONCAT('%', #{managementNumber}, '%')
</if>
</where>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/FileSaveUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/FileSaveUtil.java
index da4ca5f..d92c183 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/FileSaveUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/FileSaveUtil.java
@@ -1,6 +1,7 @@
package com.ruoyi.common.utils;
import com.alibaba.excel.util.IoUtils;
+import com.ruoyi.common.exception.base.BaseException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -69,7 +70,7 @@
suffix = originalFilename.substring(originalFilename.lastIndexOf("."));
// 濡傛灉鍚庣紑鍚嶄笉閫氳繃鎶涘嚭寮傚父
if (!isFileAllowed(suffix)){
- throw new RuntimeException(suffix);
+ throw new BaseException("涓嶆敮鎸佽鏂囦欢绫诲瀷涓婁紶");
}
}
// 鍚嶇О鎷兼帴
--
Gitblit v1.9.3