From 8d1d546ad729da0e809e17e8161376adcc662c96 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 21 一月 2026 11:51:36 +0800
Subject: [PATCH] update代码合并
---
admin-server/src/main/java/com/estate/expert/admin/io/processor/impl/business/DeviceProcessor.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/io/processor/impl/business/DeviceProcessor.java b/admin-server/src/main/java/com/estate/expert/admin/io/processor/impl/business/DeviceProcessor.java
index cb2f6a5..0f6984c 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/io/processor/impl/business/DeviceProcessor.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/io/processor/impl/business/DeviceProcessor.java
@@ -10,14 +10,14 @@
/**
* 设备处理器
- *
+ *
* 用于处理设备信息的读取和写入
*/
public class DeviceProcessor extends RowDataProcessorBase<Device> {
/**
* 获取表头
- *
+ *
* @return 表头
*/
protected final String[] getHeaders() {
@@ -34,10 +34,10 @@
protected List<String> buildRowData(Device data) {
return List.of(
data.getType().getDesc(),
- data.getName(),
+ data.getManufacturerNumber(),
getProp(data, "设备型号"),
getProp(data, "设备出厂日期"),
- data.getManufacturerNumber(),
+ data.getName(),
getProp(data, "报废年限"),
getProp(data, "使用单位"),
getProp(data, "工程起重机械生产单位"),
@@ -64,7 +64,7 @@
protected Device parseRowData(int rowIndex, List<String> rowData) {
var index = 0;
var device = new Device();
-
+
// 初始化 properties Map
device.setProperties(new HashMap<>());
@@ -76,12 +76,12 @@
if(model != null) {
device.getProperties().put("设备型号", model);
}
-
+
String manufactureDate = ExcelParseUtils.parseString(rowData.get(index++));
if(manufactureDate != null) {
device.getProperties().put("设备出厂日期", manufactureDate);
}
-
+
device.setManufacturerNumber(ExcelParseUtils.parseString(rowData.get(index++)));
var headers = getHeaders();
--
Gitblit v1.7.1