Merge remote-tracking branch 'upstream/main'

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

@@ -1,7 +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;
@@ -18,8 +22,10 @@ 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;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * APP设备信息管理
@@ -38,7 +44,6 @@ public class AppDeviceController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
-
         return appDeviceService.queryAppDeviceList(bo,pageQuery);
     }
 
@@ -105,4 +110,60 @@ public class AppDeviceController extends BaseController {
     public R<Void> sendMessage(@RequestBody AppDeviceSendMsgBo bo) {
         return toAjax(appDeviceService.sendMessage(bo));
     }
+
+    /**
+     * 上传设备logo图片
+     */
+    @PostMapping("/uploadLogo")
+    public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
+
+        MultipartFile file = bo.getFile();
+        if(file.getSize()>1024*1024*2){
+            return R.warn("图片不能大于2M");
+        }
+        appDeviceService.uploadDeviceLogo(bo);
+
+        return R.ok();
+    }
+
+    /**
+     * 灯光模式
+     * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）
+     */
+    @PostMapping("/lightModeSettings")
+    public R<Void> lightModeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.lightModeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 灯光亮度设置
+     *
+     */
+    @PostMapping("/lightBrightnessSettings")
+    public R<Void> lightBrightnessSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.lightBrightnessSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 激光模式设置
+     *
+     */
+    @PostMapping("/laserModeSettings")
+    public R<Void> laserModeSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.laserModeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 地图逆解析
+     *
+     */
+    @PostMapping("/mapReverseGeocoding")
+    public R<Void> mapReverseGeocoding(@RequestBody DeviceInstructDto params) {
+        String mapJson = appDeviceService.mapReverseGeocoding(params);
+        return R.ok(mapJson);
+    }
 }