diff --git a/src/main/java/com/campus/water/CampusWaterApplication.java b/src/main/java/com/campus/water/CampusWaterApplication.java index 375cd42..d5a741c 100644 --- a/src/main/java/com/campus/water/CampusWaterApplication.java +++ b/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管理（监控消息流转） diff --git a/src/main/java/com/campus/water/config/MD5PasswordEncoder.java b/src/main/java/com/campus/water/config/MD5PasswordEncoder.java index 061d491..b90fa64 100644 --- a/src/main/java/com/campus/water/config/MD5PasswordEncoder.java +++ b/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; diff --git a/src/main/java/com/campus/water/config/MqttConfig.java b/src/main/java/com/campus/water/config/MqttConfig.java index e86e4ab..1a374ec 100644 --- a/src/main/java/com/campus/water/config/MqttConfig.java +++ b/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; diff --git a/src/main/java/com/campus/water/config/MqttInboundConfig.java b/src/main/java/com/campus/water/config/MqttInboundConfig.java index ba546c4..af87e2f 100644 --- a/src/main/java/com/campus/water/config/MqttInboundConfig.java +++ b/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; diff --git a/src/main/java/com/campus/water/config/SecurityConfig.java b/src/main/java/com/campus/water/config/SecurityConfig.java index 8cca8f5..c57dcad 100644 --- a/src/main/java/com/campus/water/config/SecurityConfig.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/AlertController.java b/src/main/java/com/campus/water/controller/AlertController.java index 3567d05..e5fd512 100644 --- a/src/main/java/com/campus/water/controller/AlertController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/GlobalExceptionHandler.java b/src/main/java/com/campus/water/controller/GlobalExceptionHandler.java index 14dd6b8..10cab87 100644 --- a/src/main/java/com/campus/water/controller/GlobalExceptionHandler.java +++ b/src/main/java/com/campus/water/controller/GlobalExceptionHandler.java @@ -1,35 +1,19 @@ -package com.campus.water.controller; +package main.java.com.campus.water.controller; -import com.campus.water.entity.BusinessException; -import com.campus.water.util.ResultVO; -import lombok.extern.slf4j.Slf4j; -import org.springframework.dao.DataIntegrityViolationException; -import org.springframework.dao.DuplicateKeyException; -import org.springframework.http.HttpStatus; -import org.springframework.http.converter.HttpMessageNotReadableException; -import org.springframework.validation.BindException; -import org.springframework.validation.FieldError; -import org.springframework.web.HttpMediaTypeNotSupportedException; -import org.springframework.web.HttpRequestMethodNotSupportedException; -import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.MissingServletRequestParameterException; +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; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; -import org.springframework.web.multipart.MaxUploadSizeExceededException; -import org.springframework.web.servlet.NoHandlerFoundException; +import org.springframework.web.bind.MethodArgumentNotValidException; -import java.io.IOException; -import java.nio.file.AccessDeniedException; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.stream.Collectors; +import java.time.format.DateTimeParseException; +import java.util.Objects; /** * 全局异常处理器 - 统一处理项目中所有控制器层异常 */ @RestControllerAdvice -@Slf4j public class GlobalExceptionHandler { /** @@ -42,10 +26,6 @@ public class GlobalExceptionHandler { if (msg.contains("AlertLevel") || msg.contains("AlertStatus")) { msg = "参数错误：告警级别可选值(info/warning/error/critical)，告警状态可选值(pending/resolved/closed)"; } - // 设备ID格式错误特殊处理 - if (msg.contains("设备ID") || msg.contains("deviceId")) { - msg = "设备ID格式错误，正确格式为WM/WS开头+3位数字（如WM001、WS123）"; - } return ResultVO.error(400, "参数错误：" + msg); } @@ -56,15 +36,8 @@ public class GlobalExceptionHandler { public ResultVO handleTypeMismatch(MethodArgumentTypeMismatchException e) { String errorMsg; // 特殊处理时间格式错误（告警查询的时间参数） - if (e.getCause() instanceof java.time.format.DateTimeParseException) { + if (e.getCause() instanceof DateTimeParseException) { errorMsg = "时间参数格式错误，正确格式：yyyy-MM-dd HH:mm:ss（示例：2025-12-05 10:30:00）"; - } else if (e.getRequiredType() != null && e.getRequiredType().isEnum()) { - // 枚举类型转换错误处理 - errorMsg = String.format( - "参数[%s]枚举值错误，允许值：%s", - e.getName(), - getEnumValues(e.getRequiredType()) - ); } else { // 通用类型不匹配提示 errorMsg = String.format( @@ -78,179 +51,11 @@ public class GlobalExceptionHandler { } /** - * 处理权限不足异常（如非管理员/维修人员访问受限接口） - */ - @ExceptionHandler({AccessDeniedException.class, org.springframework.security.access.AccessDeniedException.class}) - public ResultVO handleAccessDenied(Exception e) { - String roleMsg = "仅超级管理员可操作"; - // 区分不同接口的权限提示 - if (e.getMessage().contains("AREA_ADMIN")) { - roleMsg = "仅区域管理员及以上权限可操作"; - } else if (e.getMessage().contains("REPAIRMAN")) { - roleMsg = "仅维修人员及管理员可操作"; - } - return ResultVO.error(403, "权限不足：" + roleMsg); - } - - /** - * 处理资源不存在异常（如查询不存在的设备/用户） - */ - @ExceptionHandler(NoSuchElementException.class) - public ResultVO handleNoSuchElement(NoSuchElementException e) { - String msg = e.getMessage(); - // 标准化资源不存在提示 - if (msg.contains("设备")) { - return ResultVO.error(404, "设备不存在：" + msg.replace("No value present", "").trim()); - } else if (msg.contains("管理员") || msg.contains("Admin")) { - return ResultVO.error(404, "管理员不存在：" + msg.replace("No value present", "").trim()); - } else if (msg.contains("区域") || msg.contains("Area")) { - return ResultVO.error(404, "区域不存在：" + msg.replace("No value present", "").trim()); - } - return ResultVO.error(404, "请求的资源不存在：" + msg); - } - - /** - * 处理请求参数验证失败（如@NotBlank/@Pattern等注解验证失败） - */ - @ExceptionHandler(MethodArgumentNotValidException.class) - public ResultVO handleMethodArgumentNotValid(MethodArgumentNotValidException e) { - // 收集所有验证失败的字段和消息 - List errorMessages = e.getBindingResult().getFieldErrors().stream() - .map(error -> error.getField() + "：" + error.getDefaultMessage()) - .collect(Collectors.toList()); - return ResultVO.error(400, "参数验证失败：" + String.join("；", errorMessages)); - } - - /** - * 处理表单参数绑定异常（非@RequestBody的参数验证） + * 处理权限不足异常（如非管理员/维修人员访问告警接口） */ - @ExceptionHandler(BindException.class) - public ResultVO handleBindException(BindException e) { - FieldError firstError = e.getBindingResult().getFieldError(); - String errorMsg = firstError != null ? - firstError.getField() + "：" + firstError.getDefaultMessage() : - "参数绑定失败"; - return ResultVO.error(400, "表单参数错误：" + errorMsg); - } - - /** - * 处理缺失必填参数异常 - */ - @ExceptionHandler(MissingServletRequestParameterException.class) - public ResultVO handleMissingParam(MissingServletRequestParameterException e) { - return ResultVO.error(400, - String.format("缺少必填参数：%s（类型：%s）", - e.getParameterName(), - e.getParameterType())); - } - - /** - * 处理数据库唯一约束冲突异常 - */ - @ExceptionHandler(DuplicateKeyException.class) - public ResultVO handleDuplicateKey(DuplicateKeyException e) { - log.error("数据库唯一约束冲突", e); - String msg = "数据已存在，无法重复添加"; - // 针对设备ID冲突特殊处理 - if (e.getMessage().contains("device_id")) { - msg = "设备ID已存在，请更换设备ID后重试"; - } else if (e.getMessage().contains("admin_name")) { - msg = "管理员用户名已存在，请更换用户名"; - } - return ResultVO.error(409, msg); - } - - /** - * 处理数据库完整性约束异常（外键关联等） - */ - @ExceptionHandler(DataIntegrityViolationException.class) - public ResultVO handleDataIntegrityViolation(DataIntegrityViolationException e) { - log.error("数据库完整性约束异常", e); - String msg = "数据操作失败，可能存在关联数据"; - if (e.getMessage().contains("foreign key constraint")) { - msg = "无法删除，该数据已被其他记录关联引用"; - } else if (e.getMessage().contains("not null")) { - msg = "必填字段不能为空，请检查输入"; - } - return ResultVO.error(400, msg); - } - - /** - * 处理JSON解析异常（请求体格式错误） - */ - @ExceptionHandler(HttpMessageNotReadableException.class) - public ResultVO handleHttpMessageNotReadable(HttpMessageNotReadableException e) { - log.error("请求体解析失败", e); - String msg = "请求数据格式错误，请检查JSON格式是否正确"; - if (e.getMessage().contains("date-time")) { - msg = "日期时间格式错误，正确格式：yyyy-MM-dd HH:mm:ss"; - } - return ResultVO.error(400, msg); - } - - /** - * 处理不支持的HTTP方法异常 - */ - @ExceptionHandler(HttpRequestMethodNotSupportedException.class) - public ResultVO handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e) { - return ResultVO.error(405, - String.format("不支持的请求方法：%s，支持的方法：%s", - e.getMethod(), - String.join(",", e.getSupportedMethods()))); - } - - /** - * 处理不支持的媒体类型异常 - */ - @ExceptionHandler(HttpMediaTypeNotSupportedException.class) - public ResultVO handleHttpMediaTypeNotSupported(HttpMediaTypeNotSupportedException e) { - return ResultVO.error(415, - String.format("不支持的媒体类型：%s，支持的类型：%s", - e.getContentType(), - e.getSupportedMediaTypes())); - } - - /** - * 处理文件上传大小超限异常 - */ - @ExceptionHandler(MaxUploadSizeExceededException.class) - public ResultVO handleMaxUploadSizeExceeded(MaxUploadSizeExceededException e) { - long maxSizeMB = e.getMaxUploadSize() / (1024 * 1024); - return ResultVO.error(413, - String.format("文件大小超限，最大支持：%dMB", maxSizeMB)); - } - - /** - * 处理IO异常（文件操作等） - */ - @ExceptionHandler(IOException.class) - public ResultVO handleIOException(IOException e) { - log.error("IO操作异常", e); - String msg = "文件操作失败：" + e.getMessage(); - if (e.getMessage().contains("Permission denied")) { - msg = "文件操作权限不足"; - } - return ResultVO.error(500, msg); - } - - /** - * 处理业务逻辑异常（自定义异常） - */ - @ExceptionHandler(BusinessException.class) - public ResultVO handleBusinessException(BusinessException e) { - // 业务异常自带状态码和消息 - return ResultVO.error(e.getCode(), e.getMessage()); - } - - /** - * 处理404异常 - */ - @ExceptionHandler(NoHandlerFoundException.class) - public ResultVO handleNoHandlerFound(NoHandlerFoundException e) { - return ResultVO.error(404, - String.format("请求的接口不存在：%s %s", - e.getHttpMethod(), - e.getRequestURL())); + @ExceptionHandler(AccessDeniedException.class) + public ResultVO handleAccessDenied(AccessDeniedException e) { + return ResultVO.error(403, "权限不足：仅管理员/维修人员可访问告警相关功能"); } /** @@ -258,32 +63,18 @@ public class GlobalExceptionHandler { */ @ExceptionHandler(RuntimeException.class) public ResultVO handleRuntimeException(RuntimeException e) { - log.error("服务器运行时异常", e); - // 生产环境可根据异常类型返回更友好的提示 - String msg = "服务器内部错误：" + e.getMessage(); - // 对常见运行时异常进行特殊处理 - if (e instanceof NullPointerException) { - msg = "系统处理异常：数据为空"; - } else if (e instanceof IndexOutOfBoundsException) { - msg = "系统处理异常：数据索引越界"; - } - return ResultVO.error(500, msg); + // 生产环境建议添加日志记录，此处简化 + // log.error("服务器运行时异常", e); + return ResultVO.error(500, "服务器内部错误：" + e.getMessage()); } /** - * 工具方法：获取枚举类的所有值 + * 处理请求参数验证失败（如@NotBlank/@Pattern等注解验证失败） */ - private String getEnumValues(Class enumClass) { - if (!enumClass.isEnum()) { - return "未知"; - } - StringBuilder values = new StringBuilder(); - for (Object enumConstant : enumClass.getEnumConstants()) { - values.append(enumConstant).append(","); - } - if (values.length() > 0) { - values.deleteCharAt(values.length() - 1); - } - return values.toString(); + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResultVO handleMethodArgumentNotValid(MethodArgumentNotValidException e) { + // 获取第一个验证失败的字段和消息 + String errorMsg = Objects.requireNonNull(e.getBindingResult().getFieldError()).getDefaultMessage(); + return ResultVO.badRequest(errorMsg); // 返回400状态码和具体错误信息 } } \ No newline at end of file diff --git a/src/main/java/com/campus/water/controller/LoginController.java b/src/main/java/com/campus/water/controller/LoginController.java index eecab39..7507b61 100644 --- a/src/main/java/com/campus/water/controller/LoginController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/RegisterController.java b/src/main/java/com/campus/water/controller/RegisterController.java index 1abe416..6950610 100644 --- a/src/main/java/com/campus/water/controller/RegisterController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/RepairmanNotificationController.java b/src/main/java/com/campus/water/controller/RepairmanNotificationController.java index 8d45fb3..03867bd 100644 --- a/src/main/java/com/campus/water/controller/RepairmanNotificationController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/StudentDrinkStatsController.java b/src/main/java/com/campus/water/controller/StudentDrinkStatsController.java index 5ffc43c..9622da6 100644 --- a/src/main/java/com/campus/water/controller/StudentDrinkStatsController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/StudentTerminalLocationController.java b/src/main/java/com/campus/water/controller/StudentTerminalLocationController.java index 8824883..1ebe091 100644 --- a/src/main/java/com/campus/water/controller/StudentTerminalLocationController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/WaterRealtimeController.java b/src/main/java/com/campus/water/controller/WaterRealtimeController.java index a44ae19..a94c154 100644 --- a/src/main/java/com/campus/water/controller/WaterRealtimeController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/WaterUsageController.java b/src/main/java/com/campus/water/controller/WaterUsageController.java index e26943e..fb3e41e 100644 --- a/src/main/java/com/campus/water/controller/WaterUsageController.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/controller/WorkOrderController.java b/src/main/java/com/campus/water/controller/WorkOrderController.java index 9434b5b..50bec86 100644 --- a/src/main/java/com/campus/water/controller/WorkOrderController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/app/RepairmanAppController.java b/src/main/java/com/campus/water/controller/app/RepairmanAppController.java index 2e3202f..38c32a0 100644 --- a/src/main/java/com/campus/water/controller/app/RepairmanAppController.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/controller/web/AdminController.java b/src/main/java/com/campus/water/controller/web/AdminController.java index 3cf6275..a55edeb 100644 --- a/src/main/java/com/campus/water/controller/web/AdminController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/web/AreaController.java b/src/main/java/com/campus/water/controller/web/AreaController.java index ce5a3f3..c9a78ee 100644 --- a/src/main/java/com/campus/water/controller/web/AreaController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/web/DeviceController.java b/src/main/java/com/campus/water/controller/web/DeviceController.java index 8bf9671..c556127 100644 --- a/src/main/java/com/campus/water/controller/web/DeviceController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/web/DeviceStatusController.java b/src/main/java/com/campus/water/controller/web/DeviceStatusController.java index edd736c..88e3343 100644 --- a/src/main/java/com/campus/water/controller/web/DeviceStatusController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/web/RepairmanController.java b/src/main/java/com/campus/water/controller/web/RepairmanController.java index e93849e..cf5ccd5 100644 --- a/src/main/java/com/campus/water/controller/web/RepairmanController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/web/StatisticsController.java b/src/main/java/com/campus/water/controller/web/StatisticsController.java index 6d6b666..c20c04e 100644 --- a/src/main/java/com/campus/water/controller/web/StatisticsController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/web/TerminalController.java b/src/main/java/com/campus/water/controller/web/TerminalController.java index f0a0ec4..6a6b3e1 100644 --- a/src/main/java/com/campus/water/controller/web/TerminalController.java +++ b/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; diff --git a/src/main/java/com/campus/water/controller/web/UserController.java b/src/main/java/com/campus/water/controller/web/UserController.java index fdaa784..00a90f7 100644 --- a/src/main/java/com/campus/water/controller/web/UserController.java +++ b/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; diff --git a/src/main/java/com/campus/water/entity/Admin.java b/src/main/java/com/campus/water/entity/Admin.java index 842922f..ee8b587 100644 --- a/src/main/java/com/campus/water/entity/Admin.java +++ b/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; diff --git a/src/main/java/com/campus/water/entity/Alert.java b/src/main/java/com/campus/water/entity/Alert.java index e5afdae..a66d911 100644 --- a/src/main/java/com/campus/water/entity/Alert.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/Area.java b/src/main/java/com/campus/water/entity/Area.java index a80c89b..30fcf73 100644 --- a/src/main/java/com/campus/water/entity/Area.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/Device.java b/src/main/java/com/campus/water/entity/Device.java index 112d491..b42a72d 100644 --- a/src/main/java/com/campus/water/entity/Device.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/DeviceTerminalMapping.java b/src/main/java/com/campus/water/entity/DeviceTerminalMapping.java index 8d2b696..adf8351 100644 --- a/src/main/java/com/campus/water/entity/DeviceTerminalMapping.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/DrinkRecommendation.java b/src/main/java/com/campus/water/entity/DrinkRecommendation.java index 417abe6..bbdbd93 100644 --- a/src/main/java/com/campus/water/entity/DrinkRecommendation.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/DrinkRecord.java b/src/main/java/com/campus/water/entity/DrinkRecord.java index e2d9e3b..d5dba82 100644 --- a/src/main/java/com/campus/water/entity/DrinkRecord.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/InspectionRecord.java b/src/main/java/com/campus/water/entity/InspectionRecord.java index 8440772..946dbd6 100644 --- a/src/main/java/com/campus/water/entity/InspectionRecord.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/MaintenancePlan.java b/src/main/java/com/campus/water/entity/MaintenancePlan.java index 6bc5c89..5c7b99c 100644 --- a/src/main/java/com/campus/water/entity/MaintenancePlan.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/MessagePush.java b/src/main/java/com/campus/water/entity/MessagePush.java index ef6f9de..0ef913d 100644 --- a/src/main/java/com/campus/water/entity/MessagePush.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/Notification.java b/src/main/java/com/campus/water/entity/Notification.java index 7c592ab..6a231e4 100644 --- a/src/main/java/com/campus/water/entity/Notification.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/RepairerAuth.java b/src/main/java/com/campus/water/entity/RepairerAuth.java index 8ae987b..7cf7a42 100644 --- a/src/main/java/com/campus/water/entity/RepairerAuth.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/Repairman.java b/src/main/java/com/campus/water/entity/Repairman.java index 3633b03..77b1db1 100644 --- a/src/main/java/com/campus/water/entity/Repairman.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/TerminalUsageStats.java b/src/main/java/com/campus/water/entity/TerminalUsageStats.java index d5812e9..20c6917 100644 --- a/src/main/java/com/campus/water/entity/TerminalUsageStats.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/User.java b/src/main/java/com/campus/water/entity/User.java index 3f1cf90..c9e3949 100644 --- a/src/main/java/com/campus/water/entity/User.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/WaterMakerRealtimeData.java b/src/main/java/com/campus/water/entity/WaterMakerRealtimeData.java index 96c0e9e..8261632 100644 --- a/src/main/java/com/campus/water/entity/WaterMakerRealtimeData.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/WaterQualityHistory.java b/src/main/java/com/campus/water/entity/WaterQualityHistory.java index d106a57..61209a7 100644 --- a/src/main/java/com/campus/water/entity/WaterQualityHistory.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/WaterSupplyRealtimeData.java b/src/main/java/com/campus/water/entity/WaterSupplyRealtimeData.java index a4c735e..7834bf5 100644 --- a/src/main/java/com/campus/water/entity/WaterSupplyRealtimeData.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/WaterTerminalLocation.java b/src/main/java/com/campus/water/entity/WaterTerminalLocation.java index b6c93f2..d9d6e54 100644 --- a/src/main/java/com/campus/water/entity/WaterTerminalLocation.java +++ b/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; diff --git a/src/main/java/com/campus/water/entity/WorkOrder.java b/src/main/java/com/campus/water/entity/WorkOrder.java index 29d9ed2..9984f46 100644 --- a/src/main/java/com/campus/water/entity/WorkOrder.java +++ b/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.*; diff --git a/src/main/java/com/campus/water/entity/dto/request/DeviceStatusUpdateRequest.java b/src/main/java/com/campus/water/entity/dto/request/DeviceStatusUpdateRequest.java index 37921ac..3519eb3 100644 --- a/src/main/java/com/campus/water/entity/dto/request/DeviceStatusUpdateRequest.java +++ b/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; diff --git a/src/main/java/com/campus/water/entity/dto/request/LoginRequest.java b/src/main/java/com/campus/water/entity/dto/request/LoginRequest.java index 4e56ed3..a96735f 100644 --- a/src/main/java/com/campus/water/entity/dto/request/LoginRequest.java +++ b/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; diff --git a/src/main/java/com/campus/water/entity/dto/request/RegisterRequest.java b/src/main/java/com/campus/water/entity/dto/request/RegisterRequest.java index 3d8ce19..797a676 100644 --- a/src/main/java/com/campus/water/entity/dto/request/RegisterRequest.java +++ b/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; diff --git a/src/main/java/com/campus/water/entity/dto/request/StatisticsQueryRequest.java b/src/main/java/com/campus/water/entity/dto/request/StatisticsQueryRequest.java index ff6c558..6a0a465 100644 --- a/src/main/java/com/campus/water/entity/dto/request/StatisticsQueryRequest.java +++ b/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; diff --git a/src/main/java/com/campus/water/entity/dto/request/StudentDrinkQueryDTO.java b/src/main/java/com/campus/water/entity/dto/request/StudentDrinkQueryDTO.java index fbad794..d7b79b7 100644 --- a/src/main/java/com/campus/water/entity/dto/request/StudentDrinkQueryDTO.java +++ b/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; diff --git a/src/main/java/com/campus/water/entity/vo/AlarmStatisticsVO.java b/src/main/java/com/campus/water/entity/vo/AlarmStatisticsVO.java index 95e0606..83152e3 100644 --- a/src/main/java/com/campus/water/entity/vo/AlarmStatisticsVO.java +++ b/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; diff --git a/src/main/java/com/campus/water/entity/vo/DailyDrinkVO.java b/src/main/java/com/campus/water/entity/vo/DailyDrinkVO.java index 16890f3..8a5c8b4 100644 --- a/src/main/java/com/campus/water/entity/vo/DailyDrinkVO.java +++ b/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; diff --git a/src/main/java/com/campus/water/entity/vo/LoginVO.java b/src/main/java/com/campus/water/entity/vo/LoginVO.java index 782df00..9f185e8 100644 --- a/src/main/java/com/campus/water/entity/vo/LoginVO.java +++ b/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; diff --git a/src/main/java/com/campus/water/entity/vo/StatisticsVO.java b/src/main/java/com/campus/water/entity/vo/StatisticsVO.java index 09a424b..c6ecde6 100644 --- a/src/main/java/com/campus/water/entity/vo/StatisticsVO.java +++ b/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; diff --git a/src/main/java/com/campus/water/entity/vo/StudentDrinkStatsVO.java b/src/main/java/com/campus/water/entity/vo/StudentDrinkStatsVO.java index a09fecc..6bb2068 100644 --- a/src/main/java/com/campus/water/entity/vo/StudentDrinkStatsVO.java +++ b/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 */ diff --git a/src/main/java/com/campus/water/entity/vo/TerminalLocationVO.java b/src/main/java/com/campus/water/entity/vo/TerminalLocationVO.java index a09cf69..91c57e1 100644 --- a/src/main/java/com/campus/water/entity/vo/TerminalLocationVO.java +++ b/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; diff --git a/src/main/java/com/campus/water/entity/vo/TerminalManageVO.java b/src/main/java/com/campus/water/entity/vo/TerminalManageVO.java index 855cfe4..53a5291 100644 --- a/src/main/java/com/campus/water/entity/vo/TerminalManageVO.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/AdminRepository.java b/src/main/java/com/campus/water/mapper/AdminRepository.java index b7b7458..e89eda6 100644 --- a/src/main/java/com/campus/water/mapper/AdminRepository.java +++ b/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 { // 新增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 findAllAreaAdminsForCampus(Admin.AdminRole role); // 检查唯一约束 diff --git a/src/main/java/com/campus/water/mapper/AlertRepository.java b/src/main/java/com/campus/water/mapper/AlertRepository.java index ac58b22..3e98f5d 100644 --- a/src/main/java/com/campus/water/mapper/AlertRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/AreaRepository.java b/src/main/java/com/campus/water/mapper/AreaRepository.java index e40eb6f..3461331 100644 --- a/src/main/java/com/campus/water/mapper/AreaRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/DeviceRepository.java b/src/main/java/com/campus/water/mapper/DeviceRepository.java index 99a1dd2..4ec5962 100644 --- a/src/main/java/com/campus/water/mapper/DeviceRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/DeviceTerminalMappingRepository.java b/src/main/java/com/campus/water/mapper/DeviceTerminalMappingRepository.java index 6f261c0..5834f04 100644 --- a/src/main/java/com/campus/water/mapper/DeviceTerminalMappingRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/DrinkRecommendationRepository.java b/src/main/java/com/campus/water/mapper/DrinkRecommendationRepository.java index 0841a4a..8a28152 100644 --- a/src/main/java/com/campus/water/mapper/DrinkRecommendationRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/DrinkRecordRepository.java b/src/main/java/com/campus/water/mapper/DrinkRecordRepository.java index 23b8364..9235215 100644 --- a/src/main/java/com/campus/water/mapper/DrinkRecordRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/InspectionRecordRepository.java b/src/main/java/com/campus/water/mapper/InspectionRecordRepository.java index 5959b2b..57366ee 100644 --- a/src/main/java/com/campus/water/mapper/InspectionRecordRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/MaintenancePlanRepository.java b/src/main/java/com/campus/water/mapper/MaintenancePlanRepository.java index 485df05..a934fbb 100644 --- a/src/main/java/com/campus/water/mapper/MaintenancePlanRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/MessagePushRepository.java b/src/main/java/com/campus/water/mapper/MessagePushRepository.java index 9ed6717..959dddd 100644 --- a/src/main/java/com/campus/water/mapper/MessagePushRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/NotificationRepository.java b/src/main/java/com/campus/water/mapper/NotificationRepository.java index e8bf9d1..5cc8bd2 100644 --- a/src/main/java/com/campus/water/mapper/NotificationRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/RepairerAuthRepository.java b/src/main/java/com/campus/water/mapper/RepairerAuthRepository.java index a0b97e1..1abc79e 100644 --- a/src/main/java/com/campus/water/mapper/RepairerAuthRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/RepairmanRepository.java b/src/main/java/com/campus/water/mapper/RepairmanRepository.java index a0ceacc..b9fcf80 100644 --- a/src/main/java/com/campus/water/mapper/RepairmanRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/StatisticsRepository.java b/src/main/java/com/campus/water/mapper/StatisticsRepository.java index 17f7f58..6d7341d 100644 --- a/src/main/java/com/campus/water/mapper/StatisticsRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/TerminalUsageStatsRepository.java b/src/main/java/com/campus/water/mapper/TerminalUsageStatsRepository.java index c44a8dc..3e2531d 100644 --- a/src/main/java/com/campus/water/mapper/TerminalUsageStatsRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/UserRepository.java b/src/main/java/com/campus/water/mapper/UserRepository.java index 85bcf39..fc9f633 100644 --- a/src/main/java/com/campus/water/mapper/UserRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/WaterMakerRealtimeDataRepository.java b/src/main/java/com/campus/water/mapper/WaterMakerRealtimeDataRepository.java index 5e2f02e..2958cce 100644 --- a/src/main/java/com/campus/water/mapper/WaterMakerRealtimeDataRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/WaterQualityHistoryRepository.java b/src/main/java/com/campus/water/mapper/WaterQualityHistoryRepository.java index 08a7a74..6bbd62b 100644 --- a/src/main/java/com/campus/water/mapper/WaterQualityHistoryRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/WaterSupplyRealtimeDataRepository.java b/src/main/java/com/campus/water/mapper/WaterSupplyRealtimeDataRepository.java index ff5ce8f..475957d 100644 --- a/src/main/java/com/campus/water/mapper/WaterSupplyRealtimeDataRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/WaterTerminalLocationRepository.java b/src/main/java/com/campus/water/mapper/WaterTerminalLocationRepository.java index 16d91db..ee59890 100644 --- a/src/main/java/com/campus/water/mapper/WaterTerminalLocationRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/mapper/WorkOrderRepository.java b/src/main/java/com/campus/water/mapper/WorkOrderRepository.java index b3dcd11..a628d67 100644 --- a/src/main/java/com/campus/water/mapper/WorkOrderRepository.java +++ b/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; diff --git a/src/main/java/com/campus/water/model/WaterMakerSensorData.java b/src/main/java/com/campus/water/model/WaterMakerSensorData.java index 3487585..1e71eb3 100644 --- a/src/main/java/com/campus/water/model/WaterMakerSensorData.java +++ b/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; diff --git a/src/main/java/com/campus/water/model/WaterSupplySensorData.java b/src/main/java/com/campus/water/model/WaterSupplySensorData.java index 6741d3b..611e6e6 100644 --- a/src/main/java/com/campus/water/model/WaterSupplySensorData.java +++ b/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; diff --git a/src/main/java/com/campus/water/security/JwtAuthenticationFilter.java b/src/main/java/com/campus/water/security/JwtAuthenticationFilter.java index 9f359bb..930e9f2 100644 --- a/src/main/java/com/campus/water/security/JwtAuthenticationFilter.java +++ b/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; diff --git a/src/main/java/com/campus/water/security/JwtTokenProvider.java b/src/main/java/com/campus/water/security/JwtTokenProvider.java index d8f6d21..75921fd 100644 --- a/src/main/java/com/campus/water/security/JwtTokenProvider.java +++ b/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; diff --git a/src/main/java/com/campus/water/security/RoleConstants.java b/src/main/java/com/campus/water/security/RoleConstants.java index 2d82713..5560ee6 100644 --- a/src/main/java/com/campus/water/security/RoleConstants.java +++ b/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; /** * 角色常量定义 diff --git a/src/main/java/com/campus/water/security/UserDetailsServiceImpl.java b/src/main/java/com/campus/water/security/UserDetailsServiceImpl.java index 5ca6874..aca5e5b 100644 --- a/src/main/java/com/campus/water/security/UserDetailsServiceImpl.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/AdminService.java b/src/main/java/com/campus/water/service/AdminService.java index bfe1837..b4924cd 100644 --- a/src/main/java/com/campus/water/service/AdminService.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/AlertPushService.java b/src/main/java/com/campus/water/service/AlertPushService.java index 1c5c7b2..f87f87e 100644 --- a/src/main/java/com/campus/water/service/AlertPushService.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/AlertTriggerService.java b/src/main/java/com/campus/water/service/AlertTriggerService.java index 10e9f47..bccd0f8 100644 --- a/src/main/java/com/campus/water/service/AlertTriggerService.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/AreaService.java b/src/main/java/com/campus/water/service/AreaService.java index fe97942..59810bd 100644 --- a/src/main/java/com/campus/water/service/AreaService.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/DeviceService.java b/src/main/java/com/campus/water/service/DeviceService.java index bbf1bbb..cc7fc8b 100644 --- a/src/main/java/com/campus/water/service/DeviceService.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/DeviceStatusService.java b/src/main/java/com/campus/water/service/DeviceStatusService.java index 7fb4ee7..6e6b282 100644 --- a/src/main/java/com/campus/water/service/DeviceStatusService.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/DeviceStatusServiceImpl.java b/src/main/java/com/campus/water/service/DeviceStatusServiceImpl.java index a4aef47..d15b21e 100644 --- a/src/main/java/com/campus/water/service/DeviceStatusServiceImpl.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/LoginService.java b/src/main/java/com/campus/water/service/LoginService.java index 91441fe..2c5885c 100644 --- a/src/main/java/com/campus/water/service/LoginService.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/MqttSensorReceiver.java b/src/main/java/com/campus/water/service/MqttSensorReceiver.java index c871af0..5662644 100644 --- a/src/main/java/com/campus/water/service/MqttSensorReceiver.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/MqttSensorSender.java b/src/main/java/com/campus/water/service/MqttSensorSender.java index 2f88f2e..122af7d 100644 --- a/src/main/java/com/campus/water/service/MqttSensorSender.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/NotificationService.java b/src/main/java/com/campus/water/service/NotificationService.java index 6fddd6c..43ae7e6 100644 --- a/src/main/java/com/campus/water/service/NotificationService.java +++ b/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; /** diff --git a/src/main/java/com/campus/water/service/NotificationServiceImpl.java b/src/main/java/com/campus/water/service/NotificationServiceImpl.java index 9af8e5c..cf7dc8c 100644 --- a/src/main/java/com/campus/water/service/NotificationServiceImpl.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/RegisterService.java b/src/main/java/com/campus/water/service/RegisterService.java index f571b41..db1f793 100644 --- a/src/main/java/com/campus/water/service/RegisterService.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/RepairmanService.java b/src/main/java/com/campus/water/service/RepairmanService.java index bb0a02f..d6d217d 100644 --- a/src/main/java/com/campus/water/service/RepairmanService.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/StatisticsService.java b/src/main/java/com/campus/water/service/StatisticsService.java index f5134b6..ffaeeaf 100644 --- a/src/main/java/com/campus/water/service/StatisticsService.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/StudentDrinkStatsService.java b/src/main/java/com/campus/water/service/StudentDrinkStatsService.java index 5d01331..01b0439 100644 --- a/src/main/java/com/campus/water/service/StudentDrinkStatsService.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/StudentWaterDataService.java b/src/main/java/com/campus/water/service/StudentWaterDataService.java index 244900d..6558daa 100644 --- a/src/main/java/com/campus/water/service/StudentWaterDataService.java +++ b/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; diff --git a/src/main/java/com/campus/water/service/TerminalService.java b/src/main/java/com/campus/water/service/TerminalService.java index bfc1650..3b1707d 100644 --- a/src/main/java/com/campus/water/service/TerminalService.java +++ b/src/main/java/com/campus/water/service/TerminalService.java @@ -1,9 +1,9 @@ // java/com/campus/water/service/TerminalService.java -package com.campus.water.service; +package main.java.com.campus.water.service; -import com.campus.water.entity.DeviceTerminalMapping; -import com.campus.water.entity.WaterTerminalLocation; -import com.campus.water.entity.vo.TerminalManageVO; +import main.java.com.campus.water.entity.DeviceTerminalMapping; +import main.java.com.campus.water.entity.WaterTerminalLocation; +import main.java.com.campus.water.entity.vo.TerminalManageVO; import java.util.List; diff --git a/src/main/java/com/campus/water/service/TerminalServiceImpl.java b/src/main/java/com/campus/water/service/TerminalServiceImpl.java index 9700fc3..b6b6990 100644 --- a/src/main/java/com/campus/water/service/TerminalServiceImpl.java +++ b/src/main/java/com/campus/water/service/TerminalServiceImpl.java @@ -1,12 +1,12 @@ // java/com/campus/water/service/impl/TerminalServiceImpl.java -package com.campus.water.service; - -import com.campus.water.entity.DeviceTerminalMapping; -import com.campus.water.entity.WaterTerminalLocation; -import com.campus.water.mapper.DeviceTerminalMappingRepository; -import com.campus.water.mapper.WaterTerminalLocationRepository; -import com.campus.water.service.TerminalService; -import com.campus.water.entity.vo.TerminalManageVO; +package main.java.com.campus.water.service; + +import main.java.com.campus.water.entity.DeviceTerminalMapping; +import main.java.com.campus.water.entity.WaterTerminalLocation; +import main.java.com.campus.water.mapper.DeviceTerminalMappingRepository; +import main.java.com.campus.water.mapper.WaterTerminalLocationRepository; +import main.java.com.campus.water.service.TerminalService; +import main.java.com.campus.water.entity.vo.TerminalManageVO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/campus/water/service/UserService.java b/src/main/java/com/campus/water/service/UserService.java index 67b9667..e476840 100644 --- a/src/main/java/com/campus/water/service/UserService.java +++ b/src/main/java/com/campus/water/service/UserService.java @@ -1,7 +1,7 @@ -package com.campus.water.service; +package main.java.com.campus.water.service; -import com.campus.water.entity.User; -import com.campus.water.mapper.UserRepository; +import main.java.com.campus.water.entity.User; +import main.java.com.campus.water.mapper.UserRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.time.LocalDateTime; diff --git a/src/main/java/com/campus/water/service/WaterTerminalLocationService.java b/src/main/java/com/campus/water/service/WaterTerminalLocationService.java index 2dcfed8..b47e81e 100644 --- a/src/main/java/com/campus/water/service/WaterTerminalLocationService.java +++ b/src/main/java/com/campus/water/service/WaterTerminalLocationService.java @@ -1,6 +1,6 @@ -package com.campus.water.service; +package main.java.com.campus.water.service; -import com.campus.water.entity.vo.TerminalLocationVO; +import main.java.com.campus.water.entity.vo.TerminalLocationVO; import java.util.List; /** diff --git a/src/main/java/com/campus/water/service/WaterTerminalLocationServiceImpl.java b/src/main/java/com/campus/water/service/WaterTerminalLocationServiceImpl.java index e21de3f..ebd27b2 100644 --- a/src/main/java/com/campus/water/service/WaterTerminalLocationServiceImpl.java +++ b/src/main/java/com/campus/water/service/WaterTerminalLocationServiceImpl.java @@ -1,11 +1,11 @@ -package com.campus.water.service; +package main.java.com.campus.water.service; -import com.campus.water.entity.DeviceTerminalMapping; -import com.campus.water.entity.WaterTerminalLocation; -import com.campus.water.entity.vo.TerminalLocationVO; -import com.campus.water.mapper.DeviceTerminalMappingRepository; -import com.campus.water.mapper.WaterTerminalLocationRepository; -import com.campus.water.service.WaterTerminalLocationService; +import main.java.com.campus.water.entity.DeviceTerminalMapping; +import main.java.com.campus.water.entity.WaterTerminalLocation; +import main.java.com.campus.water.entity.vo.TerminalLocationVO; +import main.java.com.campus.water.mapper.DeviceTerminalMappingRepository; +import main.java.com.campus.water.mapper.WaterTerminalLocationRepository; +import main.java.com.campus.water.service.WaterTerminalLocationService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/campus/water/service/WorkOrderService.java b/src/main/java/com/campus/water/service/WorkOrderService.java index 98a1e82..d1a50ad 100644 --- a/src/main/java/com/campus/water/service/WorkOrderService.java +++ b/src/main/java/com/campus/water/service/WorkOrderService.java @@ -1,6 +1,6 @@ -package com.campus.water.service; +package main.java.com.campus.water.service; -import com.campus.water.entity.WorkOrder; +import main.java.com.campus.water.entity.WorkOrder; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/com/campus/water/service/WorkOrderServiceImpl.java b/src/main/java/com/campus/water/service/WorkOrderServiceImpl.java index cb4901d..ade3fc6 100644 --- a/src/main/java/com/campus/water/service/WorkOrderServiceImpl.java +++ b/src/main/java/com/campus/water/service/WorkOrderServiceImpl.java @@ -1,16 +1,16 @@ -package com.campus.water.service; +package main.java.com.campus.water.service; -import com.campus.water.entity.WorkOrder; -import com.campus.water.entity.Repairman; -import com.campus.water.mapper.WorkOrderRepository; -import com.campus.water.mapper.RepairmanRepository; +import main.java.com.campus.water.entity.WorkOrder; +import main.java.com.campus.water.entity.Repairman; +import main.java.com.campus.water.mapper.WorkOrderRepository; +import main.java.com.campus.water.mapper.RepairmanRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.campus.water.service.NotificationService; -import com.campus.water.service.WorkOrderService; +import main.java.com.campus.water.service.NotificationService; +import main.java.com.campus.water.service.WorkOrderService; import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/campus/water/service/app/RepairmanAppService.java b/src/main/java/com/campus/water/service/app/RepairmanAppService.java index 7387881..dcf55ea 100644 --- a/src/main/java/com/campus/water/service/app/RepairmanAppService.java +++ b/src/main/java/com/campus/water/service/app/RepairmanAppService.java @@ -1,8 +1,8 @@ -package com.campus.water.service.app; +package main.java.com.campus.water.service.app; -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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/campus/water/service/app/StudentAppService.java b/src/main/java/com/campus/water/service/app/StudentAppService.java index c0d57ab..3df41e2 100644 --- a/src/main/java/com/campus/water/service/app/StudentAppService.java +++ b/src/main/java/com/campus/water/service/app/StudentAppService.java @@ -1,7 +1,7 @@ -package com.campus.water.service.app; +package main.java.com.campus.water.service.app; -import com.campus.water.controller.WaterUsageController; -import com.campus.water.util.ResultVO; +import main.java.com.campus.water.controller.WaterUsageController; +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.stereotype.Service; diff --git a/src/main/java/com/campus/water/task/DeviceStatusMonitorTask.java b/src/main/java/com/campus/water/task/DeviceStatusMonitorTask.java index 8a05577..f5c5a34 100644 --- a/src/main/java/com/campus/water/task/DeviceStatusMonitorTask.java +++ b/src/main/java/com/campus/water/task/DeviceStatusMonitorTask.java @@ -1,9 +1,9 @@ /** * 设备状态监控定时任务 * 功能：定时 */ -package com.campus.water.task; +package main.java.com.campus.water.task; -import com.campus.water.service.DeviceStatusService; // 添加这行导入 +import main.java.com.campus.water.service.DeviceStatusService; // 添加这行导入 import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/campus/water/task/SensorSimulationTask.java b/src/main/java/com/campus/water/task/SensorSimulationTask.java index 003b586..aee7dd1 100644 --- a/src/main/java/com/campus/water/task/SensorSimulationTask.java +++ b/src/main/java/com/campus/water/task/SensorSimulationTask.java @@ -1,8 +1,8 @@ -package com.campus.water.task; +package main.java.com.campus.water.task; -import com.campus.water.entity.Device; -import com.campus.water.mapper.DeviceRepository; -import com.campus.water.service.MqttSensorSender; +import main.java.com.campus.water.entity.Device; +import main.java.com.campus.water.mapper.DeviceRepository; +import main.java.com.campus.water.service.MqttSensorSender; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/campus/water/util/CommonUtils.java b/src/main/java/com/campus/water/util/CommonUtils.java index 615690a..dbfa1bc 100644 --- a/src/main/java/com/campus/water/util/CommonUtils.java +++ b/src/main/java/com/campus/water/util/CommonUtils.java @@ -1,8 +1,8 @@ -package com.campus.water.util; +package main.java.com.campus.water.util; import java.time.LocalDate; import lombok.extern.slf4j.Slf4j; -import com.campus.water.entity.Device; -import com.campus.water.entity.Device.DeviceType; +import main.java.com.campus.water.entity.Device; +import main.java.com.campus.water.entity.Device.DeviceType; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDateTime; diff --git a/src/main/java/com/campus/water/util/DeviceMappingUtil.java b/src/main/java/com/campus/water/util/DeviceMappingUtil.java index c17834c..f4a9a35 100644 --- a/src/main/java/com/campus/water/util/DeviceMappingUtil.java +++ b/src/main/java/com/campus/water/util/DeviceMappingUtil.java @@ -1,4 +1,4 @@ -package com.campus.water.util; +package main.java.com.campus.water.util; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/campus/water/util/ResultVO.java b/src/main/java/com/campus/water/util/ResultVO.java index 773a19a..e91193d 100644 --- a/src/main/java/com/campus/water/util/ResultVO.java +++ b/src/main/java/com/campus/water/util/ResultVO.java @@ -1,4 +1,4 @@ -package com.campus.water.util; +package main.java.com.campus.water.util; import lombok.Data;