From e8b6ad0c160a39b024b0f2b996d603bdd9b22db9 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 28 九月 2023 17:44:07 +0800
Subject: [PATCH] 工艺参数列表增加是否可以更新字段
---
service/task.go | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/service/task.go b/service/task.go
index dd1c11c..db15d10 100644
--- a/service/task.go
+++ b/service/task.go
@@ -10,7 +10,6 @@
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
"apsClient/pkg/structx"
- "encoding/json"
"fmt"
"gorm.io/gorm"
"time"
@@ -106,15 +105,16 @@
taskList = append(taskList, &taskData)
workers = append(workers, procedure.ProceduresInfo.Workers...)
}
-
- count, _ = search.SetStatus(model.ProcedureStatusWaitProcess).SetStartTimeMax(nowTs).SetEndTimeMin(nowTs).Count()
-
taskResp = &response.TaskResponse{
- Tasks: taskList,
- TaskCount: count,
- Workers: slf.WorkerDistinct(workers),
+ Tasks: taskList,
+ Workers: slf.WorkerDistinct(workers),
}
return taskResp, ecode.OK
+}
+func (slf TaskService) NewTaskCount() (count int64) {
+ nowTs := time.Now().Unix()
+ count, _ = model.NewProceduresSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetStatus(model.ProcedureStatusWaitProcess).SetStartTimeMax(nowTs).SetEndTimeMin(nowTs).Count()
+ return count
}
func (slf TaskService) WorkerDistinct(workers []*common.ProcedureWorker) (NoRepeatedWorkers []*common.ProcedureWorker) {
@@ -176,11 +176,6 @@
return nil, err
}
if err == nil {
- err = json.Unmarshal([]byte(data.Params), &data.ParamsMap)
- if err != nil {
- logx.Errorf("process model json.Unmarshal:%v", err)
- return
- }
return data, nil
}
--
Gitblit v1.8.0