From 04e3622c2153eef89d8552c313c502a70cae725d Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Sat, 11 Oct 2025 11:41:34 +0800
Subject: [PATCH] 1.解决报错问题，统一文件名称。
---
ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneController.java | 2 +-
ard-admin/src/main/java/com/ard/web/controller/data/ArdServerController.java | 2 +-
ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java | 2 +-
ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml | 6 +++---
ard-admin/src/main/java/com/ard/web/controller/data/ArdModelManagementController.java | 2 +-
ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java | 6 +++---
ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml | 6 +++---
ard-admin/src/main/java/com/ard/web/controller/data/ArdTileManagementController.java | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneController.java
index 99fe277..05d16ef 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneController.java
@@ -32,7 +32,7 @@
*/
@Api(tags = "无人机管理接口")
@RestController
-@RequestMapping("/data/management")
+@RequestMapping("/data/drone")
public class ArdDroneController extends BaseController {
@Autowired
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java
index 3ec3e1d..48dfb57 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java
@@ -32,7 +32,7 @@
*/
@Api(tags = "地图管理接口")
@RestController
-@RequestMapping("/data/management")
+@RequestMapping("/data/map")
public class ArdMapManagementController extends BaseController {
@Autowired
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelManagementController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelManagementController.java
index f5fc56c..0dfc2db 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelManagementController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelManagementController.java
@@ -32,7 +32,7 @@
*/
@Api(tags = "模型管理接口")
@RestController
-@RequestMapping("/data/management")
+@RequestMapping("/data/model")
public class ArdModelManagementController extends BaseController {
@Autowired
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdServerController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdServerController.java
index 5339f2d..0e1b1e0 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdServerController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdServerController.java
@@ -32,7 +32,7 @@
*/
@Api(tags = "服务器管理接口")
@RestController
-@RequestMapping("/data/management")
+@RequestMapping("/data/server")
public class ArdServerController extends BaseController {
@Autowired
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdTileManagementController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdTileManagementController.java
index d8edefd..6a9083e 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdTileManagementController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdTileManagementController.java
@@ -32,7 +32,7 @@
*/
@Api(tags = "tile管理接口")
@RestController
-@RequestMapping("/data/management")
+@RequestMapping("/data/tile")
public class ArdTileManagementController extends BaseController {
@Autowired
diff --git a/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java b/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java
index 4e7afcd..8c276ac 100644
--- a/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java
+++ b/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java
@@ -26,10 +26,10 @@
private String host;
/** tcp端口 */
- private String tcpPort;
+ private Integer tcpPort;
- /** 环境地址端口 */
- private String httpPort;
+ /** http端口 */
+ private Integer httpPort;
/** 访问密钥ID */
private String accessKeyId;
diff --git a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
index 798b274..a79d442 100644
--- a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
@@ -27,7 +27,7 @@
from ard_drone_info
</sql>
- <select id="selectArdDroneManagementList" parameterType="ArdDroneManagement" resultMap="ArdDroneManagementResult">
+ <select id="selectArdDroneManagementList" parameterType="ArdDroneInfo" resultMap="ArdDroneManagementResult">
<include refid="selectArdDroneManagementVo"/>
<where>
<if test="deviceModel != null and deviceModel != ''"> and device_model = #{deviceModel}</if>
@@ -44,7 +44,7 @@
where id = #{id}
</select>
- <insert id="insertArdDroneManagement" parameterType="ArdDroneManagement">
+ <insert id="insertArdDroneManagement" parameterType="ArdDroneInfo">
insert into ard_drone_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -68,7 +68,7 @@
</trim>
</insert>
- <update id="updateArdDroneManagement" parameterType="ArdDroneManagement">
+ <update id="updateArdDroneManagement" parameterType="ArdDroneInfo">
update ard_drone_info
<trim prefix="SET" suffixOverrides=",">
<if test="deviceModel != null">device_model = #{deviceModel},</if>
diff --git a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
index dbdceda..4447c4c 100644
--- a/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
@@ -35,7 +35,7 @@
from ard_server_info
</sql>
- <select id="selectArdServerManagementList" parameterType="ArdServerManagement" resultMap="ArdServerManagementResult">
+ <select id="selectArdServerManagementList" parameterType="ArdServerInfo" resultMap="ArdServerManagementResult">
<include refid="selectArdServerManagementVo"/>
<where>
<if test="serverName != null and serverName != ''"> and server_name like concat('%', #{serverName}, '%')</if>
@@ -47,7 +47,7 @@
where id = #{id}
</select>
- <insert id="insertArdServerManagement" parameterType="ArdServerManagement">
+ <insert id="insertArdServerManagement" parameterType="ArdServerInfo">
insert into ard_server_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -79,7 +79,7 @@
</trim>
</insert>
- <update id="updateArdServerManagement" parameterType="ArdServerManagement">
+ <update id="updateArdServerManagement" parameterType="ArdServerInfo">
update ard_server_info
<trim prefix="SET" suffixOverrides=",">
<if test="serverName != null">server_name = #{serverName},</if>
--
Gitblit v1.9.3