From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
model/response/common.go | 69 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 7 deletions(-)
diff --git a/model/response/common.go b/model/response/common.go
index f162e49..79457c5 100644
--- a/model/response/common.go
+++ b/model/response/common.go
@@ -1,7 +1,9 @@
package response
import (
+ "apsClient/conf"
"apsClient/model"
+ "apsClient/model/common"
)
type PageResult struct {
@@ -19,10 +21,21 @@
}
type TaskData struct {
- Order *model.Order
- Procedure *model.Procedures
- NextProcedure *model.Procedures
- Config
+ Order *model.Order
+ Procedure *model.Procedures
+
+ Channel int32 //褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜閫氶亾
+ AllProcedures []string
+ CurrentProcedureIndex int
+ CanStarted bool //鏄惁鍙互寮�濮嬬敓浜�
+}
+
+type TaskResponse struct {
+ Tasks []*TaskData //浠诲姟鍒楄〃
+ TaskCount int64 //浠诲姟鏁伴噺
+ Workers []*common.ProcedureWorker `json:"workers"` // 浜哄憳鍒楄〃
+ Prompt conf.Prompt //鎻愮ず璇�
+ ChannelAmount int //閫氶亾鏁伴噺
}
type Config struct {
@@ -30,12 +43,54 @@
DeviceStatus string
}
+type ProcessParamsResponse struct {
+ Number string
+ Params []ProcessParams
+}
+
type ProcessParams struct {
Key string
Value interface{}
}
-type NetConfig struct {
- DeviceName string
- DeviceStatus string
+type ProductProgress struct {
+ FinishNumber int `json:"finishNumber"`
+ TotalNumber int `json:"totalNumber"`
+ PlcStatus int `json:"plcStatus"`
+ RealStartTime int64 `json:"RealStartTime"`
+ RealEndTime int64 `json:"RealEndTime"`
+}
+
+type TaskCountdown struct {
+ CountDownHour int64 //鍊掕鏃� 鏃�
+ CountDownMinute int64 //鍊掕鏃� 鍒�
+ ShowCountDown bool //鏄惁灞曠ず鍊掕鏃�
+}
+
+type Message struct {
+ Event string
+ Data interface{}
+}
+
+type SystemDeviceStatus int
+
+const (
+ SystemDeviceStatusNormal SystemDeviceStatus = 1 //姝ｅ父
+ SystemDeviceStatusUnNormal SystemDeviceStatus = 2 //寮傚父
+)
+
+type Device struct {
+ DeviceID string `json:"deviceID"`
+ DeviceName string `json:"deviceName"`
+ NeedSetProcessParams bool `json:"needSetProcessParams"` //鏄惁闇�瑕佽缃伐鑹哄弬鏁�
+}
+
+type DeviceListResponse struct {
+ SystemDeviceID string `json:"systemDeviceID,omitempty"` //宸ユ帶鏈鸿澶嘔D
+ CurrentDeviceID string `json:"currentDeviceID,omitempty"` //褰撳墠閫夊畾鐨勭敓浜ц澶�
+ DeviceList []*Device `json:"deviceList,omitempty"` //鐢熶骇璁惧id鍒楄〃
+ SystemDeviceStatus SystemDeviceStatus `json:"systemDeviceStatus"` //璁惧鐘舵��
+ ClusterStatus string `json:"clusterStatus"` //闆嗙兢鐘舵��
+ ClusterNodeQuantity int `json:"clusterNodeQuantity"` //闆嗙兢鑺傜偣鏁伴噺
+ SystemDeviceRunSince int64 `json:"systemDeviceRunSince"` //绯荤粺杩愯寮�濮嬫椂闂存埑
}
--
Gitblit v1.8.0