server/api/v1/uhf/reader.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"server/model/common/response"
 	"server/model/uhf/request"
-	uhfResponse "server/model/uhf/response"
 	"server/service/uhf"
 
 	"github.com/gin-gonic/gin"
@@ -98,10 +97,12 @@ func ListReaders(c *gin.Context) {
 		return
 	}
 
-	response.OkWithData(uhfResponse.UHFReaderList{
-		Total: total,
-		List:  list,
-	}, c)
+	response.OkWithDetailed(response.PageResult{
+		List:     list,
+		Total:    total,
+		Page:     req.Page,
+		PageSize: req.PageSize,
+	}, "获取成功", c)
 }
 
 func DeleteReader(c *gin.Context) {

server/dao/uhf_reader.go

@@ -26,9 +26,11 @@ type UHFReader struct {
 	Status         string     `gorm:"size:20;default:'offline'" json:"status"`
 	IsActive       bool       `gorm:"default:true" json:"is_active"`
 	Description    string     `gorm:"size:200" json:"description"`
-	ParkingLotID   uint       `json:"parking_lot_id"`
 	LastOnlineTime *time.Time `json:"last_online_time" gorm:"comment:最后上线时间;default:null"`
 
+	ParkingLotID uint        `json:"parking_lot_id"`
+	ParkingLot   *ParkingLot `gorm:"foreignkey:parking_lot_id" json:"parking_lot"`
+
 	ChannelID uint     `gorm:"comment:绑定通道ID" json:"channel_id"`
 	Channel   *Channel `gorm:"foreignKey:ChannelID;references:ID" json:"channel"`
 }

server/service/uhf/uhf_service.go

@@ -123,11 +123,11 @@ func (s *uhfService) QueryAllReaders() ([]dao.UHFReader, error) {
 }
 
 // ListReaders 分页查询设备列表
-func (s *uhfService) ListReaders(req request.UHFReaderQuery) ([]response.UHFReaderResponse, int64, error) {
+func (s *uhfService) ListReaders(req request.UHFReaderQuery) ([]dao.UHFReader, int64, error) {
 	var readers []dao.UHFReader
 	var total int64
 
-	query := global.GVA_DB.Model(&dao.UHFReader{})
+	query := global.GVA_DB.Model(&dao.UHFReader{}).Preload("Channel").Preload("ParkingLot")
 
 	if req.DeviceCode != "" {
 		query = query.Where("device_code LIKE ?", "%"+req.DeviceCode+"%")
@@ -158,27 +158,7 @@ func (s *uhfService) ListReaders(req request.UHFReaderQuery) ([]response.UHFRead
 		return nil, 0, err
 	}
 
-	var list []response.UHFReaderResponse
-	for _, reader := range readers {
-		list = append(list, response.UHFReaderResponse{
-			ID:           reader.ID,
-			DeviceCode:   reader.DeviceCode,
-			DeviceName:   reader.DeviceName,
-			ConnectType:  reader.ConnectType,
-			IPAddress:    reader.IPAddress,
-			Port:         reader.Port,
-			COMPort:      reader.COMPort,
-			BaudRate:     reader.BaudRate,
-			Status:       reader.Status,
-			IsActive:     reader.IsActive,
-			Description:  reader.Description,
-			ParkingLotID: reader.ParkingLotID,
-			CreatedAt:    reader.CreatedAt,
-			UpdatedAt:    reader.UpdatedAt,
-		})
-	}
-
-	return list, total, nil
+	return readers, total, nil
 }
 
 // DeleteReader 删除设备