pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.18</version>
+        <version>3.3.5</version>
         <relativePath/>
     </parent>
 

src/main/java/com/campus/water/config/MqttConfig.java

@@ -42,6 +42,10 @@ public class MqttConfig {
         options.setAutomaticReconnect(true); // 断线自动重连
         options.setCleanSession(true); // 断开后清除会话
 
+        // 在 MqttConfig 的 mqttClientFactory() 中增强连接选项
+        options.setAutomaticReconnect(true); // 启用自动重连
+        options.setMaxReconnectDelay(5000); // 重连间隔（毫秒，与原 5 秒一致）
+
         factory.setConnectionOptions(options);
         return factory;
     }

src/main/java/com/campus/water/config/MqttInboundConfig.java

@@ -5,6 +5,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;
 import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
 
+
 @Configuration
 public class MqttInboundConfig {
 
@@ -27,8 +28,6 @@ public class MqttInboundConfig {
         adapter.setQos(mqttConfig.QOS); // 订阅QOS等级与发送端一致
         adapter.setOutputChannel(mqttConfig.mqttInputChannel()); // 消息转发到接收通道
 
-        // 开启异常重试（避免网络波动导致消息丢失）
-        adapter.setRecoveryInterval(5000); // 重试间隔5秒
 
         return adapter;
     }

src/main/java/com/campus/water/controller/LoginController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * 登录接口控制器（公共接口）

src/main/java/com/campus/water/entity/Alert.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Data

src/main/java/com/campus/water/entity/Area.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Data

src/main/java/com/campus/water/entity/Device.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 

src/main/java/com/campus/water/entity/DeviceTerminalMapping.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 

src/main/java/com/campus/water/entity/DrinkRecommendation.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 

src/main/java/com/campus/water/entity/DrinkRecord.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Data

src/main/java/com/campus/water/entity/InspectionRecord.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Data

src/main/java/com/campus/water/entity/MaintenancePlan.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 

src/main/java/com/campus/water/entity/MessagePush.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Data

src/main/java/com/campus/water/entity/RepairerAuth.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Data

src/main/java/com/campus/water/entity/Repairman.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Data

src/main/java/com/campus/water/entity/TerminalUsageStats.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 

src/main/java/com/campus/water/entity/User.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Data

src/main/java/com/campus/water/entity/WaterMakerRealtimeData.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Data

src/main/java/com/campus/water/entity/WaterQualityHistory.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Data

src/main/java/com/campus/water/entity/WaterSupplyRealtimeData.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Data

src/main/java/com/campus/water/entity/WorkOrder.java

@@ -6,7 +6,7 @@
 package com.campus.water.entity;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Data

src/main/java/com/campus/water/entity/dto/request/LoginRequest.java

@@ -2,7 +2,7 @@
 package com.campus.water.entity.dto.request;
 
 import lombok.Data;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Data
 public class LoginRequest { // 命名改为Request，符合dto/request分类

src/main/java/com/campus/water/entity/po/AdminPO.java

@@ -1,7 +1,7 @@
 package com.campus.water.entity.po;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Data
 @Entity

src/main/java/com/campus/water/entity/po/RepairerAuthPO.java

@@ -1,7 +1,7 @@
 package com.campus.water.entity.po;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Data
 @Entity

src/main/java/com/campus/water/entity/po/UserPO.java

@@ -1,7 +1,7 @@
 package com.campus.water.entity.po;
 
 import lombok.Data;
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Data
 @Entity

src/main/java/com/campus/water/service/MqttSensorReceiver.java

@@ -18,7 +18,7 @@ import org.springframework.integration.mqtt.support.MqttHeaders;
 import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.time.LocalDateTime;
 
 @Service

src/main/resources/application.yml

@@ -1,25 +1,33 @@
-# MQTT??????????
-mqtt.enabled=false
+# MQTT 配置（是否启用 + 连接参数）
+mqtt:
+  enabled: true  # 是否启用 MQTT 客户端
 
-# ??Bean????
-spring.main.allow-bean-definition-overriding=true
 
-# Database Configuration
-spring.datasource.url=jdbc:mysql://localhost:3306/campus_water_management?useSSL=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8
-spring.datasource.username=root
-spring.datasource.password=wl1113
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+# Spring 核心配置：允许 Bean 定义覆盖（解决 Bean 重复定义冲突）
+spring:
+  main:
+    allow-bean-definition-overriding: true  # 缩进在 spring 下，作为子配置
+  # 数据库配置
+  datasource:
+    url: jdbc:mysql://localhost:3306/campus_water_management?useSSL=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8
+    username: root
+    password: wl1113
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  # JPA 配置
+  jpa:
+    hibernate:
+      ddl-auto: update  # 自动更新表结构（开发环境用，生产环境建议改为 none）
+    show-sql: true  # 打印 SQL 语句
+    properties:
+      hibernate:
+        format_sql: true  # 格式化 SQL 语句
+        jdbc.lob.non_contextual_creation: true  # 解决 LOB 字段创建警告
+        dialect: org.hibernate.dialect.MySQL8Dialect  # MySQL 8 方言
 
-# JPA Configuration
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.show-sql=true
-spring.jpa.properties.hibernate.format_sql=true
-spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
-
-# Database Dialect
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect
-
-# ????
-server.servlet.encoding.charset=UTF-8
-server.servlet.encoding.enabled=true
-server.servlet.encoding.force=true
+# 服务器编码配置
+server:
+  servlet:
+    encoding:
+      charset: UTF-8
+      enabled: true
+      force: true  # 移除末尾多余的 zs