pom.xml

@@ -28,26 +28,31 @@
     </properties>
 
     <dependencies>
-        <!-- Spring Boot Starter -->
+        <!-- Spring Boot Starter Web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <!-- 核心：添加参数校验依赖（解决javax.validation.Valid解析问题） -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
         <!-- Spring Data JPA -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
-        <!--integration -->
+        <!-- Spring Integration Core -->
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-core</artifactId>
-
         </dependency>
 
-
+        <!-- Spring Integration MQTT -->
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-mqtt</artifactId>
@@ -60,14 +65,14 @@
             <version>8.0.33</version>
         </dependency>
 
-        <!-- MQTT -->
+        <!-- MQTT Client -->
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
             <version>1.2.5</version>
         </dependency>
 
-        <!-- FastJSON -->
+        <!-- FastJSON2 -->
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2</artifactId>
@@ -81,14 +86,12 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- 测试 -->
+        <!-- 测试依赖 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
-
     </dependencies>
 
     <build>

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

@@ -1,7 +1,7 @@
 package com.campus.water.controller;
 
 import com.campus.water.entity.*;
-import com.campus.water.repository.*;
+import com.campus.water.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -1,9 +1,9 @@
 package com.campus.water.controller;
 
 import com.campus.water.entity.WorkOrder;
-import com.campus.water.repository.WorkOrderRepository;
-import com.campus.water.repository.RepairmanRepository;
-import com.campus.water.repository.AlertRepository;
+import com.campus.water.mapper.WorkOrderRepository;
+import com.campus.water.mapper.RepairmanRepository;
+import com.campus.water.mapper.AlertRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/campus/water/mapper/AlertRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.Alert;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/AreaRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.Area;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/DeviceRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.Device;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/DeviceTerminalMappingRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.DeviceTerminalMapping;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/DrinkRecommendationRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.DrinkRecommendation;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/DrinkRecordRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.DrinkRecord;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/InspectionRecordRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.InspectionRecord;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/MaintenancePlanRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.MaintenancePlan;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/MessagePushRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.MessagePush;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/RepairmanRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.Repairman;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/TerminalUsageStatsRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.TerminalUsageStats;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/WaterMakerRealtimeDataRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.WaterMakerRealtimeData;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/WaterQualityHistoryRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.WaterQualityHistory;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/WaterSupplyRealtimeDataRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.WaterSupplyRealtimeData;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/mapper/WorkOrderRepository.java

@@ -1,4 +1,4 @@
-package com.campus.water.repository;
+package com.campus.water.mapper;
 
 import com.campus.water.entity.WorkOrder;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/campus/water/repository/AdminRepository.java

@@ -1,28 +0,0 @@
-package com.campus.water.repository;
-
-import com.campus.water.entity.po.AdminPO;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Optional;
-
-@Repository
-public interface AdminRepository extends JpaRepository<AdminPO, String> {
-    // 登录核心：通过用户名查询
-    Optional<AdminPO> findByUsername(String username);
-
-    // 原有业务方法
-    Optional<AdminPO> findByAdminId(String adminId);
-    List<AdminPO> findByUsernameContaining(String username);
-    List<AdminPO> findByRole(AdminPO.AdminRole role);
-    List<AdminPO> findByStatus(AdminPO.AdminStatus status);
-    Optional<AdminPO> findByPhone(String phone);
-
-    @Query("SELECT a FROM AdminPO a WHERE a.role = ?1 AND a.status = ?2")
-    List<AdminPO> findByRoleAndStatus(AdminPO.AdminRole role, AdminPO.AdminStatus status);
-
-    boolean existsByAdminId(String adminId);
-    boolean existsByPhone(String phone);
-}

src/main/java/com/campus/water/repository/RepairerAuthRepository.java

@@ -1,31 +0,0 @@
-package com.campus.water.repository;
-
-import com.campus.water.entity.po.RepairerAuthPO;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Optional;
-
-@Repository
-public interface RepairerAuthRepository extends JpaRepository<RepairerAuthPO, Long> {
-    // 登录核心：通过用户名查询
-    Optional<RepairerAuthPO> findByUsername(String username);
-
-    // 按维修人员ID查询
-    Optional<RepairerAuthPO> findByRepairmanId(String repairmanId);
-
-    // 按账号状态查询（引用PO内的枚举）
-    List<RepairerAuthPO> findByAccountStatus(RepairerAuthPO.AccountStatus accountStatus);
-
-    // 自定义查询：查询活跃状态的用户
-    @Query("SELECT ra FROM RepairerAuthPO ra WHERE ra.username = ?1 AND ra.accountStatus = 'active'")
-    Optional<RepairerAuthPO> findActiveByUsername(String username);
-
-    // 校验用户名是否存在
-    boolean existsByUsername(String username);
-
-    // 校验维修人员ID是否存在
-    boolean existsByRepairmanId(String repairmanId);
-}

src/main/java/com/campus/water/repository/UserRepository.java

@@ -1,18 +0,0 @@
-package com.campus.water.repository;
-
-import com.campus.water.entity.po.UserPO;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.Optional;
-
-@Repository
-public interface UserRepository extends JpaRepository<UserPO, String> {
-    // 登录核心：通过用户名查询
-    Optional<UserPO> findByUsername(String username);
-
-    // 可补充其他业务方法（如按学号查询）
-    Optional<UserPO> findByStudentNo(String studentNo);
-    boolean existsByUsername(String username);
-    boolean existsByStudentNo(String studentNo);
-}

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

@@ -5,9 +5,9 @@ import com.campus.water.entity.po.AdminPO;
 import com.campus.water.entity.po.RepairerAuthPO;
 import com.campus.water.entity.po.UserPO;
 import com.campus.water.entity.vo.LoginVO;
-import com.campus.water.repository.AdminRepository;
-import com.campus.water.repository.RepairerAuthRepository;
-import com.campus.water.repository.UserRepository;
+import com.campus.water.mapper.AdminRepository;
+import com.campus.water.mapper.RepairerAuthRepository;
+import com.campus.water.mapper.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;

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

@@ -4,9 +4,9 @@ import com.campus.water.config.MqttConfig;
 import com.campus.water.entity.Alert;
 import com.campus.water.entity.WaterMakerRealtimeData;
 import com.campus.water.entity.WaterSupplyRealtimeData;
-import com.campus.water.repository.AlertRepository;
-import com.campus.water.repository.WaterMakerRealtimeDataRepository;
-import com.campus.water.repository.WaterSupplyRealtimeDataRepository;
+import com.campus.water.mapper.AlertRepository;
+import com.campus.water.mapper.WaterMakerRealtimeDataRepository;
+import com.campus.water.mapper.WaterSupplyRealtimeDataRepository;
 import com.campus.water.model.WaterMakerSensorData;
 import com.campus.water.model.WaterSupplySensorData;
 import com.fasterxml.jackson.databind.ObjectMapper;