From 4ebefae262c4d8c413a036bb14b24b199547c593 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 25 Aug 2023 10:42:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handle/api/req_sync_alarm_file.go | 40 ++++++++++++-------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/handle/api/req_sync_alarm_file.go b/handle/api/req_sync_alarm_file.go
index 740c388..9cfea8c 100644
--- a/handle/api/req_sync_alarm_file.go
+++ b/handle/api/req_sync_alarm_file.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"fmt"
+	"omc/conf"
 	"omc/core"
 	"omc/core/manage"
 	"omc/core/parse"
@@ -76,48 +77,37 @@ func (s *ReqSyncAlarmFile) Handle(request ziface.IRequest) {
 	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 := utils.FileName(&utils.FileNameMeta{
+			FTPRoot:    conf.OmcConf.FTPRoot,
+			Province:   m.Province,
+			DeviceCode: m.DeviceCode,
+			ReqId:      reqId,
+			Suffix:     ".txt",
+		})
 
-		fileNmae := "/opt/omc/ftp/output.txt"
-		zipFfileNmae := "/opt/omc/ftp/output.txt.zip"
-
-		err := utils.CreateFile(fileNmae, data)
+		// 打压缩
+		zipFfileNmae, err := utils.FileToCompress(fileNmae, data, true)
 		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)
+			zlog.Ins().ErrorF("ReqSyncAlarmFileResult FileToCompress %v", err)
 			request.GetConnection().SendMsg(ReqSyncAlarmFileResultType, core.Result(ReqSyncAlarmFileResultName, map[string]string{
 				"reqId":    reqId,
 				"result":   "fail",
 				"resDesc":  err.Error(),
 				"fileName": "",
 			}))
+			return
 		}
 
 		//发送文件同步信息
 		request.GetConnection().SendMsg(ReqSyncAlarmFileResultType, core.Result(ReqSyncAlarmFileResultName, map[string]string{
 			"reqId":    reqId,
 			"result":   "succ",
-			"resDesc":  "ok",
+			"resDesc":  "null",
 			"fileName": zipFfileNmae,
 		}))
 		return
 	}
 
-	request.GetConnection().SendMsg(ReqSyncAlarmFileType, core.ResultSuccess(ReqSyncAlarmFileName, "", reqId))
+	request.GetConnection().SendMsg(ReqSyncAlarmFileType, core.ResultSuccess(ReqSyncAlarmFileName, "null", reqId))
 }