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:
SunYF
2026-08-28 09:22:19 +08:00
parent a2afd2f6dc
commit 450a094f0e
39 changed files with 516 additions and 2111 deletions
+1
View File
@@ -5,6 +5,7 @@ type LogConf struct {
Format string `json:",default=text"` // 日志格式: text, json
TimeFormat string `json:",default=2006-01-02 15:04:05"` // 时间格式
Filename string `json:",default=spcm.log"` // 日志文件名
Daily bool `json:",default=true"` // 按天存储: 文件名追加日期,跨天自动切换
MaxSize int `json:",default=100"` // 单个日志文件最大大小(MB)
MaxBackups int `json:",default=10"` // 保留的旧日志文件数量
MaxAge int `json:",default=30"` // 日志文件保留天数
+97
View File
@@ -0,0 +1,97 @@
package log
import (
"io"
"os"
"path/filepath"
"strings"
"sync"
"time"
"gopkg.in/natefinch/lumberjack.v2"
)
// dailyWriter 按天滚动的日志写入器:
// 文件名格式 base-2006-01-02.log,跨天自动切换新文件;
// 单日内超 MaxSize 仍由 lumberjack 备份(base-2006-01-02-<ts>.log);
// 超过 MaxAge 天的日志文件在跨天时清理。
type dailyWriter struct {
mu sync.Mutex
conf LogConf
date string
lj *lumberjack.Logger
}
func newDailyWriter(conf LogConf) *dailyWriter {
return &dailyWriter{conf: conf}
}
func (w *dailyWriter) filename(date string) string {
ext := filepath.Ext(w.conf.Filename)
base := strings.TrimSuffix(w.conf.Filename, ext)
return base + "-" + date + ext
}
func (w *dailyWriter) Write(p []byte) (int, error) {
w.mu.Lock()
defer w.mu.Unlock()
today := time.Now().Format("2006-01-02")
if w.lj == nil || today != w.date {
if w.lj != nil {
_ = w.lj.Close()
}
w.date = today
w.lj = &lumberjack.Logger{
Filename: w.filename(today),
MaxSize: w.conf.MaxSize,
MaxBackups: w.conf.MaxBackups,
MaxAge: w.conf.MaxAge,
Compress: w.conf.Compress,
}
w.cleanup()
}
return w.lj.Write(p)
}
func (w *dailyWriter) Close() error {
w.mu.Lock()
defer w.mu.Unlock()
if w.lj != nil {
return w.lj.Close()
}
return nil
}
// cleanup 清理超过 MaxAge 天的按天日志文件
func (w *dailyWriter) cleanup() {
if w.conf.MaxAge <= 0 {
return
}
dir := filepath.Dir(w.conf.Filename)
ext := filepath.Ext(w.conf.Filename)
base := strings.TrimSuffix(filepath.Base(w.conf.Filename), ext)
entries, err := os.ReadDir(dir)
if err != nil {
return
}
cutoff := time.Now().AddDate(0, 0, -w.conf.MaxAge)
for _, e := range entries {
if e.IsDir() || !strings.HasPrefix(e.Name(), base+"-") || !strings.HasSuffix(e.Name(), ext) {
continue
}
datePart := strings.TrimSuffix(strings.TrimPrefix(e.Name(), base+"-"), ext)
t, err := time.ParseInLocation("2006-01-02", datePart, time.Local)
if err != nil {
continue // 非按天命名的历史备份,交给 lumberjack 策略
}
if t.Before(cutoff) {
_ = os.Remove(filepath.Join(dir, e.Name()))
}
}
}
var (
_ io.WriteCloser = (*dailyWriter)(nil)
_ io.Writer = (*dailyWriter)(nil)
)
+14 -9
View File
@@ -46,16 +46,21 @@ func NewLogger(conf LogConf) *Logger {
conf.Filename = filepath.Join(workdir, conf.Filename)
}
// 创建lumberjack日志滚动器
lumberjackLogger := &lumberjack.Logger{
Filename: conf.Filename,
MaxSize: conf.MaxSize,
MaxBackups: conf.MaxBackups,
MaxAge: conf.MaxAge,
Compress: conf.Compress,
} // 创建写入器
// 创建日志写入器:默认按天存储;Daily=false 时退回单文件按大小滚动
var fileWriter io.Writer
if conf.Daily {
fileWriter = newDailyWriter(conf)
} else {
fileWriter = &lumberjack.Logger{
Filename: conf.Filename,
MaxSize: conf.MaxSize,
MaxBackups: conf.MaxBackups,
MaxAge: conf.MaxAge,
Compress: conf.Compress,
}
}
var writer io.Writer = lumberjackLogger
var writer io.Writer = fileWriter
if conf.Console {
writer = io.MultiWriter(writer, os.Stdout)
}
+10 -2
View File
@@ -20,10 +20,18 @@ Logger:
AddSource: true # 是否添加调用源信息
Auth:
AccessSecret: hardman_2024
AccessExpire: 72000
AccessSecret: Hardman_2026
AccessExpire: 86400
RefreshExpire: 144000
# 项目间内部 API 写死 token
Internal:
Token: Hardman_2026
# WMS 内部 API token
Wms:
Token: Hardman_2026
Database:
Host: 127.0.0.1
Port: 5432
@@ -127,6 +127,8 @@ export interface EventLog {
jobId?: number
workOrderId?: number
workpieceNo?: string
workOrderNo?: string
operator?: string
equipmentId?: number
equipmentName?: string
tempSlotNo?: number
@@ -326,6 +328,8 @@ export function useWorkOrderApi() {
startTime?: string
endTime?: string
workpieceNo?: string
workOrderNo?: string
operator?: string
jobId?: number
}): Promise<PageResult<EventLog>> => {
return get({url: `/api/v1/event-logs`, params})
+17 -1
View File
@@ -8,4 +8,20 @@ export const EVENT_TYPE_LABELS: Record<string, string> = {
ORDER_CANCELLED: '取消', ORDER_COMPLETED: '工单完工',
ALARM_RAISED: '报警', ALARM_ACKED: '确认',
MANUAL_ACTION_CREATED: '人工处理', MANUAL_ACTION_RESOLVED: '已解决',
}
TEMP_SLOT_CHANGED: '暂存台',
EQUIPMENT_AVAILABILITY_CHANGED: '设备启停',
// 装配线操作日志
BOM_SAVED: 'BOM维护',
MATERIAL_REQUESTED: '备料',
PLC_PROCESS_SENT: 'PLC下发',
TORQUE_REPORTED: '拧紧',
SCAN_REPORTED: '扫码报工',
SEMI_FLOW: '半成品',
AGV_TASK_CREATED: 'AGV任务',
}
// 装配线操作日志事件(工序/备料/拧紧/扫码/流转/搬运)
export const ASSEMBLY_EVENT_TYPES = [
'BOM_SAVED', 'MATERIAL_REQUESTED', 'PLC_PROCESS_SENT',
'TORQUE_REPORTED', 'SCAN_REPORTED', 'SEMI_FLOW', 'AGV_TASK_CREATED',
]
@@ -8,7 +8,7 @@ import {TagColor} from '@douyinfe/semi-ui/lib/es/tag'
import {EVENT_TYPE_LABELS} from '@/constants/event'
// 事件类别分组
type EventCategory = 'material' | 'process' | 'lifecycle' | 'alarm' | 'manual'
type EventCategory = 'material' | 'process' | 'lifecycle' | 'alarm' | 'manual' | 'assembly'
const EVENT_CATEGORY: Record<string, EventCategory> = {
LOAD: 'material', UNLOAD: 'material', EXCHANGE: 'material', REPLENISH: 'material',
@@ -19,6 +19,9 @@ const EVENT_CATEGORY: Record<string, EventCategory> = {
ORDER_CANCELLED: 'lifecycle', ORDER_COMPLETED: 'lifecycle',
ALARM_RAISED: 'alarm', ALARM_ACKED: 'alarm',
MANUAL_ACTION_CREATED: 'manual', MANUAL_ACTION_RESOLVED: 'manual',
BOM_SAVED: 'assembly', MATERIAL_REQUESTED: 'assembly', PLC_PROCESS_SENT: 'assembly',
TORQUE_REPORTED: 'assembly', SCAN_REPORTED: 'assembly', SEMI_FLOW: 'assembly',
AGV_TASK_CREATED: 'assembly',
}
const CATEGORY_COLOR: Record<EventCategory, TagColor> = {
@@ -27,6 +30,7 @@ const CATEGORY_COLOR: Record<EventCategory, TagColor> = {
lifecycle: 'grey',
alarm: 'red',
manual: 'orange',
assembly: 'cyan',
}
const EVENT_TYPE_OPTIONS = [
@@ -35,6 +39,10 @@ const EVENT_TYPE_OPTIONS = [
{label: '加工', value: 'MACHINE_START'}, {label: '完工', value: 'MACHINE_DONE'},
{label: '完成', value: 'JOB_COMPLETED'}, {label: '报废', value: 'JOB_SCRAPPED'}, {label: '下线', value: 'JOB_DISCHARGED'},
{label: '报警', value: 'ALARM_RAISED'}, {label: '确认', value: 'ALARM_ACKED'},
{label: 'BOM维护', value: 'BOM_SAVED'}, {label: '备料', value: 'MATERIAL_REQUESTED'},
{label: 'PLC下发', value: 'PLC_PROCESS_SENT'}, {label: '拧紧上报', value: 'TORQUE_REPORTED'},
{label: '扫码报工', value: 'SCAN_REPORTED'}, {label: '半成品流转', value: 'SEMI_FLOW'},
{label: 'AGV任务', value: 'AGV_TASK_CREATED'},
]
const ENTITY_TYPE_OPTIONS = [
@@ -54,6 +62,8 @@ export default function WorkOrderLogPage() {
const [entityType, setEntityType] = useState<string>()
const [dateRange, setDateRange] = useState<[Date, Date]>()
const [workpieceNo, setWorkpieceNo] = useState<string>()
const [workOrderNo, setWorkOrderNo] = useState<string>()
const [operator, setOperator] = useState<string>()
const [panelVisible, setPanelVisible] = useState(false)
const [selectedOrderId, setSelectedOrderId] = useState<number>()
const [workpiecePanelVisible, setWorkpiecePanelVisible] = useState(false)
@@ -65,16 +75,18 @@ export default function WorkOrderLogPage() {
setPanelVisible(true)
}, [])
const fetchLogs = useCallback(async (page: number, filters?: {eventType?: string; entityType?: string; dateRange?: [Date, Date]; workpieceNo?: string}) => {
const fetchLogs = useCallback(async (page: number, filters?: {eventType?: string; entityType?: string; dateRange?: [Date, Date]; workpieceNo?: string; workOrderNo?: string; operator?: string}) => {
setLoading(true)
try {
const f = filters ?? {eventType, entityType, dateRange, workpieceNo}
const f = filters ?? {eventType, entityType, dateRange, workpieceNo, workOrderNo, operator}
const params: Record<string, unknown> = {page, limit: PAGE_SIZE}
if (f.eventType) params.eventType = f.eventType
if (f.entityType) params.entityType = f.entityType
if (f.dateRange?.[0]) params.startTime = moment(f.dateRange[0]).format('YYYY-MM-DD')
if (f.dateRange?.[1]) params.endTime = moment(f.dateRange[1]).format('YYYY-MM-DD')
if (f.workpieceNo) params.workpieceNo = f.workpieceNo
if (f.workOrderNo) params.workOrderNo = f.workOrderNo
if (f.operator) params.operator = f.operator
const result = await orderApi.queryEventLogs(params as Parameters<typeof orderApi.queryEventLogs>[0])
setLogs(result.data)
@@ -87,7 +99,7 @@ export default function WorkOrderLogPage() {
} finally {
setLoading(false)
}
}, [orderApi])
}, [orderApi, eventType, entityType, dateRange, workpieceNo, workOrderNo, operator])
useEffect(() => {
fetchLogs(1)
@@ -130,6 +142,18 @@ export default function WorkOrderLogPage() {
}
},
},
{
title: '工单号',
dataIndex: 'workOrderNo',
width: 130,
render: (text: string) => text || '-',
},
{
title: '操作人',
dataIndex: 'operator',
width: 100,
render: (text: string) => text || '-',
},
{
title: '设备',
dataIndex: 'equipmentName',
@@ -182,7 +206,23 @@ export default function WorkOrderLogPage() {
showClear
onClear={() => setWorkpieceNo(undefined)}
/>
<Button theme="solid" onClick={() => fetchLogs(1, {eventType, entityType, dateRange, workpieceNo})}>查询</Button>
<Input
placeholder="工单号"
value={workOrderNo}
onChange={setWorkOrderNo}
style={{width: 160}}
showClear
onClear={() => setWorkOrderNo(undefined)}
/>
<Input
placeholder="操作人"
value={operator}
onChange={setOperator}
style={{width: 120}}
showClear
onClear={() => setOperator(undefined)}
/>
<Button theme="solid" onClick={() => fetchLogs(1, {eventType, entityType, dateRange, workpieceNo, workOrderNo, operator})}>查询</Button>
</div>
<Table
dataSource={logs}
@@ -194,7 +234,7 @@ export default function WorkOrderLogPage() {
currentPage,
pageSize: PAGE_SIZE,
total,
onPageChange: (page: number) => fetchLogs(page, {eventType, entityType, dateRange, workpieceNo}),
onPageChange: (page: number) => fetchLogs(page, {eventType, entityType, dateRange, workpieceNo, workOrderNo, operator}),
}}
/>
</div>
+2 -2
View File
@@ -54,7 +54,7 @@ type Config struct {
// WMS 服务(库存系统 C)
Wms struct {
BaseURL string `json:",default=http://127.0.0.1:8890"`
Token string `json:",default=bj-power-internal-2026"` // X-API-TOKEN 写死内部 token
Token string `json:",default=Hardman_2026"` // X-API-TOKEN 写死内部 token
}
// 海康 RCS-2000 AGV 调度
@@ -68,7 +68,7 @@ type Config struct {
// 项目间内部 API(工位终端 D 等调用)写死 token
Internal struct {
Token string `json:",default=bj-power-internal-2026"`
Token string `json:",default=Hardman_2026"`
}
Mom MomConfig `json:"MOM"`
+9
View File
@@ -54,6 +54,15 @@ const (
// 连接状态事件
EventConnectionStatusUpdated EventType = "CONNECTION_STATUS_UPDATED"
// 装配线操作日志事件(工单/工件/操作步骤/人员可追溯)
EventBomSaved EventType = "BOM_SAVED"
EventMaterialRequested EventType = "MATERIAL_REQUESTED"
EventPlcProcessSent EventType = "PLC_PROCESS_SENT"
EventTorqueReported EventType = "TORQUE_REPORTED"
EventScanReported EventType = "SCAN_REPORTED"
EventSemiFlow EventType = "SEMI_FLOW"
EventAgvTaskCreated EventType = "AGV_TASK_CREATED"
EventAll EventType = "*"
)
+17
View File
@@ -3,11 +3,28 @@ package eventbus
import (
"fmt"
"strconv"
"strings"
"time"
)
// 事件构造辅助函数
// NewProductionEvent 构建装配线操作日志事件(payload 内可含
// workOrderNo/orderNo、workpieceNo/sn、operator、stepCode 等键,写入事件日志表)
func NewProductionEvent(eventType EventType, description string, payload map[string]any) Event {
if payload == nil {
payload = map[string]any{}
}
payload["description"] = description
return Event{
ID: fmt.Sprintf("%s-%d", strings.ToLower(string(eventType)), time.Now().UnixNano()),
Type: eventType,
Source: "production",
Timestamp: time.Now(),
Payload: payload,
}
}
// NewTempSlotChangedEvent 构建暂存台槽位变更事件
func NewTempSlotChangedEvent(slotNo, jobID int, action string) Event {
return Event{
+11
View File
@@ -157,6 +157,17 @@ func (w *EventLogWriter) flush(events []eventbus.Event) {
if v, ok := e.Payload["workpieceNo"].(string); ok && v != "" {
b.SetWorkpieceNo(v)
}
if v, ok := e.Payload["sn"].(string); ok && v != "" && e.Payload["workpieceNo"] == nil {
b.SetWorkpieceNo(v) // 工位终端上报以 sn 为工件号
}
if v, ok := e.Payload["workOrderNo"].(string); ok && v != "" {
b.SetWorkOrderNo(v)
} else if v, ok := e.Payload["orderNo"].(string); ok && v != "" {
b.SetWorkOrderNo(v)
}
if v, ok := e.Payload["operator"].(string); ok && v != "" {
b.SetOperator(v)
}
if v, ok := getPayloadInt(e.Payload, "equipmentId"); ok {
b.SetEquipmentId(v)
}
@@ -7,6 +7,7 @@ import (
"time"
"bj_power_mes/ent/agvtask"
"bj_power_mes/internal/eventbus"
"bj_power_mes/internal/sse"
"bj_power_mes/internal/svc"
"bj_power_mes/internal/types"
@@ -81,6 +82,16 @@ func (l *AgvTaskLogic) AgvTaskCreate(req *types.AgvTaskCreateReq) (map[string]an
return nil, err
}
// 操作日志(AGV 搬运可追溯)
l.svcCtx.EventBus.Publish(l.ctx, eventbus.NewProductionEvent(
eventbus.EventAgvTaskCreated,
fmt.Sprintf("AGV 任务 %s %s→%s [%s]", taskNo, req.DockFrom, req.DockTo, status),
map[string]any{
"orderNo": req.OrderNo, "taskNo": taskNo, "status": status,
"dockFrom": req.DockFrom, "dockTo": req.DockTo,
"operator": CurrentUserName(l.ctx, l.svcCtx),
}))
if status == "执行中" && sim {
go func(id int, orderNo string) {
time.Sleep(10 * time.Second)
+14 -1
View File
@@ -2,9 +2,11 @@ package production
import (
"context"
"fmt"
"bj_power_mes/ent"
"bj_power_mes/ent/bomitem"
"bj_power_mes/internal/eventbus"
"bj_power_mes/internal/svc"
"bj_power_mes/internal/types"
@@ -81,5 +83,16 @@ func (l *BomLogic) BomSave(req *types.BomSaveReq) error {
return err
}
}
return tx.Commit()
if err := tx.Commit(); err != nil {
return err
}
// 操作日志(BOM 维护可追溯)
l.svcCtx.EventBus.Publish(l.ctx, eventbus.NewProductionEvent(
eventbus.EventBomSaved,
fmt.Sprintf("保存产品 %s 的 BOM(%d 项物料)", req.ProductCode, len(req.Items)),
map[string]any{
"productCode": req.ProductCode, "itemCount": len(req.Items),
"operator": CurrentUserName(l.ctx, l.svcCtx),
}))
return nil
}
@@ -7,6 +7,7 @@ import (
"bj_power_mes/ent/materialrequest"
"bj_power_mes/ent/workorder"
"bj_power_mes/internal/eventbus"
"bj_power_mes/internal/svc"
"bj_power_mes/internal/types"
wmsstock "bj_power_mes/internal/wmsstock"
@@ -128,6 +129,20 @@ func (l *MaterialRequestLogic) MaterialRequestCreate(req *types.MaterialRequestC
if err != nil {
return nil, err
}
// 操作日志(备料可追溯)
operator := req.Operator
if operator == "" {
operator = CurrentUserName(l.ctx, l.svcCtx)
}
l.svcCtx.EventBus.Publish(l.ctx, eventbus.NewProductionEvent(
eventbus.EventMaterialRequested,
fmt.Sprintf("备料 %s(%s),物料 %d 项", req.OrderNo, status, len(result.Items)),
map[string]any{
"orderNo": req.OrderNo, "status": status, "allOk": result.AllOk,
"operator": operator,
}))
out := map[string]any{"record": rec}
if respText != "" {
out["warn"] = respText
@@ -2,9 +2,11 @@ package production
import (
"context"
"fmt"
"bj_power_mes/ent"
"bj_power_mes/ent/plcsendlog"
"bj_power_mes/internal/eventbus"
"bj_power_mes/internal/plcproc"
"bj_power_mes/internal/sse"
"bj_power_mes/internal/svc"
@@ -29,6 +31,14 @@ func (l *PlcLogic) PlcSendProcess(req *types.PlcSendProcessReq) (*ent.PlcSendLog
if err != nil {
return nil, err
}
// 操作日志
l.svcCtx.EventBus.Publish(l.ctx, eventbus.NewProductionEvent(
eventbus.EventPlcProcessSent,
fmt.Sprintf("PLC 下发工序号 %s → %s", req.CodeStr, req.OrderNo),
map[string]any{
"orderNo": req.OrderNo, "codeStr": req.CodeStr,
"operator": CurrentUserName(l.ctx, l.svcCtx),
}))
l.svcCtx.SSEHandler.Emit(sse.EventDashboardUpdate, `{"type":"plc_sent","orderNo":"`+req.OrderNo+`","code":"`+req.CodeStr+`"}`)
return rec, nil
}
@@ -2,10 +2,12 @@ package production
import (
"context"
"fmt"
"strconv"
"bj_power_mes/ent/processdict"
"bj_power_mes/ent/scanrecord"
"bj_power_mes/internal/eventbus"
"bj_power_mes/internal/sse"
"bj_power_mes/internal/svc"
"bj_power_mes/internal/types"
@@ -58,6 +60,19 @@ func (l *ScanLogic) ScanReport(req *types.ScanReportReq) (map[string]any, error)
return nil, err
}
operator := req.Operator
if operator == "" {
operator = CurrentUserName(l.ctx, l.svcCtx)
}
// 操作日志(工单/工件/步骤/人员可追溯)
l.svcCtx.EventBus.Publish(l.ctx, eventbus.NewProductionEvent(
eventbus.EventScanReported,
fmt.Sprintf("扫码报工[%s] 工序%s 工件%s", action, req.StepCode, req.Sn),
map[string]any{
"orderNo": req.OrderNo, "sn": req.Sn, "stepCode": req.StepCode,
"action": action, "dockCode": req.DockCode, "operator": operator,
}))
l.svcCtx.SSEHandler.Emit(sse.EventDashboardUpdate,
map[string]any{
"type": "scan_reported", "orderNo": req.OrderNo, "sn": req.Sn,
@@ -6,6 +6,7 @@ import (
"strings"
"bj_power_mes/ent/semiflow"
"bj_power_mes/internal/eventbus"
"bj_power_mes/internal/sse"
"bj_power_mes/internal/svc"
"bj_power_mes/internal/types"
@@ -85,6 +86,14 @@ func (l *SemiFlowLogic) record(action string, req *types.SemiFlowReq, zone strin
if err != nil {
return nil, err
}
// 操作日志(半成品流转可追溯)
l.svcCtx.EventBus.Publish(l.ctx, eventbus.NewProductionEvent(
eventbus.EventSemiFlow,
fmt.Sprintf("半成品%s 工件%s → %s", map[string]string{"inbound": "入库", "outbound": "出库"}[action], req.Sn, zone),
map[string]any{
"sn": req.Sn, "orderNo": req.OrderNo, "action": action,
"zoneCode": zone, "completedProcess": req.CompletedProcess, "operator": req.Operator,
}))
l.svcCtx.SSEHandler.Emit(sse.EventDashboardUpdate,
map[string]any{"type": "semi_flow", "action": action, "sn": req.Sn, "orderNo": req.OrderNo})
return map[string]any{"record": rec}, nil
@@ -2,8 +2,10 @@ package production
import (
"context"
"fmt"
"bj_power_mes/ent/torquerecord"
"bj_power_mes/internal/eventbus"
"bj_power_mes/internal/sse"
"bj_power_mes/internal/svc"
"bj_power_mes/internal/types"
@@ -60,6 +62,15 @@ func (l *TorqueLogic) TorqueReport(req *types.TorqueReportReq) (map[string]any,
return nil, err
}
saved++
// 操作日志(拧紧结果可追溯)
l.svcCtx.EventBus.Publish(l.ctx, eventbus.NewProductionEvent(
eventbus.EventTorqueReported,
fmt.Sprintf("拧紧上报 %s 螺栓%s %s 扭矩%.1f°角度%.1f", rec.Sn, rec.ScrewNo, result, rec.Torque, rec.Angle),
map[string]any{
"workOrderNo": rec.WorkOrderNo, "sn": rec.Sn, "dockCode": rec.DockCode,
"screwNo": rec.ScrewNo, "result": result, "operator": rec.Operator,
}))
}
l.svcCtx.SSEHandler.Emit(sse.EventDashboardUpdate,
@@ -46,6 +46,12 @@ func (l *QueryEventLogsLogic) QueryEventLogs(req *types.QueryEventLogsReq) (resp
if req.WorkpieceNo != "" {
conditions = append(conditions, enteventlog.WorkpieceNoContains(req.WorkpieceNo))
}
if req.WorkOrderNo != "" {
conditions = append(conditions, enteventlog.WorkOrderNoContains(req.WorkOrderNo))
}
if req.Operator != "" {
conditions = append(conditions, enteventlog.OperatorContains(req.Operator))
}
if req.JobId > 0 {
conditions = append(conditions, enteventlog.JobId(req.JobId))
}
@@ -87,6 +93,8 @@ func (l *QueryEventLogsLogic) QueryEventLogs(req *types.QueryEventLogsReq) (resp
CreatedAt: lg.CreatedAt.Format(time.RFC3339),
JobId: int(lg.JobId),
WorkpieceNo: lg.WorkpieceNo,
WorkOrderNo: lg.WorkOrderNo,
Operator: lg.Operator,
EquipmentId: int(lg.EquipmentId),
EquipmentName: lg.EquipmentName,
TempSlotNo: int(lg.TempSlotNo),
+4
View File
@@ -1010,6 +1010,8 @@ type EventLog struct {
CreatedAt string `json:"createdAt"`
JobId int `json:"jobId,optional"`
WorkpieceNo string `json:"workpieceNo,optional"`
WorkOrderNo string `json:"workOrderNo,optional"`
Operator string `json:"operator,optional"`
EquipmentId int `json:"equipmentId,optional"`
EquipmentName string `json:"equipmentName,optional"`
TempSlotNo int `json:"tempSlotNo,optional"`
@@ -1027,6 +1029,8 @@ type QueryEventLogsReq struct {
StartTime string `form:"startTime,optional"`
EndTime string `form:"endTime,optional"`
WorkpieceNo string `form:"workpieceNo,optional"`
WorkOrderNo string `form:"workOrderNo,optional"`
Operator string `form:"operator,optional"`
JobId int `form:"jobId,optional"`
}
+4
View File
@@ -32,6 +32,8 @@ func (EventLog) Fields() []ent.Field {
field.Int64("entityVersion").Default(0).Comment("实体版本号"),
field.Int("jobId").Optional().Comment("关联工件ID"),
field.String("workpieceNo").MaxLen(64).Default("").Comment("工件编号"),
field.String("workOrderNo").MaxLen(64).Default("").Comment("关联工单号"),
field.String("operator").MaxLen(64).Default("").Comment("操作人"),
field.Int("equipmentId").Optional().Comment("关联设备ID"),
field.String("equipmentName").MaxLen(64).Default("").Comment("设备名称"),
field.Int("tempSlotNo").Optional().Comment("暂存台槽位号"),
@@ -51,6 +53,8 @@ func (EventLog) Indexes() []ent.Index {
index.Fields("createdAt"),
index.Fields("entityType", "entityId"),
index.Fields("jobId"),
index.Fields("workOrderNo"),
index.Fields("operator"),
index.Fields("equipmentId"),
}
}
+17 -5
View File
@@ -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()