fix:修改设备控制

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<TerminalChannelMapper> 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<TerminalChannelMapper> 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<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
         Terminals terminals = terminalMap.get(termId);