软件包路径修改

src/main/java/com/campus/water/CampusWaterApplication.java

@@ -1,4 +1,4 @@
-package com.campus.water;
+package main.java.com.campus.water;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -10,7 +10,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * Spring Boot 主启动类
  * 核心注解：开启自动配置、定时任务、Spring Integration
  */
-@SpringBootApplication(scanBasePackages = "com.campus.water") // 扫描所有业务组件
+@SpringBootApplication(scanBasePackages = "main.java.com.campus.water") // 扫描所有业务组件
 @EnableScheduling // 开启定时任务（支持@Scheduled）
 @EnableIntegration // 开启Spring Integration（支持MQTT集成）
 @EnableIntegrationManagement // 开启Integration管理（监控消息流转）

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

@@ -1,5 +1,5 @@
 // com/campus/water/config/MD5PasswordEncoder.java
-package com.campus.water.config;
+package main.java.com.campus.water.config;
 
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.util.DigestUtils;

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

@@ -1,4 +1,4 @@
-package com.campus.water.config;
+package main.java.com.campus.water.config;
 
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.springframework.context.annotation.Bean;

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

@@ -1,5 +1,5 @@
-package com.campus.water.config;
-import com.campus.water.config.MqttConfig;//编译器问题
+package main.java.com.campus.water.config;
+import main.java.com.campus.water.config.MqttConfig;//编译器问题
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;

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

@@ -1,8 +1,8 @@
 // com/campus/water/config/SecurityConfig.java
-package com.campus.water.config;
+package main.java.com.campus.water.config;
 
-import com.campus.water.security.JwtAuthenticationFilter;
-import com.campus.water.security.UserDetailsServiceImpl;
+import main.java.com.campus.water.security.JwtAuthenticationFilter;
+import main.java.com.campus.water.security.UserDetailsServiceImpl;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationManager;

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

@@ -1,8 +1,8 @@
-package com.campus.water.controller;
+package main.java.com.campus.water.controller;
 
-import com.campus.water.entity.Alert;
-import com.campus.water.mapper.AlertRepository;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.Alert;
+import main.java.com.campus.water.mapper.AlertRepository;
+import main.java.com.campus.water.util.ResultVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

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

@@ -1,6 +1,6 @@
-package com.campus.water.controller;
+package main.java.com.campus.water.controller;
 
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.util.ResultVO;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;

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

@@ -1,9 +1,9 @@
-package com.campus.water.controller; // 修正包路径：去掉main.java + 按规范放在common子包
+package main.java.com.campus.water.controller; // 修正包路径：去掉main.java + 按规范放在common子包
 
-import com.campus.water.entity.dto.request.LoginRequest; // 替换原LoginDTO为规范的LoginRequest
-import com.campus.water.entity.vo.LoginVO;
-import com.campus.water.service.LoginService;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.dto.request.LoginRequest; // 替换原LoginDTO为规范的LoginRequest
+import main.java.com.campus.water.entity.vo.LoginVO;
+import main.java.com.campus.water.service.LoginService;
+import main.java.com.campus.water.util.ResultVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;

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

@@ -1,8 +1,8 @@
-package com.campus.water.controller;
+package main.java.com.campus.water.controller;
 
-import com.campus.water.entity.dto.request.RegisterRequest;
-import com.campus.water.service.RegisterService;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.dto.request.RegisterRequest;
+import main.java.com.campus.water.service.RegisterService;
+import main.java.com.campus.water.util.ResultVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;

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

@@ -1,8 +1,8 @@
-package com.campus.water.controller;
+package main.java.com.campus.water.controller;
 
-import com.campus.water.entity.Notification;
-import com.campus.water.service.NotificationService;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.Notification;
+import main.java.com.campus.water.service.NotificationService;
+import main.java.com.campus.water.util.ResultVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;

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

@@ -1,9 +1,9 @@
-package com.campus.water.controller;
+package main.java.com.campus.water.controller;
 
-import com.campus.water.entity.dto.request.StudentDrinkQueryDTO;
-import com.campus.water.entity.vo.StudentDrinkStatsVO;
-import com.campus.water.service.StudentDrinkStatsService;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.dto.request.StudentDrinkQueryDTO;
+import main.java.com.campus.water.entity.vo.StudentDrinkStatsVO;
+import main.java.com.campus.water.service.StudentDrinkStatsService;
+import main.java.com.campus.water.util.ResultVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;

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

