Merge remote-tracking branch 'origin/master'

src/main/java/com/sooka/sponest/monitor/uav/controller/CentermonitorTUavController.java

@@ -865,7 +865,7 @@ public class CentermonitorTUavController extends BaseController {
      * 获取无人机详细信息
      */
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    public AjaxResult getInfo(@PathVariable("id") String id) {
         return AjaxResult.success(centermonitorTUavService.selectCentermonitorTUavById(id));
     }
 
@@ -892,7 +892,7 @@ public class CentermonitorTUavController extends BaseController {
      */
     @Log(title = "无人机", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
+    public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(centermonitorTUavService.deleteCentermonitorTUavByIds(ids));
     }
 

src/main/java/com/sooka/sponest/monitor/uav/domain/CentermonitorTUavdept.java

@@ -1,48 +0,0 @@
-package com.sooka.sponest.monitor.uav.domain;
-
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 无人机部门关联对象 centermonitor_t_uavdept
- *
- * @author ruoyi
- * @date 2025-03-19
- */
-@Data
-public class CentermonitorTUavdept extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    private Long id;
-
-    /**
-     * 无人机id
-     */
-    @Excel(name = "无人机id")
-    private Long uavId;
-
-    /**
-     * 无人机名称
-     */
-    @Excel(name = "无人机名称")
-    private String uavName;
-
-    /**
-     * 所属部门id
-     */
-    @Excel(name = "所属部门id")
-    private Long deptId;
-
-    /**
-     * 所属部门名称
-     */
-    @Excel(name = "所属部门名称")
-    private String deptName;
-
-}

src/main/java/com/sooka/sponest/monitor/uav/mapper/CentermonitorTUavMapper.java

@@ -1,7 +1,6 @@
 package com.sooka.sponest.monitor.uav.mapper;
 
 import com.sooka.sponest.monitor.uav.domain.CentermonitorTUav;
-import com.sooka.sponest.monitor.uav.domain.CentermonitorTUavdept;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,7 +18,7 @@ public interface CentermonitorTUavMapper {
      * @param id 无人机主键
      * @return 无人机
      */
-    public CentermonitorTUav selectCentermonitorTUavById(Long id);
+    public CentermonitorTUav selectCentermonitorTUavById(String id);
 
     /**
      * 查询无人机列表
@@ -51,7 +50,7 @@ public interface CentermonitorTUavMapper {
      * @param id 无人机主键
      * @return 结果
      */
-    public int deleteCentermonitorTUavById(Long id);
+    public int deleteCentermonitorTUavById(String id);
 
     /**
      * 批量删除无人机
@@ -59,7 +58,7 @@ public interface CentermonitorTUavMapper {
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCentermonitorTUavByIds(Long[] ids);
+    public int deleteCentermonitorTUavByIds(String[] ids);
 
     /**
      * 根据部门id查询无人机列表

src/main/java/com/sooka/sponest/monitor/uav/service/ICentermonitorTUavService.java

@@ -17,7 +17,7 @@ public interface ICentermonitorTUavService {
      * @param id 无人机主键
      * @return 无人机
      */
-    public CentermonitorTUav selectCentermonitorTUavById(Long id);
+    public CentermonitorTUav selectCentermonitorTUavById(String id);
 
     /**
      * 查询无人机列表
@@ -49,7 +49,7 @@ public interface ICentermonitorTUavService {
      * @param ids 需要删除的无人机主键集合
      * @return 结果
      */
-    public int deleteCentermonitorTUavByIds(Long[] ids);
+    public int deleteCentermonitorTUavByIds(String[] ids);
 
     /**
      * 删除无人机信息
@@ -57,7 +57,7 @@ public interface ICentermonitorTUavService {
      * @param id 无人机主键
      * @return 结果
      */
-    public int deleteCentermonitorTUavById(Long id);
+    public int deleteCentermonitorTUavById(String id);
 
     /**
      * 根据部门id查询无人机列表

src/main/java/com/sooka/sponest/monitor/uav/service/impl/CentermonitorTUavServiceImpl.java

@@ -35,7 +35,7 @@ public class CentermonitorTUavServiceImpl implements ICentermonitorTUavService {
      * @return 无人机
      */
     @Override
-    public CentermonitorTUav selectCentermonitorTUavById(Long id) {
+    public CentermonitorTUav selectCentermonitorTUavById(String id) {
         return centermonitorTUavMapper.selectCentermonitorTUavById(id);
     }
 
@@ -80,7 +80,7 @@ public class CentermonitorTUavServiceImpl implements ICentermonitorTUavService {
      * @return 结果
      */
     @Override
-    public int deleteCentermonitorTUavByIds(Long[] ids) {
+    public int deleteCentermonitorTUavByIds(String[] ids) {
         return centermonitorTUavMapper.deleteCentermonitorTUavByIds(ids);
     }
 
@@ -91,7 +91,7 @@ public class CentermonitorTUavServiceImpl implements ICentermonitorTUavService {
      * @return 结果
      */
     @Override
-    public int deleteCentermonitorTUavById(Long id) {
+    public int deleteCentermonitorTUavById(String id) {
         return centermonitorTUavMapper.deleteCentermonitorTUavById(id);
     }
 

src/main/resources/mapper/monitor/uav/CentermonitorTUavMapper.xml

@@ -47,7 +47,7 @@
         </where>
     </select>
 
-    <select id="selectCentermonitorTUavById" parameterType="Long" resultMap="CentermonitorTUavResult">
+    <select id="selectCentermonitorTUavById" parameterType="String" resultMap="CentermonitorTUavResult">
         <include refid="selectCentermonitorTUavVo"/>
         where id = #{id}
     </select>
@@ -93,7 +93,7 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteCentermonitorTUavById" parameterType="Long">
+    <delete id="deleteCentermonitorTUavById" parameterType="String">
         delete
         from centermonitor_t_uav
         where id = #{id}