ソースを参照

refactor(property): 优化设备和房屋信息删除逻辑

- 修改 ADeviceInfoController 和 ASimplifiedHouseInfoController 中的删除方法,使用 removeBatchId 替代 removeBatchByIds
- 更新 ADeviceInfoServiceImpl 中的删除逻辑,增加返回值
- 修改 CommonExceptionAdvice 中的异常处理,返回具体的异常信息
林仔 10 ヶ月 前
コミット
6a91cae32c

+ 1 - 2
src/main/java/com/zksy/controller/property/ADeviceInfoController.java

@@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
-import java.util.Arrays;
 
 /**
  * @author Administrator
@@ -54,7 +53,7 @@ public class ADeviceInfoController {
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "设备信息删除")
     public AjaxResult delete(@RequestBody String[] ids) {
-        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+        return service.removeBatchId(ids) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
 
     @GetMapping("/getBySimplifiedHouseId")

+ 1 - 3
src/main/java/com/zksy/controller/property/ASimplifiedHouseInfoController.java

@@ -1,7 +1,6 @@
 package com.zksy.controller.property;
 
 import com.zksy.controller.property.dto.ASimplifiedHouseInfoDto;
-import com.zksy.property.domain.AMaintenanceRecords;
 import com.zksy.property.domain.ASimplifiedHouseInfo;
 import com.zksy.property.service.ASimplifiedHouseInfoService;
 import com.zksy.utils.AjaxResult;
@@ -11,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
-import java.util.Arrays;
 
 /**
  * @author Administrator
@@ -61,7 +59,7 @@ public class ASimplifiedHouseInfoController {
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "房屋信息删除")
     public AjaxResult delete(@RequestBody String[] ids) {
-        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+        return service.removeBatchId(ids) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
 
     @GetMapping("/getHouseDetailInfo")

+ 1 - 0
src/main/java/com/zksy/property/service/impl/ADeviceInfoServiceImpl.java

@@ -67,6 +67,7 @@ public class ADeviceInfoServiceImpl extends ServiceImpl<ADeviceInfoMapper, ADevi
             if(deviceInfo != null){
                 this.removeById(id);
             }
+            return true;
         }
         return false;
     }

+ 2 - 1
src/main/java/com/zksy/utils/CommonExceptionAdvice.java

@@ -57,7 +57,8 @@ public class CommonExceptionAdvice {
 
     @ExceptionHandler(Exception.class)
     public Object handleRuntimeException(Exception e) {
-        return processResponse(new CommonException("服务器内部异常", 500));
+        return AjaxResult.error(e.getCause().getMessage());
+//        return processResponse(new CommonException("服务器内部异常", 500));
     }
 
     private ResponseEntity<AjaxResult> processResponse(CommonException e){