@@ -1,8 +1,8 @@
-package com.campus.water.controller;
+package main.java.com.campus.water.controller;
 
-import com.campus.water.entity.vo.TerminalLocationVO;
-import com.campus.water.service.WaterTerminalLocationService;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.vo.TerminalLocationVO;
+import main.java.com.campus.water.service.WaterTerminalLocationService;
+import main.java.com.campus.water.util.ResultVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;

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

@@ -1,6 +1,6 @@
-package com.campus.water.controller;
+package main.java.com.campus.water.controller;
 
-import com.campus.water.service.StudentWaterDataService;
+import main.java.com.campus.water.service.StudentWaterDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

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

@@ -1,8 +1,8 @@
-package com.campus.water.controller;
+package main.java.com.campus.water.controller;
 
-import com.campus.water.entity.*;
-import com.campus.water.mapper.*;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.*;
+import main.java.com.campus.water.mapper.*;
+import main.java.com.campus.water.util.ResultVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,8 +1,8 @@
-package com.campus.water.controller;
+package main.java.com.campus.water.controller;
 
-import com.campus.water.entity.WorkOrder;
-import com.campus.water.service.WorkOrderService;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.WorkOrder;
+import main.java.com.campus.water.service.WorkOrderService;
+import main.java.com.campus.water.util.ResultVO;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;

src/main/java/com/campus/water/controller/app/RepairmanAppController.java

@@ -1,8 +1,8 @@
-package com.campus.water.controller.app;
+package main.java.com.campus.water.controller.app;
 
-import com.campus.water.entity.WorkOrder;
-import com.campus.water.service.app.RepairmanAppService;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.WorkOrder;
+import main.java.com.campus.water.service.app.RepairmanAppService;
+import main.java.com.campus.water.util.ResultVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/campus/water/controller/web/AdminController.java

@@ -1,8 +1,8 @@
-package com.campus.water.controller.web;
+package main.java.com.campus.water.controller.web;
 
-import com.campus.water.entity.Admin;
-import com.campus.water.service.AdminService;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.Admin;
+import main.java.com.campus.water.service.AdminService;
+import main.java.com.campus.water.util.ResultVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;

src/main/java/com/campus/water/controller/web/AreaController.java

@@ -1,7 +1,7 @@
-package com.campus.water.controller.web;
+package main.java.com.campus.water.controller.web;
 
-import com.campus.water.entity.Area;
-import com.campus.water.service.AreaService;
+import main.java.com.campus.water.entity.Area;
+import main.java.com.campus.water.service.AreaService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;

src/main/java/com/campus/water/controller/web/DeviceController.java

@@ -1,12 +1,12 @@
-package com.campus.water.controller.web;
+package main.java.com.campus.water.controller.web;
 
-import com.campus.water.mapper.RepairerAuthRepository;
-import com.campus.water.mapper.WaterMakerRealtimeDataRepository;
-import com.campus.water.mapper.WaterSupplyRealtimeDataRepository;
-import com.campus.water.service.DeviceService;
-import com.campus.water.mapper.RepairmanRepository;
-import com.campus.water.service.DeviceStatusService;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.mapper.RepairerAuthRepository;
+import main.java.com.campus.water.mapper.WaterMakerRealtimeDataRepository;
+import main.java.com.campus.water.mapper.WaterSupplyRealtimeDataRepository;
+import main.java.com.campus.water.service.DeviceService;
+import main.java.com.campus.water.mapper.RepairmanRepository;
+import main.java.com.campus.water.service.DeviceStatusService;
+import main.java.com.campus.water.util.ResultVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -16,11 +16,11 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.access.prepost.PreAuthorize;
-import com.campus.water.entity.Device;
-import com.campus.water.entity.RepairerAuth;
-import com.campus.water.entity.Repairman;
-import com.campus.water.entity.WaterMakerRealtimeData;
-import com.campus.water.entity.WaterSupplyRealtimeData;
+import main.java.com.campus.water.entity.Device;
+import main.java.com.campus.water.entity.RepairerAuth;
+import main.java.com.campus.water.entity.Repairman;
+import main.java.com.campus.water.entity.WaterMakerRealtimeData;
+import main.java.com.campus.water.entity.WaterSupplyRealtimeData;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/com/campus/water/controller/web/DeviceStatusController.java

@@ -11,12 +11,12 @@
  *   6. 自动检测：触发离线设备检测任务
  * 安全：需要权限验证，记录操作日志
  */
-package com.campus.water.controller.web;
+package main.java.com.campus.water.controller.web;
 
