告警通知 -修复租房ID

app/data/controller/calcTask.go

@@ -43,7 +43,7 @@ func CalcTask() {
 		tenant := system.Tenant{}
 		tenants, _ := tenant.GetTenants(0, 1000)
 		for _, t := range tenants {
-			warnService.PlatformAlarmService.Refresh(int(t.ID))
+			warnService.PlatformAlarmService.Refresh(int(t.TenantId))
 		}
 		//发送告警
 		warnService.TaskWarnService.HandlingAlarms()

app/record/controller/lightRecordController.go

@@ -40,7 +40,7 @@ func (c *lightRecordCtl) List(ctx *gin.Context) {
 		id, _ = strconv.Atoi(groupId)
 	}
 
-	records, err := service.LightRecordService.List(searchValue, start, end, id, current, size)
+	records, total, err := service.LightRecordService.List(searchValue, start, end, id, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
@@ -49,7 +49,7 @@ func (c *lightRecordCtl) List(ctx *gin.Context) {
 	rsp := LightRecordRespose{
 		Current: current,
 		Size:    size,
-		Total:   len(records),
+		Total:   int(total),
 		Pages:   int(pages),
 		Records: records,
 	}

app/record/dao/lightRecordDao.go

@@ -50,7 +50,7 @@ func (l LightRecord) BatchCreate(record []edge_service.RecordLightUpData) error
 }
 
 // GetRecords 查记录
-func (c LightRecord) GetRecords(offset int, limit int, start, end, searchValue string, groupId int) ([]LightRecord, error) {
+func (c LightRecord) GetRecords(offset int, limit int, start, end, searchValue string, groupId int) ([]LightRecord, int64, error) {
 	var LightRecords []LightRecord
 	db := Db.Debug().Model(&c)
 	if groupId > 0 {
@@ -64,8 +64,11 @@ func (c LightRecord) GetRecords(offset int, limit int, start, end, searchValue s
 		end = end + " 23:59:59"
 		db = db.Where("start_time >=? and  start_time <= ?", start, end)
 	}
-	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&LightRecords).Error
-	return LightRecords, err
+	db = db.Where("is_deleted = 0")
+	err := db.Order("id desc").Offset(offset).Limit(limit).Find(&LightRecords).Error
+	var count int64
+	db.Count(&count)
+	return LightRecords, count, err
 }
 
 // 重写参数

app/record/service/lightRecordService.go

@@ -11,15 +11,15 @@ var LightRecordService = new(lightRecordService)
 
 type lightRecordService struct{}
 
-func (s *lightRecordService) List(searchValue, start, end string, id int, current int, size int) ([]dao.LightRecord, *common.Errors) {
+func (s *lightRecordService) List(searchValue, start, end string, id int, current int, size int) ([]dao.LightRecord, int64, *common.Errors) {
 	var record dao.LightRecord
 	offset := (current - 1) * size
 	limit := size
-	records, err := record.GetRecords(offset, limit, start, end, searchValue, id)
+	records, total, err := record.GetRecords(offset, limit, start, end, searchValue, id)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
-	return records, nil
+	return records, total, nil
 }
 
 // Refresh 同步记录