Merge remote-tracking branch 'upstream/dyf-device' into main-dyf

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

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>
@@ -123,36 +123,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>javacv-platform</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>javacv</artifactId>
-            <version>1.5.7</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- Java音频转换库 -->
-        <dependency>
-            <groupId>ws.schild</groupId>
-            <artifactId>jave-core</artifactId>
-            <version>3.3.1</version>
-        </dependency>
-
- <!--       <dependency>
-            <groupId>ws.schild</groupId>
-            <artifactId>jave-nativebin-all</artifactId>
-            <version>3.3.1</version>
-        </dependency>-->
-
-        <dependency>
-            <groupId>ws.schild</groupId>
-            <artifactId>jave-all-deps</artifactId>
-            <version>3.1.1</version>
-            <scope>compile</scope>
-        </dependency>
-
         <!-- skywalking 整合 logback -->
 <!--        <dependency>-->
 <!--            <groupId>org.apache.skywalking</groupId>-->

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

@@ -1,24 +1,22 @@
-    package com.fuyuanshen;
+package com.fuyuanshen;
 
-    import org.springframework.boot.SpringApplication;
-    import org.springframework.boot.autoconfigure.SpringBootApplication;
-    import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
-    import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
 
-    /**
-     * 启动程序
-     *
-     * @author Lion Li
-     */
-    @SpringBootApplication
-    @EnableScheduling
-    public class DromaraApplication {
-
-        public static void main(String[] args) {
-            SpringApplication application = new SpringApplication(DromaraApplication.class);
-            application.setApplicationStartup(new BufferingApplicationStartup(2048));
-            application.run(args);
-            System.out.println("(♥◠‿◠)ﾉﾞ  fys-Vue-Plus启动成功   ლ(´ڡ`ლ)ﾞ");
-        }
+/**
+ * 启动程序
+ *
+ * @author Lion Li
+ */
+@SpringBootApplication
+public class DromaraApplication {
 
+    public static void main(String[] args) {
+        SpringApplication application = new SpringApplication(DromaraApplication.class);
+        application.setApplicationStartup(new BufferingApplicationStartup(2048));
+        application.run(args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  fys-Vue-Plus启动成功   ლ(´ڡ`ლ)ﾞ");
     }
+
+}

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

@@ -1,81 +0,0 @@
-package com.fuyuanshen;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.File;
-
-public class SimpleQR {
-    public static void main(String[] args) throws Exception {
-        String text = "HELLO";
-        int size = 21; // 版本1的大小
-        boolean[][] qr = new boolean[size][size];
-
-        // 1. 三个定位标记
-        for (int i = 0; i < 7; i++)
-            for (int j = 0; j < 7; j++) {
-                boolean black = i == 0 || i == 6 || j == 0 || j == 6 || (i > 1 && i < 5 && j > 1 && j < 5);
-                qr[i][j] = qr[i][size - 1 - j] = qr[size - 1 - i][j] = black;
-            }
-
-        // 2. 定时图案（简化）
-        for (int i = 8; i < 13; i++) qr[i][6] = qr[6][i] = (i % 2 == 0);
-
-        // 3. 编码数据（极简编码）
-        byte[] data = text.getBytes();
-        int x = 20, y = 20, up = 1; // 从右下角开始
-        for (byte b : data)
-            for (int bit = 7; bit >= 0; bit--) {
-                while (qr[x][y] || (x == 6 && y < 9) || (y == 6 && x < 9) || (x < 9 && y < 9) ||
-                        (x < 9 && y > size - 10) || (y < 9 && x > size - 10)) {
-                    if (up > 0) {
-                        if (--y < 0) {
-                            y = 0;
-                            x -= 2;
-                            up = -1;
-                        }
-                    } else {
-                        if (++y >= size) {
-                            y = size - 1;
-                            x -= 2;
-                            up = 1;
-                        }
-                    }
-                    if (x == 6) x--;
-                }
-                qr[x][y] = ((b >> bit) & 1) == 1;
-                if (up > 0) {
-                    if (--y < 0) {
-                        y = 0;
-                        x -= 2;
-                        up = -1;
-                    }
-                } else {
-                    if (++y >= size) {
-                        y = size - 1;
-                        x -= 2;
-                        up = 1;
-                    }
-                }
-                if (x == 6) x--;
-            }
-
-        // 4. 保存图像
-        int scale = 10, margin = 4;
-        BufferedImage img = new BufferedImage(
-                size * scale + margin * 2, size * scale + margin * 2, BufferedImage.TYPE_INT_RGB);
-        for (int i = 0; i < img.getWidth(); i++)
-            for (int j = 0; j < img.getHeight(); j++)
-                img.setRGB(i, j, 0xFFFFFF); // 白色背景
-
-        for (int i = 0; i < size; i++)
-            for (int j = 0; j < size; j++)
-                if (qr[i][j])
-                    for (int di = 0; di < scale; di++)
-                        for (int dj = 0; dj < scale; dj++)
-                            img.setRGB(margin + i * scale + di, margin + j * scale + dj, 0x000000);
-
-        ImageIO.write(img, "PNG", new File("qr.png"));
-        System.out.println("二维码已生成");
-    }
-
-}

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

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

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

@@ -4,43 +4,28 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.RandomUtil;
-import com.alibaba.fastjson.JSON;
-import com.fuyuanshen.app.model.AppRegisterBody;
-import com.fuyuanshen.app.model.AppSmsLoginBody;
 import com.fuyuanshen.app.service.AppLoginService;
-import com.fuyuanshen.app.service.AppRegisterService;
-import com.fuyuanshen.common.core.constant.Constants;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.core.constant.SystemConstants;
 import com.fuyuanshen.common.core.domain.R;
-import com.fuyuanshen.common.core.domain.model.AppPasswordLoginBody;
-import com.fuyuanshen.common.core.domain.model.RegisterBody;
-import com.fuyuanshen.common.core.domain.model.SmsLoginBody;
-import com.fuyuanshen.common.core.enums.LoginType;
+import com.fuyuanshen.common.core.domain.model.AppLoginBody;
+import com.fuyuanshen.common.core.domain.model.AppSmsRegisterBody;
+import com.fuyuanshen.common.core.domain.model.PasswordLoginBody;
 import com.fuyuanshen.common.core.utils.*;
-import com.fuyuanshen.common.encrypt.annotation.ApiEncrypt;
 import com.fuyuanshen.common.json.utils.JsonUtils;
-import com.fuyuanshen.common.ratelimiter.annotation.RateLimiter;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.common.tenant.helper.TenantHelper;
 import com.fuyuanshen.system.domain.bo.SysTenantBo;
 import com.fuyuanshen.system.domain.vo.SysClientVo;
-import com.fuyuanshen.system.domain.vo.SysDictDataVo;
 import com.fuyuanshen.system.domain.vo.SysTenantVo;
 import com.fuyuanshen.system.service.ISysClientService;
 import com.fuyuanshen.system.service.ISysConfigService;
-import com.fuyuanshen.system.service.ISysDictTypeService;
 import com.fuyuanshen.system.service.ISysTenantService;
-import com.fuyuanshen.web.domain.Dto.SystemVersionDto;
 import com.fuyuanshen.web.domain.vo.LoginTenantVo;
 import com.fuyuanshen.web.domain.vo.LoginVo;
 import com.fuyuanshen.web.domain.vo.TenantListVo;
+import com.fuyuanshen.web.service.AppRegisterService;
 import com.fuyuanshen.web.service.IAuthStrategy;
-import com.fuyuanshen.web.service.SysRegisterService;
 import jakarta.servlet.http.HttpServletRequest;
-import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.sms4j.api.SmsBlend;
@@ -50,14 +35,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.net.URL;
-import java.time.Duration;
-import java.util.LinkedHashMap;
-import java.util.ArrayList;
 import java.util.List;
 
-import static com.fuyuanshen.common.core.constant.GlobalConstants.DEVICE_SHARE_CODES_KEY;
-import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
-
 /**
  * APP认证
  *
@@ -72,6 +51,7 @@ public class AppAuthController {
 
     private final AppLoginService loginService;
     private final AppRegisterService registerService;
+    private final ISysConfigService configService;
     private final ISysTenantService tenantService;
     private final ISysClientService clientService;
 
@@ -83,36 +63,18 @@ public class AppAuthController {
      */
 //    @ApiEncrypt
     @PostMapping("/login")
-    public R<LoginVo> login(@RequestBody AppSmsLoginBody appSmsLoginBody) {
+    public R<LoginVo> login(@RequestBody AppLoginBody appLoginBody) {
 //        SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class);
-        String loginType = appSmsLoginBody.getLoginType();
-        String body = "";
+        ValidatorUtils.validate(appLoginBody);
+        PasswordLoginBody loginBody = new PasswordLoginBody();
+        loginBody.setUsername(appLoginBody.getUserName());
+        loginBody.setPassword(appLoginBody.getPassword());
+        loginBody.setTenantId(appLoginBody.getTenantId());
+        loginBody.setClientId("835b15335d389c9fcfdf99421fa8019b");
+        loginBody.setGrantType("appPassword");
         // 授权类型和客户端id
-        String clientId = "";
-        String grantType = "";
-        String tenantId = appSmsLoginBody.getTenantId();
-        ValidatorUtils.validate(appSmsLoginBody);
-        if("2".equals(loginType)){
-            AppPasswordLoginBody loginBody = new AppPasswordLoginBody();
-            loginBody.setUsername(appSmsLoginBody.getPhonenumber());
-            loginBody.setPassword(appSmsLoginBody.getLoginPassword());
-            loginBody.setClientId("835b15335d389c9fcfdf99421fa8019b");
-            loginBody.setGrantType("appPassword");
-            clientId = loginBody.getClientId();
-            grantType = loginBody.getGrantType();
-            body = JsonUtils.toJsonString(loginBody);
-        }else{
-            SmsLoginBody loginBody = new SmsLoginBody();
-            loginBody.setPhonenumber(appSmsLoginBody.getPhonenumber());
-            loginBody.setSmsCode(appSmsLoginBody.getSmsCode());
-            loginBody.setTenantId(appSmsLoginBody.getTenantId());
-            loginBody.setClientId("ca839698e245d60aa2f0e59bd52b34f8");
-            loginBody.setGrantType("appSms");
-            clientId = loginBody.getClientId();
-            grantType = loginBody.getGrantType();
-            body = JsonUtils.toJsonString(loginBody);
-        }
-
+        String clientId = loginBody.getClientId();
+        String grantType = loginBody.getGrantType();
         SysClientVo client = clientService.queryByClientId(clientId);
         // 查询不到 client 或 client 内不包含 grantType
         if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) {
@@ -122,9 +84,9 @@ public class AppAuthController {
             return R.fail(MessageUtils.message("auth.grant.type.blocked"));
         }
         // 校验租户
-//        loginService.checkTenant(loginBody.getTenantId());
-        loginService.checkTenant(tenantId);
+        loginService.checkTenant(loginBody.getTenantId());
         // 登录
+        String body = JsonUtils.toJsonString(loginBody);
         LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
         return R.ok(loginVo);
     }
@@ -133,74 +95,27 @@ public class AppAuthController {
     /**
      * 用户注销
      */
-    @PostMapping("/cancelAccount")
+    @DeleteMapping("/cancelAccount")
     public R<Void> cancelAccount() {
         loginService.cancelAccount();
         return R.ok("用户注销成功");
     }
 
+    /**
+     * 退出登录
+     */
+    @PostMapping("/logout")
+    public R<Void> logout() {
+        loginService.logout();
+        return R.ok("退出成功");
+    }
 
     /**
      * 用户注册
      */
     @PostMapping("/register")
-    public R<Void> register(@Validated @RequestBody AppRegisterBody body) {
-        registerService.register(body);
-        return R.ok();
-    }
-
-
-    /**
-     * 找回密码
-     */
-    @PostMapping("/forgetPassword")
-    public R<Void> forgetPassword(@Validated @RequestBody AppRegisterBody body) {
-        registerService.forgetPassword(body);
-        return R.ok();
-    }
-
-
-    /**
-     * 用户注册短信验证码
-     *
-     * @param phonenumber 用户手机号
-     */
-    @SaIgnore
-    @RateLimiter(key = "#phonenumber", time = 60, count = 1)
-    @GetMapping("/registerSmsCode")
-    public R<Void> registerSmsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
-        String key = GlobalConstants.REGISTER_CODE_KEY + phonenumber;
-        String code = RandomUtil.randomNumbers(4);
-        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
-        LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
-        map.put("code", code);
-        SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
-        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, map);
-        if (!smsResponse.isSuccess()) {
-            return R.fail(smsResponse.getData().toString());
-        }
-        return R.ok();
-    }
-
-    /**
-     * 找回密码短信验证码
-     *
-     * @param phonenumber 用户手机号
-     */
-    @SaIgnore
-    @RateLimiter(key = "#phonenumber", time = 60, count = 1)
-    @GetMapping("/forgetPasswordSmsCode")
-    public R<Void> forgetPasswordSmsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
-        String key = GlobalConstants.FORGET_PASSWORD_CODE_KEY + phonenumber;
-        String code = RandomUtil.randomNumbers(4);
-        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
-        LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
-        map.put("code", code);
-        SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
-        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, map);
-        if (!smsResponse.isSuccess()) {
-            return R.fail(smsResponse.getData().toString());
-        }
+    public R<Void> register(@Validated @RequestBody AppSmsRegisterBody user) {
+        registerService.register(user);
         return R.ok();
     }
 
@@ -257,20 +172,4 @@ public class AppAuthController {
         SmsResponse smsResponse = smsBlend.sendMessage("18656573389", "123");
     }
 
-    /**
-     * 获取app版本
-     * @return
-     */
-    @GetMapping("/version")
-    public R<List<SystemVersionDto>> getAppVersion() {
-        String versionKey = GLOBAL_REDIS_KEY + "System:Version:Xinghan";
-        // 缓存告警消息到Redis
-        String versionJson = RedisUtils.getCacheObject(versionKey);
-        if (StringUtils.isBlank(versionJson)) {   // hutool 工具，可用 StringUtils.isBlank 代替
-            return R.fail(versionJson);
-        }
-        List<SystemVersionDto> list = JSON.parseArray(versionJson, SystemVersionDto.class);
-        return R.ok(list);
-    }
-
 }

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

@@ -6,7 +6,6 @@ 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.satoken.utils.AppLoginHelper;
 import com.fuyuanshen.common.web.core.BaseController;
 import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
@@ -54,8 +53,7 @@ public class AppDeviceController extends BaseController {
      */
     @DeleteMapping("/unBind")
     public R<Void> unBind(Long id) {
-        Long userId = AppLoginHelper.getUserId();
-        return toAjax(appDeviceService.unBindDevice(id,userId,0));
+        return toAjax(appDeviceService.unBindDevice(id));
     }
 
     /**
@@ -92,5 +90,4 @@ public class AppDeviceController extends BaseController {
     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;
@@ -44,8 +43,9 @@ import static com.fuyuanshen.common.core.constant.GlobalConstants.DEVICE_SHARE_C
 @RequestMapping("/app/deviceShare")
 public class AppDeviceShareController extends BaseController {
 
-    private final AppDeviceShareService appDeviceShareService;
+    private final IAppDeviceShareService deviceShareService;
 
+    private final DeviceShareService appDeviceShareService;
 
     /**
      * 分享管理列表
@@ -94,7 +94,6 @@ public class AppDeviceShareController extends BaseController {
         return toAjax(appDeviceShareService.remove(ids));
     }
 
-
     /**
      * 短信验证码
      *
@@ -116,5 +115,4 @@ public class AppDeviceShareController extends BaseController {
         }
         return R.ok();
     }
-
 }

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

@@ -11,7 +11,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -26,7 +25,6 @@ public class AppFileController extends BaseController {
 
     private final AppFileService appFileService;
 
-
     /**
      * 查询文件列表
      */
@@ -35,12 +33,11 @@ public class AppFileController extends BaseController {
         return R.ok(appFileService.list(bo));
     }
 
-
     /**
      * 上传文件
      */
     @PostMapping("/upload")
-    public R<Void> upload(@Validated @ModelAttribute AppFileDto bo) throws IOException {
+    public R<Void> upload(@Validated @ModelAttribute AppFileDto bo) {
         return toAjax(appFileService.add(bo));
     }
 
@@ -55,5 +52,4 @@ public class AppFileController extends BaseController {
         }
         return toAjax(appFileService.delete(ids));
     }
-
 }

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

@@ -25,7 +25,6 @@ public class AppOperationVideoController extends BaseController {
 
     private final IAppOperationVideoService appOperationVideoService;
 
-
     /**
      * 查询操作视频列表
      */
@@ -69,5 +68,4 @@ public class AppOperationVideoController extends BaseController {
     public R<Void> deleteOperationVideo(@PathVariable Long id) {
         return toAjax(appOperationVideoService.deleteWithValidByIds(List.of(id), true));
     }
-
 }

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

@@ -1,55 +0,0 @@
-package com.fuyuanshen.app.controller;
-
-import com.fuyuanshen.app.model.AppRegisterBody;
-import com.fuyuanshen.app.model.AppUpdatePasswordBody;
-import com.fuyuanshen.app.service.AppLoginService;
-import com.fuyuanshen.app.service.AppRegisterService;
-import com.fuyuanshen.common.core.domain.R;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * APP我的
- *
- */
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/app/userCenter")
-public class AppUserCenterController {
-
-    private final AppLoginService loginService;
-    private final AppRegisterService registerService;
-    /**
-     * 用户注销
-     */
-    @PostMapping("/cancelAccount")
-    public R<Void> cancelAccount() {
-        loginService.cancelAccount();
-        return R.ok("用户注销成功");
-    }
-
-
-    /**
-     * 修改密码
-     */
-    @PostMapping("/updatePassword")
-    public R<Void> updatePassword(@Validated @RequestBody AppUpdatePasswordBody body) {
-        registerService.updatePassword(body);
-        return R.ok();
-    }
-
-    /**
-     * 退出登录
-     */
-    @PostMapping("/logout")
-    public R<Void> logout() {
-        loginService.logout();
-        return R.ok("退出成功");
-    }
-}

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

@@ -0,0 +1,88 @@
+package com.fuyuanshen.app.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.util.RandomUtil;
+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.service.IAppUserService;
+import com.fuyuanshen.common.core.constant.Constants;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.ratelimiter.annotation.RateLimiter;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.web.core.BaseController;
+import jakarta.validation.constraints.NotBlank;
+import lombok.RequiredArgsConstructor;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.core.factory.SmsFactory;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.Duration;
+import java.util.LinkedHashMap;
+
+/**
+ * APP 用户管理
+ * @date 2025-06-27
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/user")
+public class AppUserController extends BaseController {
+
+    private final IAppUserService appUserService;
+
+    /**
+     * 个人中心
+     */
+    @GetMapping("/getUserInfo")
+    public R<APPUserInfoVo> getUserInfo() {
+        return R.ok(appUserService.getUserInfo());
+    }
+
+    /**
+     * 修改个人信息
+     */
+    @PostMapping("/updateUser")
+    public R<Void> updateUser(@Validated @ModelAttribute APPUpdateUserDTO bo) {
+        return toAjax(appUserService.updateUser(bo));
+    }
+
+    /**
+     * 忘记密码
+     */
+    @SaIgnore
+    @PostMapping("/forgotPassword")
+    public R<Void> forgotPassword(@RequestBody APPForgotPasswordDTO bo) {
+        return toAjax(appUserService.forgotPassword(bo));
+    }
+
+
+    /**
+     * 发送忘记密码短信
+     *
+     * @param phonenumber 用户手机号
+     */
+    @SaIgnore
+    @RateLimiter(key = "#phonenumber", time = 60, count = 1)
+    @GetMapping("/sendForgotPasswordSms")
+    public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
+        String key = GlobalConstants.APP_FORGOT_PASSWORD_SMS_KEY + phonenumber;
+        String code = RandomUtil.randomNumbers(4);
+        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
+        // 验证码模板id 自行处理 (查数据库或写死均可)
+        String templateId = "";
+        LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
+        map.put("code", code);
+        SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, map);
+        if (!smsResponse.isSuccess()) {
+            return R.fail(smsResponse.getData().toString());
+        }
+        return R.ok();
+    }
+}

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

@@ -1,140 +0,0 @@
-package com.fuyuanshen.app.controller;
-
-import cn.dev33.satoken.annotation.SaIgnore;
-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
-import com.fuyuanshen.app.domain.dto.AppAudioFileDto;
-import com.fuyuanshen.app.domain.dto.AppFileDto;
-import com.fuyuanshen.app.domain.dto.AppFileRenameDto;
-import com.fuyuanshen.app.domain.dto.TextToSpeechRequest;
-import com.fuyuanshen.app.domain.vo.AppFileVo;
-import com.fuyuanshen.app.service.AudioProcessService;
-import com.fuyuanshen.app.service.VideoProcessService;
-import com.fuyuanshen.common.core.domain.R;
-import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
-import com.fuyuanshen.common.web.core.BaseController;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.util.Base64;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * APP 视频处理控制器
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/app/video")
-public class AppVideoController extends BaseController {
-
-    private final VideoProcessService videoProcessService;
-    private final AudioProcessService audioProcessService;
-
-    /**
-     * 上传视频转码code默认1：RGB565 2：BGR565
-     */
-    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS,message = "请勿重复提交！")
-    public R<List<String>> uploadVideo(@RequestParam("file") MultipartFile file, @RequestParam(defaultValue = "1") int code) {
-        return R.ok(videoProcessService.processVideo(file, code));
-    }
-
-    /**
-     * 上传音频文件并转码
-     */
-    @PostMapping(value = "/audio", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS,message = "请勿重复提交！")
-    public R<List<String>> uploadAudio(@RequestParam("file") MultipartFile file) {
-        return R.ok(audioProcessService.processAudio(file));
-    }
-
-    /**
-     * 文字转音频TTS服务
-     */
-    @GetMapping("/audioTTS")
-    @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS,message = "请勿重复提交！")
-    public R<List<String>> uploadAudioTTS(@RequestParam String text) throws IOException {
-        return R.ok(audioProcessService.generateStandardPcmData(text));
-    }
-
-
-    /**
-     * 提取文本内容（只支持txt/docx）
-     */
-    @PostMapping(value = "/extract", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS,message = "请勿重复提交！")
-    public R<String> extract(@RequestParam("file") MultipartFile file) throws Exception {
-        return R.ok("Success",audioProcessService.extract(file));
-    }
-
-
-    /**
-     * 上传音频文件进行处理
-     * 支持MP3、WAV、PCM格式
-     */
-    @PostMapping("/uploadAudioToOss")
-    public R<String> uploadAudioToOss(@ModelAttribute AppAudioFileDto bo) {
-        try {
-            String result = audioProcessService.uploadAudioToOss(bo);
-            return R.ok(result);
-        } catch (IllegalArgumentException e) {
-            return R.fail("文件格式错误: " + e.getMessage());
-        } catch (Exception e) {
-
-            return R.fail("上传处理失败: " + e.getMessage());
-        }
-    }
-
-    /**
-     * 文本转语音
-     * 支持MP3、WAV、PCM格式
-     */
-    @PostMapping("/ttsToOss")
-    public R<String> textToSpeech(@RequestBody TextToSpeechRequest request) {
-        try {
-            if (request.getDeviceId() == null) {
-                return R.fail("设备ID不能为空");
-            }
-
-            String result = audioProcessService.textToSpeech(
-                    request.getDeviceId(),
-                    request.getText(),
-                    request.getFileSuffix()
-            );
-            return R.ok(result);
-        } catch (Exception e) {
-            return R.fail("文本转语音失败: " + e.getMessage());
-        }
-    }
-
-
-    /**
-     * 查询语音文件列表
-     */
-    @GetMapping("/queryAudioFileList")
-    public R<List<AppFileVo>> queryAudioFileList(Long deviceId) {
-        return R.ok(audioProcessService.queryAudioFileList(deviceId));
-    }
-
-    /**
-     * 删除语音文件
-     */
-    @GetMapping("/deleteAudioFile")
-    public R<Void> deleteAudioFile(Long fileId,Long deviceId) {
-        return audioProcessService.deleteAudioFile(fileId,deviceId);
-    }
-
-    /**
-     * 文件重命名
-     */
-    @PostMapping("/renameAudioFile")
-    public R<Void> renameAudioFile(@RequestBody AppFileRenameDto bo) {
-        return audioProcessService.renameAudioFile(bo);
-    }
-}

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

@@ -5,7 +5,6 @@ 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.exception.ServiceException;
 import com.fuyuanshen.common.core.validate.AddGroup;
 import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
 import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
@@ -18,8 +17,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-
 /**
  * BJQ6170设备控制类
  */
@@ -31,7 +28,6 @@ public class AppDeviceBJQController extends BaseController {
 
     private final DeviceBJQBizService appDeviceService;
 
-
     /**
      * 获取设备详细信息
      *
@@ -86,7 +82,6 @@ public class AppDeviceBJQController extends BaseController {
         return R.ok();
     }
 
-
     /**
      * 灯光模式
      * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）

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

@@ -1,120 +0,0 @@
-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;
-
-/**
- * HBY210设备控制类
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/app/hby/device")
-public class AppDeviceHBYController 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/controller/device/AppDeviceXinghanController.java

@@ -5,29 +5,15 @@ import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
 import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
 import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.core.validate.AddGroup;
-import com.fuyuanshen.common.log.annotation.Log;
 import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
-import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
 import com.fuyuanshen.common.web.core.BaseController;
-import com.fuyuanshen.customer.mapper.CustomerMapper;
-import com.fuyuanshen.equipment.domain.DeviceType;
-import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
-import com.fuyuanshen.equipment.domain.form.DeviceForm;
-import com.fuyuanshen.equipment.mapper.DeviceMapper;
-import com.fuyuanshen.equipment.service.DeviceService;
-import com.fuyuanshen.equipment.service.DeviceTypeService;
-import com.fuyuanshen.web.domain.Dto.DeviceXinghanInstructDto;
 import com.fuyuanshen.web.service.device.DeviceBJQBizService;
 import com.fuyuanshen.web.service.device.DeviceXinghanBizService;
-import io.swagger.v3.oas.annotations.Operation;
 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;
-
 /**
  * HBY670设备控制类
  */
@@ -38,39 +24,24 @@ import java.util.Map;
 public class AppDeviceXinghanController extends BaseController {
 
     private final DeviceXinghanBizService appDeviceService;
-    private final DeviceService deviceService;
-
-
     /**
      * 人员信息登记
      */
-    @Log(title = "xinghan指令-人员信息登记")
     @PostMapping(value = "/registerPersonInfo")
 //    @FunctionAccessAnnotation("registerPersonInfo")
     public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
         return toAjax(appDeviceService.registerPersonInfo(bo));
     }
 
-    /**
-     * 发送紧急通知
-     */
-    @Log(title = "xinghan指令-发送紧急通知")
-    @PostMapping(value = "/sendAlarmMessage")
-    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
-    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
-        return toAjax(appDeviceService.sendAlarmMessage(bo));
-    }
-
     /**
      * 上传设备logo图片
      */
-    @Log(title = "xinghan指令-上传设备logo图片")
     @PostMapping("/uploadLogo")
     @FunctionAccessAnnotation("uploadLogo")
     public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
 
         MultipartFile file = bo.getFile();
-        if (file.getSize() > 1024 * 1024 * 2) {
+        if(file.getSize()>1024*1024*2){
             return R.warn("图片不能大于2M");
         }
         appDeviceService.uploadDeviceLogo(bo);
@@ -82,9 +53,8 @@ public class AppDeviceXinghanController extends BaseController {
      * 静电预警档位
      * 3,2,1,0,分别表示高档/中档/低挡/关闭
      */
-    @Log(title = "xinghan指令-静电预警档位")
     @PostMapping("/DetectGradeSettings")
-    public R<Void> DetectGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
+    public R<Void> DetectGradeSettings(@RequestBody DeviceInstructDto params) {
         // params 转 JSONObject
         appDeviceService.upDetectGradeSettings(params);
         return R.ok();
@@ -94,21 +64,19 @@ public class AppDeviceXinghanController extends BaseController {
      * 照明档位
      * 照明档位，2,1,0,分别表示弱光/强光/关闭
      */
-    @Log(title = "xinghan指令-照明档位")
     @PostMapping("/LightGradeSettings")
-    public R<Void> LightGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
+    public R<Void> LightGradeSettings(@RequestBody DeviceInstructDto params) {
         // params 转 JSONObject
         appDeviceService.upLightGradeSettings(params);
         return R.ok();
     }
 
     /**
-     * SOS档位s
+     * SOS档位
      * SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
      */
-    @Log(title = "xinghan指令-SOS档位s")
     @PostMapping("/SOSGradeSettings")
-    public R<Void> SOSGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
+    public R<Void> SOSGradeSettings(@RequestBody DeviceInstructDto params) {
         // params 转 JSONObject
         appDeviceService.upSOSGradeSettings(params);
         return R.ok();
@@ -118,53 +86,11 @@ public class AppDeviceXinghanController extends BaseController {
      * 静止报警状态
      * 静止报警状态，0-未静止报警，1-正在静止报警。
      */
-    @Log(title = "xinghan指令-静止报警状态")
     @PostMapping("/ShakeBitSettings")
-    public R<Void> ShakeBitSettings(@RequestBody DeviceXinghanInstructDto params) {
+    public R<Void> ShakeBitSettings(@RequestBody DeviceInstructDto params) {
         // params 转 JSONObject
         appDeviceService.upShakeBitSettings(params);
         return R.ok();
     }
 
-    @GetMapping(value = "/typeAll")
-    @Operation(summary = "查询所有设备类型")
-    public R<List<DeviceType>> queryDeviceTypes() {
-        List<DeviceType> deviceTypes = appDeviceService.queryDeviceTypes();
-        return R.ok(deviceTypes);
-    }
-
-    // @Log("新增设备")
-    @Log(title = "新增设备")
-    @PostMapping(value = "/add")
-    public R<Void> addDevice(@RequestBody DeviceForm deviceForm) {
-        try {
-            appDeviceService.addDevice(deviceForm);
-        } catch (Exception e) {
-            return R.fail(e.getMessage());
-        }
-        return R.ok();
-    }
-
-    @PostMapping(value = "/GetDeviceByName")
-    @Operation(summary = "通过蓝牙名/设备名称查询设备")
-    public R<Object> GetDeviceByName(@RequestBody DeviceForm deviceForm) {
-        Object device = appDeviceService.GetDeviceByName(deviceForm);
-        return R.ok(device);
-    }
-
-
-    @PostMapping(value = "/getEquipCountByType")
-    @Operation(summary = "查询某个类型下的设备总数量")
-    public R<Object> getEquipCountByType(@RequestBody DeviceForm deviceForm) {
-        Object device = appDeviceService.getEquipCountByType(deviceForm);
-        return R.ok(device);
-    }
-
-    @PostMapping(value = "/getEquipAllByType")
-    @Operation(summary = "查询某个类型下的设备")
-    public R<List<Map<String,Object>>> getEquipAllByType(@RequestBody DeviceForm deviceForm){
-        List<Map<String,Object>> list=appDeviceService.getEquipAllByType(deviceForm);
-        return R.ok(list);
-    }
-
 }

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

@@ -28,7 +28,6 @@ public class TestController extends BaseController {
 
     private final DeviceBJQBizService appDeviceService;
 
-
     /**
      * 上传设备logo图片
      */

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

@@ -1,156 +0,0 @@
-package com.fuyuanshen.app.controller.device.bjq;
-
-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.AppDevice6075DetailVo;
-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.DeviceBJQ6075BizService;
-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;
-
-/**
- * BJQ6075 设备控制类
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/app/bjq6075/device")
-public class AppDeviceBJQ6075Controller extends BaseController {
-
-    private final DeviceBJQ6075BizService appDeviceService6075;
-
-
-    /**
-     * 获取设备详细信息
-     *
-     * @param id 主键
-     */
-    @GetMapping("/{id}")
-    public R<AppDevice6075DetailVo> getInfo(@NotNull(message = "主键不能为空")
-                                            @PathVariable Long id) {
-        return R.ok(appDeviceService6075.getInfo(id));
-    }
-
-
-    /**
-     * 人员信息登记 1
-     */
-    @PostMapping(value = "/registerPersonInfo")
-    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
-        return toAjax(appDeviceService6075.registerPersonInfo(bo));
-    }
-
-
-    /**
-     * 发送信息 2
-     */
-    @PostMapping(value = "/sendMessage")
-    @FunctionAccessBatcAnnotation(value = "sendMessage", timeOut = 30, batchMaxTimeOut = 40)
-    public R<Void> sendMessage(@RequestBody AppDeviceSendMsgBo bo) {
-        return toAjax(appDeviceService6075.sendMessage(bo));
-    }
-
-
-    /**
-     * 发送报警信息 3
-     */
-    @PostMapping(value = "/sendAlarmMessage")
-    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
-    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
-        return toAjax(appDeviceService6075.sendAlarmMessage(bo));
-    }
-
-
-    /**
-     * 上传设备logo图片 4
-     */
-    @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");
-        }
-        appDeviceService6075.uploadDeviceLogo(bo);
-
-        return R.ok();
-    }
-
-
-    /**
-     * 灯光模式 5
-     * （主光模式）
-     * 0（关闭灯光），1（强光），2（超强光）,  3（工作光）, 4（节能光），5（爆闪），6（SOS）
-     */
-    @PostMapping("/lightModeSettings")
-    public R<Void> lightModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.lightModeSettings(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 灯光模式 6
-     * （辅光模式）
-     * 0（关闭灯光），1（泛光），2（泛光爆闪）,  3（警示灯）, 4（警示灯/泛光）
-     */
-    @PostMapping("/auxiliaryLightModeSettings")
-    public R<Void> auxiliaryLightModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.lightModeSettings(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 灯光亮度设置 7
-     */
-    @PostMapping("/lightBrightnessSettings")
-    public R<Void> lightBrightnessSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.lightBrightnessSettings(params);
-        return R.ok();
-    }
-
-    /**
-     * 激光模式设置 8
-     */
-    @PostMapping("/laserModeSettings")
-    public R<Void> laserModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.laserModeSettings(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 声光报警模式设置 9
-     * Sound and light alarm
-     */
-    @PostMapping("/salaModeSettings")
-    public R<Void> salaModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.laserModeSettings(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 获取设备分享详细信息
-     *
-     * @param id 主键
-     */
-    @GetMapping("/getShareInfo/{id}")
-    public R<AppDevice6075DetailVo> getShareInfo(@NotNull(message = "主键不能为空")
-                                                 @PathVariable Long id) {
-        return R.ok(appDeviceService6075.getInfo(id));
-    }
-
-
-}

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

@@ -1,155 +0,0 @@
-package com.fuyuanshen.app.controller.device.bjq;
-
-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.AppDevice6075DetailVo;
-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.DeviceBJQ6075BizService;
-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;
-
-/**
- * BJQ6331便携式工作灯
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/app/BJQ6331/device")
-public class AppDeviceBJQ6331Controller extends BaseController {
-
-    private final DeviceBJQ6075BizService appDeviceService6075;
-
-
-    /**
-     * 获取设备详细信息
-     *
-     * @param id 主键
-     */
-    @GetMapping("/{id}")
-    public R<AppDevice6075DetailVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
-        return R.ok(appDeviceService6075.getInfo(id));
-    }
-
-
-    /**
-     * 人员信息登记 1
-     */
-    @PostMapping(value = "/registerPersonInfo")
-    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
-        return toAjax(appDeviceService6075.registerPersonInfo(bo));
-    }
-
-
-    /**
-     * 发送信息 2
-     */
-    @PostMapping(value = "/sendMessage")
-    @FunctionAccessBatcAnnotation(value = "sendMessage", timeOut = 30, batchMaxTimeOut = 40)
-    public R<Void> sendMessage(@RequestBody AppDeviceSendMsgBo bo) {
-        return toAjax(appDeviceService6075.sendMessage(bo));
-    }
-
-
-    /**
-     * 发送报警信息 3
-     */
-    @PostMapping(value = "/sendAlarmMessage")
-    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
-    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
-        return toAjax(appDeviceService6075.sendAlarmMessage(bo));
-    }
-
-
-    /**
-     * 上传设备logo图片 4
-     */
-    @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");
-        }
-        appDeviceService6075.uploadDeviceLogo(bo);
-
-        return R.ok();
-    }
-
-
-    /**
-     * 灯光模式 5
-     * （主光模式）
-     * 0（关闭灯光），1（强光），2（超强光）,  3（工作光）, 4（节能光），5（爆闪），6（SOS）
-     */
-    @PostMapping("/lightModeSettings")
-    public R<Void> lightModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.lightModeSettings(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 灯光模式 6
-     * （辅光模式）
-     * 0（关闭灯光），1（泛光），2（泛光爆闪）,  3（警示灯）, 4（警示灯/泛光）
-     */
-    @PostMapping("/auxiliaryLightModeSettings")
-    public R<Void> auxiliaryLightModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.lightModeSettings(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 灯光亮度设置 7
-     */
-    @PostMapping("/lightBrightnessSettings")
-    public R<Void> lightBrightnessSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.lightBrightnessSettings(params);
-        return R.ok();
-    }
-
-    /**
-     * 激光模式设置 8
-     */
-    @PostMapping("/laserModeSettings")
-    public R<Void> laserModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.laserModeSettings(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 声光报警模式设置 9
-     * Sound and light alarm
-     */
-    @PostMapping("/salaModeSettings")
-    public R<Void> salaModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.laserModeSettings(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 获取设备分享详细信息
-     *
-     * @param id 主键
-     */
-    @GetMapping("/getShareInfo/{id}")
-    public R<AppDevice6075DetailVo> getShareInfo(@NotNull(message = "主键不能为空")
-                                                 @PathVariable Long id) {
-        return R.ok(appDeviceService6075.getInfo(id));
-    }
-
-
-}

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

@@ -1,191 +0,0 @@
-package com.fuyuanshen.app.controller.device.bjq;
-
-import com.fuyuanshen.app.domain.vo.AppDeviceHBY100JDetailVo;
-import com.fuyuanshen.common.core.domain.R;
-import com.fuyuanshen.common.web.core.BaseController;
-import com.fuyuanshen.web.service.device.DeviceHBY100JBizService;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * HBY100J设备控制类
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/app/hby100j/device")
-public class AppDeviceHBY100JController extends BaseController {
-
-    private final DeviceHBY100JBizService deviceHBY100JBizService;
-
-
-    /**
-     * 获取设备详细信息
-     *
-     * @param id 主键
-     */
-    @GetMapping("/{id}")
-    public R<AppDeviceHBY100JDetailVo> getInfo(@NotNull(message = "主键不能为空")
-                                             @PathVariable Long id) {
-        return R.ok(deviceHBY100JBizService.getInfo(id));
-    }
-
-    /**
-     * 更新语音
-     */
-    @PostMapping("/updateVoice")
-    public R<Void> updateVoice(@RequestBody HBY100JUpdateVoiceDto dto) {
-        deviceHBY100JBizService.updateVoice(dto);
-        return R.ok();
-    }
-
-    /**
-     * 强制报警
-     *
-     */
-
-    @PostMapping("/forceAlarmActivation")
-    public R<Void> forceAlarmActivation(@RequestBody HBY100JForceAlarmActivationDto bo) {
-        deviceHBY100JBizService.forceAlarmActivation(bo);
-        return R.ok();
-    }
-
-    /**
-     * 爆闪模式
-     */
-    @PostMapping("/strobeMode")
-    public R<Void> strobeMode(@RequestBody HBY100JStrobeModeDto params) {
-        deviceHBY100JBizService.strobeMode(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 灯光调节
-     */
-    @PostMapping("/lightAdjustment")
-    public R<Void> lightAdjustment(@RequestBody HBY100JLightAdjustmentDto params) {
-        deviceHBY100JBizService.lightAdjustment(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 爆闪频率
-     */
-    @PostMapping("/strobeFrequency")
-    public R<Void> strobeFrequency(@RequestBody HBY100JStrobeFrequencyDto params) {
-        deviceHBY100JBizService.strobeFrequency(params);
-        return R.ok();
-    }
-
-    /**
-     * 修改音量
-     */
-    @PostMapping("/updateVolume")
-    public R<Void> updateVolume(@RequestBody HBY100JUpdateVolumeDto params) {
-        deviceHBY100JBizService.updateVolume(params);
-        return R.ok();
-    }
-
-    @Data
-    public static class HBY100JUpdateVoiceDto {
-
-        private Long id;
-
-    }
-
-    @Data
-    public static class HBY100JForceAlarmActivationDto {
-
-        /**
-         * 设备ID
-         */
-        List<Long> deviceIds;
-        /**
-         * 0 关闭, 1开启
-         */
-        private Integer voiceStrobeAlarm;
-        /**
-         * 0 公安,1消防,2应急,3交警，4 市政，5 铁路，6 医疗，7部队，8 水利,9 语音
-         */
-        private Integer mode;
-
-    }
-
-    @Data
-    public static class HBY100JUpdateVolumeDto{
-        /**
-         * 设备ID
-         */
-        private Long deviceId;
-        /**
-         * "volume": 1-100(app端可根据需求把40作为低音量, 70作为中音量，100作为高音量)
-         */
-        private Integer volume;
-
-    }
-
-    @Data
-    public static class HBY100JStrobeFrequencyDto{
-        /**
-         * 设备ID
-         */
-        private Long deviceId;
-        /**
-         * "frequency": 1-12
-         */
-        private Integer frequency;
-
-    }
-
-    @Data
-    public static class HBY100JLightAdjustmentDto{
-        /**
-         * 设备ID
-         */
-        private Long deviceId;
-
-        /**
-         * 亮度值0-100
-         */
-        private Integer brightness;
-//        /**
-//         * 红色LED亮度值0-100
-//         */
-//        private Integer red;
-//
-//        /**
-//         * 蓝色LED亮度值0-100
-//         */
-//        private Integer blue;
-//
-//        /**
-//         * 黄色LED亮度值0-100
-//         */
-//        private Integer yellow;
-
-    }
-    @Data
-    public static class HBY100JStrobeModeDto{
-
-        /**
-         * 设备ID
-         */
-        private Long deviceId;
-        /**
-         * 0 关闭 1 开启
-         */
-        private Integer enable;
-
-        /**
-         * 0 红色爆闪，1 蓝色爆闪，2 黄色爆闪，3，红色顺时针旋转爆闪，4黄色顺时针旋转爆闪，5，红蓝顺时针旋转爆闪，6 红蓝交替爆闪
-         */
-        private Integer mode;
-    }
-}

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

@@ -1,156 +0,0 @@
-package com.fuyuanshen.app.controller.device.bjq;
-
-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.AppDevice6075DetailVo;
-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.DeviceBJQ6075BizService;
-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;
-
-/**
- * HBY335（LED救生照明线）
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/app/HBY335/device")
-public class AppDeviceHBY335Controller extends BaseController {
-
-    private final DeviceBJQ6075BizService appDeviceService6075;
-
-
-    /**
-     * 获取设备详细信息
-     *
-     * @param id 主键
-     */
-    @GetMapping("/{id}")
-    public R<AppDevice6075DetailVo> getInfo(@NotNull(message = "主键不能为空")
-                                            @PathVariable Long id) {
-        return R.ok(appDeviceService6075.getInfo(id));
-    }
-
-
-    /**
-     * 人员信息登记 1
-     */
-    @PostMapping(value = "/registerPersonInfo")
-    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
-        return toAjax(appDeviceService6075.registerPersonInfo(bo));
-    }
-
-
-    /**
-     * 发送信息 2
-     */
-    @PostMapping(value = "/sendMessage")
-    @FunctionAccessBatcAnnotation(value = "sendMessage", timeOut = 30, batchMaxTimeOut = 40)
-    public R<Void> sendMessage(@RequestBody AppDeviceSendMsgBo bo) {
-        return toAjax(appDeviceService6075.sendMessage(bo));
-    }
-
-
-    /**
-     * 发送报警信息 3
-     */
-    @PostMapping(value = "/sendAlarmMessage")
-    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
-    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
-        return toAjax(appDeviceService6075.sendAlarmMessage(bo));
-    }
-
-
-    /**
-     * 上传设备logo图片 4
-     */
-    @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");
-        }
-        appDeviceService6075.uploadDeviceLogo(bo);
-
-        return R.ok();
-    }
-
-
-    /**
-     * 灯光模式 5
-     * （主光模式）
-     * 0（关闭灯光），1（强光），2（超强光）,  3（工作光）, 4（节能光），5（爆闪），6（SOS）
-     */
-    @PostMapping("/lightModeSettings")
-    public R<Void> lightModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.lightModeSettings(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 灯光模式 6
-     * （辅光模式）
-     * 0（关闭灯光），1（泛光），2（泛光爆闪）,  3（警示灯）, 4（警示灯/泛光）
-     */
-    @PostMapping("/auxiliaryLightModeSettings")
-    public R<Void> auxiliaryLightModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.lightModeSettings(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 灯光亮度设置 7
-     */
-    @PostMapping("/lightBrightnessSettings")
-    public R<Void> lightBrightnessSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.lightBrightnessSettings(params);
-        return R.ok();
-    }
-
-    /**
-     * 激光模式设置 8
-     */
-    @PostMapping("/laserModeSettings")
-    public R<Void> laserModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.laserModeSettings(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 声光报警模式设置 9
-     * Sound and light alarm
-     */
-    @PostMapping("/salaModeSettings")
-    public R<Void> salaModeSettings(@RequestBody DeviceInstructDto params) {
-        appDeviceService6075.laserModeSettings(params);
-        return R.ok();
-    }
-
-
-    /**
-     * 获取设备分享详细信息
-     *
-     * @param id 主键
-     */
-    @GetMapping("/getShareInfo/{id}")
-    public R<AppDevice6075DetailVo> getShareInfo(@NotNull(message = "主键不能为空")
-                                                 @PathVariable Long id) {
-        return R.ok(appDeviceService6075.getInfo(id));
-    }
-
-
-}

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

@@ -1,17 +0,0 @@
-package com.fuyuanshen.app.domain.dto;
-
-import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
-
-@Data
-public class AppAudioFileDto {
-
-    private Long deviceId;
-
-    /**
-     *  文件
-     */
-    private MultipartFile file;
-
-
-}

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

@@ -3,28 +3,16 @@ package com.fuyuanshen.app.domain.dto;
 import lombok.Data;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-
 @Data
 public class AppDeviceLogoUploadDto {
 
     private Long deviceId;
 
     private String deviceImei;
-
     /**
-     * 文件
+     *  文件
      */
     private MultipartFile file;
 
-//    /**
-//     *  文件
-//     */
-//    private List<MultipartFile> files;
-
-
-    private List<Long> deviceIds;
-
     private Integer chunkSize;
-
 }

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

@@ -18,9 +18,4 @@ public class AppFileDto {
      */
     private MultipartFile[] files;
 
-    /**
-     * 多设备id
-     */
-    private Long[] deviceIds;
-
 }

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

@@ -1,24 +0,0 @@
-package com.fuyuanshen.app.domain.dto;
-
-import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
-
-@Data
-public class AppFileRenameDto {
-
-    /**
-     * 文件id
-     */
-    private Long fileId;
-
-    /**
-     * 设备id
-     */
-    private Long deviceId;
-
-    /**
-     * 文件名称
-     */
-    private String fileName;
-
-}

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

@@ -14,7 +14,7 @@ public class AppRealTimeStatusDto {
     private String deviceImei;
 
     /**
-     * 获取实时状态类型：FunctionAccessBatchStatusRule 批量 ，FunctionAccessStatusRule 单个
+     * 设备类型
      */
     private String typeName;
 

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

@@ -8,15 +8,9 @@ public class DeviceInstructDto {
     private Long deviceId;
 
     private String deviceImei;
-
     /**
-     * 下发指令
+     *  下发指令
      */
     private String instructValue;
 
-    /**
-     * 下发指令类型
-     */
-    private String instructType;
-
 }

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

@@ -1,11 +0,0 @@
-package com.fuyuanshen.app.domain.dto;
-
-import lombok.Data;
-
-/**
- * PCM生成请求实体
- */
-@Data
-public class PcmGenerationRequest {
-    private String text;
-}

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

@@ -1,19 +0,0 @@
-package com.fuyuanshen.app.domain.dto;
-
-import lombok.Data;
-
-/**
- * 文本转语音请求实体
- */
-@Data
-public class TextToSpeechRequest {
-
-    private Long deviceId;
-
-    private String text;
-
-    /**
-     * 文件后缀格式
-     */
-    private String fileSuffix;
-}

fys-admin/src/main/java/com/fuyuanshen/app/http/HttpTtsClient.java

@@ -1,130 +0,0 @@
-package com.fuyuanshen.app.http;
-
-import com.alibaba.nls.client.AccessToken;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.time.Duration;
-import java.util.Base64;
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-
-import static cn.dev33.satoken.SaManager.log;
-
-public class HttpTtsClient {
-    
-    private String accessKeyId;
-    private String accessKeySecret;
-    private String appKey;
-    /**
-     * 阿里云TTS服务基础URL
-     */
-    private static final String BASE_URL = "https://nls-gateway-cn-shanghai.aliyuncs.com/stream/v1/tts";
-
-    public HttpTtsClient(String accessKeyId, String accessKeySecret, String appKey) {
-        this.accessKeyId = accessKeyId;
-        this.accessKeySecret = accessKeySecret;
-        this.appKey = appKey;
-    }
-    private String refreshAccessToken() {
-        try {
-            // 调用阿里云API获取访问令牌
-            AccessToken accessToken = new AccessToken(accessKeyId, accessKeySecret);
-            accessToken.apply();
-            String token = accessToken.getToken();
-            log.info("访问令牌刷新成功");
-
-            return token;
-        } catch (Exception e) {
-            log.error("刷新访问令牌失败: {}", e.getMessage(), e);
-            return null;
-        }
-    }
-    /**
-     * 使用HTTP POST方式调用阿里云TTS服务生成MP3格式语音
-     */
-    public byte[] synthesizeTextToMp3(String text) throws IOException {
-        String endpoint = "https://nls-gateway-cn-shanghai.aliyuncs.com/stream/v1/tts";
-        
-        // 构建请求体
-//        String requestBody = String.format(
-//            "{\"appkey\":\"%s\",\"text\":\"%s\",\"voice\":\"zhifeng\",\"format\":\"MP3\",\"sample_rate\":24000,\"volume\":50,\"speech_rate\":0,\"pitch_rate\":0}",
-//            appKey,
-//            text.replace("\"", "\\\"")
-//        );
-
-        String token = refreshAccessToken();
-        String requestBody = "  {\n" +
-                "    \"appkey\":\""+appKey+"\",\n" +
-                "    \"text\":\""+text+"\",\n" +
-                "    \"token\":\""+token+"\",\n" +
-                "    \"format\":\"mp3\"\n" +
-                "  }";
-        
-        URL url = new URL(endpoint);
-        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-        
-        // 设置请求方法和头部
-        conn.setRequestMethod("POST");
-        conn.setRequestProperty("Content-Type", "application/json");
-        conn.setRequestProperty("Authorization", buildAuthorization());
-        conn.setRequestProperty("Content-Length", String.valueOf(requestBody.getBytes().length));
-        conn.setDoOutput(true);
-        
-        // 发送请求体
-        try (OutputStream os = conn.getOutputStream()) {
-            os.write(requestBody.getBytes("UTF-8"));
-        }
-        
-        // 读取响应
-        int responseCode = conn.getResponseCode();
-        if (responseCode == HttpURLConnection.HTTP_OK) {
-            // 读取音频数据
-            try (InputStream is = conn.getInputStream()) {
-                ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-                int nRead;
-                byte[] data = new byte[1024];
-                while ((nRead = is.read(data, 0, data.length)) != -1) {
-                    buffer.write(data, 0, nRead);
-                }
-                return buffer.toByteArray();
-            }
-        } else {
-            throw new IOException("HTTP请求失败，状态码: " + responseCode);
-        }
-    }
-    
-    /**
-     * 构建授权头部
-     */
-    private String buildAuthorization() {
-        // 实际实现需要根据阿里云API规范构建签名
-        // 这里是简化示例
-        return "Bearer " + generateAccessToken();
-    }
-    
-    /**
-     * 生成访问令牌
-     */
-    private String generateAccessToken() {
-        // 实际实现需要调用阿里云获取token的API
-        return "your-access-token";
-    }
-    
-    /**
-     * 保存MP3到文件
-     */
-    public String saveMp3ToFile(String text, String outputPath) throws IOException {
-        byte[] mp3Data = synthesizeTextToMp3(text);
-        
-        try (FileOutputStream fos = new FileOutputStream(outputPath)) {
-            fos.write(mp3Data);
-        }
-        
-        return outputPath;
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/app/http/HttpTtsExample.java

@@ -1,32 +0,0 @@
-package com.fuyuanshen.app.http;
-
-import java.io.IOException;
-
-public class HttpTtsExample {
-
-    /**
-     *     appKey: lbGuq5K5bEH4uxmT
-     *     akId: LTAI5t66moCkhNC32TDJ5ReP
-     *     akSecret: 2F3sdoBJ08bYvJcuDgSkLnJwGXsvYH
-     * @param args
-     */
-    public static void main(String[] args) {
-        String accessKeyId = "LTAI5t66moCkhNC32TDJ5ReP";
-        String accessKeySecret = "2F3sdoBJ08bYvJcuDgSkLnJwGXsvYH";
-        String appKey = "lbGuq5K5bEH4uxmT";
-        
-        try {
-            // 使用HTTP方式调用
-            HttpTtsClient httpClient = new HttpTtsClient(accessKeyId, accessKeySecret, appKey);
-            
-            String text = "大江东去，浪淘尽，千古风流人物。故垒西边，人道是，三国周郎赤壁。乱石穿空，惊涛拍岸，卷起千堆雪。";
-            String outputPath = "D:\\http_output9.mp3";
-            
-            String resultFile = httpClient.saveMp3ToFile(text, outputPath);
-            System.out.println("MP3音频已保存至: " + resultFile);
-            
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/app/http/OkHttpTtsClient.java

@@ -1,58 +0,0 @@
-package com.fuyuanshen.app.http;
-
-import okhttp3.*;
-
-import java.io.IOException;
-
-public class OkHttpTtsClient {
-    
-    private OkHttpClient client = new OkHttpClient();
-    private String accessKeyId;
-    private String accessKeySecret;
-    private String appKey;
-    
-    public OkHttpTtsClient(String accessKeyId, String accessKeySecret, String appKey) {
-        this.accessKeyId = accessKeyId;
-        this.accessKeySecret = accessKeySecret;
-        this.appKey = appKey;
-    }
-    
-    /**
-     * 使用OkHttp调用TTS服务
-     */
-    public byte[] synthesizeTextToMp3(String text) throws IOException {
-        MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-        
-        String jsonPayload = String.format(
-            "{\"appkey\":\"%s\",\"text\":\"%s\",\"voice\":\"zhifeng\",\"format\":\"MP3\",\"sample_rate\":24000,\"volume\":50,\"speech_rate\":0,\"pitch_rate\":0}",
-            appKey,
-            text.replace("\"", "\\\"")
-        );
-        
-        RequestBody body = RequestBody.create(JSON,jsonPayload);
-        Request request = new Request.Builder()
-            .url("https://nls-gateway.cn-shanghai.aliyuncs.com/v1/tts")
-            .post(body)
-            .addHeader("Content-Type", "application/json")
-            .addHeader("Authorization", "Bearer " + getAccessToken())
-            .build();
-        
-        try (Response response = client.newCall(request).execute()) {
-            if (!response.isSuccessful()) {
-                throw new IOException("HTTP请求失败: " + response.code());
-            }
-            
-            ResponseBody responseBody = response.body();
-            if (responseBody != null) {
-                return responseBody.bytes();
-            } else {
-                throw new IOException("响应体为空");
-            }
-        }
-    }
-    
-    private String getAccessToken() {
-        // 实现获取访问令牌的逻辑
-        return "your-access-token";
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/app/http/TokenClient.java

@@ -1,48 +0,0 @@
-package com.fuyuanshen.app.http;
-
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-/**
- * 获取阿里云TTS服务访问令牌
- */
-public class TokenClient {
-    
-    public static String getAccessToken(String accessKeyId, String accessKeySecret) throws IOException {
-        String endpoint = "https://nls-meta.cn-shanghai.aliyuncs.com/v1/token";
-        
-        URL url = new URL(endpoint);
-        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-        
-        conn.setRequestMethod("POST");
-        conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-        conn.setDoOutput(true);
-        
-        // 发送认证信息
-        String params = String.format("grant_type=client_credentials&client_id=%s&client_secret=%s", 
-                                     accessKeyId, accessKeySecret);
-        
-        try (OutputStream os = conn.getOutputStream()) {
-            os.write(params.getBytes("UTF-8"));
-        }
-        
-        int responseCode = conn.getResponseCode();
-        if (responseCode == HttpURLConnection.HTTP_OK) {
-            try (InputStream is = conn.getInputStream();
-                 BufferedReader reader = new BufferedReader(new InputStreamReader(is))) {
-                
-                StringBuilder response = new StringBuilder();
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    response.append(line);
-                }
-                
-                // 解析响应获取token（实际需要使用JSON解析库）
-                return response.toString().replaceAll(".*\"access_token\":\"([^\"]+)\".*", "$1");
-            }
-        } else {
-            throw new IOException("获取令牌失败，状态码: " + responseCode);
-        }
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/app/model/AppRegisterBody.java

@@ -1,30 +0,0 @@
-package com.fuyuanshen.app.model;
-
-import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-
-@Data
-public class AppRegisterBody {
-    /**
-     * 手机号
-     */
-    @NotBlank(message = "{user.phonenumber.not.blank}")
-    private String phonenumber;
-
-    /**
-     * 短信code
-     */
-    private String smsCode;
-
-    /**
-     * 租户ID
-     */
-    @NotBlank(message = "租户ID不能为空")
-    private String tenantId;
-
-
-    /**
-     * 登录密码
-     */
-    private String password;
-}

fys-admin/src/main/java/com/fuyuanshen/app/model/AppSmsLoginBody.java

@@ -14,6 +14,7 @@ public class AppSmsLoginBody {
     /**
      * 短信code
      */
+    @NotBlank(message = "{sms.code.not.blank}")
     private String smsCode;
 
     /**
@@ -22,14 +23,4 @@ public class AppSmsLoginBody {
     @NotBlank(message = "租户ID不能为空")
     private String tenantId;
 
-    /**
-     * 登录方式 1:手机验证码登录 2:密码登录
-     */
-    @NotBlank(message = "登录方式不能为空")
-    private String loginType;
-
-    /**
-     * 登录密码
-     */
-    private String loginPassword;
 }

fys-admin/src/main/java/com/fuyuanshen/app/model/AppUpdatePasswordBody.java

@@ -1,12 +0,0 @@
-package com.fuyuanshen.app.model;
-
-import lombok.Data;
-
-@Data
-public class AppUpdatePasswordBody {
-
-    /**
-     * 登录密码
-     */
-    private String password;
-}

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

@@ -1,264 +0,0 @@
-package com.fuyuanshen.app.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 AppDeviceShareService {
-
-    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(AppDeviceShareService::buildDeviceStatus);
-        return TableDataInfo.build(result);
-    }
-
-    public TableDataInfo<AppDeviceShareVo> queryWebPageList(AppDeviceShareBo bo, PageQuery pageQuery) {
-//        Long userId = AppLoginHelper.getUserId();
-//        bo.setCreateBy(userId);
-        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
-        Page<AppDeviceShareVo> result = appDeviceShareMapper.selectWebDeviceShareList(bo, page);
-        List<AppDeviceShareVo> records = result.getRecords();
-        records.forEach(AppDeviceShareService::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("1".equals(onlineStatus)){
-            item.setOnlineStatus(1);
-        }else if("2".equals(onlineStatus)){
-            item.setOnlineStatus(2);
-        }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("create_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(AppDeviceShareService::buildDeviceStatus);
-        return TableDataInfo.build(result);
-    }
-
-
-    /**
-     * 查询设备分享列表(web)
-     *
-     * @param bo
-     * @param pageQuery
-     * @return
-     */
-    public TableDataInfo<AppDeviceShareVo> queryWebList(AppDeviceShareBo bo, PageQuery pageQuery) {
-        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
-        Page<AppDeviceShareVo> result = appDeviceShareMapper.selectWebDeviceShareList(bo, page);
-        List<AppDeviceShareVo> records = result.getRecords();
-        records.forEach(AppDeviceShareService::buildDeviceStatus);
-        return TableDataInfo.build(result);
-    }
-
-}

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

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

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

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

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

@@ -1,156 +0,0 @@
-package com.fuyuanshen.app.service;
-
-import cn.hutool.crypto.digest.BCrypt;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.fuyuanshen.app.domain.AppUser;
-import com.fuyuanshen.app.mapper.AppUserMapper;
-import com.fuyuanshen.app.model.AppRegisterBody;
-import com.fuyuanshen.app.model.AppUpdatePasswordBody;
-import com.fuyuanshen.common.core.constant.Constants;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.core.domain.model.RegisterBody;
-import com.fuyuanshen.common.core.enums.UserType;
-import com.fuyuanshen.common.core.exception.user.CaptchaException;
-import com.fuyuanshen.common.core.exception.user.CaptchaExpireException;
-import com.fuyuanshen.common.core.exception.user.UserException;
-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.StringUtils;
-import com.fuyuanshen.common.log.event.LogininforEvent;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
-import com.fuyuanshen.common.tenant.helper.TenantHelper;
-import com.fuyuanshen.common.web.config.properties.CaptchaProperties;
-import com.fuyuanshen.system.domain.SysUser;
-import com.fuyuanshen.system.domain.bo.SysUserBo;
-import com.fuyuanshen.system.mapper.SysUserMapper;
-import com.fuyuanshen.system.service.ISysUserService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
-/**
- * 注册校验方法
- *
- * @author Lion Li
- */
-@RequiredArgsConstructor
-@Service
-public class AppRegisterService {
-
-    private final IAppUserService userService;
-    private final AppUserMapper userMapper;
-
-    /**
-     * 注册
-     */
-    public void register(AppRegisterBody registerBody) {
-        String tenantId = registerBody.getTenantId();
-        String username = registerBody.getPhonenumber();
-        String password = registerBody.getPassword();
-
-        boolean codeValidate = validateRegisterSmsCode(tenantId, username, registerBody.getSmsCode());
-        if (!codeValidate) {
-            throw new CaptchaException();
-        }
-
-        // 校验用户类型是否存在
-        String userType = UserType.APP_USER.getUserType();
-
-        boolean exist = TenantHelper.dynamic(tenantId, () -> {
-            return userMapper.exists(new LambdaQueryWrapper<AppUser>()
-                .eq(AppUser::getUserName, username));
-        });
-        if (exist) {
-            throw new UserException("user.register.save.error", username);
-        }
-        AppUser appUser = new AppUser();
-        appUser.setPhonenumber(username);
-        appUser.setUserName(username);
-        appUser.setStatus("0");
-        appUser.setLoginDate(new Date());
-        appUser.setLoginIp(ServletUtils.getClientIP());
-        appUser.setTenantId(tenantId);
-        appUser.setPassword(password);
-        appUser.setUserType(userType);
-        userMapper.insert(appUser);
-        recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
-    }
-
-    /**
-     * 注册校验短信验证码
-     */
-    private boolean validateRegisterSmsCode(String tenantId, String phonenumber, String smsCode) {
-        String code = RedisUtils.getCacheObject(GlobalConstants.REGISTER_CODE_KEY + phonenumber);
-        if (StringUtils.isBlank(code)) {
-            recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
-            throw new CaptchaExpireException();
-        }
-        return code.equals(smsCode);
-    }
-
-    /**
-     * 忘记密码校验验证码
-     */
-    private boolean validateForgetPasswordCode(String tenantId, String phonenumber, String smsCode) {
-        String code = RedisUtils.getCacheObject(GlobalConstants.FORGET_PASSWORD_CODE_KEY + phonenumber);
-        if (StringUtils.isBlank(code)) {
-            recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
-            throw new CaptchaExpireException();
-        }
-        return code.equals(smsCode);
-    }
-
-    /**
-     * 记录登录信息
-     *
-     * @param tenantId 租户ID
-     * @param username 用户名
-     * @param status   状态
-     * @param message  消息内容
-     * @return
-     */
-    private void recordLogininfor(String tenantId, String username, String status, String message) {
-        LogininforEvent logininforEvent = new LogininforEvent();
-        logininforEvent.setTenantId(tenantId);
-        logininforEvent.setUsername(username);
-        logininforEvent.setStatus(status);
-        logininforEvent.setMessage(message);
-        logininforEvent.setRequest(ServletUtils.getRequest());
-        SpringUtils.context().publishEvent(logininforEvent);
-    }
-
-    public void forgetPassword(AppRegisterBody registerBody) {
-        String tenantId = registerBody.getTenantId();
-        String username = registerBody.getPhonenumber();
-        String password = registerBody.getPassword();
-        boolean codeValidate = validateForgetPasswordCode(tenantId, username, registerBody.getSmsCode());
-        if (!codeValidate) {
-            throw new CaptchaException();
-        }
-        boolean exist = TenantHelper.dynamic(tenantId, () -> {
-            return userMapper.exists(new LambdaQueryWrapper<AppUser>()
-                    .eq(AppUser::getUserName, username));
-        });
-        if (!exist) {
-            throw new UserException("用户不存在");
-        }
-
-        UpdateWrapper<AppUser> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("user_name", username)
-                .set("password", password);
-        userMapper.update(updateWrapper);
-    }
-
-    public void updatePassword(AppUpdatePasswordBody body) {
-        String username = AppLoginHelper.getUsername();
-        String password = body.getPassword();
-        UpdateWrapper<AppUser> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("user_name", username)
-                .set("password", password);
-        userMapper.update(updateWrapper);
-    }
-}

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

@@ -1,540 +0,0 @@
-package com.fuyuanshen.app.service;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.fuyuanshen.app.domain.AppBusinessFile;
-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
-import com.fuyuanshen.app.domain.dto.AppAudioFileDto;
-import com.fuyuanshen.app.domain.dto.AppFileRenameDto;
-import com.fuyuanshen.app.domain.vo.AppFileVo;
-import com.fuyuanshen.app.http.HttpTtsClient;
-import com.fuyuanshen.app.mapper.AppBusinessFileMapper;
-import com.fuyuanshen.common.core.domain.R;
-import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
-import com.fuyuanshen.equipment.utils.AlibabaTTSUtil;
-import com.fuyuanshen.equipment.utils.AudioProcessUtil;
-import com.fuyuanshen.equipment.utils.FileHashUtil;
-import com.fuyuanshen.equipment.utils.Mp3Duration;
-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 org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-import java.util.UUID;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-/**
- * 音频处理服务
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class AudioProcessService {
-
-    // 配置参数
-    private static final int MAX_AUDIO_SIZE = 5 * 1024 * 1024; // 5MB
-    private static final List<String> SUPPORTED_FORMATS = Arrays.asList(
-            ".wav", ".mp3", ".aac", ".flac", ".m4a", ".ogg"
-    );
-
-    private final AudioProcessUtil audioProcessUtil;
-    private final AlibabaTTSUtil alibabaTTSUtil;
-
-    private final FileHashUtil fileHashUtil;
-    private final ISysOssService ossService;
-    private final IAppBusinessFileService appBusinessFileService;
-    private final AppBusinessFileMapper appBusinessFileMapper;
-
-    /**
-     * 处理上传的音频文件
-     */
-    public List<String> processAudio(MultipartFile file) {
-        // 1. 参数校验
-        validateAudioFile(file);
-
-        File tempFile = null;
-        try {
-            // 2. 创建临时文件
-            tempFile = createTempAudioFile(file);
-
-            // 3. 转码为标准PCM-WAV格式
-            byte[] pcmData = audioProcessUtil.convertToStandardWav(tempFile);
-            log.info("音频处理成功，输出数据大小: {} bytes", pcmData.length);
-
-            // 获取音频信息
-//            String audioInfo = audioProcessUtil.getAudioInfo(pcmData);
-//            log.info("音频处理成功，音频信息: {}", audioInfo);
-//
-//            // 保存测试文件（用于验证）
-//            String savedPath = audioProcessUtil.saveWavToFile(pcmData, "test_output.wav");
-//            if (savedPath != null) {
-//                log.info("测试文件已保存: {}", savedPath);
-//            }
-
-            // 将byte[]转换为16进制字符串列表
-            List<String> hexList = audioProcessUtil.bytesToHexList(pcmData);
-
-            log.info("音频处理完成，原始数据大小: {} bytes, 16进制数据长度: {}",
-                    pcmData.length, hexList.size());
-
-            return hexList;
-
-        } catch (Exception e) {
-            log.error("音频处理失败", e);
-            throw new RuntimeException("音频处理失败", e);
-        } finally {
-            // 4. 清理临时文件
-            deleteTempFile(tempFile);
-        }
-    }
-
-    /**
-     * 生成标准PCM数据（单声道，16K采样率，16bit深度，包含44字节WAV头）
-     * 数据总大小不超过2MB，如果超过将抛出异常
-     * @param text 要转换的文本内容
-     * @return 标准PCM数据字节数组（WAV格式）
-     * @throws IOException 处理失败时抛出
-     * @throws IllegalArgumentException 如果生成的数据超过2MB
-     */
-    public List<String> generateStandardPcmData(String text) throws IOException {
-        // 参数校验
-        if (text == null || text.trim().isEmpty()) {
-            throw new IllegalArgumentException("文本内容不能为空");
-        }
-        if (text.length() > 100) {
-            throw new IllegalArgumentException("文本长度超过限制（最大100字符）");
-        }
-        log.info("输入文本长度: {}", text.length());
-        try {
-            byte[] rawPcmData = alibabaTTSUtil.generateStandardPcmData(text);
-
-            // 使用AudioProcessUtil转换成带头44字节 PCM
-            byte[] pcmData = audioProcessUtil.rawPcmToStandardWav(rawPcmData);
-
-//            String savedPath = audioProcessUtil.saveWavToFile(pcmData, "test_output.wav");
-//            if (savedPath != null) {
-//                log.info("测试文件已保存: {}", savedPath);
-//            }
-
-            // 保存WAV文件到本地
-            String savedPath = saveByteArrayToFile(pcmData, "tts_output.wav");
-            if (savedPath != null) {
-                log.info("WAV文件已保存: {}", savedPath);
-            }
-
-            // 将byte[]转换为16进制字符串列表
-            List<String> hexList = audioProcessUtil.bytesToHexList(pcmData);
-
-            log.info("generateStandardPcmData音频处理完成，原始数据大小: {} bytes, 16进制数据长度: {}",
-                    pcmData.length, hexList.size());
-
-            return hexList;
-        } finally {
-            // 4. 清理临时文件
-        }
-    }
-
-    public String saveWavFileLocally(String text, String filename) throws IOException {
-        // 参数校验
-        if (text == null || text.trim().isEmpty()) {
-            throw new IllegalArgumentException("文本内容不能为空");
-        }
-
-        if (filename == null || filename.trim().isEmpty()) {
-            filename = "tts_output.wav"; // 默认文件名
-        }
-
-        try {
-            // 生成PCM数据
-            byte[] rawPcmData = alibabaTTSUtil.generateStandardPcmData(text);
-
-            // 转换为标准WAV格式（添加44字节头部）
-            byte[] wavData = audioProcessUtil.rawPcmToStandardWav(rawPcmData);
-
-            // 保存到本地文件
-            String filePath = saveByteArrayToFile(wavData, filename);
-
-            log.info("WAV文件已保存: {}", filePath);
-            return filePath;
-        } catch (Exception e) {
-            log.error("保存WAV文件失败: {}", e.getMessage(), e);
-            throw new IOException("保存WAV文件失败", e);
-        }
-    }
-
-    private String saveByteArrayToFile(byte[] data, String filename) throws IOException {
-        // 确定保存路径（可以是临时目录或指定目录）
-        String directory = System.getProperty("java.io.tmpdir"); // 使用系统临时目录
-        File dir = new File(directory);
-        if (!dir.exists()) {
-            dir.mkdirs();
-        }
-
-        // 创建完整文件路径
-        File file = new File(dir, filename);
-
-        // 写入文件
-        try (FileOutputStream fos = new FileOutputStream(file)) {
-            fos.write(data);
-        }
-
-        return file.getAbsolutePath();
-    }
-
-    private String saveByteArrayToFile(InputStream inputStream, String filename) throws IOException {
-        // 确定保存路径（可以是临时目录或指定目录）
-        String directory = System.getProperty("java.io.tmpdir"); // 使用系统临时目录
-        File dir = new File(directory);
-        if (!dir.exists()) {
-            dir.mkdirs();
-        }
-
-        // 创建完整文件路径
-        File file = new File(dir, filename);
-
-        // 从输入流读取数据并写入文件
-        try (FileOutputStream fos = new FileOutputStream(file);
-             InputStream is = inputStream) {
-            byte[] buffer = new byte[8192]; // 8KB缓冲区
-            int bytesRead;
-            while ((bytesRead = is.read(buffer)) != -1) {
-                fos.write(buffer, 0, bytesRead);
-            }
-        }
-        return file.getAbsolutePath();
-    }
-
-
-    /**
-     * 验证音频文件
-     */
-    private void validateAudioFile(MultipartFile file) {
-        if (file == null || file.isEmpty()) {
-            throw new IllegalArgumentException("上传文件不能为空");
-        }
-
-        if (!isAudioFile(file.getOriginalFilename())) {
-            throw new IllegalArgumentException("只允许上传音频文件");
-        }
-
-        if (file.getSize() > MAX_AUDIO_SIZE) {
-            throw new IllegalArgumentException("音频大小不能超过5MB");
-        }
-    }
-
-    /**
-     * 判断是否是支持的音频格式
-     */
-    private boolean isAudioFile(String filename) {
-        if (filename == null || filename.lastIndexOf('.') == -1) {
-            return false;
-        }
-        String ext = filename.substring(filename.lastIndexOf('.')).toLowerCase();
-        return SUPPORTED_FORMATS.contains(ext);
-    }
-
-    /**
-     * 创建临时音频文件
-     */
-    private File createTempAudioFile(MultipartFile file) throws IOException {
-        String originalFilename = file.getOriginalFilename();
-        String extension = "";
-        if (originalFilename != null && originalFilename.contains(".")) {
-            extension = originalFilename.substring(originalFilename.lastIndexOf("."));
-        }
-
-        File tempFile = File.createTempFile("audio-", extension);
-        file.transferTo(tempFile);
-        log.debug("创建临时音频文件: {}", tempFile.getAbsolutePath());
-        return tempFile;
-    }
-
-    /**
-     * 删除临时文件
-     */
-    private void deleteTempFile(File file) {
-        if (file != null && file.exists()) {
-            if (file.delete()) {
-                log.debug("删除临时文件成功: {}", file.getAbsolutePath());
-            } else {
-                log.warn("无法删除临时文件: {}", file.getAbsolutePath());
-            }
-        }
-    }
-
-    /**
-     * 提取文本
-     */
-    public String extract(MultipartFile file) throws Exception {
-        String name = file.getOriginalFilename();
-        if (name == null ||
-                (!name.endsWith(".txt") && !name.endsWith(".docx"))) {
-            throw new IllegalArgumentException("仅支持 .txt 或 .docx");
-        }
-        if (file.getSize() > MAX_AUDIO_SIZE) {
-            throw new IllegalArgumentException("文件超过5MB");
-        }
-
-        String text;
-        /* 全程流式，不落地磁盘，不一次性读字节数组 */
-        try (InputStream in = file.getInputStream()) {
-            if (name.endsWith(".txt")) {
-                text = readTxt(in);
-            } else {
-                text = readDocx(in);
-            }
-        }
-        return text;
-    }
-
-    /* ---------- txt：按行读，StringBuilder 复用 ---------- */
-    private String readTxt(InputStream in) throws IOException {
-        BufferedReader br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
-        StringBuilder sb = new StringBuilder(4096);
-        String line;
-        while ((line = br.readLine()) != null) {
-            sb.append(line).append('\n');
-        }
-        return sb.toString();
-    }
-
-    /* ---------- docx：ZipInputStream 只扫 document.xml ---------- */
-    private String readDocx(InputStream in) throws IOException {
-        ZipInputStream zin = new ZipInputStream(in);
-        ZipEntry e;
-        while ((e = zin.getNextEntry()) != null) {
-            if ("word/document.xml".equals(e.getName())) {
-                return staxExtract(zin);   // 流式读 XML
-            }
-        }
-        return "";
-    }
-
-    /* ---------- StAX 流式提取 <w:t> ---------- */
-    private String staxExtract(InputStream xml) throws IOException {
-        XMLStreamReader r = null;
-        StringBuilder sb = new StringBuilder(4096);
-        try {
-            //System.out.println(new String(xml.readAllBytes()));
-            r = XMLInputFactory.newInstance().createXMLStreamReader(xml);
-            while (r.hasNext()) {
-                if (r.next() == XMLStreamConstants.START_ELEMENT &&
-                        "t".equals(r.getLocalName())) {
-                    String elementText = r.getElementText();
-                    sb.append(elementText);
-                }
-            }
-        } catch (XMLStreamException ex) {
-            throw new IOException(ex);
-        } finally {
-            if (r != null) try { r.close(); } catch (XMLStreamException ignore) {}
-        }
-        return sb.toString();
-    }
-
-
-    public String uploadAudioToOss(AppAudioFileDto bo) {
-        MultipartFile file = bo.getFile();
-        // 校验文件格式和大小
-        validateAudioFileForRestful(file);
-        // 上传文件
-        // SysOssVo upload = sysOssService.upload(file);
-        String filename = file.getOriginalFilename();
-        String savedPath = null;
-        try {
-            String fileHash = fileHashUtil.hash(file);
-            SysOssVo upload = ossService.updateHash(file, fileHash);
-            // 强制将HTTP替换为HTTPS
-            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
-                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
-            }
-            String fileSuffix = filename.substring(filename.lastIndexOf('.')).toLowerCase();
-            AppBusinessFileBo appBusinessFileBo = new AppBusinessFileBo();
-            appBusinessFileBo.setFileId(upload.getOssId());
-            appBusinessFileBo.setBusinessId(bo.getDeviceId());
-            appBusinessFileBo.setFileType(3L);
-            appBusinessFileBo.setCreateBy(AppLoginHelper.getUserId());
-            savedPath = saveByteArrayToFile(file.getInputStream(), generateRandomFileName(fileSuffix));
-            if (savedPath != null) {
-                log.info("MP3文件已保存: {}", savedPath);
-                Integer mp3Duration = Mp3Duration.getMp3Duration(savedPath);
-                log.info("MP3文件时长: {} 秒", mp3Duration);
-                appBusinessFileBo.setDuration(mp3Duration);
-            }
-            appBusinessFileService.insertByBo(appBusinessFileBo);
-            if (upload != null) {
-                return upload.getUrl();
-            }
-        } catch (Exception e){
-            log.error("上传音频文件失败", e);
-        }finally {
-            log.info("删除临时文件: {}", savedPath);
-            if(savedPath != null){
-                deleteTempFile(new File(savedPath));
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * 校验音频文件格式
-     */
-    private void validateAudioFileForRestful(MultipartFile file) {
-        if (file == null || file.isEmpty()) {
-            throw new IllegalArgumentException("上传文件不能为空");
-        }
-
-        String originalFilename = file.getOriginalFilename();
-        if (originalFilename == null) {
-            throw new IllegalArgumentException("文件名不能为空");
-        }
-        List<String> SUPPORTED_FORMATS = Arrays.asList(
-                ".wav", ".mp3", ".pcm"
-        );
-
-        String ext = originalFilename.substring(originalFilename.lastIndexOf('.')).toLowerCase();
-        // 检查文件扩展名
-        if (!SUPPORTED_FORMATS.contains(ext)) {
-            throw new IllegalArgumentException("只允许上传MP3、WAV、PCM格式的音频文件");
-        }
-
-        // 检查文件大小
-        if (file.getSize() > MAX_AUDIO_SIZE) {
-            throw new IllegalArgumentException("音频大小不能超过5MB");
-        }
-    }
-
-    /**
-     * 判断文件是否为支持的音频格式
-     */
-    private boolean isSupportedFormat(String filename) {
-        if (filename == null || filename.lastIndexOf('.') == -1) {
-            return false;
-        }
-        String ext = filename.substring(filename.lastIndexOf('.')).toLowerCase();
-        return SUPPORTED_FORMATS.contains(ext);
-    }
-
-    public String textToSpeech(Long deviceId,String text, String fileSuffix) {
-        //支持PCM/WAV/MP3格式
-        if (fileSuffix == null || fileSuffix.isEmpty()) {
-            fileSuffix = "mp3";
-        }
-        fileSuffix = fileSuffix.toLowerCase();
-        List<String> SUPPORTED_FORMATS = Arrays.asList(
-                "wav", "mp3", "pcm"
-        );
-        boolean contains = SUPPORTED_FORMATS.contains(fileSuffix);
-        if (!contains) {
-            throw new IllegalArgumentException("不支持的音频格式");
-        }
-        String accessKeyId = "LTAI5t66moCkhNC32TDJ5ReP";
-        String accessKeySecret = "2F3sdoBJ08bYvJcuDgSkLnJwGXsvYH";
-        String appKey = "lbGuq5K5bEH4uxmT";
-        String savedPath = null;
-        try {
-            // 使用HTTP方式调用
-            HttpTtsClient httpClient = new HttpTtsClient(accessKeyId, accessKeySecret, appKey);
-//
-            byte[] mp3Data = httpClient.synthesizeTextToMp3(text);
-//            byte[] mp3Data = alibabaTTSUtil.synthesizeTextToMp3(text);
-
-            SysOssVo upload = ossService.upload(mp3Data, generateRandomFileName(fileSuffix));
-
-            // 强制将HTTP替换为HTTPS
-            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
-                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
-            }
-
-
-            AppBusinessFileBo appBusinessFileBo = new AppBusinessFileBo();
-            appBusinessFileBo.setFileId(upload.getOssId());
-            appBusinessFileBo.setBusinessId(deviceId);
-            appBusinessFileBo.setFileType(3L);
-            appBusinessFileBo.setCreateBy(AppLoginHelper.getUserId());
-            savedPath = saveByteArrayToFile(mp3Data, generateRandomFileName(fileSuffix));
-            if (savedPath != null) {
-                log.info("MP3文件已保存: {}", savedPath);
-                Integer mp3Duration = Mp3Duration.getMp3Duration(savedPath);
-                log.info("MP3文件时长: {} 秒", mp3Duration);
-                appBusinessFileBo.setDuration(mp3Duration);
-            }
-            appBusinessFileService.insertByBo(appBusinessFileBo);
-            if (upload != null) {
-                return upload.getUrl();
-            }
-        } catch (Exception e){
-            log.error("上传音频文件失败", e);
-        } finally {
-            log.info("删除临时文件: {}", savedPath);
-            if(savedPath != null){
-                deleteTempFile(new File(savedPath));
-            }
-        }
-        return null;
-    }
-
-    private static final Random random = new Random();
-    private static final DateTimeFormatter formatter =
-            DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
-    /**
-     * 生成纯随机文件名（无原文件名依赖）
-     */
-    public static String generateRandomFileName(String extension) {
-        String timestamp = LocalDateTime.now().format(formatter);
-        int randomNum = random.nextInt(10000);
-        String uuidPart = UUID.randomUUID().toString().substring(0, 8);
-
-        if (!extension.startsWith(".")) {
-            extension = "." + extension;
-        }
-
-        return timestamp + "_" + String.format("%04d", randomNum) + "_" + uuidPart + extension;
-    }
-
-    public List<AppFileVo> queryAudioFileList(Long deviceId) {
-        if(deviceId == null){
-            return null;
-        }
-        AppBusinessFileBo bo = new AppBusinessFileBo();
-        bo.setBusinessId(deviceId);
-        bo.setFileType(3L);
-        List<AppFileVo> appFileVos = appBusinessFileService.queryAppFileList(bo);
-        return appFileVos;
-    }
-
-    public R<Void> deleteAudioFile(Long fileId,Long deviceId) {
-        UpdateWrapper<AppBusinessFile> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("file_id",fileId);
-        updateWrapper.eq("business_id",deviceId);
-        appBusinessFileMapper.delete(updateWrapper);
-        return R.ok();
-    }
-
-    public R<Void> renameAudioFile(AppFileRenameDto bo) {
-        UpdateWrapper<AppBusinessFile> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("file_id",bo.getFileId());
-        updateWrapper.eq("business_id",bo.getDeviceId());
-        updateWrapper.set("re_name",bo.getFileName());
-        appBusinessFileMapper.update(updateWrapper);
-        return R.ok();
-    }
-}

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

@@ -1,85 +0,0 @@
-package com.fuyuanshen.app.service;
-
-import com.fuyuanshen.web.util.VideoProcessUtil;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 视频处理服务
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class VideoProcessService {
-
-    // 配置参数
-    private static final int MAX_VIDEO_SIZE = 10 * 1024 * 1024;
-    private static final List<String> SUPPORTED_FORMATS = Arrays.asList(".mp4", ".avi", ".mov", ".mkv");
-    private static final int FRAME_RATE = 15;
-    private static final int DURATION = 2;
-    private static final int WIDTH = 160;
-    private static final int HEIGHT = 80;
-
-    private final VideoProcessUtil videoProcessUtil;
-
-    public List<String> processVideo(MultipartFile file, int code) {
-        // 1. 参数校验
-        validateVideoFile(file);
-
-        File tempFile = null;
-        try {
-            // 2. 创建临时文件
-            tempFile = videoProcessUtil.createTempVideoFile(file);
-
-            // 3. 处理视频并提取帧数据
-            List<String> hexList = videoProcessUtil.processVideoToHex(
-                    tempFile, FRAME_RATE, DURATION, WIDTH, HEIGHT, code
-            );
-            log.info("code: {} hexList(前100个): {}", code,
-                    hexList.subList(0, Math.min(100, hexList.size())));
-            log.info("视频处理成功，生成Hex数据长度: {}", hexList.size());
-            return hexList;
-
-        } catch (Exception e) {
-            log.error("视频处理失败", e);
-            throw new RuntimeException("视频处理失败", e);
-        } finally {
-            // 4. 清理临时文件
-            videoProcessUtil.deleteTempFile(tempFile);
-        }
-    }
-
-    /**
-     * 验证视频文件
-     */
-    private void validateVideoFile(MultipartFile file) {
-        if (file == null || file.isEmpty()) {
-            throw new IllegalArgumentException("上传文件不能为空");
-        }
-
-        if (!isVideoFile(file.getOriginalFilename())) {
-            throw new IllegalArgumentException("只允许上传视频文件");
-        }
-
-        if (file.getSize() > MAX_VIDEO_SIZE) {
-            throw new IllegalArgumentException("视频大小不能超过10MB");
-        }
-    }
-
-    /**
-     * 判断是否是支持的视频格式
-     */
-    private boolean isVideoFile(String filename) {
-        if (filename == null || filename.lastIndexOf('.') == -1) {
-            return false;
-        }
-        String ext = filename.substring(filename.lastIndexOf('.')).toLowerCase();
-        return SUPPORTED_FORMATS.contains(ext);
-    }
-}

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

@@ -1,48 +0,0 @@
-package com.fuyuanshen.global.mqtt.base;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * MQTT消息基础模型
- */
-@Data
-public class MqttMessage {
-
-    /**
-     * 请求ID，用于匹配请求和响应
-     */
-    private String requestId;
-
-    /**
-     * 设备IMEI
-     */
-    private String imei;
-
-    /**
-     * 时间戳（毫秒）
-     */
-    private Long timestamp;
-
-    /**
-     * 功能类型
-     */
-    private Integer funcType;
-
-    /**
-     * 数据内容
-     */
-    private Object data;
-
-    /**
-     * 状态（响应时使用）
-     */
-    private String status;
-
-    /**
-     * 批量数据（设备上报时使用）
-     */
-    private List<SensorData> batch;
-
-}

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;
@@ -12,37 +16,31 @@ import java.util.List;
 @Component
 public class MqttRuleEngine {
 
-//    @Autowired
-//    @Qualifier("threadPoolTaskExecutor")
-//    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+    @Autowired
+    @Qualifier("threadPoolTaskExecutor")
+    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
     private final LinkedHashMap<String, MqttMessageRule> rulesMap = new LinkedHashMap<>();
-
-
     public MqttRuleEngine(List<MqttMessageRule> rules) {
         // 按优先级排序
         rules.sort(Comparator.comparing(MqttMessageRule::getPriority));
         rules.forEach(rule -> rulesMap.put(rule.getCommandType(), rule)
         );
     }
-
-
+    
     /**
      * 执行匹配
-     *
      * @param context 处理上下文
      * @return
      */
     public boolean executeRule(MqttRuleContext context) {
         int commandType = context.getCommandType();
-        MqttMessageRule mqttMessageRule = rulesMap.get("Light_" + commandType);
+        MqttMessageRule mqttMessageRule = rulesMap.get("Light_"+commandType);
         if (mqttMessageRule != null) {
-//            threadPoolTaskExecutor.execute(() -> mqttMessageRule.execute(context));
-            mqttMessageRule.execute(context);
+            threadPoolTaskExecutor.execute(() -> mqttMessageRule.execute(context));
             return true;
         }
-
+        
         return false;
     }
-
 }

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

@@ -1,29 +0,0 @@
-package com.fuyuanshen.global.mqtt.base;
-
-import lombok.Data;
-
-/**
- * MQTT主题信息模型
- */
-@Data
-public class MqttTopicInfo {
-    /**
-     * 操作类型 (command/status/report)
-     */
-    private String operation;
-    
-    /**
-     * 租户编码
-     */
-    private String tenantCode;
-    
-    /**
-     * 设备类型
-     */
-    private String deviceType;
-    
-    /**
-     * 设备IMEI
-     */
-    private String imei;
-}

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

@@ -39,8 +39,8 @@ public class MqttXinghanJson {
     /**
      * 第七键值对, 静止报警状态，0-未静止报警，1-正在静止报警。
      */
-    @JsonProperty("sta_ShakeBit")
-    public Integer staShakeBit;
+    @JsonProperty("staShakeBit")
+    public Integer sta_ShakeBit;
     /**
      * 第八键值对, 4G信号强度，0-32，数值越大，信号越强。
      */
@@ -61,14 +61,5 @@ public class MqttXinghanJson {
      */
     @JsonProperty("sta_latitude")
     public String stalatitude;
-    /**
-     * 第十二键值对，系统现状，0关机，1仅充电，2开机未充电,3，开机且充电
-     */
-    @JsonProperty("sta_system")
-    public String stasystem;
-    /**
-     * 电量百分比(适配控制列表显示)
-     */
-    public String batteryPercentage;
 
 }

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

@@ -1,26 +0,0 @@
-package com.fuyuanshen.global.mqtt.base;
-
-/**
- * MQTT消息处理接口
- */
-public interface NewMqttMessageRule {
-
-    /**
-     * 获取命令类型
-     * @return 命令类型
-     */
-    String getCommandType();
-    /**
-     * 执行处理
-     * @param context 处理上下文
-     */
-    void execute(NewMqttRuleContext context);
-    
-    /**
-     * 获取优先级，数值越小优先级越高
-     * @return 优先级
-     */
-    default int getPriority() {
-        return 0;
-    }
-}

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

@@ -1,25 +0,0 @@
-package com.fuyuanshen.global.mqtt.base;
-
-import lombok.Data;
-
-import java.util.Map;
-
-/**
- * MQTT消息处理上下文
- */
-@Data
-public class NewMqttRuleContext {
-    /**
-     * 命令类型
-     */
-    private String commandType;
-    /**
-     * 设备IMEI
-     */
-    private String deviceImei;
-
-    /**
-     * MQTT消息负载字典
-     */
-    private Map<String, Object> payloadDict;
-}

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

@@ -1,44 +0,0 @@
-package com.fuyuanshen.global.mqtt.base;
-
-import org.springframework.stereotype.Component;
-
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-/**
- * MQTT消息引擎
- */
-@Component
-public class NewMqttRuleEngine {
-
-//    @Autowired
-//    @Qualifier("threadPoolTaskExecutor")
-//    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
-
-    private final LinkedHashMap<String, NewMqttMessageRule> rulesMap = new LinkedHashMap<>();
-    public NewMqttRuleEngine(List<NewMqttMessageRule> rules) {
-        // 按优先级排序
-        rules.sort(Comparator.comparing(NewMqttMessageRule::getPriority));
-        rules.forEach(rule -> rulesMap.put(rule.getCommandType(), rule)
-        );
-    }
-    
-    /**
-     * 执行匹配
-     * @param context 处理上下文
-     * @return
-     */
-    public boolean executeRule(NewMqttRuleContext context) {
-        String commandType = context.getCommandType();
-//        String funcType = context.getFuncType();
-        NewMqttMessageRule mqttMessageRule = rulesMap.get(commandType);
-        if (mqttMessageRule != null) {
-//            threadPoolTaskExecutor.execute(() -> mqttMessageRule.execute(context));
-            mqttMessageRule.execute(context);
-            return true;
-        }
-        
-        return false;
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.fuyuanshen.global.mqtt.base;
-
-import lombok.Data;
-
-/**
- * 传感器数据模型
- */
-@Data
-public class SensorData {
-    /**
-     * 传感器名称
-     */
-    private String sensor;
-    
-    /**
-     * 传感器值
-     */
-    private Object value;
-    
-    /**
-     * 时间戳（毫秒）
-     */
-    private Long timestamp;
-}

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

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

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

@@ -3,7 +3,6 @@ package com.fuyuanshen.global.mqtt.config;
 
 import cn.hutool.core.lang.UUID;
 import com.fuyuanshen.global.mqtt.receiver.ReceiverMessageHandler;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -39,17 +38,11 @@ public class MqttInboundConfiguration {
     public MessageProducer messageProducer(){
         // 生成一个不重复的随机数
         String clientId = mqttPropertiesConfig.getSubClientId() + "_" + UUID.fastUUID();
-        // 修复URL为null时的空指针异常
-        String url = mqttPropertiesConfig.getUrl();
-        if (url == null) {
-            throw new IllegalStateException("MQTT服务器URL未配置");
-        }
-        String subTopic = mqttPropertiesConfig.getSubTopic();
         MqttPahoMessageDrivenChannelAdapter mqttPahoMessageDrivenChannelAdapter = new MqttPahoMessageDrivenChannelAdapter(
-                url,
+                mqttPropertiesConfig.getUrl(),
                 clientId,
                 mqttPahoClientFactory,
-                subTopic.split(",")
+                mqttPropertiesConfig.getSubTopic().split(",")
         );
         mqttPahoMessageDrivenChannelAdapter.setQos(1);
         mqttPahoMessageDrivenChannelAdapter.setConverter(new DefaultPahoMessageConverter());
@@ -62,10 +55,4 @@ public class MqttInboundConfiguration {
     public MessageHandler messageHandler(){
         return receiverMessageHandler;
     }
-
-    // @Bean
-    // @ServiceActivator(inputChannel = "messageInboundChannel") // 确保通道名称正确
-    // public MessageHandler deviceAlarmMessageHandler() {
-    //     return new DeviceAlrmMessageHandler();
-    // }
 }

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

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

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

@@ -14,8 +14,6 @@ public class MqttPropertiesConfig {
     private String url;
     private String subClientId;
     private String subTopic;
-    private String subTopic2;
     private String pubClientId;
     private String pubTopic;
-    private String pubTopic2;
 }

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

@@ -1,68 +0,0 @@
-package com.fuyuanshen.global.mqtt.config;
-
-
-import cn.hutool.core.lang.UUID;
-import com.fuyuanshen.global.mqtt.receiver.NewReceiverMessageHandler;
-import lombok.extern.slf4j.Slf4j;
-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;
-
-
-@Configuration
-@Slf4j
-public class NewMqttInboundConfiguration {
-    @Autowired
-    private MqttPropertiesConfig mqttPropertiesConfig;
-    @Autowired
-    private MqttPahoClientFactory mqttPahoClientFactory;
-    @Autowired
-    private NewReceiverMessageHandler receiverMessageHandler2;
-    //消息通道
-    @Bean
-    public MessageChannel messageInboundChannel2(){
-        return new DirectChannel();
-    }
- 
-    /**
-     * 配置入站适配器
-     * 作用： 设置订阅主题，以及指定消息的通道 等相关属性
-     * */
-    @Bean
-    public MessageProducer messageProducer2(){
-        // 生成一个不重复的随机数
-        String clientId = mqttPropertiesConfig.getSubClientId() + "_" + UUID.fastUUID();
-        String subTopic = mqttPropertiesConfig.getSubTopic2();
-        log.info("订阅主题：{}", subTopic);
-        MqttPahoMessageDrivenChannelAdapter mqttPahoMessageDrivenChannelAdapter = new MqttPahoMessageDrivenChannelAdapter(
-                mqttPropertiesConfig.getUrl(),
-                clientId,
-                mqttPahoClientFactory,
-                subTopic.split(",")
-        );
-        mqttPahoMessageDrivenChannelAdapter.setQos(1);
-        mqttPahoMessageDrivenChannelAdapter.setConverter(new DefaultPahoMessageConverter());
-        mqttPahoMessageDrivenChannelAdapter.setOutputChannel(messageInboundChannel2());
-        return mqttPahoMessageDrivenChannelAdapter;
-    }
-    /**  指定处理消息来自哪个通道 */
-    @Bean
-    @ServiceActivator(inputChannel = "messageInboundChannel2")
-    public MessageHandler messageHandler2(){
-        return receiverMessageHandler2;
-    }
-
-    // @Bean
-    // @ServiceActivator(inputChannel = "messageInboundChannel") // 确保通道名称正确
-    // public MessageHandler deviceAlarmMessageHandler() {
-    //     return new DeviceAlrmMessageHandler();
-    // }
-}

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

@@ -1,46 +0,0 @@
-package com.fuyuanshen.global.mqtt.config;
-
-import cn.hutool.core.lang.UUID;
-import lombok.extern.slf4j.Slf4j;
-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.mqtt.core.MqttPahoClientFactory;
-import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
-import org.springframework.messaging.MessageChannel;
-import org.springframework.messaging.MessageHandler;
-
-@Configuration
-@Slf4j
-public class NewMqttOutboundConfiguration {
-    @Autowired
-    private MqttPropertiesConfig mqttPropertiesConfig;
-    @Autowired
-    private MqttPahoClientFactory mqttPahoClientFactory;
- 
-    // 消息通道
-    @Bean
-    public MessageChannel mqttOutboundChannel2(){
-        return new DirectChannel();
-    }
-
-
-    /** 配置出站消息处理器 */
-    @Bean
-    @ServiceActivator(inputChannel = "mqttOutboundChannel2")  // 指定处理器针对哪个通道的消息进行处理
-    public MessageHandler mqttOutboundMessageHandler2(){
-        String clientId = mqttPropertiesConfig.getPubClientId() + "_" + UUID.fastUUID();
-        MqttPahoMessageHandler mqttPahoMessageHandler = new MqttPahoMessageHandler(
-                mqttPropertiesConfig.getUrl(),
-                clientId,
-                mqttPahoClientFactory
-        );
-        mqttPahoMessageHandler.setDefaultQos(1);
-        mqttPahoMessageHandler.setDefaultTopic(mqttPropertiesConfig.getPubTopic2());
-        mqttPahoMessageHandler.setAsync(true);
-        return mqttPahoMessageHandler;
-    }
- 
-}

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

@@ -1,7 +1,6 @@
 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";
@@ -48,10 +47,4 @@ public class DeviceRedisKeyConstants {
      * 告警
      */
     public static final String DEVICE_ALARM_KEY_PREFIX = ":alarm";
-
-    /**
-     * 告警信息
-     */
-    public static final String DEVICE_ALARM_MESSAGE_KEY_PREFIX = ":alarmMessage";
-
 }

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

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

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

@@ -3,6 +3,7 @@ package com.fuyuanshen.global.mqtt.constants;
 
 public interface MqttConstants {
 
+
     /**
      * 全局发布消息的key
      */
@@ -12,6 +13,4 @@ public interface MqttConstants {
      * 全局订阅消息的key
      */
     String GLOBAL_SUB_KEY = "A/";
-
-    String GLOBAL_PUB_KEY2 = "command/";
 }

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/enums/DeviceFunctionType6075.java

@@ -1,82 +0,0 @@
-package com.fuyuanshen.global.mqtt.enums;
-
-/**
- * 设备功能类型枚举
- * 基于AppDeviceBJQ6075Controller中的功能注释1-9设计
- */
-public enum DeviceFunctionType6075 {
-
-    /**
-     * 人员信息登记
-     */
-    REGISTER_PERSON_INFO(1, "REGISTER_PERSON_INFO", "人员信息登记"),
-    
-    /**
-     * 发送信息
-     */
-    SEND_MESSAGE(2, "SEND_MESSAGE", "发送信息"),
-    
-    /**
-     * 发送报警信息
-     */
-    SEND_ALARM_MESSAGE(3, "SEND_ALARM_MESSAGE", "发送报警信息"),
-    
-    /**
-     * 上传设备logo图片
-     */
-    UPLOAD_LOGO(4, "UPLOAD_LOGO", "上传设备logo图片"),
-    
-    /**
-     * 灯光模式（主光模式）
-     * 0（关闭灯光），1（强光），2（超强光）, 3（工作光）, 4（节能光），5（爆闪），6（SOS）
-     */
-    LIGHT_MODE(5, "LIGHT_MODE", "灯光模式"),
-    
-    /**
-     * 灯光模式（辅光模式）
-     * 0（关闭灯光），1（泛光），2（泛光爆闪）, 3（警示灯）, 4（警示灯/泛光）
-     */
-    AUXILIARY_LIGHT_MODE(6, "AUXILIARY_LIGHT_MODE", "辅光模式"),
-    
-    /**
-     * 灯光亮度设置
-     */
-    LIGHT_BRIGHTNESS(7, "LIGHT_BRIGHTNESS", "灯光亮度设置"),
-    
-    /**
-     * 激光模式设置
-     */
-    LASER_MODE(8, "LASER_MODE", "激光模式设置"),
-    
-    /**
-     * 声光报警模式设置
-     */
-    SOUND_AND_LIGHT_ALARM(9, "SOUND_AND_LIGHT_ALARM", "声光报警模式设置");
-    
-    private final int number;
-    private final String code;
-    private final String description;
-
-    DeviceFunctionType6075(int number, String code, String description) {
-        this.number = number;
-        this.code = code;
-        this.description = description;
-    }
-    
-    public int getNumber() {
-        return number;
-    }
-    
-    public String getCode() {
-        return code;
-    }
-    
-    public String getDescription() {
-        return description;
-    }
-    
-    @Override
-    public String toString() {
-        return code;
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/handler/IotMqttMessageHandler.java

@@ -1,136 +0,0 @@
-package com.fuyuanshen.global.mqtt.handler;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.fuyuanshen.global.mqtt.base.MqttTopicInfo;
-import com.fuyuanshen.global.mqtt.service.IotMqttService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-
-/**
- * IoT设备MQTT消息处理器
- * 用于处理设备上报的数据和响应消息
- */
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class IotMqttMessageHandler {
-
-    private final IotMqttService iotMqttService;
-
-    /**
-     * 处理MQTT消息
-     *
-     * @param topic   主题
-     * @param payload 消息内容
-     */
-    public void handleMessage(String topic, String payload) {
-        try {
-            // 解析主题
-            MqttTopicInfo topicInfo = parseTopic(topic);
-            if (topicInfo == null) {
-                log.warn("无法解析MQTT主题: topic={}", topic);
-                return;
-            }
-
-            // 解析消息内容
-            JSONObject message = JSON.parseObject(payload);
-
-            // 根据主题类型处理消息
-            switch (topicInfo.getOperation()) {
-                case "command":
-                    // 处理下发指令（设备端不会主动发送command类型消息）
-                    log.warn("收到非法的MQTT消息类型: operation={}", topicInfo.getOperation());
-                    break;
-                case "status":
-                    // 处理设备对指令的响应
-                    iotMqttService.handleCommandResponse(
-                            topicInfo.getTenantCode(),
-                            topicInfo.getDeviceType(),
-                            topicInfo.getImei(),
-                            message);
-                    break;
-                case "report":
-                    // 处理设备主动上报的数据
-                    handleDeviceReport(topicInfo, message);
-                    break;
-                default:
-                    log.warn("未知的MQTT主题操作类型: operation={}", topicInfo.getOperation());
-                    break;
-            }
-        } catch (Exception e) {
-            log.error("处理MQTT消息时发生错误: topic={}, payload={}", topic, payload, e);
-        }
-
-    }
-
-    /**
-     * 解析MQTT主题
-     *
-     * @param topic 主题字符串
-     * @return 主题信息对象
-     */
-    MqttTopicInfo parseTopic(String topic) {
-        if (topic == null || topic.isEmpty()) {
-            return null;
-        }
-
-        String[] parts = topic.split("/");
-        if (parts.length != 4) {
-            return null;
-        }
-
-        MqttTopicInfo info = new MqttTopicInfo();
-        info.setOperation(parts[0]);
-        info.setTenantCode(parts[1]);
-        info.setDeviceType(parts[2]);
-        info.setImei(parts[3]);
-        return info;
-    }
-
-    /**
-     * 处理设备上报数据
-     *
-     * @param topicInfo 主题信息
-     * @param message   消息内容
-     */
-    private void handleDeviceReport(MqttTopicInfo topicInfo, JSONObject message) {
-        // 获取时间戳
-        Long timestamp = message.getLong("timestamp");
-
-        // 处理批量数据上报
-        if (message.containsKey("batch")) {
-            JSONObject batchData = message.getJSONObject("batch");
-            iotMqttService.handleBatchReport(
-                    topicInfo.getTenantCode(),
-                    topicInfo.getDeviceType(),
-                    topicInfo.getImei(),
-                    batchData,
-                    timestamp);
-        }
-        // 处理单个数据上报
-        else if (message.containsKey("sensor") && message.containsKey("value")) {
-            String sensor = message.getString("sensor");
-            Object value = message.get("value");
-            iotMqttService.handleSingleReport(
-                    topicInfo.getTenantCode(),
-                    topicInfo.getDeviceType(),
-                    topicInfo.getImei(),
-                    sensor,
-                    value,
-                    timestamp);
-        }
-        // 处理其他格式的数据
-        else {
-            // 将整个消息作为批量数据处理
-            iotMqttService.handleBatchReport(
-                    topicInfo.getTenantCode(),
-                    topicInfo.getDeviceType(),
-                    topicInfo.getImei(),
-                    message,
-                    timestamp);
-        }
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/handler/MqttMessageHandler.java

@@ -1,71 +0,0 @@
-package com.fuyuanshen.global.mqtt.handler;
-
-import com.alibaba.fastjson2.JSON;
-import com.fuyuanshen.global.mqtt.base.MqttMessage;
-import com.fuyuanshen.global.mqtt.service.MqttMessageService;
-import com.fuyuanshen.global.mqtt.utils.MqttTopicUtils;
-import com.fuyuanshen.global.mqtt.base.MqttTopicInfo;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * MQTT消息处理器
- */
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class MqttMessageHandler {
-    
-    private final MqttMessageService mqttMessageService;
-
-    
-    /**
-     * 处理MQTT消息
-     * @param topic 主题
-     * @param payload 消息内容
-     */
-    public void handleMessage(String topic, String payload) {
-        try {
-            // 解析主题
-            MqttTopicInfo topicInfo = MqttTopicUtils.parseTopic(topic);
-            if (topicInfo == null) {
-                log.warn("无法解析MQTT主题: topic={}", topic);
-                return;
-            }
-            
-            // 解析消息内容
-            MqttMessage message = JSON.parseObject(payload, MqttMessage.class);
-            
-            // 根据主题类型处理消息
-            switch (topicInfo.getOperation()) {
-                case "command":
-                    // 处理下发指令（设备端不会主动发送command类型消息）
-                    log.warn("收到非法的MQTT消息类型: operation={}", topicInfo.getOperation());
-                    break;
-                case "status":
-                    // 处理设备对指令的响应
-                    mqttMessageService.handleCommandResponse(
-                            topicInfo.getTenantCode(),
-                            topicInfo.getDeviceType(),
-                            topicInfo.getImei(),
-                            message);
-                    break;
-                case "report":
-                    // 处理设备主动上报的数据
-                    mqttMessageService.handleDeviceReport(
-                            topicInfo.getTenantCode(),
-                            topicInfo.getDeviceType(),
-                            topicInfo.getImei(),
-                            message);
-                    break;
-                default:
-                    log.warn("未知的MQTT主题操作类型: operation={}", topicInfo.getOperation());
-                    break;
-            }
-        } catch (Exception e) {
-            log.error("处理MQTT消息时发生错误: topic={}, payload={}", topic, payload, e);
-        }
-    }
-
-}

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

@@ -1,47 +1,23 @@
 package com.fuyuanshen.global.mqtt.listener;
 
-import cn.hutool.core.thread.ThreadUtil;
-import com.baomidou.lock.LockInfo;
-import com.baomidou.lock.LockTemplate;
-import com.baomidou.lock.executor.RedissonLockExecutor;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.mapper.DeviceMapper;
-import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.connection.Message;
 import org.springframework.data.redis.connection.MessageListener;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 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;
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX;
 
 @Component
 @Slf4j
 public class RedisKeyExpirationListener implements MessageListener {
 
-    @Autowired
-    @Qualifier("threadPoolTaskExecutor")
-    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
-
-    @Autowired
-    private DeviceMapper deviceMapper;
-
-    @Autowired
-    private LockTemplate lockTemplate;
-
     @Override
     public void onMessage(Message message, byte[] pattern) {
         String expiredKey = new String(message.getBody());
@@ -50,51 +26,8 @@ public class RedisKeyExpirationListener implements MessageListener {
             String element = expiredKey.substring(FUNCTION_ACCESS_KEY.length());
             handleFunctionAccessExpired(element);
         }
-        if(expiredKey.endsWith(DEVICE_ONLINE_STATUS_KEY_PREFIX)) {
-
-            threadPoolTaskExecutor.execute(() -> {
-                log.info("设备离线：{}", expiredKey);
-                String element = expiredKey.substring(GlobalConstants.GLOBAL_REDIS_KEY.length() + DEVICE_KEY_PREFIX.length(), expiredKey.length() - DEVICE_ONLINE_STATUS_KEY_PREFIX.length());
-
-                // 构造设备锁键
-                String deviceLockKey = GlobalConstants.GLOBAL_REDIS_KEY + ":device_lock:" + element;
-
-                // 尝试获取Redis锁
-                LockInfo lockInfo = lockTemplate.lock(deviceLockKey, 30000L, 5000L, RedissonLockExecutor.class); // 30秒过期
-
-                if (lockInfo != null) {
-                    try {
-                        String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ message + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
-//                        String deviceOnlineStatusRedis = RedisUtils.getCacheObject(deviceOnlineStatusRedisKey);
-//                        if(StringUtils.isBlank(deviceOnlineStatusRedis)){
-//                            UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
-//                            deviceUpdateWrapper.eq("device_imei", element);
-//                            deviceUpdateWrapper.set("online_status", 0);
-//                            deviceMapper.update(deviceUpdateWrapper);
-//                        }else{
-//                            RedisUtils.deleteObject(deviceOnlineStatusRedisKey);
-//                        }
-
-                        UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
-                        deviceUpdateWrapper.eq("device_imei", element);
-                        deviceUpdateWrapper.set("online_status", 0);
-                        deviceMapper.update(deviceUpdateWrapper);
-                        String deviceOnlineStatusRedis = RedisUtils.getCacheObject(deviceOnlineStatusRedisKey);
-                        if(StringUtils.isNotBlank(deviceOnlineStatusRedis)){
-                            RedisUtils.deleteObject(deviceOnlineStatusRedisKey);
-                        }
-                    } finally {
-                        //释放锁
-                        lockTemplate.releaseLock(lockInfo);
-                    }
-                } else {
-                    log.warn("无法获取设备锁，跳过设备离线处理: {}", element);
-                }
-            });
-        }
-
-
     }
+
     /**
      * 访问key过期事件
      * @param element 批次ID

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

@@ -1,22 +1,20 @@
 package com.fuyuanshen.global.mqtt.publish;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api")
-@SaIgnore
+@RequestMapping("/api/")
 @Slf4j
 public class DeviceDataController {
 
     @Autowired
     private MqttClientTest mqttClientTest;
-    @GetMapping("/command")
+    
+//    @PostMapping("/{deviceId}/command")
     public ResponseEntity<String> sendCommand() {
 
         mqttClientTest.sendMsg();

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

@@ -13,10 +13,10 @@ public class MqttClientTest {
     private MqttGateway mqttGateway;
 
     public void sendMsg() {
-        mqttGateway.sendMsgToMqtt("command/894078/HBY670/864865082081523", "hello mqtt spring boot");
+        mqttGateway.sendMsgToMqtt("worker/location/1", "hello mqtt spring boot");
         log.info("message is send");
 
-        mqttGateway.sendMsgToMqtt("report/894078/HBY670/864865082081523", "hello mqtt spring boot2");
+        mqttGateway.sendMsgToMqtt("worker/alert/2", "hello mqtt spring boot2");
         log.info("message is send2");
     }
 }

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

@@ -1,279 +0,0 @@
-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.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.base.MqttXinghanCommandType;
-import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
-import com.fuyuanshen.global.queue.MqttMessageQueueConstants;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHandler;
-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;
-
-/**
- * 6075
- *
- * @author: 默苍璃
- * @date: 2025-11-05 17:41
- */
-@Service
-@Slf4j
-public class DeviceMessageHandler implements MessageHandler {
-
-    @Autowired
-    private MqttRuleEngine ruleEngine;
-
-
-    @Override
-    public void handleMessage(Message<?> message) throws MessagingException {
-        Object payload = message.getPayload();
-        MessageHeaders headers = message.getHeaders();
-        String receivedTopic = Objects.requireNonNull(headers.get("mqtt_receivedTopic")).toString();
-        String receivedQos = Objects.requireNonNull(headers.get("mqtt_receivedQos")).toString();
-        String timestamp = Objects.requireNonNull(headers.get("timestamp")).toString();
-
-        log.info("MQTT payload= {} \n receivedTopic = {} \n receivedQos = {} \n timestamp = {}",
-                payload, receivedTopic, receivedQos, timestamp);
-
-        Dict payloadDict = JsonUtils.parseMap(payload.toString());
-        if (receivedTopic == null || payloadDict == null) {
-            return;
-        }
-
-        // 解析设备IMEI
-        String[] subStr = receivedTopic.split("/");
-        String deviceImei = subStr[1];
-
-        // 处理设备在线状态
-        handleDeviceOnlineStatus(deviceImei);
-
-        // 处理不同类型的设备信息
-        processDeviceInformation(payloadDict, deviceImei);
-
-        // 执行规则引擎处理
-        executeRuleEngine(payloadDict, deviceImei);
-    }
-
-
-    /**
-     * 处理设备在线状态
-     */
-    private void handleDeviceOnlineStatus(String deviceImei) {
-        if (StringUtils.isNotBlank(deviceImei)) {
-            // 添加去重队列
-            String queueKey = MqttMessageQueueConstants.MQTT_MESSAGE_QUEUE_KEY;
-            String dedupKey = MqttMessageQueueConstants.MQTT_MESSAGE_DEDUP_KEY;
-            RedisUtils.offerDeduplicated(queueKey, dedupKey, deviceImei, Duration.ofSeconds(900));
-
-            // 设置设备在线状态
-            String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY +
-                    DEVICE_KEY_PREFIX + deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX;
-            RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(360));
-        }
-    }
-
-
-    /**
-     * 处理不同类型的设备信息
-     */
-    private void processDeviceInformation(Dict payloadDict, String deviceImei) {
-        // 开机画面
-        if (payloadDict.containsKey("bootScreen")) {
-            handleBootScreen(payloadDict, deviceImei);
-        }
-
-        // 人员信息
-        if (payloadDict.containsKey("personInfo")) {
-            handlePersonInfo(payloadDict, deviceImei);
-        }
-
-        // 设备信息
-        if (payloadDict.containsKey("deviceInfo")) {
-            handleDeviceInfo(payloadDict, deviceImei);
-        }
-
-        // 经纬度
-        if (payloadDict.containsKey("latitude") && payloadDict.containsKey("longitude")) {
-            handleLocation(payloadDict, deviceImei);
-        }
-
-        // 电子地图
-        if (payloadDict.containsKey("mapData")) {
-            handleMapData(payloadDict, deviceImei);
-        }
-
-        // 电池电量
-        if (payloadDict.containsKey("batteryLevel")) {
-            handleBatteryLevel(payloadDict, deviceImei);
-        }
-
-        // 开启/关闭状态
-        if (payloadDict.containsKey("powerState")) {
-            handlePowerState(payloadDict, deviceImei);
-        }
-
-        // 海拔高度
-        if (payloadDict.containsKey("altitude")) {
-            handleAltitude(payloadDict, deviceImei);
-        }
-
-        // 相对高度
-        if (payloadDict.containsKey("relativeHeight")) {
-            handleRelativeHeight(payloadDict, deviceImei);
-        }
-
-        // 群呼/单呼
-        if (payloadDict.containsKey("callType")) {
-            handleCallType(payloadDict, deviceImei);
-        }
-
-        // 文字信息
-        if (payloadDict.containsKey("textMessage")) {
-            handleTextMessage(payloadDict, deviceImei);
-        }
-    }
-
-    /**
-     * 处理开机画面
-     */
-    private void handleBootScreen(Dict payloadDict, String deviceImei) {
-        log.info("处理设备{}的开机画面信息", deviceImei);
-        // 实现具体的开机画面处理逻辑
-    }
-
-    /**
-     * 处理人员信息
-     */
-    private void handlePersonInfo(Dict payloadDict, String deviceImei) {
-        log.info("处理设备{}的人员信息", deviceImei);
-        // 实现具体的人员信息处理逻辑
-    }
-
-    /**
-     * 处理设备信息
-     */
-    private void handleDeviceInfo(Dict payloadDict, String deviceImei) {
-        log.info("处理设备{}的设备信息", deviceImei);
-        // 实现具体的设备信息处理逻辑
-    }
-
-    /**
-     * 处理位置信息
-     */
-    private void handleLocation(Dict payloadDict, String deviceImei) {
-        log.info("处理设备{}的位置信息: 纬度={}, 经度={}",
-                deviceImei, payloadDict.getStr("latitude"), payloadDict.getStr("longitude"));
-        // 实现具体的位置信息处理逻辑
-    }
-
-    /**
-     * 处理电子地图数据
-     */
-    private void handleMapData(Dict payloadDict, String deviceImei) {
-        log.info("处理设备{}的电子地图数据", deviceImei);
-        // 实现具体的电子地图数据处理逻辑
-    }
-
-    /**
-     * 处理电池电量
-     */
-    private void handleBatteryLevel(Dict payloadDict, String deviceImei) {
-        log.info("处理设备{}的电池电量: {}", deviceImei, payloadDict.getStr("batteryLevel"));
-        // 实现具体的电池电量处理逻辑
-    }
-
-    /**
-     * 处理开关状态
-     */
-    private void handlePowerState(Dict payloadDict, String deviceImei) {
-        String powerState = payloadDict.getStr("powerState");
-        log.info("处理设备{}的开关状态: {}", deviceImei, powerState);
-        // 实现具体的开关状态处理逻辑
-    }
-
-    /**
-     * 处理海拔高度
-     */
-    private void handleAltitude(Dict payloadDict, String deviceImei) {
-        log.info("处理设备{}的海拔高度: {}", deviceImei, payloadDict.getStr("altitude"));
-        // 实现具体的海拔高度处理逻辑
-    }
-
-    /**
-     * 处理相对高度
-     */
-    private void handleRelativeHeight(Dict payloadDict, String deviceImei) {
-        log.info("处理设备{}的相对高度: {}", deviceImei, payloadDict.getStr("relativeHeight"));
-        // 实现具体的相对高度处理逻辑
-    }
-
-    /**
-     * 处理呼叫类型
-     */
-    private void handleCallType(Dict payloadDict, String deviceImei) {
-        String callType = payloadDict.getStr("callType");
-        log.info("处理设备{}的呼叫类型: {}", deviceImei, callType);
-        // 实现具体的呼叫类型处理逻辑
-    }
-
-    /**
-     * 处理文字信息
-     */
-    private void handleTextMessage(Dict payloadDict, String deviceImei) {
-        String textMessage = payloadDict.getStr("textMessage");
-        log.info("处理设备{}的文字信息: {}", deviceImei, textMessage);
-        // 实现具体的文字信息处理逻辑
-    }
-
-    /**
-     * 执行规则引擎处理
-     */
-    private void executeRuleEngine(Dict payloadDict, String deviceImei) {
-        String state = payloadDict.getStr("state");
-        Object[] convertArr = ImageToCArrayConverter.convertByteStringToMixedObjectArray(state);
-
-        if (convertArr.length > 0) {
-            Byte val1 = (Byte) convertArr[0];
-            MqttRuleContext context = new MqttRuleContext();
-            context.setCommandType(val1);
-            context.setConvertArr(convertArr);
-            context.setDeviceImei(deviceImei);
-            context.setPayloadDict(payloadDict);
-
-            boolean ruleExecuted = ruleEngine.executeRule(context);
-
-            if (!ruleExecuted) {
-                log.warn("未找到匹配的规则来处理命令类型: {}", val1);
-            }
-        }
-
-        /* ===== 追加：根据报文内容识别格式并统一解析 ===== */
-        int intType = MqttXinghanCommandType.computeVirtualCommandType(payloadDict);
-        if (intType > 0) {
-            MqttRuleContext newCtx = new MqttRuleContext();
-            newCtx.setCommandType((byte) intType);
-            newCtx.setDeviceImei(deviceImei);
-            newCtx.setPayloadDict(payloadDict);
-
-            boolean ok = ruleEngine.executeRule(newCtx);
-            if (!ok) {
-                log.warn("新规则引擎未命中, imei={}", deviceImei);
-            }
-        }
-    }
-
-}

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

@@ -1,125 +0,0 @@
-package com.fuyuanshen.global.mqtt.receiver;
-
-import cn.hutool.core.lang.Dict;
-import com.baomidou.lock.LockTemplate;
-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.global.mqtt.base.NewMqttRuleContext;
-import com.fuyuanshen.global.mqtt.base.NewMqttRuleEngine;
-import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
-import com.fuyuanshen.global.queue.MqttMessageQueueConstants;
-import lombok.extern.slf4j.Slf4j;
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHandler;
-import org.springframework.messaging.MessageHeaders;
-import org.springframework.messaging.MessagingException;
-import org.springframework.stereotype.Service;
-
-import java.time.Duration;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-
-@Service
-@Slf4j
-public class NewReceiverMessageHandler implements MessageHandler {
-
-    @Autowired
-    private NewMqttRuleEngine newRuleEngine;
-
-    @Override
-    public void handleMessage(Message<?> message) throws MessagingException {
-
-        Object payload = message.getPayload();
-        MessageHeaders headers = message.getHeaders();
-        String receivedTopic = Objects.requireNonNull(headers.get("mqtt_receivedTopic")).toString();
-        String receivedQos = Objects.requireNonNull(headers.get("mqtt_receivedQos")).toString();
-        String timestamp = Objects.requireNonNull(headers.get("timestamp")).toString();
-
-        log.info("MQTT2 payload= {} \n receivedTopic = {} \n receivedQos = {} \n timestamp = {}",
-                payload, receivedTopic, receivedQos, timestamp);
-
-        Dict payloadDict = JsonUtils.parseMap(payload.toString());
-        if (receivedTopic == null || payloadDict == null) {
-            return;
-        }
-        String imei = payloadDict.getStr("imei");
-        String funcType = payloadDict.getStr("funcType");
-        // 执行业务逻辑
-        if(StringUtils.isNotBlank(imei)){
-            String queueKey = MqttMessageQueueConstants.MQTT_MESSAGE_QUEUE_KEY;
-            String dedupKey = MqttMessageQueueConstants.MQTT_MESSAGE_DEDUP_KEY;
-            RedisUtils.offerDeduplicated(queueKey,dedupKey,imei, Duration.ofSeconds(900));
-            //在线状态
-            String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ imei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
-            RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(360));
-        }
-
-        String[] topicArr = receivedTopic.split("/");
-
-        NewMqttRuleContext context = new NewMqttRuleContext();
-        context.setCommandType(topicArr[2]+"_"+funcType);
-        context.setDeviceImei(imei);
-        context.setPayloadDict(payloadDict);
-
-        boolean ruleExecuted = newRuleEngine.executeRule(context);
-
-        if (!ruleExecuted) {
-            log.warn("未找到匹配的规则来处理命令类型: {}", topicArr[2] + " : " +funcType);
-        }
-//        final LockInfo lockInfo = lockTemplate.lock(GlobalConstants.GLOBAL_REDIS_KEY + lockKey + imei, 100L, 3000L, RedissonLockExecutor.class);
-//        if (null == lockInfo) {
-//            log.info("MQTT3业务处理中,请稍后再试:funcType=>{},imei=>{}",funcType,imei);
-//            return;
-//        }
-////         获取锁成功，处理业务
-//        try {
-//            if(StringUtils.isNotBlank(imei)){
-//                String queueKey = MqttMessageQueueConstants.MQTT_MESSAGE_QUEUE_KEY;
-//                String dedupKey = MqttMessageQueueConstants.MQTT_MESSAGE_DEDUP_KEY;
-//                RedisUtils.offerDeduplicated(queueKey,dedupKey,imei, Duration.ofSeconds(900));
-//                //在线状态
-//                String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ imei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
-//                RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(360));
-//            }
-//
-//            String[] topicArr = receivedTopic.split("/");
-//
-//            NewMqttRuleContext context = new NewMqttRuleContext();
-//            context.setCommandType(topicArr[2]+"_"+funcType);
-//            context.setDeviceImei(imei);
-//            context.setPayloadDict(payloadDict);
-//
-//            boolean ruleExecuted = newRuleEngine.executeRule(context);
-//
-//            if (!ruleExecuted) {
-//                log.warn("未找到匹配的规则来处理命令类型: {}", topicArr[2] + " : " +funcType);
-//            }
-//        } finally {
-//            //释放锁
-//            lockTemplate.releaseLock(lockInfo);
-//        }
-
-
-        /* ===== 追加：根据报文内容识别格式并统一解析 ===== */
-//        int intType = MqttXinghanCommandType.computeVirtualCommandType(payloadDict);
-//        if (intType > 0) {
-//            MqttRuleContext newCtx = new MqttRuleContext();
-//            String commandType = "Light_"+intType;
-//            newCtx.setCommandType(commandType);
-//            newCtx.setDeviceImei(imei);
-//            newCtx.setPayloadDict(payloadDict);
-//
-//            boolean ok = ruleEngine.executeRule(newCtx);
-//            if (!ok) {
-//                log.warn("新规则引擎未命中, imei={}", imei);
-//            }
-//        }
-    }
-}

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

@@ -9,12 +9,8 @@ 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.base.MqttXinghanCommandType;
-import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
 import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
-import com.fuyuanshen.global.queue.MqttMessageQueueConstants;
 import lombok.extern.slf4j.Slf4j;
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHandler;
@@ -24,7 +20,6 @@ import org.springframework.stereotype.Service;
 
 import java.time.Duration;
 import java.util.Objects;
-import java.util.concurrent.TimeUnit;
 
 import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
 
@@ -42,79 +37,52 @@ public class ReceiverMessageHandler implements MessageHandler {
         String receivedTopic = Objects.requireNonNull(headers.get("mqtt_receivedTopic")).toString();
         String receivedQos = Objects.requireNonNull(headers.get("mqtt_receivedQos")).toString();
         String timestamp = Objects.requireNonNull(headers.get("timestamp")).toString();
-
+        
         log.info("MQTT payload= {} \n receivedTopic = {} \n receivedQos = {} \n timestamp = {}",
                 payload, receivedTopic, receivedQos, timestamp);
-
+                
         Dict payloadDict = JsonUtils.parseMap(payload.toString());
         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];
+            MqttRuleContext context = new MqttRuleContext();
+            context.setCommandType(val1);
+            context.setConvertArr(convertArr);
+            context.setDeviceImei(deviceImei);
+            context.setPayloadDict(payloadDict);
 
-        RedissonClient client = RedisUtils.getClient();
-        String lockKey = "mqtt:consumer:lock:";
-        String  KEY = GlobalConstants.GLOBAL_REDIS_KEY + lockKey + deviceImei;
-        RLock lock = client.getLock(KEY);
-
-        try {
-            // 尝试获取锁，
-            boolean isLocked = lock.tryLock(60, 3000, TimeUnit.MILLISECONDS);
-            if (isLocked) {
-                String state = payloadDict.getStr("state");
-                Object[] convertArr = ImageToCArrayConverter.convertByteStringToMixedObjectArray(state);
-                if(StringUtils.isNotBlank(deviceImei)){
-                    String queueKey = MqttMessageQueueConstants.MQTT_MESSAGE_QUEUE_KEY;
-                    String dedupKey = MqttMessageQueueConstants.MQTT_MESSAGE_DEDUP_KEY;
-                    RedisUtils.offerDeduplicated(queueKey,dedupKey,deviceImei, Duration.ofSeconds(900));
-                    //在线状态
-                    String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
-                    RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(360));
-                }
-
-
-
-                if (convertArr.length > 0) {
-                    Byte val1 = (Byte) convertArr[0];
-                    MqttRuleContext context = new MqttRuleContext();
-                    context.setCommandType(val1);
-                    context.setConvertArr(convertArr);
-                    context.setDeviceImei(deviceImei);
-                    context.setPayloadDict(payloadDict);
-
-                    boolean ruleExecuted = ruleEngine.executeRule(context);
-
-                    if (!ruleExecuted) {
-                        log.warn("未找到匹配的规则来处理命令类型: {}", val1);
-                    }
-                }
-
-                /* ===== 追加：根据报文内容识别格式并统一解析 ===== */
-                int intType = MqttXinghanCommandType.computeVirtualCommandType(payloadDict);
-                if (intType > 0) {
-                    MqttRuleContext newCtx = new MqttRuleContext();
-                    newCtx.setCommandType((byte) intType);
-                    newCtx.setDeviceImei(deviceImei);
-                    newCtx.setPayloadDict(payloadDict);
-
-                    boolean ok = ruleEngine.executeRule(newCtx);
-                    if (!ok) {
-                        log.warn("新规则引擎未命中, imei={}", deviceImei);
-                    }
-                }
-            }else{
-                log.warn("MQTT获取锁失败，请稍后再试");
+            boolean ruleExecuted = ruleEngine.executeRule(context);
+            
+            if (!ruleExecuted) {
+                log.warn("未找到匹配的规则来处理命令类型: {}", val1);
             }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        } finally {
-            // 释放锁
-            if (lock.isHeldByCurrentThread()) {
-                lock.unlock();
+        }
+
+        /* ===== 追加：根据报文内容识别格式并统一解析 ===== */
+        int intType = MqttXinghanCommandType.computeVirtualCommandType(payloadDict);
+        if (intType > 0) {
+            MqttRuleContext newCtx = new MqttRuleContext();
+            newCtx.setCommandType((byte) intType);
+            newCtx.setDeviceImei(deviceImei);
+            newCtx.setPayloadDict(payloadDict);
+
+            boolean ok = ruleEngine.executeRule(newCtx);
+            if (!ok) {
+                log.warn("新规则引擎未命中, imei={}", deviceImei);
             }
         }
     }
-
 }

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

@@ -38,18 +38,18 @@ public class BjqActiveReportingDeviceDataRule implements MqttMessageRule {
     @Override
     public void execute(MqttRuleContext context) {
         try {
-//            Object[] convertArr = context.getConvertArr();
-//            // Latitude, longitude
-//            //主灯档位,激光灯档位,电量百分比,充电状态,电池剩余续航时间
-//            String mainLightMode = convertArr[1].toString();
-//            String laserLightMode = convertArr[2].toString();
-//            String batteryPercentage = convertArr[3].toString();
-//            String chargeState = convertArr[4].toString();
-//            String batteryRemainingTime = convertArr[5].toString();
-//
-//            // 发送设备状态和位置信息到Redis
-//            asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(), mainLightMode, laserLightMode,
-//                    batteryPercentage, chargeState, batteryRemainingTime);
+            Object[] convertArr = context.getConvertArr();
+            // Latitude, longitude
+            //主灯档位,激光灯档位,电量百分比,充电状态,电池剩余续航时间
+            String mainLightMode = convertArr[1].toString();
+            String laserLightMode = convertArr[2].toString();
+            String batteryPercentage = convertArr[3].toString();
+            String chargeState = convertArr[4].toString();
+            String batteryRemainingTime = convertArr[5].toString();
+
+            // 发送设备状态和位置信息到Redis
+            asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(), mainLightMode, laserLightMode,
+                    batteryPercentage, chargeState, batteryRemainingTime);
         } catch (Exception e) {
             log.error("处理上报数据命令时出错", e);
         }
@@ -67,29 +67,31 @@ public class BjqActiveReportingDeviceDataRule implements MqttMessageRule {
      */
     public void asyncSendDeviceDataToRedisWithFuture(String deviceImei, String mainLightMode, String laserLightMode,
                                                      String batteryPercentage, String chargeState, String batteryRemainingTime) {
-        try {
-            // 构造设备状态信息对象
-            Map<String, Object> deviceInfo = new LinkedHashMap<>();
-            deviceInfo.put("deviceImei", deviceImei);
-            deviceInfo.put("mainLightMode", mainLightMode);
-            deviceInfo.put("laserLightMode", laserLightMode);
-            deviceInfo.put("batteryPercentage", batteryPercentage);
-            deviceInfo.put("chargeState", chargeState);
-            deviceInfo.put("batteryRemainingTime", batteryRemainingTime);
-            deviceInfo.put("timestamp", System.currentTimeMillis());
+        CompletableFuture.runAsync(() -> {
+            try {
+                // 构造设备状态信息对象
+                Map<String, Object> deviceInfo = new LinkedHashMap<>();
+                deviceInfo.put("deviceImei", deviceImei);
+                deviceInfo.put("mainLightMode", mainLightMode);
+                deviceInfo.put("laserLightMode", laserLightMode);
+                deviceInfo.put("batteryPercentage", batteryPercentage);
+                deviceInfo.put("chargeState", chargeState);
+                deviceInfo.put("batteryRemainingTime", batteryRemainingTime);
+                deviceInfo.put("timestamp", System.currentTimeMillis());
 
-            // 将设备状态信息存储到Redis中
-            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_STATUS_KEY_PREFIX;
-            String deviceInfoJson = JsonUtils.toJsonString(deviceInfo);
+                // 将设备状态信息存储到Redis中
+                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_STATUS_KEY_PREFIX;
+                String deviceInfoJson = JsonUtils.toJsonString(deviceInfo);
 
-            // 存储到Redis
-            RedisUtils.setCacheObject(deviceRedisKey, deviceInfoJson);
+                // 存储到Redis
+                RedisUtils.setCacheObject(deviceRedisKey, deviceInfoJson);
 
-            log.info("设备状态信息已异步发送到Redis: device={}, mainLightMode={}, laserLightMode={}, batteryPercentage={}",
-                    deviceImei, mainLightMode, laserLightMode, batteryPercentage);
-        } catch (Exception e) {
-            log.error("异步发送设备信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
-        }
+                log.info("设备状态信息已异步发送到Redis: device={}, mainLightMode={}, laserLightMode={}, batteryPercentage={}",
+                        deviceImei, mainLightMode, laserLightMode, batteryPercentage);
+            } catch (Exception e) {
+                log.error("异步发送设备信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+            }
+        });
     }
 
 

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

@@ -1,18 +1,8 @@
 package com.fuyuanshen.global.mqtt.rule.bjq;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson2.JSONObject;
 import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.core.domain.model.LoginUser;
 import com.fuyuanshen.common.core.utils.StringUtils;
-import com.fuyuanshen.common.core.utils.date.DurationUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.common.satoken.utils.LoginHelper;
-import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
-import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
-import com.fuyuanshen.equipment.service.DeviceService;
-import com.fuyuanshen.equipment.service.IDeviceAlarmService;
 import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
 import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
 import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
@@ -23,11 +13,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.time.Duration;
-import java.util.Date;
 import java.util.concurrent.CompletableFuture;
 
 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.global.mqtt.constants.DeviceRedisKeyConstants.*;
 
 /**
@@ -38,10 +26,6 @@ import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
 @Slf4j
 public class BjqAlarmRule implements MqttMessageRule {
 
-    private final IDeviceAlarmService deviceAlarmService;
-    private final DeviceService deviceService;
-
-
     @Override
     public String getCommandType() {
         return LightingCommandTypeConstants.ALARM_MESSAGE;
@@ -54,26 +38,14 @@ public class BjqAlarmRule implements MqttMessageRule {
             Object[] convertArr = context.getConvertArr();
 
             String convertValue = convertArr[1].toString();
-            if (StringUtils.isNotBlank(convertValue)) {
+            if(StringUtils.isNotBlank(convertValue)){
                 // 将设备状态信息存储到Redis中
-                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX;
-                String sendMessageIng = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
-                if ("1".equals(convertValue)) {
-                    RedisUtils.setCacheObject(sendMessageIng, "1", Duration.ofDays(1));
-                    // 存储到Redis
-                    RedisUtils.setCacheObject(deviceRedisKey, "1");
-                } else if ("0".equals(convertValue)) {
-                    RedisUtils.deleteObject(sendMessageIng);
-                    RedisUtils.deleteObject(deviceRedisKey);
-                }
+                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));
-            //  保存告警信息
-            String deviceImei = context.getDeviceImei();
-            // 设备告警状态 0:解除告警 1:报警产生
-            Byte state = (Byte) convertArr[1];
-            savaAlarm(deviceImei, state);
-
         } catch (Exception e) {
             log.error("处理告警命令时出错", e);
             RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
@@ -81,55 +53,4 @@ public class BjqAlarmRule implements MqttMessageRule {
     }
 
 
-    public void savaAlarm(String deviceImei, Byte state) {
-        DeviceAlarmVo deviceAlarmVo = deviceAlarmService.queryLatestByDeviceImei(deviceImei);
-        DeviceAlarmBo deviceAlarmBo = new DeviceAlarmBo();
-
-        // 解除告警
-        if (state == 0) {
-            if (deviceAlarmVo != null) {
-                if (deviceAlarmVo.getFinishTime() == null) {
-                    BeanUtil.copyProperties(deviceAlarmVo, deviceAlarmBo);
-                    deviceAlarmBo.setFinishTime(new Date());
-                    String durationBetween = DurationUtils.getDurationBetween(deviceAlarmVo.getStartTime(), deviceAlarmBo.getFinishTime());
-                    deviceAlarmBo.setDurationTime(durationBetween);
-                    // 0已处理，1未处理
-                    deviceAlarmBo.setTreatmentState(0);
-                    // 告警状态，0 解除告警， 1 告警中
-                    deviceAlarmBo.setAlarmState(0);
-                    deviceAlarmService.updateByBo(deviceAlarmBo);
-                }
-            }
-        }
-
-        // 报警产生
-        if (state == 1) {
-            if (deviceAlarmVo == null || deviceAlarmVo.getFinishTime() != null) {
-
-                Device device = deviceService.selectDeviceByImei(deviceImei);
-                deviceAlarmBo.setDeviceId(device.getId());
-                deviceAlarmBo.setDeviceImei(deviceImei);
-                //  0-强制报警，1-撞击闯入，2-自动报警，3-电子围栏告警
-                deviceAlarmBo.setDeviceAction(0);
-                deviceAlarmBo.setStartTime(new Date());
-                // 0已处理，1未处理
-                deviceAlarmBo.setTreatmentState(1);
-                // 告警状态，0 解除告警， 1 告警中
-                deviceAlarmBo.setAlarmState(1);
-
-                // LoginUser loginUser = LoginHelper.getLoginUser();
-                // deviceAlarmBo.setCreateBy(loginUser.getUserId());
-                deviceAlarmBo.setTenantId(device.getTenantId());
-
-                String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + deviceImei + DEVICE_LOCATION_KEY_PREFIX);
-                if (StringUtils.isNotBlank(location)) {
-                    JSONObject jsonObject = JSONObject.parseObject(location);
-                    deviceAlarmBo.setLocation(jsonObject.getString("address"));
-                }
-                deviceAlarmService.insertByBo(deviceAlarmBo);
-            }
-        }
-
-    }
-
 }

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

@@ -44,37 +44,37 @@ public class BjqBootLogoRule implements MqttMessageRule {
     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));
+            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);

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

@@ -15,7 +15,8 @@ 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.*;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_LIGHT_MODE_KEY_PREFIX;
 
 /**
  * 灯光模式订阅设备回传消息
@@ -34,15 +35,19 @@ public class BjqLaserModeSettingsRule implements MqttMessageRule {
     public void execute(MqttRuleContext context) {
         String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
         try {
-//            Object[] convertArr = context.getConvertArr();
-//
-//            String mode = convertArr[1].toString();
-//            if(StringUtils.isNotBlank(mode)){
-//                // 发送设备状态和位置信息到Redis
-//                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),mode);
-//            }
-//
-//            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(30));
+            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));
@@ -60,7 +65,7 @@ public class BjqLaserModeSettingsRule implements MqttMessageRule {
 //        });
         try {
             // 将设备状态信息存储到Redis中
-            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_LASER_MODE_KEY_PREFIX;
+            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_LIGHT_MODE_KEY_PREFIX;
 
             // 存储到Redis
             RedisUtils.setCacheObject(deviceRedisKey, convertValue.toString());
@@ -71,4 +76,5 @@ public class BjqLaserModeSettingsRule implements MqttMessageRule {
     }
 
 
+
 }

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

@@ -34,15 +34,15 @@ public class BjqLightBrightnessRule implements MqttMessageRule {
     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));
+            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

@@ -5,8 +5,6 @@ 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.mapper.DeviceMapper;
-import com.fuyuanshen.equipment.service.DeviceService;
 import com.fuyuanshen.equipment.utils.map.GetAddressFromLatUtil;
 import com.fuyuanshen.equipment.utils.map.LngLonUtil;
 import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
@@ -38,9 +36,8 @@ import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVIC
 @RequiredArgsConstructor
 @Slf4j
 public class BjqLocationDataRule implements MqttMessageRule {
-
+    
     private final MqttGateway mqttGateway;
-    private final DeviceService deviceService;
 
 
     @Override
@@ -52,26 +49,20 @@ public class BjqLocationDataRule implements MqttMessageRule {
     public void execute(MqttRuleContext context) {
         String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
         try {
-//            Object[] convertArr = context.getConvertArr();
-//            // Latitude, longitude
-//            String latitude = convertArr[1].toString();
-//            String longitude = convertArr[2].toString();
-//            // 判断 latitude 和 longitude 是否都为 0
-//            if ("0".equals(latitude) && "0".equals(longitude)) {
-//                log.info("位置信息为0，不存储到Redis: device={}, lat={}, lon={}", context.getDeviceImei(), latitude, longitude);
-//                return;
-//            }
-//            // 异步发送经纬度到Redis
-//            asyncSendLocationToRedisWithFuture(context.getDeviceImei(), latitude, longitude);
-//            // 异步保存数据
-//            asyncSaveLocationToMySQLWithFuture(context.getDeviceImei(), latitude, longitude);
-//
-//            Map<String, Object> map = buildLocationDataMap(latitude, longitude);
-//            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
-//            log.info("发送定位数据到设备=>topic:{},payload:{}",
-//                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
-//                    JsonUtils.toJsonString(map));
-//            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+            Object[] convertArr = context.getConvertArr();
+            // Latitude, longitude
+            String latitude = convertArr[1].toString();
+            String longitude = convertArr[2].toString();
+
+            // 异步发送经纬度到Redis
+            asyncSendLocationToRedisWithFuture(context.getDeviceImei(), latitude, longitude);
+
+            Map<String, Object> map = buildLocationDataMap(latitude, longitude);
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
+            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));
@@ -121,93 +112,71 @@ public class BjqLocationDataRule implements MqttMessageRule {
      * @param longitude  经度
      */
     public void asyncSendLocationToRedisWithFuture(String deviceImei, String latitude, String longitude) {
-        try {
-            if (StringUtils.isBlank(latitude) || StringUtils.isBlank(longitude)) {
-                return;
-            }
+        CompletableFuture.runAsync(() -> {
+            try {
+                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[] 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;
-//                    }
-//                }
+                    String cacheLatitude = jsonOBj.getString("wgs84_latitude");
+                    String cacheLongitude = jsonOBj.getString("wgs84_longitude");
+                    String[] latArr1 = cacheLatitude.split("\\.");
+                    String[] lonArr1 = cacheLongitude.split("\\.");
 
-            // 构造位置信息对象
-            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());
+                    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());
 
 
-            String locationJson = JsonUtils.toJsonString(locationInfo);
+                
+                String locationJson = JsonUtils.toJsonString(locationInfo);
 
-            // 存储到Redis
-            RedisUtils.setCacheObject(redisKey, locationJson);
+                // 存储到Redis
+                RedisUtils.setCacheObject(redisKey, locationJson);
 
-            // 存储到一个列表中，保留历史位置信息
+                // 存储到一个列表中，保留历史位置信息
 //                String locationHistoryKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_LOCATION_HISTORY_KEY_PREFIX + deviceImei;
 //                RedisUtils.addCacheList(locationHistoryKey, locationJson);
 //                RedisUtils.expire(locationHistoryKey, Duration.ofDays(90));
-            storeDeviceTrajectoryWithSortedSet(deviceImei, locationJson);
-            log.info("位置信息已异步发送到Redis: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
-        } catch (Exception e) {
-            log.error("异步发送位置信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
-        }
-    }
-
-
-    /**
-     * 异步保存位置信息到MySQL数据库
-     *
-     * @param deviceImei 设备IMEI
-     * @param latitude   纬度
-     * @param longitude  经度
-     */
-    public void asyncSaveLocationToMySQLWithFuture(String deviceImei, String latitude, String longitude) {
-        try {
-            if (StringUtils.isBlank(latitude) || StringUtils.isBlank(longitude)) {
-                return;
+                storeDeviceTrajectoryWithSortedSet(deviceImei, locationJson);
+                log.info("位置信息已异步发送到Redis: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
+            } catch (Exception e) {
+                log.error("异步发送位置信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
             }
-
-            // 调用服务层方法更新设备位置信息
-            deviceService.updateDeviceLocationByImei(deviceImei, longitude, latitude);
-
-            log.info("位置信息已异步保存到MySQL: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
-        } catch (Exception e) {
-            log.error("异步保存位置信息到MySQL时出错: 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 = 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();
@@ -225,20 +194,20 @@ public class BjqLocationDataRule implements MqttMessageRule {
             log.error("存储设备轨迹到Redis(ZSet)失败: device={}, error={}", deviceImei, e.getMessage(), e);
         }
     }
-
+    
     private Map<String, Object> buildLocationDataMap(String latitude, String longitude) {
         String[] latArr = latitude.split("\\.");
         String[] lonArr = longitude.split("\\.");
-
+        
         ArrayList<Integer> intData = new ArrayList<>();
         intData.add(11);
         intData.add(Integer.parseInt(latArr[0]));
         String str1 = latArr[1];
-        intData.add(Integer.parseInt(str1.substring(0, 4)));
+        intData.add(Integer.parseInt(str1.substring(0,4)));
         String str2 = lonArr[1];
         intData.add(Integer.parseInt(lonArr[0]));
-        intData.add(Integer.parseInt(str2.substring(0, 4)));
-
+        intData.add(Integer.parseInt(str2.substring(0,4)));
+        
         Map<String, Object> map = new HashMap<>();
         map.put("instruct", intData);
         return map;

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

@@ -1,16 +1,8 @@
 package com.fuyuanshen.global.mqtt.rule.bjq;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.core.utils.StringUtils;
-import com.fuyuanshen.common.core.utils.date.DurationUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
-import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
-import com.fuyuanshen.equipment.service.DeviceService;
-import com.fuyuanshen.equipment.service.IDeviceAlarmService;
 import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
 import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
 import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
@@ -21,11 +13,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.time.Duration;
-import java.util.Date;
 import java.util.concurrent.CompletableFuture;
 
 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.global.mqtt.constants.DeviceRedisKeyConstants.*;
 
 /**
@@ -36,61 +26,32 @@ import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
 @Slf4j
 public class BjqModeRule implements MqttMessageRule {
 
-    private final DeviceService deviceService;
-    private final IDeviceAlarmService deviceAlarmService;
-
-
     @Override
     public String getCommandType() {
         return LightingCommandTypeConstants.LIGHT_MODE;
     }
 
-
     @Override
     public void execute(MqttRuleContext context) {
         String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
         try {
-            log.info("处理灯光模式命令");
-            log.info("MQTT消息负载字典：{}", context.getPayloadDict());
-//            Object[] convertArr = context.getConvertArr();
-//
-//            String mainLightMode = convertArr[1].toString();
-//            String batteryRemainingTime = convertArr[2].toString();
-//            if (StringUtils.isNotBlank(mainLightMode)) {
-//                log.info("设备离线mainLightMode：{}", 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");
-//
-//                    String sendMessageIng = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
-//                    String messageSendingValue = RedisUtils.getCacheObject(sendMessageIng);
-//                    if ("1".equals(messageSendingValue)) {
-//                        // 设置为故障状态
-//                        RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "2");
-//                        UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-//                        updateWrapper.eq("device_imei", context.getDeviceImei());
-//                        updateWrapper.set("online_status", 2);
-//                        deviceService.update(updateWrapper);
-//                        RedisUtils.deleteObject(sendMessageIng);
-//
-//                        // 解除告警
-//                        String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX;
-//                        if (RedisUtils.getCacheObject(deviceRedisKey) != null) {
-//                            RedisUtils.deleteObject(deviceRedisKey);
-//                        }
-//                        cancelAlarm(context.getDeviceImei());
-//                    }
-//                }
-//                // 发送设备状态和位置信息到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));
+            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));
@@ -102,13 +63,13 @@ public class BjqModeRule implements MqttMessageRule {
      *
      * @param deviceImei 设备IMEI
      */
-    public void syncSendDeviceDataToRedisWithFuture(String deviceImei, Object convertValue) {
+    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;
+            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_LIGHT_MODE_KEY_PREFIX;
 
             // 存储到Redis
             RedisUtils.setCacheObject(deviceRedisKey, convertValue.toString());
@@ -119,29 +80,5 @@ public class BjqModeRule implements MqttMessageRule {
     }
 
 
-    /**
-     * 解除告警
-     *
-     * @param deviceImei 设备IMEI
-     */
-
-    public void cancelAlarm(String deviceImei) {
-        DeviceAlarmVo deviceAlarmVo = deviceAlarmService.queryLatestByDeviceImei(deviceImei);
-        DeviceAlarmBo deviceAlarmBo = new DeviceAlarmBo();
-        if (deviceAlarmVo != null) {
-            if (deviceAlarmVo.getFinishTime() == null) {
-                BeanUtil.copyProperties(deviceAlarmVo, deviceAlarmBo);
-                deviceAlarmBo.setFinishTime(new Date());
-                String durationBetween = DurationUtils.getDurationBetween(deviceAlarmVo.getStartTime(), deviceAlarmBo.getFinishTime());
-                deviceAlarmBo.setDurationTime(durationBetween);
-                // 0已处理，1未处理
-                deviceAlarmBo.setTreatmentState(0);
-                // 告警状态，0 解除告警， 1 告警中
-                deviceAlarmBo.setAlarmState(0);
-                deviceAlarmService.updateByBo(deviceAlarmBo);
-            }
-        }
-    }
-
 
 }

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

@@ -1,18 +1,32 @@
 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.*;
 
 /**
  * 定位数据命令处理
@@ -34,12 +48,11 @@ public class BjqPersonnelInfoDataRule implements MqttMessageRule {
     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));
+            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

@@ -43,49 +43,38 @@ public class BjqSendMessageRule implements MqttMessageRule {
     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;
+            }
 
-//            Byte val2 = (Byte) context.getConvertArr()[1];
-//            String val2Str = context.getConvertArr()[1].toString();
-//            int val2 = Integer.parseInt(val2Str);
-//            System.out.println("收到设备信息命令:"+val2);
-//            if (val2 == 100) {
-//                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
-//                return;
-//            }
-//
-//            if(val2==200){
-//                String sendMessageIng = GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
-//                RedisUtils.deleteObject(sendMessageIng);
-//                return;
-//            }
-//
-//
-//            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);
-//            log.info("第{}块数据大小: {} 字节", val2, specificChunk.length);
-////            System.out.println("第" + val2 + "块数据: " + Arrays.toString(specificChunk));
-//
-//            ArrayList<Integer> intData = new ArrayList<>();
-//            intData.add(6);
-//            intData.add(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("发送设备信息数据到设备消息=>topic:{},payload:{}",
-//                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
-//                    JsonUtils.toJsonString(map));
+            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);
+            log.info("第{}块数据大小: {} 字节", val2, specificChunk.length);
+//            System.out.println("第" + val2 + "块数据: " + Arrays.toString(specificChunk));
+
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(6);
+            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("发送设备信息数据到设备消息=>topic:{},payload:{}",
+                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
+                    JsonUtils.toJsonString(map));
 
         } catch (Exception e) {
             log.error("处理发送设备信息时出错", e);

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType10StrobeMode.java

@@ -1,43 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
-import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-
-/**
- * 爆闪模式开启/关闭
- */
-@Slf4j
-@Component
-public class FuncType10StrobeMode implements NewMqttMessageRule {
-
-    @Override
-    public String getCommandType() {
-        return "HBY100_10";
-    }
-
-    @Override
-    public void execute(NewMqttRuleContext context) {
-        log.info("HBY100J爆闪模式开启/关闭，消息负载：{}", context.getPayloadDict());
-
-        try {
-//            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
-//                             context.getDeviceImei() + ":strobeMode";
-//
-//            Map<String, Object> payloadDict = context.getPayloadDict();
-//            if (payloadDict != null) {
-//                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-//            }
-        } catch (Exception e) {
-            log.error("HBY100J爆闪模式开启/关闭失败", e);
-        }
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType11Frequency.java

@@ -1,43 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
-import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-
-/**
- * 修改警示灯爆闪频率
- */
-@Slf4j
-@Component
-public class FuncType11Frequency implements NewMqttMessageRule {
-
-    @Override
-    public String getCommandType() {
-        return "HBY100_11";
-    }
-
-    @Override
-    public void execute(NewMqttRuleContext context) {
-        log.info("HBY100J修改警示灯爆闪频率，消息负载：{}", context.getPayloadDict());
-
-        try {
-//            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
-//                             context.getDeviceImei() + ":frequency";
-//
-//            Map<String, Object> payloadDict = context.getPayloadDict();
-//            if (payloadDict != null) {
-//                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-//            }
-        } catch (Exception e) {
-            log.error("HBY100J修改警示灯爆闪频率失败", e);
-        }
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType12ForceAudio.java

@@ -1,45 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
-import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-
-/**
- * 强制声光报警开启/关闭
- */
-@Slf4j
-@Component
-public class FuncType12ForceAudio implements NewMqttMessageRule {
-
-    @Override
-    public String getCommandType() {
-        return "HBY100_12";
-    }
-
-    @Override
-    public void execute(NewMqttRuleContext context) {
-        log.info("HBY100J强制声光报警开启/关闭，消息负载：{}", context.getPayloadDict());
-
-        try {
-            // 构建强制声光报警开关的Redis键
-//            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
-//                             context.getDeviceImei() + ":forceAudio";
-//
-//            Map<String, Object> payloadDict = context.getPayloadDict();
-//            if (payloadDict != null) {
-//                // 存储强制声光报警开关状态到Redis
-//                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-//            }
-        } catch (Exception e) {
-            log.error("HBY100J强制声光报警开启/关闭失败", e);
-        }
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType13Brightness.java

@@ -1,43 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
-import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-
-/**
- * 警示灯LED亮度调节
- */
-@Slf4j
-@Component
-public class FuncType13Brightness implements NewMqttMessageRule {
-
-    @Override
-    public String getCommandType() {
-        return "HBY100_13";
-    }
-
-    @Override
-    public void execute(NewMqttRuleContext context) {
-        log.info("HBY100J警示灯LED亮度调节，消息负载：{}", context.getPayloadDict());
-
-        try {
-//            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
-//                             context.getDeviceImei() + ":brightness";
-//
-//            Map<String, Object> payloadDict = context.getPayloadDict();
-//            if (payloadDict != null) {
-//                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-//            }
-        } catch (Exception e) {
-            log.error("HBY100J警示灯LED亮度调节失败", e);
-        }
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType14Report.java

@@ -1,43 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
-import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-
-/**
- * 获取警示灯的当前工作方式（设备下发返回响应数据、设备定时主动上报）
- */
-@Slf4j
-@Component
-public class FuncType14Report implements NewMqttMessageRule {
-
-    @Override
-    public String getCommandType() {
-        return "HBY100_14";
-    }
-
-    @Override
-    public void execute(NewMqttRuleContext context) {
-        log.info("HBY100J设备定时主动上报，消息负载：{}", context.getPayloadDict());
-
-        try {
-            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + 
-                             context.getDeviceImei() + ":report";
-            
-            Map<String, Object> payloadDict = context.getPayloadDict();
-            if (payloadDict != null) {
-                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-            }
-        } catch (Exception e) {
-            log.error("HBY100J设备定时主动上报失败", e);
-        }
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType1Rest.java

@@ -1,46 +0,0 @@
-//package com.fuyuanshen.global.mqtt.rule.hby100j;
-//
-//import com.alibaba.fastjson2.JSONObject;
-//import com.fuyuanshen.common.core.constant.GlobalConstants;
-//import com.fuyuanshen.common.redis.utils.RedisUtils;
-//import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
-//import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.Map;
-//
-//import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-//
-///**
-// * 设备复位
-// */
-//@Slf4j
-//@Component
-//public class FuncType1Rest implements NewMqttMessageRule {
-//
-//    @Override
-//    public String getCommandType() {
-//        return "HBY100_1";
-//    }
-//
-//    @Override
-//    public void execute(NewMqttRuleContext context) {
-//        log.info("开始处理设备复位，消息负载：{}", context.getPayloadDict());
-//
-//        try {
-//            // 构建强制声光报警开关的Redis键
-////            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
-////                             context.getDeviceImei() + ":force_audio_visual_alarm_switch";
-////
-////            Map<String, Object> payloadDict = context.getPayloadDict();
-////            if (payloadDict != null) {
-////                // 存储强制声光报警开关状态到Redis
-////                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-////            }
-//            log.info("设备复位，设备ID：{}", context.getDeviceImei());
-//        } catch (Exception e) {
-//            log.error("处理设备复位失败", e);
-//        }
-//    }
-//}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType2BaseInfo.java

@@ -1,46 +0,0 @@
-//package com.fuyuanshen.global.mqtt.rule.hby100j;
-//
-//import com.alibaba.fastjson2.JSONObject;
-//import com.fuyuanshen.common.core.constant.GlobalConstants;
-//import com.fuyuanshen.common.redis.utils.RedisUtils;
-//import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
-//import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.Map;
-//
-//import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-//
-///**
-// * 获取设备基础信息
-// */
-//@Slf4j
-//@Component
-//public class FuncType2BaseInfo implements NewMqttMessageRule {
-//
-//    @Override
-//    public String getCommandType() {
-//        return "HBY100_2";
-//    }
-//
-//    @Override
-//    public void execute(NewMqttRuleContext context) {
-//        log.info("开始处理强制声光报警开关，消息负载：{}", context.getPayloadDict());
-//
-//        try {
-//            // 构建强制声光报警开关的Redis键
-//            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
-//                             context.getDeviceImei() + ":force_audio_visual_alarm_switch";
-//
-//            Map<String, Object> payloadDict = context.getPayloadDict();
-//            if (payloadDict != null) {
-//                // 存储强制声光报警开关状态到Redis
-//                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-//            }
-//            log.info("强制声光报警开关处理完成，设备ID：{}", context.getDeviceImei());
-//        } catch (Exception e) {
-//            log.error("处理强制声光报警开关失败", e);
-//        }
-//    }
-//}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType3Location.java

@@ -1,43 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
-import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-
-/**
- * 获取设备位置信息（设备下发返回响应数据、设备定时主动上报）
- */
-@Slf4j
-@Component
-public class FuncType3Location implements NewMqttMessageRule {
-
-    @Override
-    public String getCommandType() {
-        return "HBY100_3";
-    }
-
-    @Override
-    public void execute(NewMqttRuleContext context) {
-        log.info("HBY100J获取设备位置信息，消息负载：{}", context.getPayloadDict());
-
-        try {
-            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + 
-                             context.getDeviceImei() + ":location";
-            
-            Map<String, Object> payloadDict = context.getPayloadDict();
-            if (payloadDict != null) {
-                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-            }
-        } catch (Exception e) {
-            log.error("HBY100J获取设备位置信息失败", e);
-        }
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType4PowerStatus.java

@@ -1,43 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
-import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-
-/**
- * 获取设备电源状态（设备下发返回响应数据、设备定时主动上报）
- */
-@Slf4j
-@Component
-public class FuncType4PowerStatus implements NewMqttMessageRule {
-
-    @Override
-    public String getCommandType() {
-        return "HBY100_4";
-    }
-
-    @Override
-    public void execute(NewMqttRuleContext context) {
-        log.info("HBY100J获取设备电源状态，消息负载：{}", context.getPayloadDict());
-
-        try {
-            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + 
-                             context.getDeviceImei() + ":powerStatus";
-            
-            Map<String, Object> payloadDict = context.getPayloadDict();
-            if (payloadDict != null) {
-                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-            }
-        } catch (Exception e) {
-            log.error("HBY100J获取设备电源状态失败", e);
-        }
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType5UpdateVoice.java

@@ -1,43 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
-import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-
-/**
- * 更新语音
- */
-@Slf4j
-@Component
-public class FuncType5UpdateVoice implements NewMqttMessageRule {
-
-    @Override
-    public String getCommandType() {
-        return "HBY100_5";
-    }
-
-    @Override
-    public void execute(NewMqttRuleContext context) {
-        log.info("HBY100J更新语音，消息负载：{}", context.getPayloadDict());
-
-        try {
-//            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
-//                             context.getDeviceImei() + ":updateVoice";
-//
-//            Map<String, Object> payloadDict = context.getPayloadDict();
-//            if (payloadDict != null) {
-//                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-//            }
-        } catch (Exception e) {
-            log.error("HBY100J更新语音失败", e);
-        }
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType6VoicePlay.java

@@ -1,43 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
-import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-
-/**
- * 语音播报开启/关闭
- */
-@Slf4j
-@Component
-public class FuncType6VoicePlay implements NewMqttMessageRule {
-
-    @Override
-    public String getCommandType() {
-        return "HBY100_9";
-    }
-
-    @Override
-    public void execute(NewMqttRuleContext context) {
-        log.info("HBY100J语音播报开启/关闭，消息负载：{}", context.getPayloadDict());
-
-        try {
-//            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
-//                             context.getDeviceImei() + ":VoicePlay";
-//
-//            Map<String, Object> payloadDict = context.getPayloadDict();
-//            if (payloadDict != null) {
-//                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-//            }
-        } catch (Exception e) {
-            log.error("HBY100J语音播报开启/关闭失败", e);
-        }
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType9UpdateVolume.java

@@ -1,43 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
-import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-
-/**
- * 修改音量
- */
-@Slf4j
-@Component
-public class FuncType9UpdateVolume implements NewMqttMessageRule {
-
-    @Override
-    public String getCommandType() {
-        return "HBY100_9";
-    }
-
-    @Override
-    public void execute(NewMqttRuleContext context) {
-        log.info("HBY100J修改音量，消息负载：{}", context.getPayloadDict());
-
-        try {
-//            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
-//                             context.getDeviceImei() + ":updateVolume";
-//
-//            Map<String, Object> payloadDict = context.getPayloadDict();
-//            if (payloadDict != null) {
-//                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-//            }
-        } catch (Exception e) {
-            log.error("HBY100J修改音量失败", e);
-        }
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType10StrobeModeRequest.java

@@ -1,58 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 爆闪模式开启/关闭
- * 对应 funcType="10"
- * mode:
- * 0 红色爆闪，1 蓝色爆闪，2 黄色爆闪，3，红色顺时针旋转爆闪，4黄色顺时针旋转爆闪，5，红蓝顺时针旋转爆闪，6 红蓝交替爆闪
- */
-@Data
-public class FuncType10StrobeModeRequest {
-
-    /**
-     * 请求唯一标识符（用于链路追踪或幂等处理）
-     */
-    @JsonProperty("requestId")
-    private String requestId;
-
-    /**
-     * 设备IMEI号（国际移动设备识别码）
-     */
-    private String imei;
-
-    /**
-     * 功能类型编码
-     */
-    private String funcType;
-
-    /**
-     * 时间戳（毫秒级Unix时间戳）
-     */
-    private Long timestamp;
-
-    /**
-     * 语音配置数据
-     */
-    private Data data;
-
-    /**
-     * 语音配置详情内部类
-     */
-    @lombok.Data
-    public static class Data {
-
-        /**
-         * 爆闪模式是否启用
-         * 0 - 禁用
-         * 1 - 启用
-         */
-        private Integer enable;
-        /**
-         * 爆闪模式类型 0 红色爆闪，1 蓝色爆闪，2 黄色爆闪，3，红色顺时针旋转爆闪，4黄色顺时针旋转爆闪，5，红蓝顺时针旋转爆闪，6 红蓝交替爆闪
-         **/
-        private Integer mode;
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType11FrequencyRequest.java

@@ -1,47 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 修改警示灯爆闪频率
- * 对应 funcType="11"
- */
-@Data
-public class FuncType11FrequencyRequest {
-
-    /**
-     * 请求唯一标识符（用于链路追踪或幂等处理）
-     */
-    @JsonProperty("requestId")
-    private String requestId;
-
-    /**
-     * 设备IMEI号（国际移动设备识别码）
-     */
-    private String imei;
-
-    /**
-     * 功能类型编码
-     */
-    private String funcType;
-
-    /**
-     * 时间戳（毫秒级Unix时间戳）
-     */
-    private Long timestamp;
-
-    /**
-     * 语音配置数据
-     */
-    private Data data;
-
-    /**
-     * 语音配置详情内部类
-     */
-    @lombok.Data
-    public static class Data {
-        //"frequency": 1-12
-        private Integer frequency;
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType12ForceAudioRequest.java

@@ -1,51 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 强制声光报警开启/关闭
- * 对应 funcType="12"
- */
-@Data
-public class FuncType12ForceAudioRequest {
-
-    /**
-     * 请求唯一标识符（用于链路追踪或幂等处理）
-     */
-    @JsonProperty("requestId")
-    private String requestId;
-
-    /**
-     * 设备IMEI号（国际移动设备识别码）
-     */
-    private String imei;
-
-    /**
-     * 功能类型编码
-     */
-    private String funcType;
-
-    /**
-     * 时间戳（毫秒级Unix时间戳）
-     */
-    private Long timestamp;
-
-    /**
-     * 语音配置数据
-     */
-    private Data data;
-
-    /**
-     * 语音配置详情内部类
-     */
-    @lombok.Data
-    public static class Data {
-        /**
-         * 语音报警0关闭,1开启
-         */
-        private Integer voiceStrobeAlarm;
-        //语音模式0公安,1消防,2应急,3交警，4市政，5铁路，6医疗，7部队，8水利
-        private Integer mode;
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType13BrightnessRequest.java

@@ -1,59 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 警示灯LED亮度调节
- * 对应 funcType="13"
- */
-@Data
-public class FuncType13BrightnessRequest {
-
-    /**
-     * 请求唯一标识符（用于链路追踪或幂等处理）
-     */
-    @JsonProperty("requestId")
-    private String requestId;
-
-    /**
-     * 设备IMEI号（国际移动设备识别码）
-     */
-    private String imei;
-
-    /**
-     * 功能类型编码
-     */
-    private String funcType;
-
-    /**
-     * 时间戳（毫秒级Unix时间戳）
-     */
-    private Long timestamp;
-
-    /**
-     * 语音配置数据
-     */
-    private Data data;
-
-    /**
-     * 语音配置详情内部类
-     */
-    @lombok.Data
-    public static class Data {
-        /**
-         * 红色LED亮度值0-100
-         */
-        private Integer red;
-
-        /**
-         * 蓝色LED亮度值0-100
-         */
-        private Integer blue;
-
-        /**
-         * 黄色LED亮度值0-100
-         */
-        private Integer yellow;
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType14StatusReport.java

@@ -1,143 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 设备状态上报数据DTO
- * 对应MQTT消息中设备上报的完整状态数据结构
- */
-@Data
-public class FuncType14StatusReport {
-
-    /**
-     * 设备IMEI号（国际移动设备识别码）
-     */
-    private String imei;
-
-    /**
-     * 功能类型编码（如"14"表示特定功能指令）
-     */
-    private String funcType;
-
-    /**
-     * 响应状态码（如"200"表示成功）
-     */
-    private String status;
-
-    /**
-     * 时间戳（毫秒级Unix时间戳）
-     */
-    private Long timestamp;
-
-    /**
-     * 设备详细状态数据
-     */
-    private Data data;
-
-    /**
-     * 设备详细状态数据内部类
-     */
-    @lombok.Data
-    public static class Data {
-        
-        /**
-         * 语音播报开关：0-关闭，1-开启
-         */
-        @JsonProperty("voice_broadcast")
-        private Integer voiceBroadcast;
-
-        /**
-         * 警报器（警笛）设置
-         */
-        @JsonProperty("siren_alarm")
-        private SirenAlarm sirenAlarm;
-
-        /**
-         * LED爆闪设置
-         */
-        @JsonProperty("led_strobe")
-        private LedStrobe ledStrobe;
-
-        /**
-         * 音量设置（0-100范围）
-         */
-        @JsonProperty("volume")
-        private Integer volume;
-
-        /**
-         * 亮度设置（RGB三色亮度值）
-         */
-        @JsonProperty("brightness")
-        private Brightness brightness;
-    }
-
-    /**
-     * 警报器（警笛）设置
-     */
-    @lombok.Data
-    public static class SirenAlarm {
-        
-        /**
-         * 是否启用：0-禁用，1-启用
-         */
-        @JsonProperty("enable")
-        private Integer enable;
-
-        /**
-         * 工作模式：0-默认模式，其他值表示不同报警模式
-         */
-        @JsonProperty("mode")
-        private Integer mode;
-    }
-
-    /**
-     * LED爆闪设置
-     */
-    @lombok.Data
-    public static class LedStrobe {
-        
-        /**
-         * 是否启用：0-禁用，1-启用
-         */
-        @JsonProperty("enable")
-        private Integer enable;
-
-        /**
-         * 工作模式：0-默认模式，其他值表示不同爆闪模式
-         */
-        @JsonProperty("mode")
-        private Integer mode;
-
-        /**
-         * 爆闪频率（单位：Hz或自定义单位）
-         */
-        @JsonProperty("frequency")
-        private Integer frequency;
-    }
-
-    /**
-     * 亮度设置（RGB三色）
-     */
-    @lombok.Data
-    public static class Brightness {
-        
-        /**
-         * 红色通道亮度值（0-255或百分比）
-         */
-        @JsonProperty("red")
-        private Integer red;
-
-        /**
-         * 绿色通道亮度值（0-255或百分比）
-         */
-        @JsonProperty("green")
-        private Integer green;
-
-        /**
-         * 蓝色通道亮度值（0-255或百分比）
-         */
-        @JsonProperty("blue")
-        private Integer blue;
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType5UpdateVoiceReport.java

@@ -1,59 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 更新设备语音
- */
-@Data
-public class FuncType5UpdateVoiceReport {
-
-    /**
-     * 设备IMEI号（国际移动设备识别码）
-     */
-    private String imei;
-
-    /**
-     * 功能类型编码（"5" 表示操作状态上报）
-     */
-    private String funcType;
-
-    /**
-     * 响应状态码（"200" 表示请求成功）
-     */
-    private String status;
-
-    /**
-     * 时间戳（毫秒级Unix时间戳）
-     */
-    private Long timestamp;
-
-    /**
-     * 操作详细状态数据
-     */
-    private Data data;
-
-    /**
-     * 操作状态数据内部类
-     */
-    @lombok.Data
-    public static class Data {
-        
-        /**
-         * 操作执行状态：
-         * 0 - 未开始 / 失败
-         * 1 - 执行中
-         * 2 - 成功完成
-         * （具体含义需结合业务协议定义）
-         */
-        @JsonProperty("status")
-        private Integer status;
-
-        /**
-         * 操作进度百分比（0-100），仅在 status=1（执行中）时有效
-         */
-        @JsonProperty("progress")
-        private Integer progress;
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType5UpdateVoiceRequest.java

@@ -1,60 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 语音资源配置请求DTO
- * 对应 funcType="5" 的语音资源下发指令（如语音播报文件配置）
- */
-@Data
-public class FuncType5UpdateVoiceRequest {
-
-    /**
-     * 请求唯一标识符（用于链路追踪或幂等处理）
-     */
-    @JsonProperty("requestId")
-    private String requestId;
-
-    /**
-     * 设备IMEI号（国际移动设备识别码）
-     */
-    private String imei;
-
-    /**
-     * 功能类型编码（"5" 表示语音资源配置）
-     */
-    private String funcType;
-
-    /**
-     * 时间戳（毫秒级Unix时间戳）
-     */
-    private Long timestamp;
-
-    /**
-     * 语音配置数据
-     */
-    private Data data;
-
-    /**
-     * 语音配置详情内部类
-     */
-    @lombok.Data
-    public static class Data {
-        
-        /**
-         * 语音类型：
-         * 0 - 默认语音（如标准提示音）
-         * 1 - 自定义语音
-         * 2 - 紧急语音
-         * （具体含义需依据设备协议定义）
-         */
-        private Integer voiceType;
-
-        /**
-         * 语音资源URL（MP3等音频文件地址）
-         * 示例：http://8.129.5.250:10001/voice/01.mp3
-         */
-        private String voiceResource;
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType6VoicePlayRequest.java

@@ -1,49 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 语音播报开启/关闭
- * 对应 funcType="6"
- */
-@Data
-public class FuncType6VoicePlayRequest {
-
-    /**
-     * 请求唯一标识符（用于链路追踪或幂等处理）
-     */
-    @JsonProperty("requestId")
-    private String requestId;
-
-    /**
-     * 设备IMEI号（国际移动设备识别码）
-     */
-    private String imei;
-
-    /**
-     * 功能类型编码
-     */
-    private String funcType;
-
-    /**
-     * 时间戳（毫秒级Unix时间戳）
-     */
-    private Long timestamp;
-
-    /**
-     * 语音配置数据
-     */
-    private Data data;
-
-    /**
-     * 语音配置详情内部类
-     */
-    @lombok.Data
-    public static class Data {
-        /**
-         * 语音报警0关闭,1开启
-         */
-        private Integer voiceBroadcast;
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType9UpdateVolumeRequest.java

@@ -1,47 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 修改音量
- * 对应 funcType="9"
- */
-@Data
-public class FuncType9UpdateVolumeRequest {
-
-    /**
-     * 请求唯一标识符（用于链路追踪或幂等处理）
-     */
-    @JsonProperty("requestId")
-    private String requestId;
-
-    /**
-     * 设备IMEI号（国际移动设备识别码）
-     */
-    private String imei;
-
-    /**
-     * 功能类型编码
-     */
-    private String funcType;
-
-    /**
-     * 时间戳（毫秒级Unix时间戳）
-     */
-    private Long timestamp;
-
-    /**
-     * 语音配置数据
-     */
-    private Data data;
-
-    /**
-     * 语音配置详情内部类
-     */
-    @lombok.Data
-    public static class Data {
-        //"volume": 1-100(app端可根据需求把40作为低音量, 70作为中音量，100作为高音量)
-        private Integer volume;
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FunctionType3LocationReport.java

@@ -1,56 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 设备位置上报DTO
- * 对应MQTT消息中设备上报的地理位置数据
- */
-@Data
-public class FunctionType3LocationReport {
-
-    /**
-     * 设备IMEI号（国际移动设备识别码）
-     */
-    private String imei;
-
-    /**
-     * 功能类型编码（如"3"表示位置上报）
-     */
-    private String funcType;
-
-    /**
-     * 响应状态码（如"200"表示成功）
-     */
-    private String status;
-
-    /**
-     * 时间戳（毫秒级Unix时间戳）
-     */
-    private Long timestamp;
-
-    /**
-     * 位置详细数据
-     */
-    private Data data;
-
-    /**
-     * 位置详细数据内部类
-     */
-    @lombok.Data
-    public static class Data {
-        
-        /**
-         * 经度（WGS-84坐标系，如22.543100）
-         */
-        @JsonProperty("longitude")
-        private Double longitude;
-
-        /**
-         * 纬度（WGS-84坐标系，如114.057900）
-         */
-        @JsonProperty("latitude")
-        private Double latitude;
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FunctionType4PowerStatusReport.java

@@ -1,74 +0,0 @@
-package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 设备电源状态上报DTO
- * 对应MQTT消息中设备上报的电源相关状态数据
- */
-@Data
-public class FunctionType4PowerStatusReport {
-
-    /**
-     * 设备IMEI号（国际移动设备识别码）
-     */
-    private String imei;
-
-    /**
-     * 功能类型编码（如"4"表示电源状态上报）
-     */
-    private String funcType;
-
-    /**
-     * 响应状态码（如"200"表示成功）
-     */
-    private String status;
-
-    /**
-     * 时间戳（毫秒级Unix时间戳）
-     */
-    private Long timestamp;
-
-    /**
-     * 电源详细状态数据
-     */
-    private Data data;
-
-    /**
-     * 电源详细状态数据内部类
-     */
-    @lombok.Data
-    public static class Data {
-        
-        /**
-         * 电池容量（如"5000mAh"）
-         */
-        @JsonProperty("capacity")
-        private String capacity;
-
-        /**
-         * 电压值（单位：V，0表示未检测或无电）
-         */
-        @JsonProperty("voltage")
-        private Integer voltage;
-
-        /**
-         * 电量百分比（0-100，0表示低电量或未检测）
-         */
-        @JsonProperty("level")
-        private Integer level;
-
-        /**
-         * 充电状态：0-未充电，1-正在充电
-         */
-        @JsonProperty("charge")
-        private Integer charge;
-
-        /**
-         * 12V电源状态：0-关闭/无输出，1-开启/有输出
-         */
-        @JsonProperty("12v_power")
-        private Integer twelveVPower;
-    }
-}

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

@@ -54,7 +54,7 @@ public class XinghanBootLogoRule implements MqttMessageRule {
 
     @Override
     public void execute(MqttRuleContext ctx) {
-        final String functionAccessKey = FUNCTION_ACCESS_KEY + "LOGO:" + ctx.getDeviceImei();
+        final String functionAccessKey = FUNCTION_ACCESS_KEY + ctx.getDeviceImei();
         try {
             MqttXinghanLogoJson payload = objectMapper.convertValue(
                     ctx.getPayloadDict(), MqttXinghanLogoJson.class);
@@ -62,14 +62,6 @@ public class XinghanBootLogoRule implements MqttMessageRule {
             String respText = payload.getStaPicTrans();
             log.warn("设备上报LOGO：{}", respText);
 
-            // --- 去重 START ---
-            String dedupKey = "xd:MSG:LOGO:" + ctx.getDeviceImei() + ":" + respText;
-            boolean first = RedisUtils.setObjectIfAbsent(dedupKey, "1", Duration.ofSeconds(3));
-            if (!first) {
-                log.warn("重复消息丢弃 {}", dedupKey);
-                return;
-            }
-
             // 1. great! —— 成功标记
             if ("great!".equalsIgnoreCase(respText)) {
                 RedisUtils.setCacheObject(functionAccessKey,
@@ -122,24 +114,13 @@ public class XinghanBootLogoRule implements MqttMessageRule {
 
     private static final int CHUNK_SIZE = 256;
 
-    /**
-     * 计算数据的CRC32校验值，并将结果转换为整数列表
-     *
-     * @param data 需要计算CRC32校验值的字节数组
-     * @return 包含CRC32校验值的整数列表，每个字节对应一个无符号整数
-     */
     private static ArrayList<Integer> crc32AsList(byte[] data) {
-        // 计算CRC32校验值
         CRC32 crc = new CRC32();
         crc.update(data);
-
-        // 将CRC32值转换为字节数组
         byte[] crcBytes = ByteBuffer.allocate(4)
                 .order(ByteOrder.BIG_ENDIAN)
                 .putInt((int) crc.getValue())
                 .array();
-
-        // 将字节数组转换为无符号整数列表
         ArrayList<Integer> list = new ArrayList<>(4);
         for (byte b : crcBytes) {
             list.add(Byte.toUnsignedInt(b));
@@ -147,7 +128,6 @@ public class XinghanBootLogoRule implements MqttMessageRule {
         return list;
     }
 
-
     /* ---------- DTO ---------- */
 
     @Data