diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/log/OpsOrderCleanLogDO.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/log/OpsOrderCleanLogDO.java deleted file mode 100644 index 3a9744f..0000000 --- a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/dataobject/log/OpsOrderCleanLogDO.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.viewsh.module.ops.environment.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-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/mysql/log/OpsOrderCleanLogMapper.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/mysql/log/OpsOrderCleanLogMapper.java deleted file mode 100644 index 220a2d6..0000000 --- a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/dal/mysql/log/OpsOrderCleanLogMapper.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.viewsh.module.ops.environment.dal.mysql.log; - -import com.viewsh.framework.mybatis.core.mapper.BaseMapperX; -import com.viewsh.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.viewsh.module.ops.environment.dal.dataobject.log.OpsOrderCleanLogDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 保洁业务日志 Mapper - * - * @author lzh - */ -@Mapper -public interface OpsOrderCleanLogMapper extends BaseMapperX { - - /** - * 根据工单ID查询日志 - */ - default List selectListByOpsOrderId(Long opsOrderId) { - return selectList(new LambdaQueryWrapperX() - .eq(OpsOrderCleanLogDO::getOpsOrderId, opsOrderId) - .orderByDesc(OpsOrderCleanLogDO::getEventTime)); - } - - /** - * 根据保洁员查询日志 - */ - default List selectListByCleanerId(Long cleanerId) { - return selectList(new LambdaQueryWrapperX() - .eq(OpsOrderCleanLogDO::getCleanerId, cleanerId) - .orderByDesc(OpsOrderCleanLogDO::getEventTime)); - } - - /** - * 根据事件领域和类型查询日志 - */ - default List selectListByDomainAndType(String eventDomain, String eventType) { - return selectList(new LambdaQueryWrapperX() - .eq(OpsOrderCleanLogDO::getEventDomain, eventDomain) - .eq(OpsOrderCleanLogDO::getEventType, eventType) - .orderByDesc(OpsOrderCleanLogDO::getEventTime)); - } - - // 注意:分页查询方法需要在Service层实现,这里只提供基础查询方法 - // 具体分页查询请参考Service实现 - -} 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 e809d99..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/mysql/log/OpsOrderCleanLogMapper.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/log/OpsOrderCleanLogMapper.java deleted file mode 100644 index ee19935..0000000 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/mysql/log/OpsOrderCleanLogMapper.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.viewsh.module.ops.dal.mysql.log; - -import com.viewsh.framework.mybatis.core.mapper.BaseMapperX; -import com.viewsh.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.viewsh.module.ops.dal.dataobject.log.OpsOrderCleanLogDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 保洁业务日志 Mapper - * - * @author lzh - */ -@Mapper -public interface OpsOrderCleanLogMapper extends BaseMapperX { - - /** - * 根据工单ID查询日志 - */ - default List selectListByOpsOrderId(Long opsOrderId) { - return selectList(new LambdaQueryWrapperX() - .eq(OpsOrderCleanLogDO::getOpsOrderId, opsOrderId) - .orderByDesc(OpsOrderCleanLogDO::getEventTime)); - } - - /** - * 根据保洁员查询日志 - */ - default List selectListByCleanerId(Long cleanerId) { - return selectList(new LambdaQueryWrapperX() - .eq(OpsOrderCleanLogDO::getCleanerId, cleanerId) - .orderByDesc(OpsOrderCleanLogDO::getEventTime)); - } - - /** - * 根据事件领域和类型查询日志 - */ - default List selectListByDomainAndType(String eventDomain, String eventType) { - return selectList(new LambdaQueryWrapperX() - .eq(OpsOrderCleanLogDO::getEventDomain, eventDomain) - .eq(OpsOrderCleanLogDO::getEventType, eventType) - .orderByDesc(OpsOrderCleanLogDO::getEventTime)); - } - -}