From 02f1a1173684cce572f5488edb4c928c5b1c386e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:35:31 +0800
Subject: [PATCH] 重构生产进度存储和同步
---
api/v1/task.go | 273 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 176 insertions(+), 97 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 44aa2fb..6729282 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -4,21 +4,16 @@
"apsClient/conf"
"apsClient/constvar"
"apsClient/model"
- "apsClient/model/common"
"apsClient/model/request"
"apsClient/model/response"
- "apsClient/nsq"
"apsClient/pkg/contextx"
- "apsClient/pkg/convertx"
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
- "apsClient/pkg/safe"
"apsClient/service"
- "apsClient/service/plc_address"
"errors"
- "fmt"
"github.com/gin-gonic/gin"
- "gorm.io/gorm"
+ "github.com/jinzhu/gorm"
+ "github.com/spf13/cast"
"sort"
"sync"
"time"
@@ -67,8 +62,7 @@
ctx.FailWithMsg(ecode.NeedConfirmedErr, err.Error())
return
}
-
- taskCount := service.NewTaskService().NewTaskCount()
+ taskCount := service.NewTaskService().NewTaskCount(conf.Conf.CurrentDeviceID)
params.Page = 1
if params.PageSize <= 0 {
if params.TaskMode == constvar.TaskModeUnStarted {
@@ -83,7 +77,7 @@
taskMode = params.TaskMode
}
- taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, taskMode, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+ taskResponse, code := service.NewTaskService().GetTask(conf.Conf.CurrentDeviceID, params.Page, params.PageSize, taskMode, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
if code != ecode.OK {
ctx.Fail(code)
return
@@ -98,7 +92,7 @@
if existsChannel[int32(i)] {
continue
}
- taskResponseTemp, code := service.NewTaskService().GetTask(params.Page, 1, constvar.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
+ taskResponseTemp, code := service.NewTaskService().GetTask(conf.Conf.CurrentDeviceID, params.Page, 1, constvar.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
if code != ecode.OK {
ctx.Fail(code)
return
@@ -114,7 +108,10 @@
nowTs := time.Now().Unix()
flagMap := make(map[int32]struct{}, 0)
for _, task := range taskResponse.Tasks {
- if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(task.Channel) && task.Procedure.StartTime <= nowTs {
+ if task.Procedure.Status != model.ProcedureStatusWaitProcess {
+ continue
+ }
+ if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(conf.Conf.CurrentDeviceID, task.Channel) && task.Procedure.StartTime <= nowTs {
task.CanStarted = true
flagMap[task.Channel] = struct{}{}
}
@@ -144,7 +141,7 @@
ctx.Fail(ecode.ParamsErr)
return
}
- id := convertx.Atoi(idx)
+ id := cast.ToUint(idx)
procedure, code := service.NewTaskService().GetProcedureById(id)
if code != ecode.OK {
ctx.Fail(code)
@@ -156,11 +153,26 @@
ctx.Fail(ecode.DBErr)
return
}
+ var processModel *model.ProcessModel
+ if procedure.ProcessModelNumber != "" {
+ processModel, err = service.GetProcessModelByNumber(procedure.ProcessModelNumber)
+ } else {
+ processModel, err = service.NewTaskService().GetProcessParams(procedure, order)
+ }
- processModel, err := service.NewTaskService().GetProcessParams(procedure, order)
if err != nil || processModel == nil || processModel.ParamsMap == nil {
- ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
- return
+ device, err := service.GetCurrentDevice()
+ if err != nil {
+ ctx.FailWithMsg(ecode.UnknownErr, err.Error())
+ return
+ }
+ if device.NeedSetProcessParams {
+ ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
+ return
+ } else {
+ ctx.OkWithDetailed(response.ProcessParamsResponse{})
+ return
+ }
}
processParamsArr := make([]response.ProcessParams, 0, len(processModel.ParamsMap))
@@ -170,15 +182,6 @@
Value: v,
})
}
-
- safe.Go(func() {
- caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicGetPlcAddress, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicSendPlcAddress, conf.Conf.NsqConf.NodeId))
- var addressResult common.ResponsePlcAddress
- err := caller.Call(common.RequestPlcAddress{DeviceId: conf.Conf.System.DeviceId}, &addressResult, time.Second*3)
- if err != nil {
- logx.Infof("get plc address err: %v", err.Error())
- }
- })
resp := response.ProcessParamsResponse{
Number: processModel.Number,
@@ -204,7 +207,7 @@
ctx.Fail(ecode.ParamsErr)
return
}
- id := convertx.Atoi(idx)
+ id := cast.ToUint(idx)
procedure, code := service.NewTaskService().GetProcedureById(id)
if code != ecode.OK {
ctx.Fail(code)
@@ -218,29 +221,32 @@
ctx.Fail(ecode.ParamsErr)
return
}
- err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished, procedure.Channel)
+
+ err := model.WithTransaction(func(db *gorm.DB) error {
+ err := service.NewTaskService().UpdateProcedureStatusAndChannel(db, id, model.ProcedureStatusFinished, procedure.Channel, procedure.ProcessModelNumber)
+ if err != nil {
+ return err
+ }
+ record := model.TaskStatusSync{
+ WorkOrderId: procedure.WorkOrderID,
+ ProcedureID: procedure.ProcedureID,
+ DeviceId: procedure.DeviceID,
+ ProductProcedureID: procedure.ProductProcedureID,
+ IsProcessing: false,
+ IsFinish: true,
+ FinishedQuantity: procedure.FinishedQuantity,
+ }
+ return service.NewTaskService().SaveTaskStatusSync(db, &record)
+ })
+
if err != nil {
- logx.Errorf("UpdateProcedureStatus err: %v", err.Error())
+ logx.Errorf("TaskFinish UpdateProcedureStatus err: %v", err.Error())
ctx.Fail(ecode.UnknownErr)
return
}
- msg := &common.MsgTaskStatusUpdate{
- WorkOrderId: procedure.WorkOrderID,
- ProcedureID: procedure.ProceduresInfo.ProcedureID,
- DeviceId: procedure.ProceduresInfo.DeviceID,
- IsProcessing: false,
- IsFinish: true,
- }
-
- caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicTaskProcedureStatusUpdate, conf.Conf.NsqConf.NodeId), "")
- err = caller.Send(msg)
- if err != nil {
- logx.Errorf("send task status update msg error:%v", err.Error())
- }
-
- service.TaskFlagUnset(procedure.Channel)
-
+ service.TaskFlagUnset(conf.Conf.CurrentDeviceID, procedure.Channel)
+ service.TaskEndTimeSet(conf.Conf.CurrentDeviceID, procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
ctx.Ok()
}
@@ -267,6 +273,10 @@
ctx.Fail(code)
return
}
+ if procedure.DeviceID != conf.Conf.CurrentDeviceID {
+ ctx.FailWithMsg(ecode.ParamsErr, "璇ヤ换鍔′笉灞炰簬褰撳墠璁惧")
+ return
+ }
order, err := taskService.GetOrderByWorkOrderId(procedure.WorkOrderID)
if err != nil {
ctx.Fail(ecode.UnknownErr)
@@ -277,74 +287,66 @@
ctx.Ok()
return
}
- processModel, err := taskService.GetProcessParams(procedure, order)
- if err != nil || processModel == nil || processModel.ParamsMap == nil {
- ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
- return
+
+ var processModelNumber string
+ plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+ if code == ecode.OK && plcConfig.ID != 0 && len(plcConfig.Details) > 0 {
+ plcConfig.MaxTryTimes = 2
+ device, err := service.GetCurrentDevice()
+ if err != nil {
+ ctx.FailWithMsg(ecode.DBErr, err.Error())
+ return
+ }
+ if device.NeedSetProcessParams {
+ processModel, err := taskService.GetProcessParams(procedure, order)
+ if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
+ return
+ }
+ err = SendParams(processModel.ParamsMap, plcConfig)
+ if err != nil {
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
+ return
+ }
+ processModelNumber = processModel.Number
+ }
+
+ plcConfig.CurrentTryTimes = 0
+ err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, procedure.Channel, order.Amount.IntPart())
+ if err != nil {
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
+ return
+ }
}
err = model.WithTransaction(func(db *gorm.DB) error {
- err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Channel)
+ err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModelNumber)
if err != nil {
return err
}
- procedure.Channel = params.Channel
err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
if err != nil {
return err
}
- return service.NewProgressService().Add(db, procedure, order)
+ record := model.TaskStatusSync{
+ WorkOrderId: procedure.WorkOrderID,
+ ProcedureID: procedure.ProcedureID,
+ DeviceId: procedure.DeviceID,
+ ProductProcedureID: procedure.ProductProcedureID,
+ IsProcessing: true,
+ IsFinish: false,
+ }
+ return service.NewTaskService().SaveTaskStatusSync(db, &record)
})
if err != nil {
logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
ctx.FailWithMsg(ecode.DBErr, "鏇存敼宸ュ崟鐘舵�佸け璐�")
return
}
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK || plcConfig.Id == 0 {
- ctx.FailWithMsg(ecode.NeedConfirmedErr, "璇峰厛閰嶇疆PLC")
- return
- }
- plcConfig.MaxTryTimes = 2
- err = SendParams(processModel.ParamsMap, plcConfig)
- if err != nil {
- logx.Errorf("SendProcessParams: %v", err.Error())
- err = model.WithTransaction(func(db *gorm.DB) error {
- err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusWaitProcess, params.Channel)
- if err != nil {
- return err
- }
- procedure.Channel = params.Channel
- err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusWaitProcess)
- if err != nil {
- return err
- }
- return nil
- })
- ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
- return
- }
- plcConfig.CurrentTryTimes = 0
- err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, params.Channel, order.Amount.IntPart())
- if err != nil {
- ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆")
- return
- }
- msg := &common.MsgTaskStatusUpdate{
- WorkOrderId: procedure.WorkOrderID,
- ProcedureID: procedure.ProceduresInfo.ProcedureID,
- DeviceId: procedure.ProceduresInfo.DeviceID,
- IsProcessing: true,
- IsFinish: false,
- }
-
- caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicTaskProcedureStatusUpdate, conf.Conf.NsqConf.NodeId), "")
- err = caller.Send(msg)
- if err != nil {
- logx.Errorf("send task status update msg error:%v", err.Error())
- }
- service.TaskFlagSet(procedure.Channel)
+ service.TaskFlagSet(conf.Conf.CurrentDeviceID, procedure.Channel, int(procedure.ID))
+ service.TaskStartTimeSet(conf.Conf.CurrentDeviceID, procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯寮�濮嬫椂闂�
+ service.TaskEndTimeSet(conf.Conf.CurrentDeviceID, procedure.Channel, 0) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
ctx.Ok()
}
@@ -386,7 +388,7 @@
}
plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK || plcConfig.Id == 0 {
+ if code != ecode.OK || plcConfig.ID == 0 {
ctx.FailWithMsg(ecode.NeedConfirmedErr, "璇峰厛閰嶇疆PLC")
return
}
@@ -397,6 +399,7 @@
ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
return
}
+ _ = taskService.UpdateProcessModelNumber(nil, params.ProcedureId, processModel.Number)
ctx.Ok()
}
@@ -411,8 +414,12 @@
logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
}
var failedNumbers int
+ processModelAddress, err := service.GetProcessModelAddress(conf.Conf.CurrentDeviceID)
+ if err != nil {
+ return err
+ }
for k, v := range paramsMap {
- address, ok := plc_address.Get(k)
+ address, ok := processModelAddress[k]
if !ok {
logx.Errorf("miss param address, k:%v, v:%v", k, v)
continue
@@ -434,3 +441,75 @@
logx.Info("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
return nil
}
+
+// TaskListByChannel
+// @Tags Task
+// @Summary 鑾峰彇浠诲姟鍒楄〃2
+// @Produce application/json
+// @Param object query request.TaskListByChannel true "鏌ヨ鍙傛暟"
+// @Success 200 {object} contextx.Response{data=map[int32]response.TaskResponse} "鎴愬姛"
+// @Router /v1/task/list [get]
+func (slf *TaskApi) TaskListByChannel(c *gin.Context) {
+ var params request.TaskListByChannel
+ ctx, ok := contextx.NewContext(c, ¶ms)
+ if !ok {
+ return
+ }
+
+ channelAmount, err := service.NewDevicePlcService().GetDeviceChannelAmount()
+ if err != nil {
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, err.Error())
+ return
+ }
+ params.DeviceID = conf.Conf.CurrentDeviceID
+
+ dataMap := make(map[int32]*response.TaskResponse, channelAmount)
+ if params.Channel != nil {
+ taskResponse, err := getTaskResponseByChannel(params, *params.Channel)
+ if err != nil {
+ ctx.FailWithMsg(ecode.DBErr, err.Error())
+ return
+ }
+ dataMap[*params.Channel] = taskResponse
+ ctx.OkWithDetailed(dataMap)
+ return
+ }
+
+ //涓嶄紶channel鍙栨墍鏈塩hannel鐨�
+ var wg sync.WaitGroup
+ var mu sync.Mutex
+ for i := 0; i < channelAmount; i++ {
+ wg.Add(1)
+ go func(channel int32) {
+ defer wg.Done()
+ taskResponse, err := getTaskResponseByChannel(params, channel)
+ if err != nil {
+ ctx.FailWithMsg(ecode.DBErr, err.Error())
+ return
+ }
+ mu.Lock()
+ defer mu.Unlock()
+ dataMap[channel] = taskResponse
+ }(int32(i))
+ }
+ wg.Wait()
+ ctx.OkWithDetailed(dataMap)
+}
+
+func getTaskResponseByChannel(params request.TaskListByChannel, channel int32) (taskResponse *response.TaskResponse, err error) {
+ taskResponse, err = service.NewTaskService().GetTask2(params.DeviceID, params.Offset, params.Limit, []int32{channel}, params.Type) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+ if err != nil {
+ return
+ }
+
+ nowTs := time.Now().Unix()
+ flagMap := make(map[int32]struct{}, 0)
+ for _, task := range taskResponse.Tasks {
+ if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(conf.Conf.CurrentDeviceID, task.Channel) && task.Procedure.StartTime <= nowTs {
+ task.CanStarted = true
+ flagMap[task.Channel] = struct{}{}
+ }
+ }
+ taskResponse.Prompt = conf.Conf.Prompt
+ return
+}
--
Gitblit v1.8.0