From dd75b36c03049be232a94d97eff1c4a5cc751fb5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 31 十月 2023 22:08:39 +0800
Subject: [PATCH] 支持设备ID切换
---
service/task.go | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/service/task.go b/service/task.go
index 8f6388d..adb83c1 100644
--- a/service/task.go
+++ b/service/task.go
@@ -1,7 +1,6 @@
package service
import (
- "apsClient/conf"
"apsClient/constvar"
"apsClient/model"
"apsClient/model/common"
@@ -22,7 +21,7 @@
}
// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂村皬浜庣瓑浜庡綋鍓嶆椂闂达紝缁撴潫鏃堕棿澶т簬褰撳墠鏃堕棿鐨勪换鍔�
-func (slf TaskService) GetTask(page, pageSize int, mode constvar.TaskMode, channels []int32) (taskResp *response.TaskResponse, code int) {
+func (slf TaskService) GetTask(deviceID string, page, pageSize int, mode constvar.TaskMode, channels []int32) (taskResp *response.TaskResponse, code int) {
var taskList []*response.TaskData
var count int64
var workers []*common.ProcedureWorker
@@ -40,7 +39,7 @@
workOrderIds []string
)
search := model.NewProceduresSearch(nil).
- SetDeviceId(conf.Conf.System.DeviceId).
+ SetDeviceId(deviceID).
SetPage(page, pageSize)
if mode == constvar.TaskModeUnStarted {
@@ -106,8 +105,8 @@
}
return taskResp, ecode.OK
}
-func (slf TaskService) NewTaskCount() (count int64) {
- count, _ = model.NewProceduresSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetStatus(model.ProcedureStatusWaitProcess).Count()
+func (slf TaskService) NewTaskCount(deviceId string) (count int64) {
+ count, _ = model.NewProceduresSearch(nil).SetDeviceId(deviceId).SetStatus(model.ProcedureStatusWaitProcess).Count()
return count
}
@@ -204,7 +203,7 @@
}
// GetTask2 鑾峰彇浠诲姟鍒楄〃2
-func (slf TaskService) GetTask2(offset, limit int, channels []int32, queryType request.QueryType) (taskResp *response.TaskResponse, err error) {
+func (slf TaskService) GetTask2(deviceID string, offset, limit int, channels []int32, queryType request.QueryType) (taskResp *response.TaskResponse, err error) {
var taskList []*response.TaskData
var count int64
var workers []*common.ProcedureWorker
@@ -221,7 +220,7 @@
workOrderIds []string
)
search := model.NewProceduresSearch(nil).
- SetDeviceId(conf.Conf.System.DeviceId).
+ SetDeviceId(deviceID).
SetOffset(offset, limit).SetChannels(channels)
nowTs := time.Now().Unix()
switch queryType {
--
Gitblit v1.8.0