From 051bb7af47cee0b8e71a1be16a87dca950fd37c2 Mon Sep 17 00:00:00 2001
From: qichengbin <qcb122658550@163.com>
Date: Fri, 26 Dec 2025 03:30:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E4=BA=BA=E6=9C=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E5=8F=8A=E5=85=B6=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/VideoCameraController.java             |  4 +++-
 .../smartFishingPort/domain/entity/UavEquipment.java  | 11 +++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/controller/VideoCameraController.java b/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/controller/VideoCameraController.java
index dc221a7..6c8cef9 100644
--- a/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/controller/VideoCameraController.java
+++ b/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/controller/VideoCameraController.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ltgk.smartFishingPort.common.constant.Constants;
+import com.ltgk.smartFishingPort.common.core.controller.BaseController;
 import com.ltgk.smartFishingPort.common.core.domain.Response;
 import com.ltgk.smartFishingPort.common.core.redis.RedisCache;
 import com.ltgk.smartFishingPort.common.utils.MybatisUtil;
@@ -45,7 +46,7 @@ import java.util.concurrent.TimeUnit;
 @Api(tags = {"监控设备模块"})
 @RestController
 @RequestMapping("/videoCamera")
-public class VideoCameraController {
+public class VideoCameraController extends BaseController {
 
     @Autowired
     RedisCache redisUtils;
@@ -73,6 +74,7 @@ public class VideoCameraController {
             , @RequestParam(value = "pageSize", defaultValue = "15") Integer pageSize) {
         IPage<UavEquipment> page = new Page<>(pageNo, pageSize);
         QueryWrapper<UavEquipment> wrapper = MybatisUtil.notNullField(uavEquipment);
+        wrapper.orderByDesc("source_type");
         IPage<UavEquipment> pageList = uavEquipmentMapper.selectPage(page, wrapper);
         return Response.ok(pageList);
     }
diff --git a/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/domain/entity/UavEquipment.java b/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/domain/entity/UavEquipment.java
index 5d7e1f9..59fe58c 100644
--- a/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/domain/entity/UavEquipment.java
+++ b/smartFishingPort-kechuang/src/main/java/com/ltgk/smartFishingPort/domain/entity/UavEquipment.java
@@ -29,7 +29,6 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-
 @TableName("haishiju.uav_equipment")
 @ApiModel(value="UavEquipment对象", description="无人机设备表")
 public class UavEquipment extends Model<UavEquipment> {
@@ -180,22 +179,22 @@ public class UavEquipment extends Model<UavEquipment> {
     private Integer isSdkControl;
     @JsonProperty("gatewaySn")
     @ApiModelProperty(value = "机巢sn")
-    @TableField(exist = false)
+    @TableField("gateway_sn")
     private String gatewaySn;
     @JsonProperty("droneSn")
     @ApiModelProperty(value = "无人机sn")
-    @TableField(exist = false)
+    @TableField("drone_sn")
     private String droneSn;
     @JsonProperty("systemUuid")
     @ApiModelProperty(value = "系统uuid")
-    @TableField(exist = false)
+    @TableField("system_uuid")
     private String systemUuid;
     @ApiModelProperty(value = "海波高度")
-    @TableField(exist = false)
+    @TableField("altitude")
     @JsonProperty("altitude")
     private BigDecimal altitude;
     @ApiModelProperty(value = "离地高度")
-    @TableField(exist = false)
+    @TableField("height")
     @JsonProperty("height")
     private BigDecimal height;