Merge pull request 'feat(equipment): 添加设备图片上传功能' (#22) from liwenlong/fys-Multi-tenant:jingquan into jingquan

Reviewed-on: #22

fys-admin/src/main/java/com/fuyuanshen/Text.java

@@ -0,0 +1,64 @@
+package com.fuyuanshen;
+
+import com.fuyuanshen.equipment.utils.AlibabaTTSUtil;
+import com.fuyuanshen.equipment.utils.AudioProcessUtil;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-12-1518:51
+ */
+public class Text {
+    public static void main(String[] args) throws IOException {
+        String text = "简述人生观的主要内容。\n" +
+                "人生观的主要内容包括以下三个方面：\n" +
+                "1.人生目的：回答“人为什么活着”的根本问题。它规定了人生的方向，是人生观的核心。\n" +
+                "2.人生态度：回答“人应该怎样活着”的问题。它是指人们通过生活实践形成的对人生问题的一种稳定的心理倾向和基本意图。\n" +
+                "3.人生价值：回答“什么样的人生才有意义”的问题。它是指人的生命及其实践活动对于社会和个人所具有的作用和意义。\n" +
+                "人生目的、人生态度和人生价值相互联系、相辅相成，共同构成一个有机整体。\n" +
+                "人生目的是人生观的核心，它决定人生态度和人生价值的方向；人生态度影响人生目的的实现和人生价值的创造；人生价值是衡量人生观正确与否的尺度。";
+
+        AlibabaTTSUtil alibabaTTSUtil = new AlibabaTTSUtil();
+        AudioProcessUtil audioProcessUtil = new AudioProcessUtil();
+
+        byte[] rawPcmData = alibabaTTSUtil.generateStandardPcmData(text);
+
+        // 使用AudioProcessUtil转换成带头44字节 PCM
+        byte[] pcmData = audioProcessUtil.rawPcmToStandardWav(rawPcmData);
+
+//            String savedPath = audioProcessUtil.saveWavToFile(pcmData, "test_output.wav");
+//            if (savedPath != null) {
+//                log.info("测试文件已保存: {}", savedPath);
+//            }
+
+        // 保存WAV文件到本地
+        String savedPath = saveByteArrayToFile(pcmData, "人生观.wav");
+        if (savedPath != null) {
+            System.out.println("WAV文件已保存: " + savedPath);
+        }
+    }
+
+
+    private static String saveByteArrayToFile(byte[] data, String filename) throws IOException {
+        // 确定保存路径（可以是临时目录或指定目录）
+        String directory = System.getProperty("java.io.tmpdir"); // 使用系统临时目录
+        File dir = new File(directory);
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+
+        // 创建完整文件路径
+        File file = new File(dir, filename);
+
+        // 写入文件
+        try (FileOutputStream fos = new FileOutputStream(file)) {
+            fos.write(data);
+        }
+
+        return file.getAbsolutePath();
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java

@@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -39,7 +40,7 @@ public class AppFileController extends BaseController {
      * 上传文件
      */
     @PostMapping("/upload")
-    public R<Void> upload(@Validated @ModelAttribute AppFileDto bo) {
+    public R<Void> upload(@Validated @ModelAttribute AppFileDto bo) throws IOException {
         return toAjax(appFileService.add(bo));
     }
 

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));
     }
 
     /**
@@ -61,4 +64,5 @@ public class AppVideoController extends BaseController {
     public R<String> extract(@RequestParam("file") MultipartFile file) throws Exception {
         return R.ok("Success",audioProcessService.extract(file));
     }
+
 }

fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceHBYController.java

@@ -28,6 +28,7 @@ public class AppDeviceHBYController extends BaseController {
 
     private final DeviceBJQBizService appDeviceService;
 
+
     /**
      * 获取设备详细信息
      *

fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceXinghanController.java

@@ -38,6 +38,8 @@ public class AppDeviceXinghanController extends BaseController {
 
     private final DeviceXinghanBizService appDeviceService;
     private final DeviceService deviceService;
+
+
     /**
      * 人员信息登记
      */
@@ -67,7 +69,7 @@ public class AppDeviceXinghanController extends BaseController {
     public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
 
         MultipartFile file = bo.getFile();
-        if(file.getSize()>1024*1024*2){
+        if (file.getSize() > 1024 * 1024 * 2) {
             return R.warn("图片不能大于2M");
         }
         appDeviceService.uploadDeviceLogo(bo);
@@ -125,7 +127,7 @@ public class AppDeviceXinghanController extends BaseController {
 
     @GetMapping(value = "/typeAll")
     @Operation(summary = "查询所有设备类型")
-    public  R<List<DeviceType>> queryDeviceTypes() {
+    public R<List<DeviceType>> queryDeviceTypes() {
         List<DeviceType> deviceTypes = appDeviceService.queryDeviceTypes();
         return R.ok(deviceTypes);
     }

fys-admin/src/main/java/com/fuyuanshen/app/controller/device/bjq/AppDeviceBJQ6075Controller.java

@@ -148,7 +148,7 @@ public class AppDeviceBJQ6075Controller extends BaseController {
      */
     @GetMapping("/getShareInfo/{id}")
     public R<AppDevice6075DetailVo> getShareInfo(@NotNull(message = "主键不能为空")
-                                             @PathVariable Long id) {
+                                                 @PathVariable Long id) {
         return R.ok(appDeviceService6075.getInfo(id));
     }
 

fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java

@@ -227,7 +227,7 @@ public class AppDeviceShareService {
             appDeviceShare.setPermission(bo.getPermission());
             appDeviceShare.setCreateBy(userId);
             return appDeviceShareMapper.insert(appDeviceShare);
-        }
+}
     }
 
     public int remove(Long[] ids) {

fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java

@@ -8,6 +8,7 @@ import com.fuyuanshen.common.core.exception.ServiceException;
 import com.fuyuanshen.common.oss.core.OssClient;
 import com.fuyuanshen.common.oss.factory.OssFactory;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.equipment.utils.FileHashUtil;
 import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
@@ -15,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -31,24 +33,38 @@ public class AppFileService {
 
     private final IAppBusinessFileService appBusinessFileService;
 
+    private final FileHashUtil fileHashUtil;
+    private final ISysOssService ossService;
+
+
     public List<AppFileVo> list(AppBusinessFileBo bo) {
 //        bo.setCreateBy(AppLoginHelper.getUserId());
         return appBusinessFileService.queryAppFileList(bo);
     }
 
-    public Boolean add(AppFileDto bo) {
+
+    /**
+     * APP文件上传
+     */
+    public Boolean add(AppFileDto bo) throws IOException {
 
         MultipartFile[] files = bo.getFiles();
-        if(files == null || files.length == 0){
+        if (files == null || files.length == 0) {
             throw new ServiceException("请选择要上传的文件");
         }
-        if(files.length > 5){
+        if (files.length > 5) {
             throw new ServiceException("最多只能上传5个文件");
         }
         for (int i = 0; i < files.length; i++) {
             MultipartFile file = files[i];
             // 上传文件
-            SysOssVo upload = sysOssService.upload(file);
+            // SysOssVo upload = sysOssService.upload(file);
+            String fileHash = fileHashUtil.hash(file);
+            SysOssVo upload = ossService.updateHash(file, fileHash);
+            // 强制将HTTP替换为HTTPS
+            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
+                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
+            }
 
             if (upload == null) {
                 return false;
@@ -66,6 +82,7 @@ public class AppFileService {
         return true;
     }
 
+
     public Boolean delete(Long[] ids) {
         AppBusinessFileBo bo = new AppBusinessFileBo();
 //        bo.setCreateBy(AppLoginHelper.getUserId());
@@ -79,4 +96,5 @@ public class AppFileService {
         }
         return appBusinessFileService.deleteWithValidByIds(List.of(ids), true);
     }
+
 }

fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java

@@ -4,6 +4,11 @@ import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.app.domain.bo.AppDeviceBindRecordBo;
+import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
+import com.fuyuanshen.app.domain.vo.AppDeviceBindRecordVo;
+import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
 import com.fuyuanshen.app.domain.vo.AppRoleVo;
 import com.fuyuanshen.app.domain.vo.AppUserVo;
 import com.fuyuanshen.common.core.constant.Constants;
@@ -23,6 +28,8 @@ import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.common.tenant.exception.TenantException;
 import com.fuyuanshen.common.tenant.helper.TenantHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.service.DeviceService;
 import com.fuyuanshen.system.domain.vo.SysTenantVo;
 import com.fuyuanshen.system.service.ISysTenantService;
 import lombok.RequiredArgsConstructor;
@@ -33,6 +40,7 @@ import org.springframework.stereotype.Service;
 import java.time.Duration;
 import java.util.*;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 /**
  * 登录校验方法
@@ -52,6 +60,9 @@ public class AppLoginService {
 
     private final ISysTenantService tenantService;
     private final IAppUserService appUserService;
+    private final IAppDeviceShareService appDeviceShareService;
+    private final IAppDeviceBindRecordService appDeviceBindRecordService;
+    private final DeviceService deviceService;
 
 
     /**
@@ -188,10 +199,46 @@ public class AppLoginService {
     public void cancelAccount() {
         try {
             AppLoginUser loginUser = AppLoginHelper.getLoginUser();
+//            AppLoginUser loginUser = new AppLoginUser();
+//            loginUser.setUserId(1988398584423133187L);
+//            loginUser.setUsername("19022528079");
             if (ObjectUtil.isNull(loginUser)) {
                 return;
             }
             appUserService.deleteWithValidByIds(Collections.singletonList(loginUser.getUserId()),true);
+
+            AppDeviceBindRecordBo appDeviceBindRecordBo = new AppDeviceBindRecordBo();
+            appDeviceBindRecordBo.setBindingUserId(loginUser.getUserId());
+            List<AppDeviceBindRecordVo> appDeviceBindRecordVos = appDeviceBindRecordService.queryList(appDeviceBindRecordBo);
+            if(ObjectUtil.length(appDeviceBindRecordVos)>0){
+
+
+                Set<Long> deviceIds = appDeviceBindRecordVos.stream().map(AppDeviceBindRecordVo::getDeviceId).collect(Collectors.toSet());
+                appDeviceShareService.deleteByDeviceIds(deviceIds);
+
+
+                List<Long> ids = appDeviceBindRecordVos.stream()
+                        .map(AppDeviceBindRecordVo::getId)
+                        .collect(Collectors.toList());
+                appDeviceBindRecordService.deleteWithValidByIds(ids, true);
+                log.info("删除绑定关系表数据：ids={}",ids);
+
+
+                // 检查设备id是否存在绑定关系
+                for (Long deviceId : deviceIds){
+                    // 根据设备id查询是否存在绑定关系
+                    Long count = appDeviceBindRecordService.checkDeviceExistBindRecord(deviceId);
+                    UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+                    updateWrapper.eq("id",deviceId);
+                    if(count>0){
+                        updateWrapper.set("binding_status",1);
+                    }else{
+                        updateWrapper.set("binding_status",0);
+                    }
+                    deviceService.update(updateWrapper);
+                }
+            }
+
             if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
                 // 超级管理员 登出清除动态租户
                 TenantHelper.clearDynamic();

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;
 

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttConfiguration.java

@@ -10,22 +10,43 @@ import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
 
 @Configuration
 public class MqttConfiguration {
+
     @Autowired
     private MqttPropertiesConfig mqttPropertiesConfig;
-    /**  创建连接工厂 **/
+
+
+    /**
+     * 创建连接工厂
+     **/
     @Bean
-    public MqttPahoClientFactory mqttPahoClientFactory(){
+    public MqttPahoClientFactory mqttPahoClientFactory() {
         DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory();
         MqttConnectOptions options = new MqttConnectOptions();
-        options.setCleanSession(true); //设置新会话
-        options.setUserName(mqttPropertiesConfig.getUsername());
-        options.setPassword(mqttPropertiesConfig.getPassword().toCharArray());
-        options.setServerURIs(new String[]{mqttPropertiesConfig.getUrl()});
+        options.setCleanSession(true); // 设置新会话
+
+        // 修复用户名为null时的空指针异常
+        String username = mqttPropertiesConfig.getUsername();
+        if (username != null) {
+            options.setUserName(username);
+        }
+
+        // 修复密码为null时的空指针异常
+        String password = mqttPropertiesConfig.getPassword();
+        if (password != null) {
+            options.setPassword(password.toCharArray());
+        }
+
+        // 修复URL为null时的空指针异常
+        String url = mqttPropertiesConfig.getUrl();
+        if (url != null) {
+            options.setServerURIs(new String[]{url});
+        }
+
         options.setAutomaticReconnect(true); // 启用自动重连
         options.setConnectionTimeout(10); // 设置连接超时时间
         options.setKeepAliveInterval(60); // 设置心跳间隔
         factory.setConnectionOptions(options);
         return factory;
     }
- 
+
 }

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttInboundConfiguration.java

@@ -39,8 +39,14 @@ public class MqttInboundConfiguration {
     public MessageProducer messageProducer(){
         // 生成一个不重复的随机数
         String clientId = mqttPropertiesConfig.getSubClientId() + "_" + UUID.fastUUID();
+        // 修复URL为null时的空指针异常
+        String url = mqttPropertiesConfig.getUrl();
+        if (url == null) {
+            throw new IllegalStateException("MQTT服务器URL未配置");
+        }
+        
         MqttPahoMessageDrivenChannelAdapter mqttPahoMessageDrivenChannelAdapter = new MqttPahoMessageDrivenChannelAdapter(
-                mqttPropertiesConfig.getUrl(),
+                url,
                 clientId,
                 mqttPahoClientFactory,
                 mqttPropertiesConfig.getSubTopic().split(",")

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttOutboundConfiguration.java

@@ -15,11 +15,14 @@ import org.springframework.messaging.MessageHandler;
 @Configuration
 @Slf4j
 public class MqttOutboundConfiguration {
+
     @Autowired
     private MqttPropertiesConfig mqttPropertiesConfig;
+
     @Autowired
     private MqttPahoClientFactory mqttPahoClientFactory;
- 
+
+
     // 消息通道
     @Bean
     public MessageChannel mqttOutboundChannel(){
@@ -32,8 +35,14 @@ public class MqttOutboundConfiguration {
     @ServiceActivator(inputChannel = "mqttOutboundChannel")  // 指定处理器针对哪个通道的消息进行处理
     public MessageHandler mqttOutboundMessageHandler(){
         String clientId = mqttPropertiesConfig.getPubClientId() + "_" + UUID.fastUUID();
+        // 修复URL为null时的空指针异常
+        String url = mqttPropertiesConfig.getUrl();
+        if (url == null) {
+            throw new IllegalStateException("MQTT服务器URL未配置");
+        }
+        
         MqttPahoMessageHandler mqttPahoMessageHandler = new MqttPahoMessageHandler(
-                mqttPropertiesConfig.getUrl(),
+                url,
                 clientId,
                 mqttPahoClientFactory
         );

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/DeviceRedisKeyConstants.java

@@ -1,6 +1,7 @@
 package com.fuyuanshen.global.mqtt.constants;
 
 public class DeviceRedisKeyConstants {
+
     public static final String DEVICE_KEY_PREFIX = "device:";
     // 设备上报状态
     public static final String DEVICE_STATUS_KEY_PREFIX = ":status";
@@ -52,4 +53,5 @@ public class DeviceRedisKeyConstants {
      * 告警信息
      */
     public static final String DEVICE_ALARM_MESSAGE_KEY_PREFIX = ":alarmMessage";
+
 }

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/LightingCommandTypeConstants.java

@@ -36,7 +36,6 @@ public class LightingCommandTypeConstants {
      */
     public static final String SEND_MESSAGE = "Light_6";
 
-
     /**
      * 报警模式
      */

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqAlarmRule.java

@@ -57,12 +57,12 @@ public class BjqAlarmRule implements MqttMessageRule {
             if (StringUtils.isNotBlank(convertValue)) {
                 // 将设备状态信息存储到Redis中
                 String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX;
-                String sendMessageIng = GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
+                String sendMessageIng = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
                 if ("1".equals(convertValue)) {
                     RedisUtils.setCacheObject(sendMessageIng, "1", Duration.ofDays(1));
                     // 存储到Redis
                     RedisUtils.setCacheObject(deviceRedisKey, "1");
-                }else if ("0".equals(convertValue)){
+                } else if ("0".equals(convertValue)) {
                     RedisUtils.deleteObject(sendMessageIng);
                     RedisUtils.deleteObject(deviceRedisKey);
                 }

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLaserModeSettingsRule.java

@@ -71,5 +71,4 @@ public class BjqLaserModeSettingsRule implements MqttMessageRule {
     }
 
 
-
 }

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqModeRule.java

@@ -45,6 +45,7 @@ public class BjqModeRule implements MqttMessageRule {
         return LightingCommandTypeConstants.LIGHT_MODE;
     }
 
+
     @Override
     public void execute(MqttRuleContext context) {
         String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqPersonnelInfoDataRule.java

@@ -1,32 +1,18 @@
 package com.fuyuanshen.global.mqtt.rule.bjq;
 
-import com.alibaba.fastjson2.JSONObject;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.core.utils.StringUtils;
-import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.equipment.utils.map.GetAddressFromLatUtil;
-import com.fuyuanshen.equipment.utils.map.LngLonUtil;
 import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
 import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
 import com.fuyuanshen.global.mqtt.config.MqttGateway;
-import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
-import com.fuyuanshen.global.mqtt.constants.MqttConstants;
 import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.time.Duration;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
 
 import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
 
 /**
  * 定位数据命令处理
@@ -55,4 +41,5 @@ public class BjqPersonnelInfoDataRule implements MqttMessageRule {
             RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(30));
         }
     }
+
 }

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanDeviceDataRule.java

@@ -1,8 +1,13 @@
 package com.fuyuanshen.global.mqtt.rule.xinghan;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson2.JSONObject;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import com.alibaba.fastjson2.JSONWriter;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.core.utils.StringUtils;
@@ -10,11 +15,20 @@ import com.fuyuanshen.common.core.utils.date.DurationUtils;
 import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
 import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceFenceAccessRecord;
+import com.fuyuanshen.equipment.domain.DeviceGeoFence;
 import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
+import com.fuyuanshen.equipment.domain.bo.DeviceFenceAccessRecordBo;
 import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.domain.vo.DeviceGeoFenceVo;
 import com.fuyuanshen.equipment.mapper.DeviceAlarmMapper;
+import com.fuyuanshen.equipment.mapper.DeviceFenceAccessRecordMapper;
+import com.fuyuanshen.equipment.mapper.DeviceGeoFenceMapper;
 import com.fuyuanshen.equipment.service.DeviceService;
 import com.fuyuanshen.equipment.service.IDeviceAlarmService;
+import com.fuyuanshen.equipment.service.IDeviceFenceAccessRecordService;
+import com.fuyuanshen.equipment.service.IDeviceGeoFenceService;
+import com.fuyuanshen.equipment.utils.map.AmapTrackUtil;
 import com.fuyuanshen.equipment.utils.map.GetAddressFromLatUtil;
 import com.fuyuanshen.equipment.utils.map.LngLonUtil;
 import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
@@ -30,13 +44,16 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.text.DecimalFormat;
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
 import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
@@ -72,6 +89,12 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
     private final IDeviceAlarmService deviceAlarmService;
     private final DeviceService deviceService;
     private final DeviceAlarmMapper deviceAlarmMapper;
+    private final AmapTrackUtil amapTrackUtil;
+    private final IDeviceFenceAccessRecordService deviceFenceAccessRecordService;
+    private final DeviceFenceAccessRecordMapper deviceFenceAccessRecordMapper;
+    private final DeviceGeoFenceMapper deviceGeoFenceMapper;
+    /** 位置未发生明显变化的距离阈值（米），可通过配置中心动态调整 */
+    private final double MOVEMENT_THRESHOLD_METER = 10.0;
 
     @Override
     public void execute(MqttRuleContext context) {
@@ -127,16 +150,20 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
      * 入口：保存报警（SOS 与 Shake 完全独立）
      */
     public void saveAlarm(String deviceImei, MqttXinghanJson status) {
-        int sos = Optional.ofNullable(status.getStaSOSGrade()).orElse(0);
-        // 1. 处理 SOS 报警
-        handleSingleAlarm(deviceImei,
-                sos > 0,
-                AlarmTypeEnum.SOS);
-        int shake = Optional.ofNullable(status.getStaShakeBit()).orElse(0);
-        // 2. 处理 Shake 报警
-        handleSingleAlarm(deviceImei,
-                shake > 0,
-                AlarmTypeEnum.SHAKE);
+        try {
+            int sos = Optional.ofNullable(status.getStaSOSGrade()).orElse(0);
+            // 1. 处理 SOS 报警
+            handleSingleAlarm(deviceImei,
+                    sos > 0,
+                    AlarmTypeEnum.SOS);
+            int shake = Optional.ofNullable(status.getStaShakeBit()).orElse(0);
+            // 2. 处理 Shake 报警
+            handleSingleAlarm(deviceImei,
+                    shake > 0,
+                    AlarmTypeEnum.SHAKE);
+        } catch (Exception e) {
+            log.error("异步保存报警（SOS 与 Shake 完全独立）报错: device={}, error={}", deviceImei, e.getMessage(), e);
+        }
     }
 
     /**
@@ -236,7 +263,7 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
         String location = RedisUtils.getCacheObject(
                 GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + deviceImei + DEVICE_LOCATION_KEY_PREFIX);
         if (StrUtil.isNotBlank(location)) {
-            bo.setLocation(JSONObject.parseObject(location).getString("address"));
+            bo.setLocation(com.alibaba.fastjson2.JSONObject.parseObject(location).getString("address"));
         }
         return bo;
     }
@@ -259,63 +286,312 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
     public void asyncSendLocationToRedisWithFuture(String deviceImei, String latitude, String longitude) {
         CompletableFuture.runAsync(() -> {
             try {
-                if(StringUtils.isBlank(latitude) || StringUtils.isBlank(longitude)){
+                if (StringUtils.isAnyBlank(deviceImei, latitude, longitude)) {
+                    log.warn("位置上报参数为空，deviceImei={}", deviceImei);
+                    return;
+                }
+                //log.info("位置上报，deviceImei={}, lat={}, lon={}", deviceImei, latitude, longitude);
+                // 1. 解析当前上报的经纬度
+                Double curLat = parseDoubleSafe(latitude.trim());
+                Double curLon = parseDoubleSafe(longitude.trim());
+                if (curLat == null || curLon == null) {
+                    log.warn("经纬度格式错误，直接更新，deviceImei={}, lat={}, lon={}", deviceImei, latitude, longitude);
+                    doSaveLocation(deviceImei, latitude, longitude);
                     return;
                 }
-                String[] latArr = latitude.split("\\.");
-                String[] lonArr = longitude.split("\\.");
-                // 将位置信息存储到Redis中
-                String redisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+  deviceImei + DEVICE_LOCATION_KEY_PREFIX;
-                String redisObj = RedisUtils.getCacheObject(redisKey);
-                JSONObject jsonOBj = JSONObject.parseObject(redisObj);
-                if(jsonOBj != null){
-                    String str1 = latArr[0] +"."+ latArr[1].substring(0,4);
-                    String str2 = lonArr[0] +"."+ lonArr[1].substring(0,4);
 
-                    String cacheLatitude = jsonOBj.getString("wgs84_latitude");
-                    String cacheLongitude = jsonOBj.getString("wgs84_longitude");
-                    String[] latArr1 = cacheLatitude.split("\\.");
-                    String[] lonArr1 = cacheLongitude.split("\\.");
+                // 2. 读取 Redis 中缓存的上一次位置
+                String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + deviceImei + DEVICE_LOCATION_KEY_PREFIX;
+                String cachedJson = RedisUtils.getCacheObject(redisKey);
 
-                    String cacheStr1 = latArr1[0] +"."+ latArr1[1].substring(0,4);
-                    String cacheStr2 = lonArr1[0] +"."+ lonArr1[1].substring(0,4);
-                    if(str1.equals(cacheStr1) && str2.equals(cacheStr2)){
-                        log.info("位置信息未发生变化: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
-                        return;
+                if (StringUtils.isNotBlank(cachedJson)) {
+                    com.alibaba.fastjson2.JSONObject cachedObj = com.alibaba.fastjson2.JSONObject.parseObject(cachedJson);
+                    String cachedWgs84Lat = cachedObj.getString("wgs84_latitude");
+                    String cachedWgs84Lon = cachedObj.getString("wgs84_longitude");
+
+                    Double oldLat = parseDoubleSafe(cachedWgs84Lat);
+                    Double oldLon = parseDoubleSafe(cachedWgs84Lon);
+
+                    if (oldLat != null && oldLon != null) {
+                        double distance = haversine(oldLat, oldLon, curLat, curLon);
+                        if (distance <= MOVEMENT_THRESHOLD_METER) {
+                            log.info("位置未发生明显变化（{}米 <= {}米），不更新 Redis，deviceImei={}, lat={}, lon={}",
+                                    distance, MOVEMENT_THRESHOLD_METER, deviceImei, latitude, longitude);
+                            return;
+                        }
                     }
                 }
 
-                // 构造位置信息对象
-                Map<String, Object> locationInfo = new LinkedHashMap<>();
-                double[] doubles = LngLonUtil.gps84_To_Gcj02(Double.parseDouble(latitude), Double.parseDouble(longitude));
-                locationInfo.put("deviceImei", deviceImei);
-                locationInfo.put("latitude", doubles[0]);
-                locationInfo.put("longitude", doubles[1]);
-                locationInfo.put("wgs84_latitude", latitude);
-                locationInfo.put("wgs84_longitude", longitude);
-                String address = GetAddressFromLatUtil.getAdd(String.valueOf(doubles[1]), String.valueOf(doubles[0]));
-                locationInfo.put("address", address);
-                locationInfo.put("timestamp", System.currentTimeMillis());
+                // 3. 位置有明显变化，执行保存
+                doSaveLocation(deviceImei, latitude, longitude);
 
-
-
-                String locationJson = JsonUtils.toJsonString(locationInfo);
-
-                // 存储到Redis
-                RedisUtils.setCacheObject(redisKey, locationJson);
-
-                // 存储到一个列表中，保留历史位置信息
-//                String locationHistoryKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_LOCATION_HISTORY_KEY_PREFIX + deviceImei;
-//                RedisUtils.addCacheList(locationHistoryKey, locationJson);
-//                RedisUtils.expire(locationHistoryKey, Duration.ofDays(90));
-                storeDeviceTrajectoryWithSortedSet(deviceImei, locationJson);
-                log.info("位置信息已异步发送到Redis: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
             } catch (Exception e) {
-                log.error("异步发送位置信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+                log.error("异步发送位置信息到 Redis 失败，deviceImei={}", deviceImei, e);
             }
         });
     }
 
+    /** 真正执行保存逻辑（抽取出来便于测试和阅读） */
+    private void doSaveLocation(String deviceImei, String wgs84Lat, String wgs84Lon) {
+
+//        Map<String, Object> locationInfo = new LinkedHashMap<>();
+//        locationInfo.put("deviceImei", deviceImei);
+//        locationInfo.put("latitude", gcj02[0]);      // GCJ02 纬度
+//        locationInfo.put("longitude", gcj02[1]);     // GCJ02 经度
+//        locationInfo.put("wgs84_latitude", wgs84Lat);
+//        locationInfo.put("wgs84_longitude", wgs84Lon);
+//
+//
+//        locationInfo.put("address", StringUtils.defaultIfBlank(address, "未知"));
+//        locationInfo.put("timestamp", System.currentTimeMillis());
+//
+//        String locationJson = JsonUtils.toJsonString(locationInfo);
+        //  使用 fastjson2 零 GC 序列化
+        //  WGS84 → GCJ02（火星坐标）
+        double[] gcj02 = LngLonUtil.gps84_To_Gcj02(
+                Double.parseDouble(wgs84Lat),
+                Double.parseDouble(wgs84Lon)
+        );
+
+        String gcj02Lat = String.format("%.6f", gcj02[0]);
+        String gcj02Lon = String.format("%.6f", gcj02[1]);
+
+        // 逆地理编码（可自行决定是否异步）
+        String address = GetAddressFromLatUtil.getAdd(gcj02Lon, gcj02Lat);
+
+        String locationJson = buildLocationJsonFastJSON2(deviceImei, wgs84Lat, wgs84Lon, gcj02Lon, gcj02Lat,address);
+
+        // 主位置信息（最新一条）
+        String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + deviceImei + DEVICE_LOCATION_KEY_PREFIX;
+        RedisUtils.setCacheObject(redisKey, locationJson);
+
+        // 轨迹存储（SortedSet，按时间戳排序）
+        storeDeviceTrajectoryWithSortedSet(deviceImei, locationJson);
+        // 轨迹上传 查询检测对象与围栏关系  记录设备进出围栏事件
+        uploadTrackPointAsync(deviceImei, gcj02Lat, gcj02Lon, address);
+
+        log.info("位置信息已更新 Redis，deviceImei={}, wgs84=({},{})", deviceImei, wgs84Lat, wgs84Lon);
+    }
+
+    private String buildLocationJsonFastJSON2(
+            String deviceImei,
+            String wgs84Lat, String wgs84Lon,
+            String gcj02Lon, String gcj02Lat,String address) {
+        long timestamp = System.currentTimeMillis();
+
+
+        // 直接用默认 writer，零配置，自动零 GC
+        try (JSONWriter w = JSONWriter.of()) {
+            w.startObject();
+            w.writeString("deviceImei"); w.writeColon(); w.writeString(deviceImei); w.writeComma();
+            w.writeString("latitude");   w.writeColon(); w.writeString(gcj02Lat); w.writeComma();
+            w.writeString("longitude");  w.writeColon(); w.writeString(gcj02Lon); w.writeComma();
+            w.writeString("wgs84_latitude"); w.writeColon(); w.writeString(wgs84Lat); w.writeComma();
+            w.writeString("wgs84_longitude"); w.writeColon(); w.writeString(wgs84Lon); w.writeComma();
+            w.writeString("address");    w.writeColon(); w.writeString(StringUtils.defaultIfBlank(address, "未知")); w.writeComma();
+            w.writeString("timestamp");  w.writeColon(); w.writeInt64(timestamp);
+            w.endObject();
+            return w.toString();
+        }
+    }
+
+    /**
+     * 上传轨迹点并处理电子围栏出入事件（高德猎鹰服务）
+     * 优化点：
+     * 1. 避免重复查询数据库（围栏信息批量缓存）
+     * 2. 防御性编程：全面空指针防护
+     * 3. Redis 操作原子性 + 合理 TTL
+     * 4. 减少不必要的对象创建和流操作
+     * 5. 精确的事件时间使用 locationTime
+     * 6. 失败不阻塞主流程，记录关键错误
+     */
+    private void uploadTrackPointAsync(String deviceImei,
+                                       String gcj02Lat,
+                                       String gcj02Lon,String address) {
+
+        if (StrUtil.hasBlank(deviceImei, gcj02Lat, gcj02Lon)) {
+            log.warn("上传轨迹点参数非法，deviceImei={}, lat={}, lon={}", deviceImei, gcj02Lat, gcj02Lon);
+            return;
+        }
+        long locationTime = System.currentTimeMillis();
+        String fenceStatusKey = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + deviceImei + ":terminal:status";
+
+        try {
+            // 1. 查询设备信息（建议加缓存，热点设备可大幅降低DB压力）
+            Device device = deviceService.selectDeviceByImei(deviceImei);
+            if (device == null || device.getSid() == null || device.getTid() == null) {
+                log.warn("设备不存在或未完成高德终端创建，imei={}", deviceImei);
+                return;
+            }
+
+            Long trid = ObjectUtil.defaultIfNull(device.getTrid(), 0L); // trid 可能为空
+
+            // 2. 上传轨迹点
+            JSONObject point = new JSONObject();
+            point.set("location", String.format("%s,%s", gcj02Lon, gcj02Lat));
+            point.set("locatetime", locationTime);
+
+            JSONArray pointsArray = new JSONArray();
+            pointsArray.add(point);
+            log.info("上传轨迹点开始，deviceImei={}, point={}", deviceImei, point);
+            JSONObject uploadResult = amapTrackUtil.uploadPoints(device.getSid(), device.getTid(), trid, pointsArray);
+            if (uploadResult == null || uploadResult.getInt("errcode", -1) != 10000) {
+                return;
+            }
+            log.info("上传轨迹点成功，deviceImei={}, result={}", deviceImei, uploadResult);
+            // 3. 查询当前围栏状态
+            JSONObject fenceResult = amapTrackUtil.queryTerminalFenceStatus(device.getSid(), null, device.getTid());
+            if (fenceResult == null || fenceResult.getInt("errcode", -1) != 10000) {
+                log.warn("查询设备围栏状态失败，imei={}, result={}", deviceImei, fenceResult);
+                return;
+            }
+            log.info("查询设备围栏状态成功，imei={}, result={}", deviceImei, fenceResult);
+            JSONArray results = fenceResult.getByPath("data.results", JSONArray.class);
+            if (results == null || results.isEmpty()) {
+                // 没有任何围栏关系，清空旧状态
+                RedisUtils.deleteObject(fenceStatusKey);
+                return;
+            }
+
+            // 4. 当前在围栏内的 gfid 集合
+            Set<Long> newInFenceGfids = new HashSet<>();
+            List<JSONObject> currentInList = new ArrayList<>();
+
+            for (Object obj : results) {
+                JSONObject item = (JSONObject) obj;
+                if (item.getInt("in", 0) == 1) {
+                    Long gfid = item.getLong("gfid");
+                    if (gfid != null) {
+                        newInFenceGfids.add(gfid);
+                        currentInList.add(item);
+                    }
+                }
+            }
+
+            // 5. 获取上一次的围栏状态
+            List<JSONObject> oldInList = RedisUtils.getCacheObject(fenceStatusKey);
+            Set<Long> oldInFenceGfids = (oldInList == null || oldInList.isEmpty())
+                    ? Collections.emptySet()
+                    : oldInList.stream()
+                    .map(o -> o.getLong("gfid"))
+                    .collect(Collectors.toSet());
+
+            // 6. 计算出入事件（使用高效的 Set 操作）
+            Set<Long> enteredGfids = new HashSet<>(newInFenceGfids);
+            enteredGfids.removeAll(oldInFenceGfids);// 进入：这次有，上次没有
+
+            Set<Long> exitedGfids = new HashSet<>(oldInFenceGfids);
+            exitedGfids.removeAll(newInFenceGfids);// 离开：上次有，这次没有
+
+            Date eventTime = new Date(locationTime);
+            Double latitude = Double.valueOf(gcj02Lat);
+            Double longitude = Double.valueOf(gcj02Lon);
+
+            // 批量查询围栏信息（关键优化：避免 N+1 查询）
+            Set<Long> allChangedGfids = new HashSet<>();
+            allChangedGfids.addAll(enteredGfids);
+            allChangedGfids.addAll(exitedGfids);
+
+            Map<Long, DeviceGeoFenceVo> fenceMap = new HashMap<>();
+            if (CollUtil.isNotEmpty(allChangedGfids)) {
+                List<DeviceGeoFenceVo> fenceList = deviceGeoFenceMapper.selectVoList(
+                        new LambdaQueryWrapper<DeviceGeoFence>().in(DeviceGeoFence::getGfid, allChangedGfids));
+                fenceMap = fenceList.stream()
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toMap(DeviceGeoFenceVo::getGfid, v -> v, (a, b) -> a));
+            }
+
+            // 7. 记录进入事件
+            if (CollUtil.isNotEmpty(enteredGfids)) {
+                List<DeviceFenceAccessRecord> enterRecords = new ArrayList<>();
+                for (Long gfid : enteredGfids) {
+                    DeviceFenceAccessRecord record = buildFenceRecord(device, fenceMap.get(gfid), 1L, latitude, longitude, eventTime, address);
+                    if (record != null) {
+                        enterRecords.add(record);
+                    }
+                }
+                deviceFenceAccessRecordMapper.insertBatch(enterRecords);
+                log.info("设备进入围栏，imei={}, gfids={}", deviceImei, enteredGfids);
+            }
+
+            // 8. 记录离开事件
+            if (CollUtil.isNotEmpty(exitedGfids)) {
+                List<DeviceFenceAccessRecord> exitRecords = new ArrayList<>();
+                for (Long gfid : exitedGfids) {
+                    DeviceFenceAccessRecord record = buildFenceRecord(device, fenceMap.get(gfid), 2L, latitude, longitude, eventTime, address);
+                    if (record != null) {
+                        exitRecords.add(record);
+                    }
+                }
+                deviceFenceAccessRecordMapper.insertBatch(exitRecords);
+                log.info("设备离开围栏，imei={}, gfids={}", deviceImei, exitedGfids);
+            }
+
+            // 9. 更新 Redis 状态（TTL 5分钟，防止频繁查询）
+            if (CollUtil.isNotEmpty(currentInList)) {
+                RedisUtils.setCacheObject(fenceStatusKey, currentInList, Duration.ofMinutes(5));
+            } else {
+                RedisUtils.deleteObject(fenceStatusKey);
+            }
+
+        } catch (Exception e) {
+            log.error("上传轨迹点并处理围栏事件异常，imei={}, lat={}, lon={}, time={}",
+                    deviceImei, gcj02Lat, gcj02Lon, locationTime, e);
+            // 可落库待重试或发告警，此处不抛异常影响定位主流程
+        }
+    }
+
+    /**
+     * 构建围栏出入记录（提取公共逻辑，避免重复代码）
+     */
+    private DeviceFenceAccessRecord buildFenceRecord(Device device,
+                                                       DeviceGeoFenceVo fence,
+                                                       Long eventType,
+                                                       Double latitude,
+                                                       Double longitude,
+                                                       Date eventTime,String address) {
+        if (fence == null || fence.getId() == null) {
+            log.warn("围栏信息不存在，gfid 可能已被删除或未绑定");
+            return null;
+        }
+        DeviceFenceAccessRecord bo = new DeviceFenceAccessRecord();
+        bo.setDeviceId(device.getId().toString());
+        bo.setFenceId(fence.getId());
+        bo.setEventType(eventType);        // 1=进入, 2=离开
+        bo.setAccuracy(20L);
+        bo.setLatitude(latitude);
+        bo.setLongitude(longitude);
+        bo.setEventTime(eventTime);
+        bo.setTenantId(device.getTenantId());
+        bo.setCreateBy(device.getCreateBy());
+        bo.setCreateDept(device.getCreateDept());
+        bo.setEventAddress(address);
+        return bo;
+    }
+
+    /** 安全解析 double，解析失败返回 null */
+    private Double parseDoubleSafe(String str) {
+        if (StringUtils.isBlank(str)) return null;
+        try {
+            return Double.parseDouble(str.trim());
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+
+    /** Haversine 公式计算两点球面距离（米） */
+    private double haversine(double lat1, double lon1, double lat2, double lon2) {
+        double dLat = Math.toRadians(lat2 - lat1);
+        double dLon = Math.toRadians(lon2 - lon1);
+        double a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+                Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2)) *
+                        Math.sin(dLon / 2) * Math.sin(dLon / 2);
+        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+        /** 地球平均半径（米） */
+        double EARTH_RADIUS = 6371_393.0;
+        return EARTH_RADIUS * c;
+    }
+
     /**
      * 存储设备30天历史轨迹到Redis (使用Sorted Set)
      */
@@ -358,4 +634,6 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
         return map;
     }
 
+
+
 }

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);
+                }, 2, 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;

fys-admin/src/main/java/com/fuyuanshen/global/queue/MqttMessageConsumer.java

@@ -27,11 +27,12 @@ public class MqttMessageConsumer {
 
     @Autowired
     private DeviceMapper deviceMapper;
-    
+
     // 创建两个线程池：一个用于消息获取，一个用于业务处理
     private ExecutorService messageConsumerPool = Executors.newFixedThreadPool(3);
     private ExecutorService messageProcessorPool = Executors.newFixedThreadPool(10);
 
+
     // 初始化方法，启动消息监听
     @PostConstruct
     public void start() {
@@ -130,4 +131,5 @@ public class MqttMessageConsumer {
             log.error("业务处理线程 {} 处理消息时发生错误: {}", threadName, message, e);
         }
     }
+
 }

fys-admin/src/main/java/com/fuyuanshen/global/queue/OnlineStatusTask.java

@@ -22,6 +22,8 @@ public class OnlineStatusTask {
 
     @Autowired
     private DeviceMapper deviceMapper;
+
+
     // 使用cron表达式，每分钟的第0秒执行
     @Scheduled(cron = "0 */3 * * * ?")
     public void cronTask() {
@@ -37,4 +39,5 @@ public class OnlineStatusTask {
             }
         });
     }
+
 }

fys-admin/src/main/java/com/fuyuanshen/web/controller/AuthController.java

@@ -101,13 +101,13 @@ public class AuthController {
         // 登录
         LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
 
-        Long userId = LoginHelper.getUserId();
-        scheduledExecutorService.schedule(() -> {
-            SseMessageDto dto = new SseMessageDto();
-            dto.setMessage("欢迎登录fys-Vue-Plus后台管理系统");
-            dto.setUserIds(List.of(userId));
-            SseMessageUtils.publishMessage(dto);
-        }, 5, TimeUnit.SECONDS);
+//        Long userId = LoginHelper.getUserId();
+//        scheduledExecutorService.schedule(() -> {
+//            SseMessageDto dto = new SseMessageDto();
+//            dto.setMessage("欢迎登录fys-Vue-Plus后台管理系统");
+//            dto.setUserIds(List.of(userId));
+//            SseMessageUtils.publishMessage(dto);
+//        }, 5, TimeUnit.SECONDS);
         return R.ok(loginVo);
     }
 

fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java

@@ -157,4 +157,4 @@ public class CaptchaController {
         return captchaVo;
     }
 
-}
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java

@@ -98,6 +98,7 @@ public class DeviceControlCenterController extends BaseController {
         return R.ok(appDeviceService.getDeviceInfo(deviceMac));
     }
 
+
     /**
      * 指令下发记录
      */
@@ -106,6 +107,7 @@ public class DeviceControlCenterController extends BaseController {
         return appDeviceService.getInstructionRecord(dto, pageQuery);
     }
 
+
     /**
      * 导出
      */

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceFenceAccessRecordController.java

@@ -59,6 +59,7 @@ public class DeviceFenceAccessRecordController extends BaseController {
         ExcelUtil.exportExcel(list, "围栏进出记录", DeviceFenceAccessRecordVo.class, response);
     }
 
+
     /**
      * 获取围栏进出记录详细信息
      *

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceGeoFenceController.java

@@ -3,6 +3,7 @@ package com.fuyuanshen.web.controller.device.fence;
 import java.util.List;
 
 import com.fuyuanshen.equipment.domain.bo.DeviceGeoFenceBo;
+import com.fuyuanshen.equipment.domain.bo.FenceTerminalBo;
 import com.fuyuanshen.equipment.domain.dto.FenceCheckResponse;
 import com.fuyuanshen.equipment.domain.query.FenceCheckRequest;
 import com.fuyuanshen.equipment.domain.vo.DeviceGeoFenceVo;
@@ -102,6 +103,7 @@ public class DeviceGeoFenceController extends BaseController {
         return toAjax(deviceGeoFenceService.updateByBo(bo));
     }
 
+
     /**
      * 删除电子围栏
      *
@@ -129,4 +131,26 @@ public class DeviceGeoFenceController extends BaseController {
         return ResponseEntity.ok(response);
     }
 
+
+    /**
+     * 添加电子围栏终端
+     *
+     * @param bo
+     * @return
+     */
+    @PostMapping("/addTerminal")
+    public R<Void> addFenceTerminal(@RequestBody FenceTerminalBo bo) {
+        return toAjax(deviceGeoFenceService.addFenceTerminal(bo));
+    }
+    /**
+     * 删除电子围栏终端
+     *
+     * @param bo
+     * @return
+     */
+    @PostMapping("/delTerminal")
+    public R<Void> delFenceTerminal(@RequestBody FenceTerminalBo bo) {
+        return toAjax(deviceGeoFenceService.delFenceTerminal(bo));
+    }
+
 }

fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBJQ6075BizService.java

@@ -69,6 +69,12 @@ public interface DeviceBJQ6075BizService {
      */
     public void recordDeviceLog(Long deviceId, String deviceName, String deviceAction, String content, Long operator);
 
+    /**
+     * 注册人员信息
+     *
+     * @param bo 参数
+     * @return 结果
+     */
     public boolean registerPersonInfo(AppPersonnelInfoBo bo);
 
     public void uploadDeviceLogo2(AppDeviceLogoUploadDto bo);

fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java

@@ -739,6 +739,7 @@ public class DeviceXinghanBizService {
         device.setCreateByName(loginUser.getNickname());
         device.setTypeName(deviceTypes.getTypeName());
         device.setDeviceType(deviceTypes.getId());
+        device.setDevicePic(deviceTypes.getDevicePic());
         if (device.getDeviceImei() != null) {
             device.setPubTopic("A/" + device.getDeviceImei());
             device.setSubTopic("B/" + device.getDeviceImei());

fys-admin/src/main/java/com/fuyuanshen/web/service/impl/DeviceBJQ6075BizServiceImpl.java

@@ -251,6 +251,12 @@ public class DeviceBJQ6075BizServiceImpl implements DeviceBJQ6075BizService {
     }
 
 
+    /**
+     * 注册人员信息
+     *
+     * @param bo
+     * @return
+     */
     @Override
     public boolean registerPersonInfo(AppPersonnelInfoBo bo) {
         Long deviceId = bo.getDeviceId();
@@ -264,7 +270,7 @@ public class DeviceBJQ6075BizServiceImpl implements DeviceBJQ6075BizService {
         QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
                 .eq("device_id", deviceId);
         List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
-//        unitName,position,name,id
+        // 生成固定长度的点阵数据
         byte[] unitName = generateFixedBitmapData(bo.getUnitName(), 120);
         byte[] position = generateFixedBitmapData(bo.getPosition(), 120);
         byte[] name = generateFixedBitmapData(bo.getName(), 120);

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);
+        }
+    }
 }

fys-admin/src/main/resources/application-prod.yml

@@ -55,32 +55,32 @@ spring:
           url: jdbc:mysql://47.120.79.150:3306/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
           password: Jq_123456#
-#        # 从库数据源
-#        slave:
-#          lazy: true
-#          type: ${spring.datasource.type}
-#          driverClassName: com.mysql.cj.jdbc.Driver
-#          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-#          username:
-#          password:
-#        oracle:
-#          type: ${spring.datasource.type}
-#          driverClassName: oracle.jdbc.OracleDriver
-#          url: jdbc:oracle:thin:@//localhost:1521/XE
-#          username: ROOT
-#          password: root
-#        postgres:
-#          type: ${spring.datasource.type}
-#          driverClassName: org.postgresql.Driver
-#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
-#          username: root
-#          password: root
-#        sqlserver:
-#          type: ${spring.datasource.type}
-#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
-#          username: SA
-#          password: root
+      #        # 从库数据源
+      #        slave:
+      #          lazy: true
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.mysql.cj.jdbc.Driver
+      #          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          username:
+      #          password:
+      #        oracle:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: oracle.jdbc.OracleDriver
+      #          url: jdbc:oracle:thin:@//localhost:1521/XE
+      #          username: ROOT
+      #          password: root
+      #        postgres:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: org.postgresql.Driver
+      #          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+      #          username: root
+      #          password: root
+      #        sqlserver:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+      #          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
+      #          username: SA
+      #          password: root
       hikari:
         # 最大连接池数量
         maxPoolSize: 20
@@ -283,8 +283,8 @@ mqtt:
   password: #YtvpSfCNG
   url: tcp://47.120.79.150:3883
   subClientId: fys_subClient
-  subTopic: A/#
-  pubTopic: B/#
+  subTopic: A/#,status/tenantCode/#,report/tenantCode/#
+  pubTopic: B/#,command/tenantCode/#
   pubClientId: fys_pubClient
 
 # TTS语音交互配置

fys-admin/src/main/resources/application-test.yml

@@ -269,4 +269,4 @@ justauth:
       server-url: https://demo.gitea.com
       client-id: 10**********6
       client-secret: 1f7d08**********5b7**********29e
-      redirect-uri: ${justauth.address}/social-callback?source=gitea
+      redirect-uri: ${justauth.address}/social-callback?source=gitea

fys-admin/src/main/resources/application.yml

@@ -69,9 +69,9 @@ spring:
   servlet:
     multipart:
       # 单个文件大小
-      max-file-size: 10MB
+      max-file-size: 100MB
       # 设置总上传的文件大小
-      max-request-size: 20MB
+      max-request-size: 200MB
   mvc:
     # 设置静态资源路径 防止所有请求都去查静态资源
     static-path-pattern: /static/**
@@ -132,6 +132,8 @@ tenant:
     - app_menu
     - app_user_role
     - app_role_menu
+    - track_service
+    - device_fence_terminal
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/SystemConstants.java

@@ -77,4 +77,9 @@ public interface SystemConstants {
      */
     String ROOT_DEPT_ANCESTORS = "0";
 
+    /**
+     * 菜单ID
+     */
+    public static final Long RESTRICTED_MENU_ID = 102L;
+
 }

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/Bitmap80x12Generator.java

@@ -27,14 +27,14 @@ public class Bitmap80x12Generator {
         BufferedImage image = convertByteArrayToImage(bytes, 12, 80);
         ImageIO.write(image, "PNG", new File("D:\\bitmap_preview.png"));
         System.out.println("成功生成预览图片: D:\\bitmap_preview.png");
-        
+
         // 打印十六进制数据
 //        System.out.println("生成的点阵数据2:");
 //        printHexData(bitmapData);
 //        int[] ints = convertHexToDecimal(bitmapData);
-        System.out.println("打印十进制无符号:"+Arrays.toString(ints));
+        System.out.println("打印十进制无符号:" + Arrays.toString(ints));
 //        printDecimalData(bitmapData);
-        
+
         // 生成C文件
         generateCFile(bitmapData, "bitmap_data.c", "chinese_text");
     }
@@ -125,7 +125,7 @@ public class Bitmap80x12Generator {
         System.out.println();
     }
 
-    public static void  buildArr(int[]  data,List<Integer> intData){
+    public static void buildArr(int[] data, List<Integer> intData) {
         for (int datum : data) {
             intData.add(datum);
         }
@@ -133,8 +133,8 @@ public class Bitmap80x12Generator {
 
     /**
      * 生成固定长度的点阵数据
-     * 
-     * @param text 要转换的文本
+     *
+     * @param text        要转换的文本
      * @param fixedLength 固定长度(字节)
      * @return 固定长度的点阵数据
      */
@@ -157,10 +157,11 @@ public class Bitmap80x12Generator {
         int copyLength = Math.min(rawData.length, fixedLength);
         System.arraycopy(rawData, 0, result, 0, copyLength);
         // 剩余部分自动初始化为0
-        
+
         return result;
     }
 
+
     /**
      * 创建文本图像
      */
@@ -185,14 +186,14 @@ public class Bitmap80x12Generator {
 
         // 获取字体度量
         FontMetrics metrics = g.getFontMetrics();
-        
+
         // 计算文本绘制位置(居中)
         int textWidth = metrics.stringWidth(text);
 //        int x = Math.max(0, (width - textWidth) / 2); // 水平居中
         // 左对齐
         int x = 0;
         int y = (height - metrics.getHeight()) / 2 + metrics.getAscent(); // 垂直居中
-        
+
         // 绘制文本
         g.drawString(text, x, y);
 
@@ -242,6 +243,7 @@ public class Bitmap80x12Generator {
         return byteListToArray(byteList);
     }
 
+
     public static byte[] byteListToArray(List<Byte> byteList) {
         byte[] result = new byte[byteList.size()];
         for (int i = 0; i < byteList.size(); i++) {
@@ -282,7 +284,7 @@ public class Bitmap80x12Generator {
                     }
                 }
                 bitIndex++;
-                
+
                 // 如果已经处理完所有像素，则退出
                 if (bitIndex >= width * height) {
                     return image;
@@ -313,6 +315,7 @@ public class Bitmap80x12Generator {
         sb.append("\n};");
         return sb.toString();
     }
+
     /**
      * 打印十六进制数据
      */
@@ -320,7 +323,7 @@ public class Bitmap80x12Generator {
         for (int i = 0; i < data.length; i++) {
             int value = data[i] & 0xFF;
             System.out.printf("0x%02X", value);
-            
+
             if (i < data.length - 1) {
                 System.out.print(", ");
                 if ((i + 1) % 12 == 0) System.out.println();
@@ -348,6 +351,7 @@ public class Bitmap80x12Generator {
         }
     }
 
+
     private static void writeByteArray(FileWriter writer, byte[] data) throws IOException {
         for (int i = 0; i < data.length; i++) {
             int value = data[i] & 0xFF;
@@ -359,4 +363,6 @@ public class Bitmap80x12Generator {
             }
         }
     }
+
+
 }

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/file/ImageCompressUtil.java

@@ -0,0 +1,289 @@
+package com.fuyuanshen.common.core.utils.file;
+
+import lombok.extern.slf4j.Slf4j;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Iterator;
+
+/**
+ * 图片压缩工具类
+ *
+ * @author AprilWind
+ */
+@Slf4j
+public class ImageCompressUtil {
+
+    /**
+     * 默认压缩目标大小(100KB)
+     */
+    private static final int DEFAULT_COMPRESS_SIZE = 100 * 1024;
+
+    /**
+     * 默认触发压缩的大小(1MB)
+     */
+    private static final int DEFAULT_TRIGGER_SIZE = 1024 * 1024;
+
+    /**
+     * 压缩图片到指定大小以下(默认100KB)
+     *
+     * @param imageData 原始图片数据
+     * @return 压缩后的图片数据
+     */
+    public static byte[] compressImage(byte[] imageData) {
+        return compressImage(imageData, DEFAULT_COMPRESS_SIZE);
+    }
+
+    /**
+     * 压缩图片到指定大小以下
+     *
+     * @param imageData 原始图片数据
+     * @param maxSize   最大大小（字节）
+     * @return 压缩后的图片数据
+     */
+    public static byte[] compressImage(byte[] imageData, int maxSize) {
+        try {
+            // 如果图片本身小于等于最大大小，直接返回
+            if (imageData.length <= maxSize) {
+                return imageData;
+            }
+
+            // 读取原始图片
+            BufferedImage originalImage = ImageIO.read(new ByteArrayInputStream(imageData));
+            if (originalImage == null) {
+                log.warn("无法读取图片数据");
+                return imageData;
+            }
+
+            // 检查图片是否包含透明度
+            boolean hasAlpha = hasAlpha(originalImage);
+            String formatName = hasAlpha ? "png" : "jpg";
+
+            // 对于小尺寸PNG图片可跳过压缩以保持图像质量
+            if ("png".equals(formatName) && imageData.length <= 2 * maxSize) {
+                log.debug("PNG图片大小适中({} bytes)，跳过压缩", imageData.length);
+                return imageData;
+            }
+
+            // 先尝试质量压缩
+            byte[] compressedData = compressImageQuality(originalImage, formatName, 0.7f);
+
+            // 如果质量压缩后仍大于目标大小，则进行尺寸压缩
+            if (compressedData.length > maxSize) {
+                // 计算缩放比例
+                double scale = Math.sqrt((double) maxSize / compressedData.length);
+                scale = Math.max(scale, 0.2); // 最小缩放到原来的20%
+
+                // 尺寸压缩
+                compressedData = compressImageByScale(originalImage, scale, formatName);
+            }
+
+            // 如果压缩后还是太大，继续压缩
+            int attempts = 0;
+            while (compressedData.length > maxSize && attempts < 15) { // 增加尝试次数到15次
+                // 优先降低质量
+                float quality = Math.max(0.01f, 0.7f - attempts * 0.1f); // 最低质量降至0.01
+                compressedData = compressImageQuality(originalImage, formatName, quality);
+                
+                // 如果质量压缩不够，再缩小尺寸
+                if (compressedData.length > maxSize) {
+                    double scale = 0.8 - attempts * 0.15; // 更积极地缩小尺寸
+                    scale = Math.max(scale, 0.1); // 最小缩放到原来的10%
+                    compressedData = compressImageByScale(originalImage, scale, formatName);
+                }
+                attempts++;
+            }
+
+            // 如果经过多次尝试仍然大于目标大小，则强制压缩到目标大小以下
+            if (compressedData.length > maxSize) {
+                // 强制尺寸压缩到目标大小
+                double finalScale = Math.sqrt((double) maxSize / compressedData.length) * 0.8; // 留一些余量
+                finalScale = Math.max(finalScale, 0.05); // 至少保留5%的尺寸
+                compressedData = compressImageByScale(originalImage, finalScale, formatName);
+                
+                // 如果仍然太大，强制质量压缩
+                if (compressedData.length > maxSize) {
+                    // 计算需要的质量值
+                    float finalQuality = (float) maxSize / compressedData.length * 0.7f; // 留一些余量
+                    finalQuality = Math.max(finalQuality, 0.005f); // 至少保留0.5%的质量
+                    compressedData = compressImageQuality(originalImage, formatName, finalQuality);
+                }
+            }
+
+            log.info("图片压缩完成，原始大小: {} bytes, 压缩后大小: {} bytes, 压缩率: {}%",
+                    imageData.length, compressedData.length, 
+                    String.format("%.2f", (1.0 - (double) compressedData.length / imageData.length) * 100));
+
+            // 如果压缩后反而变大了，则使用原始数据
+            if (compressedData.length >= imageData.length) {
+                log.debug("压缩后数据变大，使用原始数据");
+                return imageData;
+            }
+
+            // 特殊处理：如果目标大小是50KB或更小，确保最终结果符合要求
+            if (maxSize <= 50 * 1024 && compressedData.length > maxSize) {
+                // 使用更强力的压缩策略
+                compressedData = forceCompressToSize(originalImage, formatName, maxSize);
+            }
+
+            return compressedData;
+        } catch (Exception e) {
+            log.error("图片压缩失败: {}", e.getMessage(), e);
+            return imageData; // 压缩失败时返回原始数据
+        }
+    }
+
+    /**
+     * 强制压缩到指定大小
+     * 
+     * @param originalImage 原始图片
+     * @param formatName 图片格式
+     * @param maxSize 目标大小
+     * @return 压缩后的图片数据
+     */
+    private static byte[] forceCompressToSize(BufferedImage originalImage, String formatName, int maxSize) throws IOException {
+        byte[] result = null;
+        int width = originalImage.getWidth();
+        int height = originalImage.getHeight();
+        
+        // 通过不断缩小尺寸来达到目标大小
+        double scale = 0.9;
+        do {
+            int newWidth = (int) (width * scale);
+            int newHeight = (int) (height * scale);
+            
+            // 创建缩放后的图片
+            Image scaledImage = originalImage.getScaledInstance(newWidth, newHeight, Image.SCALE_SMOOTH);
+            BufferedImage bufferedImage = new BufferedImage(newWidth, newHeight, BufferedImage.TYPE_INT_RGB);
+            Graphics2D g2d = bufferedImage.createGraphics();
+            
+            // 绘制缩放后的图片
+            g2d.drawImage(scaledImage, 0, 0, null);
+            g2d.dispose();
+            
+            // 以最低质量压缩
+            result = compressImageQuality(bufferedImage, formatName, 0.01f);
+            
+            if (result.length <= maxSize) {
+                break;
+            }
+            
+            scale -= 0.1;
+        } while (scale > 0.1 && result.length > maxSize);
+        
+        // 如果还是太大，强制调整大小
+        if (result.length > maxSize) {
+            // 计算精确的缩放比例
+            double targetScale = Math.sqrt((double) maxSize / result.length) * 0.9;
+            int newWidth = Math.max((int) (width * targetScale), 5);
+            int newHeight = Math.max((int) (height * targetScale), 5);
+            
+            Image scaledImage = originalImage.getScaledInstance(newWidth, newHeight, Image.SCALE_SMOOTH);
+            BufferedImage bufferedImage = new BufferedImage(newWidth, newHeight, BufferedImage.TYPE_INT_RGB);
+            Graphics2D g2d = bufferedImage.createGraphics();
+            g2d.drawImage(scaledImage, 0, 0, null);
+            g2d.dispose();
+            
+            result = compressImageQuality(bufferedImage, formatName, 0.005f);
+        }
+        
+        return result;
+    }
+
+    /**
+     * 按比例缩放图片
+     *
+     * @param originalImage 原始图片
+     * @param scale         缩放比例
+     * @param formatName    图片格式
+     * @return 缩放后的图片数据
+     * @throws IOException IO异常
+     */
+    private static byte[] compressImageByScale(BufferedImage originalImage, double scale, String formatName) throws IOException {
+        int width = (int) (originalImage.getWidth() * scale);
+        int height = (int) (originalImage.getHeight() * scale);
+
+        // 确保最小尺寸不小于5像素
+        width = Math.max(width, 5);
+        height = Math.max(height, 5);
+
+        // 创建缩放后的图片
+        Image scaledImage = originalImage.getScaledInstance(width, height, Image.SCALE_SMOOTH);
+        BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g2d = bufferedImage.createGraphics();
+        
+        // 绘制缩放后的图片
+        g2d.drawImage(scaledImage, 0, 0, null);
+        g2d.dispose();
+
+        // 输出为指定格式
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ImageIO.write(bufferedImage, formatName, baos);
+        return baos.toByteArray();
+    }
+
+    /**
+     * 按质量压缩图片
+     *
+     * @param originalImage 原始图片
+     * @param formatName    图片格式
+     * @param quality       压缩质量(0.1-1.0)
+     * @return 压缩后的图片数据
+     * @throws IOException IO异常
+     */
+    private static byte[] compressImageQuality(BufferedImage originalImage, String formatName, float quality) throws IOException {
+        // 创建压缩参数
+        Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName(formatName);
+        if (!writers.hasNext()) {
+            log.warn("找不到合适的图片写入器");
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ImageIO.write(originalImage, formatName, baos);
+            return baos.toByteArray();
+        }
+
+        ImageWriter writer = writers.next();
+        ImageWriteParam param = writer.getDefaultWriteParam();
+
+        // 设置压缩参数
+        if (param.canWriteCompressed()) {
+            param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+            param.setCompressionQuality(quality);
+        }
+
+        // 写入压缩后的图片数据
+        ByteArrayOutputStream compressedOutputStream = new ByteArrayOutputStream();
+        writer.setOutput(ImageIO.createImageOutputStream(compressedOutputStream));
+        writer.write(null, new javax.imageio.IIOImage(originalImage, null, null), param);
+        writer.dispose();
+
+        return compressedOutputStream.toByteArray();
+    }
+
+    /**
+     * 检查图片是否包含透明度
+     *
+     * @param image 图片
+     * @return 是否包含透明度
+     */
+    private static boolean hasAlpha(BufferedImage image) {
+        return image.getType() == BufferedImage.TYPE_4BYTE_ABGR ||
+                image.getType() == BufferedImage.TYPE_INT_ARGB ||
+                image.getColorModel().hasAlpha();
+    }
+
+    /**
+     * 判断图片是否需要压缩(超过1MB)
+     *
+     * @param imageData 图片数据
+     * @return 是否需要压缩
+     */
+    public static boolean needCompress(byte[] imageData) {
+        return imageData.length > DEFAULT_TRIGGER_SIZE;
+    }
+}

fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java

@@ -39,8 +39,8 @@ public class EncryptUtilsTest {
         loginBody.setClientId("e5cd7e4891bf95d1d19206ce24a7b32e");
         loginBody.setGrantType("password");
         loginBody.setTenantId("894078");
-        loginBody.setCode("0");
-        loginBody.setUuid("1d6615668c7f410da77c4e002c601073");
+        loginBody.setCode("15");
+        loginBody.setUuid("28ecf3d396ce4e6db8eb414992235fad");
         // loginBody.setUsername("admin");
         // loginBody.setPassword("admin123");
         loginBody.setUsername("dyf");

fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/utils/ExcelUtil.java

@@ -74,6 +74,7 @@ public class ExcelUtil {
         return listener.getExcelResult();
     }
 
+
     /**
      * 导出excel
      *
@@ -92,6 +93,7 @@ public class ExcelUtil {
         }
     }
 
+
     /**
      * 导出excel
      *
@@ -174,6 +176,7 @@ public class ExcelUtil {
     public static <T> void exportExcel(List<T> list, String sheetName, Class<T> clazz, OutputStream os, List<DropDownOptions> options) {
         exportExcel(list, sheetName, clazz, false, os, options);
     }
+    
 
     /**
      * 导出excel
@@ -187,13 +190,13 @@ public class ExcelUtil {
     public static <T> void exportExcel(List<T> list, String sheetName, Class<T> clazz, boolean merge,
                                        OutputStream os, List<DropDownOptions> options) {
         ExcelWriterSheetBuilder builder = FastExcel.write(os, clazz)
-            .autoCloseStream(false)
-            // 自动适配
-            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
-            // 大数值自动转换 防止失真
-            .registerConverter(new ExcelBigNumberConvert())
-            .registerWriteHandler(new DataWriteHandler(clazz))
-            .sheet(sheetName);
+                .autoCloseStream(false)
+                // 自动适配
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                // 大数值自动转换 防止失真
+                .registerConverter(new ExcelBigNumberConvert())
+                .registerWriteHandler(new DataWriteHandler(clazz))
+                .sheet(sheetName);
         if (merge) {
             // 合并处理器
             builder.registerWriteHandler(new CellMergeStrategy(list, true));
@@ -203,6 +206,7 @@ public class ExcelUtil {
         builder.doWrite(list);
     }
 
+
     /**
      * 单表多数据模板导出 模板格式为 {.属性}
      *
@@ -238,12 +242,12 @@ public class ExcelUtil {
     public static <T> void exportTemplate(List<T> data, String templatePath, OutputStream os) {
         ClassPathResource templateResource = new ClassPathResource(templatePath);
         ExcelWriter excelWriter = FastExcel.write(os)
-            .withTemplate(templateResource.getStream())
-            .autoCloseStream(false)
-            // 大数值自动转换 防止失真
-            .registerConverter(new ExcelBigNumberConvert())
-            .registerWriteHandler(new DataWriteHandler(data.get(0).getClass()))
-            .build();
+                .withTemplate(templateResource.getStream())
+                .autoCloseStream(false)
+                // 大数值自动转换 防止失真
+                .registerConverter(new ExcelBigNumberConvert())
+                .registerWriteHandler(new DataWriteHandler(data.get(0).getClass()))
+                .build();
         WriteSheet writeSheet = FastExcel.writerSheet().build();
         FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
         // 单表多数据导出 模板格式为 {.属性}
@@ -311,11 +315,11 @@ public class ExcelUtil {
     public static void exportTemplateMultiList(Map<String, Object> data, String templatePath, OutputStream os) {
         ClassPathResource templateResource = new ClassPathResource(templatePath);
         ExcelWriter excelWriter = FastExcel.write(os)
-            .withTemplate(templateResource.getStream())
-            .autoCloseStream(false)
-            // 大数值自动转换 防止失真
-            .registerConverter(new ExcelBigNumberConvert())
-            .build();
+                .withTemplate(templateResource.getStream())
+                .autoCloseStream(false)
+                // 大数值自动转换 防止失真
+                .registerConverter(new ExcelBigNumberConvert())
+                .build();
         WriteSheet writeSheet = FastExcel.writerSheet().build();
         for (Map.Entry<String, Object> map : data.entrySet()) {
             // 设置列表后续还有数据
@@ -342,11 +346,11 @@ public class ExcelUtil {
     public static void exportTemplateMultiSheet(List<Map<String, Object>> data, String templatePath, OutputStream os) {
         ClassPathResource templateResource = new ClassPathResource(templatePath);
         ExcelWriter excelWriter = FastExcel.write(os)
-            .withTemplate(templateResource.getStream())
-            .autoCloseStream(false)
-            // 大数值自动转换 防止失真
-            .registerConverter(new ExcelBigNumberConvert())
-            .build();
+                .withTemplate(templateResource.getStream())
+                .autoCloseStream(false)
+                // 大数值自动转换 防止失真
+                .registerConverter(new ExcelBigNumberConvert())
+                .build();
         for (int i = 0; i < data.size(); i++) {
             WriteSheet writeSheet = FastExcel.writerSheet(i).build();
             for (Map.Entry<String, Object> map : data.get(i).entrySet()) {

fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/aspect/LogAspect.java

@@ -216,4 +216,5 @@ public class LogAspect {
         return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
                || o instanceof BindingResult;
     }
+
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppDeviceVoiceController.java

@@ -13,9 +13,9 @@ import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import jakarta.validation.constraints.NotNull;
-
 import java.util.Arrays;
 
 /**
@@ -29,7 +29,7 @@ import java.util.Arrays;
 @RestController
 @RequestMapping("/app/device/voice")
 public class AppDeviceVoiceController extends BaseController {
-
+    
     private final IAppDeviceVoiceService appDeviceVoiceService;
 
     /**
@@ -54,8 +54,9 @@ public class AppDeviceVoiceController extends BaseController {
      * 新增设备语音
      */
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody AppDeviceVoiceBo bo) {
-        return toAjax(appDeviceVoiceService.insertByBo(bo));
+    public R<Void> add(@RequestPart("bo") @Validated(AddGroup.class) AppDeviceVoiceBo bo,
+                       @RequestPart(value = "file", required = false) MultipartFile file) {
+        return toAjax(appDeviceVoiceService.insertByBo(bo, file));
     }
 
     /**

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppPersonnelInfoBo.java

@@ -64,4 +64,5 @@ public class AppPersonnelInfoBo extends BaseEntity {
      * ID号
      */
     private String code;
+
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceBindRecordMapper.java

@@ -3,6 +3,7 @@ package com.fuyuanshen.app.mapper;
 import com.fuyuanshen.app.domain.AppDeviceBindRecord;
 import com.fuyuanshen.app.domain.vo.AppDeviceBindRecordVo;
 import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 设备绑定关系Mapper接口
@@ -12,4 +13,5 @@ import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface AppDeviceBindRecordMapper extends BaseMapperPlus<AppDeviceBindRecord, AppDeviceBindRecordVo> {
 
+    Long checkDeviceExistBindRecord(@Param("deviceId") Long deviceId);
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java

@@ -9,6 +9,9 @@ import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
 import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Set;
+
 /**
  * 设备分享Mapper接口
  *
@@ -27,4 +30,6 @@ public interface AppDeviceShareMapper extends BaseMapperPlus<AppDeviceShare, App
      * @return 设备分享
      */
     Page<AppDeviceShareVo> selectWebDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page<AppDeviceShareVo> page);
+
+    void deleteByDeviceIds(@Param("deviceIds") Set<Long> deviceIds);
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppDeviceBindRecordService.java

@@ -4,6 +4,7 @@ import com.fuyuanshen.app.domain.vo.AppDeviceBindRecordVo;
 import com.fuyuanshen.app.domain.bo.AppDeviceBindRecordBo;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Collection;
 import java.util.List;
@@ -65,4 +66,6 @@ public interface IAppDeviceBindRecordService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    Long checkDeviceExistBindRecord(Long deviceId);
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppDeviceShareService.java

@@ -7,6 +7,7 @@ import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 设备分享Service接口
@@ -67,4 +68,6 @@ public interface IAppDeviceShareService {
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     TableDataInfo<AppDeviceShareVo> otherDeviceShareList(AppDeviceShareBo bo, PageQuery pageQuery);
+
+    void deleteByDeviceIds(Set<Long> deviceIds);
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppDeviceVoiceService.java

@@ -4,6 +4,7 @@ import com.fuyuanshen.app.domain.AppDeviceVoice;
 import com.fuyuanshen.app.domain.bo.AppDeviceVoiceBo;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Collection;
 import java.util.List;
@@ -34,7 +35,7 @@ public interface IAppDeviceVoiceService {
     /**
      * 根据新增业务对象插入设备语音
      */
-    Boolean insertByBo(AppDeviceVoiceBo bo);
+    Boolean insertByBo(AppDeviceVoiceBo bo, MultipartFile file);
 
     /**
      * 根据编辑业务对象更新设备语音

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppDeviceBindRecordServiceImpl.java

@@ -130,4 +130,9 @@ public class AppDeviceBindRecordServiceImpl implements IAppDeviceBindRecordServi
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    @Override
+    public Long checkDeviceExistBindRecord(Long deviceId) {
+        return baseMapper.checkDeviceExistBindRecord(deviceId);
+    }
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppDeviceShareServiceImpl.java

@@ -23,6 +23,7 @@ import com.fuyuanshen.app.service.IAppDeviceShareService;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.Set;
 
 /**
  * 设备分享Service业务层处理
@@ -166,4 +167,9 @@ public class AppDeviceShareServiceImpl implements IAppDeviceShareService {
         });
         return TableDataInfo.build(result);
     }
+
+    @Override
+    public void deleteByDeviceIds(Set<Long> deviceIds) {
+        baseMapper.deleteByDeviceIds(deviceIds);
+    }
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppDeviceVoiceServiceImpl.java

@@ -1,20 +1,22 @@
 package com.fuyuanshen.app.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuyuanshen.app.domain.AppDeviceVoice;
 import com.fuyuanshen.app.domain.bo.AppDeviceVoiceBo;
 import com.fuyuanshen.app.mapper.AppDeviceVoiceMapper;
 import com.fuyuanshen.app.service.IAppDeviceVoiceService;
+import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.oss.core.OssClient;
+import com.fuyuanshen.common.oss.entity.UploadResult;
+import com.fuyuanshen.common.oss.factory.OssFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 设备语音Service业务层处理
@@ -57,16 +59,45 @@ public class AppDeviceVoiceServiceImpl implements IAppDeviceVoiceService {
      * 根据新增业务对象插入设备语音
      */
     @Override
-    public Boolean insertByBo(AppDeviceVoiceBo bo) {
+    public Boolean insertByBo(AppDeviceVoiceBo bo, MultipartFile file) {
+        // 上传文件到MinIO
+        String videoUrl = "";
+        String coverUrl = "";
+        Long size = 0L;
+        Integer duration = 0;
+        String type = "";
+        
+        if (file != null && !file.isEmpty()) {
+            try {
+                OssClient storage = OssFactory.instance();
+                String suffix = "";
+                String originalFilename = file.getOriginalFilename();
+                if (originalFilename != null && originalFilename.lastIndexOf(".") > 0) {
+                    suffix = originalFilename.substring(originalFilename.lastIndexOf("."));
+                }
+                UploadResult result = storage.uploadSuffix(file.getBytes(), suffix, file.getContentType());
+                videoUrl = result.getUrl();
+                size = file.getSize();
+                type = file.getContentType();
+                // TODO: 可以通过其他方式获取音频时长，这里暂时设置为默认值
+                duration = 0;
+                // TODO: 可以生成封面图，这里暂时设置为空
+                coverUrl = "";
+            } catch (Exception e) {
+                // 文件上传失败处理
+                throw new RuntimeException("文件上传失败: " + e.getMessage());
+            }
+        }
+
         AppDeviceVoice add = new AppDeviceVoice();
         add.setVideoName(bo.getVideoName());
-        add.setVideoUrl(bo.getVideoUrl());
+        add.setVideoUrl(videoUrl);
         add.setDeviceId(bo.getDeviceId());
         add.setRemark(bo.getRemark());
-        add.setType(bo.getType());
-        add.setDuration(bo.getDuration());
-        add.setSize(bo.getSize());
-        add.setCover(bo.getCover());
+        add.setType(type);
+        add.setDuration(duration);
+        add.setSize(size);
+        add.setCover(coverUrl);
         return baseMapper.insert(add) > 0;
     }
 
@@ -78,16 +109,12 @@ public class AppDeviceVoiceServiceImpl implements IAppDeviceVoiceService {
         AppDeviceVoice update = new AppDeviceVoice();
         update.setId(bo.getId());
         update.setVideoName(bo.getVideoName());
-        update.setVideoUrl(bo.getVideoUrl());
         update.setDeviceId(bo.getDeviceId());
         update.setRemark(bo.getRemark());
-        update.setType(bo.getType());
-        update.setDuration(bo.getDuration());
-        update.setSize(bo.getSize());
-        update.setCover(bo.getCover());
         return baseMapper.updateById(update) > 0;
     }
 
+
     /**
      * 校验并批量删除设备语音信息
      */
@@ -96,6 +123,8 @@ public class AppDeviceVoiceServiceImpl implements IAppDeviceVoiceService {
         if (ids == null || ids.isEmpty()) {
             return false;
         }
+        // TODO: 可以在这里添加删除MinIO文件的逻辑
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
 }

fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceBindRecordMapper.xml

@@ -4,4 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper">
 
+    <select id="checkDeviceExistBindRecord" resultType="java.lang.Long">
+        select count(1) from app_device_bind_record where device_id = #{deviceId}
+    </select>
 </mapper>

fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml

@@ -3,6 +3,12 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuyuanshen.app.mapper.AppDeviceShareMapper">
+    <delete id="deleteByDeviceIds">
+        delete from app_device_share where  device_id in
+        <foreach item="item" collection="deviceIds" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
 
     <select id="otherDeviceShareList" resultType="com.fuyuanshen.app.domain.vo.AppDeviceShareVo">
         select d.device_name,

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;
@@ -13,12 +11,13 @@ import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.common.web.core.BaseController;
 import com.fuyuanshen.customer.mapper.CustomerMapper;
 import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceType;
 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;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
@@ -39,7 +38,10 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @Description:
@@ -70,6 +72,12 @@ public class DeviceController extends BaseController {
         return deviceService.queryAll(criteria, page);
     }
 
+    @GetMapping(value = "/pageTerminal")
+    public TableDataInfo<Device> deviceFenecSelect(DeviceQueryCriteria criteria) throws IOException {
+        Page<Device> page = new Page<>(criteria.getPageNum(), criteria.getPageSize());
+        return deviceService.queryAllTerminal(criteria, page);
+    }
+
 
     // @Log("新增设备")
     @Operation(summary = "新增设备")
@@ -163,7 +171,7 @@ public class DeviceController extends BaseController {
 
 
     @Operation(summary = "导出数据设备")
-    @GetMapping(value = "/download")
+    @GetMapping(value = "/download1")
     public R<Void> exportDevice(HttpServletResponse response, DeviceQueryCriteria criteria) throws IOException {
         List<Device> devices = deviceService.queryAll(criteria);
         exportService.export(devices, response);
@@ -171,9 +179,36 @@ public class DeviceController extends BaseController {
     }
 
 
+    /**
+     * 导出设备数据（包含完整设备类型信息）
+     *
+     * @param response HttpServletResponse对象
+     * @param criteria 查询条件
+     * @return R<Void>
+     */
+    @Operation(summary = "导出设备数据（包含完整设备类型信息）")
+    @GetMapping(value = "/download")
+    public R<Void> exportDeviceWithFullTypeInfo(HttpServletResponse response, DeviceQueryCriteria criteria) {
+        // 获取所有符合条件的设备
+        List<Device> devices = deviceService.queryAll(criteria);
+        // 获取所有设备类型信息
+        List<DeviceType> deviceTypes = deviceTypeService.queryDeviceTypes();
+        // 导出数据（包含完整设备类型信息）
+        exportService.exportWithTypeInfo(devices, deviceTypes, response);
+        return R.ok();
+    }
+
+
+    /**
+     * 导入设备数据
+     *
+     * @param file
+     * @return
+     * @throws BadRequestException
+     */
     @Operation(summary = "导入设备数据")
-    @PostMapping(value = "/import", consumes = "multipart/form-data")
-    public R<ImportResult> importData(@Parameter(name = "文件", required = true) @RequestPart("file") MultipartFile file) throws BadRequestException {
+    @PostMapping(value = "/import1", consumes = "multipart/form-data")
+    public R<ImportResult> importData1(@Parameter(name = "文件", required = true) @RequestPart("file") MultipartFile file) throws BadRequestException {
 
         String suffix = FileUtil.getExtensionName(file.getOriginalFilename());
         if (!("xlsx".equalsIgnoreCase(suffix))) {
@@ -207,6 +242,105 @@ public class DeviceController extends BaseController {
         }
     }
 
+
+    /**
+     * 导入设备数据
+     *
+     * @param file 文件
+     * @return R<ImportResult>
+     */
+    @Operation(summary = "导入设备数据")
+    @PostMapping(value = "/import", consumes = "multipart/form-data")
+    public R<ImportResult> importData(@Parameter(name = "文件", required = true) @RequestPart("file") MultipartFile file) throws BadRequestException {
+
+        String suffix = FileUtil.getExtensionName(file.getOriginalFilename());
+        if (!("xlsx".equalsIgnoreCase(suffix))) {
+            throw new BadRequestException("只能上传Excel——xlsx格式文件");
+        }
+
+        // 检查文件大小，限制为100MB
+        if (file.getSize() > 100 * 10 * 1024 * 1024) {
+            throw new BadRequestException("文件大小不能超过100MB");
+        }
+
+        // 校验模板
+        validateExcelTemplate(file);
+
+        ImportResult result = new ImportResult();
+        try {
+            LoginUser loginUser = LoginHelper.getLoginUser();
+            DeviceImportParams params = DeviceImportParams.builder().ossService(ossService)
+                    .deviceService(deviceService).tenantId(loginUser.getTenantId())
+                    .file(file).filePath("").deviceMapper(deviceMapper).deviceTypeService(deviceTypeService)
+                    .deviceTypeMapper(deviceTypeMapper).userId(loginUser.getUserId())
+                    .build();
+            // 创建监听器
+            UploadDeviceDataListener listener = new UploadDeviceDataListener(params);
+            // 读取Excel
+            EasyExcel.read(file.getInputStream(), DeviceExcelImportDTO.class, listener).sheet().doRead();
+            // 获取导入结果
+            result = listener.getImportResult();
+            // 设置响应消息
+            String message = String.format("成功导入 %d 条数据，失败 %d 条", result.getSuccessCount(), result.getFailureCount());
+            // 返回带有正确泛型的响应
+            return R.ok(message, result);
+        } catch (Exception e) {
+            log.error("导入设备数据出错: {}", e.getMessage(), e);
+            // 在异常情况下，设置默认结果
+            String errorMessage = String.format("导入失败: %s。成功 %d 条，失败 %d 条", e.getMessage(), result.getSuccessCount(), result.getFailureCount());
+            // 使用新方法确保类型正确
+            return R.fail(errorMessage, result);
+        }
+    }
+
+
+    /**
+     * 校验Excel模板是否正确
+     *
+     * @param file MultipartFile对象
+     * @throws BadRequestException 当模板不正确时抛出异常
+     */
+    private void validateExcelTemplate(MultipartFile file) throws BadRequestException {
+        try {
+            // 创建一个只读取表头的监听器
+            HeadValidateListener headValidateListener = new HeadValidateListener();
+
+            // 使用EasyExcel读取表头
+            EasyExcel.read(file.getInputStream(), headValidateListener)
+                    .sheet()
+                    .headRowNumber(0)
+                    .doRead();
+
+            // 获取读取到的表头信息
+            List<String> actualHeaders = headValidateListener.getHeadNames();
+
+            // 定义必需的表头
+            Set<String> requiredHeaders = new HashSet<>(Arrays.asList(
+                    "设备名称", "设备类型名称", "设备图片", "设备MAC", "蓝牙名称", "设备IMEI",
+                    "备注", "是否支持蓝牙", "定位方式", "通讯方式",
+                    "型号字典用于APP页面跳转", "型号字典用于PC页面跳转"
+            ));
+
+            // 检查必需的表头是否都存在
+            Set<String> actualHeaderSet = new HashSet<>(actualHeaders);
+            if (!actualHeaderSet.containsAll(requiredHeaders)) {
+                requiredHeaders.removeAll(actualHeaderSet);
+                throw new BadRequestException("Excel模板缺少必需的列: " + String.join(", ", requiredHeaders));
+            }
+
+            // 检查第三列（索引为2）是否为"设备图片"
+            if (actualHeaders.size() > 2 && !"设备图片".equals(actualHeaders.get(2))) {
+                throw new BadRequestException("Excel模板不正确，第三列必须是'设备图片'列");
+            }
+        } catch (BadRequestException e) {
+            throw e; // 直接重新抛出
+        } catch (Exception e) {
+            log.error("校验Excel模板时发生错误: {}", e.getMessage(), e);
+            throw new BadRequestException("校验Excel模板时发生错误: " + e.getMessage());
+        }
+    }
+
+
 }
 
 

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceRepairRecordsController.java

@@ -41,6 +41,7 @@ public class DeviceRepairRecordsController extends BaseController {
 
     private final IDeviceRepairRecordsService deviceRepairRecordsService;
 
+
     /**
      * 查询设备维修记录列表
      */
@@ -52,6 +53,7 @@ public class DeviceRepairRecordsController extends BaseController {
         return deviceRepairRecordsService.queryPageList(criteria, page);
     }
 
+
     /**
      * 导出设备维修记录列表
      */
@@ -63,6 +65,7 @@ public class DeviceRepairRecordsController extends BaseController {
         ExcelUtil.exportExcel(list, "设备维修记录", DeviceRepairRecordsVo.class, response);
     }
 
+
     /**
      * 获取设备维修记录详细信息
      *
@@ -75,6 +78,7 @@ public class DeviceRepairRecordsController extends BaseController {
         return R.ok(deviceRepairRecordsService.queryById(recordId));
     }
 
+
     /**
      * 新增设备维修记录
      */
@@ -86,6 +90,7 @@ public class DeviceRepairRecordsController extends BaseController {
         return toAjax(deviceRepairRecordsService.insertByBo(bo));
     }
 
+
     /**
      * 修改设备维修记录
      */
@@ -109,4 +114,5 @@ public class DeviceRepairRecordsController extends BaseController {
                           @PathVariable Long[] recordIds) {
         return toAjax(deviceRepairRecordsService.deleteWithValidByIds(List.of(recordIds), true));
     }
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java

@@ -15,6 +15,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -50,7 +51,7 @@ public class DeviceTypeController {
     // @Log("新增设备类型")
     @Operation(summary = "新增设备类型")
     @PostMapping(value = "/add")
-    public R<Void> createDeviceType(@Validated @RequestBody DeviceType resources) {
+    public R<Void> createDeviceType(@Validated @ModelAttribute DeviceTypeForm resources) throws IOException {
         deviceTypeService.create(resources);
         return R.ok();
     }
@@ -59,7 +60,7 @@ public class DeviceTypeController {
     // @Log("修改设备类型")
     @Operation(summary = "修改设备类型")
     @PutMapping(value = "/update")
-    public  R<Void>  updateDeviceType(@Validated @RequestBody DeviceTypeForm resources) {
+    public  R<Void>  updateDeviceType(@Validated @ModelAttribute DeviceTypeForm resources) throws IOException {
         deviceTypeService.update(resources);
         return R.ok();
     }
@@ -79,7 +80,6 @@ public class DeviceTypeController {
     public R<DeviceType>  getCommunicationMode(@Parameter(name = "设备类型ID", required = true) Long id) {
         DeviceType communicationMode = deviceTypeService.getCommunicationMode(id);
         return R.ok(communicationMode);
-
     }
 
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/TrackServiceController.java

@@ -0,0 +1,143 @@
+package com.fuyuanshen.equipment.controller;
+
+import java.util.List;
+
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.bo.TerminalDelBo;
+import com.fuyuanshen.equipment.domain.bo.TerminalDeviceBo;
+import com.fuyuanshen.equipment.domain.bo.TerminalQueryBo;
+import com.fuyuanshen.equipment.domain.bo.TrackServiceBo;
+import com.fuyuanshen.equipment.domain.dto.TerminalDeviceDto;
+import com.fuyuanshen.equipment.domain.vo.TrackServiceVo;
+import com.fuyuanshen.equipment.service.ITrackServiceService;
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.excel.utils.ExcelUtil;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 轨迹服务
+ *
+ * @author Lion Li
+ * @date 2025-11-24
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/trackService")
+public class TrackServiceController extends BaseController {
+
+    private final ITrackServiceService trackServiceService;
+
+    /**
+     * 查询轨迹服务列表
+     */
+//    @SaCheckPermission("equipment:trackService:list")
+    @GetMapping("/list")
+    public TableDataInfo<TrackServiceVo> list(TrackServiceBo bo, PageQuery pageQuery) {
+        return trackServiceService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 轨迹服务列表
+     */
+//    @SaCheckPermission("equipment:trackService:export")
+    @Log(title = "轨迹服务", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TrackServiceBo bo, HttpServletResponse response) {
+        List<TrackServiceVo> list = trackServiceService.queryList(bo);
+        ExcelUtil.exportExcel(list, "轨迹服务", TrackServiceVo.class, response);
+    }
+
+    /**
+     * 获取轨迹服务详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<TrackServiceVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(trackServiceService.queryById(id));
+    }
+
+    /**
+     * 新增轨迹服务
+     */
+//    @SaCheckPermission("equipment:trackService:add")
+    @Log(title = "轨迹服务", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TrackServiceBo bo) {
+        return toAjax(trackServiceService.insertByBo(bo));
+    }
+
+    /**
+     * 修改轨迹服务
+     */
+//    @SaCheckPermission("equipment:trackService:edit")
+    @Log(title = "轨迹服务", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/update")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TrackServiceBo bo) {
+        return toAjax(trackServiceService.updateByBo(bo));
+    }
+
+    /**
+     * 删除轨迹服务
+     *
+     * @param ids 主键串
+     */
+//    @SaCheckPermission("equipment:trackService:remove")
+    @Log(title = "轨迹服务", businessType = BusinessType.DELETE)
+    @DeleteMapping(value = "/delete")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(trackServiceService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    @Log(title = "高德添加终端设备")
+    @PostMapping(value = "/terminal")
+    public R<Void> terminalDevice(@RequestBody TerminalDeviceBo model) {
+        trackServiceService.terminal(model);
+        return R.ok();
+    }
+
+    @Log(title = "高德移除终端设备")
+    @DeleteMapping(value = "/delTerminal/{ids}")
+    public R<Void> delTerminalDevice(@NotEmpty(message = "主键不能为空")
+                                         @PathVariable Long[] ids) {
+        return toAjax(trackServiceService.delTerminalDevice(List.of(ids), true));
+    }
+
+    @Log(title = "高德移除终端设备")
+    @DeleteMapping(value = "/del/Terminal")
+    public R<Void> delTerminalDevice(TerminalDelBo bo) {
+        return toAjax(trackServiceService.delTerminalDevice(bo, true));
+    }
+
+    /**
+     * 高德终端设备列表
+     */
+    @GetMapping("/listTerminal")
+    public TableDataInfo<TerminalDeviceDto> listTerminal(TerminalQueryBo bo) {
+        return trackServiceService.listTerminal(bo);
+    }
+
+    /**
+     * 高德终端设备列表(关键字查询)
+     */
+    @GetMapping("/searchTerminal")
+    public TableDataInfo<TerminalDeviceDto> searchTerminal(TerminalQueryBo bo) {
+        return trackServiceService.searchTerminal(bo);
+    }
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/converter/IgnoreFailedImageConverter.java

@@ -4,6 +4,8 @@ import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.fuyuanshen.common.core.utils.file.ImageCompressUtil;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,86 +14,257 @@ import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 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: 默苍璃
  * @date: 2025-06-0618:56
  */
-
 public class IgnoreFailedImageConverter implements Converter<URL> {
     private static final Logger logger = LoggerFactory.getLogger(IgnoreFailedImageConverter.class);
 
+    // 重试次数
+    private static final int MAX_RETRIES = 3;
+    // 指数退避初始延迟（毫秒）
+    private static final int INITIAL_DELAY = 1000;
+    // 图片压缩阈值(1MB)
+    private static final int COMPRESSION_THRESHOLD = 100 * 1024;
+    // 压缩目标大小(50KB)
+    private static final int COMPRESSION_TARGET = 50 * 1024;
+    // 用于跟踪本次任务中使用到的URL缓存键
+    private static final ThreadLocal<Set<String>> USED_CACHE_KEYS = new ThreadLocal<Set<String>>() {
+        @Override
+        protected Set<String> initialValue() {
+            return new HashSet<>();
+        }
+    };
+
+    // 创建线程池用于并发处理图片
+    private static final ExecutorService IMAGE_PROCESSING_EXECUTOR = Executors.newFixedThreadPool(
+            Runtime.getRuntime().availableProcessors() * 2);
+
     @Override
     public Class<?> supportJavaTypeKey() {
         return URL.class;
     }
 
-    // @Override
-    // public CellDataTypeEnum supportExcelTypeKey() {
-    //     return CellDataTypeEnum.STRING;
-    // }
-
     @Override
     public WriteCellData<?> convertToExcelData(URL value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
         if (value == null) {
-            logger.debug("图片URL为空");
+            logger.info("图片URL为空");
             return new WriteCellData<>(new byte[0]);
         }
 
         try {
-            logger.debug("开始加载图片: {}", value);
-            URLConnection conn = value.openConnection();
-            // 增加连接和读取超时时间
-            conn.setConnectTimeout(10000);  // 10秒连接超时
-            conn.setReadTimeout(30000);     // 30秒读取超时
-            
-            // 添加User-Agent避免被服务器拦截
-            conn.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) ExcelExporter/1.0");
-            
-            // 如果是HTTP连接，设置一些额外的属性
-            if (conn instanceof HttpURLConnection) {
-                HttpURLConnection httpConn = (HttpURLConnection) conn;
-                httpConn.setRequestMethod("GET");
-                // 不使用缓存
-                httpConn.setUseCaches(false);
-                // 跟随重定向
-                httpConn.setInstanceFollowRedirects(true);
-            }
-
-            long contentLength = conn.getContentLengthLong();
-            logger.debug("连接建立成功，图片大小: {} 字节", contentLength);
-            
-            // 检查内容长度是否有效
-            if (contentLength == 0) {
-                logger.warn("图片文件为空: {}", value);
-                return new WriteCellData<>(new byte[0]);
-            }
-            
-            // 限制图片大小（防止过大文件导致内存问题）
-            if (contentLength > 10 * 1024 * 1024) { // 10MB限制
-                logger.warn("图片文件过大 ({} bytes)，跳过加载: {}", contentLength, value);
-                return new WriteCellData<>(new byte[0]);
-            }
-
-            try (InputStream inputStream = conn.getInputStream()) {
-                // byte[] bytes = FileUtils.readInputStream(inputStream, value.toString());
-                // 替代 FileUtils.readInputStream 的自定义方法
-                byte[] bytes = readInputStream(inputStream);
-                
-                // 检查读取到的数据是否为空
-                if (bytes == null || bytes.length == 0) {
-                    logger.warn("读取到空的图片数据: {}", value);
+            // 使用CompletableFuture异步处理图片加载
+            CompletableFuture<WriteCellData<?>> future = CompletableFuture.supplyAsync(() -> {
+                try {
+                    return loadImageData(value);
+                } catch (Exception e) {
+                    logger.error("异步加载图片失败: {}", value, e);
                     return new WriteCellData<>(new byte[0]);
                 }
-                
-                logger.debug("成功读取图片数据，大小: {} 字节", bytes.length);
-                return new WriteCellData<>(bytes);
-            }
+            }, IMAGE_PROCESSING_EXECUTOR);
+
+            // 设置超时时间，防止长时间阻塞
+            return future.get(30, TimeUnit.SECONDS);
         } catch (Exception e) {
-            // 静默忽略错误，只记录日志
-            logger.warn("图片加载失败: {}, 原因: {}", value, e.getMessage(), e);
-            // return null;  // 返回null表示不写入图片
-            return new WriteCellData<>(new byte[0]); // 返回空数组而不是 null
+            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) {
+            // 从缓存中读取Base64编码的数据并解码
+            byte[] cachedBytes = Base64.getDecoder().decode(cachedData);
+            logger.info("从缓存获取图片数据: {}, 大小: {} 字节", value, cachedBytes.length);
+            return new WriteCellData<>(cachedBytes);
+        }
+
+        // 缓存未命中，从URL加载
+        // 尝试多次加载图片
+        for (int attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+            try {
+                logger.info("开始加载图片: {}, 尝试次数: {}", value, attempt);
+                URLConnection conn = value.openConnection();
+                // 增加连接和读取超时时间
+                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) {
+                    HttpURLConnection httpConn = (HttpURLConnection) conn;
+                    httpConn.setRequestMethod("GET");
+                    // 不使用缓存
+                    httpConn.setUseCaches(false);
+                    // 跟随重定向
+                    httpConn.setInstanceFollowRedirects(true);
+
+                    // 检查响应码
+                    int responseCode = httpConn.getResponseCode();
+                    if (responseCode != HttpURLConnection.HTTP_OK) {
+                        logger.info("HTTP响应码异常: {}, URL: {}", responseCode, value);
+                        if (attempt < MAX_RETRIES) {
+                            // 等待后重试
+                            waitForRetry(attempt);
+                            continue;
+                        } else {
+                            // 将空数据写入缓存
+                            RedisUtils.setCacheObject(cacheKey, "");
+                            return new WriteCellData<>(new byte[0]);
+                        }
+                    }
+                }
+
+                long contentLength = conn.getContentLengthLong();
+                logger.info("连接建立成功，图片大小: {} 字节", contentLength);
+
+                // 检查内容长度是否有效
+                if (contentLength == 0) {
+                    logger.info("图片文件为空: {}", value);
+                    if (attempt < MAX_RETRIES) {
+                        waitForRetry(attempt);
+                        continue;
+                    } else {
+                        // 将空数据写入缓存
+                        RedisUtils.setCacheObject(cacheKey, "");
+                        return new WriteCellData<>(new byte[0]);
+                    }
+                }
+
+                // 限制图片大小（防止过大文件导致内存问题）
+                if (contentLength > 10 * 1024 * 1024) { // 10MB限制
+                    logger.info("图片文件过大 ({} bytes)，跳过加载: {}", contentLength, value);
+                    // 将空数据写入缓存
+                    RedisUtils.setCacheObject(cacheKey, "");
+                    return new WriteCellData<>(new byte[0]);
+                }
+
+                try (InputStream inputStream = conn.getInputStream()) {
+                    // byte[] bytes = FileUtils.readInputStream(inputStream, value.toString());
+                    // 替代 FileUtils.readInputStream 的自定义方法
+                    byte[] bytes = readInputStream(inputStream);
+
+                    // 检查读取到的数据是否为空
+                    if (bytes == null || bytes.length == 0) {
+                        logger.info("读取到空的图片数据: {}", value);
+                        if (attempt < MAX_RETRIES) {
+                            waitForRetry(attempt);
+                            continue;
+                        } else {
+                            // 将空数据写入缓存
+                            RedisUtils.setCacheObject(cacheKey, "");
+                            return new WriteCellData<>(new byte[0]);
+                        }
+                    }
+
+                    // 如果图片大于1MB，则进行压缩
+                    if (bytes.length > COMPRESSION_THRESHOLD) {
+                        logger.info("图片大小超过1MB ({} bytes)，开始压缩", bytes.length);
+                        long beforeCompressSize = bytes.length;
+
+                        // 先尝试质量压缩
+                        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.length);
+                    // 将数据写入缓存，不设置过期时间，使用Base64编码存储
+                    String encodedData = Base64.getEncoder().encodeToString(bytes);
+                    RedisUtils.setCacheObject(cacheKey, encodedData);
+                    return new WriteCellData<>(bytes);
+                }
+            } catch (Exception e) {
+                logger.info("图片加载失败: {}, 尝试次数: {}, 原因: {}", value, attempt, e.getMessage(), e);
+                if (attempt < MAX_RETRIES) {
+                    // 等待后重试
+                    waitForRetry(attempt);
+                } else {
+                    // 最后一次尝试也失败了
+                    logger.info("图片加载最终失败，已重试 {} 次: {}", MAX_RETRIES, value, e);
+                    // 将空数据写入缓存
+                    RedisUtils.setCacheObject(cacheKey, "");
+                    return new WriteCellData<>(new byte[0]); // 返回空数组而不是 null
+                }
+            }
+        }
+
+        // 所有尝试都失败了
+        // 将空数据写入缓存
+        RedisUtils.setCacheObject(cacheKey, "");
+        return new WriteCellData<>(new byte[0]);
+    }
+
+    /**
+     * 清理未使用的缓存
+     * 任务结束后调用此方法，删除本次任务中未使用的URL缓存
+     */
+    public static void cleanUnusedCache() {
+        Set<String> usedKeys = USED_CACHE_KEYS.get();
+        if (usedKeys != null && !usedKeys.isEmpty()) {
+            // 获取所有图片缓存键
+            Iterable<String> allKeys = RedisUtils.keys("excel:image:*");
+            if (allKeys != null) {
+                // 删除未使用的缓存
+                for (String key : allKeys) {
+                    if (!usedKeys.contains(key)) {
+                        RedisUtils.deleteObject(key);
+                        logger.info("删除未使用的缓存: {}", key);
+                    }
+                }
+            }
+            // 清理ThreadLocal
+            USED_CACHE_KEYS.remove();
+        }
+    }
+
+    /**
+     * 等待重试，使用指数退避策略
+     *
+     * @param attempt 当前尝试次数
+     */
+    private void waitForRetry(int attempt) {
+        try {
+            long delay = (long) INITIAL_DELAY * (1L << (attempt - 1)); // 指数退避
+            logger.info("等待 {} 毫秒后重试...", delay);
+            Thread.sleep(delay);
+        } catch (InterruptedException ie) {
+            Thread.currentThread().interrupt();
         }
     }
 
@@ -111,14 +284,49 @@ public class IgnoreFailedImageConverter implements Converter<URL> {
         while ((bytesRead = inputStream.read(buffer)) != -1) {
             outputStream.write(buffer, 0, bytesRead);
             totalBytes += bytesRead;
-            
+
             // 如果读取的数据过大，提前终止
             if (totalBytes > 10 * 1024 * 1024) { // 10MB限制
-                logger.warn("读取的图片数据超过10MB限制，提前终止");
+                logger.info("读取的图片数据超过10MB限制，提前终止");
                 break;
             }
         }
 
         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("图片预加载任务已提交");
+    }
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java

@@ -167,4 +167,20 @@ public class Device extends TenantEntity {
      */
     private Integer onlineStatus;
 
+    /**
+     * 高德服务ID
+     */
+    @Schema(title = "服务ID（高德）")
+    private Long sid;
+    /**
+     * 高德终端ID
+     */
+    @Schema(title = "终端ID（高德）")
+    private Long tid;
+    /**
+     * 高德轨迹ID
+     */
+    @Schema(title = "轨迹ID（高德）")
+    private Long trid;
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceFenceAccessRecord.java

@@ -2,6 +2,7 @@ package com.fuyuanshen.equipment.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import com.fuyuanshen.common.tenant.core.TenantEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
@@ -18,7 +19,7 @@ import java.io.Serial;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("device_fence_access_record")
-public class DeviceFenceAccessRecord extends BaseEntity {
+public class DeviceFenceAccessRecord extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceFenceTerminal.java

@@ -0,0 +1,26 @@
+package com.fuyuanshen.equipment.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 围栏终端关联
+ *
+ * @author Lion Li
+ */
+@Data
+@TableName("device_fence_terminal")
+public class DeviceFenceTerminal {
+    /**
+     * 围栏ID
+     */
+    @TableId(type = IdType.INPUT)
+    private Long fenceId;
+
+    /**
+     * 设备ID
+     */
+    private Long deviceId;
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceGeoFence.java

@@ -58,6 +58,14 @@ public class DeviceGeoFence extends BaseEntity {
      * 是否激活
      */
     private Long isActive;
+    /**
+     * 高德服务ID
+     */
+    private Long sid;
+    /**
+     * 高德围栏ID
+     */
+    private Long gfid;
 
 
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java

@@ -60,7 +60,7 @@ public class DeviceType extends TenantEntity {
     private String networkWay;
 
     @Schema(title = "通讯方式", example = "通讯方式 0:4G;1:蓝牙,2 4G&蓝牙")
-    private Integer communicationMode;
+    private String communicationMode;
 
     /**
      * 创建人名称
@@ -85,5 +85,8 @@ public class DeviceType extends TenantEntity {
     @Schema(title = "型号字典用于PC页面跳转")
     private String pcModelDictionary;
 
+    @Schema(title = "设备图片")
+    private String devicePic;
+
 
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/TrackService.java

@@ -0,0 +1,41 @@
+package com.fuyuanshen.equipment.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 轨迹服务对象 track_service
+ *
+ * @author Lion Li
+ * @date 2025-11-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("track_service")
+public class TrackService extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 猎鹰服务ID
+     */
+    private Long sid;
+
+    /**
+     * 服务名称
+     */
+    private String sname;
+
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGeoFenceBo.java

@@ -70,6 +70,14 @@ public class DeviceGeoFenceBo extends BaseEntity {
      * 更新时间
      */
     private Date updateTime;
+    /**
+     * 高德服务ID
+     */
+    private Long sid;
+    /**
+     * 高德围栏ID
+     */
+    private Long gfid;
 
 
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/FenceTerminalBo.java

@@ -0,0 +1,17 @@
+package com.fuyuanshen.equipment.domain.bo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FenceTerminalBo {
+    /**
+     * 围栏ID
+     */
+    private Long fenceId;
+    /**
+     * 设备IDs
+     */
+    private List<Long> deviceIds;
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/TerminalDelBo.java

@@ -0,0 +1,19 @@
+package com.fuyuanshen.equipment.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class TerminalDelBo {
+    /**
+     * 猎鹰服务ID
+     */
+    private Long sid;
+    /**
+     * 轨迹ID
+     */
+    private Long trid;
+    /**
+     * 终端ID
+     */
+    private Long tid;
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/TerminalDeviceBo.java

@@ -0,0 +1,18 @@
+package com.fuyuanshen.equipment.domain.bo;
+
+import com.fuyuanshen.equipment.domain.form.DeviceForm;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TerminalDeviceBo {
+    /**
+     * 猎鹰服务ID
+     */
+    private Long sid;
+    /**
+     * 设备列表
+     */
+    List<DeviceForm> deviceList;
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/TerminalQueryBo.java

@@ -0,0 +1,32 @@
+package com.fuyuanshen.equipment.domain.bo;
+
+import lombok.Data;
+import lombok.Value;
+
+@Data
+public class TerminalQueryBo {
+    /**
+     * 猎鹰服务ID
+     */
+    private Long sid;
+    /**
+     * 名称查询
+     */
+    private String name;
+    /**
+     * 终端ID
+     */
+    private Long tid;
+    /**
+     * 关键字搜索
+     */
+    private String keywords;
+    /**
+     * 分页
+     */
+    private int page = 1;
+    /**
+     * 每页数量
+     */
+    private int pagesize = 10;
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/TrackServiceBo.java

@@ -0,0 +1,36 @@
+package com.fuyuanshen.equipment.domain.bo;
+
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import com.fuyuanshen.equipment.domain.TrackService;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 轨迹服务业务对象 track_service
+ *
+ * @author Lion Li
+ * @date 2025-11-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TrackService.class, reverseConvertGenerate = false)
+public class TrackServiceBo extends BaseEntity {
+
+    /**
+     *
+     */
+    private Long id;
+
+    /**
+     * 猎鹰服务ID
+     */
+    private Long sid;
+
+    /**
+     * 服务名称
+     */
+    private String sname;
+
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceExcelImportDTO.java

@@ -1,24 +1,21 @@
 package com.fuyuanshen.equipment.domain.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import com.alibaba.excel.converters.bytearray.ByteArrayImageConverter;
 import lombok.Data;
 
 /**
  * @author: 默苍璃
- * @date: 2025-06-0710:00
+ * @date: 2025-06-07 10:00
  */
 @Data
 @HeadRowHeight(20)  // 表头行高
 @ContentRowHeight(100)  // 内容行高
 public class DeviceExcelImportDTO {
 
-    // @ExcelProperty("设备类型")
-    // private Long deviceType;
-
     @ExcelProperty("设备名称")
     @ColumnWidth(20)
     private String deviceName;
@@ -26,14 +23,23 @@ public class DeviceExcelImportDTO {
     @ExcelProperty("设备类型名称")
     private String typeName;
 
-    // @ExcelProperty(value = "设备图片", converter = ByteArrayImageConverter.class)
-    // @ColumnWidth(15)
-    // private byte[] devicePic;
-    //
-    // // 添加图片写入方法
-    // public void setDevicePicFromBytes(byte[] bytes) {
-    //     this.devicePic = bytes;
-    // }
+    /**
+     * 设备图片
+     * 导入时的图片处理方式：
+     * 在导入过程中，图片不是通过Excel单元格中的文本数据（如URL）来处理的
+     * 而是直接从Excel文件中提取嵌入的图片数据
+     * 代码通过POI库直接读取Excel中的图片对象，然后上传到OSS并生成URL
+     */
+    @ExcelProperty("设备图片")
+    @ColumnWidth(20)
+    private byte[] devicePic;
+
+    /**
+     * 用于存储实际图片数据的字段
+     * 使用@ExcelIgnore注解忽略该字段，避免创建额外的列
+     */
+    @ExcelIgnore
+    private byte[] imageData;
 
     @ExcelProperty("设备MAC")
     @ColumnWidth(20)
@@ -46,18 +52,46 @@ public class DeviceExcelImportDTO {
     @ExcelProperty("蓝牙名称")
     private String bluetoothName;
 
-    // @ExcelProperty("设备SN")
-    // @ColumnWidth(20)
-    // private String deviceSn;
-    //
-    // @ExcelProperty("经度")
-    // private String longitude;
-    //
-    // @ExcelProperty("纬度")
-    // private String latitude;
-
     @ExcelProperty("备注")
     @ColumnWidth(30)
     private String remark;
 
+    /*
+     *设备类型数据
+     */
+    @ExcelProperty("是否支持蓝牙")
+    @ColumnWidth(15)
+    private String isSupportBle;
+
+    @ExcelProperty("定位方式")
+    @ColumnWidth(20)
+    private String locateMode;
+
+    @ExcelProperty("通讯方式")
+    @ColumnWidth(20)
+    private String communicationMode;
+
+    /**
+     * 型号字典用于APP页面跳转
+     * app_model_dictionary
+     */
+    @ExcelProperty("型号字典用于APP页面跳转")
+    @ColumnWidth(20)
+    private String appModelDictionary;
+
+    /**
+     * 型号字典用于PC页面跳转
+     * pc_model_dictionary
+     */
+    @ExcelProperty("型号字典用于PC页面跳转")
+    @ColumnWidth(20)
+    private String pcModelDictionary;
+
+    /**
+     * 错误原因
+     */
+    @ExcelProperty("错误原因")
+    @ColumnWidth(30)
+    private String errorMessage;
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceWithTypeExcelExportDTO.java

@@ -0,0 +1,100 @@
+package com.fuyuanshen.equipment.domain.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fuyuanshen.equipment.converter.IgnoreFailedImageConverter;
+import lombok.Data;
+
+import java.net.URL;
+
+/**
+ * 设备及完整类型信息导出DTO
+ *
+ * @author: 默苍璃
+ * @date: 2025-11-04 16:25
+ */
+@Data
+@HeadRowHeight(20)  // 表头行高
+@ContentRowHeight(100)  // 内容行高
+public class DeviceWithTypeExcelExportDTO {
+
+    @ExcelProperty("设备名称")
+    @ColumnWidth(20)
+    private String deviceName;
+
+    @ExcelProperty("设备类型名称")
+    @ColumnWidth(20)
+    private String typeName;
+
+    @ExcelProperty(value = "设备图片", converter = IgnoreFailedImageConverter.class)
+    // @ExcelProperty(value = "设备图片")
+    @ColumnWidth(30)  // 设置图片列宽度
+    private URL devicePic;  // 使用URL类型
+
+    @ExcelProperty("设备MAC")
+    @ColumnWidth(20)
+    private String deviceMac;
+
+    @ExcelProperty("蓝牙名称")
+    @ColumnWidth(20)
+    private String bluetoothName;
+
+    @ExcelProperty("设备IMEI")
+    @ColumnWidth(20)
+    private String deviceImei;
+
+    @ExcelProperty("备注")
+    @ColumnWidth(30)
+    private String remark;
+
+    /**
+     * 绑定状态
+     * 0 未绑定
+     * 1 已绑定
+     */
+    @ExcelProperty("绑定状态")
+    @ColumnWidth(20)
+    private String bindingStatus;
+
+    @ExcelProperty("创建时间")
+    @ColumnWidth(20)
+    private String createTime;
+
+    @ExcelProperty("创建人")
+    @ColumnWidth(20)
+    private String createBy;
+
+    /*
+     *设备类型数据
+     */
+    @ExcelProperty("是否支持蓝牙")
+    @ColumnWidth(15)
+    private String isSupportBle;
+
+    @ExcelProperty("定位方式")
+    @ColumnWidth(20)
+    private String locateMode;
+
+    @ExcelProperty("通讯方式")
+    @ColumnWidth(20)
+    private String communicationMode;
+
+    /**
+     * 型号字典用于APP页面跳转
+     * app_model_dictionary
+     */
+    @ExcelProperty("型号字典用于APP页面跳转")
+    @ColumnWidth(20)
+    private String appModelDictionary;
+
+    /**
+     * 型号字典用于PC页面跳转
+     * pc_model_dictionary
+     */
+    @ExcelProperty("型号字典用于PC页面跳转")
+    @ColumnWidth(20)
+    private String pcModelDictionary;
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/TerminalDeviceDto.java

@@ -0,0 +1,29 @@
+package com.fuyuanshen.equipment.domain.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor      // 必须
+public class TerminalDeviceDto {
+    /**
+     * 终端设备名称
+     */
+    private String name;
+    /**
+     * 终端设备ID
+     */
+    private Long tid;
+    /**
+     * 终端设备描述
+     */
+    private String desc;
+    /**
+     * 终端设备创建时间
+     */
+    private String createtime;
+    /**
+     * 终端设备最后定位时间
+     */
+    private String locatetime;
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java

@@ -26,8 +26,6 @@ public class DeviceForm {
     @Schema(title = "客户号")
     private Long customerId;
 
-    /*@Schema(value = "设备编号")
-    private String deviceNo;*/
 
     @NotBlank(message = "设备名称不能为空")
     @Schema(title = "设备名称", required = true)
@@ -56,4 +54,25 @@ public class DeviceForm {
     @Schema(title = "备注")
     private String remark;
 
+
+    // 设备类型相关字段
+    @Schema(title = "设备类型名称")
+    private String typeName;
+
+    @Schema(title = "是否支持蓝牙")
+    private String isSupportBle;
+
+    @Schema(title = "定位方式")
+    private String locateMode;
+
+    @Schema(title = "通讯方式")
+    private String communicationMode;
+
+    @Schema(title = "APP模型字典")
+    private String appModelDictionary;
+
+    @Schema(title = "PC模型字典")
+    private String pcModelDictionary;
+
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java

@@ -2,6 +2,7 @@ package com.fuyuanshen.equipment.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * @Description: 设备类型
@@ -48,5 +49,10 @@ public class DeviceTypeForm {
      */
     @Schema(title = "型号字典用于PC页面跳转")
     private String pcModelDictionary;
+    @Schema(title = "设备图片")
+    private String devicePic;
+
+    @Schema(title = "设备图片")
+    private MultipartFile file;
 
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java

@@ -122,5 +122,25 @@ public class DeviceQueryCriteria extends BaseEntity {
      * online_status
      */
     private Integer onlineStatus;
+    /**
+     * 高德终端ID是否存在
+     */
+    private Boolean isTid;
+    /**
+     * 高德服务ID
+     */
+    private String sid;
+    /**
+     * 围栏ID
+     */
+    private Long fenceId;
+
+    /**
+     * 绑定状态
+     * 0 未绑定
+     * 1 已绑定
+     */
+    @Schema(title = "绑定状态")
+    private Integer bindingStatus;
 
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceFenceAccessRecordVo.java

@@ -2,6 +2,7 @@ package com.fuyuanshen.equipment.domain.vo;
 
 import java.util.Date;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -60,6 +61,13 @@ public class DeviceFenceAccessRecordVo implements Serializable {
     @ExcelProperty(value = "设备名称")
     private String deviceName;
 
+    /**
+     * 事件时间
+     */
+    @ExcelProperty(value = "事件时间")
+    @ColumnWidth(120)
+    private String eventTime;
+
     /**
      * 用户ID
      */
@@ -76,27 +84,21 @@ public class DeviceFenceAccessRecordVo implements Serializable {
     /**
      * 纬度
      */
-    @ExcelProperty(value = "纬度")
+    // @ExcelProperty(value = "纬度")
     private Double latitude;
 
     /**
      * 经度
      */
-    @ExcelProperty(value = "经度")
+    // @ExcelProperty(value = "经度")
     private Double longitude;
 
     /**
      * 定位精度
      */
-    @ExcelProperty(value = "定位精度")
+    // @ExcelProperty(value = "定位精度")
     private Long accuracy;
 
-    /**
-     * 事件时间
-     */
-    @ExcelProperty(value = "事件时间")
-    private Date eventTime;
-
     /**
      * 事件地址
      */
@@ -106,8 +108,7 @@ public class DeviceFenceAccessRecordVo implements Serializable {
     /**
      * 记录创建时间
      */
-    @ExcelProperty(value = "记录创建时间")
+    // @ExcelProperty(value = "记录创建时间")
     private Date createTime;
 
-
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGeoFenceVo.java

@@ -101,6 +101,14 @@ public class DeviceGeoFenceVo implements Serializable {
      */
     // @ExcelProperty(value = "更新时间")
     private Date updateTime;
+    /**
+     * 高德服务ID
+     */
+    private Long sid;
+    /**
+     * 高德围栏ID
+     */
+    private Long gfid;
 
 
     public void setAreaTypeNameByAreaType() {

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java

@@ -1,13 +1,11 @@
 package com.fuyuanshen.equipment.domain.vo;
 
-import java.util.Date;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.write.style.ColumnWidth;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuyuanshen.common.tenant.core.TenantEntity;
 import com.fuyuanshen.equipment.domain.DeviceRepairRecords;
-import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
-import cn.idev.excel.annotation.ExcelProperty;
-import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
-import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -34,31 +32,39 @@ public class DeviceRepairRecordsVo extends TenantEntity implements Serializable
     /**
      * 维修记录ID
      */
-    @ExcelProperty(value = "维修记录ID")
+    // @ExcelProperty(value = "维修记录ID")
     private Long recordId;
 
     /**
      * 设备ID
      */
-    @ExcelProperty(value = "设备ID")
+    // @ExcelProperty(value = "设备ID")
     private String deviceId;
 
+    /**
+     * 设备名称
+     */
+    @ExcelProperty(value = "设备名称")
+    private String deviceName;
+
     /**
      * 维修时间
      */
     @ExcelProperty(value = "维修时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ColumnWidth(value = 20)
     private Date repairTime;
 
     /**
-     * 维修部位
+     * 损坏部位
      */
-    @ExcelProperty(value = "维修部位")
+    @ExcelProperty(value = "损坏部位")
     private String repairPart;
 
     /**
-     * 维修原因
+     * 损坏原因
      */
-    @ExcelProperty(value = "维修原因")
+    @ExcelProperty(value = "损坏原因")
     private String repairReason;
 
     /**
@@ -66,12 +72,8 @@ public class DeviceRepairRecordsVo extends TenantEntity implements Serializable
      */
     @ExcelProperty(value = "维修人员")
     private String repairPerson;
-    /**
-     * 维修人员
-     */
-    @ExcelProperty(value = "设备名称")
-    private String deviceName;
+
 
     private List<DeviceRepairImagesVo> images;
 
-}
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/TrackServiceVo.java

@@ -0,0 +1,50 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
+import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
+import com.fuyuanshen.equipment.domain.TrackService;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 轨迹服务视图对象 track_service
+ *
+ * @author Lion Li
+ * @date 2025-11-24
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TrackService.class)
+public class TrackServiceVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 猎鹰服务ID
+     */
+    @ExcelProperty(value = "猎鹰服务ID")
+    private Long sid;
+
+    /**
+     * 服务名称
+     */
+    @ExcelProperty(value = "服务名称")
+    private String sname;
+
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/WebDeviceVo.java

@@ -1,6 +1,7 @@
 package com.fuyuanshen.equipment.domain.vo;
 
 import cn.idev.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -103,5 +104,20 @@ public class WebDeviceVo implements Serializable {
      * 分享用户数量
      */
     private Integer shareUsersNumber;
+    /**
+     * 高德服务ID
+     */
+    @Schema(title = "服务ID（高德）")
+    private Long sid;
+    /**
+     * 高德终端ID
+     */
+    @Schema(title = "终端ID（高德）")
+    private Long tid;
+    /**
+     * 高德轨迹ID
+     */
+    @Schema(title = "轨迹ID（高德）")
+    private Long trid;
 
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/excel/HeadValidateListener.java

@@ -0,0 +1,54 @@
+package com.fuyuanshen.equipment.excel;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson2.JSON;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 读取表头 监听器
+ *
+ * @author: 默苍璃
+ * @date: 2025-11-1809:36
+ */
+@Slf4j
+public class HeadValidateListener extends AnalysisEventListener<Map<Integer, String>> {
+
+    private List<String> headNames = new ArrayList<>();
+
+
+    /**
+     * When analysis one row trigger invoke function.
+     *
+     * @param headMap one row value. It is same as {@link AnalysisContext#readRowHolder()}
+     * @param context analysis context
+     */
+    @Override
+    public void invoke(Map<Integer, String> headMap, AnalysisContext context) {
+        log.info("解析到一条数据: {}", JSON.toJSONString(headMap));
+        // 按顺序收集表头名称
+        for (int i = 0; i < headMap.size(); i++) {
+            headNames.add(headMap.get(i));
+        }
+    }
+
+    /**
+     * if have something to do after all analysis
+     *
+     * @param context
+     */
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        // 读取完成后不需要额外操作
+    }
+
+
+    public List<String> getHeadNames() {
+        return headNames;
+    }
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/excel/UploadDeviceDataListener.java

@@ -5,14 +5,14 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
 import com.alibaba.fastjson2.JSON;
-import com.fuyuanshen.common.core.domain.model.LoginUser;
-import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.common.core.utils.file.ImageCompressUtil;
 import com.fuyuanshen.equipment.constants.DeviceConstants;
 import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.DeviceType;
 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.form.DeviceTypeForm;
 import com.fuyuanshen.equipment.handler.ImageWriteHandler;
 import com.fuyuanshen.system.domain.vo.SysOssVo;
 import lombok.extern.slf4j.Slf4j;
@@ -46,38 +46,41 @@ public class UploadDeviceDataListener implements ReadListener<DeviceExcelImportD
     }
 
 
-    public ImportResult getImportResult() {
+    public ImportResult getImportResult1() {
         ImportResult result = new ImportResult();
         result.setSuccessCount(successCount);
         result.setFailureCount(failureCount);
 
-        // 准备失败记录（包含图片数据）
+        // 准备失败记录
         List<DeviceExcelImportDTO> failedRecordsWithImages = new ArrayList<>();
 
-        for (DeviceExcelImportDTO failedRecord : failedRecords) {
+        // 创建一个映射，用于存储失败记录行号与图片数据的关系
+        Map<Integer, byte[]> errorReportImageMap = new HashMap<>();
+
+        for (int i = 0; i < failedRecords.size(); i++) {
+            DeviceExcelImportDTO failedRecord = failedRecords.get(i);
+            // 创建副本，避免修改原始数据
+            DeviceExcelImportDTO recordWithImage = new DeviceExcelImportDTO();
+            BeanUtil.copyProperties(failedRecord, recordWithImage);
+            // 设置图片占位符，让用户知道这里有图片
+            // recordWithImage.setDevicePic("[图片]");
+            failedRecordsWithImages.add(recordWithImage);
+
             // 获取原始行号
-            Integer rowIndex = null;
+            Integer originalRowIndex = null;
             for (Map.Entry<Integer, DeviceExcelImportDTO> entry : rowDtoMap.entrySet()) {
                 if (entry.getValue() == failedRecord) {
-                    rowIndex = entry.getKey();
+                    originalRowIndex = entry.getKey();
                     break;
                 }
             }
 
-            if (rowIndex != null) {
-                // 创建副本，避免修改原始数据
-                DeviceExcelImportDTO recordWithImage = new DeviceExcelImportDTO();
-                BeanUtil.copyProperties(failedRecord, recordWithImage);
-
-                // 设置图片数据
-                byte[] imageData = rowImageMap.get(rowIndex);
+            // 保存图片数据用于错误报告
+            if (originalRowIndex != null) {
+                byte[] imageData = rowImageMap.get(originalRowIndex);
                 if (imageData != null) {
-                    // recordWithImage.setDevicePicFromBytes(imageData);
+                    errorReportImageMap.put(i, imageData); // 使用新的列表索引
                 }
-
-                failedRecordsWithImages.add(recordWithImage);
-            } else {
-                failedRecordsWithImages.add(failedRecord);
             }
         }
 
@@ -99,7 +102,8 @@ public class UploadDeviceDataListener implements ReadListener<DeviceExcelImportD
 
                 // 保存错误报告到文件（包含图片）
                 File errorFile = new File(errorDir, fileName);
-                EasyExcel.write(errorFile, DeviceExcelImportDTO.class).registerWriteHandler(new ImageWriteHandler()) // 添加图片处理
+                EasyExcel.write(errorFile, DeviceExcelImportDTO.class)
+                        .registerWriteHandler(new ImageWriteHandler(errorReportImageMap)) // 传递图片数据映射
                         .sheet("失败数据").doWrite(failedRecordsWithImages);
 
                 // 生成访问URL
@@ -114,6 +118,79 @@ public class UploadDeviceDataListener implements ReadListener<DeviceExcelImportD
         return result;
     }
 
+    public ImportResult getImportResult() {
+        ImportResult result = new ImportResult();
+        result.setSuccessCount(successCount);
+        result.setFailureCount(failureCount);
+
+        // 准备失败记录
+        List<DeviceExcelImportDTO> failedRecordsWithImages = new ArrayList<>();
+
+        for (int i = 0; i < failedRecords.size(); i++) {
+            DeviceExcelImportDTO failedRecord = failedRecords.get(i);
+            // 创建副本，避免修改原始数据
+            DeviceExcelImportDTO recordWithImage = new DeviceExcelImportDTO();
+            BeanUtil.copyProperties(failedRecord, recordWithImage);
+
+            // 获取原始行号
+            Integer originalRowIndex = null;
+            for (Map.Entry<Integer, DeviceExcelImportDTO> entry : rowDtoMap.entrySet()) {
+                if (entry.getValue() == failedRecord) {
+                    originalRowIndex = entry.getKey();
+                    break;
+                }
+            }
+
+            // 保存图片数据用于错误报告
+            if (originalRowIndex != null) {
+                byte[] imageData = rowImageMap.get(originalRowIndex);
+                if (imageData != null) {
+                    // recordWithImage.setImageData(imageData);
+                    recordWithImage.setDevicePic(imageData);
+                }
+            }
+
+            failedRecordsWithImages.add(recordWithImage);
+        }
+
+        result.setFailedRecords(failedRecordsWithImages);
+
+        // 生成错误报告
+        if (!failedRecordsWithImages.isEmpty()) {
+            try {
+                // 生成唯一的文件名
+                String fileName = "import_errors_" + System.currentTimeMillis() + ".xlsx";
+
+                // 创建错误报告目录
+                String errorDirPath = params.getFilePath() + DeviceConstants.ERROR_REPORT_DIR;
+                File errorDir = new File(errorDirPath);
+                if (!errorDir.exists() && !errorDir.mkdirs()) {
+                    log.error("无法创建错误报告目录: {}", errorDirPath);
+                    return result;
+                }
+
+                // 保存错误报告到文件（包含图片）
+                File errorFile = new File(errorDir, fileName);
+                EasyExcel.write(errorFile, DeviceExcelImportDTO.class)
+                        .sheet("失败数据").doWrite(failedRecordsWithImages);
+
+                // 生成访问URL
+                SysOssVo upload = params.getOssService().upload(errorFile);
+                String url = upload.getUrl();
+                // 将http://替换为https://，但不影响已经是https://的URL
+                if (url.startsWith("http://")) {
+                    url = "https://" + url.substring(7);
+                }
+                result.setErrorExcelUrl(url);
+                log.info("错误报告已保存: {}", errorFile.getAbsolutePath());
+                log.info("错误报告已保存: {}", url);
+            } catch (Exception e) {
+                log.error("生成错误报告失败", e);
+            }
+        }
+
+        return result;
+    }
 
     @Override
     public void invoke(DeviceExcelImportDTO data, AnalysisContext context) {
@@ -142,14 +219,234 @@ public class UploadDeviceDataListener implements ReadListener<DeviceExcelImportD
 
 
     private void processDataRowByRow() {
-        LoginUser loginUser = LoginHelper.getLoginUser();
+        // 如果没有数据，直接返回
+        if (rowIndexList.isEmpty()) {
+            return;
+        }
+
+        // 批量处理设备类型，减少数据库查询次数
+        Set<String> typeNames = new HashSet<>();
+        for (Integer rowIndex : rowIndexList) {
+            Device device = rowDeviceMap.get(rowIndex);
+            if (device != null && device.getTypeName() != null) {
+                typeNames.add(device.getTypeName());
+            }
+        }
+
+        // 批量查询所有设备类型
+        Map<String, DeviceType> deviceTypeMap = new HashMap<>();
+        if (!typeNames.isEmpty()) {
+            List<DeviceType> deviceTypes = params.getDeviceTypeService().queryByNames(new ArrayList<>(typeNames));
+            for (DeviceType deviceType : deviceTypes) {
+                deviceTypeMap.put(deviceType.getTypeName(), deviceType);
+            }
+        }
+
+        for (Integer rowIndex : rowIndexList) {
+            Device device = rowDeviceMap.get(rowIndex);
+            DeviceExcelImportDTO originalDto = rowDtoMap.get(rowIndex);
+            try {
+                // 从缓存中获取设备类型
+                DeviceType deviceType = deviceTypeMap.get(device.getTypeName());
+
+                DeviceForm deviceForm = new DeviceForm();
+                deviceForm.setDeviceName(device.getDeviceName());
+                deviceForm.setDeviceType(deviceType != null ? deviceType.getId() : null);
+                deviceForm.setTypeName(device.getTypeName());
+                deviceForm.setRemark(device.getRemark());
+                deviceForm.setDeviceMac(device.getDeviceMac());
+                deviceForm.setDeviceImei(device.getDeviceImei());
+                deviceForm.setBluetoothName(device.getBluetoothName());
+                deviceForm.setDevicePic(device.getDevicePic());
+
+                // 设置设备类型相关信息，供设备服务内部创建设备类型时使用
+                if (deviceType == null) {
+                    deviceForm.setIsSupportBle(originalDto.getIsSupportBle());
+                    deviceForm.setLocateMode(originalDto.getLocateMode());
+                    deviceForm.setCommunicationMode(originalDto.getCommunicationMode());
+                    deviceForm.setAppModelDictionary(originalDto.getAppModelDictionary());
+                    deviceForm.setPcModelDictionary(originalDto.getPcModelDictionary());
+                }
+
+                params.getDeviceService().addDevice(deviceForm);
+                successCount++;
+                log.info("行 {} 数据插入成功", rowIndex);
+            } catch (Exception e) {
+                failureCount++;
+                originalDto.setErrorMessage(e.getMessage());
+                // originalDto.setErrorMessage("数据有误，请核对模板后，确认数据无误后，重新再试！！！");
+                failedRecords.add(originalDto);
+                log.error("行 {} 数据插入失败: {}", rowIndex, e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * 处理图片数据
+     */
+    private void processImages() {
+        // 如果没有数据行，直接返回
+        if (rowIndexList.isEmpty()) {
+            return;
+        }
+
+        // 检查是否有图片需要处理
+        try {
+            // 只在确实有图片时才打开文件处理
+            boolean hasImages = false;
+            try (OPCPackage opcPackage = OPCPackage.open(params.getFile().getInputStream())) {
+                ZipSecureFile.setMinInflateRatio(-1.0d);
+                XSSFWorkbook workbook = new XSSFWorkbook(opcPackage);
+                XSSFSheet sheet = workbook.getSheetAt(0);
+
+                XSSFDrawing drawing = sheet.getDrawingPatriarch();
+                if (drawing != null) {
+                    for (XSSFShape shape : drawing.getShapes()) {
+                        if (shape instanceof XSSFPicture) {
+                            hasImages = true;
+                            break;
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("检查图片时发生异常: {}", e.getMessage());
+                // 如果检查图片失败，继续处理数据
+                return;
+            }
+
+            // 如果没有图片，直接返回
+            if (!hasImages) {
+                log.info("未检测到图片，跳过图片处理");
+                return;
+            }
+
+            // 有图片时才进行处理
+            try (OPCPackage opcPackage = OPCPackage.open(params.getFile().getInputStream())) {
+                ZipSecureFile.setMinInflateRatio(-1.0d);
+                XSSFWorkbook workbook = new XSSFWorkbook(opcPackage);
+                XSSFSheet sheet = workbook.getSheetAt(0);
+
+                XSSFDrawing drawing = sheet.getDrawingPatriarch();
+                if (drawing == null) return;
+
+                for (XSSFShape shape : drawing.getShapes()) {
+                    if (shape instanceof XSSFPicture) {
+                        XSSFPicture picture = (XSSFPicture) shape;
+                        XSSFClientAnchor anchor = picture.getPreferredSize();
+                        int rowIndex = anchor.getRow1();
+                        int colIndex = anchor.getCol1();
+
+                        if (colIndex == 2) {
+                            Device device = rowDeviceMap.get(rowIndex);
+                            if (device != null) {
+                                try {
+                                    byte[] imageData = picture.getPictureData().getData();
+
+                                    // 检查图片大小，如果超过5MB则拒绝上传
+                                    if (imageData.length > 5 * 1024 * 1024) {
+                                        String errorMsg = "图片大小超过5MB限制，请压缩后重新上传";
+                                        log.warn("行 {} 图片过大: {} bytes", rowIndex, imageData.length);
+                                        // 将错误信息添加到该行的DTO中
+                                        DeviceExcelImportDTO dto = rowDtoMap.get(rowIndex);
+                                        if (dto != null) {
+                                            dto.setErrorMessage(errorMsg);
+                                            failedRecords.add(dto);
+                                            failureCount++;
+                                        }
+                                        device.setDevicePic(null); // 设置为空，让插入继续
+                                        continue; // 跳过当前图片处理
+                                    }
+
+                                    // 表示Excel表格中的第3列（因为索引从0开始计算）
+                                    String extraValue = getCellValue(sheet, rowIndex, 2);
+                                    String imageUrl = uploadAndGenerateUrl(imageData, extraValue);
+                                    device.setDevicePic(imageUrl);
+
+                                    // 2. 保存图片数据到DTO，用于错误报告
+                                    rowImageMap.put(rowIndex, imageData);
+                                } catch (Exception e) {
+                                    log.error("行 {} 图片处理失败: {}", rowIndex, e.getMessage());
+                                    device.setDevicePic(null); // 设置为空，让插入继续
+                                }
+                            }
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                log.error("图片处理失败：{}", e.getMessage(), e);
+            }
+        } catch (Exception e) {
+            log.warn("图片处理过程中发生异常: {}", e.getMessage());
+        }
+    }
+
+
+    private void processDataRowByRow1() {
         for (Integer rowIndex : rowIndexList) {
             Device device = rowDeviceMap.get(rowIndex);
             DeviceExcelImportDTO originalDto = rowDtoMap.get(rowIndex);
             try {
                 // 设备类型
                 DeviceType deviceType = params.getDeviceTypeService().queryByName(device.getTypeName());
-                // params.getDeviceService().save(device);
+
+                // 如果设备类型不存在，则创建新的设备类型
+                if (deviceType == null) {
+                    DeviceType newDeviceType = new DeviceType();
+                    newDeviceType.setTypeName(device.getTypeName());
+                    newDeviceType.setIsSupportBle("是".equals(originalDto.getIsSupportBle()) || "1".equals(originalDto.getIsSupportBle()));
+
+                    // 设置定位方式
+                    if (originalDto.getLocateMode() != null) {
+                        switch (originalDto.getLocateMode()) {
+                            case "无":
+                                newDeviceType.setLocateMode("0");
+                                break;
+                            case "GPS":
+                                newDeviceType.setLocateMode("1");
+                                break;
+                            case "基站":
+                                newDeviceType.setLocateMode("2");
+                                break;
+                            case "wifi":
+                                newDeviceType.setLocateMode("3");
+                                break;
+                            case "北斗":
+                                newDeviceType.setLocateMode("4");
+                                break;
+                            default:
+                                newDeviceType.setLocateMode(originalDto.getLocateMode());
+                        }
+                    }
+
+                    // 设置通讯方式
+                    if (originalDto.getCommunicationMode() != null) {
+                        switch (originalDto.getCommunicationMode()) {
+                            case "4G":
+                                newDeviceType.setCommunicationMode("0");
+                                break;
+                            case "蓝牙":
+                                newDeviceType.setCommunicationMode("1");
+                                break;
+                            case "4G&蓝牙":
+                                newDeviceType.setCommunicationMode("2");
+                                break;
+                            default:
+                                newDeviceType.setCommunicationMode(originalDto.getCommunicationMode());
+                        }
+                    }
+
+                    newDeviceType.setAppModelDictionary(originalDto.getAppModelDictionary());
+                    newDeviceType.setPcModelDictionary(originalDto.getPcModelDictionary());
+
+                    DeviceTypeForm deviceTypeForm = new DeviceTypeForm();
+                    BeanUtil.copyProperties(newDeviceType, deviceTypeForm, true);
+                    // 创建新的设备类型
+                    params.getDeviceTypeService().create(deviceTypeForm);
+
+                    // 重新查询确保获取到正确的ID
+                    deviceType = params.getDeviceTypeService().queryByName(device.getTypeName());
+                }
+
                 DeviceForm deviceForm = new DeviceForm();
                 deviceForm.setDeviceName(device.getDeviceName());
                 deviceForm.setDeviceType(deviceType.getId());
@@ -163,13 +460,19 @@ public class UploadDeviceDataListener implements ReadListener<DeviceExcelImportD
                 log.info("行 {} 数据插入成功", rowIndex);
             } catch (Exception e) {
                 failureCount++;
+                originalDto.setErrorMessage(e.getMessage());
+                // originalDto.setErrorMessage("数据有误，请核对模板后，确认数据无误后，重新再试！！！");
                 failedRecords.add(originalDto);
                 log.error("行 {} 数据插入失败: {}", rowIndex, e.getMessage());
             }
         }
     }
 
-    private void processImages() {
+
+    /**
+     * 处理图片数据
+     */
+    private void processImages1() {
         try (OPCPackage opcPackage = OPCPackage.open(params.getFile().getInputStream())) {
             ZipSecureFile.setMinInflateRatio(-1.0d);
             XSSFWorkbook workbook = new XSSFWorkbook(opcPackage);
@@ -190,6 +493,22 @@ public class UploadDeviceDataListener implements ReadListener<DeviceExcelImportD
                         if (device != null) {
                             try {
                                 byte[] imageData = picture.getPictureData().getData();
+
+                                // 检查图片大小，如果超过5MB则拒绝上传
+                                if (imageData.length > 5 * 1024 * 1024) {
+                                    String errorMsg = "图片大小超过5MB限制，请压缩后重新上传";
+                                    log.warn("行 {} 图片过大: {} bytes", rowIndex, imageData.length);
+                                    // 将错误信息添加到该行的DTO中
+                                    DeviceExcelImportDTO dto = rowDtoMap.get(rowIndex);
+                                    if (dto != null) {
+                                        dto.setErrorMessage(errorMsg);
+                                        failedRecords.add(dto);
+                                        failureCount++;
+                                    }
+                                    device.setDevicePic(null); // 设置为空，让插入继续
+                                    continue; // 跳过当前图片处理
+                                }
+
                                 // 表示Excel表格中的第3列（因为索引从0开始计算）
                                 String extraValue = getCellValue(sheet, rowIndex, 2);
                                 String imageUrl = uploadAndGenerateUrl(imageData, extraValue);
@@ -224,9 +543,16 @@ public class UploadDeviceDataListener implements ReadListener<DeviceExcelImportD
             return null;
         }
         try {
+            // 如果图片超过500KB，则进行压缩优化
+            if (imageData.length > 500 * 1024) {
+                log.info("检测到大图片 ({} bytes)，正在进行压缩优化...", imageData.length);
+                imageData = ImageCompressUtil.compressImage(imageData, 500 * 1024); // 压缩到500KB以下
+            }
+
             String fileExtension = "jpg";
             String newFileName = "PS_" + new Random(8) + "." + fileExtension;
             SysOssVo upload = params.getOssService().upload(imageData, newFileName);
+            log.info("图片保存成功，URL: {}", upload.getUrl());
             return upload.getUrl();
         } catch (Exception e) {
             log.error("保存图片失败", e);
@@ -234,4 +560,5 @@ public class UploadDeviceDataListener implements ReadListener<DeviceExcelImportD
         }
     }
 
-}
+}
+

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/handler/ImageWriteHandler.java

@@ -4,66 +4,95 @@ import com.alibaba.excel.write.handler.SheetWriteHandler;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFDrawing;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
+
+import java.util.Map;
 
 /**
  * @author: 默苍璃
- * @date: 2025-06-0718:05
+ * @date: 2025-06-07 18:05
  */
 public class ImageWriteHandler implements SheetWriteHandler {
 
+    private Map<Integer, byte[]> imageMap;
+    private int imageColIndex;
+
+    public ImageWriteHandler(Map<Integer, byte[]> imageMap) {
+        this(imageMap, 2);
+    }
+
+    public ImageWriteHandler(Map<Integer, byte[]> imageMap, int imageColIndex) {
+        this.imageMap = imageMap;
+        this.imageColIndex = imageColIndex;
+    }
+
+    @Override
+    public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
+        if (imageMap == null || imageMap.isEmpty()) {
+            return;
+        }
+
+        Workbook workbook = writeWorkbookHolder.getWorkbook();
+        Sheet sheet = writeSheetHolder.getSheet();
+
+        // 设置图片列的宽度
+        sheet.setColumnWidth(imageColIndex, 20 * 256); // 20个字符宽度
+
+        for (Map.Entry<Integer, byte[]> entry : imageMap.entrySet()) {
+            int dataRowIndex = entry.getKey();
+            int rowIndex = dataRowIndex + 1; // 跳过标题行
+            byte[] imageData = entry.getValue();
+
+            if (imageData != null && imageData.length > 0) {
+                insertImage(workbook, sheet, rowIndex, imageData);
+            }
+        }
+    }
+
+    private void insertImage(Workbook workbook, Sheet sheet, int rowIndex, byte[] imageData) {
+        try {
+            // 获取或创建行（确保行存在）
+            Row row = sheet.getRow(rowIndex);
+            if (row == null) {
+                row = sheet.createRow(rowIndex);
+            }
+
+            // 设置合适的行高（不要设置过大）
+            row.setHeightInPoints(60); // 60磅，足够显示小图
+
+            // 添加图片到工作簿
+            int pictureIdx = workbook.addPicture(imageData, Workbook.PICTURE_TYPE_JPEG);
+
+            // 创建绘图对象
+            Drawing<?> drawing = sheet.createDrawingPatriarch();
+
+            // 关键修改：使用MOVE_DONT_RESIZE锚点类型，避免影响行高
+            ClientAnchor anchor = workbook.getCreationHelper().createClientAnchor();
+            anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_DONT_RESIZE);
+            anchor.setCol1(imageColIndex);
+            anchor.setRow1(rowIndex);
+            anchor.setCol2(imageColIndex + 1);
+            anchor.setRow2(rowIndex + 1);
+
+            // 设置较小的偏移量，确保图片在单元格内
+            anchor.setDx1(0);
+            anchor.setDy1(0);
+            anchor.setDx2(512 * 5); // 约5个字符宽度
+            anchor.setDy2(256 * 4); // 约4行高度
+
+            // 插入图片
+            Picture picture = drawing.createPicture(anchor, pictureIdx);
+
+            // 不要调用resize()，避免自动调整影响行高
+            // picture.resize();
+
+        } catch (Exception e) {
+            System.err.println("插入图片失败，行: " + rowIndex);
+            e.printStackTrace();
+        }
+    }
+
     @Override
     public void beforeSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
         // 不需要实现
     }
-
-    @Override
-    public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
-        Workbook workbook = writeWorkbookHolder.getWorkbook();
-        Sheet sheet = writeSheetHolder.getSheet();
-
-        // 获取设备图片列索引（假设是第4列，索引3）
-        int imageColIndex = 3;
-
-        // 遍历所有行
-        for (int rowIndex = 1; rowIndex <= sheet.getLastRowNum(); rowIndex++) { // 从第2行开始（跳过标题）
-            Row row = sheet.getRow(rowIndex);
-            if (row == null) continue;
-
-            Cell imageCell = row.getCell(imageColIndex);
-            if (imageCell == null) continue;
-
-            // 获取图片数据
-            byte[] imageData = null;
-            if (imageCell.getCellType() == CellType.STRING) {
-                // 处理Base64编码的图片（如果需要）
-            }
-
-            if (imageData != null && imageData.length > 0) {
-                try {
-                    // 添加图片到工作表
-                    int pictureIdx = workbook.addPicture(imageData, Workbook.PICTURE_TYPE_JPEG);
-
-                    // 创建绘图对象
-                    if (sheet instanceof XSSFSheet) {
-                        XSSFSheet xssfSheet = (XSSFSheet) sheet;
-                        XSSFDrawing drawing = xssfSheet.createDrawingPatriarch();
-
-                        // 设置图片位置
-                        XSSFClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, imageColIndex, rowIndex, imageColIndex + 1, rowIndex + 1);
-
-                        // 创建图片
-                        drawing.createPicture(anchor, pictureIdx);
-                    }
-
-                    // 清除单元格内容
-                    imageCell.setBlank();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceFenceAccessRecordMapper.java

@@ -28,17 +28,19 @@ public interface DeviceFenceAccessRecordMapper extends BaseMapperPlus<DeviceFenc
      */
     Page<DeviceFenceAccessRecordVo> selectVoPageWithFenceAndDeviceName(Page<DeviceFenceAccessRecord> page, @Param(Constants.WRAPPER) Wrapper<DeviceFenceAccessRecord> wrapper);
 
-    List<DeviceFenceAccessRecordVo> selectVoPageWithFenceAndDeviceName(@Param(Constants.WRAPPER) Wrapper<DeviceFenceAccessRecord> wrapper,@Param("fenceName") String fenceName);
+    List<DeviceFenceAccessRecordVo> selectVoPageWithFenceAndDeviceName(@Param(Constants.WRAPPER) Wrapper<DeviceFenceAccessRecord> wrapper, @Param("fenceName") String fenceName);
 
     /**
      * 分页查询围栏进出记录列表（纯XML形式）
      *
      * @param page 分页参数
-     * @param bo 查询条件
+     * @param bo   查询条件
      * @return 围栏进出记录分页列表
      */
     Page<DeviceFenceAccessRecordVo> selectVoPageByXml(Page<DeviceFenceAccessRecord> page, @Param("bo") DeviceFenceAccessRecordBo bo);
 
+    List<DeviceFenceAccessRecordVo> selectVoPageByXml(@Param("bo") DeviceFenceAccessRecordBo bo);
+
 
     /**
      * 查询设备最新的围栏记录

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceFenceTerminalMapper.java

@@ -0,0 +1,7 @@
+package com.fuyuanshen.equipment.mapper;
+
+import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+import com.fuyuanshen.equipment.domain.DeviceFenceTerminal;
+
+public interface DeviceFenceTerminalMapper extends BaseMapperPlus<DeviceFenceTerminal, DeviceFenceTerminal> {
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java

@@ -32,6 +32,8 @@ public interface DeviceMapper extends BaseMapper<Device> {
 
     List<Device> findAll(@Param("criteria") DeviceQueryCriteria criteria);
 
+    IPage<Device> findAllTerminal(@Param("criteria") DeviceQueryCriteria criteria, Page<Device> page);
+
     List<Device> findAllDevices(@Param("criteria") DeviceQueryCriteria criteria);
 
     /**
@@ -137,4 +139,13 @@ public interface DeviceMapper extends BaseMapper<Device> {
     List<DeviceUsageFrequencyVo> getDeviceUsageFrequency(@Param("days") int days);
 
     List<OnlineStatusVo> queryOnlineStatusList();
+
+    /**
+     * 根据设备类型ID查询设备数量
+     *
+     * @param deviceTypeId 设备类型ID
+     * @return 设备数量
+     */
+    int countByDeviceTypeId(@Param("deviceTypeId") Long deviceTypeId);
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceTypeMapper.java

@@ -51,4 +51,13 @@ public interface DeviceTypeMapper extends BaseMapper<DeviceType> {
      */
     DeviceType queryByName(@Param("criteria") DeviceTypeQueryCriteria criteria);
 
+    /**
+     * 根据名称列表查询设备类型
+     *
+     * @param typeNames
+     * @return
+     */
+    List<DeviceType> selectByNames(@Param("typeNames") List<String> typeNames);
+
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/TrackServiceMapper.java

@@ -0,0 +1,15 @@
+package com.fuyuanshen.equipment.mapper;
+
+import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+import com.fuyuanshen.equipment.domain.TrackService;
+import com.fuyuanshen.equipment.domain.vo.TrackServiceVo;
+
+/**
+ * 轨迹服务Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-11-24
+ */
+public interface TrackServiceMapper extends BaseMapperPlus<TrackService, TrackServiceVo> {
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java

@@ -1,13 +1,10 @@
 package com.fuyuanshen.equipment.service;
 
-import cn.hutool.core.lang.Dict;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fuyuanshen.common.core.domain.PageResult;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
 import com.fuyuanshen.equipment.domain.form.DeviceForm;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
@@ -33,6 +30,8 @@ public interface DeviceService extends IService<Device> {
      */
     TableDataInfo<Device> queryAll(DeviceQueryCriteria criteria, Page<Device> page) throws IOException;
 
+    TableDataInfo<Device> queryAllTerminal(DeviceQueryCriteria criteria, Page<Device> page) throws IOException;
+
     /**
      * 查询所有数据不分页
      *
@@ -146,7 +145,7 @@ public interface DeviceService extends IService<Device> {
      * @return
      */
     List<Map<String, Object>> getEquipmentUsageData(Long deviceTypeId, Integer range);
-    
+
     /**
      * 根据设备IMEI查询设备
      *
@@ -191,7 +190,7 @@ public interface DeviceService extends IService<Device> {
     /**
      * 根据条件查询设备位置信息
      *
-     * @param groupId 设备分组ID
+     * @param groupId    设备分组ID
      * @param deviceType 设备类型
      * @param deviceImei 设备IMEI
      * @return 设备位置信息列表

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java

@@ -8,6 +8,7 @@ import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.domain.form.DeviceTypeForm;
 import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -49,19 +50,28 @@ public interface DeviceTypeService extends IService<DeviceType> {
      */
     DeviceType queryByName(String typeName);
 
+    /**
+     * 根据设备类型名称列表查询设备类型
+     *
+     * @param typeNames 设备类型名称列表
+     * @return List<DeviceType>
+     */
+    List<DeviceType> queryByNames(List<String> typeNames);
+
+
     /**
      * 新增设备类型
      *
      * @param resources /
      */
-    void create(DeviceType resources);
+    void create(DeviceTypeForm resources) throws IOException;
 
     /**
      * 修改设备类型
      *
      * @param resources /
      */
-    void update(DeviceTypeForm resources);
+    void update(DeviceTypeForm resources) throws IOException;
 
     /**
      * 多选删除

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGeoFenceService.java

@@ -6,6 +6,7 @@ import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.DeviceGeoFence;
 import com.fuyuanshen.equipment.domain.bo.DeviceGeoFenceBo;
+import com.fuyuanshen.equipment.domain.bo.FenceTerminalBo;
 import com.fuyuanshen.equipment.domain.dto.FenceCheckResponse;
 import com.fuyuanshen.equipment.domain.query.FenceCheckRequest;
 import com.fuyuanshen.equipment.domain.vo.DeviceGeoFenceVo;
@@ -78,4 +79,8 @@ public interface IDeviceGeoFenceService extends IService<DeviceGeoFence> {
      * @return 位置检查结果
      */
     FenceCheckResponse checkPosition(FenceCheckRequest request);
+
+    Boolean addFenceTerminal(FenceTerminalBo bo);
+
+    Boolean delFenceTerminal(FenceTerminalBo bo);
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceRepairRecordsService.java

@@ -32,8 +32,8 @@ public interface IDeviceRepairRecordsService extends IService<DeviceRepairRecord
     /**
      * 分页查询设备维修记录列表
      *
-     * @param bo        查询条件
-     * @param pageQuery 分页参数
+     * @param criteria        查询条件
+     * @param page 分页参数
      * @return 设备维修记录分页列表
      */
     TableDataInfo<DeviceRepairRecordsVo> queryPageList(DeviceRepairRecordsQueryCriteria criteria, Page<DeviceRepairRecords> page);
@@ -41,7 +41,7 @@ public interface IDeviceRepairRecordsService extends IService<DeviceRepairRecord
     /**
      * 查询符合条件的设备维修记录列表
      *
-     * @param bo 查询条件
+     * @param criteria 查询条件
      * @return 设备维修记录列表
      */
     List<DeviceRepairRecordsVo> queryList(DeviceRepairRecordsQueryCriteria criteria);
@@ -70,4 +70,5 @@ public interface IDeviceRepairRecordsService extends IService<DeviceRepairRecord
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/ITrackServiceService.java

@@ -0,0 +1,103 @@
+package com.fuyuanshen.equipment.service;
+
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.equipment.domain.bo.TerminalDelBo;
+import com.fuyuanshen.equipment.domain.bo.TerminalDeviceBo;
+import com.fuyuanshen.equipment.domain.bo.TerminalQueryBo;
+import com.fuyuanshen.equipment.domain.bo.TrackServiceBo;
+import com.fuyuanshen.equipment.domain.dto.TerminalDeviceDto;
+import com.fuyuanshen.equipment.domain.vo.TrackServiceVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 轨迹服务Service接口
+ *
+ * @author Lion Li
+ * @date 2025-11-24
+ */
+public interface ITrackServiceService {
+
+    /**
+     * 查询轨迹服务
+     *
+     * @param id 主键
+     * @return 轨迹服务
+     */
+    TrackServiceVo queryById(Long id);
+
+    /**
+     * 分页查询轨迹服务列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 轨迹服务分页列表
+     */
+    TableDataInfo<TrackServiceVo> queryPageList(TrackServiceBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的轨迹服务列表
+     *
+     * @param bo 查询条件
+     * @return 轨迹服务列表
+     */
+    List<TrackServiceVo> queryList(TrackServiceBo bo);
+
+    /**
+     * 新增轨迹服务
+     *
+     * @param bo 轨迹服务
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(TrackServiceBo bo);
+
+    /**
+     * 修改轨迹服务
+     *
+     * @param bo 轨迹服务
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(TrackServiceBo bo);
+
+    /**
+     * 校验并批量删除轨迹服务信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 高德添加终端设备
+     *
+     * @param terminalDeviceBo     添加集合
+     */
+    void terminal(TerminalDeviceBo terminalDeviceBo);
+    /**
+     * 高德移除终端设备
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean delTerminalDevice(Collection<Long> ids, Boolean isValid);
+
+    Boolean delTerminalDevice(TerminalDelBo bo, Boolean isValid);
+    /**
+     * 查询设备列表
+     *
+     * @param bo     查询条件
+     * @return 设备列表
+     */
+    TableDataInfo<TerminalDeviceDto> listTerminal(TerminalQueryBo bo);
+    /**
+     * 关键字查询设备
+     *
+     * @param bo     查询条件
+     * @return 设备列表
+     */
+    TableDataInfo<TerminalDeviceDto> searchTerminal(TerminalQueryBo bo);
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceExportService.java

@@ -3,18 +3,20 @@ package com.fuyuanshen.equipment.service.impl;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.util.DateUtils;
 import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.domain.dto.DeviceExcelExportDTO;
+import com.fuyuanshen.equipment.domain.dto.DeviceWithTypeExcelExportDTO;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.concurrent.Semaphore;
+import java.util.Map;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 /**
@@ -26,6 +28,9 @@ import java.util.stream.Collectors;
 public class DeviceExportService {
 
     public void export(List<Device> devices, HttpServletResponse response) {
+        long startTime = System.currentTimeMillis();
+        log.info("开始导出设备列表，设备数量: {}", devices.size());
+
         try {
             String fileName = "设备列表_" + System.currentTimeMillis() + ".xlsx";
             // 使用URLEncoder进行RFC 5987编码
@@ -36,26 +41,20 @@ public class DeviceExportService {
             // 使用RFC 5987标准编码文件名
             response.setHeader("Content-disposition", "attachment;filename*=UTF-8''" + encodedFileName);
 
-            // 转换为DTO列表
-            List<DeviceExcelExportDTO> dtoList = devices.stream().map(device -> {
+            // 转换为DTO列表，使用并行流加速处理
+            List<DeviceExcelExportDTO> dtoList = devices.parallelStream().map(device -> {
+                long deviceProcessStartTime = System.currentTimeMillis();
                 DeviceExcelExportDTO dto = new DeviceExcelExportDTO();
-                // dto.setId(device.getId());
-                // dto.setDeviceType(device.getDeviceType());
-                // dto.setCustomerName(device.getCustomerName());
                 dto.setDeviceName(device.getDeviceName());
                 dto.setDeviceMac(device.getDeviceMac());
                 // 设备IMEI
                 dto.setDeviceImei(device.getDeviceImei());
                 // 蓝牙名称
                 dto.setBluetoothName(device.getBluetoothName());
-                // dto.setLongitude(device.getLongitude());
-                // dto.setLatitude(device.getLatitude());
                 dto.setRemark(device.getRemark());
                 dto.setTypeName(device.getTypeName());
                 dto.setCreateBy(device.getCreateByName());
-                Integer deviceStatus = device.getDeviceStatus();
                 Integer bindingStatus = device.getBindingStatus();
-                // dto.setDeviceStatus(deviceStatus == 1 ? "正常" : "失效");
                 dto.setBindingStatus(bindingStatus == 1 ? "已绑定" : "未绑定");
                 // 时间戳转换
                 dto.setCreateTime(DateUtils.format(device.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
@@ -63,54 +62,270 @@ public class DeviceExportService {
                 // 处理图片URL转换
                 handleDevicePic(device, dto);
 
+                long deviceProcessEndTime = System.currentTimeMillis();
+                log.info("单个设备处理耗时: {} ms, 设备ID: {}", (deviceProcessEndTime - deviceProcessStartTime), device.getId());
                 return dto;
             }).collect(Collectors.toList());
 
             // 写入Excel
+            long excelWriteStartTime = System.currentTimeMillis();
             EasyExcel.write(response.getOutputStream(), DeviceExcelExportDTO.class).sheet("设备数据").doWrite(dtoList);
+            long excelWriteEndTime = System.currentTimeMillis();
+
+            long endTime = System.currentTimeMillis();
+            log.info("设备列表导出完成，总耗时: {} ms，设备数量: {}，Excel写入耗时: {} ms",
+                    (endTime - startTime), devices.size(), (excelWriteEndTime - excelWriteStartTime));
 
         } catch (IOException e) {
+            log.error("导出Excel失败", e);
             throw new RuntimeException("导出Excel失败", e);
         }
     }
 
 
+
+    /**
+     * 导出设备数据（包含完整设备类型信息）
+     *
+     * @param devices
+     * @param deviceTypes
+     * @param response
+     */
+    public void exportWithTypeInfo(List<Device> devices, List<DeviceType> deviceTypes, HttpServletResponse response) {
+        long startTime = System.currentTimeMillis();
+        log.info("开始导出设备列表（含类型详情），设备数量: {}", devices.size());
+
+        try {
+            String fileName = "设备列表_含类型详情_" + System.currentTimeMillis() + ".xlsx";
+            // 使用URLEncoder进行RFC 5987编码
+            String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.name()).replaceAll("\\+", "%20");
+
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setCharacterEncoding("utf-8");
+            // 使用RFC 5987标准编码文件名
+            response.setHeader("Content-disposition", "attachment;filename*=UTF-8''" + encodedFileName);
+
+            // 构建设备类型映射
+            Map<Long, DeviceType> deviceTypeMap = deviceTypes.stream()
+                    .collect(Collectors.toMap(DeviceType::getId, deviceType -> deviceType));
+
+            // 转换为DTO列表，使用并行流加速处理
+            List<DeviceWithTypeExcelExportDTO> dtoList = devices.parallelStream().map(device -> {
+                long deviceProcessStartTime = System.currentTimeMillis();
+                DeviceWithTypeExcelExportDTO dto = new DeviceWithTypeExcelExportDTO();
+                dto.setDeviceName(device.getDeviceName());
+                dto.setDeviceMac(device.getDeviceMac());
+                // 设备IMEI
+                dto.setDeviceImei(device.getDeviceImei());
+                // 蓝牙名称
+                dto.setBluetoothName(device.getBluetoothName());
+                dto.setRemark(device.getRemark());
+                dto.setTypeName(device.getTypeName());
+                dto.setCreateBy(device.getCreateByName());
+                Integer bindingStatus = device.getBindingStatus();
+                dto.setBindingStatus(bindingStatus == 1 ? "已绑定" : "未绑定");
+                // 时间戳转换
+                dto.setCreateTime(DateUtils.format(device.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+
+                // 获取设备类型详细信息
+                DeviceType deviceType = deviceTypeMap.get(device.getDeviceType());
+                if (deviceType != null) {
+                    // 处理是否支持蓝牙
+                    if (deviceType.getIsSupportBle() != null) {
+                        dto.setIsSupportBle(deviceType.getIsSupportBle() ? "是" : "否");
+                    } else {
+                        dto.setIsSupportBle("未知");
+                    }
+
+                    // 处理定位方式
+                    if (deviceType.getLocateMode() != null) {
+                        dto.setLocateMode(convertLocateMode(deviceType.getLocateMode()));
+                    } else {
+                        dto.setLocateMode("");
+                    }
+
+                    // 处理通讯方式
+                    if (deviceType.getCommunicationMode() != null) {
+                        dto.setCommunicationMode(convertCommunicationMode(deviceType.getCommunicationMode()));
+                    } else {
+                        dto.setCommunicationMode("");
+                    }
+
+                    // 处理APP页面跳转字典
+                    dto.setAppModelDictionary(deviceType.getAppModelDictionary() != null ? deviceType.getAppModelDictionary() : "");
+
+                    // 处理PC页面跳转字典
+                    dto.setPcModelDictionary(deviceType.getPcModelDictionary() != null ? deviceType.getPcModelDictionary() : "");
+                } else {
+                    dto.setIsSupportBle("未知");
+                    dto.setLocateMode("");
+                    dto.setCommunicationMode("");
+                    dto.setAppModelDictionary("");
+                    dto.setPcModelDictionary("");
+                }
+
+                // 处理图片URL转换
+                handleDevicePicForTypeExport(device, dto);
+                return dto;
+            }).collect(Collectors.toList());
+
+            // 写入Excel
+            long excelWriteStartTime = System.currentTimeMillis();
+            EasyExcel.write(response.getOutputStream(), DeviceWithTypeExcelExportDTO.class).sheet("设备数据含类型详情").doWrite(dtoList);
+            long excelWriteEndTime = System.currentTimeMillis();
+
+            long endTime = System.currentTimeMillis();
+            log.info("设备列表（含类型详情）导出完成，总耗时: {} ms，设备数量: {}，Excel写入耗时: {} ms",
+                    (endTime - startTime), devices.size(), (excelWriteEndTime - excelWriteStartTime));
+
+        } catch (IOException e) {
+            log.error("导出Excel失败", e);
+            throw new RuntimeException("导出Excel失败", e);
+        }
+    }
+
+
+    /**
+     * 转换定位方式代码为中文描述
+     *
+     * @param locateMode 定位方式代码 (0:无;1:GPS;2:基站;3:wifi;4:北斗)
+     * @return 中文描述
+     */
+    private String convertLocateMode(String locateMode) {
+        switch (locateMode) {
+            case "0":
+                return "无";
+            case "1":
+                return "GPS";
+            case "2":
+                return "基站";
+            case "3":
+                return "wifi";
+            case "4":
+                return "北斗";
+            default:
+                return locateMode;
+        }
+    }
+
+    /**
+     * 转换联网方式代码为中文描述
+     *
+     * @param networkWay 联网方式代码 (0:无;1:4G;2:WIFI)
+     * @return 中文描述
+     */
+    private String convertNetworkWay(String networkWay) {
+        switch (networkWay) {
+            case "0":
+                return "无";
+            case "1":
+                return "4G";
+            case "2":
+                return "WIFI";
+            default:
+                return networkWay;
+        }
+    }
+
+    /**
+     * 转换通讯方式代码为中文描述
+     *
+     * @param communicationMode 通讯方式代码 (0:4G;1:蓝牙)
+     * @return 中文描述
+     */
+    private String convertCommunicationMode(String communicationMode) {
+        switch (communicationMode) {
+            case "0":
+                return "4G";
+            case "1":
+                return "蓝牙";
+            case "2":
+                return "4G&蓝牙";
+            default:
+                return communicationMode;
+        }
+    }
+
+
     // 在DeviceExportService中添加并发控制
-    private static final Semaphore imageLoadSemaphore = new Semaphore(5); // 最多同时加载5张图片
+    private static final Semaphore imageLoadSemaphore = new Semaphore(10); // 增加到最多同时加载10张图片
 
     private void handleDevicePic(Device device, DeviceExcelExportDTO dto) {
         String picUrl = device.getDevicePic();
-        log.debug("处理设备图片，设备ID: {}, 图片URL: {}", device.getId(), picUrl);
 
         if (picUrl != null && !picUrl.trim().isEmpty()) {
             try {
-                // 获取加载图片的许可
-                imageLoadSemaphore.acquire();
+                // 获取加载图片的许可，带超时控制
+                if (!imageLoadSemaphore.tryAcquire(5, TimeUnit.SECONDS)) {
+                    dto.setDevicePic(null);
+                    return;
+                }
 
                 try {
                     // 自动将HTTP转换为HTTPS以避免重定向问题
                     if (picUrl.startsWith("http://")) {
                         picUrl = "https://" + picUrl.substring(7);
-                        log.debug("自动将HTTP转换为HTTPS: {}", picUrl);
                     }
 
                     // 尝试创建URL对象（会自动验证格式）
                     URL url = new URL(picUrl);
                     dto.setDevicePic(url);
-                    log.debug("成功设置设备图片URL到DTO");
                 } finally {
                     // 释放许可
                     imageLoadSemaphore.release();
                 }
             } catch (Exception e) {
-                log.warn("设置设备图片失败，设备ID: {}, URL: {}, 错误: {}", device.getId(), picUrl, e.getMessage());
                 dto.setDevicePic(null);
             }
         } else {
-            log.debug("设备没有设置图片，设备ID: {}", device.getId());
             dto.setDevicePic(null);
         }
     }
 
 
+    private void handleDevicePicForTypeExport(Device device, DeviceWithTypeExcelExportDTO dto) {
+        String picUrl = device.getDevicePic();
+
+        if (picUrl != null && !picUrl.trim().isEmpty()) {
+            try {
+                // 获取加载图片的许可，带超时控制
+                if (!imageLoadSemaphore.tryAcquire(5, TimeUnit.SECONDS)) {
+                    dto.setDevicePic(null);
+                    return;
+                }
+
+                try {
+                    picUrl = convertUrl(picUrl);
+
+                    // 尝试创建URL对象（会自动验证格式）
+                    URL url = new URL(picUrl);
+                    dto.setDevicePic(url);
+
+                } finally {
+                    // 释放许可
+                    imageLoadSemaphore.release();
+                }
+            } catch (Exception e) {
+                dto.setDevicePic(null);
+            }
+        } else {
+            dto.setDevicePic(null);
+        }
+    }
+
+    /**
+     * 转换图片URL为HTTP
+     * 转回minio格式
+     *
+     * @param originalUrl 原始URL
+     * @return 转换后的URL
+     */
+
+    public String convertUrl(String originalUrl) {
+        String result = originalUrl.replace("https://fuyuanshen.com", "http://120.79.224.186:9000");
+        result = result.replace("http://fuyuanshen.com", "http://120.79.224.186:9000");
+        return result;
+    }
+
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceFenceAccessRecordServiceImpl.java

@@ -33,6 +33,7 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec
 
     private final DeviceFenceAccessRecordMapper baseMapper;
 
+
     /**
      * 查询围栏进出记录
      *
@@ -68,8 +69,8 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec
      */
     @Override
     public List<DeviceFenceAccessRecordVo> queryList(DeviceFenceAccessRecordBo bo) {
-        LambdaQueryWrapper<DeviceFenceAccessRecord> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoPageWithFenceAndDeviceName(lqw, bo.getFenceName());
+        // LambdaQueryWrapper<DeviceFenceAccessRecord> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoPageByXml(bo);
     }
 
 

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGeoFenceServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fuyuanshen.equipment.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -10,14 +11,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceFenceTerminal;
 import com.fuyuanshen.equipment.domain.DeviceGeoFence;
 import com.fuyuanshen.equipment.domain.bo.DeviceFenceAccessRecordBo;
 import com.fuyuanshen.equipment.domain.bo.DeviceFenceStatusBo;
 import com.fuyuanshen.equipment.domain.bo.DeviceGeoFenceBo;
+import com.fuyuanshen.equipment.domain.bo.FenceTerminalBo;
 import com.fuyuanshen.equipment.domain.dto.FenceCheckResponse;
 import com.fuyuanshen.equipment.domain.query.FenceCheckRequest;
 import com.fuyuanshen.equipment.domain.vo.DeviceFenceStatusVo;
 import com.fuyuanshen.equipment.domain.vo.DeviceGeoFenceVo;
+import com.fuyuanshen.equipment.mapper.DeviceFenceTerminalMapper;
 import com.fuyuanshen.equipment.mapper.DeviceGeoFenceMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.service.IDeviceFenceAccessRecordService;
@@ -25,6 +29,7 @@ import com.fuyuanshen.equipment.service.IDeviceFenceStatusService;
 import com.fuyuanshen.equipment.service.IDeviceGeoFenceService;
 import com.fuyuanshen.equipment.utils.map.GeoFenceChecker;
 import com.fuyuanshen.equipment.utils.map.GetAddressFromLatUtil;
+import com.fuyuanshen.system.domain.SysRoleMenu;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -48,6 +53,7 @@ public class DeviceGeoFenceServiceImpl  extends ServiceImpl<DeviceGeoFenceMapper
     private final IDeviceFenceStatusService fenceStatusService; // 添加此行
     
     private final IDeviceFenceAccessRecordService fenceAccessRecordService; // 添加此行
+    private final DeviceFenceTerminalMapper deviceFenceTerminalMapper;
 
 
 
@@ -270,4 +276,32 @@ public class DeviceGeoFenceServiceImpl  extends ServiceImpl<DeviceGeoFenceMapper
     }
 
 
+    @Override
+    public Boolean addFenceTerminal(FenceTerminalBo bo) {
+        // 新增围栏与终端关联信息
+        List<DeviceFenceTerminal> list = new ArrayList<>();
+        for (Long deviceId : bo.getDeviceIds()) {
+            DeviceFenceTerminal rm = new DeviceFenceTerminal();
+            rm.setFenceId(bo.getFenceId());
+            rm.setDeviceId(deviceId);
+            list.add(rm);
+        }
+        if (!list.isEmpty()) {
+            return deviceFenceTerminalMapper.insertBatch(list);
+        }
+        return false;
+    }
+
+    @Override
+    public Boolean delFenceTerminal(FenceTerminalBo bo) {
+        if (bo.getFenceId() == null || bo.getDeviceIds() == null || bo.getDeviceIds().isEmpty()) {
+            throw new IllegalArgumentException("围栏ID或设备ID不能为空");
+        }
+        LambdaUpdateWrapper<DeviceFenceTerminal> lambda = new LambdaUpdateWrapper<DeviceFenceTerminal>()
+                .eq(DeviceFenceTerminal::getFenceId, bo.getFenceId())
+                .in(DeviceFenceTerminal::getDeviceId, bo.getDeviceIds());
+        return deviceFenceTerminalMapper.delete(lambda) > 0;
+    }
+
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceRepairRecordsServiceImpl.java

@@ -52,6 +52,7 @@ public class DeviceRepairRecordsServiceImpl extends ServiceImpl<DeviceRepairReco
     private final ISysOssService ossService;
     private final FileHashUtil fileHashUtil;
 
+
     /**
      * 查询设备维修记录
      *
@@ -76,6 +77,7 @@ public class DeviceRepairRecordsServiceImpl extends ServiceImpl<DeviceRepairReco
         return vo;
     }
 
+
     /**
      * 分页查询设备维修记录列表
      *
@@ -98,6 +100,7 @@ public class DeviceRepairRecordsServiceImpl extends ServiceImpl<DeviceRepairReco
         return new TableDataInfo<DeviceRepairRecordsVo>(deviceRepairRecordsIPage.getRecords(), deviceRepairRecordsIPage.getTotal());
     }
 
+
     /**
      * 查询符合条件的设备维修记录列表
      *

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.*;
 
@@ -130,6 +126,26 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
         return new TableDataInfo<Device>(records, devices.getTotal());
     }
 
+    @Override
+    public TableDataInfo<Device> queryAllTerminal(DeviceQueryCriteria criteria, Page<Device> page) throws IOException {
+        // 角色管理员
+        Long userId = LoginHelper.getUserId();
+        List<SysRoleVo> roles = roleService.selectRolesAuthByUserId(userId);
+        boolean isAdmin = false;
+        if (CollectionUtil.isNotEmpty(roles)) {
+            for (SysRoleVo role : roles) {
+                if (role.getRoleKey().equals("admin")) {
+                    isAdmin = true;
+                    criteria.setIsAdmin(true);
+                    break;
+                }
+            }
+        }
+
+        IPage<Device> devices = deviceMapper.findAllTerminal(criteria, page);
+        return new TableDataInfo<Device>(devices.getRecords(), devices.getTotal());
+    }
+
 
     @Override
     public List<Device> queryAll(DeviceQueryCriteria criteria) {
@@ -192,22 +208,108 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
             throw new BadRequestException("设备IMEI已存在！！！");
         }
 
-        DeviceTypeQueryCriteria queryCriteria = new DeviceTypeQueryCriteria();
-        queryCriteria.setDeviceTypeId(deviceForm.getDeviceType());
-        queryCriteria.setCustomerId(LoginHelper.getUserId());
-        DeviceTypeGrants typeGrants = deviceTypeGrantsMapper.selectById(queryCriteria.getDeviceTypeId());
-        if (typeGrants == null) {
-            throw new Exception("设备类型不存在!!!");
+        DeviceTypeGrants typeGrants = new DeviceTypeGrants();
+
+        if (deviceForm.getDeviceType() != null) {
+            DeviceTypeQueryCriteria queryCriteria = new DeviceTypeQueryCriteria();
+            queryCriteria.setDeviceTypeId(deviceForm.getDeviceType());
+            typeGrants = deviceTypeGrantsMapper.selectById(queryCriteria.getDeviceTypeId());
+            if (typeGrants == null) {
+                throw new Exception("设备类型不存在!!!");
+            }
         }
-        DeviceType deviceTypes = deviceTypeMapper.selectById(typeGrants.getDeviceTypeId());
-        if (deviceTypes == null) {
+
+        // 检查设备类型是否存在，如果不存在则创建
+        DeviceType deviceType = null;
+        if (deviceForm.getDeviceType() != null) {
+            deviceType = deviceTypeMapper.selectById(typeGrants.getDeviceTypeId());
+        } else if (deviceForm.getTypeName() != null) {
+            deviceType = deviceTypeMapper.selectOne(new QueryWrapper<DeviceType>().eq("type_name", deviceForm.getTypeName()));
+        }
+
+        if (deviceType == null && deviceForm.getTypeName() != null) {
+            // 创建新的设备类型
+            DeviceType newDeviceType = new DeviceType();
+            newDeviceType.setTypeName(deviceForm.getTypeName());
+            newDeviceType.setIsSupportBle("是".equals(deviceForm.getIsSupportBle()) || "1".equals(deviceForm.getIsSupportBle()));
+
+            // 设置定位方式
+            if (deviceForm.getLocateMode() != null) {
+                switch (deviceForm.getLocateMode()) {
+                    case "无":
+                        newDeviceType.setLocateMode("0");
+                        break;
+                    case "GPS":
+                        newDeviceType.setLocateMode("1");
+                        break;
+                    case "基站":
+                        newDeviceType.setLocateMode("2");
+                        break;
+                    case "wifi":
+                        newDeviceType.setLocateMode("3");
+                        break;
+                    case "北斗":
+                        newDeviceType.setLocateMode("4");
+                        break;
+                    default:
+                        newDeviceType.setLocateMode(deviceForm.getLocateMode());
+                }
+            }
+
+            // 设置通讯方式
+            if (deviceForm.getCommunicationMode() != null) {
+                switch (deviceForm.getCommunicationMode()) {
+                    case "4G":
+                        newDeviceType.setCommunicationMode("0");
+                        break;
+                    case "蓝牙":
+                        newDeviceType.setCommunicationMode("1");
+                        break;
+                    case "4G&蓝牙":
+                        newDeviceType.setCommunicationMode("2");
+                        break;
+                    default:
+                        newDeviceType.setCommunicationMode(deviceForm.getCommunicationMode());
+                }
+            }
+
+            newDeviceType.setAppModelDictionary(deviceForm.getAppModelDictionary());
+            newDeviceType.setPcModelDictionary(deviceForm.getPcModelDictionary());
+
+            // 校验设备类型名称
+            List<DeviceType> existingTypes = deviceTypeMapper.selectList(new QueryWrapper<DeviceType>().eq("type_name", newDeviceType.getTypeName()));
+            if (CollectionUtil.isNotEmpty(existingTypes)) {
+                throw new RuntimeException("设备类型名称已存在，无法新增!!!");
+            }
+
+            LoginUser loginUser = LoginHelper.getLoginUser();
+            newDeviceType.setCreateByName(loginUser.getNickname());
+            deviceTypeMapper.insert(newDeviceType);
+
+            // 重新查询确保获取到正确的ID
+            deviceType = deviceTypeMapper.selectOne(new QueryWrapper<DeviceType>().eq("type_name", deviceForm.getTypeName()));
+
+            // 自动授权给自己
+            DeviceTypeGrants deviceTypeGrants = new DeviceTypeGrants();
+            deviceTypeGrants.setDeviceTypeId(deviceType.getId());
+            deviceTypeGrants.setCustomerId(loginUser.getUserId());
+            deviceTypeGrants.setGrantorCustomerId(loginUser.getUserId());
+            deviceTypeGrants.setGrantedAt(new Date());
+            deviceTypeGrantsMapper.insert(deviceTypeGrants);
+        }
+
+        if (deviceType == null) {
             throw new Exception("设备类型不存在!!!");
         }
 
         // 保存图片并获取URL
         if (deviceForm.getFile() != null) {
             String fileHash = fileHashUtil.hash(deviceForm.getFile());
-            SysOssVo upload = ossService.updateHash(deviceForm.getFile(),fileHash);
+            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());
         }
@@ -221,8 +323,8 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
         device.setCurrentOwnerId(loginUser.getUserId());
         device.setOriginalOwnerId(loginUser.getUserId());
         device.setCreateByName(loginUser.getNickname());
-        device.setTypeName(deviceTypes.getTypeName());
-        device.setDeviceType(deviceTypes.getId());
+        device.setTypeName(deviceType.getTypeName());
+        device.setDeviceType(deviceType.getId());
         if (device.getDeviceImei() != null) {
             device.setPubTopic("A/" + device.getDeviceImei());
             device.setSubTopic("B/" + device.getDeviceImei());
@@ -282,7 +384,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
         // 处理上传的图片
         if (deviceForm.getFile() != null) {
             String fileHash = fileHashUtil.hash(deviceForm.getFile());
-            SysOssVo oss = ossService.updateHash(deviceForm.getFile(),fileHash);
+            SysOssVo oss = ossService.updateHash(deviceForm.getFile(), fileHash);
             // 强制将HTTP替换为HTTPS
             if (oss.getUrl() != null && oss.getUrl().startsWith("http://")) {
                 oss.setUrl(oss.getUrl().replaceFirst("^http://", "https://"));

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java

@@ -19,12 +19,16 @@ import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeGrantsMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
 import com.fuyuanshen.equipment.service.DeviceTypeService;
+import com.fuyuanshen.equipment.utils.FileHashUtil;
+import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.domain.vo.SysRoleVo;
+import com.fuyuanshen.system.service.ISysOssService;
 import com.fuyuanshen.system.service.ISysRoleService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -46,6 +50,8 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
     private final DeviceAssignmentsMapper deviceAssignmentsMapper;
 
     private final ISysRoleService roleService;
+    private final ISysOssService ossService;
+    private final FileHashUtil fileHashUtil;
 
 
     /**
@@ -159,6 +165,21 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
     }
 
 
+    /**
+     * 根据设备类型名称列表查询设备类型
+     *
+     * @param typeNames 设备类型名称列表
+     * @return List<DeviceType>
+     */
+    @Override
+    public List<DeviceType> queryByNames(List<String> typeNames) {
+        if (typeNames == null || typeNames.isEmpty()) {
+            return new ArrayList<>();
+        }
+        return deviceTypeMapper.selectByNames(typeNames);
+    }
+
+
     /**
      * 新增设备类型
      *
@@ -166,24 +187,38 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void create(DeviceType resources) {
+    public void create(DeviceTypeForm resources) throws IOException {
 
         // 校验设备类型名称
         List<DeviceType> typeName = deviceTypeMapper.selectList(new QueryWrapper<DeviceType>().eq("type_name", resources.getTypeName()));
         if (CollectionUtil.isNotEmpty(typeName)) {
             throw new RuntimeException("设备类型名称已存在，无法新增!!!");
         }
+        // 保存图片并获取URL
+        if (resources.getFile() != null) {
+            String fileHash = fileHashUtil.hash(resources.getFile());
+            SysOssVo upload = ossService.updateHash(resources.getFile(), fileHash);
+            // 强制将HTTP替换为HTTPS
+            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
+                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
+            }
+            // 设置图片路径
+            resources.setDevicePic(upload.getUrl());
+        }
+
+        DeviceType deviceType = new DeviceType();
+        BeanUtil.copyProperties(resources, deviceType, true);
 
         LoginUser loginUser = LoginHelper.getLoginUser();
-        resources.setCustomerId(loginUser.getUserId());
-        resources.setOwnerCustomerId(loginUser.getUserId());
-        resources.setOriginalOwnerId(loginUser.getUserId());
-        resources.setCreateByName(loginUser.getNickname());
-        deviceTypeMapper.insert(resources);
+        deviceType.setCustomerId(loginUser.getUserId());
+        deviceType.setOwnerCustomerId(loginUser.getUserId());
+        deviceType.setOriginalOwnerId(loginUser.getUserId());
+        deviceType.setCreateByName(loginUser.getNickname());
+        deviceTypeMapper.insert(deviceType);
 
         // 自动授权给自己
         DeviceTypeGrants deviceTypeGrants = new DeviceTypeGrants();
-        deviceTypeGrants.setDeviceTypeId(resources.getId());
+        deviceTypeGrants.setDeviceTypeId(deviceType.getId());
         deviceTypeGrants.setCustomerId(loginUser.getUserId());
         deviceTypeGrants.setGrantorCustomerId(loginUser.getUserId());
         deviceTypeGrants.setGrantedAt(new Date());
@@ -198,7 +233,7 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(DeviceTypeForm resources) {
+    public void update(DeviceTypeForm resources) throws IOException {
         DeviceTypeGrants deviceTypeGrants = deviceTypeGrantsMapper.selectById(resources.getId());
         if (deviceTypeGrants == null) {
             throw new RuntimeException("设备类型不存在");
@@ -209,11 +244,12 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
             throw new RuntimeException("设备类型不存在");
         }
 
-        // List<Device> devices = deviceMapper.selectList(new QueryWrapper<Device>()
-        //         .eq("device_type", deviceTypeGrants.getDeviceTypeId()));
-        // if (CollectionUtil.isNotEmpty(devices)) {
-        //     throw new RuntimeException("该设备类型已绑定设备，无法修改！！！");
-        // }
+        if (!deviceType.getTypeName().equals(resources.getTypeName())) {
+            int count = deviceMapper.countByDeviceTypeId(deviceType.getId());
+            if (count > 0) {
+                throw new RuntimeException("该设备类型下已有设备，无法修改设备类型名称!!!");
+            }
+        }
 
         // 校验设备类型名称
         DeviceType dt = deviceTypeMapper.selectOne(new QueryWrapper<DeviceType>().eq("type_name", resources.getTypeName()));
@@ -228,6 +264,17 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
                 throw new RuntimeException("无权修改该设备类型");
             }
         }
+        // 保存图片并获取URL
+        if (resources.getFile() != null) {
+            String fileHash = fileHashUtil.hash(resources.getFile());
+            SysOssVo upload = ossService.updateHash(resources.getFile(), fileHash);
+            // 强制将HTTP替换为HTTPS
+            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
+                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
+            }
+            // 设置图片路径
+            resources.setDevicePic(upload.getUrl());
+        }
 
         BeanUtil.copyProperties(resources, deviceType);
         deviceTypeMapper.updateById(deviceType);