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 | 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浠ｇ爜 瀹炰綋绫荤殑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