Merge branch 'dyf-device' into jingquan

# Conflicts: # fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java
强制将HTTP替换为HTTPS
2025-11-25 14:52:10 +08:00 · 2025-11-25 14:51:10 +08:00 · 2025-11-25 14:47:00 +08:00 · 2025-11-24 08:30:34 +08:00 · 2025-11-21 16:24:07 +08:00 · 2025-11-20 16:25:33 +08:00
9 changed files with 326 additions and 36 deletions
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java
@ -29,10 +29,13 @@ public class AppVideoController extends BaseController {
    private final VideoProcessService videoProcessService;
    private final AudioProcessService audioProcessService;

+    /**
+     * 上传视频转码code默认1：RGB565 2：BGR565
+     */
    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS,message = "请勿重复提交！")
-    public R<List<String>> uploadVideo(@RequestParam("file") MultipartFile file) {
-        return R.ok(videoProcessService.processVideo(file));
+    public R<List<String>> uploadVideo(@RequestParam("file") MultipartFile file, @RequestParam(defaultValue = "1") int code) {
+        return R.ok(videoProcessService.processVideo(file, code));
    }

    /**
--- a/fys-admin/src/main/java/com/fuyuanshen/app/service/VideoProcessService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/VideoProcessService.java
@ -28,7 +28,7 @@ public class VideoProcessService {

    private final VideoProcessUtil videoProcessUtil;

-    public List<String> processVideo(MultipartFile file) {
+    public List<String> processVideo(MultipartFile file, int code) {
        // 1. 参数校验
        validateVideoFile(file);

@ -39,9 +39,10 @@ public class VideoProcessService {

            // 3. 处理视频并提取帧数据
            List<String> hexList = videoProcessUtil.processVideoToHex(
-                    tempFile, FRAME_RATE, DURATION, WIDTH, HEIGHT
+                    tempFile, FRAME_RATE, DURATION, WIDTH, HEIGHT, code
            );
-
+            log.info("code: {} hexList(前100个): {}", code,
+                    hexList.subList(0, Math.min(100, hexList.size())));
            log.info("视频处理成功，生成Hex数据长度: {}", hexList.size());
            return hexList;

--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendAlarmMessageRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendAlarmMessageRule.java
@ -1,9 +1,18 @@
 package com.fuyuanshen.global.mqtt.rule.xinghan;

+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.common.sse.dto.SseMessageDto;
+import com.fuyuanshen.common.sse.utils.SseMessageUtils;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceLog;
+import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
 import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
 import com.fuyuanshen.global.mqtt.config.MqttGateway;
@ -21,6 +30,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;

 import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
 import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
@ -40,6 +51,18 @@ public class XinghanSendAlarmMessageRule implements MqttMessageRule {

    private final MqttGateway mqttGateway;
    private final ObjectMapper objectMapper;
+    private final ScheduledExecutorService scheduledExecutorService;
+    private final DeviceLogMapper deviceLogMapper;
+    private final DeviceMapper deviceMapper;
+    /**
+     * 设备上行确认消息
+     */
+    public static final String BREAK_NEWS_CONFIRMATION = "I get it";
+
+    /**
+     * 设备上行成功标记
+     */
+    public static final String BREAK_NEWS_SUCCESS = "cover!";

    @Override
    public String getCommandType() {
@ -62,9 +85,36 @@ public class XinghanSendAlarmMessageRule implements MqttMessageRule {
                log.warn("重复消息丢弃 {}", dedupKey);
                return;
            }
-
+            // 1. I get it —— 表示用户确认收到消息
+            if (BREAK_NEWS_CONFIRMATION.equalsIgnoreCase(respText)) {
+                var device = deviceMapper.selectOne(new QueryWrapper<Device>().eq("device_imei", ctx.getDeviceImei()));
+                // 使用MyBatis-Plus内置方法查询最新一条紧急通知
+                QueryWrapper<DeviceLog> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("device_id", device.getId())
+                        .eq("device_action", "发送紧急通知")  // 根据您的表结构调整
+                        .orderByDesc("create_time")
+                        .last("LIMIT 1");
+                DeviceLog latestLog = deviceLogMapper.selectOne(queryWrapper);
+                log.info("设备 {} 最新紧急通知：{}", ctx.getDeviceImei(), latestLog);
+                if (latestLog == null) {
+                    return;
+                }
+                // 更新数据源字段
+                UpdateWrapper<DeviceLog> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("id", latestLog.getId())             // 条件：ID匹配
+                        .set("data_source", "设备已收到通知"); // 要更新的字段
+                deviceLogMapper.update(null, updateWrapper);
+                // 推送SSE消息
+                scheduledExecutorService.schedule(() -> {
+                    SseMessageDto dto = new SseMessageDto();
+                    dto.setMessage(String.format("%s设备已收到通知！", latestLog.getDeviceName()));
+                    dto.setUserIds(List.of(latestLog.getCreateBy()));
+                    SseMessageUtils.publishMessage(dto);
+                }, 5, TimeUnit.SECONDS);
+                return;
+            }
            // 1. cover! —— 成功标记
-            if ("cover!".equalsIgnoreCase(respText)) {
+            if (BREAK_NEWS_SUCCESS.equalsIgnoreCase(respText)) {
                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
                log.info("设备 {} 发送紧急通知完成", ctx.getDeviceImei());
                return;
--- a/fys-admin/src/main/java/com/fuyuanshen/web/util/VideoProcessUtil.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/util/VideoProcessUtil.java
@ -11,6 +11,8 @@ import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
@ -37,63 +39,104 @@ public class VideoProcessUtil {
    /**
     * 处理视频并转换为Hex字符串列表
     */
-    public List<String> processVideoToHex(File videoFile, int frameRate, int duration, int width, int height) throws Exception {
+    public List<String> processVideoToHex(File videoFile, int frameRate, int duration, int width, int height, int code) throws Exception {
        // 1. 提取视频帧
        List<BufferedImage> frames = extractFramesFromVideo(videoFile, frameRate, duration, width, height);

-        // 2. 转换为RGB565格式
-        byte[] binaryData = convertFramesToRGB565(frames);
+        if (code == 1) {
+            // 1. 转换为RGB565格式
+            byte[] binaryData = convertFramesToRGB565(frames);

-        // 3. 转换为Hex字符串列表
-        return bytesToHexList(binaryData);
+            // 2. 转换为Hex字符串列表
+            return bytesToHexList(binaryData);
+        } else {
+            // 1. 转换为BGR565格式
+            byte[] binaryData = convertFramesToBGR565(frames);
+
+            // 新增：直接生成 mp4
+            //bgr565ToMp4(binaryData, width, height, frameRate, "output.mp4");
+
+            // 2. 转换为Hex字符串列表
+            return bytesToHexList(binaryData);
+        }
    }

+
    /**
     * 从视频中提取帧
+     *
+     * @param videoFile 视频文件对象
+     * @param frameRate 每秒提取的帧数（帧率）
+     * @param duration  需要提取的视频时长（秒）
+     * @param width     提取帧的宽度
+     * @param height    提取帧的高度
+     * @return 提取的帧图像列表
+     * @throws Exception 如果在提取过程中发生错误
     */
    private List<BufferedImage> extractFramesFromVideo(File videoFile, int frameRate, int duration, int width, int height) throws Exception {
+        // 初始化帧列表
        List<BufferedImage> frames = new ArrayList<>();
+        // 计算需要提取的总帧数 = 帧率 × 时长
        int totalFramesToExtract = frameRate * duration;

+        // 使用FFmpegFrameGrabber从视频文件中抓取帧
        try (FFmpegFrameGrabber grabber = FFmpegFrameGrabber.createDefault(videoFile)) {
+            // 启动抓取器
            grabber.start();

+            // 获取视频总帧数
            long totalFramesInVideo = grabber.getLengthInFrames();
+            // 获取视频帧率，如果获取不到则默认为30fps
            int fps = (int) Math.round(grabber.getFrameRate());
            if (fps <= 0) fps = 30;

+            // 计算视频总时长（秒）
            double durationSeconds = (double) totalFramesInVideo / fps;
+            // 检查视频时长是否满足要求
            if (durationSeconds < duration) {
                throw new IllegalArgumentException("视频太短，至少需要 " + duration + " 秒");
            }

+            // 计算帧间隔，用于均匀分布提取的帧
            double frameInterval = (double) totalFramesInVideo / totalFramesToExtract;

+            // 循环提取指定数量的帧
            for (int i = 0; i < totalFramesToExtract; i++) {
+                // 计算目标帧号
                int targetFrameNumber = (int) Math.round(i * frameInterval);

+                // 检查目标帧号是否超出视频范围
                if (targetFrameNumber >= totalFramesInVideo) {
                    throw new IllegalArgumentException("目标帧超出范围: " + targetFrameNumber);
                }

+                // 设置抓取器到目标帧
                grabber.setFrameNumber(targetFrameNumber);
+                // 抓取当前帧
                Frame frame = grabber.grab();

+                // 如果成功抓取到帧且帧图像不为空
                if (frame != null && frame.image != null) {
+                    // 将帧转换为BufferedImage并裁剪到指定尺寸
                    BufferedImage bufferedImage = Java2DFrameUtils.toBufferedImage(frame);
                    frames.add(cropImage(bufferedImage, width, height));
                } else {
+                    // 如果无法获取帧则抛出异常
                    throw new IllegalArgumentException("无法获取第 " + targetFrameNumber + "帧");
                }
            }

+            // 停止抓取器
            grabber.stop();
        }

+        // 记录提取的帧数
        log.debug("从视频中提取了 {} 帧", frames.size());
+        // 返回提取的帧列表
        return frames;
    }

+
    /**
     * 将所有帧转换为 RGB565 格式字节数组
     */
@ -110,6 +153,55 @@ public class VideoProcessUtil {
        return result;
    }

+    /**
+     * 将所有帧转换为 BGR565 格式字节数组
+     */
+    private byte[] convertFramesToBGR565(List<BufferedImage> frames) throws Exception {
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+
+        for (BufferedImage image : frames) {
+            byte[] bgr565Bytes = convertToBGR565(image);
+            byteArrayOutputStream.write(bgr565Bytes);
+        }
+
+        byte[] result = byteArrayOutputStream.toByteArray();
+        log.debug("转换BGR565数据完成，总字节数: {}", result.length);
+        return result;
+    }
+
+    /**
+     * 将BufferedImage转换为真正的BGR565格式字节数组
+     */
+    private byte[] convertToBGR565(BufferedImage image) {
+        int width = image.getWidth();
+        int height = image.getHeight();
+        byte[] bgr565Data = new byte[width * height * 2];
+
+        int index = 0;
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                int rgb = image.getRGB(x, y);
+
+                // 提取RGB分量
+                int red = (rgb >> 16) & 0xFF;
+                int green = (rgb >> 8) & 0xFF;
+                int blue = rgb & 0xFF;
+
+                int b = (blue >> 3) & 0x1F;   // 5位蓝色
+                int g = (green >> 2) & 0x3F;  // 6位绿色
+                int r = (red >> 3) & 0x1F;    // 5位红色
+
+                // 正确的BGR565组合：红色在高位，蓝色在低位
+                int bgr565 = (b << 11) | (g << 5) | r;
+
+                bgr565Data[index++] = (byte) ((bgr565 >> 8) & 0xFF);
+                // 小端序存储
+                bgr565Data[index++] = (byte) (bgr565 & 0xFF);
+            }
+        }
+        return bgr565Data;
+    }
+
    /**
     * 将字节数组转换为Hex字符串列表
     */
@ -191,4 +283,76 @@ public class VideoProcessUtil {
            }
        }
    }
+
+    /**
+     * 把 BGR565 字节流直接写成 MP4（H.264）
+     * @param bgr565  完整的 BGR565 裸帧流（每像素 2 字节）
+     * @param width   帧宽
+     * @param height  帧高
+     * @param fps     帧率
+     * @param outMp4  输出 mp4 文件绝对路径
+     * @throws IOException 进程启动 / IO 失败
+     */
+    public static void bgr565ToMp4(byte[] bgr565,
+                                   int width,
+                                   int height,
+                                   int fps,
+                                   String outMp4) throws IOException {
+
+        int framePixels = width * height;
+        int frameBytes  = framePixels * 2;
+        if (bgr565.length % frameBytes != 0) {
+            throw new IllegalArgumentException("字节数组长度不是整帧");
+        }
+
+        /* 1. 构造 FFmpeg 命令 */
+        String[] cmd = {
+                "ffmpeg",
+                "-y",                                 // 覆盖输出
+                "-f", "rawvideo",
+                "-pixel_format", "bgr24",
+                "-video_size", width + "x" + height,
+                "-framerate", String.valueOf(fps),
+                "-i", "-",                            // 从 stdin 读
+                "-c:v", "libx264",
+                "-pix_fmt", "yuv420p",
+                "-crf", "23",                         // 画质可自己调
+                outMp4
+        };
+
+        /* 2. 启动进程 */
+        ProcessBuilder pb = new ProcessBuilder(cmd);
+        pb.redirectError(ProcessBuilder.Redirect.INHERIT); // 把 FFmpeg 日志打到控制台
+        Process p = pb.start();
+        try (OutputStream ffmpegIn = p.getOutputStream()) {
+
+            /* 3. 逐帧转换并写入管道 */
+            byte[] bgr24 = new byte[framePixels * 3];
+            for (int off = 0; off < bgr565.length; off += frameBytes) {
+                for (int i = 0, j = 0; i < frameBytes; i += 2, j += 3) {
+                    int u = ((bgr565[off + i + 1] & 0xFF) << 8)
+                            |  (bgr565[off + i]     & 0xFF);
+                    int b = (u & 0x1F) << 3;
+                    int g = ((u >> 5)  & 0x3F) << 2;
+                    int r = ((u >> 11) & 0x1F) << 3;
+                    bgr24[j]     = (byte) b;
+                    bgr24[j + 1] = (byte) g;
+                    bgr24[j + 2] = (byte) r;
+                }
+                ffmpegIn.write(bgr24);
+            }
+            ffmpegIn.flush();
+        }
+
+        /* 4. 等待编码结束 */
+        try {
+            int exit = p.waitFor();
+            if (exit != 0) {
+                throw new IOException("FFmpeg 异常退出，code=" + exit);
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IOException("等待 FFmpeg 被中断", e);
+        }
+    }
 }
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java
@ -3,9 +3,7 @@ package com.fuyuanshen.equipment.controller;

 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fuyuanshen.common.core.constant.ResponseMessageConstants;
 import com.fuyuanshen.common.core.domain.R;
-import com.fuyuanshen.common.core.domain.ResponseVO;
 import com.fuyuanshen.common.core.domain.model.LoginUser;
 import com.fuyuanshen.common.core.utils.file.FileUtil;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
@ -18,7 +16,6 @@ import com.fuyuanshen.equipment.domain.dto.DeviceExcelImportDTO;
 import com.fuyuanshen.equipment.domain.dto.ImportResult;
 import com.fuyuanshen.equipment.domain.form.DeviceForm;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
-import com.fuyuanshen.equipment.domain.vo.CustomerVo;
 import com.fuyuanshen.equipment.excel.DeviceImportParams;
 import com.fuyuanshen.equipment.excel.HeadValidateListener;
 import com.fuyuanshen.equipment.excel.UploadDeviceDataListener;
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/converter/IgnoreFailedImageConverter.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/converter/IgnoreFailedImageConverter.java
@ -17,6 +17,10 @@ import java.net.URLConnection;
 import java.util.Base64;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;

 /**
 * @author: 默苍璃
@ -41,12 +45,15 @@ public class IgnoreFailedImageConverter implements Converter<URL> {
        }
    };

+    // 创建线程池用于并发处理图片
+    private static final ExecutorService IMAGE_PROCESSING_EXECUTOR = Executors.newFixedThreadPool(
+            Runtime.getRuntime().availableProcessors() * 2);
+
    @Override
    public Class<?> supportJavaTypeKey() {
        return URL.class;
    }

-
    @Override
    public WriteCellData<?> convertToExcelData(URL value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
        if (value == null) {
@ -54,11 +61,36 @@ public class IgnoreFailedImageConverter implements Converter<URL> {
            return new WriteCellData<>(new byte[0]);
        }

+        try {
+            // 使用CompletableFuture异步处理图片加载
+            CompletableFuture<WriteCellData<?>> future = CompletableFuture.supplyAsync(() -> {
+                try {
+                    return loadImageData(value);
+                } catch (Exception e) {
+                    logger.error("异步加载图片失败: {}", value, e);
+                    return new WriteCellData<>(new byte[0]);
+                }
+            }, IMAGE_PROCESSING_EXECUTOR);
+
+            // 设置超时时间，防止长时间阻塞
+            return future.get(30, TimeUnit.SECONDS);
+        } catch (Exception e) {
+            logger.error("图片处理异常: {}", value, e);
+            return new WriteCellData<>(new byte[0]);
+        }
+    }
+
+    /**
+     * 加载图片数据的核心方法
+     * @param value 图片URL
+     * @return WriteCellData对象
+     */
+    private WriteCellData<?> loadImageData(URL value) {
        String cacheKey = "excel:image:" + value.toString();
-        
+
        // 将当前使用的缓存键添加到集合中
        USED_CACHE_KEYS.get().add(cacheKey);
-        
+
        // 尝试从缓存获取
        String cachedData = RedisUtils.getCacheObject(cacheKey);
        if (cachedData != null) {
@ -75,11 +107,13 @@ public class IgnoreFailedImageConverter implements Converter<URL> {
                logger.info("开始加载图片: {}, 尝试次数: {}", value, attempt);
                URLConnection conn = value.openConnection();
                // 增加连接和读取超时时间
-                conn.setConnectTimeout(10000);  // 10秒连接超时
-                conn.setReadTimeout(30000);     // 30秒读取超时
+                conn.setConnectTimeout(5000);  // 5秒连接超时
+                conn.setReadTimeout(15000);     // 15秒读取超时

                // 添加User-Agent避免被服务器拦截
                conn.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 ExcelExporter/1.0");
+                // 添加Connection: close避免保持连接
+                conn.setRequestProperty("Connection", "close");

                // 如果是HTTP连接，设置一些额外的属性
                if (conn instanceof HttpURLConnection) {
@ -152,11 +186,20 @@ public class IgnoreFailedImageConverter implements Converter<URL> {
                    if (bytes.length > COMPRESSION_THRESHOLD) {
                        logger.info("图片大小超过1MB ({} bytes)，开始压缩", bytes.length);
                        long beforeCompressSize = bytes.length;
-                        bytes = ImageCompressUtil.compressImage(bytes, COMPRESSION_TARGET);
+
+                        // 先尝试质量压缩
+                        byte[] compressed = ImageCompressUtil.compressImage(bytes, COMPRESSION_TARGET);
+
+                        // 如果压缩后变大了，使用原始数据
+                        if (compressed.length >= bytes.length) {
+                            compressed = bytes;
+                        }
+
+                        bytes = compressed;
                        long afterCompressSize = bytes.length;
-                        logger.info("图片压缩完成，压缩前大小: {} bytes, 压缩后大小: {} bytes, 压缩率: {}%", 
-                                   beforeCompressSize, afterCompressSize,
-                                   String.format("%.2f", (1.0 - (double) afterCompressSize / beforeCompressSize) * 100));
+                        logger.info("图片压缩完成，压缩前大小: {} bytes, 压缩后大小: {} bytes, 压缩率: {}",
+                                beforeCompressSize, afterCompressSize,
+                                String.format("%.2f", (1.0 - (double) afterCompressSize / beforeCompressSize) * 100));
                    }

                    logger.info("成功读取图片数据，大小: {} 字节", bytes.length);
@ -209,7 +252,6 @@ public class IgnoreFailedImageConverter implements Converter<URL> {
        }
    }

-
    /**
     * 等待重试，使用指数退避策略
     *
@ -225,7 +267,6 @@ public class IgnoreFailedImageConverter implements Converter<URL> {
        }
    }

-
    /**
     * 替代 FileUtils.readInputStream 的自定义方法
     *
@ -253,4 +294,37 @@ public class IgnoreFailedImageConverter implements Converter<URL> {
        return outputStream.toByteArray();
    }

-}
+    /**
+     * 预加载图片到缓存
+     * @param imageUrls 图片URL列表
+     */
+    public static void preloadImages(Set<URL> imageUrls) {
+        if (imageUrls == null || imageUrls.isEmpty()) {
+            return;
+        }
+
+        logger.info("开始预加载 {} 张图片", imageUrls.size());
+
+        // 使用并行流并发预加载图片
+        imageUrls.parallelStream().forEach(url -> {
+            try {
+                String cacheKey = "excel:image:" + url.toString();
+                // 如果缓存中没有，则异步加载
+                if (!RedisUtils.hasKey(cacheKey)) {
+                    CompletableFuture.runAsync(() -> {
+                        try {
+                            // 简化版图片加载逻辑，只加载到缓存
+                            new IgnoreFailedImageConverter().loadImageData(url);
+                        } catch (Exception e) {
+                            logger.warn("预加载图片失败: {}", url, e);
+                        }
+                    }, IMAGE_PROCESSING_EXECUTOR);
+                }
+            } catch (Exception e) {
+                logger.warn("预加载图片异常: {}", url, e);
+            }
+        });
+
+        logger.info("图片预加载任务已提交");
+    }
+}
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceWithTypeExcelExportDTO.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceWithTypeExcelExportDTO.java
@ -13,7 +13,7 @@ import java.net.URL;
 * 设备及完整类型信息导出DTO
 *
 * @author: 默苍璃
- * @date: 2025-11-0416:25
+ * @date: 2025-11-04 16:25
 */
@Data
@HeadRowHeight(20)  // 表头行高
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
@ -19,11 +19,8 @@ import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.customer.domain.Customer;
 import com.fuyuanshen.customer.mapper.CustomerMapper;
-import com.fuyuanshen.equipment.constants.DeviceConstants;
 import com.fuyuanshen.equipment.domain.*;
-import com.fuyuanshen.equipment.domain.bo.DeviceFenceAccessRecordBo;
 import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
-import com.fuyuanshen.equipment.domain.dto.FenceCheckResponse;
 import com.fuyuanshen.equipment.domain.form.DeviceForm;
 import com.fuyuanshen.equipment.domain.query.DeviceAssignmentQuery;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
@ -33,7 +30,10 @@ import com.fuyuanshen.equipment.enums.BindingStatusEnum;
 import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
 import com.fuyuanshen.equipment.enums.DeviceActiveStatusEnum;
 import com.fuyuanshen.equipment.mapper.*;
-import com.fuyuanshen.equipment.service.*;
+import com.fuyuanshen.equipment.service.DeviceAssignmentsService;
+import com.fuyuanshen.equipment.service.DeviceService;
+import com.fuyuanshen.equipment.service.DeviceTypeGrantsService;
+import com.fuyuanshen.equipment.service.IDeviceGeoFenceService;
 import com.fuyuanshen.equipment.utils.FileHashUtil;
 import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.domain.vo.SysRoleVo;
@ -41,15 +41,11 @@ import com.fuyuanshen.system.service.ISysOssService;
 import com.fuyuanshen.system.service.ISysRoleService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;

-import java.io.File;
 import java.io.IOException;
 import java.sql.Timestamp;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;

@ -290,6 +286,10 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
        if (deviceForm.getFile() != null) {
            String fileHash = fileHashUtil.hash(deviceForm.getFile());
            SysOssVo upload = ossService.updateHash(deviceForm.getFile(), fileHash);
+            // 强制将HTTP替换为HTTPS
+            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
+                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
+            }
            // 设置图片路径
            deviceForm.setDevicePic(upload.getUrl());
        }
--- a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOss.java
+++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOss.java
@ -51,6 +51,7 @@ public class SysOss extends TenantEntity {
     * 服务商
     */
    private String service;
+
    /**
     * 内容哈希
     */
Author	SHA1	Message	Date
daiyongfei	7753444f25	Merge branch 'dyf-device' into jingquan # Conflicts: # fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java	2025-11-25 14:52:10 +08:00
daiyongfei	bf182ebc89	强制将HTTP替换为HTTPS	2025-11-25 14:51:10 +08:00
dyf	d5a29feca3	Merge pull request 'jingquan' (#20 ) from liwenlong/fys-Multi-tenant:jingquan into jingquan Reviewed-on: #20	2025-11-25 14:47:00 +08:00
liwenlong	0457877c09	merge upstream	2025-11-24 08:30:34 +08:00
daiyongfei	1e9e815314	uploadVideo	2025-11-21 16:24:07 +08:00
liwenlong	7c6f3be844	merge upstream	2025-11-20 16:25:33 +08:00
DragonWenLong	aa69b552aa	Merge remote-tracking branch 'liwenlong-fys/jingquan' into jingquan	2025-11-20 16:25:04 +08:00
DragonWenLong	3dd0d4cc90	feat(video): 支持BGR565格式视频处理及MQTT设备确认消息更新 - 新增BGR565格式转换逻辑，支持RGB565与BGR565两种颜色格式- 视频上传接口增加code参数，默认值为1（RGB565） - 在VideoProcessUtil中实现convertFramesToBGR565方法 - 添加bgr565ToMp4工具方法用于将BGR565数据编码为MP4文件 - MQTT规则新增对“设备已收到通知”的处理逻辑 - 设备确认消息后更新数据库日志状态并推送SSE消息 - 引入ScheduledExecutorService延时推送SSE消息- 增加设备日志和设备Mapper依赖以支持数据操作	2025-11-20 16:24:45 +08:00
DragonWenLong	359cabbd2c	feat(video): 支持BGR565格式视频处理- 新增code参数用于指定视频转码格式 - 实现BGR565格式的帧数据转换逻辑 - 添加convertFramesToBGR565和convertToBGR565方法 - 支持将BGR565数据通过FFmpeg生成MP4文件- 更新VideoProcessUtil工具类以支持两种颜色格式 - 在视频处理服务中记录处理日志及hex列表信息	2025-11-20 09:06:05 +08:00