From c311a31ae8ce1bbfe539bd94d9bb6dfdfc18d3be Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 30 十月 2023 13:50:31 +0800
Subject: [PATCH] 不加集群打印日志

---
 crontask/cron_task.go |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index 3ff0d59..230d38e 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -103,6 +103,7 @@
 	if err != nil {
 		logx.Errorf("SyncTaskStatus get records err:%v", err)
 	}
+	syncOkIds := make([]uint, 0, len(records))
 	for _, record := range records {
 		msg := &common.MsgTaskStatusUpdate{
 			WorkOrderId:  record.WorkOrderId,
@@ -115,6 +116,13 @@
 		err = caller.Send(msg)
 		if err != nil {
 			logx.Errorf("sync task status send msg error:%v", err.Error())
+		}
+		syncOkIds = append(syncOkIds, record.ID)
+	}
+	if len(syncOkIds) > 0 {
+		err = service.NewTaskService().RemoveTaskStatusSync(syncOkIds)
+		if err != nil {
+			logx.Errorf("sync task status delete sync ok records error:%v", err)
 		}
 	}
 }
@@ -135,11 +143,12 @@
 	caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicPullDataRequest, conf.Conf.NsqConf.NodeId), constvar.NsqTopicPullDataResponse)
 	err := caller.Send(msg)
 	if err != nil {
-		logx.Errorf("send pull data msg error:%v", err.Error())
+		logx.Errorf("send pull data msg error:%v, msg:%+v", err.Error(), msg)
 	}
-	caller = nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicGetPlcAddress, conf.Conf.NsqConf.NodeId), "")
-	err = caller.Send(common.RequestPlcAddress{DeviceId: conf.Conf.System.DeviceId})
+	msg = &common.MsgPullDataRequest{DataType: common.PullDataTypeDevice}
+	caller = nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicPullDataRequest, conf.Conf.NsqConf.NodeId), constvar.NsqTopicPullDataResponse)
+	err = caller.Send(msg)
 	if err != nil {
-		logx.Infof("get plc address err: %v", err.Error())
+		logx.Errorf("send pull data msg error:%v, msg:%+v", err.Error(), msg)
 	}
 }

--
Gitblit v1.8.0