OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

cm

Browse Source
This commit is contained in:
simonzhangsz
2023-08-24 23:21:15 +08:00
parent 40705d8309
commit 07804d627b
2 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
crontask/gencmxml.go
View File

@@ -129,16 +129,6 @@ func (t *TaskFunc) GenNFXmlFile(neType string) error {
continue continue
} }
} }
// for _, valueMaps := range dataMap {
// if len(valueMaps.([]map[string]interface{})) > 0 {
// valueMap = valueMaps.([]map[string]interface{})[0]
// // err = json.Unmarshal([]byte(valueMaps.([]map[string]interface{})[0]), &valueMap)
// // if err != nil {
// // log.Error("Failed to json.Unmarshal:", err)
// // continue
// // }
// }
// }
log.Trace("valueMap:", valueMap) log.Trace("valueMap:", valueMap)
rmUID := ne.RmUID rmUID := ne.RmUID
@@ -161,31 +151,6 @@ func (t *TaskFunc) GenNFXmlFile(neType string) error {
//objects.FieldName.N = append(objects.FieldName.N, cmschema.N{IAttr: i, Value: p}) //objects.FieldName.N = append(objects.FieldName.N, cmschema.N{IAttr: i, Value: p})
objectData.FieldName.N = append(objectData.FieldName.N, cmschema.N{IAttr: i, Value: p}) objectData.FieldName.N = append(objectData.FieldName.N, cmschema.N{IAttr: i, Value: p})
} }
// var v string
// switch p {
// case "Id":
// v = ne.RmUID
// case "UserLabel":
// v = ne.NeName
// case "VendorName":
// v = ne.VendorName
// case "SwVersion":
// v = cmResult.CmVersion
// case "PatchInfo":
// v = "-"
// case "AdministrativeState":
// v = AdminStateUnlocked
// case "OperationalState":
// v = OperationStateEnabled
// case "VnfInstanceId":
// v = "" //vnfInstanceID
// default:
// if sortResult[p] == "" {
// v = "-"
// } else {
// v = fmt.Sprintf("%s", sortResult[p])
// }
// }
var v string var v string
if valueMap[p] == nil || valueMap[p] == "" { if valueMap[p] == nil || valueMap[p] == "" {
v = "-" v = "-"
@@ -213,17 +178,22 @@ func (t *TaskFunc) GenNFXmlFile(neType string) error {
log.Error("Failed to WriteFile xml file:", err) log.Error("Failed to WriteFile xml file:", err)
continue continue
} }
// err := os.Create(tmpXmlfile)
// if err != nil {
// log.Error("Failed to WriteFile xml file:", err)
// continue
// }
err = os.Rename(tmpXmlfile, xmlfile) err = os.Rename(tmpXmlfile, xmlfile)
if err != nil { if err != nil {
log.Error("Failed to Rename xml file:", err) log.Error("Failed to Rename xml file:", err)
continue continue
} }
zipFile := xmlfile + ".zip"
err = global.ZipOneFile(xmlfile, zipFile, false)
if err != nil {
log.Error("Failed to ZipOneFile:", err)
continue
}
err = os.Remove(xmlfile)
if err != nil {
log.Error("Failed to delete file:", err)
continue
}
} }
return nil return nil

39
lib/global/kits.go
View File

@@ -1,6 +1,7 @@
package global package global
import ( import (
"archive/zip"
"bytes" "bytes"
"crypto/md5" "crypto/md5"
"encoding/hex" "encoding/hex"
@@ -477,3 +478,41 @@ func ToMap(in interface{}, tagName string) (map[string]interface{}, error) {
} }
return out, nil return out, nil
} }
func ZipOneFile(srcFile, dstZip string, pathFlag bool) error {
zipFile, err := os.Create(dstZip)
if err != nil {
return err
}
defer zipFile.Close()
zipWriter := zip.NewWriter(zipFile)
defer zipWriter.Close()
fileToCompress, err := os.Open(srcFile)
if err != nil {
return err
}
defer fileToCompress.Close()
var fileInZip io.Writer
if pathFlag {
fileInZip, err = zipWriter.Create(srcFile)
if err != nil {
return err
}
} else {
// 获取文件的基本名称
fileName := filepath.Base(fileToCompress.Name())
fileInZip, err = zipWriter.Create(fileName)
if err != nil {
return err
}
}
_, err = io.Copy(fileInZip, fileToCompress)
if err != nil {
return err
}
return nil
}