From 9fce552f48c898b61fa1cb9be73aa4ae7dfc5bb4 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 28 三月 2025 14:07:53 +0800
Subject: [PATCH] 设备导入优化
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
index 5f0ab10..533c9c7 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
@@ -3,9 +3,8 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.excel.StructureTestObjectData;
-import com.ruoyi.basic.excel.StructureTestObjectListener;
import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.LocalDateTimeStringConverters;
import com.ruoyi.device.dto.DataConfigDto;
import com.ruoyi.device.dto.DeviceCollectionDto;
import com.ruoyi.device.dto.DeviceDto;
@@ -16,7 +15,6 @@
import com.ruoyi.device.service.DeviceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
@@ -27,7 +25,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -209,7 +206,9 @@
@PostMapping("/importDevice")
public Result importDevice(@RequestParam("file") MultipartFile file){
try {
- EasyExcel.read(file.getInputStream(), Device.class, new DeviceListener(deviceService)).sheet().doRead();
+ EasyExcel.read(file.getInputStream(), Device.class, new DeviceListener(deviceService))
+ .registerConverter(new LocalDateTimeStringConverters())
+ .sheet().doRead();
} catch (IOException e) {
// 杩欓噷鍙互鏍规嵁瀹為檯鎯呭喌杩涜鏇村畬鍠勭殑閿欒澶勭悊锛屾瘮濡傝褰曟棩蹇楃瓑
System.err.println("璇诲彇鏂囦欢鏃跺彂鐢熼敊璇�: " + e.getMessage());
--
Gitblit v1.9.3