From 67764a733ef48bd9a65f6d7756e2b341b6b6b84e Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Wed, 6 Aug 2025 10:38:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E7=94=B5?= =?UTF-8?q?=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuyuanshen/app/service/AppDeviceBizService.java | 3 --- .../com/fuyuanshen/global/mqtt/config/MqttGateway.java | 6 ------ .../fuyuanshen/global/mqtt/publish/MqttMessageSender.java | 7 +------ .../fuyuanshen/global/mqtt/rule/DeviceBootLogoRule.java | 2 +- .../fuyuanshen/global/mqtt/rule/DeviceSendMessageRule.java | 2 +- .../com/fuyuanshen/global/mqtt/rule/LocationDataRule.java | 2 +- fys-admin/src/main/resources/application-prod.yml | 6 +++--- 7 files changed, 7 insertions(+), 21 deletions(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java index ac36e82..98142e9 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java @@ -166,13 +166,10 @@ public class AppDeviceBizService { } String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX + item.getDeviceImei()); - // 获取电量 if(StringUtils.isNotBlank(location)){ JSONObject jsonObject = JSONObject.parseObject(location); item.setLatitude(jsonObject.getString("latitude")); item.setLongitude(jsonObject.getString("longitude")); - }else{ - item.setBattery("0"); } } }); diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttGateway.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttGateway.java index a1b8eb2..822e5bf 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttGateway.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttGateway.java @@ -4,12 +4,6 @@ import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.mqtt.support.MqttHeaders; import org.springframework.messaging.handler.annotation.Header; -/** - * @Author: HarryLin - * @Date: 2025/3/20 17:06 - * @Company: 北京红山信息科技研究院有限公司 - * @Email: linyun@***.com.cn - **/ @MessagingGateway(defaultRequestChannel = "mqttOutboundChannel") public interface MqttGateway { public abstract void sendMsgToMqtt(@Header(value = MqttHeaders.TOPIC) String topic, String payload); diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/publish/MqttMessageSender.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/publish/MqttMessageSender.java index dcb429c..bb00124 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/publish/MqttMessageSender.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/publish/MqttMessageSender.java @@ -6,12 +6,7 @@ import org.springframework.integration.mqtt.support.MqttHeaders; import org.springframework.messaging.handler.annotation.Header; import org.springframework.stereotype.Service; -/** - * @Author: HarryLin - * @Date: 2025/3/20 16:16 - * @Company: 北京红山信息科技研究院有限公司 - * @Email: linyun@***.com.cn - **/ + @Service public class MqttMessageSender { @Autowired diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/DeviceBootLogoRule.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/DeviceBootLogoRule.java index af5bc10..288a78a 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/DeviceBootLogoRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/DeviceBootLogoRule.java @@ -51,7 +51,7 @@ public class DeviceBootLogoRule implements MqttMessageRule { byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data); byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, (val2 - 1), 512); - System.out.println("第" + val2 + "块数据大小: " + specificChunk.length + " 字节"); + log.info("第{}块数据大小: {} 字节", val2, specificChunk.length); // System.out.println("第" + val2 + "块数据: " + Arrays.toString(specificChunk)); ArrayList intData = new ArrayList<>(); diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/DeviceSendMessageRule.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/DeviceSendMessageRule.java index fab1fde..6c2176b 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/DeviceSendMessageRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/DeviceSendMessageRule.java @@ -50,7 +50,7 @@ public class DeviceSendMessageRule implements MqttMessageRule { byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data); byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, (val2 - 1), 512); - System.out.println("第" + val2 + "块数据大小: " + specificChunk.length + " 字节"); + log.info("第{}块数据大小: {} 字节", val2, specificChunk.length); // System.out.println("第" + val2 + "块数据: " + Arrays.toString(specificChunk)); ArrayList intData = new ArrayList<>(); diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java index 16dec3b..71e9403 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java @@ -181,7 +181,7 @@ public class LocationDataRule implements MqttMessageRule { // RedisUtils.expire(trajectoryKey, Duration.ofDays(30)); // 清理30天前的数据（冗余保护） - long thirtyDaysAgo = System.currentTimeMillis() - (90L * 24 * 60 * 60 * 1000); + long thirtyDaysAgo = System.currentTimeMillis() - (7L * 24 * 60 * 60 * 1000); RedisUtils.zRemoveRangeByScore(trajectoryKey, 0, thirtyDaysAgo); } catch (Exception e) { log.error("存储设备轨迹到Redis(ZSet)失败: device={}, error={}", deviceImei, e.getMessage(), e); diff --git a/fys-admin/src/main/resources/application-prod.yml b/fys-admin/src/main/resources/application-prod.yml index 45255db..8f210fb 100644 --- a/fys-admin/src/main/resources/application-prod.yml +++ b/fys-admin/src/main/resources/application-prod.yml @@ -107,7 +107,7 @@ spring.data: # 数据库索引 database: 1 # redis 密码必须配置 - password: re_fs_11520631 + password: xhYc_djkl382^#780! # 连接超时时间 timeout: 10s # 是否开启ssl @@ -280,8 +280,8 @@ mqtt: password: #YtvpSfCNG url: tcp://47.120.79.150:2883 subClientId: fys_subClient - subTopic: worker/alert/#,worker/location/# - pubTopic: worker/location + subTopic: A/#,B/#,worker/location/# + pubTopic: B/# pubClientId: fys_pubClient