From fecd8ff508b33715cbe24ca892fc19a2d1ad1ef5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 06 十一月 2023 16:34:05 +0800
Subject: [PATCH] 加锁解决同时读串口时报的资源不可用和超时报错
---
model/request/task.go | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/model/request/task.go b/model/request/task.go
index a3d78b6..1a2c6b6 100644
--- a/model/request/task.go
+++ b/model/request/task.go
@@ -1,5 +1,7 @@
package request
+import "apsClient/constvar"
+
// TaskInfo 浠诲姟寮�鍚�氱煡璇锋眰鍙傛暟
type TaskInfo struct {
OrderId string `json:"orderId"` // 璁㈠崟鍙�
@@ -12,14 +14,37 @@
// TaskList 浠诲姟鍒楄〃璇锋眰鍙傛暟
type TaskList struct {
PageInfo
+ TaskMode constvar.TaskMode `json:"taskMode" form:"taskMode"`
+ DeviceID string `json:"deviceID"`
}
type SendProcessParams struct {
- ProcedureId int `json:"procedureId" binding:"required"`
- Channel int32 `json:"channel"`
+ ProcedureId uint `json:"procedureId" binding:"required"`
}
type GetProductProgress struct {
- ProcedureId int `json:"procedureId" binding:"required"`
- Channel int32 `json:"channel"`
+ Channel int32 `json:"channel"`
}
+
+// ProcessModelList 宸ヨ壓鍙傛暟鍒楄〃璇锋眰鍙傛暟
+type ProcessModelList struct {
+ PageInfo
+ ProcedureId uint `json:"procedureId" form:"procedureId" binding:"required"` //褰撳墠鐨勫伐搴廼d
+}
+
+// TaskListByChannel 鎸塩hannel杩斿洖浠诲姟鍒楄〃璇锋眰鍙傛暟
+type TaskListByChannel struct {
+ Offset int `json:"offset,omitempty" form:"offset"` //榛樿0
+ Limit int `json:"limit,omitempty" form:"limit"` //榛樿3
+ Type QueryType `json:"type,omitempty" form:"type"` //1 鏈畬鎴� 2 浠婂ぉ鏈畬鎴� 3 宸插畬鎴�
+ Channel *int32 `json:"channel" form:"channel"` //閫氶亾鍙枫�備笉浼犲彇鍏ㄩ儴鐨�
+ DeviceID string `json:"deviceID"`
+}
+
+type QueryType int
+
+const (
+ QueryTypeUnFinish QueryType = 1
+ QueryTypeToday QueryType = 2
+ QueryTypeFinished QueryType = 3
+)
--
Gitblit v1.8.0