From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
service/task.go | 125 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 116 insertions(+), 9 deletions(-)
diff --git a/service/task.go b/service/task.go
index ed8b6ea..66bf691 100644
--- a/service/task.go
+++ b/service/task.go
@@ -5,9 +5,11 @@
"apsClient/constvar"
"apsClient/model"
"apsClient/model/common"
+ "apsClient/model/request"
"apsClient/model/response"
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
+ "apsClient/pkg/timex"
"fmt"
"github.com/jinzhu/gorm"
"time"
@@ -21,7 +23,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
@@ -29,7 +31,7 @@
taskResp = &response.TaskResponse{
Tasks: taskList,
TaskCount: count,
- Workers: slf.WorkerDistinct(workers),
+ Workers: workers,
}
var (
@@ -39,7 +41,7 @@
workOrderIds []string
)
search := model.NewProceduresSearch(nil).
- SetDeviceId(conf.Conf.System.DeviceId).
+ SetDeviceId(deviceID).
SetPage(page, pageSize)
if mode == constvar.TaskModeUnStarted {
@@ -99,13 +101,14 @@
workers = append(workers, procedure.ProceduresInfo.Workers...)
}
taskResp = &response.TaskResponse{
- Tasks: taskList,
- Workers: slf.WorkerDistinct(workers),
+ Tasks: taskList,
+ TaskCount: count,
+ Workers: slf.WorkerDistinct(workers),
}
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
}
@@ -129,9 +132,21 @@
return procedure, ecode.OK
}
+func (slf TaskService) GetProcedureAndWorkOrder(procedureId uint) (procedure *model.Procedures, workOrder *model.Order, err error) {
+ procedure, err = model.NewProceduresSearch(nil).SetId(procedureId).First()
+ if err != nil {
+ return nil, nil, err
+ }
+ workOrder, err = model.NewOrderSearch(nil).SetWorkOrderId(procedure.WorkOrderID).First()
+ if err != nil {
+ return nil, nil, err
+ }
+ return procedure, workOrder, nil
+}
+
func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id uint, status model.ProcedureStatus, channel int32, processModelNumber string) error {
if status == model.ProcedureStatusFinished || status == model.ProcedureStatusWaitProcess {
- ProgressCacheUnset(channel)
+ ProgressCacheUnset(conf.Conf.CurrentDeviceID, channel)
}
upMap := map[string]interface{}{"status": status}
@@ -171,6 +186,9 @@
logx.Errorf("TaskStart GetProcessModel err:%v", err)
return nil, err
}
+ if err == gorm.ErrRecordNotFound {
+ return nil, err
+ }
if err == nil {
return data, nil
}
@@ -188,15 +206,104 @@
// SaveTaskStatusSync 淇濆瓨浠诲姟鍚屾淇℃伅
func (slf TaskService) SaveTaskStatusSync(db *gorm.DB, record *model.TaskStatusSync) (err error) {
+ if record.IsProcessing {
+ record.StartTs = time.Now().Unix()
+ }
+ if record.IsFinish {
+ record.FinishTs = time.Now().Unix()
+ startedRecord, _ := model.NewTaskStatusSyncSearch(db).SetProductProcedureId(record.ProductProcedureID).SetWorkOrderId(record.WorkOrderId).First()
+ record.StartTs = startedRecord.StartTs
+ }
return model.NewTaskStatusSyncSearch(db).Create(record)
}
// GetTaskStatusSync 鑾峰彇寰呭悓姝ヤ换鍔′俊鎭�
func (slf TaskService) GetTaskStatusSync(limit int) ([]*model.TaskStatusSync, error) {
- return model.NewTaskStatusSyncSearch(nil).SetOrder("id desc").SetPage(1, limit).FindNotTotal()
+ return model.NewTaskStatusSyncSearch(nil).SetOrder("id asc").SetPage(1, limit).FindNotTotal()
}
// RemoveTaskStatusSync 鍒犻櫎鍚屾瀹岀殑璁板綍
func (slf TaskService) RemoveTaskStatusSync(ids []uint) (err error) {
return model.NewTaskStatusSyncSearch(nil).SetIDs(ids).Delete()
}
+
+// GetTask2 鑾峰彇浠诲姟鍒楄〃2
+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
+
+ taskResp = &response.TaskResponse{
+ Tasks: taskList,
+ TaskCount: count,
+ Workers: workers,
+ }
+
+ var (
+ orders []*model.Order
+ procedures []*model.Procedures
+ workOrderIds []string
+ )
+ search := model.NewProceduresSearch(nil).
+ SetDeviceId(deviceID).
+ SetOffset(offset, limit).SetChannels(channels)
+ todayStartTs := timex.TodayStartTs()
+ switch queryType {
+ case request.QueryTypeUnFinish:
+ search.SetStatusNot(model.ProcedureStatusFinished).SetOrder("status desc, start_time asc")
+ case request.QueryTypeToday:
+ search.SetStatusNot(model.ProcedureStatusFinished).SetStartTimeMin(todayStartTs).SetEndTimeMax(todayStartTs + 86400).SetOrder("status desc, start_time asc")
+ case request.QueryTypeFinished:
+ search.SetStatus(model.ProcedureStatusFinished).SetOrder("start_time desc")
+ }
+
+ procedures, total, err := search.Find()
+ if err != nil {
+ return taskResp, err
+ }
+
+ if err != nil {
+ return taskResp, err
+ }
+ if len(procedures) == 0 {
+ return taskResp, nil
+ }
+
+ for _, procedure := range procedures {
+ workOrderIds = append(workOrderIds, procedure.WorkOrderID)
+ }
+ orders, err = model.NewOrderSearch(nil).SetWorkOrderIds(workOrderIds).FindNotTotal() //鐢卞伐搴忓弽鎺ㄥ伐鍗�
+ if err != nil {
+ return taskResp, err
+ }
+
+ orderMap := make(map[string]*model.Order, len(workOrderIds))
+ for _, order := range orders {
+ orderMap[order.WorkOrderID] = order
+ }
+ for _, procedure := range procedures {
+ taskData := response.TaskData{
+ Order: orderMap[procedure.WorkOrderID],
+ Procedure: procedure,
+ AllProcedures: procedure.ProceduresInfo.AllProcedureNames,
+ CurrentProcedureIndex: 0,
+ Channel: procedure.Channel,
+ }
+ index := 0
+ for _, name := range procedure.ProceduresInfo.AllProcedureNames {
+ if name == procedure.ProceduresInfo.ProcedureName {
+ break
+ }
+ index++
+ }
+ taskData.CurrentProcedureIndex = index
+ taskList = append(taskList, &taskData)
+ workers = append(workers, procedure.ProceduresInfo.Workers...)
+ }
+ taskResp = &response.TaskResponse{
+ Tasks: taskList,
+ TaskCount: total,
+ Workers: slf.WorkerDistinct(workers),
+ }
+ return taskResp, err
+}
--
Gitblit v1.8.0