From 78e5175a05eeb3776d3f21f603fb6fb7a18b3d54 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期四, 08 八月 2024 10:14:59 +0800 Subject: [PATCH] 1、任务表中新增是否删除字段 0:未删除 1:已删除 2、磨边队列方法改造:增加设置参数接口,websocket推送数据时可按照设置的参数推送对应的数据 3、任务新增破损、拿走状态处理 4、破损数据新增批量新增 5、工位流程卡玻璃是否到齐方法完善 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java index 12a725b..9226203 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java @@ -1,17 +1,43 @@ package com.mes.taskcache.entity; -import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -@Data //lombok 绠�鍐檍ava浠g爜 瀹炰綋绫荤殑get涓巗et +import java.util.Date; + +/** + * 鍗у紡鐞嗙墖绗间换鍔¤〃 + */ +@Data @TableName("task_cache") public class TaskCache { - private String glassId;//浠诲姟缂栧彿 - private int startCell;//璧峰 - private int endCell;//缁撴潫 - private int taskType;//浠诲姟绫诲瀷 - private int taskStatus;//浠诲姟鐘舵�� - private DateTime createTime;//浠诲姟鐘舵�� + /** + * 浠诲姟缂栧彿 + */ + private String glassId; + /** + * 璧峰 + */ + private int startCell; + /** + * 缁撴潫 + */ + private int endCell; + /** + * 浠诲姟绫诲瀷 + */ + private int taskType; + /** + * 浠诲姟鐘舵�� + */ + private int taskStatus; + /** + * 鍒涘缓鏃堕棿 + */ + private Date createTime; + + @TableLogic + private int deleted; } -- Gitblit v1.8.0