SunYF
92f0439d89
1. 新增SSE看板广播机制，业务操作后主动推送刷新事件 2. 新增产线工序横道图与工位状态展示面板 3. 移除dashboard无用的three.js依赖 4. 重构WMS客户端布局与WMS前端资源哈希 5. 新增工位终端时钟图标与大屏自适应布局 6. 新增系统截图脚本与说明书生成工具 7. 修复多处代码细节与空值处理逻辑
111 lines
3.2 KiB
Go
111 lines
3.2 KiB
Go
package logic
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"time"
|
|
|
|
"bj_power_mes/ent"
|
|
"bj_power_mes/ent/inspectionrecord"
|
|
)
|
|
|
|
// InspectionReq 巡检记录请求（PAD 巡检终端，块8）
|
|
type InspectionReq struct {
|
|
Category string `json:"category"` // CHECKIN/POINT/PROCESS/DONE/ALARM
|
|
StationNo string `json:"stationNo"`
|
|
Shift string `json:"shift"` // 早/中/晚
|
|
OrderNo string `json:"orderNo"` // 工单号
|
|
Sn string `json:"sn"` // 工件SN
|
|
Result string `json:"result"` // OK/NG
|
|
Items []string `json:"items"` // 点检项/异常类型
|
|
Photo string `json:"photo"` // 拍照文件名
|
|
Remark string `json:"remark"` // 文字描述/签字
|
|
Operator string `json:"operator"` // 操作人
|
|
}
|
|
|
|
// CreateInspection 提交巡检记录；ALARM 类型同时触发看板报警（SSE + 清缓存）
|
|
func (s *Service) CreateInspection(ctx context.Context, req InspectionReq, operator string) error {
|
|
if req.Category == "" {
|
|
return errors.New("记录类型必填")
|
|
}
|
|
category := req.Category
|
|
if !oneOf(category, "CHECKIN", "POINT", "PROCESS", "DONE", "ALARM") {
|
|
return errors.New("记录类型不合法")
|
|
}
|
|
result := req.Result
|
|
if result == "" {
|
|
result = "OK"
|
|
}
|
|
if req.Operator == "" {
|
|
req.Operator = operator
|
|
}
|
|
_, err := s.ctx.EntClient.InspectionRecord.Create().
|
|
SetCategory(category).
|
|
SetStationNo(req.StationNo).
|
|
SetShift(req.Shift).
|
|
SetOrderNo(req.OrderNo).
|
|
SetSn(req.Sn).
|
|
SetResult(result).
|
|
SetItems(req.Items).
|
|
SetPhoto(req.Photo).
|
|
SetRemark(req.Remark).
|
|
SetOperator(req.Operator).
|
|
Save(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
s.ctx.EventLog.Write(ctx, "inspection."+category, req.OrderNo, req.Operator, "inspection_record",
|
|
req.Sn, "巡检终端提交", map[string]any{"category": category, "stationNo": req.StationNo, "result": result})
|
|
|
|
if category == "ALARM" {
|
|
// 触发看板报警：SSE 推送 + 使 Redis 看板报警缓存失效
|
|
alarmJSON, _ := json.Marshal(map[string]any{
|
|
"level": "CRITICAL",
|
|
"type": "inspection_alarm",
|
|
"message": "巡检异常上报：" + req.Remark,
|
|
"station": req.StationNo,
|
|
"time": time.Now().Format("2006-01-02 15:04:05"),
|
|
})
|
|
if s.ctx.SSE != nil {
|
|
s.ctx.SSE.Publish("dashboard.alarm", string(alarmJSON))
|
|
}
|
|
if s.ctx.RedisClient != nil {
|
|
_, _ = s.ctx.RedisClient.Del("dashboard:alarms")
|
|
}
|
|
}
|
|
s.notifyDashboard()
|
|
return nil
|
|
}
|
|
|
|
// ListInspections 查询巡检记录
|
|
func (s *Service) ListInspections(ctx context.Context, category, operator, from, to string) ([]*ent.InspectionRecord, error) {
|
|
q := s.ctx.EntClient.InspectionRecord.Query().Order(ent.Desc(inspectionrecord.FieldID))
|
|
if category != "" {
|
|
q = q.Where(inspectionrecord.Category(category))
|
|
}
|
|
if operator != "" {
|
|
q = q.Where(inspectionrecord.Operator(operator))
|
|
}
|
|
if from != "" {
|
|
if f, err := time.Parse("2006-01-02", from); err == nil {
|
|
q = q.Where(inspectionrecord.CreatedAtGTE(f))
|
|
}
|
|
}
|
|
if to != "" {
|
|
if t, err := time.Parse("2006-01-02", to); err == nil {
|
|
q = q.Where(inspectionrecord.CreatedAtLT(t.Add(24 * time.Hour)))
|
|
}
|
|
}
|
|
return q.Limit(1000).All(ctx)
|
|
}
|
|
|
|
func oneOf(v string, items ...string) bool {
|
|
for _, it := range items {
|
|
if v == it {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|