日志配置

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";
+
+}

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<Device>().eq("device_imei", deviceImei));
+            Device device = deviceMapper.selectOne(new QueryWrapper<Device>()
+                    .eq("tenant_id", tenantId)
+                    .eq("device_imei", deviceImei));
             if (device == null) {
                 log.info("不存在的设备IMEI: {}", deviceImei);
             } else {

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@
+  username: ${monitor.username}
-  password: @monitor.password@
+  password: ${monitor.password}
 
 --- # snail-job 配置
 snail-job:

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:

fys-admin/src/main/resources/logback-plus.xml

@@ -15,13 +15,13 @@
 
     <!-- 控制台输出 -->
     <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/sys-console.log</file>
+        <file>${log.path}/sys-admin-console.log</file>
-        <!-- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-        <!--     &lt;!&ndash; 日志文件名格式 &ndash;&gt; -->
+            <!-- 日志文件名格式 -->
-        <!--     <fileNamePattern>${log.path}/sys-console.%d{yyyy-MM-dd}.log</fileNamePattern> -->
+            <fileNamePattern>${log.path}/sys-admin-console.log.%d{yyyy-MM-dd}.log</fileNamePattern>
-        <!--     &lt;!&ndash; 日志最大 1天 &ndash;&gt; -->
+            <!-- 日志最大 1天 -->
-        <!--     <maxHistory>1</maxHistory> -->
+            <maxHistory>1</maxHistory>
-        <!-- </rollingPolicy> -->
+        </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
             <charset>utf-8</charset>

pom.xml

@@ -101,6 +101,20 @@
             <!--     <activeByDefault>true</activeByDefault> -->
             <!-- </activation> -->
         </profile>
+        <profile>
+            <id>jingquan</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>jingquan</profiles.active>
+                <logging.level>info</logging.level>
+                <monitor.username>fys</monitor.username>
+                <monitor.password>123456</monitor.password>
+            </properties>
+            <!-- <activation> -->
+            <!--     &lt;!&ndash; 默认环境 &ndash;&gt; -->
+            <!--     <activeByDefault>true</activeByDefault> -->
+            <!-- </activation> -->
+        </profile>
     </profiles>
 
     <!-- 依赖声明 -->