feat(业务异常相关): 将所有手动抛出的异常调整为业务异常

koala-projects · Oct 18, 2023 · 6ef50a1 · 6ef50a1
1 parent 4b7570d
commit 6ef50a1
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 18 deletions.
diff --git a/...-domains/koala-attachment/src/main/java/cn/koala/attachment/AttachmentEntityListener.java b/...-domains/koala-attachment/src/main/java/cn/koala/attachment/AttachmentEntityListener.java
@@ -2,6 +2,7 @@
 
 import cn.koala.attachment.repository.AttachmentRepository;
 import cn.koala.attachment.storage.AttachmentStorage;
+import cn.koala.web.BusinessException;
 import jakarta.persistence.PreRemove;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;
@@ -31,9 +32,9 @@ public AttachmentEntityListener(AttachmentRepository repository, AttachmentStora
   @PreRemove
   public void preDelete(AttachmentEntity entity) {
     try {
-      storage.remove(this.repository.load(entity.getId()).orElseThrow(() -> new IllegalArgumentException("附件不存在")));
+      storage.remove(this.repository.load(entity.getId()).orElseThrow(() -> new BusinessException("附件不存在")));
     } catch (Exception e) {
-      throw new IllegalStateException("附件删除失败, 请联系服务管理员", e);
+      throw new BusinessException("附件删除失败, 请联系服务管理员", e);
     }
   }
 }
diff --git a/...ains/koala-attachment/src/main/java/cn/koala/attachment/support/DefaultAttachmentApi.java b/...ains/koala-attachment/src/main/java/cn/koala/attachment/support/DefaultAttachmentApi.java
@@ -5,6 +5,7 @@
 import cn.koala.attachment.AttachmentEntity;
 import cn.koala.attachment.AttachmentService;
 import cn.koala.attachment.storage.AttachmentStorage;
+import cn.koala.web.BusinessException;
 import cn.koala.web.DataResponse;
 import cn.koala.web.Response;
 import jakarta.servlet.ServletOutputStream;
@@ -61,7 +62,7 @@ public DataResponse<Attachment> upload(MultipartFile attachment) {
       this.service.create(result);
       return DataResponse.ok(result);
     } catch (Exception e) {
-      throw new IllegalStateException("文件上传失败, 请联系服务管理员", e);
+      throw new BusinessException("文件上传失败, 请联系服务管理员", e);
     }
   }
 
@@ -78,7 +79,7 @@ public void download(Long id, HttpServletResponse response) {
         IOUtils.copy(inputStream, outputStream);
       }
     } catch (Exception e) {
-      throw new IllegalStateException("文件下载失败, 请联系服务管理员", e);
+      throw new BusinessException("文件下载失败, 请联系服务管理员", e);
     }
   }
 }
diff --git a/...-domains/koala-code-gen/src/main/java/cn/koala/codegen/support/DefaultCodeGenService.java b/...-domains/koala-code-gen/src/main/java/cn/koala/codegen/support/DefaultCodeGenService.java
@@ -8,6 +8,7 @@
 import cn.koala.template.Template;
 import cn.koala.template.TemplateGroupService;
 import cn.koala.toolkit.CompressHelper;
+import cn.koala.web.BusinessException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
@@ -45,7 +46,7 @@ public String download(Long databaseId, List<String> tableNames, Long templateGr
       CompressHelper.compress(root, new File(downloadPath + result), ArchiveStreamFactory.ZIP);
       return result;
     } catch (Exception e) {
-      throw new IllegalStateException("生成代码文件失败", e);
+      throw new BusinessException("生成代码文件失败", e);
     }
   }
 

diff --git a/...code-gen/src/main/java/cn/koala/codegen/support/domain/DomainCodeGenContextProcessor.java b/...code-gen/src/main/java/cn/koala/codegen/support/domain/DomainCodeGenContextProcessor.java
@@ -7,6 +7,7 @@
 import cn.koala.database.DatabaseTable;
 import cn.koala.database.DatabaseTableColumn;
 import cn.koala.toolkit.name.Name;
+import cn.koala.web.BusinessException;
 
 import java.util.List;
 import java.util.Map;