-import com.campus.water.entity.Device;
-import com.campus.water.entity.dto.request.DeviceStatusUpdateRequest;
-import com.campus.water.service.DeviceStatusService;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.Device;
+import main.java.com.campus.water.entity.dto.request.DeviceStatusUpdateRequest;
+import main.java.com.campus.water.service.DeviceStatusService;
+import main.java.com.campus.water.util.ResultVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;

src/main/java/com/campus/water/controller/web/RepairmanController.java

@@ -1,8 +1,8 @@
-package com.campus.water.controller.web;
+package main.java.com.campus.water.controller.web;
 
-import com.campus.water.entity.Repairman;
-import com.campus.water.service.RepairmanService;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.Repairman;
+import main.java.com.campus.water.service.RepairmanService;
+import main.java.com.campus.water.util.ResultVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;

src/main/java/com/campus/water/controller/web/StatisticsController.java

@@ -10,13 +10,13 @@
  *   5. GET /hot-devices: 热门设备用水量排名
  * 技术：Spring MVC、参数验证、统一响应格式
  */
-package com.campus.water.controller.web;
+package main.java.com.campus.water.controller.web;
 
-import com.campus.water.entity.vo.AlarmStatisticsVO;
-import com.campus.water.entity.vo.StatisticsVO;
-import com.campus.water.entity.dto.request.StatisticsQueryRequest;
-import com.campus.water.service.StatisticsService;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.vo.AlarmStatisticsVO;
+import main.java.com.campus.water.entity.vo.StatisticsVO;
+import main.java.com.campus.water.entity.dto.request.StatisticsQueryRequest;
+import main.java.com.campus.water.service.StatisticsService;
+import main.java.com.campus.water.util.ResultVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;

src/main/java/com/campus/water/controller/web/TerminalController.java

@@ -1,10 +1,10 @@
 // java/com/campus/water/controller/web/TerminalController.java
-package com.campus.water.controller.web;
+package main.java.com.campus.water.controller.web;
 
-import com.campus.water.service.DeviceService;
-import com.campus.water.service.TerminalService;
-import com.campus.water.entity.vo.TerminalManageVO;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.service.DeviceService;
+import main.java.com.campus.water.service.TerminalService;
+import main.java.com.campus.water.entity.vo.TerminalManageVO;
+import main.java.com.campus.water.util.ResultVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;

src/main/java/com/campus/water/controller/web/UserController.java

@@ -1,8 +1,8 @@
-package com.campus.water.controller.web;
+package main.java.com.campus.water.controller.web;
 
-import com.campus.water.entity.User;
-import com.campus.water.service.UserService;
-import com.campus.water.util.ResultVO;
+import main.java.com.campus.water.entity.User;
+import main.java.com.campus.water.service.UserService;
+import main.java.com.campus.water.util.ResultVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import jakarta.persistence.*;
 import lombok.Data;

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

@@ -3,7 +3,7 @@
  * 对应表：alert
  * 用于记录设备告警信息，包括告警级别、状态、处理人等
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：area
  * 用于管理校园、楼宇、区域等层级结构信息
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -1,5 +1,5 @@
 // com/campus/water/entity/Device.java
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：device_terminal_mapping
  * 用于关联设备与终端设备，记录终端状态和安装信息
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：drink_recommendation
  * 用于记录学生的每日饮水目标和当前进度
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：drink_record
  * 用于记录学生的每次饮水行为，包括用水量、水质、时间、位置等
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：inspection_record
  * 用于记录维修人员的巡检结果，包括状态、异常描述、照片等
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：maintenance_plan
  * 用于制定和管理设备的定期维护计划
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：message_push
  * 用于存储系统向用户、管理员、维修人员推送的消息记录
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -1,4 +1,4 @@
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：repairer_auth
  * 用于存储维修人员的登录账号、密码、状态等信息
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：repairman
  * 用于存储维修人员信息，包括技能、状态、工作量、评分等
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：terminal_usage_stats
  * 用于记录终端设备的每日使用情况统计，如用水量、使用次数等
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：user
  * 用于存储学生用户的基本信息、登录状态等
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：water_maker_realtime_data
  * 用于存储制水设备的实时运行数据，如TDS、流量、压力、滤芯寿命等
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：water_quality_history
  * 用于记录终端设备检测的水质历史数据，包括多个TDS值和水质评级
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -3,7 +3,7 @@
  * 对应表：water_supply_realtime_data
  * 用于存储供水设备的实时运行数据，如流量、压力、水位、温度等
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -1,4 +1,4 @@
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import java.math.BigDecimal;
 import lombok.Data;

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

