ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneManagementController.java
@@ -4,8 +4,8 @@ import javax.servlet.http.HttpServletResponse; import com.ard.common.utils.poi.ExcelUtil; import com.ard.data.domain.ArdDroneManagement; import com.ard.data.service.IArdDroneManagementService; import com.ard.work.domain.data.DroneInfo; import com.ard.work.service.IArdDroneManagementService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -44,9 +44,9 @@ @ApiOperation("查询无人机管理列表") @PreAuthorize("@ss.hasPermi('system:management:list')") @GetMapping("/list") public TableDataInfo list(ArdDroneManagement ardDroneManagement) { public TableDataInfo list(DroneInfo droneInfo) { startPage(); List<ArdDroneManagement> list = ardDroneManagementService.selectArdDroneManagementList(ardDroneManagement); List<DroneInfo> list = ardDroneManagementService.selectArdDroneManagementList(droneInfo); 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, ArdDroneManagement ardDroneManagement) { List<ArdDroneManagement> list = ardDroneManagementService.selectArdDroneManagementList(ardDroneManagement); ExcelUtil<ArdDroneManagement> util = new ExcelUtil<ArdDroneManagement>(ArdDroneManagement.class); public void export(HttpServletResponse response, DroneInfo droneInfo) { List<DroneInfo> list = ardDroneManagementService.selectArdDroneManagementList(droneInfo); ExcelUtil<DroneInfo> util = new ExcelUtil<DroneInfo>(DroneInfo.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 ArdDroneManagement ardDroneManagement) { return toAjax(ardDroneManagementService.insertArdDroneManagement(ardDroneManagement)); public AjaxResult add(@RequestBody DroneInfo droneInfo) { return toAjax(ardDroneManagementService.insertArdDroneManagement(droneInfo)); } /** @@ -91,8 +91,8 @@ @PreAuthorize("@ss.hasPermi('system:management:edit')") @Log(title = "无人机管理", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ArdDroneManagement ardDroneManagement) { return toAjax(ardDroneManagementService.updateArdDroneManagement(ardDroneManagement)); public AjaxResult edit(@RequestBody DroneInfo droneInfo) { return toAjax(ardDroneManagementService.updateArdDroneManagement(droneInfo)); } /** ard-admin/src/main/java/com/ard/web/controller/data/ArdServerManagementController.java
@@ -3,8 +3,8 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ard.data.domain.ArdServerManagement; import com.ard.data.service.IArdServerManagementService; import com.ard.work.domain.data.ServerInfo; import com.ard.work.service.IArdServerManagementService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -44,9 +44,9 @@ @ApiOperation("查询服务器管理列表") @PreAuthorize("@ss.hasPermi('system:management:list')") @GetMapping("/list") public TableDataInfo list(ArdServerManagement ardServerManagement) { public TableDataInfo list(ServerInfo serverInfo) { startPage(); List<ArdServerManagement> list = ardServerManagementService.selectArdServerManagementList(ardServerManagement); List<ServerInfo> list = ardServerManagementService.selectArdServerManagementList(serverInfo); 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, ArdServerManagement ardServerManagement) { List<ArdServerManagement> list = ardServerManagementService.selectArdServerManagementList(ardServerManagement); ExcelUtil<ArdServerManagement> util = new ExcelUtil<ArdServerManagement>(ArdServerManagement.class); public void export(HttpServletResponse response, ServerInfo serverInfo) { List<ServerInfo> list = ardServerManagementService.selectArdServerManagementList(serverInfo); ExcelUtil<ServerInfo> util = new ExcelUtil<ServerInfo>(ServerInfo.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 ArdServerManagement ardServerManagement) { return toAjax(ardServerManagementService.insertArdServerManagement(ardServerManagement)); public AjaxResult add(@RequestBody ServerInfo serverInfo) { return toAjax(ardServerManagementService.insertArdServerManagement(serverInfo)); } /** @@ -91,8 +91,8 @@ @PreAuthorize("@ss.hasPermi('system:management:edit')") @Log(title = "服务器管理", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ArdServerManagement ardServerManagement) { return toAjax(ardServerManagementService.updateArdServerManagement(ardServerManagement)); public AjaxResult edit(@RequestBody ServerInfo serverInfo) { return toAjax(ardServerManagementService.updateArdServerManagement(serverInfo)); } /** ard-system/src/main/java/com/ard/data/domain/ArdServerManagement.java
File was deleted ard-system/src/main/resources/mapper/system/ArdServerManagementMapper.xml
File was deleted ard-work/src/main/java/com/ard/work/domain/data/DroneInfo.java
File was renamed from ard-system/src/main/java/com/ard/data/domain/ArdDroneManagement.java @@ -1,4 +1,4 @@ package com.ard.data.domain; package com.ard.work.domain.data; import java.util.Date; @@ -14,7 +14,7 @@ * @date 2025-10-10 */ @Data public class ArdDroneManagement extends BaseEntity { public class DroneInfo extends BaseEntity { private static final long serialVersionUID = 1L; @@ -47,4 +47,6 @@ @Excel(name = "在线时间", width = 30, dateFormat = "yyyy-MM-dd") private Date onlineTime; private String ServerInfoId; } ard-work/src/main/java/com/ard/work/domain/data/ServerInfo.java
New file @@ -0,0 +1,63 @@ package com.ard.work.domain.data; 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; /** * 服务器管理对象 ard_server_management * * @author xia * @date 2025-10-10 */ @Data public class ServerInfo extends BaseEntity { private static final long serialVersionUID = 1L; /** ID */ private String id; /** 名称 */ private String serverName; /** 环境地址 */ private String host; /** 环境地址端口 */ private String hostPort; /** 访问密钥ID */ private String accessKeyId; /** 访问密钥秘密 */ private String accessKeySecret; /** tcp服务器地址 */ private String tcpServer; /** tcp端口 */ private String tcpPort; /** 经度 */ private Double longitude; /** 纬度 */ private Double latitude; /** 高层 */ private Double altitude; /** 用户ID */ private Long userId; /** 部门ID */ private Long deptId; private List<DroneInfo> droneInfoList; } ard-work/src/main/java/com/ard/work/mapper/ArdDroneManagementMapper.java
File was renamed from ard-system/src/main/java/com/ard/data/mapper/ArdDroneManagementMapper.java @@ -1,6 +1,6 @@ package com.ard.data.mapper; package com.ard.work.mapper; import com.ard.data.domain.ArdDroneManagement; import com.ard.work.domain.data.DroneInfo; import java.util.List; @@ -18,31 +18,31 @@ * @param id 无人机管理主键 * @return 无人机管理 */ public ArdDroneManagement selectArdDroneManagementById(String id); public DroneInfo selectArdDroneManagementById(String id); /** * 查询无人机管理列表 * * @param ardDroneManagement 无人机管理 * @param droneInfo 无人机管理 * @return 无人机管理集合 */ public List<ArdDroneManagement> selectArdDroneManagementList(ArdDroneManagement ardDroneManagement); public List<DroneInfo> selectArdDroneManagementList(DroneInfo droneInfo); /** * 新增无人机管理 * * @param ardDroneManagement 无人机管理 * @param droneInfo 无人机管理 * @return 结果 */ public int insertArdDroneManagement(ArdDroneManagement ardDroneManagement); public int insertArdDroneManagement(DroneInfo droneInfo); /** * 修改无人机管理 * * @param ardDroneManagement 无人机管理 * @param droneInfo 无人机管理 * @return 结果 */ public int updateArdDroneManagement(ArdDroneManagement ardDroneManagement); public int updateArdDroneManagement(DroneInfo droneInfo); /** * 删除无人机管理 ard-work/src/main/java/com/ard/work/mapper/ArdServerManagementMapper.java
File was renamed from ard-system/src/main/java/com/ard/data/mapper/ArdServerManagementMapper.java @@ -1,6 +1,5 @@ package com.ard.data.mapper; import com.ard.data.domain.ArdServerManagement; package com.ard.work.mapper; import com.ard.work.domain.data.ServerInfo; import java.util.List; @@ -18,31 +17,31 @@ * @param id 服务器管理主键 * @return 服务器管理 */ public ArdServerManagement selectArdServerManagementById(String id); public ServerInfo selectArdServerManagementById(String id); /** * 查询服务器管理列表 * * @param ardServerManagement 服务器管理 * @param serverInfo 服务器管理 * @return 服务器管理集合 */ public List<ArdServerManagement> selectArdServerManagementList(ArdServerManagement ardServerManagement); public List<ServerInfo> selectArdServerManagementList(ServerInfo serverInfo); /** * 新增服务器管理 * * @param ardServerManagement 服务器管理 * @param serverInfo 服务器管理 * @return 结果 */ public int insertArdServerManagement(ArdServerManagement ardServerManagement); public int insertArdServerManagement(ServerInfo serverInfo); /** * 修改服务器管理 * * @param ardServerManagement 服务器管理 * @param serverInfo 服务器管理 * @return 结果 */ public int updateArdServerManagement(ArdServerManagement ardServerManagement); public int updateArdServerManagement(ServerInfo serverInfo); /** * 删除服务器管理 ard-work/src/main/java/com/ard/work/service/IArdDroneManagementService.java
File was renamed from ard-system/src/main/java/com/ard/data/service/IArdDroneManagementService.java @@ -1,6 +1,6 @@ package com.ard.data.service; package com.ard.work.service; import com.ard.data.domain.ArdDroneManagement; import com.ard.work.domain.data.DroneInfo; import java.util.List; @@ -18,31 +18,31 @@ * @param id 无人机管理主键 * @return 无人机管理 */ public ArdDroneManagement selectArdDroneManagementById(String id); public DroneInfo selectArdDroneManagementById(String id); /** * 查询无人机管理列表 * * @param ardDroneManagement 无人机管理 * @param droneInfo 无人机管理 * @return 无人机管理集合 */ public List<ArdDroneManagement> selectArdDroneManagementList(ArdDroneManagement ardDroneManagement); public List<DroneInfo> selectArdDroneManagementList(DroneInfo droneInfo); /** * 新增无人机管理 * * @param ardDroneManagement 无人机管理 * @param droneInfo 无人机管理 * @return 结果 */ public int insertArdDroneManagement(ArdDroneManagement ardDroneManagement); public int insertArdDroneManagement(DroneInfo droneInfo); /** * 修改无人机管理 * * @param ardDroneManagement 无人机管理 * @param droneInfo 无人机管理 * @return 结果 */ public int updateArdDroneManagement(ArdDroneManagement ardDroneManagement); public int updateArdDroneManagement(DroneInfo droneInfo); /** * 批量删除无人机管理 ard-work/src/main/java/com/ard/work/service/IArdServerManagementService.java
File was renamed from ard-system/src/main/java/com/ard/data/service/IArdServerManagementService.java @@ -1,6 +1,5 @@ package com.ard.data.service; import com.ard.data.domain.ArdServerManagement; package com.ard.work.service; import com.ard.work.domain.data.ServerInfo; import java.util.List; @@ -18,31 +17,31 @@ * @param id 服务器管理主键 * @return 服务器管理 */ public ArdServerManagement selectArdServerManagementById(String id); public ServerInfo selectArdServerManagementById(String id); /** * 查询服务器管理列表 * * @param ardServerManagement 服务器管理 * @param serverInfo 服务器管理 * @return 服务器管理集合 */ public List<ArdServerManagement> selectArdServerManagementList(ArdServerManagement ardServerManagement); public List<ServerInfo> selectArdServerManagementList(ServerInfo serverInfo); /** * 新增服务器管理 * * @param ardServerManagement 服务器管理 * @param serverInfo 服务器管理 * @return 结果 */ public int insertArdServerManagement(ArdServerManagement ardServerManagement); public int insertArdServerManagement(ServerInfo serverInfo); /** * 修改服务器管理 * * @param ardServerManagement 服务器管理 * @param serverInfo 服务器管理 * @return 结果 */ public int updateArdServerManagement(ArdServerManagement ardServerManagement); public int updateArdServerManagement(ServerInfo serverInfo); /** * 批量删除服务器管理 ard-work/src/main/java/com/ard/work/service/impl/ArdDroneManagementServiceImpl.java
File was renamed from ard-system/src/main/java/com/ard/data/service/impl/ArdDroneManagementServiceImpl.java @@ -1,12 +1,12 @@ package com.ard.data.service.impl; package com.ard.work.service.impl; import java.util.List; import com.ard.data.domain.ArdDroneManagement; import com.ard.data.mapper.ArdDroneManagementMapper; import com.ard.data.service.IArdDroneManagementService; 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业务层处理 @@ -27,7 +27,7 @@ * @return 无人机管理 */ @Override public ArdDroneManagement selectArdDroneManagementById(String id) public DroneInfo selectArdDroneManagementById(String id) { return ardDroneManagementMapper.selectArdDroneManagementById(id); } @@ -35,37 +35,37 @@ /** * 查询无人机管理列表 * * @param ardDroneManagement 无人机管理 * @param droneInfo 无人机管理 * @return 无人机管理 */ @Override public List<ArdDroneManagement> selectArdDroneManagementList(ArdDroneManagement ardDroneManagement) public List<DroneInfo> selectArdDroneManagementList(DroneInfo droneInfo) { return ardDroneManagementMapper.selectArdDroneManagementList(ardDroneManagement); return ardDroneManagementMapper.selectArdDroneManagementList(droneInfo); } /** * 新增无人机管理 * * @param ardDroneManagement 无人机管理 * @param droneInfo 无人机管理 * @return 结果 */ @Override public int insertArdDroneManagement(ArdDroneManagement ardDroneManagement) public int insertArdDroneManagement(DroneInfo droneInfo) { return ardDroneManagementMapper.insertArdDroneManagement(ardDroneManagement); return ardDroneManagementMapper.insertArdDroneManagement(droneInfo); } /** * 修改无人机管理 * * @param ardDroneManagement 无人机管理 * @param droneInfo 无人机管理 * @return 结果 */ @Override public int updateArdDroneManagement(ArdDroneManagement ardDroneManagement) public int updateArdDroneManagement(DroneInfo droneInfo) { return ardDroneManagementMapper.updateArdDroneManagement(ardDroneManagement); return ardDroneManagementMapper.updateArdDroneManagement(droneInfo); } /** ard-work/src/main/java/com/ard/work/service/impl/ArdServerManagementServiceImpl.java
File was renamed from ard-system/src/main/java/com/ard/data/service/impl/ArdServerManagementServiceImpl.java @@ -1,12 +1,13 @@ package com.ard.data.service.impl; package com.ard.work.service.impl; import java.util.List; import com.ard.data.domain.ArdServerManagement; import com.ard.data.mapper.ArdServerManagementMapper; import com.ard.data.service.IArdServerManagementService; 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业务层处理 @@ -27,7 +28,7 @@ * @return 服务器管理 */ @Override public ArdServerManagement selectArdServerManagementById(String id) public ServerInfo selectArdServerManagementById(String id) { return ardServerManagementMapper.selectArdServerManagementById(id); } @@ -35,37 +36,37 @@ /** * 查询服务器管理列表 * * @param ardServerManagement 服务器管理 * @param serverInfo 服务器管理 * @return 服务器管理 */ @Override public List<ArdServerManagement> selectArdServerManagementList(ArdServerManagement ardServerManagement) public List<ServerInfo> selectArdServerManagementList(ServerInfo serverInfo) { return ardServerManagementMapper.selectArdServerManagementList(ardServerManagement); return ardServerManagementMapper.selectArdServerManagementList(serverInfo); } /** * 新增服务器管理 * * @param ardServerManagement 服务器管理 * @param serverInfo 服务器管理 * @return 结果 */ @Override public int insertArdServerManagement(ArdServerManagement ardServerManagement) { return ardServerManagementMapper.insertArdServerManagement(ardServerManagement); public int insertArdServerManagement(ServerInfo serverInfo) { serverInfo.setId(IdUtils.fastUUID()); return ardServerManagementMapper.insertArdServerManagement(serverInfo); } /** * 修改服务器管理 * * @param ardServerManagement 服务器管理 * @param serverInfo 服务器管理 * @return 结果 */ @Override public int updateArdServerManagement(ArdServerManagement ardServerManagement) public int updateArdServerManagement(ServerInfo serverInfo) { return ardServerManagementMapper.updateArdServerManagement(ardServerManagement); return ardServerManagementMapper.updateArdServerManagement(serverInfo); } /** ard-work/src/main/resources/mapper/ArdDroneManagementMapper.xml
File was renamed from ard-system/src/main/resources/mapper/system/ArdDroneManagementMapper.xml @@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ard.data.mapper.ArdDroneManagementMapper"> <mapper namespace="com.ard.work.mapper.ArdDroneManagementMapper"> <resultMap type="ArdDroneManagement" id="ArdDroneManagementResult"> <result property="id" column="id" /> ard-work/src/main/resources/mapper/ArdServerManagementMapper.xml
New file @@ -0,0 +1,115 @@ <?xml version="1.0" encoding="UTF-8" ?> <!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"> <resultMap type="ArdServerManagement" id="ArdServerManagementResult"> <result property="id" column="id" /> <result property="serverName" column="server_name" /> <result property="host" column="host" /> <result property="hostPort" column="host_pont" /> <result property="accessKeyId" column="access_key_id" /> <result property="accessKeySecret" column="access_key_secret" /> <result property="tcpServer" column="tcp_server" /> <result property="tcpPort" column="tcp_port" /> <result property="longitude" column="longitude" /> <result property="latitude" column="latitude" /> <result property="altitude" column="altitude" /> <result property="userId" column="user_id" /> <result property="deptId" column="dept_id" /> </resultMap> <sql id="selectArdServerManagementVo"> select id, server_name, host, host_pont, tcp_server, tcp_port, access_key_id, access_key_secret, longitude, latitude, altitude, user_id, dept_id from ard_server_management </sql> <select id="selectArdServerManagementList" parameterType="ArdServerManagement" resultMap="ArdServerManagementResult"> <include refid="selectArdServerManagementVo"/> <where> <if test="serverName != null and serverName != ''"> and server_name like concat('%', #{serverName}, '%')</if> </where> </select> <select id="selectArdServerManagementById" parameterType="String" resultMap="ArdServerManagementResult"> <include refid="selectArdServerManagementVo"/> where id = #{id} </select> <insert id="insertArdServerManagement" parameterType="ArdServerManagement"> insert into ard_server_management <trim prefix="(" suffix=")" suffixOverrides=","> <if test="id != null">id,</if> <if test="serverName != null">server_name,</if> <if test="host != null">host,</if> <if test="hostPort != null">host_pont,</if> <if test="accessKeyId != null">access_key_id,</if> <if test="accessKeySecret != null">access_key_secret,</if> <if test="tcpServer != null">tcp_server,</if> <if test="tcpPort != null">tcp_port,</if> <if test="longitude != null">longitude,</if> <if test="latitude != null">latitude,</if> <if test="altitude != null">altitude,</if> <if test="userId != null">user_id,</if> <if test="deptId != null">dept_id,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null">#{id},</if> <if test="serverName != null">#{serverName},</if> <if test="host != null">#{host},</if> <if test="hostPort != null">#{hostPort},</if> <if test="accessKeyId != null">#{accessKeyId},</if> <if test="accessKeySecret != null">#{accessKeySecret},</if> <if test="tcpServer != null">#{tcpServer},</if> <if test="tcpPort != null">#{tcpPort},</if> <if test="longitude != null">#{longitude},</if> <if test="latitude != null">#{latitude},</if> <if test="altitude != null">#{altitude},</if> <if test="userId != null">#{userId},</if> <if test="deptId != null">#{deptId},</if> </trim> </insert> <update id="updateArdServerManagement" parameterType="ArdServerManagement"> update ard_server_management <trim prefix="SET" suffixOverrides=","> <if test="serverName != null">server_name = #{serverName},</if> <if test="host != null">host = #{host},</if> <if test="hostPort != null">host_pont = #{hostPort},</if> <if test="accessKeyId != null">access_key_id = #{accessKeyId},</if> <if test="accessKeySecret != null">access_key_secret = #{accessKeySecret},</if> <if test="tcpServer != null">tcp_server = #{tcpServer},</if> <if test="tcpPort != null">tcp_port = #{tcpPort},</if> <if test="longitude != null">longitude = #{longitude},</if> <if test="latitude != null">latitude = #{latitude},</if> <if test="altitude != null">altitude = #{altitude},</if> <if test="userId != null">user_id = #{userId},</if> <if test="deptId != null">dept_id = #{deptId},</if> </trim> where id = #{id} </update> <delete id="deleteArdServerManagementById" parameterType="String"> delete from ard_server_management where id = #{id} </delete> <delete id="deleteArdServerManagementByIds" parameterType="String"> delete from ard_server_management where id in <foreach item="id" collection="array" open="(" separator="," close=")"> #{id} </foreach> </delete> </mapper>