From 7d6c7af68d6f54ec88eef6c41641be121998b150 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 25 Nov 2024 09:14:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0415=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/shxy/xymanager_common/excel/TerminalExcel.java | 4 ++++ .../java/com/shxy/xymanager_common/util/RawReportUtil.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/excel/TerminalExcel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/excel/TerminalExcel.java index b028b43..34557cd 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/excel/TerminalExcel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/excel/TerminalExcel.java @@ -99,6 +99,9 @@ public class TerminalExcel { @ColumnWidth(16) @ExcelProperty(value = "备注") private String comment; + @ColumnWidth(16) + @ExcelProperty(value = "夜视415") + private String night; public static TerminalExcel from(View_Dy_Line_Tower_Terminals term) { TerminalExcel item = new TerminalExcel(); @@ -141,6 +144,7 @@ public class TerminalExcel { item.setCameraService(String.valueOf(map.get("cameraService"))); item.setAiVersion(String.valueOf(map.get("aiVersion"))); item.setMcu(String.valueOf(map.get("mcu"))); + item.setNight(String.valueOf(map.get("night415"))); } } return item; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/RawReportUtil.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/RawReportUtil.java index 333293e..566cf5e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/RawReportUtil.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/RawReportUtil.java @@ -79,6 +79,8 @@ public class RawReportUtil { map.put("freeROM", str.replaceFirst("剩余存储空间:", "")); } else if (str.startsWith("剩余空间:")) { map.put("freeROM", str.replaceFirst("剩余空间:", "")); + } else if (str.startsWith("415算法:")) { + map.put("night415", str.replaceFirst("415算法:", "")); } } }