From 8cb2727cce6eaaff94df8f5dd2254da2b9870b24 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 25 十一月 2023 17:30:05 +0800
Subject: [PATCH] 增加校验
---
service/device_plc.go | 12 +++++-------
api/v1/task.go | 4 ++++
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 7ee8678..d65ab6c 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -268,6 +268,10 @@
ctx.Fail(code)
return
}
+ if procedure.DeviceID != conf.Conf.CurrentDeviceID {
+ ctx.FailWithMsg(ecode.ParamsErr, "璇ヤ换鍔′笉灞炰簬褰撳墠璁惧")
+ return
+ }
order, err := taskService.GetOrderByWorkOrderId(procedure.WorkOrderID)
if err != nil {
ctx.Fail(ecode.UnknownErr)
diff --git a/service/device_plc.go b/service/device_plc.go
index ecff338..c8124a4 100644
--- a/service/device_plc.go
+++ b/service/device_plc.go
@@ -8,6 +8,7 @@
"apsClient/pkg/logx"
"apsClient/pkg/structx"
"encoding/json"
+ "errors"
"github.com/jinzhu/gorm"
)
@@ -45,14 +46,11 @@
}
func (slf DevicePlcService) GetDeviceChannelAmount() (int, error) {
- plcConfig, code := slf.GetDevicePlc()
- if code != ecode.OK || plcConfig.ID == 0 {
- return 1, nil
+ device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.CurrentDeviceID).First()
+ if err != nil {
+ return 0, errors.New("娌℃湁鎵惧埌褰撳墠璁惧")
}
- if len(plcConfig.Details) == 0 {
- return 1, nil
- }
- return len(plcConfig.Details) / 2, nil
+ return device.ExtChannelAmount + 1, nil
}
func (DevicePlcService) UpdateDevicePlc(plc *request.UpdatePlc) int {
--
Gitblit v1.8.0