From 0146a1483a3368f75daa6eb03aa42c714943e6b2 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 17 九月 2025 14:11:28 +0800
Subject: [PATCH] Merge branch 'feature_asset'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
index 7c928c0..583b616 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
@@ -15,6 +15,7 @@
import com.ruoyi.system.vo.asset.AssetTypeTreeVO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@@ -191,7 +192,7 @@
childQueryWrapper.eq(AssetType::getParentId, id);
long childCount = this.count(childQueryWrapper);
if (childCount > 0) {
- throw new ServiceException("该资产类型存在子类型，不能删除");
+ throw new ServiceException(String.format("【%s】存在子类型，不能删除", existingAssetType.getTypeName()));
}
// 校验是否有关联的资产记录
@@ -199,11 +200,67 @@
assetMainQueryWrapper.eq(AssetMain::getAssetTypeId, id);
long assetMainCount = assetMainService.count(assetMainQueryWrapper);
if (assetMainCount > 0) {
- throw new ServiceException("该资产类型已关联资产记录，不能删除");
+ throw new ServiceException(String.format("【%s】已关联资产记录，不能删除", existingAssetType.getTypeName()));
}
// 删除资产类型
this.removeById(id);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void batchDeleteAssetType(List<Integer> ids) {
+ // 校验ID列表是否为空
+ if (CollUtil.isEmpty(ids)) {
+ throw new ServiceException("删除的资产类型ID列表不能为空");
+ }
+
+ // 收集删除失败的信息
+ List<String> failedMessages = new ArrayList<>();
+
+ // 逐个删除资产类型
+ for (Integer id : ids) {
+ try {
+ this.deleteAssetType(id);
+ } catch (ServiceException e) {
+ failedMessages.add(e.getMessage());
+ }
+ }
+
+ // 如果有删除失败的情况，抛出异常
+ if (CollUtil.isNotEmpty(failedMessages)) {
+ throw new ServiceException("批量删除失败：" + String.join("；", failedMessages));
+ }
+ }
+
+ @Override
+ public String getAssetCodePrefix(Integer assetTypeId) {
+ if (assetTypeId == null) {
+ throw new ServiceException("资产类型ID不能为空");
+ }
+
+ // 查询当前资产类型
+ AssetType currentAssetType = this.getById(assetTypeId);
+ if (currentAssetType == null) {
+ throw new ServiceException("资产类型不存在");
+ }
+
+ String parentTypeCode = "";
+ String subTypeCode = currentAssetType.getTypeCode();
+
+ // 如果是二级分类，需要获取父级分类的简写
+ if (currentAssetType.getLevel() == 2 && currentAssetType.getParentId() != null && currentAssetType.getParentId() != 0) {
+ AssetType parentAssetType = this.getById(currentAssetType.getParentId());
+ if (parentAssetType != null) {
+ parentTypeCode = parentAssetType.getTypeCode();
+ }
+ } else if (currentAssetType.getLevel() == 1) {
+ // 如果是一级分类，父级简写为空，子类简写就是当前类型简写
+ parentTypeCode = currentAssetType.getTypeCode();
+ subTypeCode = "";
+ }
+
+ return parentTypeCode + subTypeCode;
+ }
+
}
--
Gitblit v1.7.1