Xiajijian
2025-10-11 04e3622c2153eef89d8552c313c502a70cae725d
1.解决报错问题,统一文件名称。
8 files modified
28 ■■■■■ changed files
ard-admin/src/main/java/com/ard/web/controller/data/ArdDroneController.java 2 ●●●●● patch | view | raw | blame | history
ard-admin/src/main/java/com/ard/web/controller/data/ArdMapManagementController.java 2 ●●●●● patch | view | raw | blame | history
ard-admin/src/main/java/com/ard/web/controller/data/ArdModelManagementController.java 2 ●●●●● patch | view | raw | blame | history
ard-admin/src/main/java/com/ard/web/controller/data/ArdServerController.java 2 ●●●●● patch | view | raw | blame | history
ard-admin/src/main/java/com/ard/web/controller/data/ArdTileManagementController.java 2 ●●●●● patch | view | raw | blame | history
ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java 6 ●●●●● patch | view | raw | blame | history
ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml 6 ●●●●● patch | view | raw | blame | history
ard-work/src/main/resources/mapper/ArdServerInfoMapper.xml 6 ●●●●● patch | view | raw | blame | history
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
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
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
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
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
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;
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>
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>