From 0457f96716de8125560f332fcf718100b9f754eb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 13 九月 2023 21:03:56 +0800
Subject: [PATCH] 适应性改动

---
 api/v1/task.go |   58 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index 74287d5..7eb2142 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -5,13 +5,13 @@
 	"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"
@@ -49,20 +49,28 @@
 // @Tags      Task
 // @Summary   鑾峰彇浠诲姟
 // @Produce   application/json
+// @Param     object  query    request.TaskList true  "鏌ヨ鍙傛暟"
 // @Success   200   {object}  contextx.Response{data=response.TaskData}  "鎴愬姛"
 // @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, &params)
 	if !ok {
 		return
 	}
+	if params.Page <= 0 {
+		params.Page = 1
+	}
+	if params.PageSize <= 0 {
+		params.PageSize = 1
+	}
 
-	taskData, code := service.NewTaskService().GetTask()
+	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize)
 	if code != ecode.OK {
 		ctx.Fail(code)
 		return
 	}
-	ctx.OkWithDetailed(taskData)
+	ctx.OkWithDetailed(taskResponse)
 }
 
 // GetProcessParams
@@ -166,22 +174,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]
 func (slf *TaskApi) TaskStart(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.SendProcessParams
+	ctx, ok := contextx.NewContext(c, &params)
 	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,7 +207,7 @@
 	}
 
 	err = model.WithTransaction(func(db *gorm.DB) error {
-		err = taskService.UpdateProcedureStatus(db, id, model.ProcedureStatusProcessing)
+		err = taskService.UpdateProcedureStatusAndPosition(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Position)
 		if err != nil {
 			return err
 		}
@@ -266,27 +269,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