From 9210e403c66c2acf402d35100b315e5ab360ebf1 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 24 Aug 2023 22:08:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AF=BC=E5=87=BAtxt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handle/api/req_sync_alarm_file.go | 61 ++++++++++++++++++++++---------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/handle/api/req_sync_alarm_file.go b/handle/api/req_sync_alarm_file.go
index 9b1e083..740c388 100644
--- a/handle/api/req_sync_alarm_file.go
+++ b/handle/api/req_sync_alarm_file.go
@@ -5,6 +5,7 @@ import (
 	"omc/core"
 	"omc/core/manage"
 	"omc/core/parse"
+	"omc/core/utils"
 	"omc/handle/service"
 	"strconv"
 
@@ -35,23 +36,11 @@ func (s *ReqSyncAlarmFile) Handle(request ziface.IRequest) {
 		return
 	}
 
-	// 额外参数预设初始值
-	startTime, startTimeOk := body.Data["startTime"]
-	if startTimeOk {
-		fmt.Println(startTime)
-	}
-	endTime, endTimeOk := body.Data["endTime"]
-	if endTimeOk {
-		fmt.Println(endTime)
-	}
+	// 参数预设初始值 alarmSeq不一定有
 	alarmSeq, alarmSeqOk := body.Data["alarmSeq"]
 	if !alarmSeqOk || alarmSeq == "" {
-		fmt.Println(alarmSeq)
-		alarmSeq = "0"
-	}
-	syncSource, syncSourceOk := body.Data["syncSource"]
-	if syncSourceOk {
-		fmt.Println(syncSource)
+		fmt.Println("== ", alarmSeq)
+		alarmSeq = "1"
 	}
 
 	//管理模块
@@ -78,21 +67,57 @@ func (s *ReqSyncAlarmFile) Handle(request ziface.IRequest) {
 
 	// check alarmSeq 是否存在
 	neBind, _ := parse.ConvertBindFlag(m.BindFlag)
-	alarm, err := service.ListForSaveFile(neBind.NeType, neBind.NeId, int64(seq), startTime, endTime, syncSource)
+	alarm, err := service.ListForSaveFile(neBind.NeType, neBind.NeId, int64(seq), body.Data["startTime"], body.Data["endTime"], body.Data["syncSource"])
 	if err != nil {
 		zlog.Ins().ErrorF("no permissions ")
 		request.GetConnection().SendMsg(ReqSyncAlarmFileType, core.ResultError(ReqSyncAlarmFileName, "no permissions", reqId))
 		return
 	}
 	if len(alarm) > 0 {
+		data := service.ConvertOMCAlarm(alarm)
+
+		// zlog.Ins().ErrorF("ReqSyncAlarmFileResult json Marshal err %v", err)
+		// 	request.GetConnection().SendMsg(ReqSyncAlarmFileResultType, core.Result(ReqSyncAlarmFileResultName, map[string]string{
+		// 		"reqId":    reqId,
+		// 		"result":   "fail",
+		// 		"resDesc":  "data marshal err",
+		// 		"fileName": "",
+		// 	}))
+
+		fileNmae := "/opt/omc/ftp/output.txt"
+		zipFfileNmae := "/opt/omc/ftp/output.txt.zip"
+
+		err := utils.CreateFile(fileNmae, data)
+		if err != nil {
+			zlog.Ins().ErrorF("ReqSyncAlarmFileResult json Marshal err %v", err)
+			request.GetConnection().SendMsg(ReqSyncAlarmFileResultType, core.Result(ReqSyncAlarmFileResultName, map[string]string{
+				"reqId":    reqId,
+				"result":   "fail",
+				"resDesc":  err.Error(),
+				"fileName": "",
+			}))
+		}
+
+		utils.FileToZip(zipFfileNmae, fileNmae)
+		if err != nil {
+			zlog.Ins().ErrorF("ReqSyncAlarmFileResult json Marshal err %v", err)
+			request.GetConnection().SendMsg(ReqSyncAlarmFileResultType, core.Result(ReqSyncAlarmFileResultName, map[string]string{
+				"reqId":    reqId,
+				"result":   "fail",
+				"resDesc":  err.Error(),
+				"fileName": "",
+			}))
+		}
+
+		//发送文件同步信息
 		request.GetConnection().SendMsg(ReqSyncAlarmFileResultType, core.Result(ReqSyncAlarmFileResultName, map[string]string{
 			"reqId":    reqId,
 			"result":   "succ",
 			"resDesc":  "ok",
-			"fileName": "/ftproot/GD/WX/HW/JS_OMC2/FM/20150611/ FM-OMC-1A-V1.1.0-20150611011603-001.txt",
+			"fileName": zipFfileNmae,
 		}))
 		return
 	}
 
-	request.GetConnection().SendMsg(ReqSyncAlarmFileType, core.ResultSuccess(ReqSyncAlarmFileName, "ok", reqId))
+	request.GetConnection().SendMsg(ReqSyncAlarmFileType, core.ResultSuccess(ReqSyncAlarmFileName, "", reqId))
 }