WebApp用户信息

# Conflicts:
#	fys-admin/src/main/resources/application-prod.yml

aa.conf

@@ -0,0 +1,119 @@
+
+#user  nobody;
+worker_processes  1;
+
+#error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+#error_log  logs/error.log  info;
+
+#pid        logs/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    #                  '$status $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    server {
+        listen       80;
+        server_name  cnxhyc.com;
+
+        #charset koi8-r;
+
+        #access_log  logs/host.access.log  main;
+
+        location / {
+            root   html;
+            index  index.html index.htm;
+        }
+
+        #error_page  404              /404.html;
+
+        # redirect server error pages to the static page /50x.html
+        #
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+
+        # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+        #
+        #location ~ \.php$ {
+        #    proxy_pass   http://127.0.0.1;
+        #}
+
+        # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+        #
+        #location ~ \.php$ {
+        #    root           html;
+        #    fastcgi_pass   127.0.0.1:9000;
+        #    fastcgi_index  index.php;
+        #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+        #    include        fastcgi_params;
+        #}
+
+        # deny access to .htaccess files, if Apache's document root
+        # concurs with nginx's one
+        #
+        #location ~ /\.ht {
+        #    deny  all;
+        #}
+    }
+
+
+    # another virtual host using mix of IP-, name-, and port-based configuration
+    #
+    #server {
+    #    listen       8000;
+    #    listen       somename:8080;
+    #    server_name  somename  alias  another.alias;
+
+    #    location / {
+    #        root   html;
+    #        index  index.html index.htm;
+    #    }
+    #}
+
+
+    # HTTPS server
+
+    server {
+        listen       443 ssl http2;
+        server_name  cnxhyc.com;
+
+        ssl_certificate      /cert/cnxhyc.com.pem;
+        ssl_certificate_key  /cert/cnxhyc.com.key;
+
+        # 使用更现代的 SSL 配置
+        ssl_protocols TLSv1.2 TLSv1.3;
+        ssl_ciphers TLS_AES_256_GCM_SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
+        ssl_prefer_server_ciphers off;
+
+        ssl_session_cache shared:SSL:10m;
+        ssl_session_timeout 10m;
+
+        location / {
+            root   html;
+            index  index.html index.htm;
+        }
+    }
+
+}

fys-admin/pom.xml

@@ -94,10 +94,10 @@
         </dependency>
 
         <!--  demo模块  -->
-        <!--<dependency>
-            <groupId>com.fuyuanshen</groupId>
-            <artifactId>fys-demo</artifactId>
-        </dependency>-->
+        <!-- <dependency> -->
+        <!--     <groupId>com.fuyuanshen</groupId> -->
+        <!--     <artifactId>fys-demo</artifactId> -->
+        <!-- </dependency> -->
 
         <!--  工作流模块  -->
         <dependency>

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

@@ -0,0 +1,96 @@
+package com.fuyuanshen;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class CorrectVCardGenerator {
+    public static void main(String[] args) {
+        // // 定义江西上饶的134号段（共22个）
+        // String[] prefixes = {
+        //         "1340703", "1340793", "1342650", "1342651", "1342663",
+        //         "1342664", "1342665", "1343703", "1343793", "1347901",
+        //         "1347902", "1347903", "1347930", "1347931", "1347932",
+        //         "1347933", "1347934", "1347935", "1347936", "1347937",
+        //         "1347938", "1347939"
+        // }; 1340700 号段（移动）
+        // 1340708 号段（移动）
+        // 1340709 号段（移动）
+        // 1340791 号段（移动）
+        // 1342668 号段（移动）
+        // 1343700 号段（移动）
+        // 1343708 号段（移动）
+        // 1343709 号段（移动）
+        // 1343790 号段（移动）
+        // 1343791 号段（移动）
+        // 1347910 号段（移动）
+        // 1347911 号段（移动）
+        // 1347912 号段（移动）
+        // 1347913 号段（移动）
+        // 1347914 号段（移动）
+        // 1347915 号段（移动）
+        // 1347916 号段（移动）
+        // 1347917 号段（移动）
+        // 1347918 号段（移动）
+        // 1347919 号段（移动）
+
+        // 定义江西南昌的134号段（共22个）
+        String[] prefixes = {
+                "1340700", "1340708", "1340709", "1340791", "1342668",
+                "1343700", "1343708", "1343709", "1343790", "1343791",
+                "1347910", "1347911", "1347912", "1347913", "1347914",
+                "1347915", "1347916", "1347917", "1347918", "1347919"
+        };
+
+        // 创建.vcf文件
+        String filename = "南昌联系人.vcf";
+
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filename))) {
+            // 生成所有联系人
+            int count = 0;
+            for (String prefix : prefixes) {
+                for (int i = 0; i < 100; i++) {
+                    String middle = String.format("%02d", i);
+                    String phoneNumber = prefix + middle + "51";
+
+                    // 每个联系人以BEGIN:VCARD开始
+                    writer.write("BEGIN:VCARD");
+                    writer.newLine();
+                    writer.write("VERSION:3.0");
+                    writer.newLine();
+
+                    // 中文姓名（用户+序号）
+                    writer.write("FN:用户" + (count + 1));
+                    writer.newLine();
+
+                    // 手机号码
+                    writer.write("TEL;TYPE=CELL;TYPE=VOICE:" + phoneNumber);
+                    writer.newLine();
+
+                    // 添加唯一标识符
+                    writer.write("UID:" + phoneNumber + "@shangrao");
+                    writer.newLine();
+
+                    // 添加备注信息
+                    writer.write("NOTE:生成于" + new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+                    writer.newLine();
+
+                    // 每个联系人以END:VCARD结束
+                    writer.write("END:VCARD");
+                    writer.newLine();
+                    writer.newLine(); // 联系人之间空一行
+
+                    count++;
+                }
+            }
+
+            System.out.println("成功生成 " + count + " 个联系人");
+            System.out.println("文件已保存为: " + filename);
+
+        } catch (IOException e) {
+            System.err.println("文件写入错误: " + e.getMessage());
+        }
+    }
+}

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

@@ -1,28 +1,20 @@
 package com.fuyuanshen.app.controller;
 
-import cn.hutool.json.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
 import com.fuyuanshen.app.domain.dto.APPReNameDTO;
-import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
-import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
 import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
-import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
-import com.fuyuanshen.app.service.AppDeviceBizService;
 import com.fuyuanshen.common.core.domain.R;
-import com.fuyuanshen.common.core.validate.AddGroup;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
-import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
 import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
-import jakarta.validation.constraints.NotNull;
+import com.fuyuanshen.web.service.device.DeviceBizService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 import java.util.Map;
@@ -36,7 +28,7 @@ import java.util.Map;
 @RequestMapping("/app/device")
 public class AppDeviceController extends BaseController {
 
-    private final AppDeviceBizService appDeviceService;
+    private final DeviceBizService appDeviceService;
 
 
     /**
@@ -84,86 +76,18 @@ public class AppDeviceController extends BaseController {
         return R.ok("重命名成功！！！");
     }
 
-    /**
-     * 获取设备详细信息
-     *
-     * @param id 主键
-     */
-    @GetMapping("/{id}")
-    public R<AppDeviceDetailVo> getInfo(@NotNull(message = "主键不能为空")
-                                             @PathVariable Long id) {
-        return R.ok(appDeviceService.getInfo(id));
+
+    @GetMapping("/realTimeStatus")
+    public R<Map<String, Object>> getRealTimeStatus(AppRealTimeStatusDto statusDto) {
+        Map<String, Object> status = appDeviceService.getRealTimeStatus(statusDto);
+        return R.ok(status);
     }
 
     /**
-     * 人员信息登记
+     * 根据mac查询设备信息
      */
-    @PostMapping(value = "/registerPersonInfo")
-    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
-        return toAjax(appDeviceService.registerPersonInfo(bo));
-    }
-
-    /**
-     * 发送信息
-     */
-    @PostMapping(value = "/sendMessage")
-    public R<Void> sendMessage(@RequestBody AppDeviceSendMsgBo bo) {
-        return toAjax(appDeviceService.sendMessage(bo));
-    }
-
-    /**
-     * 上传设备logo图片
-     */
-    @PostMapping("/uploadLogo")
-    public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
-
-        MultipartFile file = bo.getFile();
-        if(file.getSize()>1024*1024*2){
-            return R.warn("图片不能大于2M");
-        }
-        appDeviceService.uploadDeviceLogo(bo);
-
-        return R.ok();
-    }
-
-    /**
-     * 灯光模式
-     * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）
-     */
-    @PostMapping("/lightModeSettings")
-    public R<Void> lightModeSettings(@RequestBody DeviceInstructDto params) {
-        // params 转 JSONObject
-        appDeviceService.lightModeSettings(params);
-        return R.ok();
-    }
-
-    /**
-     * 灯光亮度设置
-     *
-     */
-    @PostMapping("/lightBrightnessSettings")
-    public R<Void> lightBrightnessSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService.lightBrightnessSettings(params);
-        return R.ok();
-    }
-
-    /**
-     * 激光模式设置
-     *
-     */
-    @PostMapping("/laserModeSettings")
-    public R<Void> laserModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService.laserModeSettings(params);
-        return R.ok();
-    }
-
-    /**
-     * 地图逆解析
-     *
-     */
-    @PostMapping("/mapReverseGeocoding")
-    public R<Void> mapReverseGeocoding(@RequestBody DeviceInstructDto params) {
-        String mapJson = appDeviceService.mapReverseGeocoding(params);
-        return R.ok(mapJson);
+    @GetMapping("/getDeviceInfoByDeviceMac")
+    public R<AppDeviceVo> getDeviceInfo(String deviceMac) {
+        return R.ok(appDeviceService.getDeviceInfo(deviceMac));
     }
 }

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

@@ -5,7 +5,6 @@ import cn.hutool.core.util.RandomUtil;
 import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
 import com.fuyuanshen.app.domain.vo.AppDeviceShareDetailVo;
 import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
-import com.fuyuanshen.app.service.AppDeviceShareService;
 import com.fuyuanshen.app.service.IAppDeviceShareService;
 import com.fuyuanshen.common.core.constant.Constants;
 import com.fuyuanshen.common.core.domain.R;
@@ -16,6 +15,7 @@ import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.ratelimiter.annotation.RateLimiter;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
 import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.web.service.DeviceShareService;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -45,14 +45,14 @@ public class AppDeviceShareController extends BaseController {
 
     private final IAppDeviceShareService deviceShareService;
 
-    private final AppDeviceShareService appDeviceShareService;
+    private final DeviceShareService appDeviceShareService;
 
     /**
      * 分享管理列表
      */
     @GetMapping("/deviceShareList")
     public TableDataInfo<AppDeviceShareVo> list(AppDeviceShareBo bo, PageQuery pageQuery) {
-        return deviceShareService.queryPageList(bo, pageQuery);
+        return appDeviceShareService.queryPageList(bo, pageQuery);
     }
 
     /**
@@ -60,7 +60,7 @@ public class AppDeviceShareController extends BaseController {
      */
     @GetMapping("/otherDeviceShareList")
     public TableDataInfo<AppDeviceShareVo> otherDeviceShareList(AppDeviceShareBo bo, PageQuery pageQuery) {
-        return deviceShareService.otherDeviceShareList(bo, pageQuery);
+        return appDeviceShareService.otherDeviceShareList(bo, pageQuery);
     }
 
     /**

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

@@ -0,0 +1,119 @@
+package com.fuyuanshen.app.controller.device;
+
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.web.service.device.DeviceBJQBizService;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * BJQ6170设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/bjq/device")
+public class AppDeviceBJQController extends BaseController {
+
+    private final DeviceBJQBizService appDeviceService;
+
+    /**
+     * 获取设备详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<AppDeviceDetailVo> getInfo(@NotNull(message = "主键不能为空")
+                                             @PathVariable Long id) {
+        return R.ok(appDeviceService.getInfo(id));
+    }
+
+    /**
+     * 人员信息登记
+     */
+    @PostMapping(value = "/registerPersonInfo")
+//    @FunctionAccessAnnotation("registerPersonInfo")
+    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
+        return toAjax(appDeviceService.registerPersonInfo(bo));
+    }
+
+    /**
+     * 发送信息
+     */
+    @PostMapping(value = "/sendMessage")
+    @FunctionAccessBatcAnnotation(value = "sendMessage", timeOut = 30, batchMaxTimeOut = 40)
+    public R<Void> sendMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendMessage(bo));
+    }
+
+    /**
+     * 发送报警信息
+     */
+    @PostMapping(value = "/sendAlarmMessage")
+    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
+    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendAlarmMessage(bo));
+    }
+
+    /**
+     * 上传设备logo图片
+     */
+    @PostMapping("/uploadLogo")
+    @FunctionAccessAnnotation("uploadLogo")
+    public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
+
+        MultipartFile file = bo.getFile();
+        if(file.getSize()>1024*1024*2){
+            return R.warn("图片不能大于2M");
+        }
+        appDeviceService.uploadDeviceLogo(bo);
+
+        return R.ok();
+    }
+
+    /**
+     * 灯光模式
+     * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）
+     */
+//    @FunctionAccessAnnotation("lightModeSettings")
+    @PostMapping("/lightModeSettings")
+    public R<Void> lightModeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.lightModeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 灯光亮度设置
+     *
+     */
+//    @FunctionAccessAnnotation("lightBrightnessSettings")
+    @PostMapping("/lightBrightnessSettings")
+    public R<Void> lightBrightnessSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.lightBrightnessSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 激光模式设置
+     *
+     */
+    @PostMapping("/laserModeSettings")
+//    @FunctionAccessAnnotation("laserModeSettings")
+    public R<Void> laserModeSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.laserModeSettings(params);
+        return R.ok();
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppDeviceLogoUploadDto.java

@@ -8,6 +8,7 @@ public class AppDeviceLogoUploadDto {
 
     private Long deviceId;
 
+    private String deviceImei;
     /**
      *  文件
      */

fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppRealTimeStatusDto.java

@@ -0,0 +1,30 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+
+/**
+ * 设备实时状态
+ */
+@Data
+public class AppRealTimeStatusDto {
+
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+
+    /**
+     * 设备类型
+     */
+    private String typeName;
+
+    /**
+     * 功能类型
+     */
+    private String functionMode;
+
+    /**
+     * 批次号
+     */
+    private String batchId;
+}

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

@@ -1,428 +0,0 @@
-package com.fuyuanshen.app.service;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fuyuanshen.app.domain.AppDeviceBindRecord;
-import com.fuyuanshen.app.domain.AppPersonnelInfo;
-import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
-import com.fuyuanshen.app.domain.dto.APPReNameDTO;
-import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
-import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
-import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
-import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
-import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
-import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
-import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
-import com.fuyuanshen.app.mapper.equipment.APPDeviceMapper;
-import com.fuyuanshen.common.core.exception.ServiceException;
-import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
-import com.fuyuanshen.common.core.utils.MapstructUtils;
-import com.fuyuanshen.common.core.utils.ObjectUtils;
-import com.fuyuanshen.common.core.utils.StringUtils;
-import com.fuyuanshen.common.mybatis.core.page.PageQuery;
-import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
-import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.DeviceType;
-import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
-import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
-import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
-import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
-import com.fuyuanshen.equipment.enums.BindingStatusEnum;
-import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
-import com.fuyuanshen.equipment.mapper.DeviceMapper;
-import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
-import com.fuyuanshen.equipment.utils.c.ReliableTextToBitmap;
-import com.fuyuanshen.global.mqtt.config.MqttGateway;
-import com.fuyuanshen.global.mqtt.constants.MqttConstants;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.time.Duration;
-import java.util.*;
-
-import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
-import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
-
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class AppDeviceBizService {
-
-    private final APPDeviceMapper appDeviceMapper;
-    private final DeviceMapper deviceMapper;
-    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
-    private final DeviceTypeMapper deviceTypeMapper;
-    private final MqttGateway mqttGateway;
-    private final AppDeviceBindRecordMapper appDeviceBindRecordMapper;
-
-    public List<APPDeviceTypeVo> getTypeList() {
-        Long userId = AppLoginHelper.getUserId();
-        return appDeviceMapper.getTypeList(userId);
-    }
-
-    public void reName(APPReNameDTO reNameDTO) {
-        UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", reNameDTO.getId())
-                .eq("binding_user_id", AppLoginHelper.getUserId())
-                .set("device_name", reNameDTO.getDeviceName());
-        deviceMapper.update(updateWrapper);
-    }
-
-
-    public int sendMessage(AppDeviceSendMsgBo bo) {
-        List<Long> deviceIds = bo.getDeviceIds();
-        if(deviceIds == null || deviceIds.isEmpty()){
-            throw new ServiceException("请选择设备");
-        }
-        for (Long deviceId : deviceIds){
-            Device deviceObj = deviceMapper.selectById(deviceId);
-            if(deviceObj==null) {
-                throw new ServiceException("设备不存在"+deviceId);
-            }
-
-            byte[] msg = ReliableTextToBitmap.textToBitmapBytes(bo.getSendMsg());
-            Map<String,Object> linkHashMap = new HashMap<>();
-            linkHashMap.put("message",msg);
-            String sendMsg = JSON.toJSONString(linkHashMap);
-            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+deviceObj.getDeviceImei(), 1 ,sendMsg);
-            log.info("发送设备消息：{}", bo.getSendMsg());
-
-            UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.eq("id", deviceId)
-                    .eq("binding_user_id", AppLoginHelper.getUserId())
-                    .set("send_msg", bo.getSendMsg());
-            deviceMapper.update(updateWrapper);
-        }
-        return 1;
-    }
-
-
-    public TableDataInfo<AppDeviceVo> queryAppDeviceList(DeviceQueryCriteria bo, PageQuery pageQuery) {
-        if (bo.getBindingUserId() == null) {
-            Long userId = AppLoginHelper.getUserId();
-            bo.setBindingUserId(userId);
-        }
-        Page<AppDeviceVo> result = deviceMapper.queryAppBindDeviceList(pageQuery.build(), bo);
-        return TableDataInfo.build(result);
-    }
-
-    public int bindDevice(AppDeviceBo bo) {
-        Integer mode = bo.getCommunicationMode();
-        Long userId = AppLoginHelper.getUserId();
-        if (mode == CommunicationModeEnum.FOUR_G.getValue()) {
-
-            String deviceImei = bo.getDeviceImei();
-            QueryWrapper<Device> qw = new QueryWrapper<Device>()
-                    .eq("device_imei", deviceImei);
-            List<Device> devices = deviceMapper.selectList(qw);
-            if (devices.isEmpty()) {
-                throw new RuntimeException("请先将设备入库！！！");
-            }
-            Device device = devices.get(0);
-            if (device.getBindingStatus() != null && device.getBindingStatus() == BindingStatusEnum.BOUND.getCode()) {
-                throw new RuntimeException("设备已绑定");
-            }
-            UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
-            deviceUpdateWrapper.eq("id", device.getId())
-                    .set("binding_status", BindingStatusEnum.BOUND.getCode())
-                    .set("binding_user_id", userId)
-                    .set("binding_time", new Date());
-            return deviceMapper.update(null, deviceUpdateWrapper);
-        } else if (mode == CommunicationModeEnum.BLUETOOTH.getValue()) {
-            String deviceMac = bo.getDeviceMac();
-            QueryWrapper<Device> qw = new QueryWrapper<Device>()
-                    .eq("device_mac", deviceMac);
-            List<Device> devices = deviceMapper.selectList(qw);
-            if (devices.isEmpty()) {
-                throw new RuntimeException("请先将设备入库！！！");
-            }
-            Device device = devices.get(0);
-
-            QueryWrapper<AppDeviceBindRecord> bindRecordQueryWrapper = new QueryWrapper<>();
-            bindRecordQueryWrapper.eq("device_id", device.getId());
-            bindRecordQueryWrapper.eq("binding_user_id", userId);
-            AppDeviceBindRecord appDeviceBindRecord = appDeviceBindRecordMapper.selectOne(bindRecordQueryWrapper);
-            if (appDeviceBindRecord != null) {
-                UpdateWrapper<AppDeviceBindRecord> deviceUpdateWrapper = new UpdateWrapper<>();
-                deviceUpdateWrapper.eq("device_id", device.getId())
-                        .eq("binding_user_id", userId)
-                        .set("binding_user_id", userId)
-                        .set("binding_time", new Date());
-                return appDeviceBindRecordMapper.update(null, deviceUpdateWrapper);
-            }else{
-                AppDeviceBindRecord bindRecord = new AppDeviceBindRecord();
-                bindRecord.setDeviceId(device.getId());
-                bindRecord.setBindingUserId(userId);
-                bindRecord.setBindingTime(new Date());
-                bindRecord.setCreateBy(userId);
-                appDeviceBindRecordMapper.insert(bindRecord);
-            }
-
-            UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
-            deviceUpdateWrapper.eq("id", device.getId())
-                    .set("binding_status", BindingStatusEnum.BOUND.getCode())
-                    .set("binding_user_id", userId)
-                    .set("binding_time", new Date());
-            return deviceMapper.update(null, deviceUpdateWrapper);
-        } else {
-            throw new RuntimeException("通讯方式错误");
-        }
-
-    }
-
-
-    public int unBindDevice(Long id) {
-        return unBindDevice(id, null, 1);
-    }
-
-    public int unBindDevice(Long id, Long userId, int type) {
-        Device device = deviceMapper.selectById(id);
-        if (device == null) {
-            throw new RuntimeException("请先将设备入库！！！");
-        }
-        UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
-        deviceUpdateWrapper.eq("id", device.getId())
-                .set("binding_status", BindingStatusEnum.UNBOUND.getCode())
-                .set("binding_user_id", null)
-                .set("binding_time", null);
-        deviceMapper.update(null, deviceUpdateWrapper);
-
-        if (userId == null) {
-            userId = AppLoginHelper.getUserId();
-        }
-        QueryWrapper<AppDeviceBindRecord> bindRecordQueryWrapper = new QueryWrapper<>();
-        bindRecordQueryWrapper.eq("device_id", device.getId());
-        // 设备端解绑 0:设备端解绑 1:web端解绑
-        if (type == 1) {
-            bindRecordQueryWrapper.eq("binding_user_id", userId);
-        }
-
-        // AppDeviceBindRecord appDeviceBindRecord = appDeviceBindRecordMapper.selectOne(bindRecordQueryWrapper);
-        // if (appDeviceBindRecord != null) {
-        //     return appDeviceBindRecordMapper.deleteById(appDeviceBindRecord.getId());
-        // }
-
-        List<AppDeviceBindRecord> appDeviceBindRecordList = appDeviceBindRecordMapper.selectList(bindRecordQueryWrapper);
-        if (CollectionUtil.isNotEmpty(appDeviceBindRecordList)) {
-            appDeviceBindRecordList.forEach(appDeviceBindRecord ->
-                    appDeviceBindRecordMapper.deleteById(appDeviceBindRecord.getId()));
-        }
-
-        return 1;
-    }
-
-
-    public AppDeviceDetailVo getInfo(Long id) {
-        Device device = deviceMapper.selectById(id);
-        if (device == null) {
-            throw new RuntimeException("请先将设备入库！！！");
-        }
-        AppDeviceDetailVo vo = new AppDeviceDetailVo();
-        vo.setDeviceId(device.getId());
-        vo.setDeviceName(device.getDeviceName());
-        vo.setDevicePic(device.getDevicePic());
-        vo.setDeviceImei(device.getDeviceImei());
-        vo.setDeviceMac(device.getDeviceMac());
-        vo.setDeviceStatus(device.getDeviceStatus());
-        DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
-        if (deviceType != null) {
-            vo.setCommunicationMode(Integer.valueOf(deviceType.getCommunicationMode()));
-            vo.setTypeName(deviceType.getTypeName());
-        }
-        vo.setBluetoothName(device.getBluetoothName());
-
-        vo.setSendMsg(device.getSendMsg());
-
-        QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
-                .eq("device_id", device.getId());
-        AppPersonnelInfo appPersonnelInfo = appPersonnelInfoMapper.selectOne(qw);
-        if (appPersonnelInfo != null) {
-            AppPersonnelInfoVo personnelInfoVo = MapstructUtils.convert(appPersonnelInfo, AppPersonnelInfoVo.class);
-            vo.setPersonnelInfo(personnelInfoVo);
-        }
-        return vo;
-    }
-
-    public boolean registerPersonInfo(AppPersonnelInfoBo bo) {
-        Long deviceId = bo.getDeviceId();
-        Device deviceObj = deviceMapper.selectById(deviceId);
-        if(deviceObj == null){
-            throw new RuntimeException("请先将设备入库！！！");
-        }
-        QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
-                .eq("device_id", deviceId);
-        List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
-//        unitName,position,name,id
-        byte[] unitName = ReliableTextToBitmap.textToBitmapBytes(bo.getUnitName());
-        byte[] position = ReliableTextToBitmap.textToBitmapBytes(bo.getPosition());
-        byte[] name = ReliableTextToBitmap.textToBitmapBytes(bo.getName());
-        byte[] id = ReliableTextToBitmap.textToBitmapBytes(bo.getCode());
-        Map<String,Object> linkHashMap = new HashMap<>();
-        linkHashMap.put("unitName",unitName);
-        linkHashMap.put("position",position);
-        linkHashMap.put("name",name);
-        linkHashMap.put("id",id);
-        String personnelInfo = JSON.toJSONString(linkHashMap);
-        mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+deviceObj.getDeviceImei(), 1 ,personnelInfo);
-        log.info("发送点阵数据到设备消息：{}", bo);
-
-        if (ObjectUtils.length(appPersonnelInfoVos) == 0) {
-            AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class);
-            return appPersonnelInfoMapper.insertOrUpdate(appPersonnelInfo);
-        } else {
-            UpdateWrapper<AppPersonnelInfo> uw = new UpdateWrapper<>();
-            uw.eq("device_id", deviceId)
-                    .set("name", bo.getName())
-                    .set("position", bo.getPosition())
-                    .set("unit_name", bo.getUnitName())
-                    .set("code", bo.getCode());
-            return appPersonnelInfoMapper.update(null, uw) > 0;
-        }
-
-
-    }
-
-    public void uploadDeviceLogo(AppDeviceLogoUploadDto bo) {
-        try {
-            Device device = deviceMapper.selectById(bo.getDeviceId());
-            if (device == null) {
-                throw new ServiceException("设备不存在");
-            }
-            MultipartFile file = bo.getFile();
-
-            byte[] largeData = ImageToCArrayConverter.convertImageToCArray(file.getInputStream(), 160, 80, 25600);
-            System.out.println("长度：" + largeData.length);
-
-            System.out.println("原始数据大小: " + largeData.length + " 字节");
-
-            int[] ints = convertHexToDecimal(largeData);
-            RedisUtils.setCacheObject(GLOBAL_REDIS_KEY+"app_logo_data:" + device.getDeviceImei(), Arrays.toString(ints), Duration.ofSeconds(30 * 60L));
-
-            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+"app_logo_data:" + device.getDeviceImei());
-
-            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
-            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, 0, 512);
-            System.out.println("第0块数据大小: " + specificChunk.length + " 字节");
-            System.out.println("第0块数据: " + Arrays.toString(specificChunk));
-
-            ArrayList<Integer> intData = new ArrayList<>();
-            intData.add(3);
-            intData.add(1);
-            ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk),intData);
-            intData.add(0);
-            intData.add(0);
-            intData.add(0);
-            intData.add(0);
-            Map<String, Object> map = new HashMap<>();
-            map.put("instruct", intData);
-            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
-            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
-        } catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 灯光模式
-     * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）
-     */
-    public void lightModeSettings(DeviceInstructDto params) {
-        try {
-            Long deviceId = params.getDeviceId();
-            Device device = deviceMapper.selectById(deviceId);
-            if(device == null){
-                throw new ServiceException("设备不存在");
-            }
-            Integer instructValue =  Integer.parseInt(params.getInstructValue());
-            ArrayList<Integer> intData = new ArrayList<>();
-            intData.add(1);
-            intData.add(instructValue);
-            intData.add(0);
-            intData.add(0);
-            intData.add(0);
-            Map<String, Object> map = new HashMap<>();
-            map.put("instruct", intData);
-            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
-            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
-        } catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    //灯光亮度设置
-    public void lightBrightnessSettings(DeviceInstructDto params) {
-        try {
-            Long deviceId = params.getDeviceId();
-            Device device = deviceMapper.selectById(deviceId);
-            if(device == null){
-                throw new ServiceException("设备不存在");
-            }
-            String instructValue = params.getInstructValue();
-            ArrayList<Integer> intData = new ArrayList<>();
-            intData.add(5);
-            String[] values = instructValue.split("\\.");
-            String value1 = values[0];
-            String value2 = values[1];
-            if(StringUtils.isNoneBlank(value1)){
-                intData.add(Integer.parseInt(value1));
-            }
-            if(StringUtils.isNoneBlank(value2)){
-                intData.add(Integer.parseInt(value2));
-            }
-            intData.add(0);
-            intData.add(0);
-            intData.add(0);
-            Map<String, Object> map = new HashMap<>();
-            map.put("instruct", intData);
-            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
-            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
-        } catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    //激光模式设置
-    public void laserModeSettings(DeviceInstructDto params) {
-        try {
-            Long deviceId =  params.getDeviceId();
-            Device device = deviceMapper.selectById(deviceId);
-            if(device == null){
-                throw new ServiceException("设备不存在");
-            }
-            Integer instructValue = Integer.parseInt(params.getInstructValue());
-            ArrayList<Integer> intData = new ArrayList<>();
-            intData.add(4);
-            intData.add(instructValue);
-            intData.add(0);
-            intData.add(0);
-            intData.add(0);
-            Map<String, Object> map = new HashMap<>();
-            map.put("instruct", intData);
-            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
-            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
-        } catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    public String mapReverseGeocoding(DeviceInstructDto params) {
-//        Long deviceId = params.getDeviceId();
-//        Device device = deviceMapper.selectById(deviceId);
-        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("device_imei", params.getDeviceImei());
-        List<Device> devices = deviceMapper.selectList(queryWrapper);
-        if(ObjectUtils.length( devices) ==0){
-            throw new ServiceException("设备不存在");
-        }
-        return RedisUtils.getCacheObject("device:location:" + devices.get(0).getDeviceImei());
-    }
-
-}

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

@@ -1,135 +0,0 @@
-package com.fuyuanshen.app.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.fuyuanshen.app.domain.AppDeviceShare;
-import com.fuyuanshen.app.domain.AppPersonnelInfo;
-import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
-import com.fuyuanshen.app.domain.vo.AppDeviceShareDetailVo;
-import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
-import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
-import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
-import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
-import com.fuyuanshen.common.core.constant.Constants;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.core.exception.ServiceException;
-import com.fuyuanshen.common.core.exception.user.CaptchaExpireException;
-import com.fuyuanshen.common.core.utils.MessageUtils;
-import com.fuyuanshen.common.core.utils.StringUtils;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
-import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.DeviceType;
-import com.fuyuanshen.equipment.mapper.DeviceMapper;
-import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-
-@RequiredArgsConstructor
-@Slf4j
-@Service
-public class AppDeviceShareService {
-
-    private final AppDeviceShareMapper appDeviceShareMapper;
-    
-    private final DeviceMapper deviceMapper;
-
-    private final DeviceTypeMapper deviceTypeMapper;
-
-    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
-
-    public AppDeviceShareDetailVo getInfo(Long id) {
-
-        LambdaQueryWrapper<AppDeviceShare> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AppDeviceShare::getDeviceId, id);
-        List<AppDeviceShareVo> appDeviceShareVos = appDeviceShareMapper.selectVoList(queryWrapper);
-        if(appDeviceShareVos==null || appDeviceShareVos.isEmpty()){
-            return null;
-        }
-
-        AppDeviceShareVo shareVo = appDeviceShareVos.get(0);
-        AppDeviceShareDetailVo shareDetailVo = new AppDeviceShareDetailVo();
-        shareDetailVo.setId(shareVo.getId());
-        shareDetailVo.setDeviceId(shareVo.getDeviceId());
-        shareDetailVo.setPhonenumber(shareVo.getPhonenumber());
-        shareDetailVo.setPermission(shareVo.getPermission());
-
-        Device device = deviceMapper.selectById(shareVo.getDeviceId());
-        shareDetailVo.setDeviceName(device.getDeviceName());
-        shareDetailVo.setDeviceImei(device.getDeviceImei());
-        shareDetailVo.setDeviceMac(device.getDeviceMac());
-
-        DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
-        if(deviceType!=null){
-            shareDetailVo.setCommunicationMode(Integer.valueOf(deviceType.getCommunicationMode()));
-        }
-        shareDetailVo.setDevicePic(device.getDevicePic());
-        shareDetailVo.setTypeName(deviceType.getTypeName());
-        shareDetailVo.setBluetoothName(device.getBluetoothName());
-        shareDetailVo.setDeviceStatus(device.getDeviceStatus());
-        shareDetailVo.setSendMsg(device.getSendMsg());
-
-        LambdaQueryWrapper<AppPersonnelInfo> qw = new LambdaQueryWrapper<>();
-        qw.eq(AppPersonnelInfo::getDeviceId, device.getId());
-        List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
-        if(appPersonnelInfoVos!=null && !appPersonnelInfoVos.isEmpty()){
-            shareDetailVo.setPersonnelInfo(appPersonnelInfoVos.get(0));
-        }
-
-        return shareDetailVo;
-    }
-    /**
-     * 校验短信验证码
-     */
-    private boolean validateSmsCode(String tenantId, String phonenumber, String smsCode) {
-        String code = RedisUtils.getCacheObject(GlobalConstants.DEVICE_SHARE_CODES_KEY + phonenumber);
-        if (StringUtils.isBlank(code)) {
-            throw new ServiceException("验证码失效");
-        }
-        return code.equals(smsCode);
-    }
-    public int deviceShare(AppDeviceShareBo bo) {
-        boolean flag = validateSmsCode(AppLoginHelper.getTenantId(), bo.getPhonenumber(), bo.getSmsCode());
-        if(!flag){
-            throw new ServiceException("验证码错误");
-        }
-
-        Device device = deviceMapper.selectById(bo.getDeviceId());
-        if(device==null){
-            throw new ServiceException("设备不存在");
-        }
-        Long userId = AppLoginHelper.getUserId();
-        LambdaQueryWrapper<AppDeviceShare> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(AppDeviceShare::getDeviceId, bo.getDeviceId());
-        lqw.eq(AppDeviceShare::getPhonenumber, bo.getPhonenumber());
-        Long count = appDeviceShareMapper.selectCount(lqw);
-        if(count>0){
-
-            UpdateWrapper<AppDeviceShare> uw = new UpdateWrapper<>();
-            uw.eq("device_id", bo.getDeviceId());
-            uw.eq("phonenumber", bo.getPhonenumber());
-            uw.set("permission", bo.getPermission());
-            uw.set("update_by", userId);
-            uw.set("update_time", new Date());
-
-            return appDeviceShareMapper.update(uw);
-        }else {
-            AppDeviceShare appDeviceShare = new AppDeviceShare();
-            appDeviceShare.setDeviceId(bo.getDeviceId());
-            appDeviceShare.setPhonenumber(bo.getPhonenumber());
-            appDeviceShare.setPermission(bo.getPermission());
-            appDeviceShare.setCreateBy(userId);
-            return appDeviceShareMapper.insert(appDeviceShare);
-        }
-    }
-
-    public int remove(Long[] ids) {
-        return appDeviceShareMapper.deleteByIds(Arrays.asList(ids));
-    }
-}

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

@@ -2,11 +2,14 @@ package com.fuyuanshen.app.service;
 
 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.fuyuanshen.app.domain.vo.AppRoleVo;
 import com.fuyuanshen.app.domain.vo.AppUserVo;
 import com.fuyuanshen.common.core.constant.Constants;
 import com.fuyuanshen.common.core.constant.SystemConstants;
 import com.fuyuanshen.common.core.constant.TenantConstants;
+import com.fuyuanshen.common.core.domain.dto.RoleDTO;
 import com.fuyuanshen.common.core.domain.model.AppLoginUser;
 import com.fuyuanshen.common.core.enums.LoginType;
 import com.fuyuanshen.common.core.exception.user.UserException;
@@ -181,6 +184,7 @@ public class AppLoginService {
             throw new TenantException("tenant.expired");
         }
     }
