From e8344a2b6edeb48c76ceceb19fbe3d83bcb85731 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 11 二月 2026 15:37:20 +0800
Subject: [PATCH] fix: 导入产品规格型号去重
---
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 93 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 6953d6e..9382134 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -1,20 +1,32 @@
package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ProductModelDto;
+import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductModelService;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice涓氬姟灞傚鐞�
@@ -26,6 +38,8 @@
@AllArgsConstructor
public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, ProductModel> implements IProductModelService {
+ private final ProductMapper productMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
private ProductModelMapper productModelMapper;
@Override
@@ -33,15 +47,22 @@
if (productModelDto.getId() == null) {
ProductModel productModel = new ProductModel();
- BeanUtils.copyProperties(productModelDto,productModel);
+ BeanUtils.copyProperties(productModelDto, productModel);
return productModelMapper.insert(productModel);
} else {
return productModelMapper.updateById(productModelDto);
}
}
+
@Override
public int delProductModel(Long[] ids) {
+ List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(new QueryWrapper<SalesLedgerProduct>()
+ .lambda().in(SalesLedgerProduct::getProductModelId, ids));
+ if (salesLedgerProducts != null && salesLedgerProducts.size() > 0) {
+
+ throw new RuntimeException("宸茬粡瀛樺湪璇ヤ骇鍝佺殑閿�鍞彴璐﹀拰閲囪喘鍙拌处");
+ }
return productModelMapper.deleteBatchIds(Arrays.asList(ids));
}
@@ -54,6 +75,7 @@
/**
* 鏍规嵁id鏌ヨ浜у搧瑙勬牸鍒嗛〉鏌ヨ
+ *
* @param page
* @param productDto
* @return
@@ -64,4 +86,69 @@
queryWrapper.eq(ProductModel::getProductId, productDto.getId());
return productModelMapper.selectPage(page, queryWrapper);
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult importProductModel(MultipartFile file, Integer productId) {
+ if (productId == null) {
+ return AjaxResult.error("璇峰厛閫夋嫨浜у搧鍐嶅鍏ヨ鏍煎瀷鍙�");
+ }
+
+ Product product = productMapper.selectById(productId);
+ if (product == null) {
+ return AjaxResult.error("閫夋嫨鐨勪骇鍝佷笉瀛樺湪");
+ }
+
+ try {
+ ExcelUtil<ProductModel> productModelExcelUtil = new ExcelUtil<>(ProductModel.class);
+ List<ProductModel> productModelList = productModelExcelUtil.importExcel(file.getInputStream());
+
+ if (CollectionUtils.isEmpty(productModelList)) {
+ return AjaxResult.error("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+
+ // 鑾峰彇褰撳墠浜у搧涓嬫墍鏈夌殑瑙勬牸鍨嬪彿鍚�
+ List<ProductModel> existingModels = list(new LambdaQueryWrapper<ProductModel>().eq(ProductModel::getProductId, productId));
+ Set<String> existingModelNames = existingModels.stream().map(ProductModel::getModel).collect(Collectors.toSet());
+
+ List<ProductModel> waitToSaveList = new ArrayList<>();
+ int skipCount = 0;
+
+ for (int i = 0; i < productModelList.size(); i++) {
+ ProductModel item = productModelList.get(i);
+ int rowNum = i + 2;
+
+ if (StringUtils.isEmpty(item.getModel())) {
+ return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [瑙勬牸鍨嬪彿] 涓嶈兘涓虹┖");
+ }
+ if (StringUtils.isEmpty(item.getUnit())) {
+ return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [鍗曚綅] 涓嶈兘涓虹┖");
+ }
+
+ // 鍘婚噸,濡傛灉宸插寘鍚鍨嬪彿,鍒欒烦杩�
+ if (existingModelNames.contains(item.getModel())) {
+ skipCount++;
+ continue;
+ }
+
+ item.setProductId(product.getId());
+ waitToSaveList.add(item);
+
+ existingModelNames.add(item.getModel());
+ }
+
+ if (!waitToSaveList.isEmpty()) {
+ saveBatch(waitToSaveList);
+ }
+
+ if (skipCount == 0) {
+ return AjaxResult.success(String.format("鎴愬姛瀵煎叆 %d 鏉℃暟鎹�", waitToSaveList.size()));
+ } else {
+ return AjaxResult.success(String.format("鎴愬姛瀵煎叆 %d 鏉★紝璺宠繃宸插瓨鍦ㄦ暟鎹� %d 鏉�", waitToSaveList.size(), skipCount));
+ }
+ } catch (Exception e) {
+ log.error("瀵煎叆浜у搧瑙勬牸寮傚父", e);
+ throw new ServiceException("瀵煎叆澶辫触");
+ }
+ }
}
--
Gitblit v1.9.3