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 | 161 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 126 insertions(+), 35 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 74287d5..480a58f 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -5,19 +5,21 @@
"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"
)
@@ -49,20 +51,94 @@
// @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
+ }
+
+ 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)
+}
+
+// TaskGetUnStarted
+// @Tags Task
+// @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
@@ -97,7 +173,7 @@
processModel, err := service.NewTaskService().GetProcessParams(procedure, order)
if err != nil || processModel == nil || processModel.ParamsMap == nil {
- ctx.Fail(ecode.UnknownErr)
+ ctx.FailWithMsg(ecode.ParamsErr, "璇峰厛閰嶇疆宸ヨ壓鍙傛暟")
return
}
@@ -108,6 +184,16 @@
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,
Params: processParamsArr,
@@ -138,7 +224,7 @@
ctx.Fail(code)
return
}
- err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished)
+ err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished, procedure.Channel)
if err != nil {
logx.Errorf("UpdateProcedureStatus err: %v", err.Error())
ctx.Fail(ecode.UnknownErr)
@@ -166,22 +252,17 @@
// @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)
+ 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
@@ -204,15 +285,16 @@
}
err = model.WithTransaction(func(db *gorm.DB) error {
- err = taskService.UpdateProcedureStatus(db, id, model.ProcedureStatusProcessing)
+ err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Channel)
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().AddProgress(db, procedure, order)
+ return service.NewProgressService().Add(db, procedure, order)
})
if err != nil {
logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
@@ -228,6 +310,18 @@
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
}
@@ -236,7 +330,7 @@
return
}
plcConfig.CurrentTryTimes = 0
- err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, order.Amount.IntPart())
+ err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, params.Channel, order.Amount.IntPart())
if err != nil {
ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
return
@@ -266,27 +360,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