[Tagrecorder] modify ch_resource icon_id update

run automation test(basic) pass
xiongzx · Feb 1, 2024 · 79195f4 · 79195f4
1 parent 7dbcb6b
commit 79195f4
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/server/controller/tagrecorder/ch_az.go b/server/controller/tagrecorder/ch_az.go
@@ -84,7 +84,7 @@ func (a *ChAZ) generateUpdateInfo(oldItem, newItem mysql.ChAZ) (map[string]inter
 	if oldItem.Name != newItem.Name {
 		updateInfo["name"] = newItem.Name
 	}
-	if oldItem.IconID != newItem.IconID {
+	if oldItem.IconID != newItem.IconID && newItem.IconID != 0 {
 		updateInfo["icon_id"] = newItem.IconID
 	}
 	if len(updateInfo) > 0 {

diff --git a/server/controller/tagrecorder/ch_device.go b/server/controller/tagrecorder/ch_device.go
@@ -110,7 +110,7 @@ func (d *ChDevice) generateUpdateInfo(oldItem, newItem mysql.ChDevice) (map[stri
 	if oldItem.Name != newItem.Name {
 		updateInfo["name"] = newItem.Name
 	}
-	if oldItem.IconID != newItem.IconID {
+	if oldItem.IconID != newItem.IconID && newItem.IconID != 0 {
 		updateInfo["icon_id"] = newItem.IconID
 	}
 	if oldItem.UID != newItem.UID {

diff --git a/server/controller/tagrecorder/ch_gprocess.go b/server/controller/tagrecorder/ch_gprocess.go
@@ -76,7 +76,7 @@ func (p *ChGProcess) generateUpdateInfo(oldItem, newItem mysql.ChGProcess) (map[
 	if oldItem.Name != newItem.Name {
 		updateInfo["name"] = newItem.Name
 	}
-	if oldItem.IconID != newItem.IconID {
+	if oldItem.IconID != newItem.IconID && newItem.IconID != 0 {
 		updateInfo["icon_id"] = newItem.IconID
 	}
 	if oldItem.CHostID != newItem.CHostID {

diff --git a/server/controller/tagrecorder/ch_l3_epc.go b/server/controller/tagrecorder/ch_l3_epc.go
@@ -74,7 +74,7 @@ func (v *ChVPC) generateUpdateInfo(oldItem, newItem mysql.ChVPC) (map[string]int
 	if oldItem.Name != newItem.Name {
 		updateInfo["name"] = newItem.Name
 	}
-	if oldItem.IconID != newItem.IconID {
+	if oldItem.IconID != newItem.IconID && newItem.IconID != 0 {
 		updateInfo["icon_id"] = newItem.IconID
 	}
 	if oldItem.UID != newItem.UID {

diff --git a/server/controller/tagrecorder/ch_pod.go b/server/controller/tagrecorder/ch_pod.go
@@ -97,7 +97,7 @@ func (p *ChPod) generateUpdateInfo(oldItem, newItem mysql.ChPod) (map[string]int
 	if oldItem.Name != newItem.Name {
 		updateInfo["name"] = newItem.Name
 	}
-	if oldItem.IconID != newItem.IconID {
+	if oldItem.IconID != newItem.IconID && newItem.IconID != 0 {
 		updateInfo["icon_id"] = newItem.IconID
 	}
 	if oldItem.PodClusterID != newItem.PodClusterID {

diff --git a/server/controller/tagrecorder/ch_pod_cluster.go b/server/controller/tagrecorder/ch_pod_cluster.go
@@ -72,7 +72,7 @@ func (p *ChPodCluster) generateUpdateInfo(oldItem, newItem mysql.ChPodCluster) (
 	if oldItem.Name != newItem.Name {
 		updateInfo["name"] = newItem.Name
 	}
-	if oldItem.IconID != newItem.IconID {
+	if oldItem.IconID != newItem.IconID && newItem.IconID != 0 {
 		updateInfo["icon_id"] = newItem.IconID
 	}
 	if len(updateInfo) > 0 {

diff --git a/server/controller/tagrecorder/ch_pod_group.go b/server/controller/tagrecorder/ch_pod_group.go
@@ -81,7 +81,7 @@ func (p *ChPodGroup) generateUpdateInfo(oldItem, newItem mysql.ChPodGroup) (map[
 	if oldItem.PodGroupType != newItem.PodGroupType {
 		updateInfo["pod_group_type"] = newItem.PodGroupType
 	}
-	if oldItem.IconID != newItem.IconID {
+	if oldItem.IconID != newItem.IconID && newItem.IconID != 0 {
 		updateInfo["icon_id"] = newItem.IconID
 	}
 	if oldItem.PodClusterID != newItem.PodClusterID {

diff --git a/server/controller/tagrecorder/ch_pod_node.go b/server/controller/tagrecorder/ch_pod_node.go
@@ -72,7 +72,7 @@ func (p *ChPodNode) generateUpdateInfo(oldItem, newItem mysql.ChPodNode) (map[st
 	if oldItem.Name != newItem.Name {
 		updateInfo["name"] = newItem.Name
 	}
-	if oldItem.IconID != newItem.IconID {
+	if oldItem.IconID != newItem.IconID && newItem.IconID != 0 {
 		updateInfo["icon_id"] = newItem.IconID
 	}
 	if len(updateInfo) > 0 {

diff --git a/server/controller/tagrecorder/ch_pod_ns.go b/server/controller/tagrecorder/ch_pod_ns.go
@@ -74,7 +74,7 @@ func (p *ChPodNamespace) generateUpdateInfo(oldItem, newItem mysql.ChPodNamespac
 	if oldItem.Name != newItem.Name {
 		updateInfo["name"] = newItem.Name
 	}
-	if oldItem.IconID != newItem.IconID {
+	if oldItem.IconID != newItem.IconID && newItem.IconID != 0 {
 		updateInfo["icon_id"] = newItem.IconID
 	}
 	if oldItem.PodClusterID != newItem.PodClusterID {

diff --git a/server/controller/tagrecorder/ch_region.go b/server/controller/tagrecorder/ch_region.go
@@ -124,7 +124,7 @@ func (r *ChRegion) generateUpdateInfo(oldItem, newItem mysql.ChRegion) (map[stri
 	if oldItem.Name != newItem.Name {
 		updateInfo["name"] = newItem.Name
 	}
-	if oldItem.IconID != newItem.IconID {
+	if oldItem.IconID != newItem.IconID && newItem.IconID != 0 {
 		updateInfo["icon_id"] = newItem.IconID
 	}
 	if len(updateInfo) > 0 {

diff --git a/server/controller/tagrecorder/ch_subnet.go b/server/controller/tagrecorder/ch_subnet.go
@@ -69,7 +69,7 @@ func (n *ChNetwork) generateUpdateInfo(oldItem, newItem mysql.ChNetwork) (map[st
 	if oldItem.Name != newItem.Name {
 		updateInfo["name"] = newItem.Name
 	}
-	if oldItem.IconID != newItem.IconID {
+	if oldItem.IconID != newItem.IconID && newItem.IconID != 0 {
 		updateInfo["icon_id"] = newItem.IconID
 	}
 	if len(updateInfo) > 0 {