From 739638f21a6b32f8aee15177a87f547e76fbcb18 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 21 八月 2023 11:45:24 +0800
Subject: [PATCH] fix
---
api/v1/task.go | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 7 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 2e01370..893106b 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -1,13 +1,17 @@
package v1
import (
+ "apsClient/conf"
"apsClient/model"
+ "apsClient/model/response"
_ "apsClient/model/response"
"apsClient/pkg/contextx"
"apsClient/pkg/convertx"
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
+ "apsClient/pkg/plc"
"apsClient/service"
+ "errors"
"fmt"
"github.com/gin-gonic/gin"
"time"
@@ -40,7 +44,7 @@
// @Summary 浠诲姟寮�濮�
// @Produce application/json
// @Param id path int true "宸ュ簭id"
-// @Success 200 {object} contextx.Response{service.GetProcessModel} "鎴愬姛"
+// @Success 200 {object} contextx.Response{data=response.ProcessParamsResponse} "鎴愬姛"
// @Router /v1/task/start/{id} [get]
func (slf *TaskApi) TaskStart(c *gin.Context) {
ctx, ok := contextx.NewContext(c, nil)
@@ -58,29 +62,46 @@
ctx.Fail(code)
return
}
- order, err := service.NewTaskService().GetOrderByOrderId(procedure.OrderID)
+
+ 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: "",
+ WorkOrder: procedure.WorkOrderID,
OrderId: procedure.OrderID,
Product: order.ProductName,
Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceID,
+ Device: procedure.ProceduresInfo.DeviceName,
}
resp, err := service.ProcessModel{}.GetProcessModel(params)
if err != nil {
logx.Errorf("TaskStart Notice GetProcessModel error: %v", err.Error())
- ctx.Fail(ecode.UnknownErr)
+ ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
return
}
+ processParamsArr := make([]response.ProcessParams, 0, len(resp.ParamsMap))
+ for k, v := range resp.ParamsMap {
+ processParamsArr = append(processParamsArr, response.ProcessParams{
+ Key: k,
+ Value: v,
+ })
+ }
+ response := response.ProcessParamsResponse{
+ Number: resp.Number,
+ Params: processParamsArr,
+ }
logx.Infof("TaskStart Notice GetProcessModel: %+v", resp)
- ctx.OkWithDetailed(resp)
+ ctx.OkWithDetailed(response)
}
// TaskFinish
@@ -138,7 +159,7 @@
ctx.Fail(code)
return
}
- order, err := service.NewTaskService().GetOrderByOrderId(procedure.OrderID)
+ order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
if err != nil {
ctx.Fail(ecode.UnknownErr)
return
@@ -158,11 +179,51 @@
ctx.Fail(ecode.UnknownErr)
return
}
+
fmt.Println("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
for k, v := range resp.ParamsMap {
fmt.Println(fmt.Sprintf("%v : %v", k, v))
time.Sleep(time.Millisecond * 300)
}
fmt.Println("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
+
+ //err = SendParams(resp.ParamsMap)
+ //if err != nil {
+ // logx.Errorf("SendProcessParams: %v", err.Error())
+ // ctx.Fail(ecode.UnknownErr)
+ // return
+ //}
+
ctx.Ok()
}
+
+func SendParams(paramsMap map[string]interface{}) error {
+ plcAddressMap := make(map[string]*int, len(conf.Conf.PLCAddresses))
+ for _, item := range conf.Conf.PLCAddresses {
+ plcAddressMap[item.FieldName] = &item.Address
+ }
+
+ plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+ if code != ecode.OK {
+ return errors.New("璇峰厛閰嶇疆PLC")
+ }
+ conn, err := plc.NewModbusConnection(plcConfig.Address)
+ if err != nil {
+ return errors.New(fmt.Sprintf("杩炴帴plc澶辫触: %v", err.Error()))
+ }
+ defer conn.Close()
+
+ logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
+ 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)
+ }
+ }
+ }
+ logx.Info("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
+ return nil
+}
--
Gitblit v1.8.0