From 92c6cf5f101cca91e14d9e35217dccc1d1ce6620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E6=89=BF?= Date: Sun, 29 Sep 2024 13:28:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TermSetServiceImpl.java | 37 ++++++++++++------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TermSetServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TermSetServiceImpl.java index 4de9ef0..ad67f42 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TermSetServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TermSetServiceImpl.java @@ -124,21 +124,30 @@ public class TermSetServiceImpl implements TermSetService { Integer termId = vo.getTermId(); //通道id Integer channelId = vo.getChannelId(); - //获取当前系统时间 - Long currentTime = System.currentTimeMillis(); - - TerminalChannelMapperExample terminalChannelMapperExample = new TerminalChannelMapperExample(); - TerminalChannelMapperExample.Criteria criteria = terminalChannelMapperExample.createCriteria(); - criteria.andTermIdEqualTo(termId); - criteria.andChannelIdEqualTo(channelId.byteValue()); - - //根据当前的装置id和通道id查询当前最新的图片时间 - List terminalChannelMappers = terminalChannelMapperDao.selectByExample(terminalChannelMapperExample); - if ( terminalChannelMappers.size() > 0 ) { - Long photoTime = terminalChannelMappers.get(0).getPhotoTime().longValue(); - termChannelModelMap.put(termId + "_" + channelId, new TermChannelModel(termId, channelId, photoTime, currentTime)); - } + boolean isFlse = false; + if (null != termId && null != channelId) { + for (TermCtrlVo.CtrlBean ctrlBean : list) { + if ( "capture" == ctrlBean.getName()) { + isFlse = true; + } + } + if (isFlse) { + //获取当前系统时间 + Long currentTime = System.currentTimeMillis(); + TerminalChannelMapperExample terminalChannelMapperExample = new TerminalChannelMapperExample(); + TerminalChannelMapperExample.Criteria criteria = terminalChannelMapperExample.createCriteria(); + criteria.andTermIdEqualTo(termId); + criteria.andChannelIdEqualTo(channelId.byteValue()); + + //根据当前的装置id和通道id查询当前最新的图片时间 + List terminalChannelMappers = terminalChannelMapperDao.selectByExample(terminalChannelMapperExample); + if ( terminalChannelMappers.size() > 0 ) { + Long photoTime = terminalChannelMappers.get(0).getPhotoTime().longValue(); + termChannelModelMap.put(termId + "_" + channelId, new TermChannelModel(termId, channelId, photoTime, currentTime)); + } + } + } Map terminalMap = newCacheService.getTerminalMap(); Terminals terminals = terminalMap.get(termId);