From c2eb5ba52495ee030b2a02380f6c968bf3bdafbd Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Wed, 6 Aug 2025 09:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mqtt/constants/TenantsConstant.java | 27 +++++++++++++++++++ .../mqtt/DeviceReceiverMessageHandler.java | 8 +++++- .../src/main/resources/application-dev.yml | 6 ++--- fys-admin/src/main/resources/application.yml | 5 ++-- fys-admin/src/main/resources/logback-plus.xml | 14 +++++----- pom.xml | 14 ++++++++++ 6 files changed, 61 insertions(+), 13 deletions(-) create mode 100644 fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/TenantsConstant.java diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/TenantsConstant.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/TenantsConstant.java new file mode 100644 index 00000000..84931d79 --- /dev/null +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/TenantsConstant.java @@ -0,0 +1,27 @@ +package com.fuyuanshen.global.mqtt.constants; + +/** + * 租户常量定义类 + * 包含系统中使用的各种租户标识 + * + * @author: 默苍璃 + * @date: 2025-08-05 10:46 + */ +public class TenantsConstant { + + /** + * 晶全租户 + */ + public static final String JING_QUAN = "014443"; + + /** + * 富源晟租户 + */ + public static final String FU_YUAN_SHENG = "894078"; + + /** + * 管理员租户 + */ + public static final String ADMIN = "000000"; + +} diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/handler/mqtt/DeviceReceiverMessageHandler.java b/fys-admin/src/main/java/com/fuyuanshen/web/handler/mqtt/DeviceReceiverMessageHandler.java index 2f31fc37..3548e13f 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/handler/mqtt/DeviceReceiverMessageHandler.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/handler/mqtt/DeviceReceiverMessageHandler.java @@ -3,12 +3,14 @@ package com.fuyuanshen.web.handler.mqtt; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fuyuanshen.common.satoken.utils.LoginHelper; import com.fuyuanshen.equipment.domain.Device; import com.fuyuanshen.equipment.domain.DeviceLog; import com.fuyuanshen.equipment.mapper.DeviceLogMapper; import com.fuyuanshen.equipment.mapper.DeviceMapper; import com.fuyuanshen.equipment.utils.map.GetAddressFromLatUtil; import com.fuyuanshen.equipment.utils.map.LngLonUtil; +import com.fuyuanshen.global.mqtt.constants.TenantsConstant; import com.fuyuanshen.web.enums.InstructType6170; import com.fuyuanshen.web.enums.LightModeEnum6170; import lombok.AllArgsConstructor; @@ -52,12 +54,16 @@ public class DeviceReceiverMessageHandler implements MessageHandler { String receivedTopicName = (String) headers.get("mqtt_receivedTopic"); System.out.println("消息来自主题：" + receivedTopicName); + // String tenantId = LoginHelper.getTenantId(); + String tenantId = TenantsConstant.FU_YUAN_SHENG; String payload = message.getPayload().toString(); if (receivedTopicName != null) { // 1. 提取设备ID (从主题中获取) String deviceImei = extractDeviceId(receivedTopicName); - Device device = deviceMapper.selectOne(new QueryWrapper().eq("device_imei", deviceImei)); + Device device = deviceMapper.selectOne(new QueryWrapper() + .eq("tenant_id", tenantId) + .eq("device_imei", deviceImei)); if (device == null) { log.info("不存在的设备IMEI: {}", deviceImei); } else { diff --git a/fys-admin/src/main/resources/application-dev.yml b/fys-admin/src/main/resources/application-dev.yml index a9cb4bab..e586574e 100644 --- a/fys-admin/src/main/resources/application-dev.yml +++ b/fys-admin/src/main/resources/application-dev.yml @@ -1,15 +1,15 @@ --- # 监控中心配置 spring.boot.admin.client: # 增加客户端开关 - enabled: false + enabled: true url: http://localhost:9090/admin instance: service-host-type: IP metadata: username: ${spring.boot.admin.client.username} userpassword: ${spring.boot.admin.client.password} - username: @monitor.username@ - password: @monitor.password@ + username: ${monitor.username} + password: ${monitor.password} --- # snail-job 配置 snail-job: diff --git a/fys-admin/src/main/resources/application.yml b/fys-admin/src/main/resources/application.yml index 37448352..60c91061 100644 --- a/fys-admin/src/main/resources/application.yml +++ b/fys-admin/src/main/resources/application.yml @@ -35,7 +35,8 @@ captcha: # 日志配置 logging: level: - com.fuyuanshen: @logging.level@ + #com.fuyuanshen: @logging.level@ + com.fuyuanshen: ${logging.level} org.springframework: warn org.mybatis.spring.mapper: error org.apache.fury: warn @@ -254,7 +255,7 @@ management: health: show-details: ALWAYS logfile: - external-file: ./logs/sys-console.log + external-file: ./logs/sys-admin-console.log --- # 默认/推荐使用sse推送 sse: diff --git a/fys-admin/src/main/resources/logback-plus.xml b/fys-admin/src/main/resources/logback-plus.xml index afb8124b..e58ea441 100644 --- a/fys-admin/src/main/resources/logback-plus.xml +++ b/fys-admin/src/main/resources/logback-plus.xml @@ -15,13 +15,13 @@ - ${log.path}/sys-console.log - - - - - - + ${log.path}/sys-admin-console.log + + + ${log.path}/sys-admin-console.log.%d{yyyy-MM-dd}.log + + 1 + ${log.pattern} utf-8 diff --git a/pom.xml b/pom.xml index 67f04f5a..3adbdc0c 100644 --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,20 @@ + + jingquan + + + jingquan + info + fys + 123456 + + + + + +