From 2ab94056786f8a7bcf66cf1ed25002e74ed7f016 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 08 十一月 2023 17:36:19 +0800
Subject: [PATCH] sql同步消息添加id,处理消息重复的问题
---
model/response/common.go | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/model/response/common.go b/model/response/common.go
index 9e36958..aee78c3 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 {
@@ -77,10 +79,15 @@
SystemDeviceStatusUnNormal SystemDeviceStatus = 2 //寮傚父
)
+type Device struct {
+ DeviceID string `json:"deviceID,omitempty"`
+ DeviceName string `json:"deviceName,omitempty"`
+}
+
type DeviceListResponse struct {
SystemDeviceID string `json:"systemDeviceID,omitempty"` //宸ユ帶鏈鸿澶嘔D
CurrentDeviceID string `json:"currentDeviceID,omitempty"` //褰撳墠閫夊畾鐨勭敓浜ц澶�
- DeviceIDList []string `json:"deviceIDList,omitempty"` //鐢熶骇璁惧id鍒楄〃
+ DeviceList []*Device `json:"deviceList,omitempty"` //鐢熶骇璁惧id鍒楄〃
SystemDeviceStatus SystemDeviceStatus `json:"systemDeviceStatus"` //璁惧鐘舵��
ClusterStatus string `json:"clusterStatus"` //闆嗙兢鐘舵��
ClusterNodeQuantity int `json:"clusterNodeQuantity"` //闆嗙兢鑺傜偣鏁伴噺
--
Gitblit v1.8.0