diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType10StrobeMode.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType10StrobeMode.java index 004792d3..409d665d 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType10StrobeMode.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType10StrobeMode.java @@ -29,13 +29,13 @@ public class FuncType10StrobeMode implements NewMqttMessageRule { log.info("HBY100J爆闪模式开启/关闭,消息负载:{}", context.getPayloadDict()); try { - String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + - context.getDeviceImei() + ":strobeMode"; - - Map payloadDict = context.getPayloadDict(); - if (payloadDict != null) { - RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); - } +// String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + +// context.getDeviceImei() + ":strobeMode"; +// +// Map payloadDict = context.getPayloadDict(); +// if (payloadDict != null) { +// RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); +// } } catch (Exception e) { log.error("HBY100J爆闪模式开启/关闭失败", e); } diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType11Frequency.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType11Frequency.java index 3e442033..7e93a6ab 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType11Frequency.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType11Frequency.java @@ -29,13 +29,13 @@ public class FuncType11Frequency implements NewMqttMessageRule { log.info("HBY100J修改警示灯爆闪频率,消息负载:{}", context.getPayloadDict()); try { - String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + - context.getDeviceImei() + ":frequency"; - - Map payloadDict = context.getPayloadDict(); - if (payloadDict != null) { - RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); - } +// String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + +// context.getDeviceImei() + ":frequency"; +// +// Map payloadDict = context.getPayloadDict(); +// if (payloadDict != null) { +// RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); +// } } catch (Exception e) { log.error("HBY100J修改警示灯爆闪频率失败", e); } diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType12ForceAudio.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType12ForceAudio.java index de724607..0b4b46e6 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType12ForceAudio.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType12ForceAudio.java @@ -30,14 +30,14 @@ public class FuncType12ForceAudio implements NewMqttMessageRule { try { // 构建强制声光报警开关的Redis键 - String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + - context.getDeviceImei() + ":forceAudio"; - - Map payloadDict = context.getPayloadDict(); - if (payloadDict != null) { - // 存储强制声光报警开关状态到Redis - RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); - } +// String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + +// context.getDeviceImei() + ":forceAudio"; +// +// Map payloadDict = context.getPayloadDict(); +// if (payloadDict != null) { +// // 存储强制声光报警开关状态到Redis +// RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); +// } } catch (Exception e) { log.error("HBY100J强制声光报警开启/关闭失败", e); } diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType13Brightness.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType13Brightness.java index 351a5031..74af4211 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType13Brightness.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType13Brightness.java @@ -29,13 +29,13 @@ public class FuncType13Brightness implements NewMqttMessageRule { log.info("HBY100J警示灯LED亮度调节,消息负载:{}", context.getPayloadDict()); try { - String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + - context.getDeviceImei() + ":brightness"; - - Map payloadDict = context.getPayloadDict(); - if (payloadDict != null) { - RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); - } +// String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + +// context.getDeviceImei() + ":brightness"; +// +// Map payloadDict = context.getPayloadDict(); +// if (payloadDict != null) { +// RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); +// } } catch (Exception e) { log.error("HBY100J警示灯LED亮度调节失败", e); } diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType5UpdateVoice.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType5UpdateVoice.java index 9bbfe1b0..724c3171 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType5UpdateVoice.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType5UpdateVoice.java @@ -29,13 +29,13 @@ public class FuncType5UpdateVoice implements NewMqttMessageRule { log.info("HBY100J更新语音,消息负载:{}", context.getPayloadDict()); try { - String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + - context.getDeviceImei() + ":updateVoice"; - - Map payloadDict = context.getPayloadDict(); - if (payloadDict != null) { - RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); - } +// String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + +// context.getDeviceImei() + ":updateVoice"; +// +// Map payloadDict = context.getPayloadDict(); +// if (payloadDict != null) { +// RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); +// } } catch (Exception e) { log.error("HBY100J更新语音失败", e); } diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType6VoicePlay.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType6VoicePlay.java index f19acd8c..75a53dca 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType6VoicePlay.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType6VoicePlay.java @@ -29,13 +29,13 @@ public class FuncType6VoicePlay implements NewMqttMessageRule { log.info("HBY100J语音播报开启/关闭,消息负载:{}", context.getPayloadDict()); try { - String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + - context.getDeviceImei() + ":VoicePlay"; - - Map payloadDict = context.getPayloadDict(); - if (payloadDict != null) { - RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); - } +// String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + +// context.getDeviceImei() + ":VoicePlay"; +// +// Map payloadDict = context.getPayloadDict(); +// if (payloadDict != null) { +// RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); +// } } catch (Exception e) { log.error("HBY100J语音播报开启/关闭失败", e); } diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType9UpdateVolume.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType9UpdateVolume.java index 182ad844..0407f8c5 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType9UpdateVolume.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType9UpdateVolume.java @@ -29,13 +29,13 @@ public class FuncType9UpdateVolume implements NewMqttMessageRule { log.info("HBY100J修改音量,消息负载:{}", context.getPayloadDict()); try { - String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + - context.getDeviceImei() + ":updateVolume"; - - Map payloadDict = context.getPayloadDict(); - if (payloadDict != null) { - RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); - } +// String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + +// context.getDeviceImei() + ":updateVolume"; +// +// Map payloadDict = context.getPayloadDict(); +// if (payloadDict != null) { +// RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict)); +// } } catch (Exception e) { log.error("HBY100J修改音量失败", e); } diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/Test.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/Test.java deleted file mode 100644 index 4146409e..00000000 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/Test.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.fuyuanshen.global.mqtt.rule.hby100j.domin; - -import com.alibaba.fastjson2.JSONObject; - -public class Test { - public static void main(String[] args) { - String a = "{\n" + - "\"imei\":\"868108070185303\",\n" + - "\"funcType\":\"14\",\n" + - "\"status\":\"200\",\n" + - "\"timestamp\":1770169375000,\n" + - "\"data\":{\n" + - "\"voice_broadcast\":0,\n" + - "\"siren_alarm\":{\n" + - "\"enable\":0,\n" + - "\"mode\":0\n" + - "},\n" + - "\"led_strobe\":{\n" + - "\"enable\":1,\n" + - "\"mode\":0,\n" + - "\"frequency\":0\n" + - "},\n" + - "\"volume\":0,\n" + - "\"brightness\":{\n" + - "\"red\":0,\n" + - "\"green\":0,\n" + - "\"blue\":0\n" + - "}\n" + - "}\n" + - "}"; - FuncType14StatusReport deviceStatusReport = JSONObject.parseObject(a, FuncType14StatusReport.class); - System.out.println(deviceStatusReport); - System.out.println("hello world"); - } -} diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceHBY100JBizService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceHBY100JBizService.java index 15d909cf..b2f81c44 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceHBY100JBizService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceHBY100JBizService.java @@ -195,7 +195,7 @@ public class DeviceHBY100JBizService { FuncType6VoicePlayRequest request = new FuncType6VoicePlayRequest(); request.setRequestId(GenerateIdUtil.generateNumericId()); request.setImei(deviceObj.getDeviceImei()); - request.setFuncType("12"); + request.setFuncType("6"); request.setTimestamp(System.currentTimeMillis()); FuncType6VoicePlayRequest.Data data = new FuncType6VoicePlayRequest.Data(); data.setVoiceBroadcast(bo.getVoiceStrobeAlarm());