From d37076e765284f1cf8d4db7b9b34913ef07d9d34 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 19 九月 2019 20:37:37 +0800
Subject: [PATCH] get ServerId from cache

---
 controllers/dbtablesCon.go            |    4 +-
 controllers/fileController.go         |    4 +-
 controllers/capture.go                |    7 +--
 controllers/monitoring.go             |    7 +--
 controllers/es.go                     |    7 +--
 service/EnableStatusControlService.go |   10 ++---
 controllers/esSearch.go               |    9 ++--
 controllers/tasklist.go               |    2 
 controllers/initForData.go            |   14 ++----
 service/CameraVideoService.go         |    2 
 controllers/dbtableperson.go          |    2 
 controllers/taglist.go                |    2 
 12 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/controllers/capture.go b/controllers/capture.go
index 962a333..f263e1b 100644
--- a/controllers/capture.go
+++ b/controllers/capture.go
@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"basic.com/dbapi.git"
 	"basic.com/valib/logger.git"
 	"fmt"
 	"github.com/gin-gonic/gin"
@@ -42,7 +41,7 @@
 	}
 	//璇锋眰澶�
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		util.ResponseFormat(c,code.ComError,"es config err")
 		return
@@ -50,9 +49,7 @@
 	url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
 		"/" + index + "/_search"
 
-	var setApi dbapi.SysSetApi
-	_, sysconf := setApi.GetServerInfo()
-	analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}},"
+	analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}},"
 
 	prama := "{\"query\":{\"bool\":{\"filter\":[" +
 		cameraIdStr +
diff --git a/controllers/dbtableperson.go b/controllers/dbtableperson.go
index ac89321..0f7ea9b 100644
--- a/controllers/dbtableperson.go
+++ b/controllers/dbtableperson.go
@@ -313,7 +313,7 @@
 
 func UpdateDbPersonsOfDbTable(id string) (message string) {
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		return "淇敼澶辫触"
 	}
diff --git a/controllers/dbtablesCon.go b/controllers/dbtablesCon.go
index 1865c9e..9d0d09a 100644
--- a/controllers/dbtablesCon.go
+++ b/controllers/dbtablesCon.go
@@ -43,7 +43,7 @@
 // 渚濇嵁搴曞簱id  鏌ヨ鏁版嵁
 func QueryDbTableInfo(tableId string) map[string]interface{} {
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		return nil
 	}
@@ -177,7 +177,7 @@
 func UpdateEndTime(id string) (flag bool) {
 	flag = false
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		return false
 	}
diff --git a/controllers/es.go b/controllers/es.go
index a2c591b..d566366 100644
--- a/controllers/es.go
+++ b/controllers/es.go
@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"basic.com/dbapi.git"
 	"basic.com/valib/logger.git"
 	"fmt"
 	"github.com/gin-gonic/gin"
@@ -106,16 +105,14 @@
 	//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
 	//璇锋眰澶�
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		return nil
 	}
 	url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
 		"/" + index + "/_search?search_type=dfs_query_then_fetch"
 
-	var setApi dbapi.SysSetApi
-	_, sysconf := setApi.GetServerInfo()
-	analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}},"
+	analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}},"
 
 	//璇锋眰浣�
 	prama := "{\"from\":\"" + esFrom + "\",\"size\":\"" + esSize + "\"," +
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 33a6bca..feeb04c 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -142,15 +142,14 @@
 	//浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉
 	//璇锋眰澶�
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		return nil
 	}
 	url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
 		"/" + index + "/_search?search_type=dfs_query_then_fetch"
-	var setApi dbapi.SysSetApi
-	_, sysconf := setApi.GetServerInfo()
-	analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}},"
+
+	analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}},"
 
 	//璇锋眰浣�
 	prama := "{\"from\":\"" + from + "\"," +
@@ -203,7 +202,7 @@
 
 func GetLinkInfo(linkId string, id string) []map[string]interface{} {
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		return nil
 	}
