From e6d2efaa0974680f673c0a9e25c99ed3215e43fa Mon Sep 17 00:00:00 2001 From: huangfeng Date: Thu, 15 May 2025 16:37:27 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=9B=BE=E7=89=87=E8=A6=86=E5=86=B0?= =?UTF-8?q?=E5=A4=A9=E6=B0=94=E7=9A=84=E6=8C=89=E6=97=B6=E9=97=B4=E8=A1=A8?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=99=84=E5=B8=A6=E4=B8=8ABasicInfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shxy/xymanager_admin/controller/TerminalExtController.java | 2 ++ .../src/main/java/com/shxy/xymanager_common/model/StatTerm.java | 2 ++ .../impl/TerminalBasicInfoHistoryServiceImpl.java | 1 + 3 files changed, 5 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 ec8804a..7409f28 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 @@ -380,6 +380,8 @@ public class TerminalExtController extends BaseController { for (StatTerm statTerm : termList) { List scheduleList = cameraScheduleService.list(statTerm.getTermId()); statTerm.initScheduleList(scheduleList, vo.getStarttime().getTime(), vo.getEndtime().getTime(), vo.getInterval()); + TerminalBasicInfoHistory info = infoHistoryService.getLast(statTerm.getTermId()); + statTerm.setLastInfo(info); } if (list != null) { for (TerminalPhotoSelectListModel.PhotoBean photo : list) { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/StatTerm.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/StatTerm.java index 506afc5..dd08c99 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/StatTerm.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/StatTerm.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.shxy.xymanager_common.dto.ScheduleDetailsDto; import com.shxy.xymanager_common.entity.CameraSchedule; import com.shxy.xymanager_common.entity.LeadPulls; +import com.shxy.xymanager_common.entity.TerminalBasicInfoHistory; import com.shxy.xymanager_common.entity.Weathers; import com.shxy.xymanager_common.util.DateUtil; import lombok.Data; @@ -29,6 +30,7 @@ public class StatTerm implements Serializable { List pullScheduleList = new ArrayList<>(); List pullTimeList = new ArrayList<>(); Integer pullTotal = 0; + TerminalBasicInfoHistory lastInfo; public void addPhoto(TerminalPhotoSelectListModel.PhotoBean photo) { StatChannel the = null; 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 7612be0..5d9907b 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 @@ -39,6 +39,7 @@ public class TerminalBasicInfoHistoryServiceImpl implements TerminalBasicInfoHis TerminalBasicInfoHistoryExample example = new TerminalBasicInfoHistoryExample(); TerminalBasicInfoHistoryExample.Criteria criteria = example.createCriteria(); criteria.andTermIdEqualTo(termId); + example.setOrderByClause("update_time desc"); List list = terminalBasicInfoHistoryDao.selectByExample(example); if (CollectionUtils.isEmpty(list)) {