From 5456eb00456e013e3b98229971a4df479e50a4a6 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Thu, 24 Aug 2023 22:34:50 +0800
Subject: [PATCH] cm

---
 crontask/etc/crontask.yaml |  4 ++--
 crontask/etc/tasks.yaml    |  2 +-
 crontask/gencmxml.go       | 23 ++++++++++++++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/crontask/etc/crontask.yaml b/crontask/etc/crontask.yaml
index f74185ed..e545caf8 100644
--- a/crontask/etc/crontask.yaml
+++ b/crontask/etc/crontask.yaml
@@ -8,10 +8,10 @@ logger:
   count: 10 
 
 omc:
-  name: SZOMC1
+  name: BJ_OMC01
   hosturi: http://127.0.0.1:3040
   hostno: S001
-  province: GD
+  province: BJ
   netabbr: HX
   vendor: RJ
 
diff --git a/crontask/etc/tasks.yaml b/crontask/etc/tasks.yaml
index 9d08a583..4ef08234 100644
--- a/crontask/etc/tasks.yaml
+++ b/crontask/etc/tasks.yaml
@@ -97,7 +97,7 @@ tasks:
     params: 
     interval: 1
     unit: Day
-    at: 00:00,06:00,12:00,18:00,20:43
+    at: 00:00,06:00,12:00,18:00,22:27
     do: GenCmXmlFile
   - name: Task of Generate measure threshold alarm
     status: Inactive
diff --git a/crontask/gencmxml.go b/crontask/gencmxml.go
index d9367bc9..b7253d82 100644
--- a/crontask/gencmxml.go
+++ b/crontask/gencmxml.go
@@ -60,6 +60,8 @@ func (t *TaskFunc) ReadCmYaml(cmfile string) (map[string]interface{}, error) {
 }
 
 func (t *TaskFunc) GenNFXmlFile(neType string) error {
+	log.Info("GenNFXmlFile processing...")
+
 	var nes []NeInfo
 	_, err := XormGetNeInfoByType(neType, &nes)
 	if err != nil {
@@ -118,6 +120,7 @@ func (t *TaskFunc) GenNFXmlFile(neType string) error {
 				continue
 			}
 			log.Trace("cmResult:", cmResult)
+			//dataMap := make(map[string]interface{})
 			valueMap := make(map[string]interface{})
 			if cmResult.ValueJSON != "" {
 				err = json.Unmarshal([]byte(cmResult.ValueJSON), &valueMap)
@@ -126,6 +129,17 @@ func (t *TaskFunc) GenNFXmlFile(neType string) error {
 					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)
 			rmUID := ne.RmUID
 			var object cmschema.Object
@@ -172,7 +186,14 @@ func (t *TaskFunc) GenNFXmlFile(neType string) error {
 				// 		v = fmt.Sprintf("%s", sortResult[p])
 				// 	}
 				// }
-				object.V = append(object.V, cmschema.V{IAttr: i, Value: fmt.Sprintf("%v", valueMap[p])})
+				var v string
+				if valueMap[p] == nil || valueMap[p] == "" {
+					v = "-"
+				} else {
+					v = fmt.Sprintf("%v", valueMap[p])
+				}
+
+				object.V = append(object.V, cmschema.V{IAttr: i, Value: v})
 				i++
 			}
 			//objects.FieldValue.Object = append(objects.FieldValue.Object, object)