From 1577c2e2874c1fad9ac684356bf0e568c3015045 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 27 十一月 2024 09:46:15 +0800
Subject: [PATCH] 1、大理片笼新增进笼规则，计算本工程下所有玻璃的虚拟格子信息，按照虚拟格子，匹配笼内的实际格子，进笼之后查看格子是否有到齐的，执行调度任务 2、卧理修改任务执行顺序，移除捕获异常操作 3、不覆盖原有逻辑，新增opc任务，避免任务重复执行报错
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java | 50 ++++++++++++++++++++++----------------------------
1 files changed, 22 insertions(+), 28 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 1f3a632..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,49 +1,43 @@
package com.mes.taskcache.entity;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.util.Date;
/**
- * <p>
- *
- * </p>
- *
- * @author zhoush
- * @since 2024-04-07
+ * 鍗у紡鐞嗙墖绗间换鍔¤〃
*/
@Data
-@EqualsAndHashCode(callSuper = false)
-public class TaskCache implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
+@TableName("task_cache")
+public class TaskCache {
/**
- * ID缂栧彿
+ * 浠诲姟缂栧彿
*/
- @TableId("ID")
- private String id;
-
+ private String glassId;
/**
* 璧峰
*/
- private String startCell;
-
+ private int startCell;
/**
- * 鐩爣
+ * 缁撴潫
*/
- private String endCell;
-
+ private int endCell;
/**
- * 浠诲姟绫诲瀷 1:杩� 2锛氬嚭
+ * 浠诲姟绫诲瀷
*/
- private String taskType;
-
+ private int taskType;
/**
- * 浠诲姟鐘舵�� 0 鏈紑濮� 1姝ｅ湪杩涜 2瀹屾垚
+ * 浠诲姟鐘舵��
*/
- private String taskStauts;
+ private int taskStatus;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createTime;
+ @TableLogic
+ private int deleted;
}
--
Gitblit v1.8.0