From cf96f6bc1fb484fde16bd5ed6d49534c96958022 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 25 九月 2023 15:43:12 +0800
Subject: [PATCH] fix
---
api/v1/task.go | 447 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 262 insertions(+), 185 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 0c77d46..480a58f 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -5,52 +5,150 @@
"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/pkg/safe"
"apsClient/service"
"apsClient/service/plc_address"
"errors"
"fmt"
"github.com/gin-gonic/gin"
+ "gorm.io/gorm"
+ "sort"
"time"
)
type TaskApi struct{}
-// TaskGet
+// TaskCountdown
// @Tags Task
-// @Summary 鑾峰彇浠诲姟
+// @Summary 鏂颁换鍔″�掕鏃�
// @Produce application/json
-// @Success 200 {object} contextx.Response{data=response.TaskData} "鎴愬姛"
-// @Router /v1/task/get [get]
-func (slf *TaskApi) TaskGet(c *gin.Context) {
+// @Success 200 {object} contextx.Response{data=response.TaskCountdown} "鎴愬姛"
+// @Router /v1/task/countdown [get]
+func (slf *TaskApi) TaskCountdown(c *gin.Context) {
ctx, ok := contextx.NewContext(c, nil)
if !ok {
return
}
+ var resp response.TaskCountdown
+ workOrder, err := service.NewTaskService().GetNextTask()
+ if err == nil {
+ seconds := workOrder.StartTime - time.Now().Unix()
+ resp.CountDownHour = seconds / 3600
+ resp.CountDownMinute = seconds % 3600 / 60
+ resp.ShowCountDown = true
+ }
+ ctx.OkWithDetailed(resp)
+}
- taskData, code := service.NewTaskService().GetTask()
+// TaskGet
+// @Tags Task
+// @Summary 鑾峰彇浠诲姟
+// @Produce application/json
+// @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) {
+ var params request.TaskList
+ 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.Page = 1
+
+ if params.PageSize <= 0 {
+ params.PageSize = channelAmount
+ }
+
+ taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeCurrent, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
if code != ecode.OK {
ctx.Fail(code)
return
}
- ctx.OkWithDetailed(taskData)
+
+ if len(taskResponse.Tasks) < channelAmount {
+ 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, service.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
+ })
+
+ for _, task := range taskResponse.Tasks {
+ if task.Procedure.Status == model.ProcedureStatusWaitProcess {
+ task.CanStarted = true
+ }
+ }
+
+ taskResponse.Prompt = conf.Conf.Prompt
+ taskResponse.ChannelAmount = channelAmount
+
+ ctx.OkWithDetailed(taskResponse)
}
-// TaskStart
+// TaskGetUnStarted
// @Tags Task
-// @Summary 浠诲姟寮�濮�
+// @Summary 鑾峰彇鏈紑濮嬬殑浠诲姟
+// @Produce application/json
+// @Param object query request.TaskList true "鏌ヨ鍙傛暟"
+// @Success 200 {object} contextx.Response{data=response.TaskData} "鎴愬姛"
+// @Router /v1/task/get/unStarted [get]
+func (slf *TaskApi) TaskGetUnStarted(c *gin.Context) {
+ var params request.TaskList
+ ctx, ok := contextx.NewContext(c, ¶ms)
+ if !ok {
+ return
+ }
+ if params.Page <= 0 {
+ params.Page = 1
+ }
+ if params.PageSize <= 0 {
+ params.PageSize = 100
+ }
+
+ taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeUnStarted, nil) //鏃堕棿鍒颁簡鏈紑濮嬬殑
+ if code != ecode.OK {
+ ctx.Fail(code)
+ return
+ }
+ ctx.OkWithDetailed(taskResponse)
+}
+
+// GetProcessParams
+// @Tags Task
+// @Summary 浠诲姟寮�濮嬶紙鑾峰彇宸ヨ壓鍙傛暟锛�
// @Produce application/json
// @Param id path int true "宸ュ簭id"
// @Success 200 {object} contextx.Response{data=response.ProcessParamsResponse} "鎴愬姛"
// @Router /v1/task/start/{id} [get]
-func (slf *TaskApi) TaskStart(c *gin.Context) {
+func (slf *TaskApi) GetProcessParams(c *gin.Context) {
ctx, ok := contextx.NewContext(c, nil)
if !ok {
return
@@ -66,63 +164,41 @@
ctx.Fail(code)
return
}
- if procedure.Status != model.ProcedureStatusUnFinished {
- ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡缁撴潫")
- return
- }
order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
if err != nil {
ctx.Fail(ecode.UnknownErr)
return
}
- //params := service.GetProcessModelParams{
- // WorkOrder: procedure.WorkOrderID,
- // OrderId: procedure.OrderID,
- // Product: order.ProductName,
- // Procedure: procedure.ProceduresInfo.ProcedureName,
- // Device: procedure.ProceduresInfo.DeviceName,
- //}
- //resp, err := service.ProcessModel{}.GetProcessModel(params)
- //if err != nil {
- // logx.Errorf("TaskStart GetProcessModel error: %v", err.Error())
- // ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
- // return
- //}
- caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicProcessParamsRequest, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicProcessParamsResponse, conf.Conf.NsqConf.NodeId))
- var result common.ResponseProcessParams
-
- err = caller.Call(common.RequestProcessParams{
- WorkOrder: procedure.WorkOrderID,
- OrderId: procedure.OrderID,
- Product: order.ProductName,
- Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*5)
- if err != nil {
- logx.Errorf("TaskStart GetProcessModel error:%v", err.Error())
- ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
- return
- }
- if result.ParamsMap == nil {
- logx.Errorf("TaskStart GetProcessModel response miss process params:%v", result)
- ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
+ 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(result.ParamsMap))
- for k, v := range result.ParamsMap {
+ processParamsArr := make([]response.ProcessParams, 0, len(processModel.ParamsMap))
+ for k, v := range processModel.ParamsMap {
processParamsArr = append(processParamsArr, response.ProcessParams{
Key: k,
Value: v,
})
}
- data := response.ProcessParamsResponse{
- Number: result.Number,
+
+ 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,
Params: processParamsArr,
}
- logx.Infof("TaskStart Notice GetProcessModel: %+v", result)
- ctx.OkWithDetailed(data)
+ ctx.OkWithDetailed(resp)
}
// TaskFinish
@@ -143,169 +219,170 @@
return
}
id := convertx.Atoi(idx)
- _, code := service.NewTaskService().GetProcedureById(id)
- if code != ecode.OK {
- ctx.Fail(code)
- return
- }
- err := service.NewTaskService().UpdateProcedureStatus(id, model.ProcedureStatusFinished)
- if err != nil {
- logx.Errorf("UpdateProcedureStatus err: %v", err.Error())
- ctx.Fail(ecode.UnknownErr)
- return
- }
- ctx.Ok()
-}
-
-// SendProcessParams
-// @Tags Task
-// @Summary 涓嬪彂宸ヨ壓鍙傛暟
-// @Produce application/json
-// @Param id path int true "宸ュ簭id"
-// @Success 200 {object} contextx.Response{service.GetProcessModel} "鎴愬姛"
-// @Router /v1/task/sendProcessParams/{id} [post]
-func (slf *TaskApi) SendProcessParams(c *gin.Context) {
- ctx, ok := contextx.NewContext(c, nil)
- if !ok {
- return
- }
- idx := c.Param("id")
- if idx == "" {
- ctx.Fail(ecode.ParamsErr)
- return
- }
- id := convertx.Atoi(idx)
procedure, code := service.NewTaskService().GetProcedureById(id)
if code != ecode.OK {
ctx.Fail(code)
return
}
- order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
+ err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished, procedure.Channel)
+ if err != nil {
+ logx.Errorf("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())
+ }
+
+ ctx.Ok()
+}
+
+// TaskStart
+// @Tags Task
+// @Summary 涓嬪彂宸ヨ壓鍙傛暟锛堝紑濮嬩换鍔★級
+// @Produce application/json
+// @Param object body request.SendProcessParams true "鏌ヨ鍙傛暟"
+// @Success 200 {object} contextx.Response{service.GetProcessModel} "鎴愬姛"
+// @Router /v1/task/sendProcessParams [post]
+func (slf *TaskApi) TaskStart(c *gin.Context) {
+ 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
}
- caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicProcessParamsRequest, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicProcessParamsResponse, conf.Conf.NsqConf.NodeId))
- var result common.ResponseProcessParams
-
- err = caller.Call(common.RequestProcessParams{
- WorkOrder: procedure.WorkOrderID,
- OrderId: procedure.OrderID,
- Product: order.ProductName,
- Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*5)
- if err != nil {
- logx.Errorf("SendProcessParams GetProcessModel error:%v", err.Error())
- ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
- return
- }
- if result.ParamsMap == nil {
- logx.Errorf("SendProcessParams GetProcessModel response miss process params:%v", result)
- ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
+ if procedure.Status == model.ProcedureStatusProcessing {
+ ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡寮�濮嬬敓浜�")
return
}
- //fmt.Println("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
- //for k, v := range resp.ParamsMap {
- // fmt.Println(fmt.Sprintf("%v : %v", k, v))
- // time.Sleep(time.Millisecond * 300)
- //}
- //fmt.Println("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
+ processModel, err := taskService.GetProcessParams(procedure, order)
+ if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ ctx.Fail(ecode.UnknownErr)
+ return
+ }
- //err = SendParams(resp.ParamsMap)
- //if err != nil {
- // logx.Errorf("SendProcessParams: %v", err.Error())
- // ctx.Fail(ecode.UnknownErr)
- // return
- //}
-
- safe.Go(func() {
- err = SendParams2(result.ParamsMap, 0)
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Channel)
if err != nil {
- logx.Errorf("SendProcessParams: %v", err.Error())
- return
+ 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)
})
+ if err != nil {
+ logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "鏇存敼宸ュ崟鐘舵�佸け璐�")
+ 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, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
+ return
+ }
+ if code != ecode.OK {
+ logx.Errorf("get plcConfig err: %v", err.Error())
+ return
+ }
+ plcConfig.CurrentTryTimes = 0
+ err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, params.Channel, 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())
+ }
+
ctx.Ok()
}
-func SendParams(paramsMap map[string]interface{}) error {
+func SendParams(paramsMap map[string]interface{}, plcConfig *model.DevicePlc) error {
if len(paramsMap) == 0 {
return errors.New("empty params")
}
- plcAddressMap := make(map[string]*int, len(conf.Conf.PLCAddresses))
- for _, item := range conf.Conf.PLCAddresses {
- plcAddressMap[item.FieldName] = &item.Address
+ if plcConfig.CurrentTryTimes > plcConfig.MaxTryTimes {
+ return plcConfig.CurrentErr
}
-
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK {
- return errors.New("璇峰厛閰嶇疆PLC")
+ if plcConfig.CurrentTryTimes == 0 {
+ logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
}
- conn, err := plc.NewModbusConnection(fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port))
- if err != nil {
- return errors.New(fmt.Sprintf("杩炴帴plc澶辫触: %v", err.Error()))
- }
- defer conn.Close()
-
- logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
+ var failedNumbers int
for k, v := range paramsMap {
- if plcAddressMap[k] != nil {
- result, err := plc.WriteHoldingRegister(conn, *plcAddressMap[k], v)
- if err != nil {
- logx.Errorf("WriteHoldingRegister err:%v, address: %v, key: %v value: %v", err.Error(), *plcAddressMap[k], k, v)
- } else {
- logx.Infof("WriteHoldingRegister ok: key: %v, value: %v, result: %v", k, v, result)
- }
+ address, ok := plc_address.Get(k)
+ if !ok {
+ logx.Errorf("miss param address, k:%v, v:%v", k, v)
+ continue
}
- }
- logx.Info("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
- return nil
-}
-
-func SendParams2(paramsMap map[string]interface{}, tryTimes int) error {
- if len(paramsMap) == 0 {
- return errors.New("empty params")
- }
- if tryTimes > 2 {
- return errors.New("beyond max try time")
- }
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK {
- return errors.New("璇峰厛閰嶇疆PLC")
- }
- conn, err := plc.NewModbusConnection(fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port))
- if err != nil {
- return errors.New(fmt.Sprintf("杩炴帴plc澶辫触: %v", err.Error()))
- }
- defer conn.Close()
-
- logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
- var missNumbers int
- for k, v := range paramsMap {
- if address, ok := plc_address.Get(k); ok {
- result, err := plc.WriteHoldingRegister(conn, address, v)
- if err != nil {
- logx.Errorf("WriteHoldingRegister err:%v, address: %v, key: %v value: %v", err.Error(), address, k, v)
- } else {
- delete(paramsMap, k)
- logx.Infof("WriteHoldingRegister ok: key: %v, value: %v, result: %v", k, v, result)
- }
- } else {
- missNumbers++
- }
- }
- if missNumbers >= 1 {
- 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*2)
+ err := service.PlcWriteDirect(plcConfig, address, v)
if err != nil {
- logx.Infof("SendParams2 err: %v", err.Error())
- return err
+ 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)
}
- tryTimes++
- return SendParams2(paramsMap, tryTimes)
+ }
+ if failedNumbers >= 1 { //鍐欏叆plc澶辫触, 閲嶈瘯
+ plcConfig.CurrentTryTimes++
+ return SendParams(paramsMap, plcConfig)
}
logx.Info("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
return nil
--
Gitblit v1.8.0