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 | 317 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 270 insertions(+), 47 deletions(-)
diff --git a/service/task.go b/service/task.go
index e173964..66bf691 100644
--- a/service/task.go
+++ b/service/task.go
@@ -1,10 +1,17 @@
package service
import (
+ "apsClient/conf"
+ "apsClient/constvar"
"apsClient/model"
+ "apsClient/model/common"
+ "apsClient/model/request"
"apsClient/model/response"
"apsClient/pkg/ecode"
- "gorm.io/gorm"
+ "apsClient/pkg/logx"
+ "apsClient/pkg/timex"
+ "fmt"
+ "github.com/jinzhu/gorm"
"time"
)
@@ -15,59 +22,109 @@
return &TaskService{}
}
-// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂存渶鏃╃殑浠诲姟
-func (slf TaskService) GetTask() (taskData *response.TaskData, code int) {
- nowTs := time.Now().Unix()
- orderSearch := model.NewOrderSearch(nil)
- orderSearch.SetOrder("created_at asc").
- SetStartTimeMax(nowTs).
- SetStatus(model.OrderStatusUnFinished)
+// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂村皬浜庣瓑浜庡綋鍓嶆椂闂达紝缁撴潫鏃堕棿澶т簬褰撳墠鏃堕棿鐨勪换鍔�
+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
+
+ taskResp = &response.TaskResponse{
+ Tasks: taskList,
+ TaskCount: count,
+ Workers: workers,
+ }
+
var (
- err error
- order *model.Order
+ err error
+ orders []*model.Order
+ procedures []*model.Procedures
+ workOrderIds []string
)
- order, err = orderSearch.First() //鍏堝彇杩涜涓殑浠诲姟
- if err == gorm.ErrRecordNotFound {
- err = nil
- return nil, ecode.OK
- }
- if err != nil {
- return nil, ecode.DBErr
- }
- procedure, err := model.NewProceduresSearch(nil).
- SetWorkOrderId(order.WorkOrderID).
- SetStartTimeMax(nowTs).
- SetStatus(model.ProcedureStatusUnFinished).
- First()
- if err == gorm.ErrRecordNotFound { //璇ヨ鍗曟湰璁惧鍏ㄩ儴宸ュ簭瀹屾垚锛屾妸璁㈠崟缃负瀹屾垚鐘舵�侊紙鍙槸瀵规湰璁惧瀹屾垚锛�
- err = nil
- err = model.NewOrderSearch(nil).SetWorkOrderId(order.WorkOrderID).UpdateByMap(map[string]interface{}{
- "status": model.OrderStatusFinished,
- })
- if err != nil {
- return nil, ecode.DBErr
+ search := model.NewProceduresSearch(nil).
+ SetDeviceId(deviceID).
+ SetPage(page, pageSize)
+
+ if mode == constvar.TaskModeUnStarted {
+ search.SetStatus(model.ProcedureStatusWaitProcess).
+ SetOrder("start_time asc")
+ } else if mode == constvar.TaskModeCurrent {
+ search.SetStatus(model.ProcedureStatusProcessing).
+ SetOrder("start_time asc")
+ } else if mode == constvar.TaskModeLastFinished {
+ search.SetStatus(model.ProcedureStatusFinished).SetOrder("updated_at desc")
+ if len(channels) > 0 {
+ search.SetChannels(channels)
}
- return slf.GetTask() //褰撳墠璁㈠崟宸插畬鍏紝缁х画鏌ヨ鏈畬鎴愯鍗�
}
+
+ procedures, err = search.FindNotTotal()
if err != nil {
- return nil, ecode.DBErr
+ return taskResp, ecode.DBErr
}
- nextProcedure := new(model.Procedures)
- nextProcedure, err = model.NewProceduresSearch(nil).
- SetWorkOrderId(order.WorkOrderID).
- SetStatus(model.ProcedureStatusUnFinished).
- SetId(procedure.ID + 1).First()
- if err == nil {
- nextProcedure.ProceduresInfo.ProcedureName = "--"
+
+ if err != nil {
+ return taskResp, ecode.DBErr
}
- taskData = new(response.TaskData)
- taskData.Order = order
- taskData.Procedure = procedure
- taskData.NextProcedure = nextProcedure
- return taskData, ecode.OK
+ if len(procedures) == 0 {
+ return taskResp, ecode.OK
+ }
+
+ for _, procedure := range procedures {
+ workOrderIds = append(workOrderIds, procedure.WorkOrderID)
+ }
+ orders, err = model.NewOrderSearch(nil).SetWorkOrderIds(workOrderIds).FindNotTotal() //鐢卞伐搴忓弽鎺ㄥ伐鍗�
+ if err != nil {
+ return taskResp, ecode.DBErr
+ }
+
+ 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: count,
+ Workers: slf.WorkerDistinct(workers),
+ }
+ return taskResp, ecode.OK
+}
+func (slf TaskService) NewTaskCount(deviceId string) (count int64) {
+ count, _ = model.NewProceduresSearch(nil).SetDeviceId(deviceId).SetStatus(model.ProcedureStatusWaitProcess).Count()
+ return count
}
-func (slf TaskService) GetProcedureById(id int) (*model.Procedures, int) {
+func (slf TaskService) WorkerDistinct(workers []*common.ProcedureWorker) (NoRepeatedWorkers []*common.ProcedureWorker) {
+ exists := make(map[string]bool, 0)
+ for _, worker := range workers {
+ key := fmt.Sprintf("%v%v", worker.WorkerID, worker.StartTime)
+ if !exists[key] {
+ NoRepeatedWorkers = append(NoRepeatedWorkers, worker)
+ exists[key] = true
+ }
+ }
+ return NoRepeatedWorkers
+}
+
+func (slf TaskService) GetProcedureById(id uint) (*model.Procedures, int) {
procedure, err := model.NewProceduresSearch(nil).SetId(id).First()
if err != nil {
return nil, ecode.DBErr
@@ -75,8 +132,43 @@
return procedure, ecode.OK
}
-func (slf TaskService) UpdateProcedureStatus(id int, status model.ProcedureStatus) error {
- return model.NewProceduresSearch(nil).SetId(id).UpdateByMap(map[string]interface{}{
+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(conf.Conf.CurrentDeviceID, channel)
+ }
+
+ upMap := map[string]interface{}{"status": status}
+ if status == model.ProcedureStatusProcessing {
+ upMap["process_model_number"] = processModelNumber
+ upMap["real_start_time"] = time.Now().Unix()
+ } else if status == model.ProcedureStatusWaitProcess {
+ upMap["process_model_number"] = ""
+ } else if status == model.ProcedureStatusFinished {
+ upMap["real_end_time"] = time.Now().Unix()
+ }
+
+ return model.NewProceduresSearch(db).SetId(id).UpdateByMap(upMap)
+}
+
+func (slf TaskService) UpdateProcessModelNumber(db *gorm.DB, id uint, processModelNumber string) error {
+ upMap := map[string]interface{}{"process_model_number": processModelNumber}
+ return model.NewProceduresSearch(db).SetId(id).UpdateByMap(upMap)
+}
+
+func (slf TaskService) UpdateOrderStatus(db *gorm.DB, id uint, status model.OrderStatus) error {
+ return model.NewOrderSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
"status": status,
})
}
@@ -84,3 +176,134 @@
func (slf TaskService) GetOrderByWorkOrderId(workOrderId string) (order *model.Order, err error) {
return model.NewOrderSearch(nil).SetWorkOrderId(workOrderId).First()
}
+
+func (slf TaskService) GetProcessParams(procedure *model.Procedures, order *model.Order) (processModel *model.ProcessModel, err error) {
+ data, err := model.NewProcessModelSearch().
+ SetProcedure(procedure.ProceduresInfo.ProcedureName).
+ SetProduct(order.ProductName).
+ SetOrder("id desc").First()
+ if err != nil && err != gorm.ErrRecordNotFound {
+ logx.Errorf("TaskStart GetProcessModel err:%v", err)
+ return nil, err
+ }
+ if err == gorm.ErrRecordNotFound {
+ return nil, err
+ }
+ if err == nil {
+ return data, nil
+ }
+ return
+}
+
+// GetNextTask 鑾峰彇鏈紑濮嬬殑浠诲姟
+func (slf TaskService) GetNextTask() (workOrder *model.Order, err error) {
+ nowTs := time.Now().Unix()
+ orderSearch := model.NewOrderSearch(nil)
+ return orderSearch.SetOrder("start_time asc").
+ SetStartTimeMin(nowTs).
+ SetStatus(model.OrderStatusWaitProcess).First()
+}
+
+// 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 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