@@ -71,7 +72,7 @@ private DomainProperty processDomainId(DatabaseTable table) {
       .filter(column -> COLUMN_ID_NAME.equals(column.getName()))
       .findFirst()
       .map(this::processDomainProperty)
-      .orElseThrow(() -> new IllegalArgumentException("数据表必须包含名为id的主键列"));
+      .orElseThrow(() -> new BusinessException("数据表必须包含名为id的主键列"));
   }
 
   private List<DomainProperty> processDomainProperties(DatabaseTable table) {

diff --git a/...mains/koala-database/src/main/java/cn/koala/database/services/DefaultDatabaseService.java b/...mains/koala-database/src/main/java/cn/koala/database/services/DefaultDatabaseService.java
@@ -7,6 +7,7 @@
 import cn.koala.database.SimpleDatabaseTableColumn;
 import cn.koala.database.repositories.DatabaseRepository;
 import cn.koala.mybatis.AbstractMyBatisService;
+import cn.koala.web.BusinessException;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -35,7 +36,7 @@ public class DefaultDatabaseService extends AbstractMyBatisService<Database, Lon
 
   @Override
   public List<DatabaseTable> listTable(Long id) {
-    Database database = repository.load(id).orElseThrow(() -> new IllegalArgumentException("数据库不存在"));
+    Database database = repository.load(id).orElseThrow(() -> new BusinessException("数据库不存在"));
     return query(database, (connection) -> {
       ResultSet rs = connection.getMetaData().getTables(database.getCatalog(), database.getSchema(), null, new String[]{"TABLE"});
       List<DatabaseTable> result = new ArrayList<>();
@@ -51,14 +52,14 @@ public List<DatabaseTable> listTable(Long id) {
 
   @Override
   public List<DatabaseTable> listTable(Long id, List<String> names) {
-    Database database = repository.load(id).orElseThrow(() -> new IllegalArgumentException("数据库不存在"));
+    Database database = repository.load(id).orElseThrow(() -> new BusinessException("数据库不存在"));
     Assert.notEmpty(names, "表名列表不能为空");
     return names.stream().map(name -> loadTable(database, name)).toList();
   }
 
   @Override
   public DatabaseTable loadTable(Long id, String name) {
-    Database database = repository.load(id).orElseThrow(() -> new IllegalArgumentException("数据库不存在"));
+    Database database = repository.load(id).orElseThrow(() -> new BusinessException("数据库不存在"));
     Assert.hasLength(name, "表名不能为空");
     return loadTable(database, name);
   }
@@ -67,7 +68,7 @@ protected DatabaseTable loadTable(Database database, String table) {
     return query(database, (connection -> {
       ResultSet rs = connection.getMetaData().getTables(database.getCatalog(), database.getSchema(), table, new String[]{"TABLE"});
       if (!rs.next()) {
-        throw new IllegalArgumentException("表不存在");
+        throw new BusinessException("表不存在");
       }
       return SimpleDatabaseTable.builder()
         .name(rs.getString("TABLE_NAME"))
@@ -123,7 +124,7 @@ protected <R> R query(Database database, ConnectionQuery<R> query) {
     try (Connection connection = getConnection(database)) {
       return query.query(connection);
     } catch (SQLException e) {
-      throw new IllegalStateException("数据库操作异常", e);
+      throw new BusinessException("数据库操作异常", e);
     }
   }
 

diff --git a/koala-domains/koala-ocr/src/main/java/cn/koala/ocr/support/DefaultOcrService.java b/koala-domains/koala-ocr/src/main/java/cn/koala/ocr/support/DefaultOcrService.java
@@ -6,6 +6,7 @@
 import cn.koala.ocr.OcrProcessor;
 import cn.koala.ocr.OcrService;
 import cn.koala.toolkit.MultipartFileHelper;
+import cn.koala.web.BusinessException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
@@ -44,10 +45,10 @@ public List<DetectedObjects.DetectedObject> image(MultipartFile file) {
       return processor.process(OpenCVImageFactory.getInstance().fromInputStream(file.getInputStream())).items();
     } catch (IOException e) {
       LOGGER.error("上传文件[name={}]读取失败", file.getOriginalFilename(), e);
-      throw new IllegalArgumentException("上传文件读取失败");
+      throw new BusinessException("上传文件读取失败");
     } catch (Exception e) {
       LOGGER.error("图片识别失败", e);
-      throw new IllegalStateException("图片识别失败");
+      throw new BusinessException("图片识别失败");
     }
   }
 
@@ -69,10 +70,10 @@ public List<String> pdf(MultipartFile file) {
       }
     } catch (IOException e) {
       LOGGER.error("上传文件[name={}]读取失败", file.getOriginalFilename(), e);
-      throw new IllegalArgumentException("上传文件读取失败");
+      throw new BusinessException("上传文件读取失败");
     } catch (Exception e) {
       LOGGER.error("PDF识别失败", e);
-      throw new IllegalStateException("PDF识别失败");
+      throw new BusinessException("PDF识别失败");
     }
   }
 

diff --git a/koala-domains/koala-query/src/main/java/cn/koala/query/support/JdbcQueryService.java b/koala-domains/koala-query/src/main/java/cn/koala/query/support/JdbcQueryService.java
@@ -4,6 +4,7 @@
 import cn.koala.query.Query;
 import cn.koala.query.QueryService;
 import cn.koala.query.repository.QueryRepository;
+import cn.koala.web.BusinessException;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -29,7 +30,7 @@ public class JdbcQueryService extends AbstractMyBatisService<Query, Long> implem
 
   @Override
   public Page<Map<String, Object>> execute(Long id, Map<String, Object> parameters, Pageable pageable) {
-    Query query = getRepository().load(id).orElseThrow(() -> new IllegalArgumentException("查询不存在"));
+    Query query = getRepository().load(id).orElseThrow(() -> new BusinessException("查询不存在"));
     addPageableParameters(parameters, pageable);
     resetNullParameters(parameters);
     List<Map<String, Object>> result = jdbcTemplate.queryForList(query.getSql(), parameters);

diff --git a/...ala-sensitive-word/src/main/java/cn/koala/sensitive/support/FileSensitiveWordService.java b/...ala-sensitive-word/src/main/java/cn/koala/sensitive/support/FileSensitiveWordService.java
@@ -1,6 +1,7 @@
 package cn.koala.sensitive.support;
 
 import cn.koala.sensitive.SensitiveWordService;
+import cn.koala.web.BusinessException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 
@@ -36,12 +37,12 @@ public List<String> list() {
   @Override
   public void add(String word) {
     LOGGER.debug("[koala-sensitive-word]: 文件敏感词服务不允许新增敏感词");
-    throw new IllegalStateException();
+    throw new BusinessException("文件敏感词服务不允许新增敏感词");
   }
 
   @Override
   public void delete(String word) {
     LOGGER.debug("[koala-sensitive-word]: 文件敏感词服务不允许删除敏感词");
-    throw new IllegalStateException();
+    throw new BusinessException("文件敏感词服务不允许删除敏感词");
   }
 }