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 |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/model/response/common.go b/model/response/common.go
index 78341ce..79457c5 100644
--- a/model/response/common.go
+++ b/model/response/common.go
@@ -54,9 +54,11 @@
 }
 
 type ProductProgress struct {
-	FinishNumber int `json:"finishNumber"`
-	TotalNumber  int `json:"totalNumber"`
-	PlcStatus    int `json:"plcStatus"`
+	FinishNumber  int   `json:"finishNumber"`
+	TotalNumber   int   `json:"totalNumber"`
+	PlcStatus     int   `json:"plcStatus"`
+	RealStartTime int64 `json:"RealStartTime"`
+	RealEndTime   int64 `json:"RealEndTime"`
 }
 
 type TaskCountdown struct {
@@ -70,8 +72,25 @@
 	Data  interface{}
 }
 
+type SystemDeviceStatus int
+
+const (
+	SystemDeviceStatusNormal   SystemDeviceStatus = 1 //姝e父
+	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"` //褰撳墠閫夊畾鐨勭敓浜ц澶�
-	DeviceIDList    []string `json:"deviceIDList,omitempty"`    //鐢熶骇璁惧id鍒楄〃
+	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