hby100japp功能

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

@@ -1,23 +1,16 @@
 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.AppDeviceDetailVo;
 import com.fuyuanshen.app.domain.vo.AppDeviceHBY100JDetailVo;
 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 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 org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
  * HBY100J设备控制类
@@ -25,7 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/app/hby100/device")
+@RequestMapping("/app/hby100j/device")
 public class AppDeviceHBY100JController extends BaseController {
 
     private final DeviceHBY100JBizService deviceHBY100JBizService;
@@ -46,8 +39,8 @@ public class AppDeviceHBY100JController extends BaseController {
      * 更新语音
      */
     @PostMapping("/updateVoice")
-    public R<Void> updateVoice(Long id) {
-        deviceHBY100JBizService.updateVoice(id);
+    public R<Void> updateVoice(@RequestBody HBY100JUpdateVoiceDto dto) {
+        deviceHBY100JBizService.updateVoice(dto);
         return R.ok();
     }
 
@@ -57,10 +50,142 @@ public class AppDeviceHBY100JController extends BaseController {
      */
 
     @PostMapping("/forceAlarmActivation")
-    public R<Void> forceAlarmActivation(@RequestBody AppDeviceSendMsgBo bo) {
+    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;
+    }
 }