From 63645d248c765244488cd34dbc1bb6528ca6b7c7 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 05 九月 2023 09:58:13 +0800
Subject: [PATCH] 修复编译
---
system-service/service/resourceConfigService.go | 258 +++++++++++++++++++++++++-------------------------
1 files changed, 129 insertions(+), 129 deletions(-)
diff --git a/system-service/service/resourceConfigService.go b/system-service/service/resourceConfigService.go
index e1894e8..11559e2 100644
--- a/system-service/service/resourceConfigService.go
+++ b/system-service/service/resourceConfigService.go
@@ -1,129 +1,129 @@
-package service
-
-import (
- "basic.com/pubsub/protomsg.git"
- "basic.com/valib/bhomeclient.git"
- "basic.com/valib/bhomedbapi.git"
- "encoding/json"
- "time"
- "vamicro/config"
- "vamicro/extend/util"
- "vamicro/system-service/models"
-)
-
-type ResourceConfigService struct {
-
-}
-
-func WatchEsAndWeedfsIp(bk bhomeclient.Broker) {
- for {
- initEsAndWeedfsIp(bk)
-
- InitAppPermissions()
-
- time.Sleep(3 * time.Second)
- }
-}
-
-func initEsAndWeedfsIp(bk bhomeclient.Broker) {
- devTyp := GetDevType(config.Server.DeviceType)
- bp := false
- if devTyp == DevType_Analysis { //鍙仛鍒嗘瀽(鐩掑瓙),鐩掑瓙蹇呴』鍔犲叆闆嗙兢鎵嶈兘姝ｅ父宸ヤ綔
- var clusterE models.Cluster
- clusters, err := clusterE.FindAll()
- if err ==nil && clusters !=nil && len(clusters) >0 {
- c := clusters[0]
- var nodeE models.Node
- nodes, e := nodeE.FindNodesByClusterId(c.ClusterId)
- if e == nil && nodes !=nil && len(nodes) >0 {
- var ipArr []string
- for _,n :=range nodes {
- if !n.IsDelete {
- typ := GetDevType(n.DeviceType)
- if typ == DevType_Storage || typ == DevType_Analysis_Storage {
- if ip,b := util.IpCheck(n.NodeIp);b {
- ipArr = append(ipArr, ip)
- }
- }
- }
- }
- if len(ipArr) > 0 {
- var localConf models.LocalConfig
- err := localConf.Select()
- if err == nil {
- found := false
- for _,ipStr := range ipArr {
- if ipStr == localConf.AlarmIp {
- found = true
- break
- }
- }
- if !found { //褰撳墠璁剧疆鐨刬p涓嶅彲鐢紝璁剧疆涓�涓柊鐨刬p
- localConf.AlarmIp = ipArr[0]
- localConf.WebPicIp = ipArr[0]
- localConf.Update()
- bp = true
- }
- }
- }
- }
- }
-
- } else if devTyp == DevType_Storage || devTyp == DevType_Analysis_Storage { //鍒嗘瀽甯﹀瓨鍌ㄦ垨鑰呭彧瀛樺偍锛屽彇鏈満鍗冲彲
- localIp, _, _ := util.GetLocalIP(config.Server.NetworkAdapter)
- if localIp != "" {
- var localConf models.LocalConfig
- err := localConf.Select()
- if err == nil {
- if localConf.AlarmIp != localIp || localConf.WebPicIp != localIp {
- localConf.AlarmIp = localIp
- localConf.WebPicIp = localIp
- localConf.Update()
- bp = true
- }
- }
- }
- }
- if bp {
- pMsg := protomsg.DbChangeMessage{
- Table:protomsg.TableChanged_T_Server,
- Action:protomsg.DbAction_Update,
- }
- pb, _ := json.Marshal(pMsg)
- bk.Publish(ProcName, pb)
- }
-}
-
-func (rcs *ResourceConfigService) Save(reqBody models.ResourceConfig) bool {
- b := false
- if reqBody.IpType == models.IpType_Local {
- localIp, _, _ := util.GetLocalIP(config.Server.NetworkAdapter)
- if localIp != reqBody.ServiceIp {
- reqBody.ServiceIp = localIp
- }
- }
-
- var tmpConfig models.ResourceConfig
- err := tmpConfig.Select()
- if err == nil {
- if reqBody.Update() {
- b = true
- }
- } else {
- if reqBody.Insert() {
- b = true
- }
- }
- if b {
- gbIp := reqBody.ServiceIp //瑕佷箞鏄湰鏈篿p锛岃涔堟槸婕傜Щip
- if gbIp != "" {
- //鍒ゆ柇鏄惁闇�瑕佸埛鏂板浗鏍囷紝鏉′欢鍥芥爣鏈嶅姟ip鏈夊彉鍖�
- var gbApi bhomedbapi.Gb28181Api
- flag, gbConfig := gbApi.Show()
- if flag {
- gbApi.Gb28181TreeRefresh(gbConfig.Id)
- }
- }
- }
- return b
-}
+package service
+
+import (
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/bhomeclient.git"
+ "basic.com/valib/bhomedbapi.git"
+ "encoding/json"
+ "time"
+ "vamicro/config"
+ "vamicro/extend/util"
+ "vamicro/system-service/models"
+)
+
+type ResourceConfigService struct {
+
+}
+
+func WatchEsAndWeedfsIp(bk bhomeclient.Broker) {
+ for {
+ initEsAndWeedfsIp(bk)
+
+ InitAppPermissions()
+
+ time.Sleep(3 * time.Second)
+ }
+}
+
+func initEsAndWeedfsIp(bk bhomeclient.Broker) {
+ devTyp := GetDevType(config.Server.DeviceType)
+ bp := false
+ if devTyp == DevType_Analysis { //鍙仛鍒嗘瀽(鐩掑瓙),鐩掑瓙蹇呴』鍔犲叆闆嗙兢鎵嶈兘姝ｅ父宸ヤ綔
+ var clusterE models.Cluster
+ clusters, err := clusterE.FindAll()
+ if err ==nil && clusters !=nil && len(clusters) >0 {
+ c := clusters[0]
+ var nodeE models.Node
+ nodes, e := nodeE.FindNodesByClusterId(c.ClusterId)
+ if e == nil && nodes !=nil && len(nodes) >0 {
+ var ipArr []string
+ for _,n :=range nodes {
+ if !n.IsDelete {
+ typ := GetDevType(n.DeviceType)
+ if typ == DevType_Storage || typ == DevType_Analysis_Storage {
+ if ip,b := util.IpCheck(n.NodeIp);b {
+ ipArr = append(ipArr, ip)
+ }
+ }
+ }
+ }
+ if len(ipArr) > 0 {
+ var localConf models.LocalConfig
+ err := localConf.Select()
+ if err == nil {
+ found := false
+ for _,ipStr := range ipArr {
+ if ipStr == localConf.AlarmIp {
+ found = true
+ break
+ }
+ }
+ if !found { //褰撳墠璁剧疆鐨刬p涓嶅彲鐢紝璁剧疆涓�涓柊鐨刬p
+ localConf.AlarmIp = ipArr[0]
+ localConf.WebPicIp = ipArr[0]
+ localConf.Update()
+ bp = true
+ }
+ }
+ }
+ }
+ }
+
+ } else if devTyp == DevType_Storage || devTyp == DevType_Analysis_Storage { //鍒嗘瀽甯﹀瓨鍌ㄦ垨鑰呭彧瀛樺偍锛屽彇鏈満鍗冲彲
+ localIp, _, _ := util.GetLocalIP(config.Server.NetworkAdapter)
+ if localIp != "" {
+ var localConf models.LocalConfig
+ err := localConf.Select()
+ if err == nil {
+ if localConf.AlarmIp != localIp || localConf.WebPicIp != localIp {
+ localConf.AlarmIp = localIp
+ localConf.WebPicIp = localIp
+ localConf.Update()
+ bp = true
+ }
+ }
+ }
+ }
+ if bp {
+ pMsg := protomsg.DbChangeMessage{
+ Table:protomsg.TableChanged_T_Server,
+ Action:protomsg.DbAction_Update,
+ }
+ pb, _ := json.Marshal(pMsg)
+ bk.Publish(ProcName, pb)
+ }
+}
+
+func (rcs *ResourceConfigService) Save(reqBody models.ResourceConfig) bool {
+ b := false
+ if reqBody.IpType == models.IpType_Local {
+ localIp, _, _ := util.GetLocalIP(config.Server.NetworkAdapter)
+ if localIp != reqBody.ServiceIp {
+ reqBody.ServiceIp = localIp
+ }
+ }
+
+ var tmpConfig models.ResourceConfig
+ err := tmpConfig.Select()
+ if err == nil {
+ if reqBody.Update() {
+ b = true
+ }
+ } else {
+ if reqBody.Insert() {
+ b = true
+ }
+ }
+ if b {
+ gbIp := reqBody.ServiceIp //瑕佷箞鏄湰鏈篿p锛岃涔堟槸婕傜Щip
+ if gbIp != "" {
+ //鍒ゆ柇鏄惁闇�瑕佸埛鏂板浗鏍囷紝鏉′欢鍥芥爣鏈嶅姟ip鏈夊彉鍖�
+ var gbApi bhomedbapi.Gb28181Api
+ flag, gbConfig := gbApi.Show()
+ if flag {
+ gbApi.Gb28181TreeRefresh(gbConfig.Id)
+ }
+ }
+ }
+ return b
+}
--
Gitblit v1.8.0