From cab6eea89a0d82710369604ecb51f1cdb122e433 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 17:26:34 +0800
Subject: [PATCH] fix
---
api/v1/task.go | 304 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 211 insertions(+), 93 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 74287d5..c2b864c 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -4,20 +4,19 @@
"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/plc"
"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"
)
@@ -49,20 +48,79 @@
// @Tags Task
// @Summary 鑾峰彇浠诲姟
// @Produce application/json
-// @Success 200 {object} contextx.Response{data=response.TaskData} "鎴愬姛"
+// @Param object query request.TaskList true "鏌ヨ鍙傛暟"
+// @Success 200 {object} contextx.Response{data=response.TaskResponse} "鎴愬姛"
// @Router /v1/task/get [get]
func (slf *TaskApi) TaskGet(c *gin.Context) {
- ctx, ok := contextx.NewContext(c, nil)
+ var params request.TaskList
+ ctx, ok := contextx.NewContext(c, ¶ms)
if !ok {
return
}
- taskData, code := service.NewTaskService().GetTask()
+ channelAmount, err := service.NewDevicePlcService().GetDeviceChannelAmount()
+ if err != nil {
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, err.Error())
+ return
+ }
+
+ taskCount := service.NewTaskService().NewTaskCount()
+ params.Page = 1
+ if params.PageSize <= 0 {
+ if params.TaskMode == constvar.TaskModeUnStarted {
+ params.PageSize = int(taskCount)
+ } else {
+ params.PageSize = channelAmount
+ }
+ }
+
+ taskMode := constvar.TaskModeCurrent
+ if params.TaskMode == constvar.TaskModeUnStarted {
+ taskMode = params.TaskMode
+ }
+
+ taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, taskMode, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
if code != ecode.OK {
ctx.Fail(code)
return
}
- ctx.OkWithDetailed(taskData)
+
+ if len(taskResponse.Tasks) < channelAmount && taskMode == constvar.TaskModeCurrent {
+ var existsChannel = make(map[int32]bool, channelAmount)
+ for _, task := range taskResponse.Tasks {
+ existsChannel[task.Channel] = true
+ }
+ for i := 0; i < channelAmount; i++ {
+ if existsChannel[int32(i)] {
+ continue
+ }
+ taskResponseTemp, code := service.NewTaskService().GetTask(params.Page, 1, constvar.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
+ if code != ecode.OK {
+ ctx.Fail(code)
+ return
+ }
+ taskResponse.Tasks = append(taskResponse.Tasks, taskResponseTemp.Tasks...)
+ }
+ }
+
+ sort.Slice(taskResponse.Tasks, func(i, j int) bool {
+ 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 {
+ task.CanStarted = true
+ flagMap[task.Channel] = struct{}{}
+ }
+ }
+
+ taskResponse.Prompt = conf.Conf.Prompt
+ taskResponse.ChannelAmount = channelAmount
+ taskResponse.TaskCount = taskCount
+
+ ctx.OkWithDetailed(taskResponse)
}
// GetProcessParams
@@ -82,7 +140,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)
@@ -91,14 +149,22 @@
order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
if err != nil {
- ctx.Fail(ecode.UnknownErr)
+ ctx.Fail(ecode.DBErr)
return
}
-
- processModel, err := service.NewTaskService().GetProcessParams(procedure, order)
- if err != nil || processModel == nil || processModel.ParamsMap == nil {
- ctx.Fail(ecode.UnknownErr)
- return
+ 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 {
+ ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
+ return
+ }
}
processParamsArr := make([]response.ProcessParams, 0, len(processModel.ParamsMap))
@@ -108,6 +174,7 @@
Value: v,
})
}
+
resp := response.ProcessParamsResponse{
Number: processModel.Number,
Params: processParamsArr,
@@ -132,56 +199,66 @@
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)
return
}
- err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished)
+ if procedure.Status == model.ProcedureStatusFinished {
+ ctx.Ok()
+ return
+ }
+ if procedure.Status != model.ProcedureStatusProcessing {
+ ctx.Fail(ecode.ParamsErr)
+ return
+ }
+
+ err := model.WithTransaction(func(db *gorm.DB) error {
+ err := service.NewTaskService().UpdateProcedureStatus(db, id, model.ProcedureStatusFinished, procedure.Channel)
+ if err != nil {
+ return err
+ }
+ record := model.TaskStatusSync{
+ WorkOrderId: procedure.WorkOrderID,
+ ProcedureID: procedure.ProcedureID,
+ DeviceId: procedure.DeviceID,
+ IsProcessing: false,
+ IsFinish: true,
+ }
+ 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)
ctx.Ok()
}
+
+var mutex sync.Mutex
// TaskStart
// @Tags Task
// @Summary 涓嬪彂宸ヨ壓鍙傛暟锛堝紑濮嬩换鍔★級
// @Produce application/json
-// @Param id path int true "宸ュ簭id"
+// @Param object body request.SendProcessParams true "鏌ヨ鍙傛暟"
// @Success 200 {object} contextx.Response{service.GetProcessModel} "鎴愬姛"
-// @Router /v1/task/sendProcessParams/{id} [post]
+// @Router /v1/task/sendProcessParams [post]
func (slf *TaskApi) TaskStart(c *gin.Context) {
- ctx, ok := contextx.NewContext(c, nil)
+ mutex.Lock()
+ defer mutex.Unlock()
+ var params request.SendProcessParams
+ ctx, ok := contextx.NewContext(c, ¶ms)
if !ok {
return
}
- idx := c.Param("id")
- if idx == "" {
- ctx.Fail(ecode.ParamsErr)
- return
- }
- id := convertx.Atoi(idx)
taskService := service.NewTaskService()
- procedure, code := taskService.GetProcedureById(id)
+ procedure, code := taskService.GetProcedureById(params.ProcedureId)
if code != ecode.OK {
ctx.Fail(code)
return
@@ -193,18 +270,33 @@
}
if procedure.Status == model.ProcedureStatusProcessing {
- ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡寮�濮嬬敓浜�")
+ ctx.Ok()
return
}
-
processModel, err := taskService.GetProcessParams(procedure, order)
if err != nil || processModel == nil || processModel.ParamsMap == nil {
- ctx.Fail(ecode.UnknownErr)
+ ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
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 {
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
+ return
+ }
+ 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.UpdateProcedureStatus(db, id, model.ProcedureStatusProcessing)
+ err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModel.Number)
if err != nil {
return err
}
@@ -212,50 +304,79 @@
if err != nil {
return err
}
- return service.NewProgressService().AddProgress(db, procedure, order)
+ 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,
+ }
+ return service.NewTaskService().SaveTaskStatusSync(db, &record)
})
if err != nil {
logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
- ctx.FailWithMsg(ecode.NeedConfirmedErr, "鏇存敼宸ュ崟鐘舵�佸け璐�")
+ ctx.FailWithMsg(ecode.DBErr, "鏇存敼宸ュ崟鐘舵�佸け璐�")
return
}
+
+ service.TaskFlagSet(procedure.Channel)
+ ctx.Ok()
+}
+
+// UpdateProcessParams
+// @Tags Task
+// @Summary 鏇存柊宸ヨ壓鍙傛暟锛堣繘琛屼腑鐨勪换鍔★級
+// @Produce application/json
+// @Param object body request.SendProcessParams true "鏌ヨ鍙傛暟"
+// @Success 200 {object} contextx.Response{} "鎴愬姛"
+// @Router /v1/task/updateProcessParams [post]
+func (slf *TaskApi) UpdateProcessParams(c *gin.Context) {
+ mutex.Lock()
+ defer mutex.Unlock()
+ var params request.SendProcessParams
+ ctx, ok := contextx.NewContext(c, ¶ms)
+ if !ok {
+ return
+ }
+ taskService := service.NewTaskService()
+ procedure, code := taskService.GetProcedureById(params.ProcedureId)
+ if code != ecode.OK {
+ ctx.Fail(code)
+ return
+ }
+ order, err := taskService.GetOrderByWorkOrderId(procedure.WorkOrderID)
+ if err != nil {
+ ctx.Fail(ecode.UnknownErr)
+ return
+ }
+
+ if procedure.Status != model.ProcedureStatusProcessing { //鍙兘杩涜涓殑鍙互鏇存柊
+ ctx.FailWithMsg(ecode.ParamsErr, "鍙兘杩涜涓殑宸ュ簭鍙互鏇存柊宸ヨ壓鍙傛暟")
+ return
+ }
+ processModel, err := taskService.GetProcessParams(procedure, order)
+ if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
+ return
+ }
+
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
}
plcConfig.MaxTryTimes = 2
err = SendParams(processModel.ParamsMap, plcConfig)
if err != nil {
- logx.Errorf("SendProcessParams: %v", err.Error())
- ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
+ logx.Errorf("update process params err: %v", err.Error())
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
return
}
- if code != ecode.OK {
- logx.Errorf("get plcConfig err: %v", err.Error())
- return
- }
- plcConfig.CurrentTryTimes = 0
- err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, order.Amount.IntPart())
- if err != nil {
- ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
- 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())
- }
-
+ _ = taskService.UpdateProcedureStatusAndChannel(nil, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModel.Number)
ctx.Ok()
}
@@ -266,27 +387,24 @@
if plcConfig.CurrentTryTimes > plcConfig.MaxTryTimes {
return plcConfig.CurrentErr
}
- conn, err := plc.GetModbusConnection(fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port))
- if err != nil {
- return errors.New(fmt.Sprintf("杩炴帴plc澶辫触: %v", err.Error()))
- }
if plcConfig.CurrentTryTimes == 0 {
logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
}
var failedNumbers int
for k, v := range paramsMap {
- if address, ok := plc_address.Get(k); ok {
- result, err := plc.WriteHoldingRegister(conn, address, v)
- if err != nil {
- plcConfig.CurrentErr = err
- failedNumbers++
- logx.Errorf("plc write err:%v, address: %v, key: %v value: %v", err.Error(), address, k, v)
- } else {
- delete(paramsMap, k)
- logx.Infof("plc write ok: key: %v, value: %v, result: %v", k, v, result)
- }
- } else {
+ address, ok := plc_address.Get(k)
+ if !ok {
logx.Errorf("miss param address, k:%v, v:%v", k, v)
+ continue
+ }
+ err := service.PlcWriteDirect(plcConfig, address, v)
+ if err != nil {
+ plcConfig.CurrentErr = err
+ failedNumbers++
+ logx.Errorf("plc write err:%v, address: %v, key: %v value: %v", err.Error(), address, k, v)
+ } else {
+ delete(paramsMap, k)
+ logx.Infof("plc write ok: key: %v, value: %v", k, v)
}
}
if failedNumbers >= 1 { //鍐欏叆plc澶辫触, 閲嶈瘯
--
Gitblit v1.8.0