'commit'

dsSupport/MyModel/DataSource/DatasourceDAO/DatasourceDAO.go

@@ -18,17 +18,12 @@ func GetDatasourceResults(query MySwagger.DatasourceQuery) (bool, string, int, [
 	//接收传入参数
 	var limit = 100
 	var offset = (query.Page - 1) * limit
-	//var orderby = "create_time DESC"
-	// 排序查询语句
-	//orderBySql := fmt.Sprintf("%s", " order by ? ")
 	//条件查询语句
 	conditionSql := fmt.Sprintf("%s", " limit ? offset ? ")
 	//分页的语句
 	pageSql := fmt.Sprintf("%s %s", sql, conditionSql)
-	fmt.Println(pageSql)
 	//分页数据当前页现存条数
 	count, _ := DbUtil.Engine.SQL(pageSql, limit, offset).Query().Count()
-	fmt.Println(count)
 	if count > 0 {
 		//分页数据
 		list, err := DbUtil.Engine.SQL(pageSql, limit, offset).Query().List()

dsSupport/MyModel/DataStatistic/DatastatisticService/DatastatisticService.go

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package DatastatisticService
 
 import (
@@ -57,3 +58,61 @@ func GetESDocCount() (bool, []map[string]interface{}) {
 
 	return true, datas
 }
+=======
+package DatastatisticService
+
+import (
+	"dsSupport/MyModel/AccessSystem/AccessSystemDao"
+	"dsSupport/MyModel/DataSource/DatasourceService"
+	"dsSupport/MyModel/MySwagger"
+	"dsSupport/Utils/ES7Util"
+)
+
+type ESDataContent struct {
+	Address  string `json:"address"`
+	AreaCode string `json:"area_code"`
+	OrgName  string `json:"org_name"`
+}
+
+func GetESDocCount() (bool, []map[string]interface{}) {
+	var datas []map[string]interface{}
+	var data map[string]interface{}
+
+	linksystems, c, _ := AccessSystemDao.ListApp("", 1, 1000)
+	if c > 0 {
+		for _, v := range linksystems {
+			var num int64 = 0
+			var sw MySwagger.DatasourceSwag
+			sw.SystemId = v["app_id"].(string)
+			rr, _, _, datasources, _ := DatasourceService.GetDatasourceResults(sw)
+			if rr == true {
+				for _, vv := range datasources {
+					result, _ := ES7Util.GetDocCount(vv["datasource_code"].(string))
+					num += result
+					_, _, esdata := ES7Util.GetLatestDoc(vv["datasource_code"].(string))
+
+					data = make(map[string]interface{})
+					data["system_name"] = v["app_name"]
+					data["system_id"] = v["app_id"]
+					data["datasource_code"] = vv["datasource_code"]
+					data["datasource_name"] = vv["datasource_name"]
+					data["datasource_id"] = vv["id"]
+					data["storage_time"] = esdata.BeginTime
+					data["num"] = result
+					datas = append(datas, data)
+				}
+			}
+
+			//data = make(map[string]interface{})
+			//data["system_name"] = v["app_name"]
+			//data["system_id"] = v["app_id"]
+			//data["num"] = num
+			//datas = append(datas, data)
+		}
+	} else {
+		return false, datas
+	}
+
+	return true, datas
+}
+>>>>>>> ed13a56a674e22558c9fde7fef8d8bd7df80d00b

dsSupport/MyModel/MetaData/MetadataDAO/MetadataDAO.go

@@ -2,7 +2,6 @@ package MetadataDAO
 
 import (
 	"dsSupport/MyModel/MySwagger"
-	"dsSupport/Utils/CacheUtil"
 	"dsSupport/Utils/DbUtil"
 	"dsSupport/Utils/ErrorConst"
 	"dsSupport/Utils/LogUtil"
@@ -13,20 +12,6 @@ import (
 //数据库
 var db = DbUtil.Engine
 
-func GetMetadataRow(where string) (bool, string, map[string]interface{}, error) {
-	sql := "SELECT id FROM t_dataex_metadata WHERE " + where
-	fmt.Println("sql = ", sql)
-
-	//通过SQL获取带缓存的数据
-	list, count, _ := CacheUtil.Page(sql, 1, 0)
-
-	if count > 0 {
-		return true, "数据获取成功", list[0], nil
-	} else {
-		return false, "数据获取失败，systemID对应的数据源类型不存在", nil, nil
-	}
-}
-
 func GetMetadataResults(query MySwagger.MetadataQuery) (bool, string, int, []map[string]interface{}, error) {
 	sql := "SELECT * FROM t_dataex_metadata WHERE 1 = 1" + query.Conditions + " ORDER BY create_time DESC, change_time DESC"
 	//接收传入参数

dsSupport/MyModel/MySwagger/Jyt2012Swag.go

@@ -45,7 +45,7 @@ import "time"
 type Jyt2012Swag struct {
 	Id         string    `json:"id" xorm:"not null pk comment('ID') VARCHAR(36)" example:"F38BD0DB-0142-4356-8F2B-623813FC2578"`
 	DicName    string    `json:"dic_name" xorm:"not null comment('字典/字典项名称') VARCHAR(100)" example:"sex"`
-	DicValue   string    `json:"dic_name" xorm:"not null comment('字典/字典项值') VARCHAR(100)" example:"10"`
+	DicValue   string    `json:"dic_value" xorm:"not null comment('字典/字典项值') VARCHAR(100)" example:"10"`
 	DicType    int       `json:"dic_type" xorm:"not null default 1 comment('字典类型【1：国标数据、关联数据源，2：国标字典、关联元数据】') INT(11)" example:"1"`
 	DicInfo    string    `json:"dic_info" xorm:"default ''NULL'' comment('字典项说明') VARCHAR(500)" example:"我是字典项说明"`
 	RootFlag   int       `json:"root_flag" xorm:"not null default -1 comment('是否是字典【1：是，-1：否】') INT(11)" example:"1"`