@@ -3,7 +3,7 @@
  * 对应表：work_order
  * 用于管理维修、保养、巡检等工单信息，包括状态、优先级、处理记录等
  */
-package com.campus.water.entity;
+package main.java.com.campus.water.entity;
 
 import lombok.Data;
 import jakarta.persistence.*;

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

@@ -1,7 +1,7 @@
 // 路径：com/campus/water/entity/dto/request/DeviceStatusUpdateRequest.java
-package com.campus.water.entity.dto.request;
+package main.java.com.campus.water.entity.dto.request;
 
-import com.campus.water.entity.Device;
+import main.java.com.campus.water.entity.Device;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 

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

@@ -1,5 +1,5 @@
 // LoginRequest.java（原LoginDTO，按项目规范重命名）
-package com.campus.water.entity.dto.request;
+package main.java.com.campus.water.entity.dto.request;
 
 import lombok.Data;
 import jakarta.validation.constraints.NotBlank;

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

@@ -1,4 +1,4 @@
-package com.campus.water.entity.dto.request;
+package main.java.com.campus.water.entity.dto.request;
 
 import lombok.Data;
 import jakarta.validation.constraints.NotBlank;

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

@@ -1,5 +1,5 @@
 // com/campus/water/entity/dto/request/StatisticsQueryRequest.java
-package com.campus.water.entity.dto.request;
+package main.java.com.campus.water.entity.dto.request;
 
 import lombok.Data;
 import java.time.LocalDate;

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

@@ -1,4 +1,4 @@
-package com.campus.water.entity.dto.request;
+package main.java.com.campus.water.entity.dto.request;
 
 import lombok.Data;
 

src/main/java/com/campus/water/entity/vo/AlarmStatisticsVO.java

@@ -1,5 +1,5 @@
 // com/campus/water/entity/vo/AlarmStatisticsVO.java
-package com.campus.water.entity.vo;
+package main.java.com.campus.water.entity.vo;
 
 import lombok.Data;
 import java.util.Map;

src/main/java/com/campus/water/entity/vo/DailyDrinkVO.java

@@ -1,4 +1,4 @@
-package com.campus.water.entity.vo;
+package main.java.com.campus.water.entity.vo;
 
 import lombok.Data;
 

src/main/java/com/campus/water/entity/vo/LoginVO.java

@@ -1,5 +1,5 @@
 // LoginVO.java（保持VO命名，无需修改）
-package com.campus.water.entity.vo;
+package main.java.com.campus.water.entity.vo;
 
 import lombok.Data;
 

src/main/java/com/campus/water/entity/vo/StatisticsVO.java

@@ -1,5 +1,5 @@
 // com/campus/water/entity/vo/StatisticsVO.java
-package com.campus.water.entity.vo;
+package main.java.com.campus.water.entity.vo;
 
 import lombok.Data;
 import java.util.List;

src/main/java/com/campus/water/entity/vo/StudentDrinkStatsVO.java

@@ -1,9 +1,9 @@
-package com.campus.water.entity.vo;
+package main.java.com.campus.water.entity.vo;
 
 import lombok.Data;
 import java.util.List;
-import com.campus.water.entity.DrinkRecord;
-import com.campus.water.entity.vo.DailyDrinkVO;
+import main.java.com.campus.water.entity.DrinkRecord;
+import main.java.com.campus.water.entity.vo.DailyDrinkVO;
 /**
  * 学生饮水量统计结果VO
  */

src/main/java/com/campus/water/entity/vo/TerminalLocationVO.java

@@ -1,4 +1,4 @@
-package com.campus.water.entity.vo;
+package main.java.com.campus.water.entity.vo;
 
 import lombok.Data;
 import java.math.BigDecimal;

src/main/java/com/campus/water/entity/vo/TerminalManageVO.java

@@ -1,7 +1,7 @@
 // java/com/campus/water/vo/TerminalManageVO.java
-package com.campus.water.entity.vo;
+package main.java.com.campus.water.entity.vo;
 
-import com.campus.water.entity.DeviceTerminalMapping;
+import main.java.com.campus.water.entity.DeviceTerminalMapping;
 import lombok.Data;
 
 import java.math.BigDecimal;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.Admin;
