From 285abe6d484cfc511241b4434bcac6b385c9ed5e Mon Sep 17 00:00:00 2001 From: lzh Date: Fri, 9 Jan 2026 16:44:26 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E3=80=90ops=E3=80=91=E8=BF=81?= =?UTF-8?q?=E7=A7=BBcleaner=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93=E5=88=B0en?= =?UTF-8?q?vironment=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OpsCleanerPerformanceMonthlyDO.java | 2 +- .../cleaner/OpsCleanerStatusDO.java | 2 +- .../service/cleaner/CleanerStatusService.java | 2 +- .../cleaner/CleanerStatusServiceImpl.java | 4 +- .../dataobject/log/OpsOrderCleanLogDO.java | 82 ------------------- .../workorder/OpsOrderCleanExtDO.java | 74 ----------------- .../OpsCleanerPerformanceMonthlyMapper.java | 48 ----------- .../mysql/cleaner/OpsCleanerStatusMapper.java | 61 -------------- 8 files changed, 5 insertions(+), 270 deletions(-) rename viewsh-module-ops/{viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops => viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment}/dal/dataobject/cleaner/OpsCleanerPerformanceMonthlyDO.java (96%) rename viewsh-module-ops/{viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops => viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment}/dal/dataobject/cleaner/OpsCleanerStatusDO.java (97%) delete mode 100644 viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/log/OpsOrderCleanLogDO.java delete mode 100644 viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderCleanExtDO.java delete mode 100644 viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/cleaner/OpsCleanerPerformanceMonthlyMapper.java delete mode 100644 viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/cleaner/OpsCleanerStatusMapper.java diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/cleaner/OpsCleanerPerformanceMonthlyDO.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/cleaner/OpsCleanerPerformanceMonthlyDO.java similarity index 96% rename from viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/cleaner/OpsCleanerPerformanceMonthlyDO.java rename to viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/cleaner/OpsCleanerPerformanceMonthlyDO.java index 447ae45..db5c8b8 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/cleaner/OpsCleanerPerformanceMonthlyDO.java +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/cleaner/OpsCleanerPerformanceMonthlyDO.java @@ -1,4 +1,4 @@ -package com.viewsh.module.ops.dal.dataobject.cleaner; +package com.viewsh.module.ops.environment.dal.dataobject.cleaner; import com.viewsh.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/cleaner/OpsCleanerStatusDO.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/cleaner/OpsCleanerStatusDO.java similarity index 97% rename from viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/cleaner/OpsCleanerStatusDO.java rename to viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/cleaner/OpsCleanerStatusDO.java index 25966bf..905fd04 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/cleaner/OpsCleanerStatusDO.java +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/cleaner/OpsCleanerStatusDO.java @@ -1,4 +1,4 @@ -package com.viewsh.module.ops.dal.dataobject.cleaner; +package com.viewsh.module.ops.environment.dal.dataobject.cleaner; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/cleaner/CleanerStatusService.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/cleaner/CleanerStatusService.java index 061574e..ba8382e 100644 --- a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/cleaner/CleanerStatusService.java +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/cleaner/CleanerStatusService.java @@ -1,6 +1,6 @@ package com.viewsh.module.ops.environment.service.cleaner; -import com.viewsh.module.ops.dal.dataobject.cleaner.OpsCleanerStatusDO; +import com.viewsh.module.ops.environment.dal.dataobject.cleaner.OpsCleanerStatusDO; import com.viewsh.module.ops.enums.CleanerStatusEnum; import java.util.List; diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/cleaner/CleanerStatusServiceImpl.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/cleaner/CleanerStatusServiceImpl.java index d83466e..9a4bb3d 100644 --- a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/cleaner/CleanerStatusServiceImpl.java +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/service/cleaner/CleanerStatusServiceImpl.java @@ -1,8 +1,8 @@ package com.viewsh.module.ops.environment.service.cleaner; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.viewsh.module.ops.dal.dataobject.cleaner.OpsCleanerStatusDO; -import com.viewsh.module.ops.dal.mysql.cleaner.OpsCleanerStatusMapper; +import com.viewsh.module.ops.environment.dal.dataobject.cleaner.OpsCleanerStatusDO; +import com.viewsh.module.ops.environment.dal.mysql.cleaner.OpsCleanerStatusMapper; import com.viewsh.module.ops.enums.CleanerStatusEnum; import jakarta.annotation.Resource; diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/log/OpsOrderCleanLogDO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/log/OpsOrderCleanLogDO.java deleted file mode 100644 index 92717e4..0000000 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/log/OpsOrderCleanLogDO.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.viewsh.module.ops.dal.dataobject.log; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.viewsh.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.Map; - -/** - * 保洁业务日志 DO - * - * @author lzh - */ -@TableName(value = "ops_order_clean_log", autoResultMap = true) -@KeySequence("ops_order_clean_log_seq") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class OpsOrderCleanLogDO extends BaseDO { - - /** - * 日志ID - */ - @TableId - private Long id; - /** - * 事件发生时间 - */ - private LocalDateTime eventTime; - /** - * 日志级别（INFO=信息/WARN=警告/ERROR=错误） - */ - private String eventLevel; - /** - * 领域（RULE=规则引擎/DISPATCH=调度/BADGE=工牌/BEACON=信标/SYSTEM=系统） - * - * 枚举 {@link com.viewsh.module.ops.enums.EventDomainEnum} - */ - private String eventDomain; - /** - * 事件类型 - */ - private String eventType; - /** - * 关联工单ID - * - * 关联 {@link com.viewsh.module.ops.dal.dataobject.workorder.OpsOrderDO#getId()} - */ - private Long opsOrderId; - /** - * 区域ID - * - * 关联 {@link com.viewsh.module.ops.dal.dataobject.area.OpsBusAreaDO#getId()} - */ - private Long areaId; - /** - * 保洁员ID - */ - private Long cleanerId; - /** - * 设备ID（工牌/信标） - */ - private Long deviceId; - /** - * 可读日志内容 - */ - private String eventMessage; - /** - * 结构化上下文 - */ - @TableField(typeHandler = JacksonTypeHandler.class) - private Map eventPayload; - -} diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderCleanExtDO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderCleanExtDO.java deleted file mode 100644 index 48f8ce1..0000000 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/workorder/OpsOrderCleanExtDO.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.viewsh.module.ops.dal.dataobject.workorder; - -import com.viewsh.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -import java.time.LocalDateTime; - -/** - * 保洁工单扩展 DO - * - * @author lzh - */ -@TableName("ops_order_clean_ext") -@KeySequence("ops_order_clean_ext_seq") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class OpsOrderCleanExtDO extends BaseDO { - - /** - * 主键 - */ - @TableId - private Long id; - /** - * 工单ID - * - * 关联 {@link OpsOrderDO#getId()} - */ - private Long opsOrderId; - /** - * 是否自动工单（1=自动 0=手动） - */ - private Integer isAuto; - /** - * 预计作业时长（分钟） - */ - private Integer expectedDuration; - /** - * 实际到岗时间 - */ - private LocalDateTime arrivedTime; - /** - * 实际完成时间 - */ - private LocalDateTime completedTime; - /** - * 暂停开始时间 - */ - private LocalDateTime pauseStartTime; - /** - * 暂停结束时间 - */ - private LocalDateTime pauseEndTime; - /** - * 累计暂停时长（秒） - */ - private Integer totalPauseSeconds; - /** - * 保洁类型（ROUTINE=日常/DEEP=深度/SPOT=点状/EMERGENCY=应急） - */ - private String cleaningType; - /** - * 难度等级（1-5级） - */ - private Integer difficultyLevel; - -} diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/cleaner/OpsCleanerPerformanceMonthlyMapper.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/cleaner/OpsCleanerPerformanceMonthlyMapper.java deleted file mode 100644 index a7a1680..0000000 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/cleaner/OpsCleanerPerformanceMonthlyMapper.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.viewsh.module.ops.dal.mysql.cleaner; - -import com.viewsh.framework.mybatis.core.mapper.BaseMapperX; -import com.viewsh.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.viewsh.module.ops.dal.dataobject.cleaner.OpsCleanerPerformanceMonthlyDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 保洁员绩效月度汇总 Mapper - * - * @author lzh - */ -@Mapper -public interface OpsCleanerPerformanceMonthlyMapper extends BaseMapperX { - - /** - * 根据用户ID和年月查询绩效 - */ - default OpsCleanerPerformanceMonthlyDO selectByUserIdAndYearMonth(Long userId, String yearMonth) { - return selectOne(new LambdaQueryWrapperX() - .eq(OpsCleanerPerformanceMonthlyDO::getUserId, userId) - .eq(OpsCleanerPerformanceMonthlyDO::getYearMonth, yearMonth)); - } - - /** - * 根据年月查询所有人的绩效 - */ - default List selectListByYearMonth(String yearMonth) { - return selectList(new LambdaQueryWrapperX() - .eq(OpsCleanerPerformanceMonthlyDO::getYearMonth, yearMonth) - .orderByDesc(OpsCleanerPerformanceMonthlyDO::getPerformanceScore)); - } - - // 注意：分页查询方法需要在Service层实现，这里只提供基础查询方法 - // 具体分页查询请参考Service实现 - - /** - * 查询用户的历史绩效列表 - */ - default List selectListByUserId(Long userId) { - return selectList(new LambdaQueryWrapperX() - .eq(OpsCleanerPerformanceMonthlyDO::getUserId, userId) - .orderByDesc(OpsCleanerPerformanceMonthlyDO::getYearMonth)); - } - -} diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/cleaner/OpsCleanerStatusMapper.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/cleaner/OpsCleanerStatusMapper.java deleted file mode 100644 index 6f56bdc..0000000 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/cleaner/OpsCleanerStatusMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.viewsh.module.ops.dal.mysql.cleaner; - -import com.viewsh.framework.mybatis.core.mapper.BaseMapperX; -import com.viewsh.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.viewsh.module.ops.dal.dataobject.cleaner.OpsCleanerStatusDO; -import org.apache.ibatis.annotations.Mapper; - -import java.time.LocalDateTime; -import java.util.List; - -/** - * 保洁员实时状态 Mapper - * - * @author lzh - */ -@Mapper -public interface OpsCleanerStatusMapper extends BaseMapperX { - - /** - * 根据用户ID查询状态 - */ - default OpsCleanerStatusDO selectByUserId(Long userId) { - return selectOne(OpsCleanerStatusDO::getUserId, userId); - } - - /** - * 根据状态查询保洁员列表 - */ - default List selectListByStatus(String status) { - return selectList(new LambdaQueryWrapperX() - .eq(OpsCleanerStatusDO::getStatus, status) - .orderByDesc(OpsCleanerStatusDO::getStatusChangeTime)); - } - - /** - * 根据区域查询附近保洁员 - */ - default List selectListByAreaId(Long areaId) { - return selectList(new LambdaQueryWrapperX() - .eq(OpsCleanerStatusDO::getCurrentAreaId, areaId) - .ne(OpsCleanerStatusDO::getStatus, "OFFLINE") - .orderByDesc(OpsCleanerStatusDO::getLastHeartbeatTime)); - } - - /** - * 查询离线保洁员（心跳超时） - */ - default List selectListByHeartbeatTimeout(LocalDateTime timeout) { - return selectList(new LambdaQueryWrapperX() - .lt(OpsCleanerStatusDO::getLastHeartbeatTime, timeout) - .ne(OpsCleanerStatusDO::getStatus, "OFFLINE")); - } - - /** - * 根据设备ID查询保洁员状态 - */ - default OpsCleanerStatusDO selectByDeviceId(Long deviceId) { - return selectOne(OpsCleanerStatusDO::getDeviceId, deviceId); - } - -}