发送巡检消息

services/websocket_msg.go

@@ -171,15 +171,17 @@ func DealEdbInspectionMessageTest(adminId int) {
 	if err != nil {
 		utils.FileLog.Error("获取巡检信息历史失败,err:%s, adminId:%d", err.Error(), adminId)
 	}
-	success := make(chan int64, 10)
+	if len(messageList) == 0 {
+		return
+	}
 	go func() {
-		defer close(success)
-		for i, msg := range messageList {
-			if i == 0 {
+		readList := make([]int64, 0)
+		for _, msg := range messageList {
 				// 多条消息仅发送最新一条
 				respData, err := data.SendInspectionMessages(adminId, msg)
 				if err != nil {
 					utils.FileLog.Error("巡检信息发送失败,err:%s, adminId:%d", err.Error(), adminId)
+					return
 				} else {
 					resp := models.WebsocketMessageResponse{
 						MessageType: 1,
@@ -193,28 +195,17 @@ func DealEdbInspectionMessageTest(adminId int) {
 					err = conn.WriteJSON(resp)
 					if err != nil {
 						utils.FileLog.Error("巡检信息发送失败,err:%s, adminId:%d", err.Error(), adminId)
-						} else {
-							utils.FileLog.Info("巡检信息发送成功,adminId:%d, messageId:%d", adminId, msg.MessageId)
-							success <- msg.MessageId
-						}
+						return
+					} else {
+						utils.FileLog.Info("巡检信息发送成功,adminId:%d, messageId:%d", adminId, msg.MessageId)
 					}
-				} else {
-					success <- msg.MessageId
 				}
+				readList = append(readList, msg.MessageId)
 			}
-	}()
-	go func() {
-		readList := make([]int64, 0)
-		for {
-			msgId, ok := <-success
-			if !ok {
-				break
+			_, err = data.ReadEdbInspectionMessageList(readList, adminId)
+			if err != nil {
+				utils.FileLog.Error("巡检信息已读失败,err:%s, adminId:%d", err.Error(), adminId)
+				return
 			}
-			readList = append(readList, msgId)
-		}
-		_, err = data.ReadEdbInspectionMessageList(readList, adminId)
-		if err != nil {
-			utils.FileLog.Error("巡检信息已读失败,err:%s, adminId:%d", err.Error(), adminId)
-		}
-	}()
+		}()
 }