截图代码修改

business-service/src/main/java/com/ozs/service/service/impl/CameraCaptureService.java

@@ -1,6 +1,8 @@
 package com.ozs.service.service.impl;
 
 import com.ozs.common.utils.MinioUtils;
+import com.ozs.common.utils.uuid.IdUtils;
+import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -63,10 +65,23 @@ public class CameraCaptureService {
                     byteArrayOutputStream.write(bytes,0,index);
                 }
                 ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
-                log.info("getCapture======" + fileName);
-                log.info("fileName"+fileName+"图片开始截图时间"+new Date()+"--数组大小"+bytes.length);
+                String uploadUrl = "/data/test_picture/"+ IdUtils.fastSimpleUUID()+".jpeg";
+                if (log.isDebugEnabled()) {
+                    log.debug("生成至服务器本地开始，路径为======" + uploadUrl);
+                }
+                IOUtils.copy(byteArrayInputStream, new FileOutputStream(uploadUrl));
+                if (log.isDebugEnabled()) {
+                    log.debug("生成至服务器本地结束");
+                }
+                byteArrayInputStream.reset();
+                if (log.isDebugEnabled()) {
+                    log.debug("getCapture======" + fileName);
+                    log.debug("minIoClientUpload fileName:"+fileName+"图片开始截图时间"+new Date()+"--数组大小"+bytes.length);
+                }
                 minioUtils.minIoClientUpload(byteArrayInputStream, fileName);
-                log.info("fileName"+fileName+"图片结束截图时间"+new Date());
+                if (log.isDebugEnabled()) {
+                    log.debug("minIoClientUpload fileName:"+fileName+"图片结束截图时间:"+new Date());
+                }
             }
         } catch (Exception e) {
             //先关闭外层的缓冲流，再关闭内层的流,但是在关闭外层流的同时，

business-service/src/main/java/com/ozs/service/service/impl/MsgAlarmServiceImpl.java

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.service.service.RedisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -156,20 +157,22 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
     @Override
     public void getNormalBaseCameraManagementsCache(String setType) {
         Set<BaseCameraVO> alarmSet = redisService.getSetMembers(Constants.ALARM_SET);
-        Set<String> cameraCodeSet = alarmSet.stream()
-                .map(BaseCameraVO::getCameraCode)
-                .collect(Collectors.toSet());
-        QueryWrapper<BaseCameraManagement> queryWrapper = new QueryWrapper<>();
-        if(Constants.ALARM_SET.equals(setType)) {
-            // 使用QueryWrapper和notin方法根据cameraCode列表查询BaseCameraManagement数据
-            queryWrapper.notIn("camera_code", cameraCodeSet);
-            Set<BaseCameraManagement> set = baseCameraManagementMapper.selectList(queryWrapper).stream().collect(Collectors.toSet());
-            set.forEach(item -> {
-                BaseCameraVO  baseCameraVO=new BaseCameraVO();
-                baseCameraVO.setCameraCode(item.getCameraCode());
-                baseCameraVO.setChannel(item.getChannel());
-                redisService.addToSet(Constants.NORMAL_SET, baseCameraVO);
-            });
+        if(!CollectionUtils.isEmpty(alarmSet)) {
+            Set<String> cameraCodeSet = alarmSet.stream()
+                    .map(BaseCameraVO::getCameraCode)
+                    .collect(Collectors.toSet());
+            QueryWrapper<BaseCameraManagement> queryWrapper = new QueryWrapper<>();
+            if (Constants.ALARM_SET.equals(setType)) {
+                // 使用QueryWrapper和notin方法根据cameraCode列表查询BaseCameraManagement数据
+                queryWrapper.notIn("camera_code", cameraCodeSet);
+                Set<BaseCameraManagement> set = baseCameraManagementMapper.selectList(queryWrapper).stream().collect(Collectors.toSet());
+                set.forEach(item -> {
+                    BaseCameraVO baseCameraVO = new BaseCameraVO();
+                    baseCameraVO.setCameraCode(item.getCameraCode());
+                    baseCameraVO.setChannel(item.getChannel());
+                    redisService.addToSet(Constants.NORMAL_SET, baseCameraVO);
+                });
+            }
         }
     }