From 2d6875c93b25d0b7336c7fa11e066d213259fe2e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 25 四月 2024 10:02:01 +0800
Subject: [PATCH] 更改定时任务时区设置
---
api/v1/task.go | 123 +++++++++++++++++++++++-----------------
1 files changed, 70 insertions(+), 53 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 22c282e..6e3c295 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -105,10 +105,12 @@
return taskResponse.Tasks[i].Channel < taskResponse.Tasks[i].Channel
})
- 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.CanStarted = true
flagMap[task.Channel] = struct{}{}
}
@@ -153,14 +155,21 @@
var processModel *model.ProcessModel
if procedure.ProcessModelNumber != "" {
processModel, err = service.GetProcessModelByNumber(procedure.ProcessModelNumber)
- if err != nil || processModel == nil || processModel.ParamsMap == nil {
- ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
- return
- }
} else {
processModel, err = service.NewTaskService().GetProcessParams(procedure, order)
- if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ }
+
+ if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ 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
}
}
@@ -218,11 +227,13 @@
return err
}
record := model.TaskStatusSync{
- WorkOrderId: procedure.WorkOrderID,
- ProcedureID: procedure.ProcedureID,
- DeviceId: procedure.DeviceID,
- IsProcessing: false,
- IsFinish: true,
+ 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)
})
@@ -233,8 +244,8 @@
return
}
- service.TaskFlagUnset(procedure.Channel)
- service.TaskEndTimeSet(procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
+ service.TaskFlagUnset(procedure.DeviceID, procedure.Channel)
+ service.TaskEndTimeSet(procedure.DeviceID, procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
ctx.Ok()
}
@@ -261,6 +272,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)
@@ -272,39 +287,43 @@
return
}
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK || plcConfig.ID == 0 {
- ctx.FailWithMsg(ecode.NeedConfirmedErr, "璇峰厛閰嶇疆PLC")
- return
- }
- plcConfig.MaxTryTimes = 2
-
- device, err := service.GetCurrentDevice()
- if err != nil {
- ctx.FailWithMsg(ecode.DBErr, err.Error())
- return
- }
var processModelNumber string
- if device.NeedSetProcessParams {
- processModel, err := taskService.GetProcessParams(procedure, order)
- if err != nil || processModel == nil || processModel.ParamsMap == nil {
- ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
+ 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
}
- err = SendParams(processModel.ParamsMap, plcConfig)
+ 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
+ }
+
+ fieldType := constvar.PlcStartAddressTypeTotalNumber
+ for _, pc := range plcConfig.Details { //濡傛灉鏈夊啓鍏ュ湴鍧�锛屼紭鍏堝線鍐欏叆鍦板潃鍐欏叆锛屾病鏈夌殑璇濆線璇诲彇鍦板潃鍐欏叆
+ if pc.FieldName == constvar.PlcStartAddressTypeTotalNumberWrite && pc.Channel == procedure.Channel {
+ fieldType = constvar.PlcStartAddressTypeTotalNumberWrite
+ }
+ }
+ plcConfig.CurrentTryTimes = 0
+ err = service.PlcWrite(plcConfig, fieldType, procedure.Channel, order.Amount.IntPart())
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, procedure.Channel, processModelNumber)
if err != nil {
@@ -314,16 +333,13 @@
if err != nil {
return err
}
- err = service.NewProgressService().Add(db, procedure, order)
- if err != nil {
- return err
- }
record := model.TaskStatusSync{
- WorkOrderId: procedure.WorkOrderID,
- ProcedureID: procedure.ProcedureID,
- DeviceId: procedure.DeviceID,
- IsProcessing: true,
- IsFinish: false,
+ WorkOrderId: procedure.WorkOrderID,
+ ProcedureID: procedure.ProcedureID,
+ DeviceId: procedure.DeviceID,
+ ProductProcedureID: procedure.ProductProcedureID,
+ IsProcessing: true,
+ IsFinish: false,
}
return service.NewTaskService().SaveTaskStatusSync(db, &record)
})
@@ -333,9 +349,9 @@
return
}
- service.TaskFlagSet(procedure.Channel, int(procedure.ID))
- service.TaskStartTimeSet(procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯寮�濮嬫椂闂�
- service.TaskEndTimeSet(procedure.Channel, 0) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
+ service.TaskFlagSet(procedure.DeviceID, procedure.Channel, int(procedure.ID))
+ service.TaskStartTimeSet(procedure.DeviceID, procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯寮�濮嬫椂闂�
+ service.TaskEndTimeSet(procedure.DeviceID, procedure.Channel, 0) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
ctx.Ok()
}
@@ -413,7 +429,9 @@
logx.Errorf("miss param address, k:%v, v:%v", k, v)
continue
}
- err := service.PlcWriteDirect(plcConfig, address, v)
+ err := service.PlcWriteDirect(plcConfig, v, &model.DevicePlcAddress{
+ StartAddress: address,
+ })
if err != nil {
plcConfig.CurrentErr = err
failedNumbers++
@@ -491,10 +509,9 @@
return
}
- 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 _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(conf.Conf.CurrentDeviceID, task.Channel) {
task.CanStarted = true
flagMap[task.Channel] = struct{}{}
}
--
Gitblit v1.8.0