From e44aa1ce6be43c3733434426c2130d955e1024ce Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Sat, 11 Oct 2025 10:04:26 +0800
Subject: [PATCH] 1.统一修改文件名称。
---
ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneController.java | 26 +-
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneServiceImpl.java | 94 +++++++++++
ard-admin/src/main/java/com/ard/web/controller/data/ArdServerController.java | 26 +-
ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java | 18 +-
ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java | 6
ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java | 20 -
ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml | 4
ard-work/src/main/java/com/ard/work/service/IArdDroneService.java | 18 +-
ard-work/src/main/java/com/ard/work/mapper/ArdServerInfoMapper.java | 18 +-
/dev/null | 95 -----------
ard-work/src/main/java/com/ard/work/service/impl/ArdServerServiceImpl.java | 95 +++++++++++
ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml | 4
ard-work/src/main/java/com/ard/work/service/IArdServerService.java | 18 +-
13 files changed, 264 insertions(+), 178 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneManagementController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneController.java
similarity index 79%
rename from ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneManagementController.java
rename to ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneController.java
index fe69b33..99fe277 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneManagementController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneController.java
@@ -4,8 +4,8 @@
import javax.servlet.http.HttpServletResponse;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.work.domain.data.DroneInfo;
-import com.ard.work.service.IArdDroneManagementService;
+import com.ard.work.domain.entity.ArdDroneInfo;
+import com.ard.work.service.IArdDroneService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,10 +33,10 @@
@Api(tags = "无人机管理接口")
@RestController
@RequestMapping("/data/management")
-public class ArdDroneManagementController extends BaseController {
+public class ArdDroneController extends BaseController {
@Autowired
- private IArdDroneManagementService ardDroneManagementService;
+ private IArdDroneService ardDroneManagementService;
/**
* 查询无人机管理列表
@@ -44,9 +44,9 @@
@ApiOperation("查询无人机管理列表")
@PreAuthorize("@ss.hasPermi('system:management:list')")
@GetMapping("/list")
- public TableDataInfo list(DroneInfo droneInfo) {
+ public TableDataInfo list(ArdDroneInfo ardDroneInfo) {
startPage();
- List<DroneInfo> list = ardDroneManagementService.selectArdDroneManagementList(droneInfo);
+ List<ArdDroneInfo> list = ardDroneManagementService.selectArdDroneManagementList(ardDroneInfo);
return getDataTable(list);
}
@@ -57,9 +57,9 @@
@PreAuthorize("@ss.hasPermi('system:management:export')")
@Log(title = "无人机管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, DroneInfo droneInfo) {
- List<DroneInfo> list = ardDroneManagementService.selectArdDroneManagementList(droneInfo);
- ExcelUtil<DroneInfo> util = new ExcelUtil<DroneInfo>(DroneInfo.class);
+ public void export(HttpServletResponse response, ArdDroneInfo ardDroneInfo) {
+ List<ArdDroneInfo> list = ardDroneManagementService.selectArdDroneManagementList(ardDroneInfo);
+ ExcelUtil<ArdDroneInfo> util = new ExcelUtil<ArdDroneInfo>(ArdDroneInfo.class);
util.exportExcel(response, list, "无人机管理数据");
}
@@ -80,8 +80,8 @@
@PreAuthorize("@ss.hasPermi('system:management:add')")
@Log(title = "无人机管理", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody DroneInfo droneInfo) {
- return toAjax(ardDroneManagementService.insertArdDroneManagement(droneInfo));
+ public AjaxResult add(@RequestBody ArdDroneInfo ardDroneInfo) {
+ return toAjax(ardDroneManagementService.insertArdDroneManagement(ardDroneInfo));
}
/**
@@ -91,8 +91,8 @@
@PreAuthorize("@ss.hasPermi('system:management:edit')")
@Log(title = "无人机管理", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody DroneInfo droneInfo) {
- return toAjax(ardDroneManagementService.updateArdDroneManagement(droneInfo));
+ public AjaxResult edit(@RequestBody ArdDroneInfo ardDroneInfo) {
+ return toAjax(ardDroneManagementService.updateArdDroneManagement(ardDroneInfo));
}
/**
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdServerManagementController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdServerController.java
similarity index 78%
rename from ard-admin/src/main/java/com/ard/web/controller/data/ArdServerManagementController.java
rename to ard-admin/src/main/java/com/ard/web/controller/data/ArdServerController.java
index 64040bf..5339f2d 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdServerManagementController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdServerController.java
@@ -3,8 +3,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
-import com.ard.work.domain.data.ServerInfo;
-import com.ard.work.service.IArdServerManagementService;
+import com.ard.work.domain.entity.ArdServerInfo;
+import com.ard.work.service.IArdServerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,10 +33,10 @@
@Api(tags = "服务器管理接口")
@RestController
@RequestMapping("/data/management")
-public class ArdServerManagementController extends BaseController {
+public class ArdServerController extends BaseController {
@Autowired
- private IArdServerManagementService ardServerManagementService;
+ private IArdServerService ardServerManagementService;
/**
* 查询服务器管理列表
@@ -44,9 +44,9 @@
@ApiOperation("查询服务器管理列表")
@PreAuthorize("@ss.hasPermi('system:management:list')")
@GetMapping("/list")
- public TableDataInfo list(ServerInfo serverInfo) {
+ public TableDataInfo list(ArdServerInfo ardServerInfo) {
startPage();
- List<ServerInfo> list = ardServerManagementService.selectArdServerManagementList(serverInfo);
+ List<ArdServerInfo> list = ardServerManagementService.selectArdServerManagementList(ardServerInfo);
return getDataTable(list);
}
@@ -57,9 +57,9 @@
@PreAuthorize("@ss.hasPermi('system:management:export')")
@Log(title = "服务器管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ServerInfo serverInfo) {
- List<ServerInfo> list = ardServerManagementService.selectArdServerManagementList(serverInfo);
- ExcelUtil<ServerInfo> util = new ExcelUtil<ServerInfo>(ServerInfo.class);
+ public void export(HttpServletResponse response, ArdServerInfo ardServerInfo) {
+ List<ArdServerInfo> list = ardServerManagementService.selectArdServerManagementList(ardServerInfo);
+ ExcelUtil<ArdServerInfo> util = new ExcelUtil<ArdServerInfo>(ArdServerInfo.class);
util.exportExcel(response, list, "服务器管理数据");
}
@@ -80,8 +80,8 @@
@PreAuthorize("@ss.hasPermi('system:management:add')")
@Log(title = "服务器管理", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody ServerInfo serverInfo) {
- return toAjax(ardServerManagementService.insertArdServerManagement(serverInfo));
+ public AjaxResult add(@RequestBody ArdServerInfo ardServerInfo) {
+ return toAjax(ardServerManagementService.insertArdServerManagement(ardServerInfo));
}
/**
@@ -91,8 +91,8 @@
@PreAuthorize("@ss.hasPermi('system:management:edit')")
@Log(title = "服务器管理", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody ServerInfo serverInfo) {
- return toAjax(ardServerManagementService.updateArdServerManagement(serverInfo));
+ public AjaxResult edit(@RequestBody ArdServerInfo ardServerInfo) {
+ return toAjax(ardServerManagementService.updateArdServerManagement(ardServerInfo));
}
/**
diff --git a/ard-work/src/main/java/com/ard/work/domain/data/DroneInfo.java b/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
similarity index 79%
rename from ard-work/src/main/java/com/ard/work/domain/data/DroneInfo.java
rename to ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
index 257706b..9c475f0 100644
--- a/ard-work/src/main/java/com/ard/work/domain/data/DroneInfo.java
+++ b/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
@@ -1,10 +1,8 @@
-package com.ard.work.domain.data;
+package com.ard.work.domain.entity;
import java.util.Date;
import com.ard.common.core.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ard.common.annotation.Excel;
import lombok.Data;
/**
@@ -14,7 +12,7 @@
* @date 2025-10-10
*/
@Data
-public class DroneInfo extends BaseEntity {
+public class ArdDroneInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/ard-work/src/main/java/com/ard/work/domain/data/ServerInfo.java b/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java
similarity index 71%
rename from ard-work/src/main/java/com/ard/work/domain/data/ServerInfo.java
rename to ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java
index d132b39..4e7afcd 100644
--- a/ard-work/src/main/java/com/ard/work/domain/data/ServerInfo.java
+++ b/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java
@@ -1,11 +1,8 @@
-package com.ard.work.domain.data;
+package com.ard.work.domain.entity;
-import java.util.Date;
import java.util.List;
import com.ard.common.core.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ard.common.annotation.Excel;
import lombok.Data;
/**
@@ -15,7 +12,7 @@
* @date 2025-10-10
*/
@Data
-public class ServerInfo extends BaseEntity {
+public class ArdServerInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -28,20 +25,17 @@
/** 环境地址 */
private String host;
+ /** tcp端口 */
+ private String tcpPort;
+
/** 环境地址端口 */
- private String hostPort;
+ private String httpPort;
/** 访问密钥ID */
private String accessKeyId;
/** 访问密钥秘密 */
private String accessKeySecret;
-
- /** tcp服务器地址 */
- private String tcpServer;
-
- /** tcp端口 */
- private String tcpPort;
/** 经度 */
private Double longitude;
@@ -58,6 +52,6 @@
/** 部门ID */
private Long deptId;
- private List<DroneInfo> droneInfoList;
+ private List<ArdDroneInfo> ardDroneInfoList;
}
diff --git a/ard-work/src/main/java/com/ard/work/mapper/ArdDroneManagementMapper.java b/ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java
similarity index 63%
rename from ard-work/src/main/java/com/ard/work/mapper/ArdDroneManagementMapper.java
rename to ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java
index 83273ad..5b7f06b 100644
--- a/ard-work/src/main/java/com/ard/work/mapper/ArdDroneManagementMapper.java
+++ b/ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java
@@ -1,6 +1,6 @@
package com.ard.work.mapper;
-import com.ard.work.domain.data.DroneInfo;
+import com.ard.work.domain.entity.ArdDroneInfo;
import java.util.List;
@@ -10,7 +10,7 @@
* @author xia
* @date 2025-10-10
*/
-public interface ArdDroneManagementMapper {
+public interface ArdDroneInfoMapper {
/**
* 查询无人机管理
@@ -18,31 +18,31 @@
* @param id 无人机管理主键
* @return 无人机管理
*/
- public DroneInfo selectArdDroneManagementById(String id);
+ public ArdDroneInfo selectArdDroneManagementById(String id);
/**
* 查询无人机管理列表
*
- * @param droneInfo 无人机管理
+ * @param ardDroneInfo 无人机管理
* @return 无人机管理集合
*/
- public List<DroneInfo> selectArdDroneManagementList(DroneInfo droneInfo);
+ public List<ArdDroneInfo> selectArdDroneManagementList(ArdDroneInfo ardDroneInfo);
/**
* 新增无人机管理
*
- * @param droneInfo 无人机管理
+ * @param ardDroneInfo 无人机管理
* @return 结果
*/
- public int insertArdDroneManagement(DroneInfo droneInfo);
+ public int insertArdDroneManagement(ArdDroneInfo ardDroneInfo);
/**
* 修改无人机管理
*
- * @param droneInfo 无人机管理
+ * @param ardDroneInfo 无人机管理
* @return 结果
*/
- public int updateArdDroneManagement(DroneInfo droneInfo);
+ public int updateArdDroneManagement(ArdDroneInfo ardDroneInfo);
/**
* 删除无人机管理
diff --git a/ard-work/src/main/java/com/ard/work/mapper/ArdServerManagementMapper.java b/ard-work/src/main/java/com/ard/work/mapper/ArdServerInfoMapper.java
similarity index 62%
rename from ard-work/src/main/java/com/ard/work/mapper/ArdServerManagementMapper.java
rename to ard-work/src/main/java/com/ard/work/mapper/ArdServerInfoMapper.java
index 8f68cb5..e8cda24 100644
--- a/ard-work/src/main/java/com/ard/work/mapper/ArdServerManagementMapper.java
+++ b/ard-work/src/main/java/com/ard/work/mapper/ArdServerInfoMapper.java
@@ -1,5 +1,5 @@
package com.ard.work.mapper;
-import com.ard.work.domain.data.ServerInfo;
+import com.ard.work.domain.entity.ArdServerInfo;
import java.util.List;
@@ -9,7 +9,7 @@
* @author xia
* @date 2025-10-10
*/
-public interface ArdServerManagementMapper {
+public interface ArdServerInfoMapper {
/**
* 查询服务器管理
@@ -17,31 +17,31 @@
* @param id 服务器管理主键
* @return 服务器管理
*/
- public ServerInfo selectArdServerManagementById(String id);
+ public ArdServerInfo selectArdServerManagementById(String id);
/**
* 查询服务器管理列表
*
- * @param serverInfo 服务器管理
+ * @param ardServerInfo 服务器管理
* @return 服务器管理集合
*/
- public List<ServerInfo> selectArdServerManagementList(ServerInfo serverInfo);
+ public List<ArdServerInfo> selectArdServerManagementList(ArdServerInfo ardServerInfo);
/**
* 新增服务器管理
*
- * @param serverInfo 服务器管理
+ * @param ardServerInfo 服务器管理
* @return 结果
*/
- public int insertArdServerManagement(ServerInfo serverInfo);
+ public int insertArdServerManagement(ArdServerInfo ardServerInfo);
/**
* 修改服务器管理
*
- * @param serverInfo 服务器管理
+ * @param ardServerInfo 服务器管理
* @return 结果
*/
- public int updateArdServerManagement(ServerInfo serverInfo);
+ public int updateArdServerManagement(ArdServerInfo ardServerInfo);
/**
* 删除服务器管理
diff --git a/ard-work/src/main/java/com/ard/work/service/IArdDroneManagementService.java b/ard-work/src/main/java/com/ard/work/service/IArdDroneService.java
similarity index 64%
rename from ard-work/src/main/java/com/ard/work/service/IArdDroneManagementService.java
rename to ard-work/src/main/java/com/ard/work/service/IArdDroneService.java
index 56981e3..589831c 100644
--- a/ard-work/src/main/java/com/ard/work/service/IArdDroneManagementService.java
+++ b/ard-work/src/main/java/com/ard/work/service/IArdDroneService.java
@@ -1,6 +1,6 @@
package com.ard.work.service;
-import com.ard.work.domain.data.DroneInfo;
+import com.ard.work.domain.entity.ArdDroneInfo;
import java.util.List;
@@ -10,7 +10,7 @@
* @author xia
* @date 2025-10-10
*/
-public interface IArdDroneManagementService {
+public interface IArdDroneService {
/**
* 查询无人机管理
@@ -18,31 +18,31 @@
* @param id 无人机管理主键
* @return 无人机管理
*/
- public DroneInfo selectArdDroneManagementById(String id);
+ public ArdDroneInfo selectArdDroneManagementById(String id);
/**
* 查询无人机管理列表
*
- * @param droneInfo 无人机管理
+ * @param ardDroneInfo 无人机管理
* @return 无人机管理集合
*/
- public List<DroneInfo> selectArdDroneManagementList(DroneInfo droneInfo);
+ public List<ArdDroneInfo> selectArdDroneManagementList(ArdDroneInfo ardDroneInfo);
/**
* 新增无人机管理
*
- * @param droneInfo 无人机管理
+ * @param ardDroneInfo 无人机管理
* @return 结果
*/
- public int insertArdDroneManagement(DroneInfo droneInfo);
+ public int insertArdDroneManagement(ArdDroneInfo ardDroneInfo);
/**
* 修改无人机管理
*
- * @param droneInfo 无人机管理
+ * @param ardDroneInfo 无人机管理
* @return 结果
*/
- public int updateArdDroneManagement(DroneInfo droneInfo);
+ public int updateArdDroneManagement(ArdDroneInfo ardDroneInfo);
/**
* 批量删除无人机管理
diff --git a/ard-work/src/main/java/com/ard/work/service/IArdServerManagementService.java b/ard-work/src/main/java/com/ard/work/service/IArdServerService.java
similarity index 63%
rename from ard-work/src/main/java/com/ard/work/service/IArdServerManagementService.java
rename to ard-work/src/main/java/com/ard/work/service/IArdServerService.java
index 162d938..f506eae 100644
--- a/ard-work/src/main/java/com/ard/work/service/IArdServerManagementService.java
+++ b/ard-work/src/main/java/com/ard/work/service/IArdServerService.java
@@ -1,5 +1,5 @@
package com.ard.work.service;
-import com.ard.work.domain.data.ServerInfo;
+import com.ard.work.domain.entity.ArdServerInfo;
import java.util.List;
@@ -9,7 +9,7 @@
* @author xia
* @date 2025-10-10
*/
-public interface IArdServerManagementService {
+public interface IArdServerService {
/**
* 查询服务器管理
@@ -17,31 +17,31 @@
* @param id 服务器管理主键
* @return 服务器管理
*/
- public ServerInfo selectArdServerManagementById(String id);
+ public ArdServerInfo selectArdServerManagementById(String id);
/**
* 查询服务器管理列表
*
- * @param serverInfo 服务器管理
+ * @param ardServerInfo 服务器管理
* @return 服务器管理集合
*/
- public List<ServerInfo> selectArdServerManagementList(ServerInfo serverInfo);
+ public List<ArdServerInfo> selectArdServerManagementList(ArdServerInfo ardServerInfo);
/**
* 新增服务器管理
*
- * @param serverInfo 服务器管理
+ * @param ardServerInfo 服务器管理
* @return 结果
*/
- public int insertArdServerManagement(ServerInfo serverInfo);
+ public int insertArdServerManagement(ArdServerInfo ardServerInfo);
/**
* 修改服务器管理
*
- * @param serverInfo 服务器管理
+ * @param ardServerInfo 服务器管理
* @return 结果
*/
- public int updateArdServerManagement(ServerInfo serverInfo);
+ public int updateArdServerManagement(ArdServerInfo ardServerInfo);
/**
* 批量删除服务器管理
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneManagementServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneManagementServiceImpl.java
deleted file mode 100644
index b453e3d..0000000
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneManagementServiceImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.ard.work.service.impl;
-
-import com.ard.common.utils.uuid.IdUtils;
-import com.ard.work.domain.data.DroneInfo;
-import com.ard.work.mapper.ArdDroneManagementMapper;
-import com.ard.work.service.IArdDroneManagementService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 无人机管理Service业务层处理
- *
- * @author xia
- * @date 2025-10-10
- */
-@Service
-public class ArdDroneManagementServiceImpl implements IArdDroneManagementService {
-
- @Autowired
- private ArdDroneManagementMapper ardDroneManagementMapper;
-
- /**
- * 查询无人机管理
- *
- * @param id 无人机管理主键
- * @return 无人机管理
- */
- @Override
- public DroneInfo selectArdDroneManagementById(String id)
- {
- return ardDroneManagementMapper.selectArdDroneManagementById(id);
- }
-
- /**
- * 查询无人机管理列表
- *
- * @param droneInfo 无人机管理
- * @return 无人机管理
- */
- @Override
- public List<DroneInfo> selectArdDroneManagementList(DroneInfo droneInfo) {
- return ardDroneManagementMapper.selectArdDroneManagementList(droneInfo);
- }
-
- /**
- * 新增无人机管理
- *
- * @param droneInfo 无人机管理
- * @return 结果
- */
- @Override
- public int insertArdDroneManagement(DroneInfo droneInfo) {
- droneInfo.setId(IdUtils.fastUUID());
- return ardDroneManagementMapper.insertArdDroneManagement(droneInfo);
- }
-
- /**
- * 修改无人机管理
- *
- * @param droneInfo 无人机管理
- * @return 结果
- */
- @Override
- public int updateArdDroneManagement(DroneInfo droneInfo)
- {
- return ardDroneManagementMapper.updateArdDroneManagement(droneInfo);
- }
-
- /**
- * 批量删除无人机管理
- *
- * @param ids 需要删除的无人机管理主键
- * @return 结果
- */
- @Override
- public int deleteArdDroneManagementByIds(String[] ids)
- {
- return ardDroneManagementMapper.deleteArdDroneManagementByIds(ids);
- }
-
- /**
- * 删除无人机管理信息
- *
- * @param id 无人机管理主键
- * @return 结果
- */
- @Override
- public int deleteArdDroneManagementById(String id)
- {
- return ardDroneManagementMapper.deleteArdDroneManagementById(id);
- }
-}
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneServiceImpl.java
new file mode 100644
index 0000000..7011058
--- /dev/null
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneServiceImpl.java
@@ -0,0 +1,94 @@
+package com.ard.work.service.impl;
+
+import com.ard.common.utils.uuid.IdUtils;
+import com.ard.work.domain.entity.ArdDroneInfo;
+import com.ard.work.mapper.ArdDroneInfoMapper;
+import com.ard.work.service.IArdDroneService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 无人机管理Service业务层处理
+ *
+ * @author xia
+ * @date 2025-10-10
+ */
+@Service
+public class ArdDroneServiceImpl implements IArdDroneService {
+
+ @Autowired
+ private ArdDroneInfoMapper ardDroneInfoMapper;
+
+ /**
+ * 查询无人机管理
+ *
+ * @param id 无人机管理主键
+ * @return 无人机管理
+ */
+ @Override
+ public ArdDroneInfo selectArdDroneManagementById(String id)
+ {
+ return ardDroneInfoMapper.selectArdDroneManagementById(id);
+ }
+
+ /**
+ * 查询无人机管理列表
+ *
+ * @param ardDroneInfo 无人机管理
+ * @return 无人机管理
+ */
+ @Override
+ public List<ArdDroneInfo> selectArdDroneManagementList(ArdDroneInfo ardDroneInfo) {
+ return ardDroneInfoMapper.selectArdDroneManagementList(ardDroneInfo);
+ }
+
+ /**
+ * 新增无人机管理
+ *
+ * @param ardDroneInfo 无人机管理
+ * @return 结果
+ */
+ @Override
+ public int insertArdDroneManagement(ArdDroneInfo ardDroneInfo) {
+ ardDroneInfo.setId(IdUtils.fastUUID());
+ return ardDroneInfoMapper.insertArdDroneManagement(ardDroneInfo);
+ }
+
+ /**
+ * 修改无人机管理
+ *
+ * @param ardDroneInfo 无人机管理
+ * @return 结果
+ */
+ @Override
+ public int updateArdDroneManagement(ArdDroneInfo ardDroneInfo)
+ {
+ return ardDroneInfoMapper.updateArdDroneManagement(ardDroneInfo);
+ }
+
+ /**
+ * 批量删除无人机管理
+ *
+ * @param ids 需要删除的无人机管理主键
+ * @return 结果
+ */
+ @Override
+ public int deleteArdDroneManagementByIds(String[] ids)
+ {
+ return ardDroneInfoMapper.deleteArdDroneManagementByIds(ids);
+ }
+
+ /**
+ * 删除无人机管理信息
+ *
+ * @param id 无人机管理主键
+ * @return 结果
+ */
+ @Override
+ public int deleteArdDroneManagementById(String id)
+ {
+ return ardDroneInfoMapper.deleteArdDroneManagementById(id);
+ }
+}
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdServerManagementServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdServerManagementServiceImpl.java
deleted file mode 100644
index 41c6eda..0000000
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdServerManagementServiceImpl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.ard.work.service.impl;
-
-import com.ard.common.utils.uuid.IdUtils;
-import com.ard.work.domain.data.ServerInfo;
-import com.ard.work.mapper.ArdServerManagementMapper;
-import com.ard.work.service.IArdServerManagementService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 服务器管理Service业务层处理
- *
- * @author xia
- * @date 2025-10-10
- */
-@Service
-public class ArdServerManagementServiceImpl implements IArdServerManagementService {
-
- @Autowired
- private ArdServerManagementMapper ardServerManagementMapper;
-
- /**
- * 查询服务器管理
- *
- * @param id 服务器管理主键
- * @return 服务器管理
- */
- @Override
- public ServerInfo selectArdServerManagementById(String id)
- {
- return ardServerManagementMapper.selectArdServerManagementById(id);
- }
-
- /**
- * 查询服务器管理列表
- *
- * @param serverInfo 服务器管理
- * @return 服务器管理
- */
- @Override
- public List<ServerInfo> selectArdServerManagementList(ServerInfo serverInfo)
- {
- return ardServerManagementMapper.selectArdServerManagementList(serverInfo);
- }
-
- /**
- * 新增服务器管理
- *
- * @param serverInfo 服务器管理
- * @return 结果
- */
- @Override
- public int insertArdServerManagement(ServerInfo serverInfo) {
- serverInfo.setId(IdUtils.fastUUID());
- return ardServerManagementMapper.insertArdServerManagement(serverInfo);
- }
-
- /**
- * 修改服务器管理
- *
- * @param serverInfo 服务器管理
- * @return 结果
- */
- @Override
- public int updateArdServerManagement(ServerInfo serverInfo)
- {
- return ardServerManagementMapper.updateArdServerManagement(serverInfo);
- }
-
- /**
- * 批量删除服务器管理
- *
- * @param ids 需要删除的服务器管理主键
- * @return 结果
- */
- @Override
- public int deleteArdServerManagementByIds(String[] ids)
- {
- return ardServerManagementMapper.deleteArdServerManagementByIds(ids);
- }
-
- /**
- * 删除服务器管理信息
- *
- * @param id 服务器管理主键
- * @return 结果
- */
- @Override
- public int deleteArdServerManagementById(String id)
- {
- return ardServerManagementMapper.deleteArdServerManagementById(id);
- }
-}
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdServerServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdServerServiceImpl.java
new file mode 100644
index 0000000..31a4650
--- /dev/null
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdServerServiceImpl.java
@@ -0,0 +1,95 @@
+package com.ard.work.service.impl;
+
+import com.ard.common.utils.uuid.IdUtils;
+import com.ard.work.domain.entity.ArdServerInfo;
+import com.ard.work.mapper.ArdServerInfoMapper;
+import com.ard.work.service.IArdServerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 服务器管理Service业务层处理
+ *
+ * @author xia
+ * @date 2025-10-10
+ */
+@Service
+public class ArdServerServiceImpl implements IArdServerService {
+
+ @Autowired
+ private ArdServerInfoMapper ardServerInfoMapper;
+
+ /**
+ * 查询服务器管理
+ *
+ * @param id 服务器管理主键
+ * @return 服务器管理
+ */
+ @Override
+ public ArdServerInfo selectArdServerManagementById(String id)
+ {
+ return ardServerInfoMapper.selectArdServerManagementById(id);
+ }
+
+ /**
+ * 查询服务器管理列表
+ *
+ * @param ardServerInfo 服务器管理
+ * @return 服务器管理
+ */
+ @Override
+ public List<ArdServerInfo> selectArdServerManagementList(ArdServerInfo ardServerInfo)
+ {
+ return ardServerInfoMapper.selectArdServerManagementList(ardServerInfo);
+ }
+
+ /**
+ * 新增服务器管理
+ *
+ * @param ardServerInfo 服务器管理
+ * @return 结果
+ */
+ @Override
+ public int insertArdServerManagement(ArdServerInfo ardServerInfo) {
+ ardServerInfo.setId(IdUtils.fastUUID());
+ return ardServerInfoMapper.insertArdServerManagement(ardServerInfo);
+ }
+
+ /**
+ * 修改服务器管理
+ *
+ * @param ardServerInfo 服务器管理
+ * @return 结果
+ */
+ @Override
+ public int updateArdServerManagement(ArdServerInfo ardServerInfo)
+ {
+ return ardServerInfoMapper.updateArdServerManagement(ardServerInfo);
+ }
+
+ /**
+ * 批量删除服务器管理
+ *
+ * @param ids 需要删除的服务器管理主键
+ * @return 结果
+ */
+ @Override
+ public int deleteArdServerManagementByIds(String[] ids)
+ {
+ return ardServerInfoMapper.deleteArdServerManagementByIds(ids);
+ }
+
+ /**
+ * 删除服务器管理信息
+ *
+ * @param id 服务器管理主键
+ * @return 结果
+ */
+ @Override
+ public int deleteArdServerManagementById(String id)
+ {
+ return ardServerInfoMapper.deleteArdServerManagementById(id);
+ }
+}
diff --git a/ard-work/src/main/resources/mapper/ArdDroneManagementMapper.xml b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
similarity index 96%
rename from ard-work/src/main/resources/mapper/ArdDroneManagementMapper.xml
rename to ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
index 13eea6e..798b274 100644
--- a/ard-work/src/main/resources/mapper/ArdDroneManagementMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.work.mapper.ArdDroneManagementMapper">
+<mapper namespace="com.ard.work.mapper.ArdDroneInfoMapper">
- <resultMap type="DroneInfo" id="ArdDroneManagementResult">
+ <resultMap type="ArdDroneInfo" id="ArdDroneManagementResult">
<result property="id" column="id" />
<result property="deviceModel" column="device_model" />
<result property="deviceSn" column="device_sn" />
diff --git a/ard-work/src/main/resources/mapper/ArdServerManagementMapper.xml b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
similarity index 97%
rename from ard-work/src/main/resources/mapper/ArdServerManagementMapper.xml
rename to ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
index 2294591..dbdceda 100644
--- a/ard-work/src/main/resources/mapper/ArdServerManagementMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.work.mapper.ArdServerManagementMapper">
+<mapper namespace="com.ard.work.mapper.ArdServerInfoMapper">
- <resultMap type="ServerInfo" id="ArdServerManagementResult">
+ <resultMap type="ArdServerInfo" id="ArdServerManagementResult">
<result property="id" column="id" />
<result property="serverName" column="server_name" />
<result property="host" column="host" />
--
Gitblit v1.9.3