From 24991928e6b6123751c05f166678883a89e4bf0a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 03 十一月 2023 16:19:41 +0800
Subject: [PATCH] fix

---
 api/v1/task.go |   89 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 81 insertions(+), 8 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index c2b864c..0b1c769 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -63,8 +63,7 @@
 		ctx.FailWithMsg(ecode.NeedConfirmedErr, err.Error())
 		return
 	}
-
-	taskCount := service.NewTaskService().NewTaskCount()
+	taskCount := service.NewTaskService().NewTaskCount(conf.Conf.CurrentDeviceID)
 	params.Page = 1
 	if params.PageSize <= 0 {
 		if params.TaskMode == constvar.TaskModeUnStarted {
@@ -79,7 +78,7 @@
 		taskMode = params.TaskMode
 	}
 
-	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, taskMode, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+	taskResponse, code := service.NewTaskService().GetTask(params.DeviceID, params.Page, params.PageSize, taskMode, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
 	if code != ecode.OK {
 		ctx.Fail(code)
 		return
@@ -94,7 +93,7 @@
 			if existsChannel[int32(i)] {
 				continue
 			}
-			taskResponseTemp, code := service.NewTaskService().GetTask(params.Page, 1, constvar.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
+			taskResponseTemp, code := service.NewTaskService().GetTask(params.DeviceID, params.Page, 1, constvar.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
 			if code != ecode.OK {
 				ctx.Fail(code)
 				return
@@ -215,7 +214,7 @@
 	}
 
 	err := model.WithTransaction(func(db *gorm.DB) error {
-		err := service.NewTaskService().UpdateProcedureStatus(db, id, model.ProcedureStatusFinished, procedure.Channel)
+		err := service.NewTaskService().UpdateProcedureStatusAndChannel(db, id, model.ProcedureStatusFinished, procedure.Channel, procedure.ProcessModelNumber)
 		if err != nil {
 			return err
 		}
@@ -236,7 +235,7 @@
 	}
 
 	service.TaskFlagUnset(procedure.Channel)
-
+	service.TaskEndTimeSet(procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
 	ctx.Ok()
 }
 
@@ -323,7 +322,9 @@
 		return
 	}
 
-	service.TaskFlagSet(procedure.Channel)
+	service.TaskFlagSet(procedure.Channel, int(procedure.ID))
+	service.TaskStartTimeSet(procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯寮�濮嬫椂闂�
+	service.TaskEndTimeSet(procedure.Channel, 0)                   //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
 	ctx.Ok()
 }
 
@@ -376,7 +377,7 @@
 		ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
 		return
 	}
-	_ = taskService.UpdateProcedureStatusAndChannel(nil, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModel.Number)
+	_ = taskService.UpdateProcessModelNumber(nil, params.ProcedureId, processModel.Number)
 	ctx.Ok()
 }
 
@@ -414,3 +415,75 @@
 	logx.Info("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
 	return nil
 }
+
+// TaskListByChannel
+// @Tags      Task
+// @Summary   鑾峰彇浠诲姟鍒楄〃2
+// @Produce   application/json
+// @Param     object  query    request.TaskListByChannel true  "鏌ヨ鍙傛暟"
+// @Success   200   {object}  contextx.Response{data=map[int32]response.TaskResponse}  "鎴愬姛"
+// @Router    /v1/task/list [get]
+func (slf *TaskApi) TaskListByChannel(c *gin.Context) {
+	var params request.TaskListByChannel
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	channelAmount, err := service.NewDevicePlcService().GetDeviceChannelAmount()
+	if err != nil {
+		ctx.FailWithMsg(ecode.NeedConfirmedErr, err.Error())
+		return
+	}
+	params.DeviceID = conf.Conf.CurrentDeviceID
+
+	dataMap := make(map[int32]*response.TaskResponse, channelAmount)
+	if params.Channel != nil {
+		taskResponse, err := getTaskResponseByChannel(params, *params.Channel)
+		if err != nil {
+			ctx.FailWithMsg(ecode.DBErr, err.Error())
+			return
+		}
+		dataMap[*params.Channel] = taskResponse
+		ctx.OkWithDetailed(dataMap)
+		return
+	}
+
+	//涓嶄紶channel鍙栨墍鏈塩hannel鐨�
+	var wg sync.WaitGroup
+	var mu sync.Mutex
+	for i := 0; i < channelAmount; i++ {
+		wg.Add(1)
+		go func(channel int32) {
+			defer wg.Done()
+			taskResponse, err := getTaskResponseByChannel(params, channel)
+			if err != nil {
+				ctx.FailWithMsg(ecode.DBErr, err.Error())
+				return
+			}
+			mu.Lock()
+			defer mu.Unlock()
+			dataMap[channel] = taskResponse
+		}(int32(i))
+	}
+	wg.Wait()
+	ctx.OkWithDetailed(dataMap)
+}
+
+func getTaskResponseByChannel(params request.TaskListByChannel, channel int32) (taskResponse *response.TaskResponse, err error) {
+	taskResponse, err = service.NewTaskService().GetTask2(params.DeviceID, params.Offset, params.Limit, []int32{channel}, params.Type) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+	if err != nil {
+		return
+	}
+
+	nowTs := time.Now().Unix()
+	flagMap := make(map[int32]struct{}, 0)
+	for _, task := range taskResponse.Tasks {
+		if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(task.Channel) && task.Procedure.StartTime <= nowTs {
+			task.CanStarted = true
+			flagMap[task.Channel] = struct{}{}
+		}
+	}
+	taskResponse.Prompt = conf.Conf.Prompt
+	return
+}

--
Gitblit v1.8.0