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)) }