+
     public void cancelAccount() {
         try {
             AppLoginUser loginUser = AppLoginHelper.getLoginUser();

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/base/MqttRuleEngine.java

@@ -1,5 +1,9 @@
 package com.fuyuanshen.global.mqtt.base;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.task.TaskExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
 import java.util.Comparator;
@@ -11,7 +15,10 @@ import java.util.List;
  */
 @Component
 public class MqttRuleEngine {
-    
+
+    @Autowired
+    @Qualifier("threadPoolTaskExecutor")
+    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
     private final LinkedHashMap<String, MqttMessageRule> rulesMap = new LinkedHashMap<>();
     public MqttRuleEngine(List<MqttMessageRule> rules) {
@@ -30,7 +37,7 @@ public class MqttRuleEngine {
         int commandType = context.getCommandType();
         MqttMessageRule mqttMessageRule = rulesMap.get("Light_"+commandType);
         if (mqttMessageRule != null) {
-            mqttMessageRule.execute(context);
+            threadPoolTaskExecutor.execute(() -> mqttMessageRule.execute(context));
             return true;
         }
         

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

@@ -4,12 +4,6 @@ import org.springframework.integration.annotation.MessagingGateway;
 import org.springframework.integration.mqtt.support.MqttHeaders;
 import org.springframework.messaging.handler.annotation.Header;
 
-/**
- * @Author: HarryLin
- * @Date: 2025/3/20  17:06
- * @Company: 北京红山信息科技研究院有限公司
- * @Email: linyun@***.com.cn
- **/
 @MessagingGateway(defaultRequestChannel = "mqttOutboundChannel")
 public interface MqttGateway {
     public abstract void sendMsgToMqtt(@Header(value = MqttHeaders.TOPIC) String topic, String payload);

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

@@ -0,0 +1,50 @@
+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";
+    // 在线状态
+    public static final String DEVICE_ONLINE_STATUS_KEY_PREFIX = ":onlineStatus";
+    // 设备状态信息存储到Redis中
+    public static final String DEVICE_LOCATION_KEY_PREFIX = ":location";
+    // 存储到一个列表中，保留历史位置信息
+    public static final String DEVICE_LOCATION_HISTORY_KEY_PREFIX = ":location:history";
+
+    // 存储设备活跃上报信息
+    public static final String DEVICE_ACTIVE_REPORTING_KEY_PREFIX = ":activeReporting";
+
+    // 存储设备人员信息
+    public static final String DEVICE_PERSONNEL_INFO_KEY_PREFIX = ":personnelInfo";
+
+    // 存储设备发送消息
+    public static final String DEVICE_SEND_MESSAGE_KEY_PREFIX = ":sendMessage";
+
+    // 存储设备启动logo
+    public static final String DEVICE_BOOT_LOGO_KEY_PREFIX = ":bootLogo";
+
+    /**
+     * 灯模式
+     */
+    public static final String DEVICE_LIGHT_MODE_KEY_PREFIX = ":lightMode";
+
+    /**
+     * 亮度模式
+     */
+    public static final String DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX = ":lightBrightness";
+
+    /**
+     * 激光模式
+     */
+    public static final String DEVICE_LASER_MODE_KEY_PREFIX = ":laserMode";
+
+    /**
+     * 地图逆地理编码
+     */
+    public static final String DEVICE_MAP_REVERSE_GEOCODING_KEY_PREFIX = ":mapReverseGeocoding";
+
+    /**
+     * 告警
+     */
+    public static final String DEVICE_ALARM_KEY_PREFIX = ":alarm";
+}

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

@@ -30,6 +30,17 @@ public class LightingCommandTypeConstants {
      * 主灯亮度 (Main Light Brightness)
      */
     public static final String MAIN_LIGHT_BRIGHTNESS = "Light_5";
+
+    /**
+     * 设备发送消息
+     */
+    public static final String SEND_MESSAGE = "Light_6";
+
+
+    /**
+     * 报警模式
+     */
+    public static final String ALARM_MESSAGE = "Light_7";
     
     /**
      * 定位数据 (Location Data)
@@ -40,37 +51,5 @@ public class LightingCommandTypeConstants {
      * 主动上报设备数据 (Active Reporting Device Data)
      */
     public static final String ACTIVE_REPORTING_DEVICE_DATA = "Light_12";
-    
-    /**
-     * 获取命令类型描述
-     * 
-     * @param commandType 命令类型
-     * @return 命令类型描述
-     */
-    public static String getCommandTypeDescription(String commandType) {
-        return switch (commandType) {
-            case LIGHT_MODE -> "灯光模式 (Light Mode)";
-            case PERSONNEL_INFO -> "人员信息 (Personnel Information)";
-            case BOOT_LOGO -> "开机LOGO (Boot Logo)";
-            case LASER_LIGHT -> "激光灯 (Laser Light)";
-            case MAIN_LIGHT_BRIGHTNESS -> "主灯亮度 (Main Light Brightness)";
-            case LOCATION_DATA -> "定位数据 (Location Data)";
-            default -> "未知命令类型 (Unknown Command Type)";
-        };
-    }
-    
-    /**
-     * 检查是否为有效命令类型
-     * 
-     * @param commandType 命令类型
-     * @return 是否有效
-     */
-    public static boolean isValidCommandType(String commandType) {
-        return commandType.equals(LIGHT_MODE)  ||
-               commandType.equals(PERSONNEL_INFO) ||
-               commandType.equals(BOOT_LOGO) ||
-               commandType.equals(LASER_LIGHT) ||
-               commandType.equals(MAIN_LIGHT_BRIGHTNESS) ||
-               commandType.equals(LOCATION_DATA);
-    }
+
 }

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

@@ -0,0 +1,27 @@
+package com.fuyuanshen.global.mqtt.constants;
+
+/**
+ * 租户常量定义类
+ * 包含系统中使用的各种租户标识
+ *
+ * @author: 默苍璃
+ * @date: 2025-08-05 10:46
+ */
+public class TenantsConstant {
+
+    /**
+     * 晶全租户
+     */
+    public static final String JING_QUAN = "014443";
+
+    /**
+     * 富源晟租户
+     */
+    public static final String FU_YUAN_SHENG = "894078";
+
+    /**
+     * 管理员租户
+     */
+    public static final String ADMIN = "000000";
+
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/listener/RedisKeyExpirationListener.java

@@ -0,0 +1,38 @@
+package com.fuyuanshen.global.mqtt.listener;
+
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_TIMEOUT_KEY;
+
+@Component
+@Slf4j
+public class RedisKeyExpirationListener implements MessageListener {
+
+    @Override
+    public void onMessage(Message message, byte[] pattern) {
+        String expiredKey = new String(message.getBody());
+
+        if (expiredKey.startsWith(FUNCTION_ACCESS_KEY)) {
+            String element = expiredKey.substring(FUNCTION_ACCESS_KEY.length());
+            handleFunctionAccessExpired(element);
+        }
+    }
+
+    /**
+     * 访问key过期事件
+     * @param element 批次ID
+     */
+    private void handleFunctionAccessExpired(String element) {
+        RedisUtils.setCacheObject(FUNCTION_ACCESS_TIMEOUT_KEY + element, FunctionAccessStatus.TIMEOUT.getCode(), Duration.ofSeconds(30L));
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.fuyuanshen.global.mqtt.listener.config;
+
+import com.fuyuanshen.global.mqtt.listener.RedisKeyExpirationListener;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.listener.PatternTopic;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+
+@Configuration
+public class RedisListenerConfig {
+
+    @Bean
+    RedisMessageListenerContainer redisMessageListenerContainer(RedisConnectionFactory connectionFactory,
+                                                               RedisKeyExpirationListener redisKeyExpirationListener) {
+        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+        container.setConnectionFactory(connectionFactory);
+        
+        // 监听过期事件
+        container.addMessageListener(redisKeyExpirationListener, new PatternTopic("__keyevent@*__:expired"));
+        return container;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/listener/domain/FunctionAccessResult.java

@@ -0,0 +1,96 @@
+package com.fuyuanshen.global.mqtt.listener.domain;
+
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+/**
+ * 功能访问状态对象
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FunctionAccessResult {
+    
+    /**
+     * 状态码
+     */
+    private String status;
+    
+    /**
+     * 消息描述
+     */
+    private String message;
+    
+    /**
+     * 时间戳
+     */
+    private Long timestamp;
+    
+    /**
+     * 设备IMEI（可选）
+     */
+    private String deviceImei;
+    
+    /**
+     * 批次ID（可选）
+     */
+    private String batchId;
+    
+    public FunctionAccessResult(String status, String message) {
+        this.status = status;
+        this.message = message;
+        this.timestamp = System.currentTimeMillis();
+    }
+    
+    /**
+     * 创建失败状态对象
+     * @param message 消息
+     * @return FunctionAccessResult
+     */
+    public static FunctionAccessResult failed(String message) {
+        return new FunctionAccessResult("FAILED", message);
+    }
+    
+    /**
+     * 创建成功状态对象
+     * @param message 消息
+     * @return FunctionAccessResult
+     */
+    public static FunctionAccessResult ok(String message) {
+        return new FunctionAccessResult("OK", message);
+    }
+    
+    /**
+     * 创建超时状态对象
+     * @param message 消息
+     * @return FunctionAccessResult
+     */
+    public static FunctionAccessResult timeout(String message) {
+        return new FunctionAccessResult("TIMEOUT", message);
+    }
+    
+    /**
+     * 判断是否为失败状态
+     * @return boolean
+     */
+    public boolean isFailed() {
+        return "FAILED".equals(this.status);
+    }
+    
+    /**
+     * 判断是否为成功状态
+     * @return boolean
+     */
+    public boolean isOk() {
+        return "OK".equals(this.status);
+    }
+    
+    /**
+     * 判断是否为超时状态
+     * @return boolean
+     */
+    public boolean isTimeout() {
+        return "TIMEOUT".equals(this.status);
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/listener/domain/FunctionAccessStatus.java

@@ -0,0 +1,62 @@
+package com.fuyuanshen.global.mqtt.listener.domain;
+
+/**
+ * 功能访问状态枚举
+ */
+public enum FunctionAccessStatus {
+    
+    /**
+     * 失败状态
+     */
+    FAILED("FAILED", "失败"),
+    
+    /**
+     * 成功状态
+     */
+    OK("OK", "成功"),
+
+    /**
+     * 激活中状态
+     */
+    ACTIVE("ACTIVE", "处理中"),
+
+    /**
+     * 超时状态
+     */
+    TIMEOUT("TIMEOUT", "超时");
+
+    private final String code;
+    private final String description;
+
+    FunctionAccessStatus(String code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * 根据代码获取状态枚举
+     * @param code 状态代码
+     * @return 对应的状态枚举
+     */
+    public static FunctionAccessStatus fromCode(String code) {
+        for (FunctionAccessStatus status : FunctionAccessStatus.values()) {
+            if (status.getCode().equals(code)) {
+                return status;
+            }
+        }
+        throw new IllegalArgumentException("未知的状态代码: " + code);
+    }
+
+    @Override
+    public String toString() {
+        return code;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/publish/MqttMessageSender.java

@@ -6,12 +6,7 @@ import org.springframework.integration.mqtt.support.MqttHeaders;
 import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.stereotype.Service;
 
-/**
- * @Author: HarryLin
- * @Date: 2025/3/20  16:16
- * @Company: 北京红山信息科技研究院有限公司
- * @Email: linyun@***.com.cn
- **/
+
 @Service
 public class MqttMessageSender {
     @Autowired

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/receiver/ReceiverMessageHandler.java

@@ -1,10 +1,14 @@
 package com.fuyuanshen.global.mqtt.receiver;
 
 import cn.hutool.core.lang.Dict;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
+import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
 import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
 import com.fuyuanshen.global.mqtt.base.MqttRuleEngine;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.Message;
@@ -13,8 +17,11 @@ import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.MessagingException;
 import org.springframework.stereotype.Service;
 
+import java.time.Duration;
 import java.util.Objects;
 
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
 @Service
 @Slf4j
 public class ReceiverMessageHandler implements MessageHandler {
@@ -37,16 +44,19 @@ public class ReceiverMessageHandler implements MessageHandler {
         if (receivedTopic == null || payloadDict == null) {
             return;
         }
-        
+        String[] subStr = receivedTopic.split("/");
+        String deviceImei = subStr[1];
+        if(StringUtils.isNotBlank(deviceImei)){
+            //在线状态
+            String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+            RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(62));
+        }
+
         String state = payloadDict.getStr("state");
         Object[] convertArr = ImageToCArrayConverter.convertByteStringToMixedObjectArray(state);
         
         if (convertArr.length > 0) {
             Byte val1 = (Byte) convertArr[0];
-            String[] subStr = receivedTopic.split("/");
-            System.out.println("收到设备id: " + subStr[1]);
-            String deviceImei = subStr[1];
-
             MqttRuleContext context = new MqttRuleContext();
             context.setCommandType(val1);
             context.setConvertArr(convertArr);

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

@@ -1,11 +1,13 @@
-package com.fuyuanshen.global.mqtt.rule;
+package com.fuyuanshen.global.mqtt.rule.bjq;
 
+import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
 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.listener.domain.FunctionAccessStatus;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -15,6 +17,9 @@ 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.DEVICE_STATUS_KEY_PREFIX;
+
 /**
  * 主动上报设备数据命令处理
  * "第1位为12表示设备主动上报设备硬件状态，第2为表示当时设备主灯档位，第3位表示当时激光灯档位，第4位电量百分比，第5位为充电状态（0没有充电，1正在充电，2为已充满）
@@ -23,10 +28,7 @@ import java.util.concurrent.CompletableFuture;
 @Component
 @RequiredArgsConstructor
 @Slf4j
-public class ActiveReportingDeviceDataRule implements MqttMessageRule {
-    
-    private final MqttGateway mqttGateway;
-
+public class BjqActiveReportingDeviceDataRule implements MqttMessageRule {
 
     @Override
     public String getCommandType() {
@@ -45,16 +47,16 @@ public class ActiveReportingDeviceDataRule implements MqttMessageRule {
             String chargeState = convertArr[4].toString();
             String batteryRemainingTime = convertArr[5].toString();
 
-            // 异步发送设备状态和位置信息到Redis
+            // 发送设备状态和位置信息到Redis
             asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(), mainLightMode, laserLightMode,
                     batteryPercentage, chargeState, batteryRemainingTime);
         } catch (Exception e) {
-            log.error("处理定位数据命令时出错", e);
+            log.error("处理上报数据命令时出错", e);
         }
     }
 
     /**
-     * 异步发送设备状态信息和位置信息到Redis（使用CompletableFuture）
+     * 发送设备状态信息和位置信息到Redis
      *
      * @param deviceImei 设备IMEI
      * @param mainLightMode 主灯档位
@@ -78,11 +80,11 @@ public class ActiveReportingDeviceDataRule implements MqttMessageRule {
                 deviceInfo.put("timestamp", System.currentTimeMillis());
 
                 // 将设备状态信息存储到Redis中
-                String deviceRedisKey = "device:status:" + deviceImei;
+                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_STATUS_KEY_PREFIX;
                 String deviceInfoJson = JsonUtils.toJsonString(deviceInfo);
 
-                // 存储到Redis，设置过期时间（例如24小时）
-                RedisUtils.setCacheObject(deviceRedisKey, deviceInfoJson, Duration.ofSeconds(24 * 60 * 60));
+                // 存储到Redis
+                RedisUtils.setCacheObject(deviceRedisKey, deviceInfoJson);
 
                 log.info("设备状态信息已异步发送到Redis: device={}, mainLightMode={}, laserLightMode={}, batteryPercentage={}",
                         deviceImei, mainLightMode, laserLightMode, batteryPercentage);
@@ -92,4 +94,6 @@ public class ActiveReportingDeviceDataRule implements MqttMessageRule {
         });
     }
 
+
+
 }

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

@@ -0,0 +1,56 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+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.concurrent.CompletableFuture;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+/**
+ * 灯光模式订阅设备回传消息
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqAlarmRule implements MqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.ALARM_MESSAGE;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Object[] convertArr = context.getConvertArr();
+
+            String convertValue = convertArr[1].toString();
+            if(StringUtils.isNotBlank(convertValue)){
+                // 将设备状态信息存储到Redis中
+                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX;
+
+                // 存储到Redis
+                RedisUtils.setCacheObject(deviceRedisKey, convertValue);
+            }
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+        } catch (Exception e) {
+            log.error("处理告警命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+
+
+}

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

@@ -0,0 +1,84 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+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.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.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_BOOT_LOGO_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 上传开机图片命令处理
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqBootLogoRule implements MqttMessageRule {
+    
+    private final MqttGateway mqttGateway;
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.BOOT_LOGO;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Byte val2 = (Byte) context.getConvertArr()[1];
+            if (val2 == 100) {
+                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+                return;
+            }
+
+            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX  + context.getDeviceImei() +DEVICE_BOOT_LOGO_KEY_PREFIX);
+            if (StringUtils.isEmpty(data)) {
+                return;
+            }
+            
+            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
+            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, (val2 - 1), 512);
+            log.info("第{}块数据大小: {} 字节", val2, specificChunk.length);
+
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(3);
+            intData.add((int) val2);
+            ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk), intData);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            
+            Map<String, Object> map = new HashMap<>();
+            map.put("instruct", intData);
+            
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
+            log.info("发送开机LOGO点阵数据到设备消息=>topic:{},payload:{}",
+                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
+                    JsonUtils.toJsonString(map));
+
+        } catch (Exception e) {
+            log.error("处理开机LOGO时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+}

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

@@ -0,0 +1,80 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+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 static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_LIGHT_MODE_KEY_PREFIX;
+
+/**
+ * 灯光模式订阅设备回传消息
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqLaserModeSettingsRule implements MqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.LASER_LIGHT;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Object[] convertArr = context.getConvertArr();
+
+            String mainLightMode = convertArr[1].toString();
+            if(StringUtils.isNotBlank(mainLightMode)){
+                if("0".equals(mainLightMode)){
+                    String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ context.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+                    RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "0", Duration.ofSeconds(60*15));
+                }
+                // 发送设备状态和位置信息到Redis
+                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),mainLightMode);
+            }
+
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(30));
+        } catch (Exception e) {
+            log.error("处理激光模式命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(30));
+        }
+    }
+
+    /**
+     * 发送设备状态信息和位置信息到Redis
+     *
+     * @param deviceImei 设备IMEI
+     */
+    public void syncSendDeviceDataToRedisWithFuture(String deviceImei,Object convertValue) {
+//        CompletableFuture.runAsync(() -> {
+//
+//        });
+        try {
+            // 将设备状态信息存储到Redis中
+            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_LIGHT_MODE_KEY_PREFIX;
+
+            // 存储到Redis
+            RedisUtils.setCacheObject(deviceRedisKey, convertValue.toString());
+
+        } catch (Exception e) {
+            log.error("异步发送设备信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+        }
+    }
+
+
+
+}

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

@@ -0,0 +1,51 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+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 static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+/**
+ * 灯光模式订阅设备回传消息
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqLightBrightnessRule implements MqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.MAIN_LIGHT_BRIGHTNESS;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Object[] convertArr = context.getConvertArr();
+
+            String convertValue = convertArr[1].toString();
+            // 将设备状态信息存储到Redis中
+            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX;
+
+            // 存储到Redis
+            RedisUtils.setCacheObject(deviceRedisKey, convertValue);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+        } catch (Exception e) {
+            log.error("处理灯光亮度命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+}

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

@@ -1,5 +1,7 @@
-package com.fuyuanshen.global.mqtt.rule;
+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;
@@ -8,8 +10,10 @@ 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;
@@ -21,13 +25,17 @@ 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.DEVICE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX;
+
 /**
  * 定位数据命令处理
  */
 @Component
 @RequiredArgsConstructor
 @Slf4j
-public class LocationDataRule implements MqttMessageRule {
+public class BjqLocationDataRule implements MqttMessageRule {
     
     private final MqttGateway mqttGateway;
 
@@ -39,6 +47,7 @@ public class LocationDataRule implements MqttMessageRule {
 
     @Override
     public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
         try {
             Object[] convertArr = context.getConvertArr();
             // Latitude, longitude
@@ -53,8 +62,10 @@ public class LocationDataRule implements MqttMessageRule {
             log.info("发送定位数据到设备=>topic:{},payload:{}",
                     MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
                     JsonUtils.toJsonString(map));
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
         } catch (Exception e) {
             log.error("处理定位数据命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
         }
     }
 
@@ -103,33 +114,86 @@ public class LocationDataRule implements MqttMessageRule {
     public void asyncSendLocationToRedisWithFuture(String deviceImei, String latitude, String longitude) {
         CompletableFuture.runAsync(() -> {
             try {
-                if(StringUtils.isNotBlank(latitude) || StringUtils.isNotBlank(longitude)){
+                if(StringUtils.isBlank(latitude) || StringUtils.isBlank(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("\\.");
+
+                    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;
+                    }
+                }
+
                 // 构造位置信息对象
                 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());
 
 
-                // 将位置信息存储到Redis中
-                String redisKey = "device:location:" + deviceImei;
+                
                 String locationJson = JsonUtils.toJsonString(locationInfo);
 
                 // 存储到Redis
-                RedisUtils.setCacheObject(redisKey, locationJson, Duration.ofSeconds(24 * 60 * 60));
+                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);
             }
         });
     }
+
+    /**
+     * 存储设备30天历史轨迹到Redis (使用Sorted Set)
+     */
+    public void storeDeviceTrajectoryWithSortedSet(String deviceImei, String locationJson) {
+        try {
+            String trajectoryKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + deviceImei + DeviceRedisKeyConstants.DEVICE_LOCATION_HISTORY_KEY_PREFIX;
+//            String trajectoryKey = "device:trajectory:zset:" + deviceImei;
+//            String locationJson = JsonUtils.toJsonString(locationInfo);
+            long timestamp = System.currentTimeMillis();
+
+            // 添加到Sorted Set，使用时间戳作为score
+            RedisUtils.zAdd(trajectoryKey, locationJson, timestamp);
+
+//            // 设置30天过期时间
+//            RedisUtils.expire(trajectoryKey, Duration.ofDays(30));
+
+            // 清理30天前的数据（冗余保护）
+            long thirtyDaysAgo = System.currentTimeMillis() - (7L * 24 * 60 * 60 * 1000);
+            RedisUtils.zRemoveRangeByScore(trajectoryKey, 0, thirtyDaysAgo);
+        } catch (Exception e) {
+            log.error("存储设备轨迹到Redis(ZSet)失败: device={}, error={}", deviceImei, e.getMessage(), e);
+        }
+    }
     
     private Map<String, Object> buildLocationDataMap(String latitude, String longitude) {
         String[] latArr = latitude.split("\\.");
@@ -138,9 +202,11 @@ public class LocationDataRule implements MqttMessageRule {
         ArrayList<Integer> intData = new ArrayList<>();
         intData.add(11);
         intData.add(Integer.parseInt(latArr[0]));
-        intData.add(Integer.parseInt(latArr[1]));
+        String str1 = latArr[1];
+        intData.add(Integer.parseInt(str1.substring(0,4)));
+        String str2 = lonArr[1];
         intData.add(Integer.parseInt(lonArr[0]));
-        intData.add(Integer.parseInt(lonArr[1]));
+        intData.add(Integer.parseInt(str2.substring(0,4)));
         
         Map<String, Object> map = new HashMap<>();
         map.put("instruct", intData);

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

@@ -0,0 +1,84 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+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.concurrent.CompletableFuture;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+/**
+ * 灯光模式订阅设备回传消息
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqModeRule implements MqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.LIGHT_MODE;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Object[] convertArr = context.getConvertArr();
+
+            String mainLightMode = convertArr[1].toString();
+            String batteryRemainingTime = convertArr[2].toString();
+            if(StringUtils.isNotBlank(mainLightMode)){
+                if("0".equals(mainLightMode)){
+                    String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ context.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+                    RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "0", Duration.ofSeconds(60*15));
+                }
+                // 发送设备状态和位置信息到Redis
+                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),mainLightMode);
+                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX;
+
+                // 存储到Redis
+                RedisUtils.setCacheObject(deviceRedisKey, batteryRemainingTime);
+            }
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+        } catch (Exception e) {
+            log.error("处理灯光模式命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+
+    /**
+     * 发送设备状态信息和位置信息到Redis
+     *
+     * @param deviceImei 设备IMEI
+     */
+    public void syncSendDeviceDataToRedisWithFuture(String deviceImei,Object convertValue) {
+//        CompletableFuture.runAsync(() -> {
+//
+//        });
+        try {
+            // 将设备状态信息存储到Redis中
+            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_LIGHT_MODE_KEY_PREFIX;
+
+            // 存储到Redis
+            RedisUtils.setCacheObject(deviceRedisKey, convertValue.toString());
+
+        } catch (Exception e) {
+            log.error("异步发送设备信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+        }
+    }
+
+
+
+}

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

@@ -0,0 +1,58 @@
+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.*;
+
+/**
+ * 定位数据命令处理
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqPersonnelInfoDataRule implements MqttMessageRule {
+    
+    private final MqttGateway mqttGateway;
+
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.PERSONNEL_INFO;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Object[] convertArr = context.getConvertArr();
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(30));
+        } catch (Exception e) {
+            log.error("处理定位数据命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(30));
+        }
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.fuyuanshen.global.mqtt.rule;
+package com.fuyuanshen.global.mqtt.rule.bjq;
 
 import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
 import com.fuyuanshen.common.core.utils.StringUtils;
@@ -9,16 +9,20 @@ import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
 import com.fuyuanshen.global.mqtt.config.MqttGateway;
 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.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
 import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
 
 /**
  * 人员信息命令处理
@@ -26,35 +30,37 @@ import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHex
 @Component
 @RequiredArgsConstructor
 @Slf4j
-public class PersonnelInfoRule implements MqttMessageRule {
+public class BjqSendMessageRule implements MqttMessageRule {
     
     private final MqttGateway mqttGateway;
 
     @Override
     public String getCommandType() {
-        return LightingCommandTypeConstants.PERSONNEL_INFO;
+        return LightingCommandTypeConstants.SEND_MESSAGE;
     }
 
     @Override
     public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
         try {
             Byte val2 = (Byte) context.getConvertArr()[1];
             if (val2 == 100) {
+                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
                 return;
             }
 
-            String data = RedisUtils.getCacheObject("894078:app_logo_data:" + context.getDeviceImei());
+            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + context.getDeviceImei() + ":app_send_message_data");
             if (StringUtils.isEmpty(data)) {
                 return;
             }
             
             byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
             byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, (val2 - 1), 512);
-            System.out.println("第" + val2 + "块数据大小: " + specificChunk.length + " 字节");
-            System.out.println("第" + val2 + "块数据: " + Arrays.toString(specificChunk));
+            log.info("第{}块数据大小: {} 字节", val2, specificChunk.length);
+//            System.out.println("第" + val2 + "块数据: " + Arrays.toString(specificChunk));
 
             ArrayList<Integer> intData = new ArrayList<>();
-            intData.add(3);
+            intData.add(6);
             intData.add((int) val2);
             ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk), intData);
             intData.add(0);
@@ -66,11 +72,13 @@ public class PersonnelInfoRule implements MqttMessageRule {
             map.put("instruct", intData);
             
             mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
-            log.info("发送人员信息点阵数据到设备消息=>topic:{},payload:{}",
+            log.info("发送设备信息数据到设备消息=>topic:{},payload:{}",
                     MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
                     JsonUtils.toJsonString(map));
+
         } catch (Exception e) {
-            log.error("处理人员信息命令时出错", e);
+            log.error("处理发送设备信息时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
         }
     }
 }

fys-admin/src/main/java/com/fuyuanshen/web/ChineseVCardGenerator.java

@@ -0,0 +1,64 @@
+package com.fuyuanshen.web;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class ChineseVCardGenerator {
+    public static void main(String[] args) {
+        // 定义江西上饶的134号段（共22个）
+        String[] prefixes = {
+                "1340703", "1340793", "1342650", "1342651", "1342663",
+                "1342664", "1342665", "1343703", "1343793", "1347901",
+                "1347902", "1347903", "1347930", "1347931", "1347932",
+                "1347933", "1347934", "1347935", "1347936", "1347937",
+                "1347938", "1347939"
+        };
+
+        // 创建.vcf文件
+        String filename = "上饶联系人.vcf";
+
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filename, true))) {
+            // 添加文件头信息（包含中文）
+            writer.write("BEGIN:VCARD");
+            writer.newLine();
+            writer.write("VERSION:3.0");
+            writer.newLine();
+            writer.write("X-GENERATOR:Java VCard Generator");
+            writer.newLine();
+            writer.write("PRODID:-//Apple Inc.//iPhone OS 15.6//EN");
+            writer.newLine();
+            writer.newLine();
+
+            // 生成所有联系人
+            int count = 0;
+            for (String prefix : prefixes) {
+                for (int i = 0; i < 100; i++) {
+                    String middle = String.format("%02d", i);
+                    String phoneNumber = prefix + middle + "51";
+
+                    // 写入单个联系人（使用中文）
+                    writer.write("FN;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:用户" + (count + 1));  // 中文姓名
+                    writer.newLine();
+                    writer.write("TEL;TYPE=CELL;CHARSET=UTF-8:" + phoneNumber);  // 手机号
+                    writer.newLine();
+                    writer.write("NOTE;CHARSET=UTF-8:生成时间 " + new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+                    writer.newLine();
+                    writer.write("END:VCARD");
+                    writer.newLine();
+                    writer.newLine();
+
+                    count++;
+                }
+            }
+
+            System.out.println("成功生成 " + count + " 个中文联系人");
+            System.out.println("文件已保存为: " + filename);
+
+        } catch (IOException e) {
+            System.err.println("文件写入错误: " + e.getMessage());
+        }
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/PhoneNumberGenerator.java

@@ -0,0 +1,41 @@
+package com.fuyuanshen.web;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+
+public class PhoneNumberGenerator {
+    public static void main(String[] args) {
+        // 定义江西上饶的134号段（共22个）
+        String[] prefixes = {
+                "1340703", "1340793", "1342650", "1342651", "1342663",
+                "1342664", "1342665", "1343703", "1343793", "1347901",
+                "1347902", "1347903", "1347930", "1347931", "1347932",
+                "1347933", "1347934", "1347935", "1347936", "1347937",
+                "1347938", "1347939"
+        };
+
+        // 输出到控制台
+        System.out.println("江西上饶134号段完整手机号码（共2200个）：");
+        for (String prefix : prefixes) {
+            for (int i = 0; i < 100; i++) {
+                String middle = String.format("%02d", i); // 生成00-99的中间数字
+                System.out.println(prefix + middle + "51");
+            }
+        }
+
+        // 同时输出到文件（可选）
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter("shangrao_phones.txt"))) {
+            for (String prefix : prefixes) {
+                for (int i = 0; i < 100; i++) {
+                    String middle = String.format("%02d", i);
+                    writer.write(prefix + middle + "51");
+                    writer.newLine();
+                }
+            }
+            System.out.println("\n同时已保存到文件：shangrao_phones.txt");
+        } catch (IOException e) {
+            System.err.println("文件写入错误：" + e.getMessage());
+        }
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/VCardGenerator.java

@@ -0,0 +1,59 @@
+package com.fuyuanshen.web;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+
+public class VCardGenerator {
+    public static void main(String[] args) {
+        // 定义江西上饶的134号段（共22个）
+        String[] prefixes = {
+                "1340703", "1340793", "1342650", "1342651", "1342663",
+                "1342664", "1342665", "1343703", "1343793", "1347901",
+                "1347902", "1347903", "1347930", "1347931", "1347932",
+                "1347933", "1347934", "1347935", "1347936", "1347937",
+                "1347938", "1347939"
+        };
+
+        // 创建.vcf文件
+        String filename = "shangrao_contacts.vcf";
+
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filename))) {
+            // 写入文件头
+            writer.write("BEGIN:VCARD");
+            writer.newLine();
+            writer.write("VERSION:3.0");
+            writer.newLine();
+            writer.newLine();
+
+            // 生成所有联系人
+            int count = 0;
+            for (String prefix : prefixes) {
+                for (int i = 0; i < 100; i++) {
+                    String middle = String.format("%02d", i);
+                    String phoneNumber = prefix + middle + "51";
+
+                    // 写入单个联系人
+                    writer.write("FN:" + phoneNumber);  // 姓名字段使用手机号
+                    writer.newLine();
+                    writer.write("TEL;TYPE=CELL:" + phoneNumber);  // 电话字段使用手机号
+                    writer.newLine();
+                    writer.write("END:VCARD");
+                    writer.newLine();
+                    writer.newLine();
+
+                    count++;
+                }
+            }
+
+            // 写入文件尾
+            writer.write("END:VCARD");
+
+            System.out.println("成功生成 " + count + " 个联系人");
+            System.out.println("文件已保存为: " + filename);
+
+        } catch (IOException e) {
+            System.err.println("文件写入错误: " + e.getMessage());
+        }
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/config/CustomMqttInboundConfiguration.java

@@ -0,0 +1,61 @@
+//package com.fuyuanshen.web.config;
+//
+//import cn.hutool.core.lang.UUID;
+//import com.fuyuanshen.global.mqtt.config.MqttPropertiesConfig;
+//import com.fuyuanshen.web.handler.mqtt.DeviceReceiverMessageHandler;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.integration.annotation.ServiceActivator;
+//import org.springframework.integration.channel.DirectChannel;
+//import org.springframework.integration.core.MessageProducer;
+//import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
+//import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;
+//import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
+//import org.springframework.messaging.MessageChannel;
+//import org.springframework.messaging.MessageHandler;
+//
+///**
+// * @author: 默苍璃
+// * @date: 2025-08-0110:46
+// */
+//@Configuration
+//public class CustomMqttInboundConfiguration {
+//
+//    @Autowired
+//    private MqttPropertiesConfig mqttPropertiesConfig;
+//    @Autowired
+//    private MqttPahoClientFactory mqttPahoClientFactory;
+//    @Autowired
+//    private DeviceReceiverMessageHandler deviceReceiverMessageHandler;
+//
+//
+//    @Bean
+//    public MessageChannel customMqttChannel(){
+//        return new DirectChannel();
+//    }
+//
+//
+//    @Bean
+//    public MessageProducer customMessageProducer(){
+//        String clientId = "custom_client_" + UUID.fastUUID();
+//        MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter(
+//                mqttPropertiesConfig.getUrl(),
+//                clientId,
+//                mqttPahoClientFactory,
+//                "A/#", "B/#"  // 直接指定这两个主题
+//        );
+//        adapter.setQos(1);
+//        adapter.setConverter(new DefaultPahoMessageConverter());
+//        adapter.setOutputChannel(customMqttChannel());
+//        return adapter;
+//    }
+//
+//
+//    @Bean
+//    @ServiceActivator(inputChannel = "customMqttChannel")
+//    public MessageHandler customMessageHandler(){
+//        return deviceReceiverMessageHandler;
+//    }
+//
+//}

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

@@ -0,0 +1,119 @@
+package com.fuyuanshen.web.controller.device;
+
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.web.service.device.DeviceBJQBizService;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * BJQ6170设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/bjq/device")
+public class DeviceBJQController extends BaseController {
+
+    private final DeviceBJQBizService appDeviceService;
+
+    /**
+     * 获取设备详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<AppDeviceDetailVo> getInfo(@NotNull(message = "主键不能为空")
+                                             @PathVariable Long id) {
+        return R.ok(appDeviceService.getInfo(id));
+    }
+
+    /**
+     * 人员信息登记
+     */
+    @PostMapping(value = "/registerPersonInfo")
+//    @FunctionAccessAnnotation("registerPersonInfo")
+    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
+        return toAjax(appDeviceService.registerPersonInfo(bo));
+    }
+
+    /**
+     * 发送信息
+     */
+    @PostMapping(value = "/sendMessage")
+    @FunctionAccessBatcAnnotation(value = "sendMessage", timeOut = 30, batchMaxTimeOut = 40)
+    public R<Void> sendMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendMessage(bo));
+    }
+
+    /**
+     * 发送报警信息
+     */
+    @PostMapping(value = "/sendAlarmMessage")
+    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
+    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendAlarmMessage(bo));
+    }
+
+    /**
+     * 上传设备logo图片
+     */
+    @PostMapping("/uploadLogo")
+    @FunctionAccessAnnotation("uploadLogo")
+    public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
+
+        MultipartFile file = bo.getFile();
+        if(file.getSize()>1024*1024*2){
+            return R.warn("图片不能大于2M");
+        }
+        appDeviceService.uploadDeviceLogo(bo);
+
+        return R.ok();
+    }
+
+    /**
+     * 灯光模式
+     * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）
+     */
+//    @FunctionAccessAnnotation("lightModeSettings")
+    @PostMapping("/lightModeSettings")
+    public R<Void> lightModeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.lightModeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 灯光亮度设置
+     *
+     */
+//    @FunctionAccessAnnotation("lightBrightnessSettings")
+    @PostMapping("/lightBrightnessSettings")
+    public R<Void> lightBrightnessSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.lightBrightnessSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 激光模式设置
+     *
+     */
+    @PostMapping("/laserModeSettings")
+//    @FunctionAccessAnnotation("laserModeSettings")
+    public R<Void> laserModeSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.laserModeSettings(params);
+        return R.ok();
+    }
+
+}

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

@@ -0,0 +1,210 @@
+package com.fuyuanshen.web.controller.device;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-08-0810:40
+ */
+@Slf4j
+@Tag(name = "web后台:设备控制中心", description = "web后台:设备控制中心")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/device/controlCenter")
+public class DeviceControlCenterController {
+
+    /**
+     * 获取设备基本信息
+     * @param deviceId 设备ID
+     * @return 设备基本信息
+     */
+    @GetMapping("/info/{deviceId}")
+    public ResponseEntity<Map<String, Object>> getDeviceInfo(@PathVariable String deviceId) {
+        // 实际应用中这里会从数据库查询设备信息
+        Map<String, Object> deviceInfo = new HashMap<>();
+        deviceInfo.put("deviceName", "6170零零一");
+        deviceInfo.put("deviceModel", "BJQ6170");
+        deviceInfo.put("deviceId", deviceId);
+        deviceInfo.put("status", "在线");
+        deviceInfo.put("batteryLevel", 85);
+
+        return ResponseEntity.ok(deviceInfo);
+    }
+
+    /**
+     * 设置灯光模式
+     * @param lightModeRequest 灯光模式请求
+     * @return 操作结果
+     */
+    @PostMapping("/light-mode")
+    public ResponseEntity<Map<String, Object>> setLightMode(@RequestBody LightModeRequest lightModeRequest) {
+        // 实际应用中这里会控制设备灯光
+        Map<String, Object> response = new HashMap<>();
+        response.put("code", 200);
+        // response.put("message", "灯光模式已设置为: " + lightModeRequest.getMode());
+        // response.put("deviceId", lightModeRequest.getDeviceId());
+        // response.put("mode", lightModeRequest.getMode());
+
+        return ResponseEntity.ok(response);
+    }
+
+    /**
+     * 更新人员信息
+     * @param personInfo 人员信息
+     * @return 操作结果
+     */
+    @PostMapping("/person-info")
+    public ResponseEntity<Map<String, Object>> updatePersonInfo(@RequestBody PersonInfo personInfo) {
+        // 实际应用中这里会更新数据库
+        Map<String, Object> response = new HashMap<>();
+        response.put("code", 200);
+        response.put("message", "人员信息已更新");
+        // response.put("unit", personInfo.getUnit());
+        // response.put("position", personInfo.getPosition());
+
+        return ResponseEntity.ok(response);
+    }
+
+    /**
+     * 管理开机画面内容
+     * @param bootScreenRequest 开机画面请求
+     * @return 操作结果
+     */
+    @PostMapping("/boot-screen")
+    public ResponseEntity<Map<String, Object>> manageBootScreen(@RequestBody BootScreenRequest bootScreenRequest) {
+        // 实际应用中这里会更新设备开机画面
+        Map<String, Object> response = new HashMap<>();
+        response.put("code", 200);
+        response.put("message", "开机画面内容已更新");
+        // response.put("deviceId", bootScreenRequest.getDeviceId());
+        // response.put("screens", bootScreenRequest.getScreens());
+
+        return ResponseEntity.ok(response);
+    }
+
+    /**
+     * 设置灯光亮度
+     * @param brightnessRequest 亮度请求
+     * @return 操作结果
+     */
+    @PostMapping("/brightness")
+    public ResponseEntity<Map<String, Object>> setBrightness(@RequestBody BrightnessRequest brightnessRequest) {
+        // 实际应用中这里会控制设备亮度
+        Map<String, Object> response = new HashMap<>();
+        response.put("code", 200);
+        // response.put("message", "灯光亮度已设置为: " + brightnessRequest.getBrightness() + "%");
+        // response.put("deviceId", brightnessRequest.getDeviceId());
+        // response.put("brightness", brightnessRequest.getBrightness());
+        // response.put("forceAlarm", brightnessRequest.isForceAlarm());
+
+        return ResponseEntity.ok(response);
+    }
+
+    /**
+     * 获取设备位置信息
+     * @param deviceId 设备ID
+     * @return 位置信息
+     */
+    @GetMapping("/location/{deviceId}")
+    public ResponseEntity<Map<String, Object>> getLocation(@PathVariable String deviceId) {
+        // 实际应用中这里会从设备获取实时位置
+        Map<String, Object> locationInfo = new HashMap<>();
+        locationInfo.put("deviceId", deviceId);
+        locationInfo.put("longitude", "114°7'E");
+        locationInfo.put("latitude", "30'28'N");
+        locationInfo.put("address", "湖北省武汉市洪山区光谷大道国际企业中心");
+        locationInfo.put("timestamp", new Date());
+
+        return ResponseEntity.ok(locationInfo);
+    }
+
+    /**
+     * 发送紧急消息
+     * @param messageRequest 消息请求
+     * @return 操作结果
+     */
+    @PostMapping("/send-message")
+    public ResponseEntity<Map<String, Object>> sendMessage(@RequestBody MessageRequest messageRequest) {
+        // 实际应用中这里会向设备发送消息
+        Map<String, Object> response = new HashMap<>();
+        response.put("code", 200);
+        response.put("message", "消息已发送");
+        // response.put("deviceId", messageRequest.getDeviceId());
+        // response.put("content", messageRequest.getContent());
+        response.put("timestamp", new Date());
+
+        return ResponseEntity.ok(response);
+    }
+
+    /**
+     * 管理操作视频
+     * @param videoRequest 视频请求
+     * @return 操作结果
+     */
+    @PostMapping("/operation-video")
+    public ResponseEntity<Map<String, Object>> manageOperationVideo(@RequestBody VideoRequest videoRequest) {
+        // 实际应用中这里会更新设备操作视频
+        Map<String, Object> response = new HashMap<>();
+        response.put("code", 200);
+        response.put("message", "操作视频已更新");
+        // response.put("deviceId", videoRequest.getDeviceId());
+        // response.put("videoUrl", videoRequest.getVideoUrl());
+
+        return ResponseEntity.ok(response);
+    }
+
+    // 请求对象类定义
+    public static class LightModeRequest {
+        private String deviceId;
+        private String mode; // 强光、弱光、爆闪、泛光、激光
+
+        // Getters and Setters
+    }
+
+    public static class PersonInfo {
+        private String deviceId;
+        private String unit; // 单位
+        private String position; // 职位
+
+        // Getters and Setters
+    }
+
+    public static class BootScreenRequest {
+        private String deviceId;
+        private List<String> screens; // 产品参数、操作说明等
+
+        // Getters and Setters
+    }
+
+    public static class BrightnessRequest {
+        private String deviceId;
+        private int brightness; // 0-100
+        private boolean forceAlarm; // 强制报警
+
+        // Getters and Setters
+    }
+
+    public static class MessageRequest {
+        private String deviceId;
+        private String content; // 消息内容
+
+        // Getters and Setters
+    }
+
+    public static class VideoRequest {
+        private String deviceId;
+        private String videoUrl; // 视频链接
+
+        // Getters and Setters
+    }
+
+}

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

@@ -0,0 +1,109 @@
+package com.fuyuanshen.web.controller.device;
+
+import java.util.List;
+
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+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.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.equipment.domain.vo.DeviceGroupVo;
+import com.fuyuanshen.equipment.domain.bo.DeviceGroupBo;
+import com.fuyuanshen.equipment.service.IDeviceGroupService;
+
+/**
+ * 设备分组
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/device/group")
+public class DeviceGroupController extends BaseController {
+
+    private final IDeviceGroupService deviceGroupService;
+
+
+    /**
+     * 查询设备分组列表
+     */
+    @SaCheckPermission("fys-equipment:group:list")
+    @GetMapping("/list")
+    public R<List<DeviceGroupVo>> list(DeviceGroupBo bo) {
+        List<DeviceGroupVo> list = deviceGroupService.queryList(bo);
+        return R.ok(list);
+    }
+
+
+    /**
+     * 导出设备分组列表
+     */
+    @SaCheckPermission("fys-equipment:group:export")
+    @Log(title = "设备分组", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DeviceGroupBo bo, HttpServletResponse response) {
+        List<DeviceGroupVo> list = deviceGroupService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备分组", DeviceGroupVo.class, response);
+    }
+
+
+    /**
+     * 获取设备分组详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("fys-equipment:group:query")
+    @GetMapping("/{id}")
+    public R<DeviceGroupVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return R.ok(deviceGroupService.queryById(id));
+    }
+
+
+    /**
+     * 新增设备分组
+     */
+    @SaCheckPermission("fys-equipment:group:add")
+    @Log(title = "设备分组", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceGroupBo bo) {
+        return toAjax(deviceGroupService.insertByBo(bo));
+    }
+
+
+    /**
+     * 修改设备分组
+     */
+    @SaCheckPermission("fys-equipment:group:edit")
+    @Log(title = "设备分组", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceGroupBo bo) {
+        return toAjax(deviceGroupService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备分组
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("fys-equipment:group:remove")
+    @Log(title = "设备分组", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
+        return toAjax(deviceGroupService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+}

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

@@ -1,16 +1,27 @@
 package com.fuyuanshen.web.controller.device;
 
 
+import com.fuyuanshen.app.domain.dto.APPReNameDTO;
+import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
+import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
 import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
 import com.fuyuanshen.web.service.WEBDeviceService;
+import com.fuyuanshen.web.service.device.DeviceBizService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -25,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class WEBDeviceController extends BaseController {
 
     private final WEBDeviceService deviceService;
+    private final DeviceBizService appDeviceService;
 
 
     /**
@@ -41,6 +53,66 @@ public class WEBDeviceController extends BaseController {
     }
 
 
+    /**
+     * 查询设备列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
+        return appDeviceService.queryAppDeviceList(bo, pageQuery);
+    }
+
+    /**
+     * 绑定设备
+     */
+    @PostMapping("/bind")
+    public R<Void> bind(@RequestBody AppDeviceBo bo) {
+        return toAjax(appDeviceService.bindDevice(bo));
+    }
+
+
+    /**
+     * 解绑设备
+     */
+    @DeleteMapping("/unBind")
+    public R<Void> unBind(Long id) {
+        return toAjax(appDeviceService.unBindDevice(id));
+    }
+
+    /**
+     * 查询设备类型列表
+     */
+    @GetMapping(value = "/typeList")
+    public R<List<APPDeviceTypeVo>> getTypeList() {
+        List<APPDeviceTypeVo> typeList = appDeviceService.getTypeList();
+        return R.ok(typeList);
+    }
+
+    /**
+     * 重命名设备
+     *
+     * @param reNameDTO
+     * @return
+     */
+    @PostMapping(value = "/reName")
+    public R<String> reName(@Validated @RequestBody APPReNameDTO reNameDTO) {
+        appDeviceService.reName(reNameDTO);
+        return R.ok("重命名成功！！！");
+    }
+
+
+    @GetMapping("/realTimeStatus")
+    public R<Map<String, Object>> getRealTimeStatus(AppRealTimeStatusDto statusDto) {
+        Map<String, Object> status = appDeviceService.getRealTimeStatus(statusDto);
+        return R.ok(status);
+    }
+
+    /**
+     * 根据mac查询设备信息
+     */
+    @GetMapping("/getDeviceInfoByDeviceMac")
+    public R<AppDeviceVo> getDeviceInfo(String deviceMac) {
+        return R.ok(appDeviceService.getDeviceInfo(deviceMac));
+    }
 }
 
 

fys-admin/src/main/java/com/fuyuanshen/web/enums/InstructType6170.java

@@ -0,0 +1,50 @@
+package com.fuyuanshen.web.enums;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-08-0114:14
+ */
+public enum InstructType6170 {
+
+    EQUIPMENT_REPORTING(0, "设备启动"),
+    LIGHT_MODE(1, "灯光模式"),
+    /**
+     * 设备信息
+     * 单位/姓名/职位
+     */
+    UNIT_INFO(2, "设备信息"),
+    BOOT_IMAGE(3, "开机图片"),
+    LASER_LIGHT(4, "激光灯"),
+    BRIGHTNESS(5, "亮度调节"),
+    LOCATION_DATA(11, "定位数据"),
+
+
+    UNKNOWN(-1, "未知操作");
+
+    private final int code;
+    private final String description;
+
+    InstructType6170(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public static InstructType6170 fromCode(int code) {
+        for (InstructType6170 type : values()) {
+            if (type.getCode() == code) {
+                return type;
+            }
+        }
+        // throw new IllegalArgumentException("未知的指令类型代码: " + code);
+        return UNKNOWN;
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/enums/LightModeEnum6170.java

@@ -0,0 +1,45 @@
+package com.fuyuanshen.web.enums;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-08-0114:30
+ */
+public enum LightModeEnum6170 {
+
+    OFF(0, "关灯"),
+    HIGH_BEAM(1, "强光模式"),
+    LOW_BEAM(2, "弱光模式"),
+    STROBE(3, "爆闪模式"),
+    FLOOD(4, "泛光模式"),
+
+    UNKNOWN(-1, "未知的灯光模式");
+
+
+    private final int code;
+    private final String description;
+
+
+    LightModeEnum6170(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public static LightModeEnum6170 fromCode(int code) {
+        for (LightModeEnum6170 mode : values()) {
+            if (mode.getCode() == code) {
+                return mode;
+            }
+        }
+        // throw new IllegalArgumentException("未知的灯光模式代码: " + code);
+        return UNKNOWN;
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/handler/mqtt/DeviceReceiverMessageHandler.java

@@ -0,0 +1,318 @@
+//package com.fuyuanshen.web.handler.mqtt;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.fasterxml.jackson.databind.JsonNode;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import com.fuyuanshen.common.satoken.utils.LoginHelper;
+//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.equipment.utils.map.GetAddressFromLatUtil;
+//import com.fuyuanshen.equipment.utils.map.LngLonUtil;
+//import com.fuyuanshen.global.mqtt.constants.TenantsConstant;
+//import com.fuyuanshen.web.enums.InstructType6170;
+//import com.fuyuanshen.web.enums.LightModeEnum6170;
+//import lombok.AllArgsConstructor;
+//import lombok.Data;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.messaging.Message;
+//import org.springframework.messaging.MessageHandler;
+//import org.springframework.messaging.MessageHeaders;
+//import org.springframework.messaging.MessagingException;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 定义监听主题消息的处理器
+// *
+// * @author: 默苍璃
+// * @date: 2025-08-0110:19
+// */
+//@Component
+//@Data
+//@AllArgsConstructor
+//@Slf4j
+//public class DeviceReceiverMessageHandler implements MessageHandler {
+//
+//    private final DeviceMapper deviceMapper;
+//    private final DeviceLogMapper deviceLogMapper;
+//
+//    // 使用Jackson解析JSON
+//    private static final ObjectMapper objectMapper = new ObjectMapper();
+//
+//
+//    /**
+//     * 处理接收的消息
+//     *
+//     * @param message
+//     * @throws MessagingException
+//     */
+//    @Override
+//    public void handleMessage(Message<?> message) throws MessagingException {
+//        // System.out.println("接收到的消息：" + message.getPayload());
+//        MessageHeaders headers = message.getHeaders();
+//        String receivedTopicName = (String) headers.get("mqtt_receivedTopic");
+//        System.out.println("消息来自主题：" + receivedTopicName);
+//
+//        // String tenantId = LoginHelper.getTenantId();
+//        String tenantId = TenantsConstant.FU_YUAN_SHENG;
+//        String payload = message.getPayload().toString();
+//
+//        if (receivedTopicName != null) {
+//            // 1. 提取设备ID (从主题中获取)
+//            String deviceImei = extractDeviceId(receivedTopicName);
+//            Device device = deviceMapper.selectOne(new QueryWrapper<Device>()
+//                    .eq("tenant_id", tenantId)
+//                    .eq("device_imei", deviceImei));
+//            if (device == null) {
+//                log.info("不存在的设备IMEI: {}", deviceImei);
+//            } else {
+//
+//                try {
+//                    JsonNode root = objectMapper.readTree(payload);
+//
+//                    DeviceLog record = new DeviceLog();
+//                    // 手动设置租户ID
+//                    record.setTenantId(device.getTenantId()); // 从设备信息中获取租户ID
+//                    // 设备ID
+//                    record.setDeviceId(device.getId());
+//                    // 设备名称
+//                    record.setDeviceName(device.getDeviceName());
+//
+//                    // 2. 处理instruct消息
+//                    if (root.has("instruct")) {
+//                        JsonNode instructNode = root.get("instruct");
+//                        if (instructNode.isArray()) {
+//                            boolean b = receivedTopicName.startsWith("B/");
+//                            record = parseInstruct(device, instructNode, b);
+//                            // 根据不同主题进行不同处理
+//                            if (receivedTopicName.startsWith("A/")) {
+//                                // 处理A主题的消息（设备上传）
+//                                record.setDataSource("设备上报");
+//                            } else if (receivedTopicName.startsWith("B/")) {
+//                                // 处理B主题的消息 （手动上传）
+//                                record.setDataSource("客户端操作");
+//                            }
+//                        }
+//                        // 确保在插入前设置tenantId和deviceId
+//                        record.setTenantId(device.getTenantId());
+//                        record.setDeviceId(device.getId());
+//                        deviceLogMapper.insert(record);
+//                    }
+//
+//                    // 2. 处理 state 消息
+//                    if (root.has("state")) {
+//                        JsonNode instructNode = root.get("state");
+//                        if (instructNode.isArray()) {
+//                            boolean b = receivedTopicName.startsWith("B/");
+//                            record = parseState(device, instructNode, b);
+//                            // 根据不同主题进行不同处理
+//                            if (receivedTopicName.startsWith("A/")) {
+//                                // 处理A主题的消息（设备上传）
+//                                record.setDataSource("设备上报");
+//                            } else if (receivedTopicName.startsWith("B/")) {
+//                                // 处理B主题的消息 （手动上传）
+//                                record.setDataSource("客户端操作");
+//                            }
+//                        }
+//                        // 确保在插入前设置tenantId和deviceId
+//                        record.setTenantId(device.getTenantId());
+//                        record.setDeviceId(device.getId());
+//                        deviceLogMapper.insert(record);
+//                    }
+//
+//                    if (root.has("imei")) {
+//                        // 设备行为
+//                        record.setDeviceAction(InstructType6170.fromCode(0).getDescription());
+//                        record.setDataSource("设备上报");
+//                        record.setContent("设备启动");
+//                        // 确保在插入前设置tenantId和deviceId
+//                        record.setTenantId(device.getTenantId());
+//                        record.setDeviceId(device.getId());
+//                        deviceLogMapper.insert(record);
+//                    }
+//
+//
+//                    // 3. 处理state消息
+//                    // else if (root.has("state")) {
+//                    //     JsonNode stateNode = root.get("state");
+//                    //     if (stateNode.isArray()) {
+//                    //         StateRecord record = parseState(device, stateNode);
+//                    //         stateRepo.save(record);
+//                    //     }
+//                    // }
+//                } catch (Exception e) {
+//                    log.error("消息解析失败: {}", payload, e);
+//                }
+//
+//            }
+//
+//        }
+//    }
+//
+//
+//    /**
+//     * 从主题中提取设备ID(IMEI)
+//     *
+//     * @param topic
+//     * @return
+//     */
+//    private String extractDeviceId(String topic) {
+//        // 处理 A/# 或 B/# 格式的主题，例如 B/861556078765285 或 A/861556078765285
+//        String[] segments = topic.split("/");
+//        if (segments.length >= 2) {
+//            // 返回第二个段，即 / 后面的部分
+//            return segments[1];
+//        }
+//        // 如果格式不符合预期，返回原主题
+//        return topic;
+//    }
+//
+//
+//    /**
+//     * 解析instruct消息
+//     *
+//     * @param device
+//     * @param array
+//     * @param b
+//     * @return
+//     */
+//    private DeviceLog parseInstruct(Device device, JsonNode array, boolean b) {
+//        DeviceLog record = new DeviceLog();
+//        record.setDeviceName(device.getDeviceName());
+//        // 设备行为
+//        record.setDeviceAction(InstructType6170.fromCode(array.get(0).asInt()).getDescription());
+//
+//        switch (array.get(0).asInt()) {
+//            case 1: // 灯光模式
+//                LightModeEnum6170 lightModeEnum6170 = LightModeEnum6170.fromCode(array.get(1).asInt());
+//                record.setContent(lightModeEnum6170.getDescription());
+//                break;
+//
+//            case 2: // 单位/姓名/职位
+//                byte[] unitBytes = new byte[480];
+//                for (int i = 1; i <= 480; i++) {
+//                    unitBytes[i - 1] = (byte) array.get(i).asInt();
+//                }
+//                // record.setUnitData(unitBytes);
+//                break;
+//
+//            case 3: // 开机图片
+//                // record.setImagePage(array.get(1).asInt());
+//                byte[] imageBytes = new byte[512];
+//                for (int i = 2; i <= 513; i++) {
+//                    imageBytes[i - 2] = (byte) array.get(i).asInt();
+//                }
+//                // record.setImageData(imageBytes);
+//                break;
+//
+//            case 4: // 激光灯
+//                int anInt = array.get(1).asInt();
+//                if (anInt == 0) {
+//                    record.setContent("关闭激光灯");
+//                } else if (anInt == 1) {
+//                    record.setContent("开启激光灯");
+//                } else {
+//                    record.setContent("未知操作");
+//                }
+//                break;
+//
+//            case 5: // 亮度调节
+//                record.setContent(+array.get(1).asInt() + "%");
+//                break;
+//
+//            case 11: // 定位数据
+//                if (b) {
+//                    break;
+//                }
+//                int i1 = array.get(1).asInt();
+//                int i2 = array.get(2).asInt();
+//                int i3 = array.get(3).asInt();
+//                int i4 = array.get(4).asInt();
+//
+//                // 优雅的转换方式 Longitude and latitude
+//                double latitude = i1 + i2 / 10.0;
+//                double Longitude = i3 + i4 / 10.0;
+//                // 84 ==》 高德
+//                double[] doubles = LngLonUtil.gps84_To_Gcj02(latitude, Longitude);
+//                String address = GetAddressFromLatUtil.getAdd(String.valueOf(doubles[1]), String.valueOf(doubles[0]));
+//                record.setContent(address);
+//                break;
+//        }
+//        return record;
+//    }
+//
+//
+//    /**
+//     * 解析 state 消息
+//     *
+//     * @param device
+//     * @param array
+//     * @return
+//     */
+//    private DeviceLog parseState(Device device, JsonNode array, boolean b) {
+//        DeviceLog record = new DeviceLog();
+//        record.setDeviceName(device.getDeviceName());
+//        // 设备行为
+//        record.setDeviceAction(InstructType6170.fromCode(array.get(0).asInt()).getDescription());
+//
+//        switch (array.get(0).asInt()) {
+//            case 1: // 灯光模式
+//                LightModeEnum6170 lightModeEnum6170 = LightModeEnum6170.fromCode(array.get(1).asInt());
+//                record.setContent(lightModeEnum6170.getDescription());
+//                break;
+//
+//            case 2: // 单位/姓名/职位
+//                byte[] unitBytes = new byte[480];
+//                for (int i = 1; i <= 480; i++) {
+//                    unitBytes[i - 1] = (byte) array.get(i).asInt();
+//                }
+//                // record.setUnitData(unitBytes);
+//                break;
+//
+//            case 3: // 开机图片
+//                // record.setImagePage(array.get(1).asInt());
+//                byte[] imageBytes = new byte[512];
+//                for (int i = 2; i <= 513; i++) {
+//                    imageBytes[i - 2] = (byte) array.get(i).asInt();
+//                }
+//                // record.setImageData(imageBytes);
+//                break;
+//
+//            case 4: // 激光灯
+//                int anInt = array.get(1).asInt();
+//                if (anInt == 0) {
+//                    record.setContent("关闭激光灯");
+//                } else if (anInt == 1) {
+//                    record.setContent("开启激光灯");
+//                } else {
+//                    record.setContent("未知操作");
+//                }
+//                break;
+//
+//            case 5: // 亮度调节
+//                record.setContent(+array.get(1).asInt() + "%");
+//                break;
+//
+//            case 11: // 定位数据
+//                if (b) {
+//                    break;
+//                }
+//                int i1 = array.get(1).asInt();
+//                int i2 = array.get(2).asInt();
+//                int i3 = array.get(3).asInt();
+//                int i4 = array.get(4).asInt();
+//
+//                // 优雅的转换方式 Longitude and latitude
+//                double latitude = i1 + i2 / 10.0;
+//                double Longitude = i3 + i4 / 10.0;
+//                // 84 ==》 高德
+//                double[] doubles = LngLonUtil.gps84_To_Gcj02(latitude, Longitude);
+//                String address = GetAddressFromLatUtil.getAdd(String.valueOf(doubles[1]), String.valueOf(doubles[0]));
+//                record.setContent(address);
+//                break;
+//        }
+//        return record;
+//    }
+//
+//}

fys-admin/src/main/java/com/fuyuanshen/web/listener/UserActionListener.java

@@ -1,163 +1,163 @@
-package com.fuyuanshen.web.listener;
-
-import cn.dev33.satoken.listener.SaTokenListener;
-import cn.dev33.satoken.stp.StpUtil;
-import cn.dev33.satoken.stp.parameter.SaLoginParameter;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.http.useragent.UserAgent;
-import cn.hutool.http.useragent.UserAgentUtil;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import com.fuyuanshen.common.core.constant.CacheConstants;
-import com.fuyuanshen.common.core.constant.Constants;
-import com.fuyuanshen.common.core.domain.dto.UserOnlineDTO;
-import com.fuyuanshen.common.core.utils.MessageUtils;
-import com.fuyuanshen.common.core.utils.ServletUtils;
-import com.fuyuanshen.common.core.utils.SpringUtils;
-import com.fuyuanshen.common.core.utils.ip.AddressUtils;
-import com.fuyuanshen.common.log.event.LogininforEvent;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.common.satoken.utils.LoginHelper;
-import com.fuyuanshen.common.tenant.helper.TenantHelper;
-import com.fuyuanshen.web.service.SysLoginService;
-import org.springframework.stereotype.Component;
-
-import java.time.Duration;
-
-/**
- * 用户行为 侦听器的实现
- *
- * @author Lion Li
- */
-@RequiredArgsConstructor
-@Component
-@Slf4j
-public class UserActionListener implements SaTokenListener {
-
-    private final SysLoginService loginService;
-
-    /**
-     * 每次登录时触发
-     */
-    @Override
-    public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginParameter loginParameter) {
-        UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
-        String ip = ServletUtils.getClientIP();
-        UserOnlineDTO dto = new UserOnlineDTO();
-        dto.setIpaddr(ip);
-        dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
-        dto.setBrowser(userAgent.getBrowser().getName());
-        dto.setOs(userAgent.getOs().getName());
-        dto.setLoginTime(System.currentTimeMillis());
-        dto.setTokenId(tokenValue);
-        String username = (String) loginParameter.getExtra(LoginHelper.USER_NAME_KEY);
-        String tenantId = (String) loginParameter.getExtra(LoginHelper.TENANT_KEY);
-        dto.setUserName(username);
-        dto.setClientKey((String) loginParameter.getExtra(LoginHelper.CLIENT_KEY));
-        dto.setDeviceType(loginParameter.getDeviceType());
-        dto.setDeptName((String) loginParameter.getExtra(LoginHelper.DEPT_NAME_KEY));
-        TenantHelper.dynamic(tenantId, () -> {
-            if(loginParameter.getTimeout() == -1) {
-                RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto);
-            } else {
-                RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(loginParameter.getTimeout()));
-            }
-        });
-        // 记录登录日志
-        LogininforEvent logininforEvent = new LogininforEvent();
-        logininforEvent.setTenantId(tenantId);
-        logininforEvent.setUsername(username);
-        logininforEvent.setStatus(Constants.LOGIN_SUCCESS);
-        logininforEvent.setMessage(MessageUtils.message("user.login.success"));
-        logininforEvent.setRequest(ServletUtils.getRequest());
-        SpringUtils.context().publishEvent(logininforEvent);
-        // 更新登录信息
-        loginService.recordLoginInfo((Long) loginParameter.getExtra(LoginHelper.USER_KEY), ip);
-        log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue);
-    }
-
-    /**
-     * 每次注销时触发
-     */
-    @Override
-    public void doLogout(String loginType, Object loginId, String tokenValue) {
-        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
-        TenantHelper.dynamic(tenantId, () -> {
-            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
-        });
-        log.info("user doLogout, userId:{}, token:{}", loginId, tokenValue);
-    }
-
-    /**
-     * 每次被踢下线时触发
-     */
-    @Override
-    public void doKickout(String loginType, Object loginId, String tokenValue) {
-        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
-        TenantHelper.dynamic(tenantId, () -> {
-            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
-        });
-        log.info("user doKickout, userId:{}, token:{}", loginId, tokenValue);
-    }
-
-    /**
-     * 每次被顶下线时触发
-     */
-    @Override
-    public void doReplaced(String loginType, Object loginId, String tokenValue) {
-        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
-        TenantHelper.dynamic(tenantId, () -> {
-            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
-        });
-        log.info("user doReplaced, userId:{}, token:{}", loginId, tokenValue);
-    }
-
-    /**
-     * 每次被封禁时触发
-     */
-    @Override
-    public void doDisable(String loginType, Object loginId, String service, int level, long disableTime) {
-    }
-
-    /**
-     * 每次被解封时触发
-     */
-    @Override
-    public void doUntieDisable(String loginType, Object loginId, String service) {
-    }
-
-    /**
-     * 每次打开二级认证时触发
-     */
-    @Override
-    public void doOpenSafe(String loginType, String tokenValue, String service, long safeTime) {
-    }
-
-    /**
-     * 每次创建Session时触发
-     */
-    @Override
-    public void doCloseSafe(String loginType, String tokenValue, String service) {
-    }
-
-    /**
-     * 每次创建Session时触发
-     */
-    @Override
-    public void doCreateSession(String id) {
-    }
-
-    /**
-     * 每次注销Session时触发
-     */
-    @Override
-    public void doLogoutSession(String id) {
-    }
-
-    /**
-     * 每次Token续期时触发
-     */
-    @Override
-    public void doRenewTimeout(String tokenValue, Object loginId, long timeout) {
-    }
-}
+//package com.fuyuanshen.web.listener;
+//
+//import cn.dev33.satoken.listener.SaTokenListener;
+//import cn.dev33.satoken.stp.StpUtil;
+//import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+//import cn.hutool.core.convert.Convert;
+//import cn.hutool.http.useragent.UserAgent;
+//import cn.hutool.http.useragent.UserAgentUtil;
+//import lombok.RequiredArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import com.fuyuanshen.common.core.constant.CacheConstants;
+//import com.fuyuanshen.common.core.constant.Constants;
+//import com.fuyuanshen.common.core.domain.dto.UserOnlineDTO;
+//import com.fuyuanshen.common.core.utils.MessageUtils;
+//import com.fuyuanshen.common.core.utils.ServletUtils;
+//import com.fuyuanshen.common.core.utils.SpringUtils;
+//import com.fuyuanshen.common.core.utils.ip.AddressUtils;
+//import com.fuyuanshen.common.log.event.LogininforEvent;
+//import com.fuyuanshen.common.redis.utils.RedisUtils;
+//import com.fuyuanshen.common.satoken.utils.LoginHelper;
+//import com.fuyuanshen.common.tenant.helper.TenantHelper;
+//import com.fuyuanshen.web.service.SysLoginService;
+//import org.springframework.stereotype.Component;
+//
+//import java.time.Duration;
+//
+///**
+// * 用户行为 侦听器的实现
+// *
+// * @author Lion Li
+// */
+//@RequiredArgsConstructor
+//@Component
+//@Slf4j
+//public class UserActionListener implements SaTokenListener {
+//
+//    private final SysLoginService loginService;
+//
+//    /**
+//     * 每次登录时触发
+//     */
+//    @Override
+//    public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginParameter loginParameter) {
+//        UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
+//        String ip = ServletUtils.getClientIP();
+//        UserOnlineDTO dto = new UserOnlineDTO();
+//        dto.setIpaddr(ip);
+//        dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
+//        dto.setBrowser(userAgent.getBrowser().getName());
+//        dto.setOs(userAgent.getOs().getName());
+//        dto.setLoginTime(System.currentTimeMillis());
+//        dto.setTokenId(tokenValue);
+//        String username = (String) loginParameter.getExtra(LoginHelper.USER_NAME_KEY);
+//        String tenantId = (String) loginParameter.getExtra(LoginHelper.TENANT_KEY);
+//        dto.setUserName(username);
+//        dto.setClientKey((String) loginParameter.getExtra(LoginHelper.CLIENT_KEY));
+//        dto.setDeviceType(loginParameter.getDeviceType());
+//        dto.setDeptName((String) loginParameter.getExtra(LoginHelper.DEPT_NAME_KEY));
+//        TenantHelper.dynamic(tenantId, () -> {
+//            if(loginParameter.getTimeout() == -1) {
+//                RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto);
+//            } else {
+//                RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(loginParameter.getTimeout()));
+//            }
+//        });
+//        // 记录登录日志
+//        LogininforEvent logininforEvent = new LogininforEvent();
+//        logininforEvent.setTenantId(tenantId);
+//        logininforEvent.setUsername(username);
+//        logininforEvent.setStatus(Constants.LOGIN_SUCCESS);
+//        logininforEvent.setMessage(MessageUtils.message("user.login.success"));
+//        logininforEvent.setRequest(ServletUtils.getRequest());
+//        SpringUtils.context().publishEvent(logininforEvent);
+//        // 更新登录信息
+//        loginService.recordLoginInfo((Long) loginParameter.getExtra(LoginHelper.USER_KEY), ip);
+//        log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue);
+//    }
+//
+//    /**
+//     * 每次注销时触发
+//     */
+//    @Override
+//    public void doLogout(String loginType, Object loginId, String tokenValue) {
+//        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
+//        TenantHelper.dynamic(tenantId, () -> {
+//            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+//        });
+//        log.info("user doLogout, userId:{}, token:{}", loginId, tokenValue);
+//    }
+//
+//    /**
+//     * 每次被踢下线时触发
+//     */
+//    @Override
+//    public void doKickout(String loginType, Object loginId, String tokenValue) {
+//        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
+//        TenantHelper.dynamic(tenantId, () -> {
+//            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+//        });
+//        log.info("user doKickout, userId:{}, token:{}", loginId, tokenValue);
+//    }
+//
+//    /**
+//     * 每次被顶下线时触发
+//     */
+//    @Override
+//    public void doReplaced(String loginType, Object loginId, String tokenValue) {
+//        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
+//        TenantHelper.dynamic(tenantId, () -> {
+//            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+//        });
+//        log.info("user doReplaced, userId:{}, token:{}", loginId, tokenValue);
+//    }
+//
+//    /**
+//     * 每次被封禁时触发
+//     */
+//    @Override
+//    public void doDisable(String loginType, Object loginId, String service, int level, long disableTime) {
+//    }
+//
+//    /**
+//     * 每次被解封时触发
+//     */
+//    @Override
+//    public void doUntieDisable(String loginType, Object loginId, String service) {
+//    }
+//
+//    /**
+//     * 每次打开二级认证时触发
+//     */
+//    @Override
+//    public void doOpenSafe(String loginType, String tokenValue, String service, long safeTime) {
+//    }
+//
+//    /**
+//     * 每次创建Session时触发
+//     */
+//    @Override
+//    public void doCloseSafe(String loginType, String tokenValue, String service) {
+//    }
+//
+//    /**
+//     * 每次创建Session时触发
+//     */
+//    @Override
+//    public void doCreateSession(String id) {
+//    }
+//
+//    /**
+//     * 每次注销Session时触发
+//     */
+//    @Override
+//    public void doLogoutSession(String id) {
+//    }
+//
+//    /**
+//     * 每次Token续期时触发
+//     */
+//    @Override
+//    public void doRenewTimeout(String tokenValue, Object loginId, long timeout) {
+//    }
+//}

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

@@ -0,0 +1,235 @@
+package com.fuyuanshen.web.service;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.app.domain.AppDeviceShare;
+import com.fuyuanshen.app.domain.AppPersonnelInfo;
+import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
+import com.fuyuanshen.app.domain.vo.AppDeviceShareDetailVo;
+import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.exception.ServiceException;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceType;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class DeviceShareService {
+
+    private final AppDeviceShareMapper appDeviceShareMapper;
+    
+    private final DeviceMapper deviceMapper;
+
+    private final DeviceTypeMapper deviceTypeMapper;
+
+    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
+
+    public TableDataInfo<AppDeviceShareVo> queryPageList(AppDeviceShareBo bo, PageQuery pageQuery) {
+        Long userId = AppLoginHelper.getUserId();
+        bo.setCreateBy(userId);
+        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<AppDeviceShareVo> result = appDeviceShareMapper.selectAppDeviceShareList(bo, page);
+        List<AppDeviceShareVo> records = result.getRecords();
+        records.forEach(DeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
+    private static void buildDeviceStatus(AppDeviceShareVo item) {
+        //设备在线状态
+        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+        if(StringUtils.isNotBlank(onlineStatus)){
+
+            item.setOnlineStatus(1);
+        }else{
+            item.setOnlineStatus(0);
+        }
+        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX+ item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX);
+        // 获取电量
+        if(StringUtils.isNotBlank(deviceStatus)){
+            JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+            item.setBattery(jsonObject.getString("batteryPercentage"));
+        }else{
+            item.setBattery("0");
+        }
+
+        String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_LOCATION_KEY_PREFIX);
+        if(StringUtils.isNotBlank(location)){
+            JSONObject jsonObject = JSONObject.parseObject(location);
+            item.setLatitude(jsonObject.getString("latitude"));
+            item.setLongitude(jsonObject.getString("longitude"));
+        }
+
+        String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX);
+        if(StringUtils.isNotBlank(alarmStatus)){
+            item.setAlarmStatus(alarmStatus);
+        }
+    }
+
+    public AppDeviceShareDetailVo getInfo(Long id) {
+
+        LambdaQueryWrapper<AppDeviceShare> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AppDeviceShare::getId, id);
+        List<AppDeviceShareVo> appDeviceShareVos = appDeviceShareMapper.selectVoList(queryWrapper);
+        if(appDeviceShareVos==null || appDeviceShareVos.isEmpty()){
+            return null;
+        }
+
+        AppDeviceShareVo shareVo = appDeviceShareVos.get(0);
+        AppDeviceShareDetailVo shareDetailVo = new AppDeviceShareDetailVo();
+        shareDetailVo.setId(shareVo.getId());
+        shareDetailVo.setDeviceId(shareVo.getDeviceId());
+        shareDetailVo.setPhonenumber(shareVo.getPhonenumber());
+        shareDetailVo.setPermission(shareVo.getPermission());
+
+        Device device = deviceMapper.selectById(shareVo.getDeviceId());
+        shareDetailVo.setDeviceName(device.getDeviceName());
+        shareDetailVo.setDeviceImei(device.getDeviceImei());
+        shareDetailVo.setDeviceMac(device.getDeviceMac());
+
+        DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
+        if(deviceType!=null){
+            shareDetailVo.setCommunicationMode(Integer.valueOf(deviceType.getCommunicationMode()));
+        }
+        shareDetailVo.setDevicePic(device.getDevicePic());
+        shareDetailVo.setTypeName(deviceType.getTypeName());
+        shareDetailVo.setBluetoothName(device.getBluetoothName());
+        shareDetailVo.setDeviceStatus(device.getDeviceStatus());
+        shareDetailVo.setSendMsg(device.getSendMsg());
+
+        LambdaQueryWrapper<AppPersonnelInfo> qw = new LambdaQueryWrapper<>();
+        qw.eq(AppPersonnelInfo::getDeviceId, device.getId());
+        List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
+        if(appPersonnelInfoVos!=null && !appPersonnelInfoVos.isEmpty()){
+            shareDetailVo.setPersonnelInfo(appPersonnelInfoVos.get(0));
+        }
+      //设备在线状态
+        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei()+ DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+        if(StringUtils.isNotBlank(onlineStatus)){
+            shareDetailVo.setOnlineStatus(1);
+        }else{
+            shareDetailVo.setOnlineStatus(0);
+        }
+        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX);
+        // 获取电量
+        if(StringUtils.isNotBlank(deviceStatus)){
+            JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+            shareDetailVo.setMainLightMode(jsonObject.getString("mainLightMode"));
+            shareDetailVo.setLaserLightMode(jsonObject.getString("laserLightMode"));
+            shareDetailVo.setBatteryPercentage(jsonObject.getString("batteryPercentage"));
+            shareDetailVo.setChargeState(jsonObject.getString("chargeState"));
+            shareDetailVo.setBatteryRemainingTime(jsonObject.getString("batteryRemainingTime"));
+        }else{
+            shareDetailVo.setBatteryPercentage("0");
+        }
+
+        // 获取经度纬度
+        String locationKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX;
+        String locationInfo = RedisUtils.getCacheObject(locationKey);
+        if(StringUtils.isNotBlank(locationInfo)){
+            JSONObject jsonObject = JSONObject.parseObject(locationInfo);
+            shareDetailVo.setLongitude(jsonObject.get("longitude").toString());
+            shareDetailVo.setLatitude(jsonObject.get("latitude").toString());
+            shareDetailVo.setAddress((String)jsonObject.get("address"));
+        }
+
+
+        String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ device.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX);
+        if(StringUtils.isNotBlank(alarmStatus)){
+            shareDetailVo.setAlarmStatus(alarmStatus);
+        }
+
+        String lightBrightness = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ device.getDeviceImei()+ DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX);
+        if(StringUtils.isNotBlank(lightBrightness)){
+            shareDetailVo.setLightBrightness(lightBrightness);
+        }
+
+        return shareDetailVo;
+    }
+    /**
+     * 校验短信验证码
+     */
+    private boolean validateSmsCode(String tenantId, String phonenumber, String smsCode) {
+        String code = RedisUtils.getCacheObject(GlobalConstants.DEVICE_SHARE_CODES_KEY + phonenumber);
+        if (StringUtils.isBlank(code)) {
+            throw new ServiceException("验证码失效");
+        }
+        return code.equals(smsCode);
+    }
+    public int deviceShare(AppDeviceShareBo bo) {
+        boolean flag = validateSmsCode(AppLoginHelper.getTenantId(), bo.getPhonenumber(), bo.getSmsCode());
+        if(!flag){
+            throw new ServiceException("验证码错误");
+        }
+
+        Device device = deviceMapper.selectById(bo.getDeviceId());
+        if(device==null){
+            throw new ServiceException("设备不存在");
+        }
+        Long userId = AppLoginHelper.getUserId();
+        LambdaQueryWrapper<AppDeviceShare> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AppDeviceShare::getDeviceId, bo.getDeviceId());
+        lqw.eq(AppDeviceShare::getPhonenumber, bo.getPhonenumber());
+        Long count = appDeviceShareMapper.selectCount(lqw);
+        if(count>0){
+
+            UpdateWrapper<AppDeviceShare> uw = new UpdateWrapper<>();
+            uw.eq("device_id", bo.getDeviceId());
+            uw.eq("phonenumber", bo.getPhonenumber());
+            uw.set("permission", bo.getPermission());
+            uw.set("update_by", userId);
+            uw.set("update_time", new Date());
+
+            return appDeviceShareMapper.update(uw);
+        }else {
+            AppDeviceShare appDeviceShare = new AppDeviceShare();
+            appDeviceShare.setDeviceId(bo.getDeviceId());
+            appDeviceShare.setPhonenumber(bo.getPhonenumber());
+            appDeviceShare.setPermission(bo.getPermission());
+            appDeviceShare.setCreateBy(userId);
+            return appDeviceShareMapper.insert(appDeviceShare);
+        }
+    }
+
+    public int remove(Long[] ids) {
+        return appDeviceShareMapper.deleteByIds(Arrays.asList(ids));
+    }
+
+    public TableDataInfo<AppDeviceShareVo> otherDeviceShareList(AppDeviceShareBo bo, PageQuery pageQuery) {
+        String username = AppLoginHelper.getUsername();
+        bo.setPhonenumber(username);
+        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        IPage<AppDeviceShareVo> result = appDeviceShareMapper.otherDeviceShareList(bo, page);
+        List<AppDeviceShareVo> records = result.getRecords();
+
+        records.forEach(DeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
+
+}

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

@@ -0,0 +1,474 @@
+package com.fuyuanshen.web.service.device;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.app.domain.AppPersonnelInfo;
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.exception.ServiceException;
+import com.fuyuanshen.common.core.utils.*;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceType;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.equipment.enums.LightModeEnum;
+import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.MqttConstants;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+import java.time.Duration;
+import java.util.*;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.buildArr;
+import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.generateFixedBitmapData;
+import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DeviceBJQBizService {
+
+    private final DeviceMapper deviceMapper;
+    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
+    private final DeviceTypeMapper deviceTypeMapper;
+    private final MqttGateway mqttGateway;
+    private final DeviceLogMapper deviceLogMapper;
+
+    public int sendMessage(AppDeviceSendMsgBo bo) {
+        List<Long> deviceIds = bo.getDeviceIds();
+        if (deviceIds == null || deviceIds.isEmpty()) {
+            throw new ServiceException("请选择设备");
+        }
+        for (Long deviceId : deviceIds) {
+            Device device = deviceMapper.selectById(deviceId);
+            if (device == null) {
+                throw new ServiceException("设备不存在" + deviceId);
+            }
+            if(getDeviceStatus(device.getDeviceImei())){
+                throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+            }
+            try {
+                ClassPathResource resource = new ClassPathResource("image/background.png");
+                InputStream inputStream = resource.getInputStream();
+
+                byte[] largeData = ImageWithTextGenerate.generate160x80ImageWithText2(bo.getSendMsg(), inputStream, 25600);
+                int[] ints = convertHexToDecimal(largeData);
+                RedisUtils.setCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + ":app_send_message_data" , Arrays.toString(ints), Duration.ofSeconds(5 * 60L));
+
+                String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + ":app_send_message_data");
+
+                byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
+                byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, 0, 512);
+                log.info("发送信息第0块数据大小: {} 字节",specificChunk.length);
+
+                ArrayList<Integer> intData = new ArrayList<>();
+                intData.add(6);
+                intData.add(1);
+                ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk),intData);
+                intData.add(0);
+                intData.add(0);
+                intData.add(0);
+                intData.add(0);
+                Map<String, Object> map = new HashMap<>();
+                map.put("instruct", intData);
+                mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
+                log.info("发送信息点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
+
+                UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("id", deviceId)
+                        .eq("binding_user_id", AppLoginHelper.getUserId())
+                        .set("send_msg", bo.getSendMsg());
+                deviceMapper.update(updateWrapper);
+
+                recordDeviceLog(deviceId, device.getDeviceName(), "发送信息", bo.getSendMsg(), AppLoginHelper.getUserId());
+            } catch (Exception e) {
+                log.info("发送信息设备发送信息失败:{}" ,deviceId);
+                throw new ServiceException("发送指令失败");
+            }
+
+        }
+
+
+        return 1;
+    }
+
+    /**
+     * 记录设备操作日志
+     * @param deviceId 设备ID
+     * @param content 日志内容
+     * @param operator 操作人
+     */
+    private void recordDeviceLog(Long deviceId,String deviceName, String deviceAction, String content, Long operator) {
+        try {
+            // 创建设备日志实体
+            com.fuyuanshen.equipment.domain.DeviceLog deviceLog = new com.fuyuanshen.equipment.domain.DeviceLog();
+            deviceLog.setDeviceId(deviceId);
+            deviceLog.setDeviceAction(deviceAction);
+            deviceLog.setContent(content);
+            deviceLog.setCreateBy(operator);
+            deviceLog.setDeviceName(deviceName);
+            deviceLog.setCreateTime(new Date());
+
+            // 插入日志记录
+            deviceLogMapper.insert(deviceLog);
+        } catch (Exception e) {
+            log.error("记录设备操作日志失败: {}", e.getMessage(), e);
+        }
+    }
+
+
+    public AppDeviceDetailVo getInfo(Long id) {
+        Device device = deviceMapper.selectById(id);
+        if (device == null) {
+            throw new RuntimeException("请先将设备入库！！！");
+        }
+
+        AppDeviceDetailVo vo = new AppDeviceDetailVo();
+        vo.setDeviceId(device.getId());
+        vo.setDeviceName(device.getDeviceName());
+        vo.setDevicePic(device.getDevicePic());
+        vo.setDeviceImei(device.getDeviceImei());
+        vo.setDeviceMac(device.getDeviceMac());
+        vo.setDeviceStatus(device.getDeviceStatus());
+        DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
+        if (deviceType != null) {
+            vo.setCommunicationMode(Integer.valueOf(deviceType.getCommunicationMode()));
+            vo.setTypeName(deviceType.getTypeName());
+        }
+        vo.setBluetoothName(device.getBluetoothName());
+
+        vo.setSendMsg(device.getSendMsg());
+
+        QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
+                .eq("device_id", device.getId());
+        AppPersonnelInfo appPersonnelInfo = appPersonnelInfoMapper.selectOne(qw);
+        if (appPersonnelInfo != null) {
+            AppPersonnelInfoVo personnelInfoVo = MapstructUtils.convert(appPersonnelInfo, AppPersonnelInfoVo.class);
+            vo.setPersonnelInfo(personnelInfoVo);
+        }
+        //设备在线状态
+        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei()+ DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+        if(StringUtils.isNotBlank(onlineStatus)){
+            vo.setOnlineStatus(1);
+        }else{
+            vo.setOnlineStatus(0);
+        }
+        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX);
+        // 获取电量
+        if(StringUtils.isNotBlank(deviceStatus)){
+            JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+            vo.setMainLightMode(jsonObject.getString("mainLightMode"));
+            vo.setLaserLightMode(jsonObject.getString("laserLightMode"));
+            vo.setBatteryPercentage(jsonObject.getString("batteryPercentage"));
+            vo.setChargeState(jsonObject.getString("chargeState"));
+            vo.setBatteryRemainingTime(jsonObject.getString("batteryRemainingTime"));
+        }else{
+            vo.setBatteryPercentage("0");
+        }
+
+        // 获取经度纬度
+        String locationKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX;
+        String locationInfo = RedisUtils.getCacheObject(locationKey);
+        if(StringUtils.isNotBlank(locationInfo)){
+            JSONObject jsonObject = JSONObject.parseObject(locationInfo);
+            vo.setLongitude(jsonObject.get("longitude").toString());
+            vo.setLatitude(jsonObject.get("latitude").toString());
+            vo.setAddress((String)jsonObject.get("address"));
+        }
+
+        String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ device.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX);
+        if(StringUtils.isNotBlank(alarmStatus)){
+            vo.setAlarmStatus(alarmStatus);
+        }
+
+        String lightBrightness = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ device.getDeviceImei()+ DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX);
+        if(StringUtils.isNotBlank(lightBrightness)){
+            vo.setLightBrightness(lightBrightness);
+        }
+
+        return vo;
+    }
+
+
+
+    public boolean registerPersonInfo(AppPersonnelInfoBo bo) {
+        Long deviceId = bo.getDeviceId();
+        Device deviceObj = deviceMapper.selectById(deviceId);
+        if (deviceObj == null) {
+            throw new RuntimeException("请先将设备入库！！！");
+        }
+        if(getDeviceStatus(deviceObj.getDeviceImei())){
+            throw new ServiceException(deviceObj.getDeviceName()+",设备已断开连接");
+        }
+        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);
+        byte[] id = generateFixedBitmapData(bo.getCode(), 120);
+        ArrayList<Integer> intData = new ArrayList<>();
+        intData.add(2);
+        buildArr(convertHexToDecimal(unitName), intData);
+        buildArr(convertHexToDecimal(position), intData);
+        buildArr(convertHexToDecimal(name), intData);
+        buildArr(convertHexToDecimal(id), intData);
+        intData.add(0);
+        intData.add(0);
+        intData.add(0);
+        intData.add(0);
+        Map<String, Object> map = new HashMap<>();
+        map.put("instruct", intData);
+        mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), 1, JSON.toJSONString(map));
+        log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), bo);
+
+        recordDeviceLog(deviceId, deviceObj.getDeviceName(), "人员信息登记", JSON.toJSONString(bo), AppLoginHelper.getUserId());
+        if (ObjectUtils.length(appPersonnelInfoVos) == 0) {
+            AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class);
+            return appPersonnelInfoMapper.insertOrUpdate(appPersonnelInfo);
+        } else {
+            UpdateWrapper<AppPersonnelInfo> uw = new UpdateWrapper<>();
+            uw.eq("device_id", deviceId)
+                    .set("name", bo.getName())
+                    .set("position", bo.getPosition())
+                    .set("unit_name", bo.getUnitName())
+                    .set("code", bo.getCode());
+            return appPersonnelInfoMapper.update(null, uw) > 0;
+        }
+    }
+
+    public void uploadDeviceLogo(AppDeviceLogoUploadDto bo) {
+        try {
+            Device device = deviceMapper.selectById(bo.getDeviceId());
+            if (device == null) {
+                throw new ServiceException("设备不存在");
+            }
+            if(getDeviceStatus(device.getDeviceImei())){
+                throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+            }
+            MultipartFile file = bo.getFile();
+
+            byte[] largeData = ImageToCArrayConverter.convertImageToCArray(file.getInputStream(), 160, 80, 25600);
+            log.info("长度：" + largeData.length);
+
+            log.info("原始数据大小: {} 字节", largeData.length);
+
+            int[] ints = convertHexToDecimal(largeData);
+            RedisUtils.setCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() +DEVICE_BOOT_LOGO_KEY_PREFIX, Arrays.toString(ints), Duration.ofSeconds(5 * 60L));
+
+            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei()  + DEVICE_BOOT_LOGO_KEY_PREFIX);
+
+            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
+            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, 0, 512);
+            log.info("第0块数据大小: {} 字节", specificChunk.length);
+//            log.info("第0块数据: {}", Arrays.toString(specificChunk));
+
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(3);
+            intData.add(1);
+            ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk),intData);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            Map<String, Object> map = new HashMap<>();
+            map.put("instruct", intData);
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
+            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
+
+            recordDeviceLog(device.getId(), device.getDeviceName(), "上传开机画面", "上传开机画面", AppLoginHelper.getUserId());
+        } catch (Exception e){
+            e.printStackTrace();
+            throw new ServiceException("发送指令失败");
+        }
+    }
+
+    /**
+     * 灯光模式
+     * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）
+     */
+
+    public void lightModeSettings(DeviceInstructDto params) {
+        try {
+            Long deviceId = params.getDeviceId();
+            Device device = deviceMapper.selectById(deviceId);
+            if(device == null){
+                throw new ServiceException("设备不存在");
+            }
+            if(getDeviceStatus(device.getDeviceImei())){
+                throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+            }
+            Integer instructValue =  Integer.parseInt(params.getInstructValue());
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(1);
+            intData.add(instructValue);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            Map<String, Object> map = new HashMap<>();
+            map.put("instruct", intData);
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
+            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
+            LightModeEnum modeEnum = LightModeEnum.getByCode(instructValue);
+            recordDeviceLog(device.getId(), device.getDeviceName(), "灯光模式", modeEnum!=null?modeEnum.getName():null, AppLoginHelper.getUserId());
+        } catch (Exception e){
+            e.printStackTrace();
+            throw new ServiceException("发送指令失败");
+        }
+    }
+
+    //灯光亮度设置
+    public void lightBrightnessSettings(DeviceInstructDto params) {
+        try {
+            Long deviceId = params.getDeviceId();
+            Device device = deviceMapper.selectById(deviceId);
+            if(device == null){
+                throw new ServiceException("设备不存在");
+            }
+            if(getDeviceStatus(device.getDeviceImei())){
+                throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+            }
+            String instructValue = params.getInstructValue();
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(5);
+            String[] values = instructValue.split("\\.");
+            String value1 = values[0];
+            String value2 = values[1];
+            if(StringUtils.isNoneBlank(value1)){
+                intData.add(Integer.parseInt(value1));
+            }
+            if(StringUtils.isNoneBlank(value2)){
+                intData.add(Integer.parseInt(value2));
+            }
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            Map<String, Object> map = new HashMap<>();
+            map.put("instruct", intData);
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
+            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
+
+        } catch (Exception e){
+            e.printStackTrace();
+            throw new ServiceException("发送指令失败");
+        }
+    }
+
+    //激光模式设置
+    public void laserModeSettings(DeviceInstructDto params) {
+        try {
+            Long deviceId =  params.getDeviceId();
+            Device device = deviceMapper.selectById(deviceId);
+            if(device == null){
+                throw new ServiceException("设备不存在");
+            }
+            if(getDeviceStatus(device.getDeviceImei())){
+                throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+            }
+            Integer instructValue = Integer.parseInt(params.getInstructValue());
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(4);
+            intData.add(instructValue);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            Map<String, Object> map = new HashMap<>();
+            map.put("instruct", intData);
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
+            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
+            // 1代表开启激光灯，此时主灯关闭，主灯控件为关机状态，为0代表关闭激光灯
+            if("1".equals(params.getInstructValue())){
+                recordDeviceLog(device.getId(), device.getDeviceName(), "激光模式设置", "开启激光灯", AppLoginHelper.getUserId());
+            }else{
+                recordDeviceLog(device.getId(), device.getDeviceName(), "激光模式设置", "关闭激光灯", AppLoginHelper.getUserId());
+            }
+        } catch (Exception e){
+            e.printStackTrace();
+            throw new ServiceException("发送指令失败");
+        }
+    }
+
+    public String mapReverseGeocoding(DeviceInstructDto params) {
+        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("device_imei", params.getDeviceImei());
+        List<Device> devices = deviceMapper.selectList(queryWrapper);
+        if(ObjectUtils.length( devices) ==0){
+            throw new ServiceException("设备不存在");
+        }
+        return RedisUtils.getCacheObject("device:location:" + devices.get(0).getDeviceImei());
+    }
+
+    public int sendAlarmMessage(AppDeviceSendMsgBo bo) {
+        try {
+            List<Long> deviceIds = bo.getDeviceIds();
+            if (deviceIds == null || deviceIds.isEmpty()) {
+                throw new ServiceException("请选择设备");
+            }
+
+            for (Long deviceId : deviceIds) {
+                Device device = deviceMapper.selectById(deviceId);
+                if (device == null) {
+                    throw new ServiceException("设备不存在" + deviceId);
+                }
+                if(getDeviceStatus(device.getDeviceImei())){
+                    throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+                }
+                try {
+
+                    ArrayList<Integer> intData = new ArrayList<>();
+                    intData.add(7);
+                    intData.add(Integer.parseInt(bo.getInstructValue()));
+                    intData.add(0);
+                    intData.add(0);
+                    intData.add(0);
+                    intData.add(0);
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("instruct", intData);
+                    mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
+                    log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
+
+                    UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+                    updateWrapper.eq("id", deviceId)
+                            .eq("binding_user_id", AppLoginHelper.getUserId())
+                            .set("send_msg", bo.getSendMsg());
+                    deviceMapper.update(updateWrapper);
+                    recordDeviceLog(device.getId(), device.getDeviceName(), "发送告警信息", bo.getSendMsg(), AppLoginHelper.getUserId());
+                } catch (Exception e) {
+                    log.info("设备发送告警信息信息失败:{}" ,deviceId);
+                    throw new ServiceException("设备发送告警信息信息失败");
+                }
+
+            }
+        } catch (Exception e){
+            e.printStackTrace();
+            throw new ServiceException("发送告警信息指令失败");
+        }
+        return 1;
+    }
+
+    private boolean getDeviceStatus(String deviceImei) {
+        String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+        return StringUtils.isBlank(deviceOnlineStatusRedisKey);
+    }
+}

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

@@ -0,0 +1,293 @@
+package com.fuyuanshen.web.service.device;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.app.domain.AppDeviceBindRecord;
+import com.fuyuanshen.app.domain.AppDeviceShare;
+import com.fuyuanshen.app.domain.dto.APPReNameDTO;
+import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
+import com.fuyuanshen.app.domain.vo.AppUserVo;
+import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
+import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
+import com.fuyuanshen.app.mapper.AppUserMapper;
+import com.fuyuanshen.app.mapper.equipment.APPDeviceMapper;
+import com.fuyuanshen.common.core.exception.ServiceException;
+import com.fuyuanshen.common.core.utils.ObjectUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.enums.BindingStatusEnum;
+import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
+import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.web.service.device.status.base.DeviceStatusRule;
+import com.fuyuanshen.web.service.device.status.base.RealTimeStatusEngine;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DeviceBizService {
+
+    private final APPDeviceMapper appDeviceMapper;
+    private final DeviceMapper deviceMapper;
+    private final AppDeviceBindRecordMapper appDeviceBindRecordMapper;
+    private final RealTimeStatusEngine realTimeStatusEngine;
+    private final DeviceLogMapper deviceLogMapper;
+    private final AppDeviceShareMapper appDeviceShareMapper;
+    private final AppUserMapper appUserMapper;;
+
+
+
+    public List<APPDeviceTypeVo> getTypeList() {
+        Long userId = AppLoginHelper.getUserId();
+        return appDeviceMapper.getTypeList(userId);
+    }
+
+    public void reName(APPReNameDTO reNameDTO) {
+        UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id", reNameDTO.getId())
+                .eq("binding_user_id", AppLoginHelper.getUserId())
+                .set("device_name", reNameDTO.getDeviceName());
+        deviceMapper.update(updateWrapper);
+    }
+
+
+    public TableDataInfo<AppDeviceVo> queryAppDeviceList(DeviceQueryCriteria bo, PageQuery pageQuery) {
+        if (bo.getBindingUserId() == null) {
+            Long userId = AppLoginHelper.getUserId();
+            bo.setBindingUserId(userId);
+        }
+        Page<AppDeviceVo> result = deviceMapper.queryAppBindDeviceList(pageQuery.build(), bo);
+        List<AppDeviceVo> records = result.getRecords();
+        if(records != null && !records.isEmpty()){
+            records.forEach(item -> {
+                if(item.getCommunicationMode()!=null && item.getCommunicationMode() == 0){
+
+                    //设备在线状态
+                    String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(onlineStatus)){
+
+                        item.setOnlineStatus(1);
+                    }else{
+                        item.setOnlineStatus(0);
+                    }
+                    String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX+ item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX);
+                    // 获取电量
+                    if(StringUtils.isNotBlank(deviceStatus)){
+                        JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+                        item.setBattery(jsonObject.getString("batteryPercentage"));
+                    }else{
+                        item.setBattery("0");
+                    }
+
+                    String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_LOCATION_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(location)){
+                        JSONObject jsonObject = JSONObject.parseObject(location);
+                        item.setLatitude(jsonObject.getString("latitude"));
+                        item.setLongitude(jsonObject.getString("longitude"));
+                    }
+
+                    String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(alarmStatus)){
+                        item.setAlarmStatus(alarmStatus);
+                    }
+                }
+            });
+        }
+        return TableDataInfo.build(result);
+    }
+
+    public int bindDevice(AppDeviceBo bo) {
+        Integer mode = bo.getCommunicationMode();
+        Long userId = AppLoginHelper.getUserId();
+        if (mode == CommunicationModeEnum.FOUR_G.getValue()) {
+
+            String deviceImei = bo.getDeviceImei();
+            QueryWrapper<Device> qw = new QueryWrapper<Device>()
+                    .eq("device_imei", deviceImei);
+            List<Device> devices = deviceMapper.selectList(qw);
+            if (devices.isEmpty()) {
+                throw new RuntimeException("请先将设备入库！！！");
+            }
+            Device device = devices.get(0);
+            if (device.getBindingStatus() != null && device.getBindingStatus() == BindingStatusEnum.BOUND.getCode()) {
+                throw new RuntimeException("设备已绑定");
+            }
+
+            QueryWrapper<AppDeviceBindRecord> bindRecordQueryWrapper = new QueryWrapper<>();
+            bindRecordQueryWrapper.eq("device_id", device.getId());
+            AppDeviceBindRecord appDeviceBindRecord = appDeviceBindRecordMapper.selectOne(bindRecordQueryWrapper);
+            if (appDeviceBindRecord != null) {
+                UpdateWrapper<AppDeviceBindRecord> deviceUpdateWrapper = new UpdateWrapper<>();
+                deviceUpdateWrapper.eq("device_id", device.getId())
+                        .set("binding_status", BindingStatusEnum.BOUND.getCode())
+                        .set("binding_user_id", userId)
+                        .set("update_time", new Date())
+                        .set("binding_time", new Date());
+                return appDeviceBindRecordMapper.update(null, deviceUpdateWrapper);
+            } else {
+                AppDeviceBindRecord bindRecord = new AppDeviceBindRecord();
+                bindRecord.setDeviceId(device.getId());
+                bindRecord.setBindingUserId(userId);
+                bindRecord.setBindingTime(new Date());
+                bindRecord.setCreateBy(userId);
+                appDeviceBindRecordMapper.insert(bindRecord);
+            }
+
+            UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
+            deviceUpdateWrapper.eq("id", device.getId())
+                    .set("binding_status", BindingStatusEnum.BOUND.getCode())
+                    .set("binding_user_id", userId)
+                    .set("binding_time", new Date());
+            return deviceMapper.update(null, deviceUpdateWrapper);
+        } else if (mode == CommunicationModeEnum.BLUETOOTH.getValue()) {
+            String deviceMac = bo.getDeviceMac();
+            QueryWrapper<Device> qw = new QueryWrapper<Device>()
+                    .eq("device_mac", deviceMac);
+            List<Device> devices = deviceMapper.selectList(qw);
+            if (devices.isEmpty()) {
+                throw new RuntimeException("请先将设备入库！！！");
+            }
+            Device device = devices.get(0);
+
+            QueryWrapper<AppDeviceBindRecord> bindRecordQueryWrapper = new QueryWrapper<>();
+            bindRecordQueryWrapper.eq("device_id", device.getId());
+            bindRecordQueryWrapper.eq("binding_user_id", userId);
+            AppDeviceBindRecord appDeviceBindRecord = appDeviceBindRecordMapper.selectOne(bindRecordQueryWrapper);
+            if (appDeviceBindRecord != null) {
+                UpdateWrapper<AppDeviceBindRecord> deviceUpdateWrapper = new UpdateWrapper<>();
+                deviceUpdateWrapper.eq("device_id", device.getId())
+                        .eq("binding_user_id", userId)
+                        .set("binding_user_id", userId)
+                        .set("binding_time", new Date());
+                return appDeviceBindRecordMapper.update(null, deviceUpdateWrapper);
+            } else {
+                AppDeviceBindRecord bindRecord = new AppDeviceBindRecord();
+                bindRecord.setDeviceId(device.getId());
+                bindRecord.setBindingUserId(userId);
+                bindRecord.setBindingTime(new Date());
+                bindRecord.setCreateBy(userId);
+                appDeviceBindRecordMapper.insert(bindRecord);
+            }
+
+            UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
+            deviceUpdateWrapper.eq("id", device.getId())
+                    .set("binding_status", BindingStatusEnum.BOUND.getCode())
+                    .set("binding_user_id", userId)
+                    .set("binding_time", new Date());
+            return deviceMapper.update(null, deviceUpdateWrapper);
+        } else {
+            throw new RuntimeException("通讯方式错误");
+        }
+
+    }
+
+
+    public int unBindDevice(Long id) {
+        return unBindDevice(id, null, 1);
+    }
+
+    public int unBindDevice(Long id, Long userId, int type) {
+        Device device = deviceMapper.selectById(id);
+        if (device == null) {
+            throw new RuntimeException("请先将设备入库！！！");
+        }
+        UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
+        deviceUpdateWrapper.eq("id", device.getId())
+                .set("binding_user_id", null)
+                .set("binding_status", BindingStatusEnum.UNBOUND.getCode())
+                .set("binding_time", null);
+        deviceMapper.update(null, deviceUpdateWrapper);
+
+        if (userId == null) {
+            userId = AppLoginHelper.getUserId();
+        }
+        QueryWrapper<AppDeviceBindRecord> bindRecordQueryWrapper = new QueryWrapper<>();
+        bindRecordQueryWrapper.eq("device_id", device.getId());
+        // 设备端解绑 0:设备端解绑 1:web端解绑
+        if (type == 1) {
+            bindRecordQueryWrapper.eq("binding_user_id", userId);
+        }
+
+        // AppDeviceBindRecord appDeviceBindRecord = appDeviceBindRecordMapper.selectOne(bindRecordQueryWrapper);
+        // if (appDeviceBindRecord != null) {
+        //     return appDeviceBindRecordMapper.deleteById(appDeviceBindRecord.getId());
+        // }
+
+        List<AppDeviceBindRecord> appDeviceBindRecordList = appDeviceBindRecordMapper.selectList(bindRecordQueryWrapper);
+        if (CollectionUtil.isNotEmpty(appDeviceBindRecordList)) {
+            appDeviceBindRecordList.forEach(appDeviceBindRecord ->
+                    appDeviceBindRecordMapper.deleteById(appDeviceBindRecord.getId()));
+        }
+
+        AppUserVo appUserVo = appUserMapper.selectVoById(userId);
+        QueryWrapper<AppDeviceShare> appDeviceShareQueryWrapper = new QueryWrapper<>();
+        appDeviceShareQueryWrapper.eq("device_id", device.getId());
+        appDeviceShareQueryWrapper.eq("phonenumber", appUserVo.getPhonenumber());
+        List<AppDeviceShare> appDeviceShareList = appDeviceShareMapper.selectList(appDeviceShareQueryWrapper);
+        if (CollectionUtil.isNotEmpty(appDeviceShareList)) {
+            appDeviceShareList.forEach(appDeviceShare ->
+                    appDeviceShareMapper.deleteById(appDeviceShare.getId()));
+        }
+        return 1;
+    }
+
+    public String mapReverseGeocoding(DeviceInstructDto params) {
+//        Long deviceId = params.getDeviceId();
+//        Device device = deviceMapper.selectById(deviceId);
+        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("device_imei", params.getDeviceImei());
+        List<Device> devices = deviceMapper.selectList(queryWrapper);
+        if(ObjectUtils.length( devices) ==0){
+            throw new ServiceException("设备不存在");
+        }
+        return RedisUtils.getCacheObject("device:location:" + devices.get(0).getDeviceImei());
+    }
+
+    public Map<String, Object> getRealTimeStatus(AppRealTimeStatusDto statusDto) {
+        try {
+            String commandType = statusDto.getTypeName()+"_" + statusDto.getFunctionMode();
+            DeviceStatusRule rule  = realTimeStatusEngine.getDeviceStatusRule(commandType);
+            if(rule == null){
+                throw new ServiceException("未匹配到处理命令");
+            }
+            return rule.getStatus(statusDto);
+        } catch (Exception e){
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public AppDeviceVo getDeviceInfo(String deviceMac) {
+//        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("device_mac", deviceMac);
+//        List<Device> devices = deviceMapper.selectList(queryWrapper);
+        return deviceMapper.getDeviceInfo(deviceMac);
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.fuyuanshen.web.service.device.status;
+
+import cn.hutool.json.JSONUtil;
+import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import com.fuyuanshen.web.service.device.status.base.DeviceStatusRule;
+import com.fuyuanshen.web.service.device.status.constants.DeviceTypeConstants;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+
+
+@Slf4j
+@Component
+public class FunctionAccessBatchStatusRule implements DeviceStatusRule {
+    @Override
+    public String getCommandType() {
+        return DeviceTypeConstants.TYPE_BJQ6170+"_2";
+    }
+
+    @Override
+    public boolean supports(String deviceType) {
+        return true; // 适用于所有设备类型
+    }
+
+    @Override
+    public Map<String, Object> getStatus(AppRealTimeStatusDto dto) {
+        Map<String, Object> status = new HashMap<>();
+        String functionAccess = RedisUtils.getCacheObject(
+                FUNCTION_ACCESS_KEY + dto.getBatchId());
+        log.info("FunctionAccessBatchStatusRule:{}",functionAccess);
+        if(StringUtils.isBlank(functionAccess)){
+            status.put("functionAccess", FunctionAccessStatus.OK.getCode());
+            return status;
+        }
+        List<String> cachedDeviceImeiList = JSONUtil.toList(functionAccess, String.class);
+        if(cachedDeviceImeiList.isEmpty()){
+            status.put("functionAccess", FunctionAccessStatus.OK.getCode());
+            return status;
+        }
+        for (String key : cachedDeviceImeiList) {
+            String item = RedisUtils.getCacheObject(FUNCTION_ACCESS_KEY + key);
+            if("ACTIVE".equals(item)){
+                status.put("functionAccess", FunctionAccessStatus.ACTIVE.getCode());
+                break;
+            }else {
+                status.put("functionAccess", FunctionAccessStatus.OK.getCode());
+            }
+//            if (StringUtils.isBlank(item)) {
+//                String timeOut = RedisUtils.getCacheObject(FUNCTION_ACCESS_TIMEOUT_KEY + dto.getDeviceImei());
+//                if ("TIMEOUT".equals(timeOut)) {
+//                    status.put("functionAccess", FunctionAccessStatus.TIMEOUT.getCode());
+//                    break;
+//                } else {
+//                    status.put("functionAccess", FunctionAccessStatus.OK.getCode());
+//                }
+//            } else {
+//                if (!FunctionAccessStatus.OK.getCode().equals(item)) {
+//                    status.put("functionAccess", FunctionAccessStatus.FAILED.getCode());
+//                    break;
+//                } else {
+//                    status.put("functionAccess", FunctionAccessStatus.OK.getCode());
+//                }
+//            }
+        }
+        return status;
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.fuyuanshen.web.service.device.status;
+
+import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import com.fuyuanshen.web.service.device.status.base.DeviceStatusRule;
+import com.fuyuanshen.web.service.device.status.constants.DeviceTypeConstants;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_TIMEOUT_KEY;
+
+// 上传开机图片
+@Slf4j
+@Component
+public class FunctionAccessStatusRule implements DeviceStatusRule {
+    @Override
+    public String getCommandType() {
+        return DeviceTypeConstants.TYPE_BJQ6170+"_1";
+    }
+
+    @Override
+    public boolean supports(String deviceType) {
+        return true; // 适用于所有设备类型
+    }
+    
+    @Override
+    public Map<String, Object> getStatus(AppRealTimeStatusDto dto) {
+        Map<String, Object> status = new HashMap<>();
+        String functionAccess = RedisUtils.getCacheObject(
+                FUNCTION_ACCESS_KEY + dto.getDeviceImei());
+        log.info("FunctionAccessStatusRule:{}",functionAccess);
+        if(StringUtils.isBlank(functionAccess)){
+            String timeOut = RedisUtils.getCacheObject(FUNCTION_ACCESS_TIMEOUT_KEY + dto.getDeviceImei());
+            if("TIMEOUT".equals(timeOut)){
+                status.put("functionAccess", FunctionAccessStatus.TIMEOUT.getCode());
+                RedisUtils.deleteObject(FUNCTION_ACCESS_TIMEOUT_KEY + dto.getDeviceImei());
+            }else{
+                status.put("functionAccess", FunctionAccessStatus.OK.getCode());
+            }
+        }else{
+            status.put("functionAccess", functionAccess);
+        }
+        return status;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/base/DeviceStatusRule.java

@@ -0,0 +1,19 @@
+package com.fuyuanshen.web.service.device.status.base;
+
+import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
+
+import java.util.Map;
+
+// 规则接口
+public interface DeviceStatusRule {
+
+    /**
+     * 获取命令类型
+     * @return 命令类型
+     */
+    String getCommandType();
+
+    boolean supports(String deviceType);
+
+    Map<String, Object> getStatus(AppRealTimeStatusDto statusDto);
+}

fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/base/RealTimeStatusEngine.java

@@ -0,0 +1,23 @@
+package com.fuyuanshen.web.service.device.status.base;
+
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+
+@Component
+public class RealTimeStatusEngine {
+    
+
+    private final LinkedHashMap<String, DeviceStatusRule> rulesMap = new LinkedHashMap<>();
+    public RealTimeStatusEngine(List<DeviceStatusRule> rules) {
+        rules.forEach(rule -> rulesMap.put(rule.getCommandType(), rule)
+        );
+    }
+
+
+    public DeviceStatusRule getDeviceStatusRule(String commandType) {
+        return rulesMap.get(commandType);
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/constants/DeviceTypeConstants.java

@@ -0,0 +1,6 @@
+package com.fuyuanshen.web.service.device.status.constants;
+
+public class DeviceTypeConstants {
+    public static final String TYPE_BJQ6170 = "BJQ6170";
+
+}

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

@@ -1,15 +1,21 @@
 package com.fuyuanshen.web.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fuyuanshen.app.service.AppDeviceBizService;
+import com.fuyuanshen.app.domain.AppDeviceBindRecord;
+import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
 import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.DeviceAssignments;
+import com.fuyuanshen.equipment.enums.BindingStatusEnum;
 import com.fuyuanshen.equipment.mapper.DeviceAssignmentsMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.web.service.WEBDeviceService;
+import com.fuyuanshen.web.service.device.DeviceBizService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Description:
@@ -21,10 +27,14 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements WEBDeviceService {
 
-    private final AppDeviceBizService appDeviceService;
+    private final DeviceBizService appDeviceService;
 
     private final DeviceAssignmentsMapper deviceAssignmentsMapper;
 
+    private final AppDeviceBindRecordMapper appDeviceBindRecordMapper;
+
+    private final DeviceMapper deviceMapper;
+
 
     /**
      * WEB端解绑设备
@@ -33,6 +43,7 @@ public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impl
      * @return
      */
     @Override
+    @Transactional
     public int webUnBindDevice(Long id, Long userId) {
         // 设备端解绑 0:设备端解绑 1:web端解绑
         int type = 1;
@@ -44,7 +55,18 @@ public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impl
             id = deviceAssignments.getDeviceId();
             type = 0;
         }
-        return appDeviceService.unBindDevice(id, userId, type);
+
+        QueryWrapper<AppDeviceBindRecord> deviceId = new QueryWrapper<AppDeviceBindRecord>().eq("device_id", id);
+
+        // appDeviceService.unBindDevice(id, userId, type);
+        UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
+        deviceUpdateWrapper.eq("id", id)
+                .set("binding_user_id", null)
+                .set("binding_status", BindingStatusEnum.UNBOUND.getCode())
+                .set("binding_time", null);
+        deviceMapper.update(null, deviceUpdateWrapper);
+
+        return appDeviceBindRecordMapper.delete(deviceId);
     }
 
 

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

@@ -8,8 +8,8 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: @monitor.username@
-  password: @monitor.password@
+  username: ${monitor.username}
+  password: ${monitor.password}
 
 --- # snail-job 配置
 snail-job:
@@ -174,14 +174,14 @@ sms:
       # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: alibaba
       # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
-      access-key-id: LTAI5tJdDNpZootsPQ5hdELx
+      access-key-id: LTAI5tDGfJd4kMvrGtvyzCHz
       # 称为accessSecret有些称之为apiSecret
-      access-key-secret: mU4WtffcCXpHPz5tLwQpaGtLsJXONt
+      access-key-secret: a4ZlVHVSYeMQHn0p1R18thA6xCdHQh
         #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置
-      template-id: SMS_322180518
+      template-id: SMS_324526343
         #模板变量 上述模板的变量
       templateName: code
-      signature:  湖北星汉研创科技
+      signature:  深圳市富源晟科技
 #      sdk-app-id: 您的sdkAppId
     config2:
       # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
@@ -303,6 +303,6 @@ mqtt:
   password: fys123456
   url: tcp://47.107.152.87:1883
   subClientId: fys_subClient
-  subTopic: A/#,worker/location/#
+  subTopic: worker/location/#
   pubTopic: B/#
   pubClientId: fys_pubClient

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

@@ -52,7 +52,7 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3306/fys_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://47.107.152.87: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: Jz_5623_cl1
 #        # 从库数据源
@@ -101,7 +101,7 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: localhost
+    host: 47.107.152.87
     # 端口，默认为6379
     port: 6379
     # 数据库索引
@@ -177,14 +177,14 @@ sms:
       # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: alibaba
       # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
-      access-key-id: LTAI5tJdDNpZootsPQ5hdELx
+      access-key-id: LTAI5tDGfJd4kMvrGtvyzCHz
       # 称为accessSecret有些称之为apiSecret
-      access-key-secret: mU4WtffcCXpHPz5tLwQpaGtLsJXONt
+      access-key-secret: a4ZlVHVSYeMQHn0p1R18thA6xCdHQh
       #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置
-      template-id: SMS_322180518
+      template-id: SMS_324526343
       #模板变量 上述模板的变量
       templateName: code
-      signature: 湖北星汉研创科技
+      signature:  深圳市富源晟科技
     config2:
       # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: tencent
@@ -286,6 +286,7 @@ mqtt:
   subTopic: A/#,worker/location/#
   pubTopic: B/#
   pubClientId: fys_pubClient
+  enabled: false
 
 
 # 文件存储路径

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

@@ -35,7 +35,8 @@ captcha:
 # 日志配置
 logging:
   level:
-    com.fuyuanshen: @logging.level@
+    #com.fuyuanshen: @logging.level@
+    com.fuyuanshen: ${logging.level}
     org.springframework: warn
     org.mybatis.spring.mapper: error
     org.apache.fury: warn
@@ -63,7 +64,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: @profiles.active@
+    active: ${profiles.active}
   # 文件上传
   servlet:
     multipart:
@@ -231,7 +232,7 @@ xss:
 # 如使用JDK21请直接使用虚拟线程 不要开启此配置
 thread-pool:
   # 是否开启线程池
-  enabled: false
+  enabled: true
   # 队列最大长度
   queueCapacity: 128
   # 线程池维护线程所允许的空闲时间
@@ -254,7 +255,7 @@ management:
     health:
       show-details: ALWAYS
     logfile:
-      external-file: ./logs/sys-console.log
+      external-file: ./logs/sys-admin-console.log
 
 --- # 默认/推荐使用sse推送
 sse:

fys-admin/src/main/resources/logback-plus.xml

@@ -15,13 +15,13 @@
 
     <!-- 控制台输出 -->
     <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/sys-console.log</file>
-        <!-- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> -->
-        <!--     &lt;!&ndash; 日志文件名格式 &ndash;&gt; -->
-        <!--     <fileNamePattern>${log.path}/sys-console.%d{yyyy-MM-dd}.log</fileNamePattern> -->
-        <!--     &lt;!&ndash; 日志最大 1天 &ndash;&gt; -->
-        <!--     <maxHistory>1</maxHistory> -->
-        <!-- </rollingPolicy> -->
+        <file>${log.path}/sys-admin-console.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-admin-console.log.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大 1天 -->
+            <maxHistory>1</maxHistory>
+        </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
             <charset>utf-8</charset>

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

@@ -41,4 +41,9 @@ public interface GlobalConstants {
      * 三方认证 redis key
      */
     String SOCIAL_AUTH_CODE_KEY = GLOBAL_REDIS_KEY + "social_auth_codes:";
+
+
+    String  FUNCTION_ACCESS_KEY =  GLOBAL_REDIS_KEY + "device:function_access:";
+
+    String  FUNCTION_ACCESS_TIMEOUT_KEY =  GLOBAL_REDIS_KEY + "device:function_access_timeout:";
 }

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

@@ -242,7 +242,7 @@ public class Bitmap80x12Generator {
         return byteListToArray(byteList);
     }
 
-    private static byte[] byteListToArray(List<Byte> byteList) {
+    public static byte[] byteListToArray(List<Byte> byteList) {
         byte[] result = new byte[byteList.size()];
         for (int i = 0; i < byteList.size(); i++) {
             result[i] = byteList.get(i);

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

@@ -33,7 +33,7 @@ public class ImageToCArrayConverter {
 
     public static void main(String[] args) throws IOException {
 
-        byte[] largeData = convertImageToCArray("E:\\workspace\\6170_强光_160_80_2.jpg", 160, 80,25600);
+        byte[] largeData = convertImageToCArray("E:\\workspace\\demo.png", 160, 80,25600);
         System.out.println("长度："+largeData.length);
 
         System.out.println("原始数据大小: " + largeData.length + " 字节");

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

@@ -0,0 +1,429 @@
+package com.fuyuanshen.common.core.utils;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+
+public class ImageWithTextGenerate {
+
+    /**
+     * 生成160*80画布，嵌入背景图片并居中显示文字（支持自动换行），输出RGB565格式数据
+     *
+     * @param text 要显示的文字
+     * @param fixedLength 固定输出长度（字节数）
+     * @return RGB565格式的图像数据
+     */
+    public static byte[] generate160x80ImageWithText2(String text, InputStream backgroundImageInputStream,  int fixedLength) throws IOException {
+        // 创建160*80的图像
+        BufferedImage image = new BufferedImage(160, 80, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g = image.createGraphics();
+
+        // 绘制白色背景
+        g.setColor(Color.WHITE);
+        g.fillRect(0, 0, 160, 80);
+
+        // 如果提供了背景图片，则绘制背景
+        if (backgroundImageInputStream != null ) {
+            BufferedImage backgroundImage = ImageIO.read(backgroundImageInputStream);
+            // 缩放并绘制背景图片以适应160*80画布
+            g.drawImage(backgroundImage, 0, 0, 160, 80, null);
+        }
+
+        // 设置文字属性
+        Font font = new Font("宋体", Font.PLAIN, 12); // 可根据需要调整字体大小
+        g.setFont(font);
+        g.setColor(new Color(255, 255, 255, (int)(0.6 * 255)));
+
+        // 关闭抗锯齿以获得清晰的点阵效果
+        g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
+                RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
+        g.setRenderingHint(RenderingHints.KEY_RENDERING,
+                RenderingHints.VALUE_RENDER_QUALITY);
+
+        // 获取字体度量信息
+        FontMetrics metrics = g.getFontMetrics();
+        int lineHeight = metrics.getHeight();
+
+        // 文本换行处理
+        ArrayList<String> lines = wrapText(text, metrics, 120); // 160为画布宽度
+
+        // 计算垂直居中起始位置
+        int totalTextHeight = lines.size() * lineHeight;
+        int startY = (80 - totalTextHeight) / 2 + metrics.getAscent();
+
+        // 绘制每一行文字
+        for (int i = 0; i < lines.size(); i++) {
+            String line = lines.get(i);
+            int lineWidth = metrics.stringWidth(line);
+            int x = (160 - lineWidth) / 2; // 水平居中
+            int y = startY + i * lineHeight;
+            g.drawString(line, x, y);
+        }
+
+        g.dispose();
+
+        // 转换像素数据为RGB565格式（高位在前）
+        ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+        for (int yCoord = 0; yCoord < 80; yCoord++) {
+            for (int xCoord = 0; xCoord < 160; xCoord++) {
+                int rgb = image.getRGB(xCoord, yCoord);
+
+                // 提取RGB分量
+                int r = (rgb >> 16) & 0xFF;
+                int g1 = (rgb >> 8) & 0xFF;
+                int b = rgb & 0xFF;
+
+                // 转换为RGB565（5位红，6位绿，5位蓝）
+                int r5 = (r >> 3) & 0x1F;
+                int g6 = (g1 >> 2) & 0x3F;
+                int b5 = (b >> 3) & 0x1F;
+
+                // 组合为16位值
+                int rgb565 = (r5 << 11) | (g6 << 5) | b5;
+
+                // 高位在前（大端序）写入字节
+                byteStream.write((rgb565 >> 8) & 0xFF); // 高字节
+                byteStream.write(rgb565 & 0xFF);        // 低字节
+            }
+        }
+
+        // 调整到固定长度
+        byte[] rawData = byteStream.toByteArray();
+        byte[] result = new byte[fixedLength];
+        int copyLength = Math.min(rawData.length, fixedLength);
+        System.arraycopy(rawData, 0, result, 0, copyLength);
+        return result;
+    }
+    /**
+     * 生成160*80画布，嵌入背景图片并居中显示文字（支持自动换行），输出RGB565格式数据
+     *
+     * @param text 要显示的文字
+     * @param backgroundImagePath 背景图片路径
+     * @param fixedLength 固定输出长度（字节数）
+     * @return RGB565格式的图像数据
+     */
+    public static byte[] generate160x80ImageWithText(String text, String backgroundImagePath, int fixedLength) throws IOException {
+        // 创建160*80的图像
+        BufferedImage image = new BufferedImage(160, 80, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g = image.createGraphics();
+
+        // 绘制白色背景
+        g.setColor(Color.WHITE);
+        g.fillRect(0, 0, 160, 80);
+
+        // 如果提供了背景图片，则绘制背景
+        if (backgroundImagePath != null && !backgroundImagePath.isEmpty()) {
+            File backgroundFile = new File(backgroundImagePath);
+            if (backgroundFile.exists()) {
+                BufferedImage backgroundImage = ImageIO.read(backgroundFile);
+                // 缩放并绘制背景图片以适应160*80画布
+                g.drawImage(backgroundImage, 0, 0, 160, 80, null);
+            }
+        }
+
+        // 设置文字属性
+        Font font = new Font("宋体", Font.PLAIN, 12); // 可根据需要调整字体大小
+        g.setFont(font);
+        g.setColor(new Color(255, 255, 255, (int)(0.6 * 255)));
+
+        // 关闭抗锯齿以获得清晰的点阵效果
+        g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
+                RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
+        g.setRenderingHint(RenderingHints.KEY_RENDERING,
+                RenderingHints.VALUE_RENDER_QUALITY);
+
+        // 获取字体度量信息
+        FontMetrics metrics = g.getFontMetrics();
+        int lineHeight = metrics.getHeight();
+
+        // 文本换行处理
+        ArrayList<String> lines = wrapText(text, metrics, 120); // 160为画布宽度
+
+        // 计算垂直居中起始位置
+        int totalTextHeight = lines.size() * lineHeight;
+        int startY = (80 - totalTextHeight) / 2 + metrics.getAscent();
+
+        // 绘制每一行文字
+        for (int i = 0; i < lines.size(); i++) {
+            String line = lines.get(i);
+            int lineWidth = metrics.stringWidth(line);
+            int x = (160 - lineWidth) / 2; // 水平居中
+            int y = startY + i * lineHeight;
+            g.drawString(line, x, y);
+        }
+
+        g.dispose();
+
+        // 转换像素数据为RGB565格式（高位在前）
+        ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+        for (int yCoord = 0; yCoord < 80; yCoord++) {
+            for (int xCoord = 0; xCoord < 160; xCoord++) {
+                int rgb = image.getRGB(xCoord, yCoord);
+
+                // 提取RGB分量
+                int r = (rgb >> 16) & 0xFF;
+                int g1 = (rgb >> 8) & 0xFF;
+                int b = rgb & 0xFF;
+
+                // 转换为RGB565（5位红，6位绿，5位蓝）
+                int r5 = (r >> 3) & 0x1F;
+                int g6 = (g1 >> 2) & 0x3F;
+                int b5 = (b >> 3) & 0x1F;
+
+                // 组合为16位值
+                int rgb565 = (r5 << 11) | (g6 << 5) | b5;
+
+                // 高位在前（大端序）写入字节
+                byteStream.write((rgb565 >> 8) & 0xFF); // 高字节
+                byteStream.write(rgb565 & 0xFF);        // 低字节
+            }
+        }
+
+        // 调整到固定长度
+        byte[] rawData = byteStream.toByteArray();
+        byte[] result = new byte[fixedLength];
+        int copyLength = Math.min(rawData.length, fixedLength);
+        System.arraycopy(rawData, 0, result, 0, copyLength);
+        return result;
+    }
+
+    /**
+     * 文本换行处理
+     *
+     * @param text 原始文本
+     * @param metrics 字体度量信息
+     * @param maxWidth 最大宽度
+     * @return 换行后的文本行列表
+     */
+    private static ArrayList<String> wrapText(String text, FontMetrics metrics, int maxWidth) {
+        ArrayList<String> lines = new ArrayList<>();
+        String[] paragraphs = text.split("\n");
+
+        for (String paragraph : paragraphs) {
+            String[] words = paragraph.split("(?<=\\S)(?=\\s)|(?<=\\s)(?=\\S)");
+            StringBuilder line = new StringBuilder();
+
+            for (String word : words) {
+                String testLine = line.toString() + word;
+                int lineWidth = metrics.stringWidth(testLine);
+
+                if (lineWidth <= maxWidth) {
+                    line.append(word);
+                } else {
+                    if (line.length() > 0) {
+                        lines.add(line.toString());
+                        line = new StringBuilder(word);
+                    } else {
+                        // 单个词就超过宽度，需要进一步拆分
+                        lines.addAll(wrapWord(word, metrics, maxWidth));
+                    }
+                }
+            }
+
+            if (line.length() > 0) {
+                lines.add(line.toString());
+            }
+        }
+
+        // 限制最大行数以适应80像素高度
+        if (lines.size() > 6) { // 假设每行最多13像素高，80/13约等于6
+            return (ArrayList<String>) lines.subList(0, 6);
+        }
+
+        return lines;
+    }
+
+    /**
+     * 对单个超长词进行拆分
+     *
+     * @param word 单词
+     * @param metrics 字体度量信息
+     * @param maxWidth 最大宽度
+     * @return 拆分后的词列表
+     */
+    private static ArrayList<String> wrapWord(String word, FontMetrics metrics, int maxWidth) {
+        ArrayList<String> result = new ArrayList<>();
+        StringBuilder current = new StringBuilder();
+
+        for (char c : word.toCharArray()) {
+            String testStr = current.toString() + c;
+            if (metrics.stringWidth(testStr) <= maxWidth) {
+                current.append(c);
+            } else {
+                if (current.length() > 0) {
+                    result.add(current.toString());
+                }
+                current = new StringBuilder(String.valueOf(c));
+            }
+        }
+
+        if (current.length() > 0) {
+            result.add(current.toString());
+        }
+
+        return result;
+    }
+
+    /**
+     * 生成160*80画布，嵌入背景图片并居中显示文字，输出RGB565格式数据（支持InputStream）
+     *
+     * @param text 要显示的文字
+     * @param backgroundImageInputStream 背景图片输入流
+     * @param fixedLength 固定输出长度（字节数）
+     * @return RGB565格式的图像数据
+     */
+    public static byte[] generate160x80ImageWithText(String text, InputStream backgroundImageInputStream, int fixedLength) throws IOException {
+        // 创建160*80的图像
+        BufferedImage image = new BufferedImage(160, 80, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g = image.createGraphics();
+
+        // 绘制白色背景
+        g.setColor(Color.WHITE);
+        g.fillRect(0, 0, 160, 80);
+
+        // 如果提供了背景图片，则绘制背景
+        if (backgroundImageInputStream != null) {
+            BufferedImage backgroundImage = ImageIO.read(backgroundImageInputStream);
+            // 缩放并绘制背景图片以适应160*80画布
+            g.drawImage(backgroundImage, 0, 0, 160, 80, null);
+        }
+
+        // 设置文字属性
+        Font font = new Font("宋体", Font.PLAIN, 16); // 可根据需要调整字体大小
+        g.setFont(font);
+        g.setColor(Color.BLACK);
+
+        // 关闭抗锯齿以获得清晰的点阵效果
+        g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
+                RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
+        g.setRenderingHint(RenderingHints.KEY_RENDERING,
+                RenderingHints.VALUE_RENDER_QUALITY);
+
+        // 获取字体度量信息
+        FontMetrics metrics = g.getFontMetrics();
+
+        // 计算文字的宽度和高度
+        int textWidth = metrics.stringWidth(text);
+        int textHeight = metrics.getHeight();
+
+        // 计算居中位置
+        int x = (160 - textWidth) / 2; // 水平居中
+        int y = (80 - textHeight) / 2 + metrics.getAscent(); // 垂直居中
+
+        // 绘制文字
+        g.drawString(text, x, y);
+
+        g.dispose();
+
+        // 转换像素数据为RGB565格式（高位在前）
+        ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+        for (int yCoord = 0; yCoord < 80; yCoord++) {
+            for (int xCoord = 0; xCoord < 160; xCoord++) {
+                int rgb = image.getRGB(xCoord, yCoord);
+
+                // 提取RGB分量
+                int r = (rgb >> 16) & 0xFF;
+                int g1 = (rgb >> 8) & 0xFF;
+                int b = rgb & 0xFF;
+
+                // 转换为RGB565（5位红，6位绿，5位蓝）
+                int r5 = (r >> 3) & 0x1F;
+                int g6 = (g1 >> 2) & 0x3F;
+                int b5 = (b >> 3) & 0x1F;
+
+                // 组合为16位值
+                int rgb565 = (r5 << 11) | (g6 << 5) | b5;
+
+                // 高位在前（大端序）写入字节
+                byteStream.write((rgb565 >> 8) & 0xFF); // 高字节
+                byteStream.write(rgb565 & 0xFF);        // 低字节
+            }
+        }
+
+        // 调整到固定长度
+        byte[] rawData = byteStream.toByteArray();
+        byte[] result = new byte[fixedLength];
+        int copyLength = Math.min(rawData.length, fixedLength);
+        System.arraycopy(rawData, 0, result, 0, copyLength);
+        return result;
+    }
+    /**
+     * 将RGB565格式的字节数组转换为BufferedImage
+     *
+     * @param data RGB565格式的数据
+     * @param height 图像高度
+     * @param width 图像宽度
+     * @return 转换后的BufferedImage
+     */
+    public static BufferedImage convertByteArrayToImage(byte[] data, int height, int width) {
+        if (data == null || data.length == 0) {
+            return new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
+        }
+
+        // 创建图像
+        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+
+        // 处理RGB565数据
+        int dataIndex = 0;
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                // 每个像素占2个字节
+                if (dataIndex + 1 >= data.length) {
+                    return image;
+                }
+
+                // 读取两个字节组成RGB565值
+                int highByte = data[dataIndex++] & 0xFF;
+                int lowByte = data[dataIndex++] & 0xFF;
+                int rgb565 = (highByte << 8) | lowByte;
+
+                // 将RGB565转换为RGB888
+                int r = ((rgb565 >> 11) & 0x1F) << 3;
+                int g = ((rgb565 >> 5) & 0x3F) << 2;
+                int b = (rgb565 & 0x1F) << 3;
+
+                int rgb = (r << 16) | (g << 8) | b;
+                image.setRGB(x, y, rgb);
+            }
+        }
+
+        return image;
+    }
+
+
+    public static void main(String[] args) throws IOException {
+        // ... 原有代码 ...
+
+        // 测试生成160*80画布，嵌入背景图片并居中显示文字
+//        String text = "现在危险，停止救援紧急撤离至安全区域";
+        String text = "现在危险，停止救援，紧急撤离至安全区域！";
+        String backgroundImagePath = "D:\\background.png"; // 替换为实际背景图片路径
+        byte[] imageData = generate160x80ImageWithText(text, backgroundImagePath, 25600);
+
+        System.out.println("生成的160*80 RGB565图像数据:");
+        System.out.println("数据长度: " + imageData.length + " 字节");
+        // 生成预览图片
+        // 生成预览图片
+        BufferedImage image160x80 = convertByteArrayToImage(imageData, 80, 160);
+        ImageIO.write(image160x80, "PNG", new File("D:\\bitmap_160x80_preview.png"));
+//        System.out.println("成功生成160*80预览图片: D:\\bitmap_160x80_preview.png");
+        // 转换为十进制数组
+//        int[] decimalArray = convertHexToDecimal(imageData);
+//        System.out.println("生成的十进制数据（前50个）:");
+//        System.out.println(Arrays.toString(Arrays.copyOf(decimalArray, Math.min(50, decimalArray.length))));
+//
+//        // 将数据分割成512字节的块
+//        List<byte[]> chunks = splitByteArrayIntoChunks(imageData, 512);
+//        printChunkInfo(chunks);
+//
+//        // 示例：获取特定块的数据
+//        byte[] specificChunk = getChunk(imageData, 0, 512); // 获取第1块（索引0）
+//        System.out.println("第1块数据大小: " + specificChunk.length + " 字节");
+    }
+
+}

fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/DecryptRequestBodyWrapper.java

@@ -24,6 +24,13 @@ public class DecryptRequestBodyWrapper extends HttpServletRequestWrapper {
 
     private final byte[] body;
 
+
+    /**
+     * @param request
+     * @param privateKey
+     * @param headerFlag encrypt-key
+     * @throws IOException
+     */
     public DecryptRequestBodyWrapper(HttpServletRequest request, String privateKey, String headerFlag) throws IOException {
         super(request);
         // 获取 AES 密码 采用 RSA 加密

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

@@ -19,31 +19,36 @@ public class EncryptUtilsTest {
         String s = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y=";
 
 
+        /**
+         * encrypt-key
+         */
         String s1 = EncryptUtils.encryptByRsa("MTIzNDU2Nzg5MGFiY2RlZg==", g);
         System.out.println(s1);
+        System.out.println("-------------s1--------------");
+
         String s2 = EncryptUtils.decryptByRsa("jJPaW7hgFXD/gjdkrfBOEUdXpPZnQg/LZUASoOJAOLU/XRVXO/5666CzyALjw7neK1ujvRuys4MdKCvr9cRARw==", s);
         System.out.println(s2);
-
+        System.out.println("-------------s2--------------");
         String s3 = EncryptUtils.decryptByBase64(s2);
         System.out.println(s3);
-
+        System.out.println("-------------s2--------------");
         String s4 = EncryptUtils.encryptByAes("123456", s3);
         System.out.println(s4);
-
+        System.out.println("-------------s2--------------");
         String s5 = EncryptUtils.decryptByAes(s4, s3);
         System.out.println(s5);
-
+        System.out.println("-------------s2--------------");
 
         // 1. 构造 LoginBody 对象
         PasswordLoginBody loginBody = new PasswordLoginBody();
         loginBody.setClientId("e5cd7e4891bf95d1d19206ce24a7b32e");
         loginBody.setGrantType("password");
         loginBody.setTenantId("894078");
-        loginBody.setCode("0");
-        loginBody.setUuid("1c285b27f516486f9535face77023aeb");
+        loginBody.setCode("2");
+        loginBody.setUuid("d339659cea5245aab7df92642326218e");
         // loginBody.setUsername("admin");
         // loginBody.setPassword("admin123");
-        loginBody.setUsername("dyf");
+        loginBody.setUsername("fel");
         loginBody.setPassword("123456");
 
         // 2. 使用更清晰的方式拼接 JSON 字符串
@@ -67,9 +72,12 @@ public class EncryptUtilsTest {
         );
 
 
+        /**
+         * body
+         */
         String S5 = EncryptUtils.encryptByAes(jsonLoginBody, s3);
         System.out.println(S5);
-
+        System.out.println("-------------s5--------------");
         String S6 = EncryptUtils.decryptByAes(S5, s3);
         System.out.println(S6);
 

fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/annotation/FunctionAccessAnnotation.java

@@ -0,0 +1,12 @@
+package com.fuyuanshen.common.ratelimiter.annotation;// DeviceRedisKeyAnnotation.java
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FunctionAccessAnnotation {
+    String value() default "";
+    long timeOut() default 30;
+}

fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/annotation/FunctionAccessBatcAnnotation.java

@@ -0,0 +1,13 @@
+package com.fuyuanshen.common.ratelimiter.annotation;// DeviceRedisKeyAnnotation.java
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FunctionAccessBatcAnnotation {
+    String value() default "";
+    long timeOut() default 30;
+    long batchMaxTimeOut() default 40;
+}

fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/aspectj/FunctionAccessAspect.java

@@ -0,0 +1,104 @@
+package com.fuyuanshen.common.ratelimiter.aspectj;// DeviceRedisKeyAspect.java
+import com.fuyuanshen.common.core.exception.ServiceException;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_TIMEOUT_KEY;
+
+@Slf4j
+@Aspect
+@Component
+public class FunctionAccessAspect {
+
+    // 定义切点，拦截带有DeviceRedisKeyAnnotation注解的方法
+    @Around("@annotation(functionAccessAnnotation)")
+    public Object addDeviceRedisKey(ProceedingJoinPoint joinPoint, FunctionAccessAnnotation functionAccessAnnotation) throws Throwable {
+        Object result;
+        String deviceImei = null;
+
+        // 获取方法参数，查找设备ID
+        Object[] args = joinPoint.getArgs();
+        deviceImei = extractDeviceImei(args);
+        long timeout = functionAccessAnnotation.timeOut();
+
+        if (StringUtils.isNotBlank(deviceImei)) {
+            // 生成全局Redis key
+            String redisKey = generateDeviceRedisKey(deviceImei);
+            String cacheKey = RedisUtils.getCacheObject(redisKey);
+            if(StringUtils.isNotBlank(cacheKey) && "ACTIVE".equals(cacheKey)){
+                throw new ServiceException("设备已存在访问限制，请稍后再试", 500);
+            }
+            //
+            RedisUtils.setCacheObject(redisKey, "ACTIVE", Duration.ofSeconds(timeout));
+        }
+        
+        // 执行原方法
+        result = joinPoint.proceed();
+        
+        return result;
+    }
+    
+    /**
+     * 从方法参数中提取设备ID
+     */
+    private String extractDeviceImei(Object[] args) {
+        if (args == null || args.length == 0) {
+            return null;
+        }
+        
+        for (Object arg : args) {
+            if (arg == null) continue;
+            
+            // 如果参数本身就是设备ID (Long类型)
+            if (arg instanceof Long) {
+                return arg.toString();
+            }
+            
+            // 如果参数是对象，尝试获取deviceId字段
+            try {
+                // 使用反射获取deviceId字段
+                java.lang.reflect.Field[] fields = arg.getClass().getDeclaredFields();
+                for (java.lang.reflect.Field field : fields) {
+                    if ("deviceImei".equalsIgnoreCase(field.getName()) ||
+                        "device_imei".equalsIgnoreCase(field.getName())) {
+                        field.setAccessible(true);
+                        Object value = field.get(arg);
+                        if (value != null) {
+                            return value.toString();
+                        }
+                    }
+                }
+                
+                // 尝试获取getId方法
+                try {
+                    java.lang.reflect.Method getIdMethod = arg.getClass().getMethod("getDeviceImei");
+                    Object value = getIdMethod.invoke(arg);
+                    if (value != null) {
+                        return value.toString();
+                    }
+                } catch (Exception ignored) {}
+                
+            } catch (Exception e) {
+                log.debug("从参数中提取设备ID时出错: {}", e.getMessage());
+            }
+        }
+        
+        return null;
+    }
+    
+    /**
+     * 生成设备的全局Redis key
+     */
+    private String generateDeviceRedisKey(String deviceImei) {
+        return FUNCTION_ACCESS_KEY + deviceImei;
+    }
+}

fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/aspectj/FunctionAccessBatchAspect.java

@@ -0,0 +1,183 @@
+package com.fuyuanshen.common.ratelimiter.aspectj;// DeviceRedisKeyAspect.java
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
+import com.fuyuanshen.common.core.exception.ServiceException;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.util.List;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+
+@Slf4j
+@Aspect
+@Component
+public class FunctionAccessBatchAspect {
+
+    // 定义切点，拦截带有DeviceRedisKeyAnnotation注解的方法
+    @Around("@annotation(functionAccessBatchAspect)")
+    public Object addDeviceRedisKey(ProceedingJoinPoint joinPoint, FunctionAccessBatcAnnotation functionAccessBatchAspect) throws Throwable {
+        Object result;
+        String batchId = null;
+        List<String> deviceImeiList = null;
+
+        // 获取方法参数，查找设备ID
+        Object[] args = joinPoint.getArgs();
+        batchId = extractDeviceBatchId(args);
+        deviceImeiList = extractDeviceImeiList(args);
+        if (StringUtils.isNotBlank(batchId)) {
+            // 生成全局Redis key
+            String redisKey = generateDeviceRedisKey(batchId);
+            String cacheKey = RedisUtils.getCacheObject(redisKey);
+            if(StringUtils.isNotBlank(cacheKey) && "ACTIVE".equals(cacheKey)){
+                throw new ServiceException("设备已存在访问限制，请稍后再试", 500);
+            }
+            deviceImeiList.forEach(item->{
+                RedisUtils.setCacheObject(FUNCTION_ACCESS_KEY + item, "ACTIVE", Duration.ofSeconds(functionAccessBatchAspect.timeOut()));
+            });
+            String deviceImeiListStr = JSONUtil.toJsonStr(deviceImeiList);
+            RedisUtils.setCacheObject(redisKey, deviceImeiListStr , Duration.ofSeconds(functionAccessBatchAspect.batchMaxTimeOut()));
+        }
+        
+        // 执行原方法
+        result = joinPoint.proceed();
+        
+        return result;
+    }
+
+    /**
+     * 从方法参数中提取设备IMEI列表
+     */
+    private List<String> extractDeviceImeiList(Object[] args) {
+        if (args == null || args.length == 0) {
+            return null;
+        }
+
+        for (Object arg : args) {
+            if (arg == null) continue;
+
+            // 如果参数本身就是List<String>类型
+            if (arg instanceof List) {
+                List<?> list = (List<?>) arg;
+                if (!list.isEmpty() && list.get(0) instanceof String) {
+                    // 检查是否为deviceImeiList
+                    return (List<String>) list;
+                }
+            }
+
+            // 如果参数是对象，尝试获取deviceImeiList字段
+            try {
+                // 使用反射获取deviceImeiList字段
+                java.lang.reflect.Field[] fields = arg.getClass().getDeclaredFields();
+                for (java.lang.reflect.Field field : fields) {
+                    if ("deviceImeiList".equalsIgnoreCase(field.getName()) ||
+                            "device_imei_list".equalsIgnoreCase(field.getName()) ||
+                            "deviceImeis".equalsIgnoreCase(field.getName()) ||
+                            "device_imeis".equalsIgnoreCase(field.getName())) {
+                        field.setAccessible(true);
+                        Object value = field.get(arg);
+                        if (value instanceof List) {
+                            List<?> list = (List<?>) value;
+                            if (!list.isEmpty() && list.get(0) instanceof String) {
+                                return (List<String>) list;
+                            }
+                        }
+                    }
+                }
+
+                // 尝试获取getDeviceImeiList方法
+                try {
+                    java.lang.reflect.Method getDeviceImeiListMethod = arg.getClass().getMethod("getDeviceImeiList");
+                    Object value = getDeviceImeiListMethod.invoke(arg);
+                    if (value instanceof List) {
+                        List<?> list = (List<?>) value;
+                        if (!list.isEmpty() && list.get(0) instanceof String) {
+                            return (List<String>) list;
+                        }
+                    }
+                } catch (Exception ignored) {}
+
+                // 尝试获取getDeviceImeis方法
+                try {
+                    java.lang.reflect.Method getDeviceImeisMethod = arg.getClass().getMethod("getDeviceImeis");
+                    Object value = getDeviceImeisMethod.invoke(arg);
+                    if (value instanceof List) {
+                        List<?> list = (List<?>) value;
+                        if (!list.isEmpty() && list.get(0) instanceof String) {
+                            return (List<String>) list;
+                        }
+                    }
+                } catch (Exception ignored) {}
+
+            } catch (Exception e) {
+                log.debug("从参数中提取设备IMEI列表时出错: {}", e.getMessage());
+            }
+        }
+
+        return null;
+    }
+
+
+    /**
+     * 从方法参数中提取设备ID
+     */
+    private String extractDeviceBatchId(Object[] args) {
+        if (args == null || args.length == 0) {
+            return null;
+        }
+        
+        for (Object arg : args) {
+            if (arg == null) continue;
+            
+            // 如果参数本身就是设备ID (Long类型)
+            if (arg instanceof Long) {
+                return arg.toString();
+            }
+            
+            // 如果参数是对象，尝试获取deviceId字段
+            try {
+                // 使用反射获取deviceId字段
+                java.lang.reflect.Field[] fields = arg.getClass().getDeclaredFields();
+                for (java.lang.reflect.Field field : fields) {
+                    if ("batchId".equalsIgnoreCase(field.getName()) ||
+                        "batch_id".equalsIgnoreCase(field.getName())) {
+                        field.setAccessible(true);
+                        Object value = field.get(arg);
+                        if (value != null) {
+                            return value.toString();
+                        }
+                    }
+                }
+                
+                // 尝试获取getId方法
+                try {
+                    java.lang.reflect.Method getIdMethod = arg.getClass().getMethod("batchId");
+                    Object value = getIdMethod.invoke(arg);
+                    if (value != null) {
+                        return value.toString();
+                    }
+                } catch (Exception ignored) {}
+                
+            } catch (Exception e) {
+                log.debug("从参数中提取批次号时出错: {}", e.getMessage());
+            }
+        }
+        
+        return null;
+    }
+    
+    /**
+     * 生成设备的全局Redis key
+     */
+    private String generateDeviceRedisKey(String batchId) {
+        return FUNCTION_ACCESS_KEY + batchId;
+    }
+}

fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/RedisUtils.java

@@ -339,7 +339,40 @@ public class RedisUtils {
         RSet<T> rSet = CLIENT.getSet(key);
         return rSet.addAll(dataSet);
     }
+    /**
+     * 向Sorted Set添加元素
+     *
+     * @param key   键
+     * @param value 值
+     * @param score 分数
+     * @return 添加成功返回true，否则返回false
+     */
+    public static boolean zAdd(String key, Object value, double score) {
+        try {
+            RScoredSortedSet<Object> sortedSet = CLIENT.getScoredSortedSet(key);
+            return sortedSet.add(score, value);
+        } catch (Exception e) {
+//            log.error("向Sorted Set添加元素失败: key={}, value={}, score={}, error={}", key, value, score, e.getMessage(), e);
+            return false;
+        }
+    }
 
+    /**
+     * 移除Sorted Set中指定范围的元素（按分数）
+     *
+     * @param key  键
+     * @param min 最小分数
+     * @param max 最大分数
+     * @return 移除的元素数量
+     */
+    public static int zRemoveRangeByScore(String key, double min, double max) {
+        try {
+            RScoredSortedSet<Object> sortedSet = CLIENT.getScoredSortedSet(key);
+            return sortedSet.removeRangeByScore(min, true, max, true);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
     /**
      * 追加缓存Set数据
      *

fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/controller/TestSMSController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class TestSMSController {
 
+
     @GetMapping("/test")
     public void testSend() {
         // 在创建完SmsBlend实例后，再未手动调用注销的情况下框架会持有该实例，可以直接通过指定configId来获取想要的配置，如果你想使用

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

@@ -24,7 +24,7 @@ import com.fuyuanshen.app.service.IAppUserService;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 
 /**
- * APP用户信息
+ * WebApp用户信息
  *
  * @author Lion Li
  * @date 2025-06-27
@@ -32,8 +32,8 @@ import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/app/user")
-public class AppUserController extends BaseController {
+@RequestMapping("/WebApp/user")
+public class WebAppUserController extends BaseController {
 
     private final IAppUserService appUserService;
 
@@ -67,7 +67,7 @@ public class AppUserController extends BaseController {
     @SaCheckPermission("app:user:query")
     @GetMapping("/{userId}")
     public R<AppUserVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long userId) {
+                                @PathVariable Long userId) {
         return R.ok(appUserService.queryById(userId));
     }
 
@@ -105,4 +105,5 @@ public class AppUserController extends BaseController {
                           @PathVariable Long[] userIds) {
         return toAjax(appUserService.deleteWithValidByIds(List.of(userIds), true));
     }
+
 }

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

@@ -25,6 +25,11 @@ public class AppPersonnelInfoBo extends BaseEntity {
      */
     private Long id;
 
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+
     /**
      * 设备id
      */

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceDetailVo.java

@@ -16,11 +16,6 @@ public class AppDeviceDetailVo {
     @ExcelProperty(value = "设备ID")
     private Long deviceId;
 
-    /**
-     * 手机号
-     */
-    @ExcelProperty(value = "手机号")
-    private String phonenumber;
 
     /**
      * 设备名称
@@ -74,4 +69,42 @@ public class AppDeviceDetailVo {
      * 发送信息
      */
     private String sendMsg;
+
+    //"{\"deviceImei\":\"AA\",\"mainLightMode\":\"1\",\"laserLightMode\":\"0\",\"batteryPercentage\":\"60\",\"chargeState\":\"1\",\"batteryRemainingTime\":\"200\",\"timestamp\":1753871635241}"
+    //设备主灯档位
+    private String mainLightMode;
+
+    //激光灯档位
+    private String laserLightMode;
+
+    //电量百分比
+    private String batteryPercentage;
+
+    //充电状态（0没有充电，1正在充电，2为已充满）
+    private String chargeState;
+
+    //电池剩余续航时间200分钟
+    private String batteryRemainingTime;
+
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
+
+    // 经度
+    private String longitude;
+
+    // 纬度
+    private String latitude;
+
+    // 逆解析地址
+    private String address;
+
+    /**
+     * 告警状态(0解除告警，1告警)
+     */
+    private String alarmStatus;
+
+    // 灯光亮度
+    private String lightBrightness;
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareDetailVo.java

@@ -104,4 +104,41 @@ public class AppDeviceShareDetailVo implements Serializable {
      * 发送信息
      */
     private String sendMsg;
+
+    //设备主灯档位
+    private String mainLightMode;
+
+    //激光灯档位
+    private String laserLightMode;
+
+    //电量百分比
+    private String batteryPercentage;
+
+    //充电状态（0没有充电，1正在充电，2为已充满）
+    private String chargeState;
+
+    //电池剩余续航时间200分钟
+    private String batteryRemainingTime;
+
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
+
+    // 经度
+    private String longitude;
+
+    // 纬度
+    private String latitude;
+
+    // 逆解析地址
+    private String address;
+
+    /**
+     * 告警状态(0解除告警，1告警)
+     */
+    private String alarmStatus;
+
+    // 灯光亮度
+    private String lightBrightness;
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareVo.java

@@ -57,6 +57,12 @@ public class AppDeviceShareVo implements Serializable {
     @ExcelProperty(value = "手机号")
     private String phonenumber;
 
+    /**
+     * 他人分享手机号
+     */
+    @ExcelProperty(value = "手机号")
+    private String otherPhonenumber;
+
     /**
      * 功能权限（1：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息）
 以逗号分隔
@@ -65,6 +71,11 @@ public class AppDeviceShareVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "1=：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息")
     private String permission;
 
+    /**
+     * 设备类型
+     */
+    private String typeName;
+
     /**
      * 备注
      */
@@ -73,4 +84,29 @@ public class AppDeviceShareVo implements Serializable {
 
     // 设备图片
     private String devicePic;
+
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
+
+    /**
+     * 电量 百分比
+     */
+    private String battery;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 告警状态(0解除告警，1告警)
+     */
+    private String alarmStatus;
 }

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

@@ -1,5 +1,6 @@
 package com.fuyuanshen.app.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuyuanshen.app.domain.AppDeviceShare;
@@ -16,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface AppDeviceShareMapper extends BaseMapperPlus<AppDeviceShare, AppDeviceShareVo> {
     IPage<AppDeviceShareVo> otherDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page<AppDeviceShareVo> page);
+
+    Page<AppDeviceShareVo> selectAppDeviceShareList(@Param("bo") AppDeviceShareBo bo,Page<AppDeviceShareVo> page);
 }

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

@@ -1,37 +1,43 @@
 package com.fuyuanshen.app.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fuyuanshen.app.domain.AppUser;
-import com.fuyuanshen.app.domain.bo.AppUserBo;
 import com.fuyuanshen.app.domain.dto.APPForgotPasswordDTO;
 import com.fuyuanshen.app.domain.dto.APPForgotPasswordSmsDTO;
 import com.fuyuanshen.app.domain.dto.APPUpdateUserDTO;
 import com.fuyuanshen.app.domain.vo.APPUserInfoVo;
-import com.fuyuanshen.app.domain.vo.AppUserVo;
-import com.fuyuanshen.app.mapper.AppUserMapper;
-import com.fuyuanshen.app.service.IAppUserService;
+import com.fuyuanshen.common.core.constant.Constants;
 import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.core.domain.model.AppLoginUser;
 import com.fuyuanshen.common.core.exception.BadRequestException;
 import com.fuyuanshen.common.core.utils.MapstructUtils;
 import com.fuyuanshen.common.core.utils.StringUtils;
-import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+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.common.redis.utils.RedisUtils;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.common.tenant.helper.TenantHelper;
 import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import com.fuyuanshen.app.domain.bo.AppUserBo;
+import com.fuyuanshen.app.domain.vo.AppUserVo;
+import com.fuyuanshen.app.domain.AppUser;
+import com.fuyuanshen.app.mapper.AppUserMapper;
+import com.fuyuanshen.app.service.IAppUserService;
 
-import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Collection;
 
 /**
  * Service业务层处理
@@ -47,7 +53,6 @@ public class AppUserServiceImpl implements IAppUserService {
     private final AppUserMapper baseMapper;
 
     private final ISysOssService sysOssService;
-
     /**
      * 查询APP用户信息
      *

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

@@ -5,6 +5,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.fuyuanshen.app.mapper.AppDeviceShareMapper">
 
     <select id="otherDeviceShareList" resultType="com.fuyuanshen.app.domain.vo.AppDeviceShareVo">
-        SELECT * FROM app_device_share a where a.phonenumber = #{bo.phonenumber}
+        select d.device_name,
+        d.device_mac,
+        d.device_sn,
+        d.device_imei,
+        d.device_pic,
+        dt.type_name,
+        dt.communication_mode,
+        dt.model_dictionary detailPageUrl,
+        d.bluetooth_name,
+        c.binding_time,
+        ad.*,u.user_name otherPhonenumber
+        from
+        app_device_share ad
+        left join device d on ad.device_id = d.id
+        left join app_user u on ad.create_by = u.user_id
+        inner join device_type dt on d.device_type = dt.id
+        inner join app_device_bind_record c on d.id = c.device_id
+        where ad.phonenumber = #{bo.phonenumber}
+    </select>
+    <select id="selectAppDeviceShareList" resultType="com.fuyuanshen.app.domain.vo.AppDeviceShareVo">
+        select d.device_name,
+        d.device_mac,
+        d.device_sn,
+        d.device_imei,
+        d.device_pic,
+        dt.type_name,
+        dt.communication_mode,
+        d.bluetooth_name,
+        dt.model_dictionary detailPageUrl,
+        c.binding_time,
+        ad.*,u.user_name otherPhonenumber
+        from
+        app_device_share ad
+        left join device d on ad.device_id = d.id
+        left join app_user u on ad.create_by = u.user_id
+        inner join device_type dt on d.device_type = dt.id
+        inner join app_device_bind_record c on d.id = c.device_id
+        where ad.create_by = #{bo.createBy}
+        <if test="bo.deviceId != null">
+            and ad.device_id = #{bo.deviceId}
+        </if>
     </select>
 </mapper>

fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuyuanshen.common.core.domain.model.LoginUser;
+import com.fuyuanshen.common.core.enums.UserType;
 import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
@@ -95,7 +96,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         customer.setUserLevel((byte) (loginUser.getUserLevel() + 1));
         customer.setPid(loginUser.getUserId());
         customer.setStatus("0");
-
+        customer.setUserType(UserType.SYS_USER.getUserType());
         save(customer);
 
         // 新增用户与角色管理
@@ -117,6 +118,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     @Transactional(rollbackFor = Exception.class)
     public void updateCustomer(Customer customer) throws Exception {
 
+        // 获取当前会话账号id, 如果未登录，则抛出异常：`NotLoginException`
+        Object loginId = StpUtil.getLoginId();
+
         UserQueryCriteria userQueryCriteria = new UserQueryCriteria();
         if (StringUtils.isNotEmpty(customer.getUserName())) {
             userQueryCriteria.setCustomerName(customer.getUserName());
@@ -130,17 +134,19 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
             customer.setStatus("0");
         } else {
             // 强制下线
-            // StpUtil.logout(customer.getCustomerId());
+            // String tokenId = customer.getUserType() + ":" + customer.getCustomerId();
+            String tokenId = UserType.SYS_USER.getUserType() + ":" + customer.getCustomerId();
+            StpUtil.logout(tokenId);
             // StpUtil.kickout(customer.getCustomerId());
             customer.setStatus("1");
             // 检查目标用户是否有有效的登录状态
-            if (StpUtil.isLogin(customer.getCustomerId())) {
-                // 用户已登录，可以执行踢出操作
-                StpUtil.kickout(customer.getCustomerId());
-            } else {
-                // 用户未登录，无法踢出
-                System.out.println("目标用户未登录，无法执行踢出操作");
-            }
+            // if (StpUtil.isLogin(customer.getCustomerId())) {
+            //     // 用户已登录，可以执行踢出操作
+            //     StpUtil.kickout(customer.getCustomerId());
+            // } else {
+            //     // 用户未登录，无法踢出
+            //     System.out.println("目标用户未登录，无法执行踢出操作");
+            // }
         }
         saveOrUpdate(customer);
     }

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

@@ -0,0 +1,105 @@
+package com.fuyuanshen.equipment.controller;
+
+import java.util.List;
+
+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.equipment.domain.vo.DeviceRepairRecordsVo;
+import com.fuyuanshen.equipment.domain.bo.DeviceRepairRecordsBo;
+import com.fuyuanshen.equipment.service.IDeviceRepairRecordsService;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 设备维修记录
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/equipment/repairRecords")
+public class DeviceRepairRecordsController extends BaseController {
+
+    private final IDeviceRepairRecordsService deviceRepairRecordsService;
+
+    /**
+     * 查询设备维修记录列表
+     */
+    @SaCheckPermission("equipment:repairRecords:list")
+    @GetMapping("/list")
+    public TableDataInfo<DeviceRepairRecordsVo> list(DeviceRepairRecordsBo bo, PageQuery pageQuery) {
+        return deviceRepairRecordsService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出设备维修记录列表
+     */
+    @SaCheckPermission("equipment:repairRecords:export")
+    @Log(title = "设备维修记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DeviceRepairRecordsBo bo, HttpServletResponse response) {
+        List<DeviceRepairRecordsVo> list = deviceRepairRecordsService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备维修记录", DeviceRepairRecordsVo.class, response);
+    }
+
+    /**
+     * 获取设备维修记录详细信息
+     *
+     * @param recordId 主键
+     */
+    @SaCheckPermission("equipment:repairRecords:query")
+    @GetMapping("/{recordId}")
+    public R<DeviceRepairRecordsVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long recordId) {
+        return R.ok(deviceRepairRecordsService.queryById(recordId));
+    }
+
+    /**
+     * 新增设备维修记录
+     */
+    @SaCheckPermission("equipment:repairRecords:add")
+    @Log(title = "设备维修记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceRepairRecordsBo bo) {
+        return toAjax(deviceRepairRecordsService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备维修记录
+     */
+    @SaCheckPermission("equipment:repairRecords:edit")
+    @Log(title = "设备维修记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceRepairRecordsBo bo) {
+        return toAjax(deviceRepairRecordsService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备维修记录
+     *
+     * @param recordIds 主键串
+     */
+    @SaCheckPermission("equipment:repairRecords:remove")
+    @Log(title = "设备维修记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{recordIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] recordIds) {
+        return toAjax(deviceRepairRecordsService.deleteWithValidByIds(List.of(recordIds), true));
+    }
+}

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

@@ -82,6 +82,10 @@ public class Device extends TenantEntity {
     @Schema(name = "蓝牙名称")
     private String bluetoothName;
 
+    /**
+     * 设备IMEI
+     * device_imei
+     */
     @Schema(name = "设备IMEI")
     private String deviceImei;
 

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

@@ -0,0 +1,56 @@
+package com.fuyuanshen.equipment.domain;
+
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 设备分组对象 device_group
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("device_group")
+public class DeviceGroup extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 分组名称
+     */
+    private String groupName;
+
+    /**
+     * 状态：0-禁用，1-正常
+     */
+    private Long status;
+
+    /**
+     * 父分组ID
+     */
+    private Long parentId;
+
+    /**
+     * 完整分组路径
+     */
+    private String fullPath;
+
+    /**
+     * 删除标记：0-未删除，1-已删除
+     */
+    private Long isDeleted;
+
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceLog.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;
 
@@ -16,7 +17,7 @@ import java.io.Serial;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("device_log")
-public class DeviceLog extends BaseEntity {
+public class DeviceLog  extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -27,10 +28,16 @@ public class DeviceLog extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 设备ID
+     */
+    private Long deviceId;
+
     /**
      * 设备行为
      */
     private String deviceAction;
+    // private Integer deviceActionInt;
 
     /**
      * 设备名称
@@ -47,5 +54,4 @@ public class DeviceLog extends BaseEntity {
      */
     private String content;
 
-
 }

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

@@ -0,0 +1,58 @@
+package com.fuyuanshen.equipment.domain;
+
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 设备维修记录对象 device_repair_records
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("device_repair_records")
+public class DeviceRepairRecords extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 维修记录ID
+     */
+    @TableId(value = "record_id")
+    private Long recordId;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 维修时间
+     */
+    private Date repairTime;
+
+    /**
+     * 维修部位
+     */
+    private String repairPart;
+
+    /**
+     * 维修原因
+     */
+    private String repairReason;
+
+    /**
+     * 维修人员
+     */
+    private String repairPerson;
+
+
+}

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

@@ -65,4 +65,11 @@ public class DeviceType extends TenantEntity {
         BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
     }
 
+    /**
+     * 型号字典用于APP页面跳转
+     */
+    @Schema(name = "型号字典用于APP页面跳转")
+    private String modelDictionary;
+
+
 }

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

@@ -0,0 +1,65 @@
+package com.fuyuanshen.equipment.domain.bo;
+
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.equipment.domain.DeviceGroup;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 设备分组业务对象 device_group
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DeviceGroup.class, reverseConvertGenerate = false)
+public class DeviceGroupBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    // @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 分组名称
+     */
+    @NotBlank(message = "分组名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String groupName;
+
+    /**
+     * 状态：0-禁用，1-正常
+     */
+    // @NotNull(message = "状态：0-禁用，1-正常不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long status;
+
+    /**
+     * 父分组ID
+     */
+    private Long parentId;
+
+    /**
+     * 完整分组路径
+     */
+    private String fullPath;
+
+    /**
+     * 删除标记：0-未删除，1-已删除
+     */
+    // @NotNull(message = "删除标记：0-未删除，1-已删除不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long isDeleted;
+
+
+    @Schema(name = "页码", example = "1")
+    private Integer pageNum = 1;
+
+    @Schema(name = "每页数据量", example = "10")
+    private Integer pageSize = 10;
+
+}

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

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
+import java.util.List;
+
 /**
  * 设备日志业务对象 device_log
  *
@@ -22,9 +24,14 @@ public class DeviceLogBo extends BaseEntity {
     /**
      * ID
      */
-    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    @NotNull(message = "ID不能为空", groups = {EditGroup.class})
     private Long id;
 
+    /**
+     * 设备编号
+     */
+    private List<Long> deviceIds;
+
     /**
      * 设备行为
      */

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

@@ -0,0 +1,62 @@
+package com.fuyuanshen.equipment.domain.bo;
+
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.equipment.domain.DeviceRepairRecords;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 设备维修记录业务对象 device_repair_records
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DeviceRepairRecords.class, reverseConvertGenerate = false)
+public class DeviceRepairRecordsBo extends BaseEntity {
+
+    /**
+     * 维修记录ID
+     */
+    @NotNull(message = "维修记录ID不能为空", groups = { EditGroup.class })
+    private Long recordId;
+
+    /**
+     * 设备ID
+     */
+    @NotBlank(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String deviceId;
+
+    /**
+     * 维修时间
+     */
+    @NotNull(message = "维修时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date repairTime;
+
+    /**
+     * 维修部位
+     */
+    @NotBlank(message = "维修部位不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String repairPart;
+
+    /**
+     * 维修原因
+     */
+    @NotBlank(message = "维修原因不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String repairReason;
+
+    /**
+     * 维修人员
+     */
+    @NotBlank(message = "维修人员不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String repairPerson;
+
+
+}

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

@@ -13,4 +13,17 @@ public class AppDeviceSendMsgBo {
     private String sendMsg;
 
     private List<Long> deviceIds;
+
+    private List<String> deviceImeiList;
+
+    /**
+     *  下发指令
+     */
+    private String instructValue;
+
+    /**
+     * 批次号
+     */
+    private String batchId;
+
 }

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

@@ -1,13 +1,6 @@
 package com.fuyuanshen.equipment.domain.form;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fuyuanshen.common.tenant.core.TenantEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 /**
@@ -36,4 +29,10 @@ public class DeviceTypeForm {
     @Schema(name = "通讯方式", example = "0:4G;1:蓝牙")
     private String communicationMode;
 
+    /**
+     * 型号字典用于APP页面跳转
+     */
+    @Schema(name = "型号字典用于APP页面跳转")
+    private String modelDictionary;
+
 }

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

@@ -57,4 +57,33 @@ public class AppDeviceVo implements Serializable {
      */
     private Date bindingTime;
 
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
+
+    /**
+     * 电量 百分比
+     */
+    private String battery;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 告警状态(0解除告警，1告警)
+     */
+    private String alarmStatus;
+
+    /**
+     * 设备详情页面
+     */
+    private String detailPageUrl;
 }

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

@@ -0,0 +1,79 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fuyuanshen.equipment.domain.DeviceGroup;
+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;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 设备分组视图对象 device_group
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = DeviceGroup.class)
+public class DeviceGroupVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 分组名称
+     */
+    @ExcelProperty(value = "分组名称")
+    private String groupName;
+
+    /**
+     * 状态：0-禁用，1-正常
+     */
+    @ExcelProperty(value = "状态：0-禁用，1-正常")
+    private String status;
+
+    /**
+     * 父分组ID
+     */
+    @ExcelProperty(value = "父分组ID")
+    private Long parentId;
+
+    /**
+     * 完整分组路径
+     */
+    @ExcelProperty(value = "完整分组路径")
+    private String fullPath;
+
+    /**
+     * 删除标记：0-未删除，1-已删除
+     */
+    @ExcelProperty(value = "删除标记：0-未删除，1-已删除")
+    private Long isDeleted;
+
+    /**
+     * 嵌套子分组
+     */
+    private List<DeviceGroupVo> children;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+}

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

@@ -1,5 +1,7 @@
 package com.fuyuanshen.equipment.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fuyuanshen.equipment.domain.DeviceLog;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -58,5 +60,10 @@ public class DeviceLogVo implements Serializable {
     @ExcelProperty(value = "内容")
     private String content;
 
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
 
 }

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

@@ -0,0 +1,70 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 设备维修记录视图对象 device_repair_records
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = DeviceRepairRecords.class)
+public class DeviceRepairRecordsVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 维修记录ID
+     */
+    @ExcelProperty(value = "维修记录ID")
+    private Long recordId;
+
+    /**
+     * 设备ID
+     */
+    @ExcelProperty(value = "设备ID")
+    private String deviceId;
+
+    /**
+     * 维修时间
+     */
+    @ExcelProperty(value = "维修时间")
+    private Date repairTime;
+
+    /**
+     * 维修部位
+     */
+    @ExcelProperty(value = "维修部位")
+    private String repairPart;
+
+    /**
+     * 维修原因
+     */
+    @ExcelProperty(value = "维修原因")
+    private String repairReason;
+
+    /**
+     * 维修人员
+     */
+    @ExcelProperty(value = "维修人员")
+    private String repairPerson;
+
+
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/enums/LightModeEnum.java

@@ -0,0 +1,72 @@
+package com.fuyuanshen.equipment.enums;
+
+/**
+ * 灯光模式枚举
+ */
+public enum LightModeEnum {
+    
+    /**
+     * 关灯模式
+     */
+    OFF(0, "关灯"),
+    
+    /**
+     * 强光模式
+     */
+    HIGH_BEAM(1, "开启强光模式"),
+    
+    /**
+     * 弱光模式
+     */
+    LOW_BEAM(2, "开启弱光模式"),
+    
+    /**
+     * 爆闪模式
+     */
+    STROBE(3, "开启爆闪模式"),
+    
+    /**
+     * 泛光模式
+     */
+    FLOOD(4, "开启泛光模式");
+    
+    private final Integer code;
+    private final String name;
+    
+    LightModeEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+    
+    public Integer getCode() {
+        return code;
+    }
+    
+    public String getName() {
+        return name;
+    }
+    
+    /**
+     * 根据编号获取枚举
+     * @param code 编号
+     * @return 对应的枚举值
+     */
+    public static LightModeEnum getByCode(Integer code) {
+        for (LightModeEnum mode : LightModeEnum.values()) {
+            if (mode.getCode().equals(code)) {
+                return mode;
+            }
+        }
+        return null;
+    }
+    
+    /**
+     * 根据编号获取名称
+     * @param code 编号
+     * @return 对应的名称
+     */
+    public static String getNameByCode(Integer code) {
+        LightModeEnum mode = getByCode(code);
+        return mode != null ? mode.getName() : null;
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.fuyuanshen.equipment.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceGroup;
+import com.fuyuanshen.equipment.domain.bo.DeviceGroupBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo;
+import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 设备分组Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+public interface DeviceGroupMapper extends BaseMapperPlus<DeviceGroup, DeviceGroupVo> {
+
+    /**
+     * 查询设备分组列表
+     *
+     * @param bo 设备分组
+     * @return 设备分组
+     */
+    IPage<DeviceGroup> selectRootGroups(@Param("bo") DeviceGroupBo bo, Page<Device> page);
+
+    /**
+     * 查询子分组
+     *
+     * @param id
+     * @return
+     */
+    List<DeviceGroup> selectByParentId(Long id);
+
+}

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

@@ -66,4 +66,6 @@ public interface DeviceMapper extends BaseMapper<Device> {
      * @return
      */
     List<Device> findByOriginalDeviceId(Long originalDeviceId);
+
+    AppDeviceVo getDeviceInfo(@Param("deviceMac") String deviceMac);
 }

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

@@ -0,0 +1,15 @@
+package com.fuyuanshen.equipment.mapper;
+
+import com.fuyuanshen.equipment.domain.DeviceRepairRecords;
+import com.fuyuanshen.equipment.domain.vo.DeviceRepairRecordsVo;
+import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 设备维修记录Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+public interface DeviceRepairRecordsMapper extends BaseMapperPlus<DeviceRepairRecords, DeviceRepairRecordsVo> {
+
+}

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

@@ -0,0 +1,59 @@
+package com.fuyuanshen.equipment.service;
+
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo;
+import com.fuyuanshen.equipment.domain.bo.DeviceGroupBo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 设备分组Service接口
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+public interface IDeviceGroupService {
+
+    /**
+     * 查询设备分组
+     *
+     * @param id 主键
+     * @return 设备分组
+     */
+    DeviceGroupVo queryById(Long id);
+
+
+    /**
+     * 查询符合条件的设备分组列表
+     *
+     * @param bo 查询条件
+     * @return 设备分组列表
+     */
+    List<DeviceGroupVo> queryList(DeviceGroupBo bo);
+
+    /**
+     * 新增设备分组
+     *
+     * @param bo 设备分组
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(DeviceGroupBo bo);
+
+    /**
+     * 修改设备分组
+     *
+     * @param bo 设备分组
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(DeviceGroupBo bo);
+
+    /**
+     * 校验并批量删除设备分组信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,68 @@
+package com.fuyuanshen.equipment.service;
+
+import com.fuyuanshen.equipment.domain.vo.DeviceRepairRecordsVo;
+import com.fuyuanshen.equipment.domain.bo.DeviceRepairRecordsBo;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 设备维修记录Service接口
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+public interface IDeviceRepairRecordsService {
+
+    /**
+     * 查询设备维修记录
+     *
+     * @param recordId 主键
+     * @return 设备维修记录
+     */
+    DeviceRepairRecordsVo queryById(Long recordId);
+
+    /**
+     * 分页查询设备维修记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备维修记录分页列表
+     */
+    TableDataInfo<DeviceRepairRecordsVo> queryPageList(DeviceRepairRecordsBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的设备维修记录列表
+     *
+     * @param bo 查询条件
+     * @return 设备维修记录列表
+     */
+    List<DeviceRepairRecordsVo> queryList(DeviceRepairRecordsBo bo);
+
+    /**
+     * 新增设备维修记录
+     *
+     * @param bo 设备维修记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(DeviceRepairRecordsBo bo);
+
+    /**
+     * 修改设备维修记录
+     *
+     * @param bo 设备维修记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(DeviceRepairRecordsBo bo);
+
+    /**
+     * 校验并批量删除设备维修记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,172 @@
+package com.fuyuanshen.equipment.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.utils.MapstructUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceTypeGrants;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import com.fuyuanshen.equipment.domain.bo.DeviceGroupBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo;
+import com.fuyuanshen.equipment.domain.DeviceGroup;
+import com.fuyuanshen.equipment.mapper.DeviceGroupMapper;
+import com.fuyuanshen.equipment.service.IDeviceGroupService;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/**
+ * 设备分组Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class DeviceGroupServiceImpl implements IDeviceGroupService {
+
+    private final DeviceGroupMapper baseMapper;
+
+
+    /**
+     * 查询设备分组
+     *
+     * @param id 主键
+     * @return 设备分组
+     */
+    @Override
+    public DeviceGroupVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+
+    /**
+     * 查询符合条件的设备分组列表
+     *
+     * @param bo 查询条件
+     * @return 设备分组列表
+     */
+    @Override
+    public List<DeviceGroupVo> queryList(DeviceGroupBo bo) {
+        Page<Device> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        // 1. 查询顶级分组（parent_id为null）
+        IPage<DeviceGroup>  rootGroups = baseMapper.selectRootGroups(bo, page);
+        List<DeviceGroup> records = rootGroups.getRecords();
+
+        // 2. 递归构建树形结构
+        return records.stream()
+                .map(this::buildGroupTree)
+                .collect(Collectors.toList());
+    }
+
+    private DeviceGroupVo buildGroupTree(DeviceGroup group) {
+        DeviceGroupVo vo = convertToVO(group);
+        // 递归查询子分组
+        List<DeviceGroup> children = baseMapper.selectByParentId(group.getId());
+        vo.setChildren(children.stream()
+                .map(this::buildGroupTree)
+                .collect(Collectors.toList()));
+        return vo;
+    }
+
+    private DeviceGroupVo convertToVO(DeviceGroup group) {
+        DeviceGroupVo vo = new DeviceGroupVo();
+        vo.setId(group.getId());
+        vo.setGroupName(group.getGroupName());
+        vo.setStatus(group.getStatus() == 1 ? "正常" : "禁用");
+        vo.setCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(group.getCreateTime()));
+        return vo;
+    }
+
+    private LambdaQueryWrapper<DeviceGroup> buildQueryWrapper(DeviceGroupBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<DeviceGroup> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(DeviceGroup::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getGroupName()), DeviceGroup::getGroupName, bo.getGroupName());
+        lqw.eq(bo.getStatus() != null, DeviceGroup::getStatus, bo.getStatus());
+        lqw.eq(bo.getParentId() != null, DeviceGroup::getParentId, bo.getParentId());
+        lqw.eq(StringUtils.isNotBlank(bo.getFullPath()), DeviceGroup::getFullPath, bo.getFullPath());
+        lqw.eq(bo.getIsDeleted() != null, DeviceGroup::getIsDeleted, bo.getIsDeleted());
+        return lqw;
+    }
+
+
+    /**
+     * 新增设备分组
+     *
+     * @param bo 设备分组
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(DeviceGroupBo bo) {
+
+        // 验证分组名称唯一性
+        DeviceGroup deviceGroup = baseMapper.selectOne(new QueryWrapper<DeviceGroup>().eq("group_name", bo.getGroupName()));
+        if (deviceGroup != null) {
+            throw new RuntimeException("分组名称已存在,请勿重复添加！！！");
+        }
+
+        // 验证父分组是否存在（如果提供了parentId）
+        DeviceGroup pDeviceGroup = baseMapper.selectById(bo.getParentId());
+        if (bo.getParentId() != null && pDeviceGroup == null) {
+            throw new RuntimeException("父分组不存在！！！");
+        }
+
+        DeviceGroup add = MapstructUtils.convert(bo, DeviceGroup.class);
+        // validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+
+    /**
+     * 修改设备分组
+     *
+     * @param bo 设备分组
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(DeviceGroupBo bo) {
+        DeviceGroup update = MapstructUtils.convert(bo, DeviceGroup.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(DeviceGroup entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除设备分组信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}