feat: 装配线看板修正、统一密钥Hardman_2026、操作日志追溯、日志按天存储
Dashboard 移除 CNC/清洗机等不存在设备,改为纯装配线看板(扫码枪+拧紧枪+人工);JWT/内部token统一为 Hardman_2026 写入各 etc/*.yaml,MES 建表 DSN 改读 yaml;event_log 增加 workOrderNo/operator,BOM/备料/PLC下发/拧紧/扫码报工/半成品/AGV 全链路埋点,日志页支持工单号/操作人筛选;MES/WMS 日志按天存储(dailyWriter),WMS SetWriter 用 logx.NewWriter 适配
This commit is contained in:
@@ -5,31 +5,42 @@ package main
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"flag"
|
||||
"fmt"
|
||||
"log"
|
||||
|
||||
"bj_power_mes/ent"
|
||||
"bj_power_mes/internal/db"
|
||||
|
||||
"entgo.io/ent/dialect"
|
||||
entsql "entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/schema"
|
||||
_ "github.com/jackc/pgx/v5/stdlib"
|
||||
"github.com/zeromicro/go-zero/core/conf"
|
||||
)
|
||||
|
||||
// 建表工具:DSN 一律从 etc 配置读取,不再硬编码
|
||||
// 用法(在 bj_power_mes 目录下):go run schema/tools/migrate.go
|
||||
|
||||
var (
|
||||
client *ent.Client
|
||||
|
||||
ctx = context.Background()
|
||||
ctx = context.Background()
|
||||
configFile = flag.String("config", "etc/bj_power_mes-api.yaml", "配置文件路径")
|
||||
)
|
||||
|
||||
func setUp() {
|
||||
db, err := sql.Open("pgx", "postgresql://postgres:postgres@127.0.0.1:5432/back_cover")
|
||||
//db, err := sql.Open("pgx", "postgresql://postgres:hardman@192.168.1.125:5432/back_cover")
|
||||
var c db.DatabaseConf
|
||||
conf.MustLoad(*configFile, &c)
|
||||
|
||||
dsn := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable",
|
||||
c.Host, c.Port, c.User, c.Password, c.Dbname)
|
||||
db, err := sql.Open("pgx", dsn)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
_, err = db.Query("select 1")
|
||||
if err != nil {
|
||||
if _, err = db.Query("select 1"); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
@@ -45,6 +56,7 @@ func tearDown() {
|
||||
}
|
||||
|
||||
func main() {
|
||||
flag.Parse()
|
||||
setUp()
|
||||
defer tearDown()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user