From 7a2deb17ed470cdda58551f3565b35b3ad146845 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Fri, 6 Sep 2024 10:18:56 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=9F=A5=E8=AF=A2=E8=A3=85=E7=BD=AE?= =?UTF-8?q?=E9=99=84=E5=B8=A6=E6=9B=B4=E5=A4=9A=E7=9A=84=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xymanager_common/model/PhotoDayModel.java | 5 +++++ .../impl/TerminalPhotoServiceImpl.java | 20 +++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoDayModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoDayModel.java index 6a75d54..5f25143 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoDayModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoDayModel.java @@ -12,7 +12,12 @@ public class PhotoDayModel implements Serializable { private Date firstPhotoTime; private Date lastPhotoTime; + private Date firstRecvTime; private Date lastRecvTime; + private String firstPhotoPath; + private String lastPhotoPath; + private Integer firstChannelId; + private Integer lastChannelId; private long totalDays; private long photoCount; diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java index 7e6860e..e849165 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java @@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; @@ -93,6 +94,9 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { @Autowired UserService userService; + @Value("${photo.address}") + private String photoAddress; + //服务器中的位置 private static final String C_PATH = "/home/xymp/photos/"; @@ -206,7 +210,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { ArrayList photoalarmlist = new ArrayList<>(); for (TerminalImgAlarmsDto dto : imgarlarmsList) { BigInteger photoOrgId = dto.getPhotoOrgId(); - if (photoOrgId.longValue() == photoid.longValue() ) { + if (photoOrgId.longValue() == photoid.longValue()) { TerminalPhotoListModel.AlarmItemBean alarmItemBean = new TerminalPhotoListModel.AlarmItemBean(); alarmItemBean.setEnname(dto.getEnname()); alarmItemBean.setName(dto.getName()); @@ -1002,16 +1006,24 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { example.setOrderByClause("photo_time desc"); PageHelper.startPage(1, 1); List list = terminalPhotoDao.selectByExample(example); - long lastrecv = list.get(0).getRecvTime().longValue(); + TerminalPhoto last = list.get(0); + long lastrecv = last.getRecvTime().longValue(); result.setLastRecvTime(new Date(lastrecv * 1000)); - long lastphoto = list.get(0).getPhotoTime().longValue(); + long lastphoto = last.getPhotoTime().longValue(); result.setLastPhotoTime(new Date(lastphoto * 1000)); + result.setLastChannelId(last.getChannelId()); + result.setLastPhotoPath(photoAddress + last.getPath()); example.setOrderByClause("photo_time asc"); PageHelper.startPage(1, 1); list = terminalPhotoDao.selectByExample(example); - long firstphoto = list.get(0).getPhotoTime().longValue(); + TerminalPhoto first = list.get(0); + long firstrecv = first.getRecvTime().longValue(); + result.setFirstRecvTime(new Date(firstrecv * 1000)); + long firstphoto = first.getPhotoTime().longValue(); result.setFirstPhotoTime(new Date(firstphoto * 1000)); + result.setFirstChannelId(first.getChannelId()); + result.setFirstPhotoPath(photoAddress + first.getPath()); long totalDays = DateUtil.getDifferenceInDays(result.getFirstPhotoTime(), result.getLastPhotoTime()); result.setTotalDays(totalDays);