From 21e0e02fd465fef04f1834b078c621a0e3594308 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 02 九月 2023 16:51:48 +0800
Subject: [PATCH] 任务开始和结束都发送消息通知apsserver

---
 api/v1/config.go |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/api/v1/config.go b/api/v1/config.go
index 571d203..4765bcf 100644
--- a/api/v1/config.go
+++ b/api/v1/config.go
@@ -2,6 +2,7 @@
 
 import (
 	"apsClient/conf"
+	"apsClient/constvar"
 	"apsClient/model"
 	"apsClient/model/request"
 	_ "apsClient/model/response"
@@ -75,7 +76,7 @@
 	} else {
 		shName = conf.Conf.System.NetDownShellName
 	}
-	sh := fmt.Sprintf("%s %v %v %v", shName, params.IP, params.MASK, params.Gateway)
+	sh := fmt.Sprintf("%s %v %v %v %v", shName, params.NetworkCard, params.IP, params.MASK, params.Gateway)
 	err = utils.Cmd(conf.Conf.System.NetSetShellPath + sh)
 	if err != nil {
 		logx.Errorf("network update failed: %v", err.Error())
@@ -119,6 +120,20 @@
 		return
 	}
 
+	if !params.Method.Valid() {
+		ctx.FailWithMsg(ecode.ParamsErr, "鎺ュ彛鏂瑰紡涓嶆纭�")
+		return
+	}
+
+	if params.Method == constvar.PlcMethodModbusTCP && (params.Address == "" || params.Port == 0) {
+		ctx.FailWithMsg(ecode.ParamsErr, "褰撴帴鍙ｆ柟寮忎负modbusTCP鏃讹紝address鍜宲ort涓嶈兘涓虹┖")
+		return
+	}
+	if params.Method == constvar.PlcMethodSerial && (params.BaudRate == 0 || params.SerialName == "") {
+		ctx.FailWithMsg(ecode.ParamsErr, "褰撴帴鍙ｆ柟寮忎负serial鏃讹紝baudRate鍜宻erialName涓嶈兘涓虹┖")
+		return
+	}
+
 	errCode := service.NewDevicePlcService().UpdateDevicePlc(&params)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)

--
Gitblit v1.8.0