From 469c6d085bf4244b10245cf27ea4e37ded6df413 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Tue, 7 May 2024 13:38:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0lastInfo=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TerminalExtController.java     |  2 ++
 .../entity/View_Dy_Line_Tower_Terminals.java  |  1 +
 .../TerminalBasicInfoHistoryServiceImpl.java  | 19 +++++++++++++++++++
 .../TerminalBasicInfoHistoryService.java      |  5 +++++
 4 files changed, 27 insertions(+)

diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java
index 9cc2262..d28c66c 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java
@@ -75,6 +75,8 @@ public class TerminalExtController extends BaseController {
                 terminal.setPositions(positions);
                 long rebootCount = infoHistoryService.count(terminal.getId(), start, end);
                 terminal.setRebootCount(rebootCount);
+                TerminalBasicInfoHistory info = infoHistoryService.getLast(terminal.getId());
+                terminal.setLastInfo(info);
             }
         }
         return ResponseReult.success(result);
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java
index 7bab68f..08d8f88 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java
@@ -131,4 +131,5 @@ public class View_Dy_Line_Tower_Terminals implements Serializable {
     private TerminalStatus workingStatus;
     private TerminalPositions positions;
     private Long rebootCount;
+    private TerminalBasicInfoHistory lastInfo;
 }
\ No newline at end of file
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalBasicInfoHistoryServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalBasicInfoHistoryServiceImpl.java
index a4350c9..7612be0 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalBasicInfoHistoryServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalBasicInfoHistoryServiceImpl.java
@@ -1,12 +1,16 @@
 package com.shxy.xymanager_service.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.shxy.xymanager_common.entity.TerminalBasicInfoHistory;
 import com.shxy.xymanager_common.entity.TerminalBasicInfoHistoryExample;
 import com.shxy.xymanager_dao.dao.TerminalBasicInfoHistoryDao;
 import com.shxy.xymanager_service.service.TerminalBasicInfoHistoryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 @Slf4j
@@ -28,4 +32,19 @@ public class TerminalBasicInfoHistoryServiceImpl implements TerminalBasicInfoHis
         }
         return terminalBasicInfoHistoryDao.countByExample(example);
     }
+
+    @Override
+    public TerminalBasicInfoHistory getLast(Integer termId) {
+        PageHelper.startPage(1, 1);
+        TerminalBasicInfoHistoryExample example = new TerminalBasicInfoHistoryExample();
+        TerminalBasicInfoHistoryExample.Criteria criteria = example.createCriteria();
+        criteria.andTermIdEqualTo(termId);
+
+        List<TerminalBasicInfoHistory> list = terminalBasicInfoHistoryDao.selectByExample(example);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        } else {
+            return list.get(0);
+        }
+    }
 }
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalBasicInfoHistoryService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalBasicInfoHistoryService.java
index 0c3e504..fb1cd7e 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalBasicInfoHistoryService.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalBasicInfoHistoryService.java
@@ -1,5 +1,10 @@
 package com.shxy.xymanager_service.service;
 
+import com.shxy.xymanager_common.entity.TerminalBasicInfoHistory;
+
 public interface TerminalBasicInfoHistoryService {
+
     long count(Integer termId, Long start, Long end);
+
+    TerminalBasicInfoHistory getLast(Integer termId);
 }