forked from uav/ard-uav-server
ard-work/src/main/java/com/ard/work/domain/data/DroneInfo.java
@@ -8,7 +8,7 @@ import lombok.Data; /** * 无人机管理对象 ard_drone_management * 无人机管理对象 ard_drone_info * * @author xia * @date 2025-10-10 @@ -22,31 +22,24 @@ private String id; /** 设备型号 */ @Excel(name = "设备型号") private String deviceModel; /** 设备SN */ @Excel(name = "设备SN") private String deviceSn; /** 设备名称 */ @Excel(name = "设备名称") private String deviceName; /** 工作状态 */ @Excel(name = "工作状态") private String deviceStatus; /** 加入时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "加入时间", width = 30, dateFormat = "yyyy-MM-dd") private Date deviceAddTime; /** 在线时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "在线时间", width = 30, dateFormat = "yyyy-MM-dd") private Date onlineTime; private String ServerInfoId; /** 服务器管理ID */ private String serverInfoId; } ard-work/src/main/java/com/ard/work/domain/data/ServerInfo.java
@@ -9,7 +9,7 @@ import lombok.Data; /** * 服务器管理对象 ard_server_management * 服务器管理对象 ard_server_info * * @author xia * @date 2025-10-10 ard-work/src/main/java/com/ard/work/service/impl/ArdDroneManagementServiceImpl.java
@@ -1,5 +1,6 @@ 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; @@ -39,8 +40,7 @@ * @return 无人机管理 */ @Override public List<DroneInfo> selectArdDroneManagementList(DroneInfo droneInfo) { public List<DroneInfo> selectArdDroneManagementList(DroneInfo droneInfo) { return ardDroneManagementMapper.selectArdDroneManagementList(droneInfo); } @@ -51,8 +51,8 @@ * @return 结果 */ @Override public int insertArdDroneManagement(DroneInfo droneInfo) { public int insertArdDroneManagement(DroneInfo droneInfo) { droneInfo.setId(IdUtils.fastUUID()); return ardDroneManagementMapper.insertArdDroneManagement(droneInfo); }
@@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ard.work.mapper.ArdDroneManagementMapper"> <resultMap type="ArdDroneManagement" id="ArdDroneManagementResult"> <resultMap type="DroneInfo" id="ArdDroneManagementResult"> <result property="id" column="id" /> <result property="deviceModel" column="device_model" /> <result property="deviceSn" column="device_sn" /> @@ -12,6 +12,7 @@ <result property="deviceStatus" column="device_status" /> <result property="deviceAddTime" column="device_add_time" /> <result property="onlineTime" column="online_time" /> <result property="serverInfoId" column="server_info_id" /> </resultMap> <sql id="selectArdDroneManagementVo"> @@ -21,8 +22,9 @@ device_name, device_status, device_add_time, online_time from ard_drone_management online_time, server_info_id from ard_drone_info </sql> <select id="selectArdDroneManagementList" parameterType="ArdDroneManagement" resultMap="ArdDroneManagementResult"> @@ -43,7 +45,7 @@ </select> <insert id="insertArdDroneManagement" parameterType="ArdDroneManagement"> insert into ard_drone_management insert into ard_drone_info <trim prefix="(" suffix=")" suffixOverrides=","> <if test="id != null">id,</if> <if test="deviceModel != null">device_model,</if> @@ -52,6 +54,7 @@ <if test="deviceStatus != null">device_status,</if> <if test="deviceAddTime != null">device_add_time,</if> <if test="onlineTime != null">online_time,</if> <if test="serverInfoId != null">server_info_id,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null">#{id},</if> @@ -61,11 +64,12 @@ <if test="deviceStatus != null">#{deviceStatus},</if> <if test="deviceAddTime != null">#{deviceAddTime},</if> <if test="onlineTime != null">#{onlineTime},</if> <if test="serverInfoId != null">#{serverInfoId},</if> </trim> </insert> <update id="updateArdDroneManagement" parameterType="ArdDroneManagement"> update ard_drone_management update ard_drone_info <trim prefix="SET" suffixOverrides=","> <if test="deviceModel != null">device_model = #{deviceModel},</if> <if test="deviceSn != null">device_sn = #{deviceSn},</if> @@ -73,16 +77,17 @@ <if test="deviceStatus != null">device_status = #{deviceStatus},</if> <if test="deviceAddTime != null">device_add_time = #{deviceAddTime},</if> <if test="onlineTime != null">online_time = #{onlineTime},</if> <if test="serverInfoId != null">server_info_id = #{serverInfoId},</if> </trim> where id = #{id} </update> <delete id="deleteArdDroneManagementById" parameterType="String"> delete from ard_drone_management where id = #{id} delete from ard_drone_info where id = #{id} </delete> <delete id="deleteArdDroneManagementByIds" parameterType="String"> delete from ard_drone_management where id in delete from ard_drone_info where id in <foreach item="id" collection="array" open="(" separator="," close=")"> #{id} </foreach> ard-work/src/main/resources/mapper/ArdServerManagementMapper.xml
@@ -4,15 +4,14 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ard.work.mapper.ArdServerManagementMapper"> <resultMap type="ArdServerManagement" id="ArdServerManagementResult"> <resultMap type="ServerInfo" 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="tcpPort" column="tcp_port" /> <result property="httpPort" column="http_port" /> <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" /> @@ -24,9 +23,8 @@ select id, server_name, host, host_pont, tcp_server, tcp_port, http_port, access_key_id, access_key_secret, longitude, @@ -34,7 +32,7 @@ altitude, user_id, dept_id from ard_server_management from ard_server_info </sql> <select id="selectArdServerManagementList" parameterType="ArdServerManagement" resultMap="ArdServerManagementResult"> @@ -50,16 +48,15 @@ </select> <insert id="insertArdServerManagement" parameterType="ArdServerManagement"> insert into ard_server_management insert into ard_server_info <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="tcpPort != null">tcp_port,</if> <if test="httpPort != null">http_port,</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> @@ -70,11 +67,10 @@ <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="tcpPort != null">#{tcpPort},</if> <if test="httpPort != null">#{httpPort},</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> @@ -84,15 +80,14 @@ </insert> <update id="updateArdServerManagement" parameterType="ArdServerManagement"> update ard_server_management update ard_server_info <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="tcpPort != null">tcp_port = #{tcpPort},</if> <if test="httpPort != null">http_port = #{httpPort},</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> @@ -103,11 +98,11 @@ </update> <delete id="deleteArdServerManagementById" parameterType="String"> delete from ard_server_management where id = #{id} delete from ard_server_info where id = #{id} </delete> <delete id="deleteArdServerManagementByIds" parameterType="String"> delete from ard_server_management where id in delete from ard_server_info where id in <foreach item="id" collection="array" open="(" separator="," close=")"> #{id} </foreach>