+import main.java.com.campus.water.entity.Admin;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -41,7 +41,7 @@ public interface AdminRepository extends JpaRepository<Admin, String> {
     // 新增2：查询所有校区关联的区域管理员（排除市区，用于管理员列表筛选）
     // 备注：此处使用@Query注解，关联Area表过滤区域类型为campus的管理员
     @Query("SELECT a FROM Admin a WHERE a.role = ?1 AND a.areaId IN " +
-            "(SELECT ar.areaId FROM Area ar WHERE ar.areaType = com.campus.water.entity.Area.AreaType.campus)")
+            "(SELECT ar.areaId FROM Area ar WHERE ar.areaType = main.java.com.campus.water.entity.Area.AreaType.campus)")
     List<Admin> findAllAreaAdminsForCampus(Admin.AdminRole role);
 
     // 检查唯一约束

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.Alert;
+import main.java.com.campus.water.entity.Alert;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import java.time.LocalDateTime;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.Area;
+import main.java.com.campus.water.entity.Area;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

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

@@ -1,7 +1,7 @@
 // com/campus/water/mapper/DeviceRepository.java
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.Device;
+import main.java.com.campus.water.entity.Device;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import java.util.List;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.DeviceTerminalMapping;
+import main.java.com.campus.water.entity.DeviceTerminalMapping;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import java.util.List;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.DrinkRecommendation;
+import main.java.com.campus.water.entity.DrinkRecommendation;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.DrinkRecord;
+import main.java.com.campus.water.entity.DrinkRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.InspectionRecord;
+import main.java.com.campus.water.entity.InspectionRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import java.time.LocalDateTime;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.MaintenancePlan;
+import main.java.com.campus.water.entity.MaintenancePlan;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.MessagePush;
+import main.java.com.campus.water.entity.MessagePush;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.Notification;
+import main.java.com.campus.water.entity.Notification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import java.util.List;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.RepairerAuth; // 改为entity包下的RepairerAuth
+import main.java.com.campus.water.entity.RepairerAuth; // 改为entity包下的RepairerAuth
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.Repairman;
+import main.java.com.campus.water.entity.Repairman;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import java.util.List;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.DrinkRecord;
+import main.java.com.campus.water.entity.DrinkRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.TerminalUsageStats;
+import main.java.com.campus.water.entity.TerminalUsageStats;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

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

@@ -1,7 +1,7 @@
 // filePath：main/java/com/campus/water/mapper/UserRepository.java
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.User; // 改为引用User实体类
+import main.java.com.campus.water.entity.User; // 改为引用User实体类
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.WaterMakerRealtimeData;
+import main.java.com.campus.water.entity.WaterMakerRealtimeData;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.WaterQualityHistory;
+import main.java.com.campus.water.entity.WaterQualityHistory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.WaterSupplyRealtimeData;
+import main.java.com.campus.water.entity.WaterSupplyRealtimeData;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.WaterTerminalLocation;
+import main.java.com.campus.water.entity.WaterTerminalLocation;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
-package com.campus.water.mapper;
+package main.java.com.campus.water.mapper;
 
-import com.campus.water.entity.WorkOrder;
+import main.java.com.campus.water.entity.WorkOrder;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import java.time.LocalDateTime;

src/main/java/com/campus/water/model/WaterMakerSensorData.java

@@ -1,4 +1,4 @@
-package com.campus.water.model;
+package main.java.com.campus.water.model;
 
 import lombok.Data;
 import java.time.LocalDateTime;

src/main/java/com/campus/water/model/WaterSupplySensorData.java

@@ -1,4 +1,4 @@
-package com.campus.water.model;
+package main.java.com.campus.water.model;
 
 import lombok.Data;
 import java.time.LocalDateTime;

src/main/java/com/campus/water/security/JwtAuthenticationFilter.java

@@ -1,5 +1,5 @@
 // com/campus/water/security/JwtAuthenticationFilter.java
-package com.campus.water.security;
+package main.java.com.campus.water.security;
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;

src/main/java/com/campus/water/security/JwtTokenProvider.java

@@ -1,5 +1,5 @@
 // com/campus/water/security/JwtTokenProvider.java
-package com.campus.water.security;
+package main.java.com.campus.water.security;
 
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.security.Keys;

src/main/java/com/campus/water/security/RoleConstants.java

