From 0c71c7ea3a9fc9576f2dcb46461372a6d3a47536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E6=89=BF?= <guocheng@xinyingpower.com>
Date: Thu, 31 Oct 2024 13:45:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=88=97=E8=A3=85=E7=BD=AE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xydl/cac/controller/NSensorController.java     | 4 ++--
 .../java/com/xydl/cac/service/impl/ReportServiceImpl.java   | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xydl/cac/controller/NSensorController.java b/src/main/java/com/xydl/cac/controller/NSensorController.java
index 2ddb0fb..bc02a06 100644
--- a/src/main/java/com/xydl/cac/controller/NSensorController.java
+++ b/src/main/java/com/xydl/cac/controller/NSensorController.java
@@ -64,7 +64,7 @@ public class NSensorController extends BasicController {
     @ApiOperation("查询全部")
     public Response<List<NSensor>> listAll(@ApiParam("主设备id") @RequestParam(value = "zsbid", required = false) Integer zsbid,
                                            @ApiParam("类型") @RequestParam(value = "typeId", required = false) Integer typeId) throws Exception {
-        List<NSensor> result = service.listAll(zsbid , typeId);
+        List<NSensor> result = service.listAll(zsbid, typeId);
         return Response.success(result);
     }
 
@@ -191,7 +191,7 @@ public class NSensorController extends BasicController {
     public void exportLatest(@ApiParam("主设备id") @RequestParam(value = "zsbid", required = false) Integer zsbid, HttpServletResponse response) throws Exception {
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
-        List<NSensor> result = service.listAll(zsbid , null);
+        List<NSensor> result = service.listAll(zsbid, null);
 
         Map<Integer, List<NSensor>> map = new HashMap<>();
         for (NSensor nSensor : result) {
diff --git a/src/main/java/com/xydl/cac/service/impl/ReportServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ReportServiceImpl.java
index 7eef80f..d2e2aaf 100644
--- a/src/main/java/com/xydl/cac/service/impl/ReportServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/ReportServiceImpl.java
@@ -134,6 +134,9 @@ public class ReportServiceImpl implements ReportService {
         head.add("主设备名称");
         heads.add(head);
         head = new ArrayList<>();
+        head.add("装置名称");
+        heads.add(head);
+        head = new ArrayList<>();
         head.add("时间");
         heads.add(head);
         for (ModevTypePoint point : nSensors.get(0).getTypePoints()) {
@@ -147,9 +150,10 @@ public class ReportServiceImpl implements ReportService {
         for (NSensor nSensor : nSensors) {
             List<String> line = new ArrayList<>();
             line.add(nSensor.getZsbName());
+            line.add(nSensor.getName());
             HashMap<String, String> lastData = nSensor.getLastData();
             if (null != lastData) {
-                String acquisitionTime = nSensor.getLastData().get("acquisitionTime");
+                String acquisitionTime = lastData.get("acquisitionTime");
                 line.add(acquisitionTime);
                 for (ModevTypePoint typePoint : nSensor.getTypePoints()) {
                     line.add(lastData.get(typePoint.getField()));