feat: 移除工艺物料与混产模板实体、新增产线清线与 PLC 监控实时推送、看板双屏增强
- 移除实体:MES 删除 FlowMaterial(工艺物料)与 MixProductionTemplate(混产模板)全套(schema/ent 生成码/handler/logic),清理关联路由与种子 - 新增功能:产线清线(line_clearance handler + logic)、PLC 监控 WebSocket 实时推送(ws/plc_monitor_hub + handler) - 看板增强:新增管理屏与 KPI 组件(BoardManage/BoardKpi),调整演示屏 Mock 与各看板面板 - MES 完善:PLC 匹配/扭矩扫描/签收、工艺卡 PDF 与工单、AGV 链路、叫料/备料/在制品/短料预测等逻辑与前端调整 - 工位终端:删除离线面板 OfflinePanel,调整主界面/物料面板与 api/store/handler/路由 - WMS:AGV 托盘、物料与 MES 客户端调整及前端帮助/基础数据/叫料/托盘页 - 文档:更新产线API/客户问题/案例/部署手册/问题记录
This commit is contained in:
@@ -0,0 +1,198 @@
|
||||
package ws
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"bj_power_mes/internal/logic"
|
||||
"bj_power_mes/internal/svc"
|
||||
|
||||
"github.com/gorilla/websocket"
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
// PLC 点位长连接推送参数。
|
||||
const (
|
||||
plcMonitorPollInterval = 3 * time.Second // 联调要秒级感知,3s 读一次
|
||||
plcMonitorSnapshotTimeout = 2500 * time.Millisecond // 与 plcHardCut 同口径,PLC 断电 2.5s fail-open
|
||||
plcMonitorWriteTimeout = 5 * time.Second
|
||||
plcMonitorReadTimeout = 90 * time.Second
|
||||
plcMonitorPingInterval = 30 * time.Second
|
||||
)
|
||||
|
||||
type plcMonitorClient struct {
|
||||
conn *websocket.Conn
|
||||
send chan []byte
|
||||
}
|
||||
|
||||
// PlcMonitorHub PLC 管理页点位长连接推送中心:
|
||||
// - 首个连接建立时懒启动轮询:每 plcMonitorPollInterval 读一次 48 位信号 + 全部 MW 在途指令,
|
||||
// 2.5s 读超时(PLC 断电不拖垮推送),快照变化才广播整帧;
|
||||
// - 读失败时推一条 error 帧(仅状态翻转时推一次,不刷屏),前端据此提示"PLC 通讯异常"并保留上一帧;
|
||||
// - 本 Hub 只推只读快照,绝不写 PLC;写操作仍走 /plc/monitor/manual-write 等带二次确认的接口。
|
||||
type PlcMonitorHub struct {
|
||||
svcCtx *svc.ServiceContext
|
||||
upgrader websocket.Upgrader
|
||||
mu sync.Mutex
|
||||
clients map[*plcMonitorClient]struct{}
|
||||
last string // 上一帧成功快照(JSON),用于变化检测
|
||||
lastErr bool // 上一次读取是否失败(仅错误状态翻转时推 error 帧)
|
||||
once sync.Once
|
||||
}
|
||||
|
||||
func NewPlcMonitorHub(svcCtx *svc.ServiceContext) *PlcMonitorHub {
|
||||
h := &PlcMonitorHub{
|
||||
svcCtx: svcCtx,
|
||||
clients: map[*plcMonitorClient]struct{}{},
|
||||
}
|
||||
h.upgrader = websocket.Upgrader{CheckOrigin: sameOrigin}
|
||||
return h
|
||||
}
|
||||
|
||||
func (h *PlcMonitorHub) add(c *plcMonitorClient) {
|
||||
h.mu.Lock()
|
||||
h.clients[c] = struct{}{}
|
||||
h.mu.Unlock()
|
||||
}
|
||||
|
||||
func (h *PlcMonitorHub) remove(c *plcMonitorClient) {
|
||||
h.mu.Lock()
|
||||
delete(h.clients, c)
|
||||
h.mu.Unlock()
|
||||
_ = c.conn.Close()
|
||||
}
|
||||
|
||||
// snapshot 取一次点位快照:48 位信号 + MW 在途指令,2.5s 超时封顶(PLC 断电 fail-open)。
|
||||
func (h *PlcMonitorHub) snapshot() ([]byte, error) {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), plcMonitorSnapshotTimeout)
|
||||
defer cancel()
|
||||
svc := logic.New(h.svcCtx)
|
||||
bits, err := svc.PlcMonitorBits(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
mws, err := svc.PlcMonitorMW(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
b, _ := json.Marshal(map[string]any{"bits": bits, "mws": mws})
|
||||
return b, nil
|
||||
}
|
||||
|
||||
// publishIfChanged 只在快照变化时广播;读取失败仅在错误状态翻转时推一条 error 帧。
|
||||
// 仅由 startPolling 的单一 ticker goroutine 调用,lastErr 无并发写。
|
||||
func (h *PlcMonitorHub) publishIfChanged() {
|
||||
payload, err := h.snapshot()
|
||||
if err != nil {
|
||||
logx.Errorf("PLC 点位快照失败:%v", err)
|
||||
if !h.lastErr {
|
||||
h.lastErr = true
|
||||
b, _ := json.Marshal(map[string]any{"error": err.Error()})
|
||||
h.broadcast(b)
|
||||
}
|
||||
return
|
||||
}
|
||||
if h.lastErr {
|
||||
h.lastErr = false // 通讯恢复,下一条正常帧会清掉前端错误提示
|
||||
}
|
||||
h.mu.Lock()
|
||||
if string(payload) == h.last {
|
||||
h.mu.Unlock()
|
||||
return
|
||||
}
|
||||
h.last = string(payload)
|
||||
h.mu.Unlock()
|
||||
h.broadcast(payload)
|
||||
}
|
||||
|
||||
func (h *PlcMonitorHub) broadcast(payload []byte) {
|
||||
h.mu.Lock()
|
||||
for c := range h.clients {
|
||||
select {
|
||||
case c.send <- payload:
|
||||
default: // 慢客户端丢弃当前帧,下个周期会推最新全量
|
||||
}
|
||||
}
|
||||
h.mu.Unlock()
|
||||
}
|
||||
|
||||
// startPolling 首个连接建立时懒启动轮询。
|
||||
func (h *PlcMonitorHub) startPolling() {
|
||||
h.once.Do(func() {
|
||||
go func() {
|
||||
ticker := time.NewTicker(plcMonitorPollInterval)
|
||||
defer ticker.Stop()
|
||||
for range ticker.C {
|
||||
h.publishIfChanged()
|
||||
}
|
||||
}()
|
||||
})
|
||||
}
|
||||
|
||||
// Handle 升级为 WebSocket:先推一次全量并对齐 last,再由 writePump 串行写广播帧与 ping。
|
||||
// token 校验在 handler 层完成。
|
||||
func (h *PlcMonitorHub) Handle(w http.ResponseWriter, r *http.Request) {
|
||||
conn, err := h.upgrader.Upgrade(w, r, nil)
|
||||
if err != nil {
|
||||
logx.Errorf("PLC 点位 WebSocket 升级失败:%v", err)
|
||||
return
|
||||
}
|
||||
c := &plcMonitorClient{conn: conn, send: make(chan []byte, 16)}
|
||||
h.add(c)
|
||||
h.startPolling()
|
||||
|
||||
payload, err := h.snapshot()
|
||||
if err != nil {
|
||||
logx.Errorf("PLC 点位首帧失败:%v", err)
|
||||
h.lastErr = true
|
||||
payload, _ = json.Marshal(map[string]any{"error": err.Error()})
|
||||
} else {
|
||||
h.lastErr = false
|
||||
h.mu.Lock()
|
||||
h.last = string(payload)
|
||||
h.mu.Unlock()
|
||||
}
|
||||
c.send <- payload
|
||||
|
||||
go h.writePump(c)
|
||||
h.readPump(c)
|
||||
}
|
||||
|
||||
func (h *PlcMonitorHub) readPump(c *plcMonitorClient) {
|
||||
defer h.remove(c)
|
||||
c.conn.SetReadLimit(1024)
|
||||
_ = c.conn.SetReadDeadline(time.Now().Add(plcMonitorReadTimeout))
|
||||
c.conn.SetPongHandler(func(string) error {
|
||||
return c.conn.SetReadDeadline(time.Now().Add(plcMonitorReadTimeout))
|
||||
})
|
||||
for {
|
||||
if _, _, err := c.conn.ReadMessage(); err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (h *PlcMonitorHub) writePump(c *plcMonitorClient) {
|
||||
ticker := time.NewTicker(plcMonitorPingInterval)
|
||||
defer func() {
|
||||
ticker.Stop()
|
||||
_ = c.conn.Close()
|
||||
}()
|
||||
for {
|
||||
select {
|
||||
case msg := <-c.send:
|
||||
_ = c.conn.SetWriteDeadline(time.Now().Add(plcMonitorWriteTimeout))
|
||||
if err := c.conn.WriteMessage(websocket.TextMessage, msg); err != nil {
|
||||
return
|
||||
}
|
||||
case <-ticker.C:
|
||||
_ = c.conn.SetWriteDeadline(time.Now().Add(plcMonitorWriteTimeout))
|
||||
if err := c.conn.WriteMessage(websocket.PingMessage, nil); err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user