河道删除、河道详情

src/main/java/com/taauav/admin/controller/TauvDriverController.java

@@ -93,6 +93,18 @@ public class TauvDriverController {
         return iTauvDriverService.add(driver);
     }
 
+    /**
+     * 删除设备
+     *
+     * @param id 设备ID
+     * @return
+     */
+    @PostMapping("/drop")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
+    public Response drop(@RequestBody Integer id) {
+        return iTauvDriverService.drop(id);
+    }
+
     /**
      * 查看河道详细数据
      *

src/main/java/com/taauav/admin/controller/TauvEquipmentController.java

@@ -109,7 +109,7 @@ public class TauvEquipmentController {
      */
     @PostMapping("/drop")
     @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
-    public Response drop(Integer id) {
+    public Response drop(@RequestBody Integer id) {
         return iTauvEquipmentService.drop(id);
     }
 

src/main/java/com/taauav/admin/controller/TauvMountEquipmentController.java

@@ -100,7 +100,7 @@ public class TauvMountEquipmentController extends BaseController {
      */
     @PostMapping("/drop")
     @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
-    public Response drop(Integer id) {
+    public Response drop(@RequestBody Integer id) {
         return tauvMountEquipmentService.drop(id);
     }
 

src/main/java/com/taauav/admin/service/ITauvDriverService.java

@@ -40,6 +40,14 @@ public interface ITauvDriverService extends IBaseService<TauvDriver> {
      */
     Response add(TauvDriver driver);
 
+    /**
+     * 根据ID删除河道
+     *
+     * @param id 河道ID
+     * @return
+     */
+    Response drop(Integer id);
+
     /**
      * 根据河道编号获取数据
      *

src/main/java/com/taauav/admin/service/impl/TauvDriverServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.taauav.admin.entity.LsAdmin;
+import com.taauav.admin.entity.TauvEquipment;
 import com.taauav.admin.mapper.LsAdminMapper;
 import com.taauav.admin.query.TauvDriverQuery;
 import com.taauav.admin.service.ISysCityService;
@@ -16,6 +17,7 @@ import com.taauav.admin.mapper.TauvDriverMapper;
 import com.taauav.admin.service.ISysAdminService;
 import com.taauav.admin.service.ITauvDriverService;
 import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -158,6 +160,28 @@ public class TauvDriverServiceImpl extends BaseServiceImpl<TauvDriverMapper, Tau
         return response.success("添加成功");
     }
 
+    /**
+     * 根据ID删除河道
+     *
+     * @param id 河道ID
+     * @return
+     */
+    @Override
+    public Response drop(Integer id) {
+        if (id == null || id <= 0) {
+            return response.failure("河道ID不存在");
+        }
+        TauvDriver entity = driverMapper.selectById(id);
+        if (entity == null) {
+            return response.failure("河道信息不存在");
+        }
+        boolean result = this.deleteById(id, entity);
+        if (!result) {
+            return response.failure("删除失败");
+        }
+        return response.success("删除成功");
+    }
+
     /**
      * 根据编号获取数据
      *
@@ -190,7 +214,8 @@ public class TauvDriverServiceImpl extends BaseServiceImpl<TauvDriverMapper, Tau
         map.put("start_point", info.getStartPoint());
         map.put("end_point", info.getEndPoint());
         map.put("type_list", driver.getTypeList());
-        map.put("format_create_time", driver.getCreateTime());
+        map.put("format_create_time", DateUtil.format(info.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+        map.put("note", info.getNote());
         SysAdmin adminInfo = null;
         if (info.getCreateUser() > 0) {
             adminInfo = iSysAdminService.findById(info.getCreateUser());