feat: 全端体验与稳定性整改(帮助文档清理/收集式报错/操作列统一/托盘与WS通知/物料同步重推)
- 移除 bj_power_dashboard 旧 React 大屏源码(迁移至 2D SVG 方案) - MES/WMS/工位终端前端:清理 help.js 与 PageHelp 帮助文档,统一操作列与布局,接入请求拦截器 - 新增收集式校验错误弹窗(ErrorListDialog 统一拦截 3015,逐条列现象+建议) - 新增托盘程序(tray)与 WebSocket(ws) 实时通知模块(三端共用) - MES/WMS 物料档案新增同步状态字段,补齐双向失败重推与默认角色 seed - 工单/产能/产品工艺/日排产逻辑调整;拧紧枪按工位配置 - 新增迁移 SQL:扭矩按工位、sysconfig 序列修复 - 更新 技术约束/案例/部署手册/项目说明 等文档
This commit is contained in:
@@ -2,6 +2,7 @@ package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"github.com/zeromicro/go-zero/rest/httpx"
|
||||
)
|
||||
@@ -17,6 +18,36 @@ func ok(w http.ResponseWriter, data any) {
|
||||
httpx.WriteJson(w, http.StatusOK, Response{Code: 0, Message: "ok", Data: data})
|
||||
}
|
||||
|
||||
// friendlyMessage 把数据库唯一约束冲突(SQLSTATE 23505)等技术错误转成业务语言提示。
|
||||
// 2026-11-10 改动10:任何出口都不再向操作员暴露 SQLSTATE / 重复键 / duplicate key 等字样。
|
||||
func friendlyMessage(raw string) string {
|
||||
s := strings.TrimSpace(raw)
|
||||
if s == "" {
|
||||
return s
|
||||
}
|
||||
lower := strings.ToLower(s)
|
||||
isDup := strings.Contains(lower, "23505") ||
|
||||
strings.Contains(lower, "duplicate key") ||
|
||||
strings.Contains(lower, "violates unique constraint") ||
|
||||
strings.Contains(s, "重复键") ||
|
||||
strings.Contains(s, "唯一约束")
|
||||
if !isDup {
|
||||
return s
|
||||
}
|
||||
switch {
|
||||
case strings.Contains(lower, "workstation") || strings.Contains(s, "登录态"):
|
||||
return "该工位登录状态已存在,请勿重复登记"
|
||||
case strings.Contains(lower, "workpiece") || strings.Contains(s, "工件"):
|
||||
return "该工件已建档,请勿重复上线(如确为同一工件请在提示里选择「绑定已知」)"
|
||||
case strings.Contains(lower, "material_request") || strings.Contains(s, "叫料"):
|
||||
return "该叫料记录已存在,请勿重复提交"
|
||||
case strings.Contains(lower, "torque") || strings.Contains(s, "拧紧"):
|
||||
return "该条拧紧记录已上报,请勿重复提交"
|
||||
default:
|
||||
return "该记录已存在,请勿重复添加(同名或同编号的记录只能保存一次)"
|
||||
}
|
||||
}
|
||||
|
||||
func fail(w http.ResponseWriter, httpStatus int, message string) {
|
||||
httpx.WriteJson(w, httpStatus, Response{Code: -1, Message: message})
|
||||
}
|
||||
httpx.WriteJson(w, httpStatus, Response{Code: -1, Message: friendlyMessage(message)})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user