fix: "设备删除bug修复"

src/main/java/com/szwl/controller/TEquipmentDeletedController.java

@@ -1,5 +1,6 @@
 package com.szwl.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.szwl.manager.TokenManager;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
@@ -7,11 +8,13 @@ import com.szwl.model.bo.UserDetailBO;
 import com.szwl.model.entity.IDRequest;
 import com.szwl.model.entity.TAdmin;
 import com.szwl.model.entity.TEquipment;
+import com.szwl.model.entity.TEquipmentDeleted;
 import com.szwl.service.TAdminService;
 import com.szwl.service.TEquipmentDeletedService;
 import com.szwl.service.TEquipmentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,6 +23,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
+import java.util.Objects;
+
 import static com.szwl.constant.ResponseCodesEnum.P0002;
 
 /**
@@ -67,13 +72,25 @@ public class TEquipmentDeletedController {
         // 如果不为空，并且类型是 0 1 就执行以下操作
         if (adminType != null && (adminType == 0 || adminType == 1)) {
             // 查询当前设备信息
-            TEquipment tEquipment = tEquipmentService.getById(equipmentId);
+
+//            LambdaQueryWrapper<TEquipment> lambdaQueryWrapper = Wrappers.lambdaQuery();
+//            lambdaQueryWrapper.eq(TEquipment::getId, equipmentId);
+//            TEquipment tEquipment = tEquipmentService.getOne(lambdaQueryWrapper);
+//            TEquipment tEquipment = tEquipmentService.getById(equipmentId);
+            TEquipment tEquipment = tEquipmentService.getOne(Wrappers.<TEquipment>lambdaQuery().eq(TEquipment::getId, equipmentId));
             System.out.println(tEquipment);
-            // 先把准备删除的设备信息添加到t_equipment_deleted表中
-            tEquipmentDeletedService.addOne(tEquipment);
-            // 删除设备
-            tEquipmentService.removeById(equipmentId);
-            return R.ok(null, "设备已删除！");
+            if (Objects.nonNull(tEquipment)) {
+                // 先把准备删除的设备信息添加到t_equipment_deleted表中
+                TEquipmentDeleted tEquipmentDeleted = new TEquipmentDeleted();
+                BeanUtils.copyProperties(tEquipment, tEquipmentDeleted);
+//            tEquipmentDeletedService.addOne(tEquipment);
+                tEquipmentDeletedService.save(tEquipmentDeleted);
+                // 删除设备
+                tEquipmentService.removeById(equipmentId);
+                return R.ok(null, "设备已删除！");
+            } else {
+                return R.fail(null, "设备不存在");
+            }
 
         }
         // 如果没有删除权限 不做处理