查询抓拍列表 新增搜索条件

server/dao/capture_vehicles.go

@@ -14,9 +14,17 @@ func (CaptureVehicles) TableName() string {
 	return "capture_vehicles"
 }
 
-func QueryCaptureVehiclesList(limit, offset int) (captureVehicles []CaptureVehicles, total int64, err error) {
+func QueryCaptureVehiclesList(limit, offset, vehicleType int, sLicense string) (captureVehicles []CaptureVehicles, total int64, err error) {
 	db := global.GVA_DB.Model(&CaptureVehicles{})
 
+	if vehicleType != 0 {
+		db = db.Where("vehicle_type = ?", vehicleType)
+	}
+
+	if sLicense != "" {
+		db = db.Where("sLicense = ?", sLicense)
+	}
+
 	err = db.Count(&total).Error
 	if err != nil {
 		return

server/model/devices/common.go

@@ -134,4 +134,6 @@ type SearchCamera struct {
 
 type SearchCaptureVehicles struct {
 	request.PageInfo
+	SLicense    string `json:"sLicense"`
+	VehicleType int    `json:"vehicleType"`
 }

server/service/devices/captureVehicles.go

@@ -12,5 +12,5 @@ func (cvs *CaptureVehiclesService) QueryCaptureVehiclesList(info devices.SearchC
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
 
-	return dao.QueryCaptureVehiclesList(limit, offset)
+	return dao.QueryCaptureVehiclesList(limit, offset, info.VehicleType, info.SLicense)
 }