【MES】 - AGV点位/线路点位/AGV任务/工单 ent schema 重构(全量重生成 ent 代码) - 新增派车锁 agv_point_lock.go:目标点位占用即拒车,JBT21 库房接驳台卸货后保持锁定待库管手动解锁 - 新增进程内 TTL 缓存 cache.go,由 Redis 看板缓存迁移至内存(singleflight 防击穿,去除外部依赖) - AGV 三段链安全机制、车辆状态/接驳台左右互换、补料损耗闭环完善 - 来料检/工序卡/工单/质检/日排产/AGV 前端与帮助文档更新 - 新增 migrations/、sql/ 目录 【WMS】 - 出库、Excel 导出、物料、路由处理增强 - 配置与 DB 初始化调整;基础数据/成品入库/入库前端调整 【工位终端】 - 移除离线同步队列(syncer 包、sync.go、SyncQueueDialog.vue),改为实时直连上报 MES(断网即失败报错),以本人身份操作 - 本地 SQLite 仅保留操作日志 + 内置账号 + 登录态;保留空闲自动登出 【文档】 - 删除 AGV海康litev1.5.md;案例.md 更新
69 lines
2.1 KiB
Go
69 lines
2.1 KiB
Go
package svc
|
||
|
||
import (
|
||
"strings"
|
||
|
||
"bj_power_mes/ent"
|
||
"bj_power_mes/internal/agv"
|
||
"bj_power_mes/internal/backup"
|
||
"bj_power_mes/internal/config"
|
||
"bj_power_mes/internal/db"
|
||
"bj_power_mes/internal/eventlog"
|
||
"bj_power_mes/internal/plc"
|
||
"bj_power_mes/internal/sse"
|
||
"bj_power_mes/internal/wmsclient"
|
||
)
|
||
|
||
// ServiceContext 全局依赖
|
||
type ServiceContext struct {
|
||
Config config.Config
|
||
EntClient *ent.Client
|
||
EventLog *eventlog.Writer
|
||
SSE *sse.Hub
|
||
PLC *plc.Manager
|
||
Agv agv.Client
|
||
Wms *wmsclient.Client
|
||
Backup *backup.Service
|
||
}
|
||
|
||
func NewServiceContext(c config.Config) *ServiceContext {
|
||
// 启动期密钥校验:编译期默认密钥已移除,yaml 缺失/为空则直接 panic,
|
||
// 杜绝「空 token 绕过内部接口鉴权」的攻击面(安全审计 #6/#13)。
|
||
validateMesSecrets(c)
|
||
|
||
entClient, _ := db.MustNewDB(c.Database)
|
||
|
||
plcMgr, _ := plc.NewManager(c.Plc, !c.Plc.Enable) // NewManager 第三参=mock:Enable=true 走真实 S7 真读,否则 mock(2026-10-14 修反写回归)
|
||
|
||
return &ServiceContext{
|
||
Config: c,
|
||
EntClient: entClient,
|
||
EventLog: eventlog.NewWriter(entClient),
|
||
SSE: sse.NewHub(),
|
||
PLC: plcMgr,
|
||
Agv: agv.New(c.Agv),
|
||
Wms: wmsclient.New(c.Wms.BaseURL, c.Wms.Token),
|
||
Backup: backup.New(entClient, eventlog.NewWriter(entClient), c.Upload.Dir),
|
||
}
|
||
}
|
||
|
||
// validateMesSecrets 启动期校验必要密钥非空(编译期默认密钥已移除)。
|
||
func validateMesSecrets(c config.Config) {
|
||
missing := make([]string, 0, 4)
|
||
if strings.TrimSpace(c.Auth.AccessSecret) == "" {
|
||
missing = append(missing, "Auth.AccessSecret")
|
||
}
|
||
if strings.TrimSpace(c.Internal.Token) == "" {
|
||
missing = append(missing, "Internal.Token")
|
||
}
|
||
if strings.TrimSpace(c.Cli.AdminPassword) == "" {
|
||
missing = append(missing, "Cli.AdminPassword")
|
||
}
|
||
if strings.TrimSpace(c.Wms.Token) == "" {
|
||
missing = append(missing, "Wms.Token")
|
||
}
|
||
if len(missing) > 0 {
|
||
panic("配置缺失必要密钥(已禁止编译期默认密钥,必须在 etc/*.yaml 中显式配置):" + strings.Join(missing, ", "))
|
||
}
|
||
}
|