From cf3482e6a4d40713cc09d107f11092c8db2e245a Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 五月 2026 17:18:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 262 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 754d93f..7f7a44d 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -1,18 +1,39 @@
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.core.toolkit.ObjectUtils;
+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.ProductModelAnticlockwiseDto;
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.SecurityUtils;
+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.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.script.DefaultRedisScript;
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 javax.validation.constraints.NotNull;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
/**
* 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice涓氬姟灞傚鐞�
@@ -23,7 +44,14 @@
@Service
@AllArgsConstructor
public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, ProductModel> implements IProductModelService {
+ private static final String PRODUCT_MODEL_LOCK_PREFIX = "product_model_anticlockwise:";
+ private static final long LOCK_WAIT_TIMEOUT_SECONDS = 10L;
+ private static final long LOCK_EXPIRE_TIME_SECONDS = 30L;
+ private static final String FINISHED_PRODUCT_NAME = "\u6210\u54c1";
+ private final RedisTemplate redisTemplate;
+ private final ProductMapper productMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
private ProductModelMapper productModelMapper;
@Override
@@ -31,15 +59,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));
}
@@ -47,6 +82,230 @@
public List<ProductModel> selectModelList(ProductDto productDto) {
LambdaQueryWrapper<ProductModel> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ProductModel::getProductId, productDto.getId());
+ queryWrapper.eq(productDto.getCreateUser() != null, ProductModel::getCreateUser, productDto.getCreateUser());
+ queryWrapper.eq(productDto.getDeptId() != null, ProductModel::getDeptId, productDto.getDeptId());
+ if (ObjectUtils.isNotEmpty(productDto.getDeptIds())) {
+ queryWrapper.in( ProductModel::getDeptId, Arrays.asList(productDto.getDeptIds()));
+ }
return productModelMapper.selectList(queryWrapper);
}
+
+ @Override
+ public List<ProductModel> selectModelListByProductIds(@NotNull List<Long> ids) {
+ return productModelMapper.selectModelListByProductIds(ids);
+ }
+
+ /**
+ * 鏍规嵁id鏌ヨ浜у搧瑙勬牸鍒嗛〉鏌ヨ
+ *
+ * @param page
+ * @param productDto
+ * @return
+ */
+ @Override
+ public IPage<ProductModel> modelListPage(Page page, ProductDto productDto) {
+ LambdaQueryWrapper<ProductModel> queryWrapper = new LambdaQueryWrapper<>();
+ 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("瀵煎叆澶辫触");
+ }
+ }
+
+ //鍙嶅悜鏂板鎴愬搧浜у搧锛屽彧鏈夐攢鍞叧鑱旀柊澧炵殑鏃跺�欒皟鐢�
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long productModelAnticlockwise(ProductModelAnticlockwiseDto productModelDto) {
+ Long deptId = SecurityUtils.getDeptId()[0];
+
+ // 濡傛灉鎻愪緵浜咺D锛岀洿鎺ユ洿鏂�
+ if (ObjectUtils.isNotEmpty(productModelDto.getId())) {
+ return updateProductModelById(productModelDto, deptId);
+ }
+
+ // 妫�鏌ユ槸鍚﹀凡瀛樺湪鐩稿悓鐨勪骇鍝佸瀷鍙�
+ ProductModel existingModel = productModelMapper.selectOldProductModel(
+ productModelDto.getModel(), productModelDto.getProductName()
+ );
+ if (existingModel != null) {
+ return updateExistingProductModel(existingModel, productModelDto, deptId);
+ }
+
+ // 鏂板鏃堕渶瑕佸姞閿侀槻姝㈠苟鍙戝垱寤�
+ String lockKey = buildProductModelLockKey(FINISHED_PRODUCT_NAME,
+ productModelDto.getProductName(), productModelDto.getModel());
+ String lockValue = UUID.randomUUID().toString();
+ acquireLock(lockKey, lockValue);
+ try {
+ Long productId = getOrCreateProduct(productModelDto.getProductName(), deptId);
+
+ ProductModel productModel = new ProductModel();
+ productModel.setProductId(productId);
+ productModel.setModel(productModelDto.getModel());
+ productModel.setUnit(productModelDto.getUnit());
+ productModel.setSubUnit(productModelDto.getSubUnit());
+ productModel.setDeptId(deptId);
+ productModelMapper.insert(productModel);
+ return productModel.getId();
+ } finally {
+ releaseLock(lockKey, lockValue);
+ }
+ }
+
+ private Long updateProductModelById(ProductModelAnticlockwiseDto productModelDto, Long deptId) {
+ ProductModel productModel = productModelMapper.selectById(productModelDto.getId());
+ if (productModel == null) {
+ throw new ServiceException("浜у搧鍨嬪彿涓嶅瓨鍦�");
+ }
+ return updateExistingProductModel(productModel, productModelDto, deptId);
+ }
+
+ private Long updateExistingProductModel(ProductModel productModel, ProductModelAnticlockwiseDto dto, Long deptId) {
+ productModel.setModel(dto.getModel());
+ productModel.setUnit(dto.getUnit());
+ productModel.setSubUnit(dto.getSubUnit());
+ productModel.setDeptId(deptId);
+ productModelMapper.updateById(productModel);
+
+ updateProductName(productModel.getProductId(), dto.getProductName(), deptId);
+ return productModel.getId();
+ }
+
+ private Long getOrCreateProduct(String productName, Long deptId) {
+ // 鑾峰彇鎴栧垱寤虹埗浜у搧"鎴愬搧"
+ Product parentProduct = getOrCreateParentProduct(FINISHED_PRODUCT_NAME, deptId);
+
+ // 鏌ユ壘鎴栧垱寤哄叿浣撲骇鍝�
+ Product product = productMapper.selectOne(new QueryWrapper<Product>().lambda()
+ .eq(Product::getProductName, productName)
+ .eq(Product::getParentId, parentProduct.getId())
+ .last("limit 1"));
+
+ if (product == null) {
+ product = new Product();
+ product.setProductName(productName);
+ product.setParentId(parentProduct.getId());
+ product.setDeptId(deptId);
+ productMapper.insert(product);
+ }
+ return product.getId();
+ }
+
+ private Product getOrCreateParentProduct(String parentName, Long deptId) {
+ Product parentProduct = productMapper.selectOne(new QueryWrapper<Product>().lambda()
+ .eq(Product::getProductName, parentName)
+ .last("limit 1"));
+
+ if (parentProduct == null) {
+ parentProduct = new Product();
+ parentProduct.setProductName(parentName);
+ parentProduct.setDeptId(deptId);
+ productMapper.insert(parentProduct);
+ }
+ return parentProduct;
+ }
+
+ private void updateProductName(Long productId, String productName, Long deptId) {
+ Product product = productMapper.selectById(productId);
+ if (product != null) {
+ product.setProductName(productName);
+ product.setDeptId(deptId);
+ productMapper.updateById(product);
+ }
+ }
+
+ private String buildProductModelLockKey(String parentName, String productName, String model) {
+ return PRODUCT_MODEL_LOCK_PREFIX + parentName + ":" + productName + ":" + model;
+ }
+
+ private void acquireLock(String lockKey, String lockValue) {
+ long startWaitTime = System.currentTimeMillis();
+ while (System.currentTimeMillis() - startWaitTime < LOCK_WAIT_TIMEOUT_SECONDS * 1000) {
+ Boolean locked = redisTemplate.opsForValue().setIfAbsent(
+ lockKey, lockValue, LOCK_EXPIRE_TIME_SECONDS, TimeUnit.SECONDS
+ );
+ if (Boolean.TRUE.equals(locked)) {
+ return;
+ }
+ try {
+ Thread.sleep(100L);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new ServiceException("Get product model lock interrupted");
+ }
+ }
+ throw new ServiceException("Get product model lock timeout");
+ }
+
+ private void releaseLock(String lockKey, String lockValue) {
+ String luaScript = "if redis.call('GET', KEYS[1]) == ARGV[1] then return redis.call('DEL', KEYS[1]) else return 0 end";
+ redisTemplate.execute(
+ new DefaultRedisScript<>(luaScript, Long.class),
+ Collections.singletonList(lockKey),
+ lockValue
+ );
+ }
+
}
--
Gitblit v1.9.3