modify task type

conf/postgres.conf

@@ -5,6 +5,12 @@ postgreshost = "192.168.1.10"
 postgresport = 8812
 postgresdb = "qdb"
 
+; postgresuser = "admin"
+; postgrespass = "quest"
+; postgreshost = "43.198.252.255"
+; postgresport = 8812
+; postgresdb = "qdb"
+
 [test]
 postgresuser = "admin"
 postgrespass = "quest"

controllers/funds.go

@@ -103,14 +103,48 @@ func (server *FundsController) RechargeRecords() {
 		return
 	}
 
+	body := server.Ctx.Input.RequestBody
+	appRequest := models.AppRequest{}
+	err = json.Unmarshal(body, &appRequest) //解析body中数据
+	logs.Debug("appRequest", appRequest, string(body))
+	if err != nil {
+		server.respond(models.NoRequestBody, err.Error())
+		return
+	}
+
+	if appRequest.Page == 0 {
+		appRequest.Page = 1
+	}
+
+	if appRequest.Size == 0 {
+		appRequest.Size = 10
+	}
+	offset := (appRequest.Page - 1) * appRequest.Size
+
 	qs := mysql.GetMysqlInstace().Ormer.QueryTable("charge_record")
-	infoQs := qs.Filter("user_id", info.UserID)
+	infoQs := qs.Filter("user_id", info.UserID).Offset(offset).Limit(appRequest.Size)
 	count, err := infoQs.Count()
 	logs.Debug("Count = ", count)
 	var tokens []*models.ChargeRecord
 	if count > 0 {
 		infoQs.All(&tokens)
 	}
-	server.respond(http.StatusOK, "", tokens)
+	total, err := qs.Count()
+	responseData := struct {
+		Total int64       `json:"total"`
+		Data  interface{} `json:"data,omitempty"`
+	}{
+		Total: total,
+		Data:  tokens,
+	}
+	server.respond(http.StatusOK, "", responseData)
 
 }
+
+func (server *FundsController) IncomeAndExpense() {
+	//info, err := server.Check()
+	//if err != nil {
+	//	server.respond(http.StatusUnauthorized, err.Error())
+	//	return
+	//}
+}

controllers/userlevel.go

@@ -19,14 +19,41 @@ func (server *UserLevelController) Levels() {
 		server.respond(http.StatusUnauthorized, err.Error())
 		return
 	}
+	body := server.Ctx.Input.RequestBody
+	appRequest := models.AppRequest{}
+	err = json.Unmarshal(body, &appRequest) //解析body中数据
+	logs.Debug("appRequest", appRequest, string(body))
+	if err != nil {
+		server.respond(models.NoRequestBody, err.Error())
+		return
+	}
+
+	if appRequest.Page == 0 {
+		appRequest.Page = 1
+	}
+
+	if appRequest.Size == 0 {
+		appRequest.Size = 10
+	}
+	offset := (appRequest.Page - 1) * appRequest.Size
+
 	qs := mysql.GetMysqlInstace().Ormer.QueryTable("user_level").Filter("deleted", 0)
-	count, err := qs.Count()
+	infoQs := qs.Offset(offset).Limit(appRequest.Size)
+	count, err := infoQs.Count()
 	logs.Debug("Levels = ", count)
 	var levels []*models.UserLevel
 	if count > 0 {
-		qs.All(&levels)
+		infoQs.All(&levels)
 	}
-	server.respond(http.StatusOK, "", levels)
+	total, err := qs.Count()
+	responseData := struct {
+		Total int64       `json:"total"`
+		Data  interface{} `json:"data,omitempty"`
+	}{
+		Total: total,
+		Data:  levels,
+	}
+	server.respond(http.StatusOK, "", responseData)
 }
 
 func (server *UserLevelController) AddLevel() {

lastupdate.tmp

-{"/Users/brent/Documents/wubanWork/ai_developer_admin/controllers":1708598583449330754}
+{"/Users/brent/Documents/wubanWork/ai_developer_admin/controllers":1708678164620771077}
\ No newline at end of file

libs/postgres/postgres.go

@@ -100,6 +100,38 @@ func QueryBills(sql string) ([]models.Bills, error) {
 	return containers, nil
 }
 
+func QueryTotal(sql string) (int64, error) {
+	logs.Debug("QueryBills = ", sql)
+	var count int64
+	_ = ormpost.Raw(sql).QueryRow(&count)
+
+	//_, err := qs.Values(&params)
+	//if err != nil {
+	//	return 0, err
+	//}
+	//arr, err := json.Marshal(params)
+	//if err != nil {
+	//	return 0, err
+	//}
+	//var containers models.TotalType
+	//logs.Debug("QueryTotal = ", string(arr))
+	//err = json.Unmarshal(arr, &containers)
+	//if err != nil {
+	//	return 0, err
+	//}
+	//dataType := reflect.TypeOf(containers.Count)
+	//
+	//count := int64(0)
+	// 判断变量的类型是否为字符串
+	//if dataType.Kind() == reflect.String {
+	//	num, err := strconv.ParseInt(containers.Count, 10, 64)
+	//	if err == nil {
+	//		count = num
+	//	}
+	//}
+	return count, nil
+}
+
 func CountTasks(sql string) ([]models.TaskCount, error) {
 	logs.Debug("CountTasks = ", sql)
 	qs := ormpost.Raw(sql)

models/funds.go

@@ -49,3 +49,6 @@ type ChargeRecord struct {
 	UpdatedTime   time.Time `json:"updated_time";orm:"column(updated_time);type(datetime)"`
 	Deleted       int       `json:"deleted";orm:"column(deleted);size(1)"`
 }
+
+type IncomeAndExpenseRsponse struct {
+}

models/task.go

@@ -145,6 +145,10 @@ type Bills struct {
 	Balance      int64     `json:"balance,omitempty"`
 }
 
+type TotalType struct {
+	Count string `json:"count,omitempty"`
+}
+
 type TaskCount struct {
 	Time            time.Time `json:"time,omitempty"`
 	Count           string    `json:"count,omitempty"`