|
|
@ -124,9 +124,17 @@ public class TermSetServiceImpl implements TermSetService {
|
|
|
|
Integer termId = vo.getTermId();
|
|
|
|
Integer termId = vo.getTermId();
|
|
|
|
//通道id
|
|
|
|
//通道id
|
|
|
|
Integer channelId = vo.getChannelId();
|
|
|
|
Integer channelId = vo.getChannelId();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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();
|
|
|
|
Long currentTime = System.currentTimeMillis();
|
|
|
|
|
|
|
|
|
|
|
|
TerminalChannelMapperExample terminalChannelMapperExample = new TerminalChannelMapperExample();
|
|
|
|
TerminalChannelMapperExample terminalChannelMapperExample = new TerminalChannelMapperExample();
|
|
|
|
TerminalChannelMapperExample.Criteria criteria = terminalChannelMapperExample.createCriteria();
|
|
|
|
TerminalChannelMapperExample.Criteria criteria = terminalChannelMapperExample.createCriteria();
|
|
|
|
criteria.andTermIdEqualTo(termId);
|
|
|
|
criteria.andTermIdEqualTo(termId);
|
|
|
@ -138,7 +146,8 @@ public class TermSetServiceImpl implements TermSetService {
|
|
|
|
Long photoTime = terminalChannelMappers.get(0).getPhotoTime().longValue();
|
|
|
|
Long photoTime = terminalChannelMappers.get(0).getPhotoTime().longValue();
|
|
|
|
termChannelModelMap.put(termId + "_" + channelId, new TermChannelModel(termId, channelId, photoTime, currentTime));
|
|
|
|
termChannelModelMap.put(termId + "_" + channelId, new TermChannelModel(termId, channelId, photoTime, currentTime));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
|
|
|
|
Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
|
|
|
|
Terminals terminals = terminalMap.get(termId);
|
|
|
|
Terminals terminals = terminalMap.get(termId);
|
|
|
|