Browse Source

总数处理

WH01243 1 year ago
parent
commit
428dae6b0d
2 changed files with 10 additions and 5 deletions
  1. 5 1
      api/internal/logic/sqlmanagelogic.go
  2. 5 4
      api/internal/service/sqlService.go

+ 5 - 1
api/internal/logic/sqlmanagelogic.go

@@ -28,6 +28,10 @@ func (l *SqlManageLogic) SqlManage(req *types.SqlManageReq) (resp *types.Reply,
 	// todo: add your logic here and delete this line
 	resp = &types.Reply{}
 	sqlService := &service.SqlService{}
-	resp.Data = sqlService.SqlManage(req)
+	data, count := sqlService.SqlManage(req)
+	resp.Data = map[string]interface{}{
+		"data":  data,
+		"count": count,
+	}
 	return
 }

+ 5 - 4
api/internal/service/sqlService.go

@@ -12,25 +12,26 @@ import (
 type SqlService struct {
 }
 
-func (l SqlService) SqlManage(in *types.SqlManageReq) *[]map[string]interface{} {
+func (l SqlService) SqlManage(in *types.SqlManageReq) (*[]map[string]interface{}, int64) {
 	sqlData := MC.BaseMysql.FindOne("sql_manage", map[string]interface{}{
 		"id": common.Int64All(in.Id),
 	}, "", "")
 	if sqlData == nil || len(*sqlData) == 0 {
-		return &[]map[string]interface{}{}
+		return &[]map[string]interface{}{}, 0
 	}
 	dbType := (*sqlData)["db_type"]
 	rs := &[]map[string]interface{}{}
+	count := int64(0)
 	switch dbType {
 	case "es":
-		rs = elastic.Get(common.InterfaceToStr((*sqlData)["db_name"]), common.InterfaceToStr((*sqlData)["db_name"]), Sqlformat(common.InterfaceToStr((*sqlData)["content"]), *in))
+		count, rs = elastic.GetWithCount(common.InterfaceToStr((*sqlData)["db_name"]), common.InterfaceToStr((*sqlData)["db_name"]), "", Sqlformat(common.InterfaceToStr((*sqlData)["content"]), *in))
 	}
 
 	for k, v := range *rs {
 		(*rs)[k]["id"] = encrypt.EncodeArticleId2ByCheck(common.InterfaceToStr(v["id"]))
 		delete((*rs)[k], "_id")
 	}
-	return rs
+	return rs, count
 }
 func Sqlformat(sqlStr string, sqlData types.SqlManageReq) string {
 	data := []interface{}{}