@@ -1,4 +1,4 @@
-package com.campus.water.security;
+package main.java.com.campus.water.security;
 
 /**
  * 角色常量定义

src/main/java/com/campus/water/security/UserDetailsServiceImpl.java

@@ -1,11 +1,11 @@
-package com.campus.water.security;
+package main.java.com.campus.water.security;
 
-import com.campus.water.entity.Admin;
-import com.campus.water.entity.RepairerAuth;
-import com.campus.water.entity.User; // 自定义User实体类（保留）
-import com.campus.water.mapper.AdminRepository;
-import com.campus.water.mapper.RepairerAuthRepository;
-import com.campus.water.mapper.UserRepository;
+import main.java.com.campus.water.entity.Admin;
+import main.java.com.campus.water.entity.RepairerAuth;
+import main.java.com.campus.water.entity.User; // 自定义User实体类（保留）
+import main.java.com.campus.water.mapper.AdminRepository;
+import main.java.com.campus.water.mapper.RepairerAuthRepository;
+import main.java.com.campus.water.mapper.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;

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

@@ -1,9 +1,9 @@
-package com.campus.water.service;
+package main.java.com.campus.water.service;
 
-import com.campus.water.entity.Admin;
-import com.campus.water.entity.Area;
-import com.campus.water.mapper.AdminRepository;
-import com.campus.water.mapper.AreaRepository;
+import main.java.com.campus.water.entity.Admin;
+import main.java.com.campus.water.entity.Area;
+import main.java.com.campus.water.mapper.AdminRepository;
+import main.java.com.campus.water.mapper.AreaRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;

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

@@ -1,10 +1,10 @@
-package com.campus.water.service;
+package main.java.com.campus.water.service;
 
-import com.campus.water.entity.Alert;
-import com.campus.water.entity.MessagePush;
-import com.campus.water.entity.Repairman;
-import com.campus.water.mapper.MessagePushRepository;
-import com.campus.water.mapper.RepairmanRepository;
+import main.java.com.campus.water.entity.Alert;
+import main.java.com.campus.water.entity.MessagePush;
+import main.java.com.campus.water.entity.Repairman;
+import main.java.com.campus.water.mapper.MessagePushRepository;
+import main.java.com.campus.water.mapper.RepairmanRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -1,18 +1,18 @@
-package com.campus.water.service;
-
-import com.campus.water.entity.Alert;
-import com.campus.water.entity.Device;
-import com.campus.water.entity.WorkOrder;
-import com.campus.water.mapper.AlertRepository;
-import com.campus.water.mapper.DeviceRepository;
-import com.campus.water.mapper.WorkOrderRepository;
-import com.campus.water.model.WaterMakerSensorData;
-import com.campus.water.model.WaterSupplySensorData;
+package main.java.com.campus.water.service;
+
+import main.java.com.campus.water.entity.Alert;
+import main.java.com.campus.water.entity.Device;
+import main.java.com.campus.water.entity.WorkOrder;
+import main.java.com.campus.water.mapper.AlertRepository;
+import main.java.com.campus.water.mapper.DeviceRepository;
+import main.java.com.campus.water.mapper.WorkOrderRepository;
+import main.java.com.campus.water.model.WaterMakerSensorData;
+import main.java.com.campus.water.model.WaterSupplySensorData;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.campus.water.service.AlertPushService;
+import main.java.com.campus.water.service.AlertPushService;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;

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

@@ -1,12 +1,12 @@
-package com.campus.water.service;
-
-import com.campus.water.entity.Area;
-import com.campus.water.mapper.AreaRepository;
-import com.campus.water.entity.Admin;
-import com.campus.water.mapper.AdminRepository;
-import com.campus.water.mapper.DeviceRepository;
-import com.campus.water.mapper.DeviceTerminalMappingRepository;
-import com.campus.water.security.RoleConstants;
+package main.java.com.campus.water.service;
+
+import main.java.com.campus.water.entity.Area;
+import main.java.com.campus.water.mapper.AreaRepository;
+import main.java.com.campus.water.entity.Admin;
+import main.java.com.campus.water.mapper.AdminRepository;
+import main.java.com.campus.water.mapper.DeviceRepository;
+import main.java.com.campus.water.mapper.DeviceTerminalMappingRepository;
+import main.java.com.campus.water.security.RoleConstants;
 
 import java.util.List;
 import org.springframework.stereotype.Service;

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

@@ -1,13 +1,13 @@
-package com.campus.water.service;
-
-import com.campus.water.entity.Device;
-import com.campus.water.entity.DeviceTerminalMapping;
-import com.campus.water.entity.Device.DeviceStatus;
-import com.campus.water.entity.Device.DeviceType;
-import com.campus.water.entity.DeviceTerminalMapping.TerminalStatus;
-import com.campus.water.mapper.DeviceRepository;
-import com.campus.water.mapper.DeviceTerminalMappingRepository;
-import com.campus.water.util.ResultVO;
+package main.java.com.campus.water.service;
+
+import main.java.com.campus.water.entity.Device;
+import main.java.com.campus.water.entity.DeviceTerminalMapping;
+import main.java.com.campus.water.entity.Device.DeviceStatus;
+import main.java.com.campus.water.entity.Device.DeviceType;
+import main.java.com.campus.water.entity.DeviceTerminalMapping.TerminalStatus;
+import main.java.com.campus.water.mapper.DeviceRepository;
+import main.java.com.campus.water.mapper.DeviceTerminalMappingRepository;
+import main.java.com.campus.water.util.ResultVO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -1,8 +1,8 @@
 // 路径：com/campus/water/service/DeviceStatusService.java
-package com.campus.water.service;
+package main.java.com.campus.water.service;
 
-import com.campus.water.entity.Device;
-import com.campus.water.entity.dto.request.DeviceStatusUpdateRequest;
+import main.java.com.campus.water.entity.Device;
+import main.java.com.campus.water.entity.dto.request.DeviceStatusUpdateRequest;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1,8 +1,8 @@
-package com.campus.water.service;
+package main.java.com.campus.water.service;
 
-import com.campus.water.entity.Device;
-import com.campus.water.entity.dto.request.DeviceStatusUpdateRequest;
-import com.campus.water.mapper.DeviceRepository;
+import main.java.com.campus.water.entity.Device;
+import main.java.com.campus.water.entity.dto.request.DeviceStatusUpdateRequest;
+import main.java.com.campus.water.mapper.DeviceRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -1,17 +1,17 @@
-package com.campus.water.service;
-
-import com.campus.water.entity.Admin;
-import com.campus.water.entity.RepairerAuth;
-import com.campus.water.entity.Repairman;
-import com.campus.water.entity.User;
-import com.campus.water.entity.vo.LoginVO;
-import com.campus.water.mapper.AdminRepository;
-import com.campus.water.mapper.RepairerAuthRepository;
-import com.campus.water.mapper.RepairmanRepository;
-import com.campus.water.mapper.UserRepository;
-import com.campus.water.entity.dto.request.LoginRequest;
-import com.campus.water.security.RoleConstants;
-import com.campus.water.security.JwtTokenProvider;
+package main.java.com.campus.water.service;
+
+import main.java.com.campus.water.entity.Admin;
+import main.java.com.campus.water.entity.RepairerAuth;
+import main.java.com.campus.water.entity.Repairman;
+import main.java.com.campus.water.entity.User;
+import main.java.com.campus.water.entity.vo.LoginVO;
+import main.java.com.campus.water.mapper.AdminRepository;
+import main.java.com.campus.water.mapper.RepairerAuthRepository;
+import main.java.com.campus.water.mapper.RepairmanRepository;
+import main.java.com.campus.water.mapper.UserRepository;
+import main.java.com.campus.water.entity.dto.request.LoginRequest;
+import main.java.com.campus.water.security.RoleConstants;
+import main.java.com.campus.water.security.JwtTokenProvider;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;

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

@@ -1,14 +1,14 @@
-package com.campus.water.service;
-import com.campus.water.service.AlertTriggerService;
-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.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;
+package main.java.com.campus.water.service;
+import main.java.com.campus.water.service.AlertTriggerService;
+import main.java.com.campus.water.config.MqttConfig;
+import main.java.com.campus.water.entity.Alert;
+import main.java.com.campus.water.entity.WaterMakerRealtimeData;
+import main.java.com.campus.water.entity.WaterSupplyRealtimeData;
+import main.java.com.campus.water.mapper.AlertRepository;
+import main.java.com.campus.water.mapper.WaterMakerRealtimeDataRepository;
+import main.java.com.campus.water.mapper.WaterSupplyRealtimeDataRepository;
+import main.java.com.campus.water.model.WaterMakerSensorData;
+import main.java.com.campus.water.model.WaterSupplySensorData;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,8 +1,8 @@
-package com.campus.water.service;
+package main.java.com.campus.water.service;
 
-import com.campus.water.config.MqttConfig;
-import com.campus.water.model.WaterMakerSensorData;
-import com.campus.water.model.WaterSupplySensorData;
+import main.java.com.campus.water.config.MqttConfig;
+import main.java.com.campus.water.model.WaterMakerSensorData;
+import main.java.com.campus.water.model.WaterSupplySensorData;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;

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

@@ -1,6 +1,6 @@
-package com.campus.water.service;
+package main.java.com.campus.water.service;
 
-import com.campus.water.entity.Notification;
+import main.java.com.campus.water.entity.Notification;
 import java.util.List;
 
 /**

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

@@ -1,8 +1,8 @@
-package com.campus.water.service.impl;
+package main.java.com.campus.water.service;
 
-import com.campus.water.entity.Notification;
-import com.campus.water.mapper.NotificationRepository;
-import com.campus.water.service.NotificationService;
+import main.java.com.campus.water.entity.Notification;
+import main.java.com.campus.water.mapper.NotificationRepository;
+import main.java.com.campus.water.service.NotificationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

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

@@ -1,11 +1,11 @@
-package com.campus.water.service;
-
-import com.campus.water.entity.Admin;
-import com.campus.water.entity.RepairerAuth;
-import com.campus.water.entity.Repairman;
-import com.campus.water.entity.User;
-import com.campus.water.entity.dto.request.RegisterRequest;
-import com.campus.water.mapper.*;
+package main.java.com.campus.water.service;
+
+import main.java.com.campus.water.entity.Admin;
+import main.java.com.campus.water.entity.RepairerAuth;
+import main.java.com.campus.water.entity.Repairman;
+import main.java.com.campus.water.entity.User;
+import main.java.com.campus.water.entity.dto.request.RegisterRequest;
+import main.java.com.campus.water.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;

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

@@ -1,7 +1,7 @@
-package com.campus.water.service;
+package main.java.com.campus.water.service;
 
-import com.campus.water.entity.Repairman;
-import com.campus.water.mapper.RepairmanRepository;
+import main.java.com.campus.water.entity.Repairman;
+import main.java.com.campus.water.mapper.RepairmanRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;

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

@@ -1,14 +1,14 @@
-package com.campus.water.service;
-
-import com.campus.water.entity.Alert;
-import com.campus.water.entity.Device;
-import com.campus.water.entity.TerminalUsageStats;
-import com.campus.water.entity.dto.request.StatisticsQueryRequest;
-import com.campus.water.entity.vo.AlarmStatisticsVO;
-import com.campus.water.entity.vo.StatisticsVO;
-import com.campus.water.mapper.AlertRepository;
-import com.campus.water.mapper.DeviceRepository;
-import com.campus.water.mapper.TerminalUsageStatsRepository;
+package main.java.com.campus.water.service;
+
+import main.java.com.campus.water.entity.Alert;
+import main.java.com.campus.water.entity.Device;
+import main.java.com.campus.water.entity.TerminalUsageStats;
+import main.java.com.campus.water.entity.dto.request.StatisticsQueryRequest;
+import main.java.com.campus.water.entity.vo.AlarmStatisticsVO;
+import main.java.com.campus.water.entity.vo.StatisticsVO;
+import main.java.com.campus.water.mapper.AlertRepository;
+import main.java.com.campus.water.mapper.DeviceRepository;
+import main.java.com.campus.water.mapper.TerminalUsageStatsRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

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

@@ -1,9 +1,9 @@
-package com.campus.water.service;
+package main.java.com.campus.water.service;
 
-import com.campus.water.entity.DrinkRecord;
-import com.campus.water.entity.vo.DailyDrinkVO;
-import com.campus.water.entity.vo.StudentDrinkStatsVO;
-import com.campus.water.mapper.DrinkRecordRepository;
+import main.java.com.campus.water.entity.DrinkRecord;
+import main.java.com.campus.water.entity.vo.DailyDrinkVO;
+import main.java.com.campus.water.entity.vo.StudentDrinkStatsVO;
+import main.java.com.campus.water.mapper.DrinkRecordRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;

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

@@ -1,8 +1,8 @@
-package com.campus.water.service;
+package main.java.com.campus.water.service;
 
-import com.campus.water.entity.DeviceTerminalMapping;
-import com.campus.water.mapper.DeviceTerminalMappingRepository;
-import com.campus.water.util.DeviceMappingUtil; // 硬编码映射工具类（之前定义的）
+import main.java.com.campus.water.entity.DeviceTerminalMapping;
+import main.java.com.campus.water.mapper.DeviceTerminalMappingRepository;
+import main.java.com.campus.water.util.DeviceMappingUtil; // 硬编码映射工具类（之前定义的）
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;