设备mqtt收发数据

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

@@ -1,9 +1,11 @@
 package com.fuyuanshen.app.controller;
 
+import cn.hutool.json.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
 import com.fuyuanshen.app.domain.dto.APPReNameDTO;
 import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
 import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
 import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
 import com.fuyuanshen.app.service.AppDeviceBizService;
@@ -23,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * APP设备信息管理
@@ -129,7 +132,8 @@ public class AppDeviceController extends BaseController {
      * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）
      */
     @PostMapping("/lightModeSettings")
-    public R<Void> lightModeSettings(@RequestBody JSONObject params) {
+    public R<Void> lightModeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
         appDeviceService.lightModeSettings(params);
         return R.ok();
     }
@@ -139,7 +143,7 @@ public class AppDeviceController extends BaseController {
      *
      */
     @PostMapping("/lightBrightnessSettings")
-    public R<Void> lightBrightnessSettings(@RequestBody JSONObject params) {
+    public R<Void> lightBrightnessSettings(@RequestBody DeviceInstructDto params) {
         appDeviceService.lightBrightnessSettings(params);
         return R.ok();
     }
@@ -149,7 +153,7 @@ public class AppDeviceController extends BaseController {
      *
      */
     @PostMapping("/laserModeSettings")
-    public R<Void> laserModeSettings(@RequestBody JSONObject params) {
+    public R<Void> laserModeSettings(@RequestBody DeviceInstructDto params) {
         appDeviceService.laserModeSettings(params);
         return R.ok();
     }
@@ -159,7 +163,7 @@ public class AppDeviceController extends BaseController {
      *
      */
     @PostMapping("/mapReverseGeocoding")
-    public R<Void> mapReverseGeocoding(@RequestBody JSONObject params) {
+    public R<Void> mapReverseGeocoding(@RequestBody DeviceInstructDto params) {
         String mapJson = appDeviceService.mapReverseGeocoding(params);
         return R.ok(mapJson);
     }