From 205945d5d813f274c895711c8b158c14799cf8f7 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Wed, 20 Nov 2024 09:44:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8F=98=E9=87=8F=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E6=96=B0=E5=A2=9Eunit=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/das/modules/fdr/domain/SysFaultRecordingDesc.java   | 2 ++
 .../modules/fdr/domain/excel/SysFaultRecordingExcel.java    | 5 +++++
 .../modules/fdr/service/impl/FaultRecorderServiceImpl.java  | 1 +
 .../com/das/modules/plc/domain/Excel/SysRunLogExcel.java    | 5 +++++
 .../main/java/com/das/modules/plc/domain/SysRunLogDesc.java | 6 ++++++
 .../das/modules/plc/service/impl/PlcLogsServiceImpl.java    | 1 +
 6 files changed, 20 insertions(+)

diff --git a/das/src/main/java/com/das/modules/fdr/domain/SysFaultRecordingDesc.java b/das/src/main/java/com/das/modules/fdr/domain/SysFaultRecordingDesc.java
index 49098561..d91707c0 100644
--- a/das/src/main/java/com/das/modules/fdr/domain/SysFaultRecordingDesc.java
+++ b/das/src/main/java/com/das/modules/fdr/domain/SysFaultRecordingDesc.java
@@ -46,4 +46,6 @@ public class SysFaultRecordingDesc {
     @TableField("updated_time")
     private Date updatedTime;
 
+    @TableField("unit")
+    private String unit;
 }
diff --git a/das/src/main/java/com/das/modules/fdr/domain/excel/SysFaultRecordingExcel.java b/das/src/main/java/com/das/modules/fdr/domain/excel/SysFaultRecordingExcel.java
index 269e5ee9..6a6f8be3 100644
--- a/das/src/main/java/com/das/modules/fdr/domain/excel/SysFaultRecordingExcel.java
+++ b/das/src/main/java/com/das/modules/fdr/domain/excel/SysFaultRecordingExcel.java
@@ -20,4 +20,9 @@ public class SysFaultRecordingExcel implements Serializable {
     @ExcelProperty(value = "中文描述",index = 1)
     private String description;
 
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位",index = 2)
+    private String unit;
 }
diff --git a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java
index 848867f0..b6caf69e 100644
--- a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java
+++ b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java
@@ -101,6 +101,7 @@ public class FaultRecorderServiceImpl implements FaultRecorderService {
         SheetInfoBean sheetDTO = new SheetInfoBean();
         map.put("variable", "英文名称");
         map.put("description", "中文描述");
+        map.put("unit","单位");
         sheetDTO.setSheetName(theoreticalPowerCurve.getMadeinfactory());
         sheetDTO.setFieldAndAlias(map);
         sheetDTO.setCollection(sysFaultRecordingDescList);
diff --git a/das/src/main/java/com/das/modules/plc/domain/Excel/SysRunLogExcel.java b/das/src/main/java/com/das/modules/plc/domain/Excel/SysRunLogExcel.java
index c4d206a2..61c87cc0 100644
--- a/das/src/main/java/com/das/modules/plc/domain/Excel/SysRunLogExcel.java
+++ b/das/src/main/java/com/das/modules/plc/domain/Excel/SysRunLogExcel.java
@@ -20,4 +20,9 @@ public class SysRunLogExcel implements Serializable {
     @ExcelProperty(value = "中文描述",index = 1)
     private String description;
 
+    /**
+     * 单位
+     */
+    @ExcelProperty(value = "单位",index = 2)
+    private String unit;
 }
diff --git a/das/src/main/java/com/das/modules/plc/domain/SysRunLogDesc.java b/das/src/main/java/com/das/modules/plc/domain/SysRunLogDesc.java
index 5825be83..d5de4307 100644
--- a/das/src/main/java/com/das/modules/plc/domain/SysRunLogDesc.java
+++ b/das/src/main/java/com/das/modules/plc/domain/SysRunLogDesc.java
@@ -1,5 +1,6 @@
 package com.das.modules.plc.domain;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -46,4 +47,9 @@ public class SysRunLogDesc {
     @TableField("updated_time")
     private Date updatedTime;
 
+    /**
+     * 单位
+     */
+    @TableField("unit")
+    private String unit;
 }
diff --git a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java
index 652124c9..728e8e40 100644
--- a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java
+++ b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java
@@ -122,6 +122,7 @@ public class PlcLogsServiceImpl implements PlcLogService {
         SheetInfoBean sheetDTO = new SheetInfoBean();
         map.put("variable", "英文名称");
         map.put("description", "中文描述");
+        map.put("unit","单位");
         sheetDTO.setSheetName(theoreticalPowerCurve.getMadeinfactory());
         sheetDTO.setFieldAndAlias(map);
         sheetDTO.setCollection(sysFaultRecordingDescList);