From 1e4fb529057bce6d3bb5936c9a785952019d198e Mon Sep 17 00:00:00 2001
From: zhuangtianxiang <2913129173@qq.com>
Date: Wed, 8 Jan 2025 10:17:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor(exception):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E5=B9=B6=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 ApiExceptionHandler 中的重复异常处理方法
- 在 PropertyServiceImpl 中使用自定义 ApiException 替代 RuntimeException- 删除 DeviceService 中未使用的导入
- 移除 SpringSecurityConfig 中的 @EnableWebSecurity 注解
---
 .../edu/gateway/exception/ApiExceptionHandler.java    | 11 +++++------
 .../framework/security/SpringSecurityConfig.java      |  1 -
 .../modules/iot/device/service/DeviceService.java     |  3 ---
 .../iot/tsl/service/impl/PropertyServiceImpl.java     |  7 ++++---
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zsc/edu/gateway/exception/ApiExceptionHandler.java b/src/main/java/com/zsc/edu/gateway/exception/ApiExceptionHandler.java
index 7cd4acd..fa08f91 100644
--- a/src/main/java/com/zsc/edu/gateway/exception/ApiExceptionHandler.java
+++ b/src/main/java/com/zsc/edu/gateway/exception/ApiExceptionHandler.java
@@ -65,11 +65,10 @@ public class ApiExceptionHandler {
         return new ResponseEntity<>(objectMapper.writeValueAsString(Map.of("msg", ex.getMessage())), HttpStatus.INTERNAL_SERVER_ERROR);
     }
 
-    //TODO 冲突
-    @ExceptionHandler(value = {Exception.class})
-    public ResponseEntity<Object> handleException(Exception ex) throws JsonProcessingException {
-        log.error("Exception: {}", objectMapper.writeValueAsString(Map.of("msg", ex.getMessage())));
-        return new ResponseEntity<>(objectMapper.writeValueAsString(Map.of("msg", ex.getMessage())), HttpStatus.INTERNAL_SERVER_ERROR);
-    }
+//    @ExceptionHandler(value = {Exception.class})
+//    public ResponseEntity<Object> handleException(Exception ex) throws JsonProcessingException {
+//        log.error("Exception: {}", objectMapper.writeValueAsString(Map.of("msg", ex.getMessage())));
+//        return new ResponseEntity<>(objectMapper.writeValueAsString(Map.of("msg", ex.getMessage())), HttpStatus.INTERNAL_SERVER_ERROR);
+//    }
 
 }
diff --git a/src/main/java/com/zsc/edu/gateway/framework/security/SpringSecurityConfig.java b/src/main/java/com/zsc/edu/gateway/framework/security/SpringSecurityConfig.java
index 5e84d1a..c7771f7 100644
--- a/src/main/java/com/zsc/edu/gateway/framework/security/SpringSecurityConfig.java
+++ b/src/main/java/com/zsc/edu/gateway/framework/security/SpringSecurityConfig.java
@@ -33,7 +33,6 @@ import javax.sql.DataSource;
 @AllArgsConstructor
 @EnableMethodSecurity
 @Configuration
-@EnableWebSecurity
 public class SpringSecurityConfig {
 
     private final UserDetailsService userDetailsService;
diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java
index 8e60ed5..5191757 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java
@@ -1,14 +1,11 @@
 package com.zsc.edu.gateway.modules.iot.device.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zsc.edu.gateway.modules.iot.device.dto.BatchDeviceDto;
 import com.zsc.edu.gateway.modules.iot.device.dto.DeviceDto;
 import com.zsc.edu.gateway.modules.iot.device.dto.DeviceServeDto;
 import com.zsc.edu.gateway.modules.iot.device.entity.Device;
 import com.zsc.edu.gateway.modules.iot.device.entity.DeviceDiff;
-import com.zsc.edu.gateway.modules.iot.device.query.DeviceQuery;
 import com.zsc.edu.gateway.modules.iot.device.vo.DeviceVo;
 
 import java.util.List;
diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/PropertyServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/PropertyServiceImpl.java
index 0454538..f4f7a1e 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/PropertyServiceImpl.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/service/impl/PropertyServiceImpl.java
@@ -1,6 +1,7 @@
 package com.zsc.edu.gateway.modules.iot.tsl.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zsc.edu.gateway.exception.ApiException;
 import com.zsc.edu.gateway.modules.iot.tsl.dto.PropertyDto;
 import com.zsc.edu.gateway.modules.iot.tsl.entity.Property;
 import com.zsc.edu.gateway.modules.iot.tsl.mapper.PropertyMapper;
@@ -25,7 +26,7 @@ public class PropertyServiceImpl extends ServiceImpl<PropertyRepository, Propert
     @Override
     public Property create(PropertyDto dto) {
         if (baseMapper.findByName(dto.getName()) != null) {
-            throw new RuntimeException("该属性已存在！");
+            throw new ApiException("该属性已存在！");
         }
         Property property = mapper.toEntity(dto);
         save(property);
@@ -40,7 +41,7 @@ public class PropertyServiceImpl extends ServiceImpl<PropertyRepository, Propert
     public Property update(PropertyDto dto, Long id) {
         Property property = baseMapper.selectById(id);
         if (property == null) {
-            throw new RuntimeException("Serve not found with id: " + id);
+            throw new ApiException("Serve not found with id: " + id);
         }
         mapper.convert(dto, property);
         baseMapper.updateById(property);
@@ -51,7 +52,7 @@ public class PropertyServiceImpl extends ServiceImpl<PropertyRepository, Propert
     public Property detail(Long id) {
         Property property = baseMapper.selectById(id);
         if (property == null) {
-            throw new RuntimeException("属性不存在！请检查输入ID是否正确！");
+            throw new ApiException("属性不存在！请检查输入ID是否正确！");
         }
         return property;
     }