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:
@@ -5,6 +5,7 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"bj_power_mes/internal/verr"
|
||||
)
|
||||
@@ -32,14 +33,51 @@ func OkMessage(w http.ResponseWriter, message string, data any) {
|
||||
writeJSON(w, http.StatusOK, Resp{Code: 0, Message: message, Data: data})
|
||||
}
|
||||
|
||||
// friendlyMessage 把数据库唯一约束冲突(SQLSTATE 23505)等技术错误转成业务语言提示。
|
||||
// 覆盖所有出口(Fail / FailHTTP / FailErr / BadRequest / InternalError),
|
||||
// 免得某个 handler 直接 err.Error() 就把 "重复键违反唯一约束..." 原样弹给用户。
|
||||
func friendlyMessage(raw string) string {
|
||||
if raw == "" {
|
||||
return raw
|
||||
}
|
||||
lower := strings.ToLower(raw)
|
||||
isDup := strings.Contains(lower, "23505") ||
|
||||
strings.Contains(lower, "duplicate key") ||
|
||||
strings.Contains(lower, "violates unique constraint") ||
|
||||
strings.Contains(lower, "重复键") ||
|
||||
strings.Contains(lower, "重复键违反唯一约束")
|
||||
if !isDup {
|
||||
return raw
|
||||
}
|
||||
// 按约束/表名给更具体的业务对象名;命中不了走通用提示
|
||||
switch {
|
||||
case strings.Contains(lower, "sys_config"):
|
||||
return "该配置项已存在,请勿重复添加(同名模板/配置只能保存一次)"
|
||||
case strings.Contains(lower, "station"):
|
||||
return "该工位已存在,请勿重复添加(工位号不能重复)"
|
||||
case strings.Contains(lower, "work_order") || strings.Contains(lower, "workorder"):
|
||||
return "该产品工号已存在,请勿重复添加"
|
||||
case strings.Contains(lower, "workpiece") || strings.Contains(lower, "_sn"):
|
||||
return "该产品序号(SN)已存在,请勿重复添加"
|
||||
case strings.Contains(lower, "material") || strings.Contains(lower, "product_type"):
|
||||
return "该物料已存在,请勿重复添加(图号不能重复)"
|
||||
case strings.Contains(lower, "daily_plan"):
|
||||
return "该工单在这天已有排产,请勿重复添加"
|
||||
case strings.Contains(lower, "user") || strings.Contains(lower, "username"):
|
||||
return "该账号已存在,请勿重复添加"
|
||||
default:
|
||||
return "该记录已存在,请勿重复添加(同名或同编号的记录只能保存一次)"
|
||||
}
|
||||
}
|
||||
|
||||
// Fail 业务失败(HTTP 200,业务码非0)
|
||||
func Fail(w http.ResponseWriter, code int, message string) {
|
||||
writeJSON(w, http.StatusOK, Resp{Code: code, Message: message})
|
||||
writeJSON(w, http.StatusOK, Resp{Code: code, Message: friendlyMessage(message)})
|
||||
}
|
||||
|
||||
// FailHTTP 直接返回 HTTP 错误
|
||||
func FailHTTP(w http.ResponseWriter, status int, message string) {
|
||||
writeJSON(w, status, Resp{Code: status, Message: message})
|
||||
writeJSON(w, status, Resp{Code: status, Message: friendlyMessage(message)})
|
||||
}
|
||||
|
||||
// FailValidation 收集式校验失败(HTTP 200,code=3015,data.errors 结构化清单;
|
||||
@@ -64,11 +102,11 @@ func FailErr(w http.ResponseWriter, err error) {
|
||||
|
||||
// BadRequest 参数错误
|
||||
func BadRequest(w http.ResponseWriter, message string) {
|
||||
writeJSON(w, http.StatusBadRequest, Resp{Code: 400, Message: message})
|
||||
writeJSON(w, http.StatusBadRequest, Resp{Code: 400, Message: friendlyMessage(message)})
|
||||
}
|
||||
|
||||
func InternalError(w http.ResponseWriter, message string) {
|
||||
writeJSON(w, http.StatusInternalServerError, Resp{Code: 500, Message: message})
|
||||
writeJSON(w, http.StatusInternalServerError, Resp{Code: 500, Message: friendlyMessage(message)})
|
||||
}
|
||||
|
||||
func Unauthorized(w http.ResponseWriter, message string) {
|
||||
|
||||
Reference in New Issue
Block a user