From 9cd4074a456fd5c422506279191b6015836347e5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 10:08:35 +0800
Subject: [PATCH] feat: 设备台账启用状态、审批签核展示与导入健壮性
---
src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java | 73 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
index 154923d..bce327f 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
@@ -23,6 +24,7 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
@@ -45,6 +47,11 @@
public IPage<DeviceLedgerDto> queryPage(Page page, DeviceLedgerDto deviceLedger) {
return deviceLedgerMapper.queryPage(page, deviceLedger);
+ }
+
+ @Override
+ public List<DeviceLedgerDto> selectDeviceOptions(Long areaId) {
+ return deviceLedgerMapper.selectDeviceOptions(areaId);
}
@Override
@@ -138,29 +145,59 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Boolean importData(MultipartFile file) throws IOException {
ExcelUtil<DeviceLedgerExeclDto> util = new ExcelUtil<DeviceLedgerExeclDto>(DeviceLedgerExeclDto.class);
List<DeviceLedgerExeclDto> userList = util.importExcel(file.getInputStream());
- userList.forEach(c -> {
- DeviceLedger deviceLedger = new DeviceLedger();
- SysUser sysUser = sysUserMapper.selectUserByUserName(c.getCreateUser());
- if (sysUser!=null) {
- deviceLedger.setCreateUser(sysUser.getUserId().intValue());
- }else {
- deviceLedger.setCreateUser(SecurityUtils.getUserId().intValue());
+ if (userList == null || userList.isEmpty()) {
+ // 琛ㄥご涓庢ā鏉夸笉涓�鑷存椂瑙ｆ瀽涓嶅埌浠讳綍鏁版嵁锛屾槑纭彁绀猴紝閬垮厤鍓嶇鍙湅鍒扳�滃鍏ユ垚鍔熲�濆嵈娌℃湁浠讳綍鏁版嵁
+ throw new ServiceException("鏈鍙栧埌鍙鍏ョ殑鏁版嵁锛岃纭鏂囦欢琛ㄥご涓庡鍏ユā鏉夸竴鑷村悗閲嶈瘯");
+ }
+ int importCount = 0;
+ for (int i = 0; i < userList.size(); i++) {
+ DeviceLedgerExeclDto c = userList.get(i);
+ if (c == null) {
+ continue;
}
- BeanUtils.copyProperties(c,deviceLedger);
- // 閫氳繃鍚◣鍗曚环銆佹暟閲忋�佺◣鐜囪绠楀惈绋庢�讳环锛屼笉鍚◣鎬讳环
- deviceLedger.setTaxIncludingPriceTotal(c.getTaxIncludingPriceUnit());
- deviceLedger.setNumber(BigDecimal.ONE);
- deviceLedger.setPlanRuntimeTime(DateUtils.toLocalDate(c.getPlanRuntimeTime()));
- // 璁＄畻涓嶅惈绋庢�讳环锛屽鐞嗙┖鍊兼儏鍐�
- if (deviceLedger.getTaxIncludingPriceTotal() != null && c.getTaxRate() != null) {
- deviceLedger.setUnTaxIncludingPriceTotal(deviceLedger.getTaxIncludingPriceTotal().divide(BigDecimal.ONE.add(c.getTaxRate()), 2, RoundingMode.HALF_UP));
+ DeviceLedger deviceLedger;
+ try {
+ deviceLedger = buildDeviceLedger(c);
+ } catch (Exception e) {
+ throw new ServiceException("绗�" + (i + 2) + "琛屾暟鎹湁璇細" + e.getMessage());
}
- deviceLedgerMapper.insert(deviceLedger);
- });
-
+ try {
+ deviceLedgerMapper.insert(deviceLedger);
+ } catch (Exception e) {
+ throw new ServiceException("绗�" + (i + 2) + "琛屼繚瀛樺け璐ワ細" + e.getMessage());
+ }
+ importCount++;
+ }
+ if (importCount == 0) {
+ throw new ServiceException("鏈鍙栧埌鍙鍏ョ殑鏁版嵁锛岃纭鏂囦欢琛ㄥご涓庡鍏ユā鏉夸竴鑷村悗閲嶈瘯");
+ }
return true;
}
+
+ /**
+ * 灏嗗鍏ヨ杞崲涓鸿澶囧彴璐﹀疄浣�
+ */
+ private DeviceLedger buildDeviceLedger(DeviceLedgerExeclDto c) {
+ DeviceLedger deviceLedger = new DeviceLedger();
+ SysUser sysUser = sysUserMapper.selectUserByUserName(c.getCreateUser());
+ if (sysUser != null) {
+ deviceLedger.setCreateUser(sysUser.getUserId().intValue());
+ } else {
+ deviceLedger.setCreateUser(SecurityUtils.getUserId().intValue());
+ }
+ BeanUtils.copyProperties(c, deviceLedger);
+ // 閫氳繃鍚◣鍗曚环銆佹暟閲忋�佺◣鐜囪绠楀惈绋庢�讳环锛屼笉鍚◣鎬讳环
+ deviceLedger.setTaxIncludingPriceTotal(c.getTaxIncludingPriceUnit());
+ deviceLedger.setNumber(BigDecimal.ONE);
+ deviceLedger.setPlanRuntimeTime(DateUtils.toLocalDate(c.getPlanRuntimeTime()));
+ // 璁＄畻涓嶅惈绋庢�讳环锛屽鐞嗙┖鍊兼儏鍐�
+ if (deviceLedger.getTaxIncludingPriceTotal() != null && c.getTaxRate() != null) {
+ deviceLedger.setUnTaxIncludingPriceTotal(deviceLedger.getTaxIncludingPriceTotal().divide(BigDecimal.ONE.add(c.getTaxRate()), 2, RoundingMode.HALF_UP));
+ }
+ return deviceLedger;
+ }
}
--
Gitblit v1.9.3