'commit'

dsSupport/MyModel/DataStatistic/DatastatisticOpenAPI/DatastatisticOpenAPI.go

@@ -19,12 +19,13 @@ import (
 // @Failure 400 {object} MySwagger.Result
 // @Router /v1/openapi/datastatistic/ReadESDocAmount [post]
 func ReadESDocAmount(c *gin.Context) {
-	success, data := DatastatisticService.GetESDocCount()
+	success, message, count, data := DatastatisticService.GetESDocCount()
 	if success {
 		c.JSON(http.StatusOK, MySwagger.Result{
 			Success: true,
 			Fail:    false,
-			Message: "",
+			Message: message,
+			Total: count,
 			Data:    data,
 		})
 
@@ -33,7 +34,7 @@ func ReadESDocAmount(c *gin.Context) {
 		c.JSON(http.StatusOK, MySwagger.Result{
 			Success: false,
 			Fail:    true,
-			Message: "",
+			Message: message,
 		})
 
 		return

dsSupport/MyModel/DataStatistic/DatastatisticService/DatastatisticService.go

@@ -13,9 +13,10 @@ type ESDataContent struct {
 	OrgName  string `json:"org_name"`
 }
 
-func GetESDocCount() (bool, []map[string]interface{}) {
+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 {
@@ -47,11 +48,13 @@ func GetESDocCount() (bool, []map[string]interface{}) {
 			//data["system_id"] = v["app_id"]
 			//data["num"] = num
 			//datas = append(datas, data)
+			//fmt.Println("len(datas):", len(datas))
 		}
+		count = len(datas)
 	} else {
-		return false, datas
+		return false, "数据获取失败, 找不到系统", count, datas
 	}
 
-	return true, datas
+	return true, "数据获取成功", count, datas
 }