bigdata
/
dsMin
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

'commit'

Browse Source
master
wangshuai 5 years ago
parent 60e83ba7cb
commit 1d170b94c8
4 changed files with 93 additions and 9 deletions
Show Stats Download Patch File Download Diff File

43
dsSupport/MyModel/DataAccess/DataaccessService/DataaccessService.go
Unescape View File

@ -16,6 +16,18 @@ import (
"time"
)
/**
* @title GetDataaccessResults
* @Description 获取订阅集合
* @Author wangshuai
* @Date 2020-09-17
* @Param swag MySwagger.DataaccessSwag 查询条件
* @Return bool 执行结果
* @Return string 提示信息
* @Return int 订阅数量
* @Return []map[string]interface{} 订阅集合
* @Return error 错误信息
*/
func GetDataaccessResults(swag MySwagger.DataaccessSwag) (bool, string, int, []map[string]interface{}, error) {
var condition string
var conditions []string
@ -81,6 +93,16 @@ func GetDataaccessResults(swag MySwagger.DataaccessSwag) (bool, string, int, []m
return result, message, count, data, failResult
}
/**
* @title CreateDataaccess
* @Description 创建订阅
* @Author wangshuai
* @Date 2020-09-17
* @Param model models.TDataexDataaccess 订阅信息
* @Return bool 执行结果
* @Return string 提示信息
* @Return error 错误信息
*/
func CreateDataaccess(model models.TDataexDataaccess) (bool, string, error) {
if !DatasourceService.IsDatasourceExistsById(model.DatasourceId) {
return false, "DatasourceId不存在", nil
@ -111,6 +133,17 @@ func CreateDataaccess(model models.TDataexDataaccess) (bool, string, error) {
return result, message, error
}
/**
* @title UpdateDataaccess
* @Description 编辑订阅
* @Author wangshuai
* @Date 2020-09-17
* @Param id string 订阅ID
* @Param model models.TDataexDataaccess 订阅信息
* @Return bool 执行结果
* @Return string 提示信息
* @Return error 错误信息
*/
func UpdateDataaccess(id string, model models.TDataexDataaccess) (bool, string, error) {
if !DatasourceService.IsDatasourceExistsById(model.DatasourceId) {
return false, "DatasourceId不存在", nil
@ -146,6 +179,16 @@ func UpdateDataaccess(id string, model models.TDataexDataaccess) (bool, string,
return result, message, error
}
/**
* @title RemoveDataaccess
* @Description 删除订阅
* @Author wangshuai
* @Date 2020-09-17
* @Param id string 订阅ID
* @Return bool 执行结果
* @Return string 提示信息
* @Return error 错误信息
*/
func RemoveDataaccess(id string) (bool, string, error) {
business := new(models.TDataexDataaccess)

33
dsSupport/MyModel/DataSource/DatasourceService/DatasourceService.go
Unescape View File

@ -17,12 +17,25 @@ import (
"time"
)
// ESDataContent DataContent,定义了DataContent结构信息
type ESDataContent struct {
Address string `json:"address"`
AreaCode string `json:"area_code"`
OrgName string `json:"org_name"`
Address string `json:"address"` // 地址
AreaCode string `json:"area_code"` // 区域码
OrgName string `json:"org_name"` // 机构名称
}
/**
* @title GetDatasourceResults
* @Description 获取数据源集合
* @Author wangshuai
* @Date 2020-09-17
* @Param swag MySwagger.DatasourceSwag 查询条件
* @Return bool 执行结果
* @Return string 提示信息
* @Return int 数据源数量
* @Return []map[string]interface{} 数据源集合
* @Return error 错误信息
*/
func GetDatasourceResults(swag MySwagger.DatasourceSwag) (bool, string, int, []map[string]interface{}, error) {
var condition string
var conditions []string
@ -87,6 +100,16 @@ func GetDatasourceResults(swag MySwagger.DatasourceSwag) (bool, string, int, []m
return result, message, count, data, failResult
}
/**
* @title CreateDatasource
* @Description 创建数据源
* @Author wangshuai
* @Date 2020-09-17
* @Param model models.TDataexDatasource 数据源信息
* @Return bool 执行结果
* @Return string 提示信息
* @Return error 错误信息
*/
func CreateDatasource(model models.TDataexDatasource) (bool, string, error) {
_, e := AccessSystemDao.GetApp(model.SystemId)
if e != nil {
@ -180,7 +203,7 @@ func GetESDoc(datasourceCode string, dataId string) (bool, string, map[string]in
}
func ReadESDoc(datasourceCode string, orgIDs []string, page int, begin string, conditions map[string]interface{}, sort map[string]interface{}) (bool, string, int, []map[string]interface{}) {
count, _ := ES7Util.GetDocCount(datasourceCode, "", nil)
count, _ := ES7Util.GetDocCount(datasourceCode, begin, conditions)
fmt.Println(count)
result, message, esdata := ES7Util.SearchDocPage(datasourceCode, orgIDs, page, begin, conditions, sort)
var query = "AND datasource_code='" + datasourceCode + "'"
@ -196,7 +219,7 @@ func ReadESDoc(datasourceCode string, orgIDs []string, page int, begin string, c
for _, value := range esdata {
j, _ := json.Marshal(value)
json.Unmarshal(j, &esData)
esData = make(map[string]interface{})
//esData = make(map[string]interface{})
esData["datasource_name"] = datasourceName
esDatas = append(esDatas, esData)
}

21
dsSupport/MyModel/DataStatistic/DatastatisticService/DatastatisticService.go
Unescape View File

@ -8,29 +8,44 @@ import (
"fmt"
)
// ESDataContent DataContent,定义了DataContent结构信息
type ESDataContent struct {
Address string `json:"address"`
AreaCode string `json:"area_code"`
OrgName string `json:"org_name"`
Address string `json:"address"` // 地址
AreaCode string `json:"area_code"` // 区域码
OrgName string `json:"org_name"` // 机构名称
}
/**
* @title GetESDocCount
* @Description 获取ES文档数量
* @Author wangshuai
* @Date 2020-09-17
* @Return bool 执行结果
* @Return string 提示信息
* @Return int ES文档数量
* @Return []map[string]interface{} ES文档集合
*/
func GetESDocCount() (bool, string, int, []map[string]interface{}) {
var datas []map[string]interface{}
var data map[string]interface{}
var count int
// 获取接入系统集合
linksystems, c, _ := AccessSystemDao.ListApp("", 1, 1000)
if c > 0 {
for _, v := range linksystems {
var num int = 0
var sw MySwagger.DatasourceSwag
sw.SystemId = v["app_code"].(string)
// 获取接入系统关联数据源
rr, _, _, datasources, _ := DatasourceService.GetDatasourceResults(sw)
if rr == true {
for _, vv := range datasources {
fmt.Println(vv["datasource_code"])
// 获取ES文档数量
result, _ := ES7Util.GetDocCount(vv["datasource_code"].(string), "", nil)
num += result
// 获取ES最新文档
_, _, esdata := ES7Util.GetLatestDoc(vv["datasource_code"].(string))
data = make(map[string]interface{})

5
dsSupport/Utils/ES7Util/ES7Util.go
Unescape View File

@ -633,6 +633,10 @@ func SearchDocPage(indexName string,orgIDs []string,page int,begin string, condi
query.Filter(term)
}
if page > 0 {
page = page - 1
}
if begin!=""{
term3 := elastic.NewRangeQuery("begin_time").Gte(begin)
query.Filter(term3)
@ -654,7 +658,6 @@ func SearchDocPage(indexName string,orgIDs []string,page int,begin string, condi
}
result,err:=ES7Client.Search().Index(indexName).Query(query).From(page * 100).Size(100).Sort(field, ascending).Do(CTX)
if err == nil{
var ttyp DataEX.ESData
for _, item := range result.Each(reflect.TypeOf(ttyp)) {

Write Preview
Loading…
Cancel
Save