feat: 新增收集式校验错误弹窗及工位报警语音播报
新增 ErrorListDialog 组件用于统一展示结构化校验错误信息,实现报错一次收全;新增工位报警语音播报功能,通过浏览器 SpeechSynthesis 播放本工位相关报警;调整物料类别及序列号字段文案,移除「其他」类别;新增工单实际开始字段及采集方式配置;优化 AGV 及 PlcSend 页签刷新逻辑;新增看板物料追溯及工位报警接口;删除 PLC 强制写 M 位及相关测试代码;同步数据库字段注释及补丁。
This commit is contained in:
@@ -0,0 +1,155 @@
|
||||
package alertstream
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"bj_power_workstation/internal/mes"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
// Manager 工位报警事件流(谁受影响谁播报,2026-10-20 轮询改事件驱动):
|
||||
// 后台长连接 MES GET /api/internal/station/alerts/stream(SSE,X-API-TOKEN 鉴权),
|
||||
// 只认 station.alert 事件;按本机固定工位号过滤「工位N」相关报警后,广播给本机前端订阅者。
|
||||
// 断线自动重连(3 秒退避);前端断线重连后的一次性补拉走 GET /api/alerts/station(前端自己调)。
|
||||
type Manager struct {
|
||||
mc *mes.Client
|
||||
stationNo int
|
||||
|
||||
mu sync.Mutex
|
||||
clients map[chan string]struct{}
|
||||
}
|
||||
|
||||
// New 新建报警流管理器。
|
||||
func New(mc *mes.Client, stationNo int) *Manager {
|
||||
return &Manager{
|
||||
mc: mc,
|
||||
stationNo: stationNo,
|
||||
clients: make(map[chan string]struct{}),
|
||||
}
|
||||
}
|
||||
|
||||
// Subscribe 本机前端订阅(每个 EventSource 连接一个 channel)。
|
||||
func (m *Manager) Subscribe() chan string {
|
||||
ch := make(chan string, 32)
|
||||
m.mu.Lock()
|
||||
m.clients[ch] = struct{}{}
|
||||
m.mu.Unlock()
|
||||
return ch
|
||||
}
|
||||
|
||||
// Unsubscribe 取消订阅并关闭 channel。
|
||||
func (m *Manager) Unsubscribe(ch chan string) {
|
||||
m.mu.Lock()
|
||||
if _, ok := m.clients[ch]; ok {
|
||||
delete(m.clients, ch)
|
||||
close(ch)
|
||||
}
|
||||
m.mu.Unlock()
|
||||
}
|
||||
|
||||
func (m *Manager) broadcast(data string) {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
for ch := range m.clients {
|
||||
select {
|
||||
case ch <- data:
|
||||
default: // 订阅者堆积(前端卡死)直接丢帧,下一条报警自然追上
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Run 主循环:连 MES SSE → 解析分发 → 断线 3 秒重连,直到 ctx 取消。
|
||||
func (m *Manager) Run(ctx context.Context) {
|
||||
if m.stationNo <= 0 {
|
||||
logx.Errorf("报警事件流未启动:Station.StationNo=%d 无效", m.stationNo)
|
||||
return
|
||||
}
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
default:
|
||||
}
|
||||
if err := m.runOnce(ctx); err != nil {
|
||||
logx.Errorf("工位报警事件流断开,3 秒后重连: %v", err)
|
||||
}
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-time.After(3 * time.Second):
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (m *Manager) runOnce(ctx context.Context) error {
|
||||
body, err := m.mc.GetStream("/api/internal/station/alerts/stream", nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer body.Close()
|
||||
logx.Infof("工位报警事件流已连接 MES(工位%d)", m.stationNo)
|
||||
defer logx.Infof("工位报警事件流连接关闭(工位%d)", m.stationNo)
|
||||
|
||||
rd := bufio.NewReader(body)
|
||||
event := ""
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return ctx.Err()
|
||||
default:
|
||||
}
|
||||
line, rerr := rd.ReadString('\n')
|
||||
if rerr != nil {
|
||||
if rerr == io.EOF {
|
||||
return fmt.Errorf("MES 流关闭(EOF)")
|
||||
}
|
||||
return rerr
|
||||
}
|
||||
line = strings.TrimRight(line, "\r\n")
|
||||
switch {
|
||||
case strings.HasPrefix(line, "event:"):
|
||||
event = strings.TrimSpace(strings.TrimPrefix(line, "event:"))
|
||||
case strings.HasPrefix(line, "data:"):
|
||||
data := strings.TrimSpace(strings.TrimPrefix(line, "data:"))
|
||||
if event == "station.alert" && data != "" {
|
||||
m.dispatch(data)
|
||||
}
|
||||
event = ""
|
||||
default:
|
||||
// 空行/心跳注释(": ping")忽略
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// dispatch 解析报警 JSON,命中本工位(target/content/title 含「工位N」)才广播。
|
||||
type alertPayload struct {
|
||||
ID int `json:"id"`
|
||||
Type string `json:"type"`
|
||||
Level string `json:"level"`
|
||||
Target string `json:"target"`
|
||||
Title string `json:"title"`
|
||||
Content string `json:"content"`
|
||||
}
|
||||
|
||||
func (m *Manager) dispatch(data string) {
|
||||
var a alertPayload
|
||||
if err := json.Unmarshal([]byte(data), &a); err != nil {
|
||||
return
|
||||
}
|
||||
hit := strings.Contains(a.Target, "工位"+strconv.Itoa(m.stationNo)) ||
|
||||
strings.Contains(a.Content, "工位"+strconv.Itoa(m.stationNo)) ||
|
||||
strings.Contains(a.Title, "工位"+strconv.Itoa(m.stationNo))
|
||||
if !hit {
|
||||
return
|
||||
}
|
||||
m.broadcast(data)
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"bj_power_workstation/internal/svc"
|
||||
)
|
||||
|
||||
// alertsStreamHandler GET /api/alerts/stream(本机 SSE,免鉴权)
|
||||
// 终端前端 EventSource 订阅本端点(同源、EventSource 无法携带 JWT,故走免鉴权组;
|
||||
// 数据已经 alertstream.Manager 按本机固定工位号过滤,仅本机 LAN 可达,敏感度低)。
|
||||
// 收到 MES station.alert 即转发;15 秒心跳注释行防空闲断链;前端断开由 r.Context().Done() 感知。
|
||||
func alertsStreamHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
fl, ok := w.(http.Flusher)
|
||||
if !ok {
|
||||
http.Error(w, "streaming unsupported", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "text/event-stream")
|
||||
w.Header().Set("Cache-Control", "no-cache")
|
||||
w.Header().Set("Connection", "keep-alive")
|
||||
ch := ctx.AlertStream.Subscribe()
|
||||
defer ctx.AlertStream.Unsubscribe(ch)
|
||||
fl.Flush()
|
||||
ticker := time.NewTicker(15 * time.Second)
|
||||
defer ticker.Stop()
|
||||
for {
|
||||
select {
|
||||
case data := <-ch:
|
||||
if _, err := fmt.Fprintf(w, "event: station.alert\ndata: %s\n\n", data); err != nil {
|
||||
return
|
||||
}
|
||||
fl.Flush()
|
||||
case <-ticker.C:
|
||||
if _, err := fmt.Fprint(w, ": ping\n\n"); err != nil {
|
||||
return
|
||||
}
|
||||
fl.Flush()
|
||||
case <-r.Context().Done():
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,8 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
{Method: http.MethodGet, Path: "/api/config", Handler: configHandler(ctx)},
|
||||
// 工艺文件免鉴权直链(query 传名,支持日期子目录;供 iframe/window.open)
|
||||
{Method: http.MethodGet, Path: "/pdfview", Handler: pdfViewHandler(ctx)},
|
||||
// 本机工位报警 SSE(免鉴权:EventSource 无法携带 JWT;数据已按本机工位过滤,LAN 内低敏感)
|
||||
{Method: http.MethodGet, Path: "/api/alerts/stream", Handler: alertsStreamHandler(ctx)},
|
||||
// 前端静态托管
|
||||
{Method: http.MethodGet, Path: "/", Handler: indexHandler(ctx.WebFS)},
|
||||
{Method: http.MethodGet, Path: "/assets/:file", Handler: assetHandler(ctx.WebFS)},
|
||||
@@ -82,6 +84,9 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
{Method: http.MethodPost, Path: "/api/workpiece/online", Handler: onlineHandler(ctx)},
|
||||
{Method: http.MethodPost, Path: "/api/workpiece/done", Handler: doneHandler(ctx)},
|
||||
|
||||
// 本工位相关报警(谁受影响谁播报,2026-10-20):终端前端轮询 + 语音播报
|
||||
{Method: http.MethodGet, Path: "/api/alerts/station", Handler: stationAlertsHandler(ctx)},
|
||||
|
||||
// PLC↔MES 对账(#8 T2/T3 终端事件驱动检查,不轮询):代理 MES 内部接口,MES 不可达静默跳过
|
||||
{Method: http.MethodPost, Path: "/api/plc/mismatch/check", Handler: plcMismatchCheckHandler(ctx)},
|
||||
},
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"bj_power_workstation/internal/svc"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
// stationAlertsHandler GET /api/alerts/station?stationNo=&minutes=
|
||||
// 代理 MES GET /api/internal/station/alerts(谁受影响谁播报,2026-10-20)。
|
||||
// 终端前端 30 秒轮询本工位相关报警;MES 不可达/业务拒绝静默返回空列表,不影响作业。
|
||||
func stationAlertsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
stationNo := atoi(strings.TrimSpace(r.URL.Query().Get("stationNo")), 0)
|
||||
minutes := atoi(strings.TrimSpace(r.URL.Query().Get("minutes")), 10)
|
||||
if stationNo <= 0 {
|
||||
ok(w, []any{})
|
||||
return
|
||||
}
|
||||
body, _, err := ctx.Mes.Get("/api/internal/station/alerts", url.Values{
|
||||
"stationNo": {strconv.Itoa(stationNo)},
|
||||
"minutes": {strconv.Itoa(minutes)},
|
||||
})
|
||||
if err != nil {
|
||||
// MES 不可达:静默返回空,终端语音播报不因后端抖动而报错刷屏
|
||||
logx.Errorf("工位报警查询 MES 不可达,静默跳过: %v", err)
|
||||
ok(w, []any{})
|
||||
return
|
||||
}
|
||||
if msg := mesRespCode(body); msg != "" {
|
||||
logx.Errorf("工位报警查询 MES 业务拒绝,静默跳过: %s", msg)
|
||||
ok(w, []any{})
|
||||
return
|
||||
}
|
||||
passJSON(w, body)
|
||||
}
|
||||
}
|
||||
@@ -38,6 +38,7 @@ type Client struct {
|
||||
token string // X-API-TOKEN 共享内部 token(项目间)
|
||||
stationToken string // 工位登录态 JWT(Bearer):方案 B 报工链路可信身份凭证
|
||||
httpClient *http.Client
|
||||
streamClient *http.Client // SSE 长连接专用(无总超时)
|
||||
|
||||
mu sync.Mutex
|
||||
Touch func() // 每次以「当前有效登录态」发起的调用触发,用于刷新工位空闲计时(核实4)
|
||||
@@ -45,9 +46,10 @@ type Client struct {
|
||||
|
||||
func New(baseURL, token string) *Client {
|
||||
return &Client{
|
||||
baseURL: strings.TrimRight(baseURL, "/"),
|
||||
token: token,
|
||||
httpClient: &http.Client{Timeout: 10 * time.Second},
|
||||
baseURL: strings.TrimRight(baseURL, "/"),
|
||||
token: token,
|
||||
httpClient: &http.Client{Timeout: 10 * time.Second},
|
||||
streamClient: &http.Client{}, // SSE 长连接专用:无总超时,靠服务端心跳+断线重连兜底
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,6 +85,33 @@ func (c *Client) Post(path string, body any) ([]byte, http.Header, error) {
|
||||
}
|
||||
|
||||
|
||||
// GetStream 发起 SSE 长连接(工位报警事件流,2026-10-20):仅 X-API-TOKEN 鉴权,
|
||||
// 不携带/不刷新工位登录态(长连接期间登录态可能过期,SSE 鉴权只认项目间 token)。
|
||||
// 使用独立的无超时 http.Client(默认 httpClient 的 10s 总超时会掐断长连接);
|
||||
// 调用方负责关闭返回的 ReadCloser,断线重连由调用方(alertstream.Manager)负责。
|
||||
func (c *Client) GetStream(path string, query url.Values) (io.ReadCloser, error) {
|
||||
u := c.baseURL + path
|
||||
if len(query) > 0 {
|
||||
u += "?" + query.Encode()
|
||||
}
|
||||
req, err := http.NewRequest(http.MethodGet, u, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req.Header.Set("X-API-TOKEN", c.token)
|
||||
req.Header.Set("Accept", "text/event-stream")
|
||||
resp, err := c.streamClient.Do(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
body, _ := io.ReadAll(resp.Body)
|
||||
resp.Body.Close()
|
||||
return nil, fmt.Errorf("MES %s 返回 %d:%s", path, resp.StatusCode, truncate(string(body), 200))
|
||||
}
|
||||
return resp.Body, nil
|
||||
}
|
||||
|
||||
// do 执行请求:Bearer 固定使用当前登录态 JWT(c.stationToken)。
|
||||
// 仅在「当前登录态有效」时刷新空闲计时(核实4)。
|
||||
func (c *Client) do(method, u string, body io.Reader) ([]byte, http.Header, error) {
|
||||
|
||||
@@ -3,6 +3,7 @@ package svc
|
||||
import (
|
||||
"io/fs"
|
||||
|
||||
"bj_power_workstation/internal/alertstream"
|
||||
"bj_power_workstation/internal/config"
|
||||
"bj_power_workstation/internal/mes"
|
||||
"bj_power_workstation/internal/pdfcache"
|
||||
@@ -13,11 +14,12 @@ import (
|
||||
|
||||
// ServiceContext 服务上下文:配置 + 本地存储 + MES 客户端 + 同步器 + PDF 缓存 + 前端静态资源 + 拧紧枪 OP 接入
|
||||
type ServiceContext struct {
|
||||
Config config.Config
|
||||
Store *store.Store
|
||||
Mes *mes.Client
|
||||
Syncer *syncer.Syncer
|
||||
PdfCache *pdfcache.Cache
|
||||
WebFS fs.FS // go:embed 的 web/static 子文件系统
|
||||
Tightening *tightening.Manager
|
||||
Config config.Config
|
||||
Store *store.Store
|
||||
Mes *mes.Client
|
||||
Syncer *syncer.Syncer
|
||||
PdfCache *pdfcache.Cache
|
||||
WebFS fs.FS // go:embed 的 web/static 子文件系统
|
||||
Tightening *tightening.Manager
|
||||
AlertStream *alertstream.Manager // 工位报警事件流(SSE 事件驱动播报)
|
||||
}
|
||||
Reference in New Issue
Block a user