diff --git a/controllers/fileController.go b/controllers/fileController.go
index fab536f..1f6a6c3 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -275,7 +275,7 @@
 	}
 	if len(captureIds) >0 {
 		localConf, err2 := cache.GetServerInfo()
-		if err2 !=nil || localConf.AlarmIp == "" {
+		if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 			logger.Debug("localConfig is wrong!!!")
 			return nil
 		}
@@ -355,7 +355,7 @@
 	var faceB []byte
 	if searchBody.CaptureId != "" {//鍋氭煡鎵炬浜�,鎼滄墍鏈夋姄鎷嶅拰搴曞簱
 		localConf, err2 := cache.GetServerInfo()
-		if err2 !=nil || localConf.AlarmIp == "" {
+		if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 			logger.Debug("localConfig is wrong!!!")
 			util.ResponseFormat(c,code.ComError,"localConf wrong")
 			return
diff --git a/controllers/initForData.go b/controllers/initForData.go
index 8d595d9..2dcb218 100644
--- a/controllers/initForData.go
+++ b/controllers/initForData.go
@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"basic.com/dbapi.git"
 	"basic.com/valib/logger.git"
 	"fmt"
 	"github.com/gin-gonic/gin"
@@ -33,7 +32,7 @@
 	c.BindJSON(&searchBody)
 	index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		util.ResponseFormat(c,code.ComError,"localConf wrong")
 		return
@@ -49,9 +48,7 @@
 		}
 	}
 
-	var setApi dbapi.SysSetApi
-	_, sysconf := setApi.GetServerInfo()
-	analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}}"
+	analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}}"
 
 	prama := "{\"query\":{\"bool\":{\"filter\":[{\"term\":{\"isAlarm\":\"1\"}}," +
 		cameraIdStr +
@@ -98,16 +95,15 @@
 	}
 	//璇锋眰澶�
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		util.ResponseFormat(c,code.ComError,"localConf wrong")
 		return
 	}
 	url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
 		"/" + index + "/_search"
-	var setApi dbapi.SysSetApi
-	_, sysconf := setApi.GetServerInfo()
-	analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}}"
+
+	analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}}"
 
 	prama := "{\"query\":{\"bool\":{\"filter\":[" +
 		cameraIdStr +
diff --git a/controllers/monitoring.go b/controllers/monitoring.go
index 70414ea..8586698 100644
--- a/controllers/monitoring.go
+++ b/controllers/monitoring.go
@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"basic.com/dbapi.git"
 	"basic.com/valib/logger.git"
 	"fmt"
 	"strconv"
@@ -45,7 +44,7 @@
 	}
 	//璇锋眰澶�
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		util.ResponseFormat(c,code.ComError,"localConf wrong")
 		return
@@ -53,9 +52,7 @@
 	url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
 		"/" + index + "/_search"
 
-	var setApi dbapi.SysSetApi
-	_, sysconf := setApi.GetServerInfo()
-	analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}},"
+	analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}},"
 
 	prama := "{\"query\":{\"bool\":{\"filter\":[" +
 		cameraIdStr +
diff --git a/controllers/taglist.go b/controllers/taglist.go
index beb54e6..cd863a3 100644
--- a/controllers/taglist.go
+++ b/controllers/taglist.go
@@ -54,7 +54,7 @@
 func GetTotalFromDb(id string) (flag bool) {
 	flag = false
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		return false
 	}
diff --git a/controllers/tasklist.go b/controllers/tasklist.go
index e6e9e64..c616f1c 100644
--- a/controllers/tasklist.go
+++ b/controllers/tasklist.go
@@ -24,7 +24,7 @@
 // @Router /data/api-v/es/tagList [POST]
 func (sc *EsSearchController) PostEsTaskList(c *gin.Context) {
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		util.ResponseFormat(c,code.ComError,"localConf wrong")
 		return
diff --git a/service/CameraVideoService.go b/service/CameraVideoService.go
index 2725d03..8a158f2 100644
--- a/service/CameraVideoService.go
+++ b/service/CameraVideoService.go
@@ -14,7 +14,7 @@
 // 鍦板簱浜哄憳鏁版嵁 涓� 姣斿鍋氬噯澶�
 func QueryDbPersonsForCompare(reqBody models.EsSearch) map[string]interface{} {
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		return nil
 	}
diff --git a/service/EnableStatusControlService.go b/service/EnableStatusControlService.go
index 045f9b9..a0439b1 100644
--- a/service/EnableStatusControlService.go
+++ b/service/EnableStatusControlService.go
@@ -1,7 +1,6 @@
 package service
 
 import (
-	"basic.com/dbapi.git"
 	"basic.com/valib/logger.git"
 	"encoding/json"
 	"fmt"
@@ -15,14 +14,13 @@
 
 func GetVerificationData() []map[string]interface{} {
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		return nil
 	}
 	url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
 		"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/_search"
-	var setApi dbapi.SysSetApi
-	_, sysconf := setApi.GetServerInfo()
+
 	jsonDSL := `{
 	"query": {
 		"bool": {
@@ -33,7 +31,7 @@
 				},
 				{
 					"terms": {
-						"analyServerId": ["` + sysconf.ServerId + `",""]
+						"analyServerId": ["` + localConf.ServerId + `",""]
 					}
 				}
 			]
@@ -90,7 +88,7 @@
 	}
 	enable := strconv.Itoa(status)
 	localConf, err2 := cache.GetServerInfo()
-	if err2 !=nil || localConf.AlarmIp == "" {
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
 		logger.Debug("localConfig is wrong!!!")
 		return "localConf wrong"
 	}

--
Gitblit v1.8.0