r
/
hangtag
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev

This commit is contained in:
wwb 2026-07-10 10:42:39 +08:00
parent f56ec80d51 531f3c6b29
commit 58016881dd
5 changed files with 340 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
hangtag-framework/hangtag-spring-boot-starter-excel/src/main/java/cn/hangtag/framework/excel/core/handler/OmsColumnWidthStyleStrategy.java Normal file
View File

@ -0,0 +1,115 @@
package cn.hangtag.framework.excel.core.handler;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.enums.CellDataTypeEnum;
import com.alibaba.excel.metadata.Head;
import com.alibaba.excel.metadata.data.WriteCellData;
import com.alibaba.excel.util.MapUtils;
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.poi.ss.usermodel.Cell;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Excel 列宽自适应处理器
* 规则：
* 1. 字段上加 @ColumnWidth 则使用注解宽度
* 2. 未加注解 → 自动计算宽度
* 3. 自动宽度不超过设定最大值
*/
public class OmsColumnWidthStyleStrategy extends AbstractColumnWidthStyleStrategy {
private final Map<Integer, Map<Integer, Integer>> cache = MapUtils.newHashMapWithExpectedSize(8);
private final int MAX_COLUMN_WIDTH;
// 缓存：列index → 注解指定宽度（只解析一次）
private final Map<Integer, Integer> annotatedWidthMap = new HashMap<>();
private boolean initialized = false;
public OmsColumnWidthStyleStrategy(int maxColumnWidth) {
MAX_COLUMN_WIDTH = maxColumnWidth;
}
@Override
protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List<WriteCellData<?>> cellDataList, Cell cell,
Head head, Integer relativeRowIndex, Boolean isHead) {
if (!initialized && isHead && relativeRowIndex == 0) {
try {
Class<?> clazz = writeSheetHolder.getClazz(); // 这里才是真正的导出实体类！
Field[] fields = clazz.getDeclaredFields();
for (Field field : fields) {
ExcelProperty excelProperty = field.getAnnotation(ExcelProperty.class);
ColumnWidth columnWidth = field.getAnnotation(ColumnWidth.class);
if (excelProperty != null && columnWidth != null) {
int index = excelProperty.index();
annotatedWidthMap.put(index, columnWidth.value());
}
}
} catch (Exception ignored) {
}
initialized = true;
}
boolean needSetWidth = isHead || !CollectionUtils.isEmpty(cellDataList);
if (!needSetWidth) {
return;
}
Integer columnIndex = cell.getColumnIndex();
// ===================== 优先使用注解宽度 =====================
if (annotatedWidthMap.containsKey(columnIndex)) {
Integer width = annotatedWidthMap.get(columnIndex);
writeSheetHolder.getSheet().setColumnWidth(columnIndex, width * 256);
return;
}
// ===================== 没有注解，走自适应 =====================
Map<Integer, Integer> maxColumnWidthMap = cache.get(writeSheetHolder.getSheetNo());
if (maxColumnWidthMap == null) {
maxColumnWidthMap = new HashMap<>(16);
cache.put(writeSheetHolder.getSheetNo(), maxColumnWidthMap);
}
Integer columnWidth = dataLength(cellDataList, cell, isHead);
if (columnWidth < 0) {
return;
}
if (columnWidth > MAX_COLUMN_WIDTH) {
columnWidth = MAX_COLUMN_WIDTH;
}
Integer maxWidth = maxColumnWidthMap.get(columnIndex);
if (maxWidth == null || columnWidth > maxWidth) {
maxColumnWidthMap.put(columnIndex, columnWidth);
writeSheetHolder.getSheet().setColumnWidth(columnIndex, columnWidth * 256);
}
}
private Integer dataLength(List<WriteCellData<?>> cellDataList, Cell cell, Boolean isHead) {
if (isHead) {
return cell.getStringCellValue().getBytes().length;
}
WriteCellData<?> cellData = cellDataList.get(0);
CellDataTypeEnum type = cellData.getType();
if (type == null) {
return -1;
}
switch (type) {
case STRING:
return cellData.getStringValue().getBytes().length;
case BOOLEAN:
return cellData.getBooleanValue().toString().getBytes().length;
case NUMBER:
return cellData.getNumberValue().toString().getBytes().length;
default:
return -1;
}
}
}

3
hangtag-framework/hangtag-spring-boot-starter-excel/src/main/java/cn/hangtag/framework/excel/core/util/ExcelUtils.java
View File

@ -1,5 +1,6 @@
package cn.hangtag.framework.excel.core.util;
import cn.hangtag.framework.excel.core.handler.OmsColumnWidthStyleStrategy;
import cn.hangtag.framework.excel.core.handler.SelectSheetWriteHandler;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.converters.longconverter.LongStringConverter;
@ -35,7 +36,7 @@ public class ExcelUtils {
// 输出 Excel
EasyExcel.write(response.getOutputStream(), head)
.autoCloseStream(false) // 不要自动关闭，交给 Servlet 自己处理
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 基于 column 长度，自动适配。最大 255 宽度
.registerWriteHandler(new OmsColumnWidthStyleStrategy(80)) // 基于 column 长度，自动适配。最大 80 宽度
.registerWriteHandler(new SelectSheetWriteHandler(head)) // 基于固定 sheet 实现下拉框
.registerConverter(new LongStringConverter()) // 避免 Long 类型丢失精度
.sheet(sheetName).doWrite(data);

6
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoExcelVO.java
View File

@ -2,6 +2,7 @@ package cn.hangtag.module.oms.controller.admin.productinfo.vo;
import cn.hangtag.framework.excel.core.annotations.ExcelColumnSelect;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentStyle;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.alibaba.excel.annotation.write.style.HeadStyle;
@ -48,6 +49,7 @@ public class ProductInfoExcelVO {
@Schema(description = "产品简介")
@ExcelProperty("产品简介")
@HeadFontStyle(color = Font.COLOR_NORMAL)
@ColumnWidth(value = 10)
private String introduction;
@Schema(description = "产品规格-宽")
@ -67,6 +69,10 @@ public class ProductInfoExcelVO {
@ExcelProperty("材质(颜色)")
private String material;
@Schema(description = "单价")
@ExcelProperty("单价")
private String price;
@Schema(description = "备注")
@ExcelProperty("备注")
private String remarks;

2
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productinfo/ProductInfoService.java
View File

@ -77,7 +77,7 @@ public interface ProductInfoService {
/**
* 按产品ID查询价格
*
* @param productId 材质id
* @param productId 材质ide
* @param currency 货币
* @return {@link BigDecimal }
*/

365
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/productinfo/ProductInfoServiceImpl.java
View File

@ -27,17 +27,23 @@ import cn.hangtag.module.oms.service.productprocess.ProductProcessService;
import cn.hutool.cache.CacheUtil;
import cn.hutool.cache.impl.LFUCache;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
import cn.hangtag.module.oms.controller.admin.productinfo.vo.*;
import cn.hangtag.module.oms.dal.dataobject.productinfo.ProductInfoDO;
import cn.hangtag.framework.common.pojo.PageResult;
@ -70,23 +76,24 @@ public class ProductInfoServiceImpl implements ProductInfoService {
private final BrandService brandService;
private final DraftDesignDataService draftDesignDataService;
private final DraftDesignDataMapper draftDesignDataMapper;
private static final int TMP_CACHE_TIME = 1000 * 60;
@Override
@Transactional(rollbackFor = Exception.class)
public Long createProductInfo(ProductInfoSaveReqVO createReqVO) {
// 插入
ProductInfoDO productInfo = BeanUtils.toBean(createReqVO, ProductInfoDO.class);
String code = productInfo.getCode();
if(FuncUtil.isNotEmpty(code)){
checkCode(productInfo.getId(),code);
}else {
if (FuncUtil.isNotEmpty(code)) {
checkCode(productInfo.getId(), code);
} else {
productInfo.setCode(getNewCode());
}
productInfoMapper.insert(productInfo);
List<ProductProcessSaveReqVO> productProcessList = createReqVO.getProductProcessList();
if(FuncUtil.isNotEmpty(productProcessList)){
if (FuncUtil.isNotEmpty(productProcessList)) {
List<ProductProcessDO> subList = new ArrayList<>();
for (ProductProcessSaveReqVO reqVO : productProcessList) {
ProductProcessDO processDO = new ProductProcessDO();
@ -111,13 +118,13 @@ public class ProductInfoServiceImpl implements ProductInfoService {
ProductInfoDO productInfoDO = validateProductInfoExists(updateReqVO.getId());
String code = updateReqVO.getCode();
if(FuncUtil.isNotEmpty(code)){
checkCode(updateReqVO.getId(),code);
}else {
if (FuncUtil.isNotEmpty(code)) {
checkCode(updateReqVO.getId(), code);
} else {
updateReqVO.setCode(getNewCode());
}
List<ProductProcessSaveReqVO> productProcessList = updateReqVO.getProductProcessList();
if(FuncUtil.isNotEmpty(productProcessList)){
if (FuncUtil.isNotEmpty(productProcessList)) {
List<ProductProcessDO> addList = new ArrayList<>();
List<ProductProcessDO> updateList = new ArrayList<>();
for (ProductProcessSaveReqVO reqVO : productProcessList) {
@ -126,29 +133,29 @@ public class ProductInfoServiceImpl implements ProductInfoService {
processDO.setName(reqVO.getName());
processDO.setRemark(reqVO.getRemark());
processDO.setStep(reqVO.getStep());
if(FuncUtil.isEmpty(reqVO.getId())){
if (FuncUtil.isEmpty(reqVO.getId())) {
addList.add(processDO);
}else{
} else {
processDO.setId(reqVO.getId());
updateList.add(processDO);
}
}
if(FuncUtil.isNotEmpty(addList)){
if (FuncUtil.isNotEmpty(addList)) {
productProcessMapper.insertBatch(addList);
}
if(FuncUtil.isNotEmpty(updateList)){
if (FuncUtil.isNotEmpty(updateList)) {
productProcessMapper.updateBatch(updateList);
}
}
// 更新
ProductInfoDO updateObj = BeanUtils.toBean(updateReqVO, ProductInfoDO.class);
productInfoMapper.updateById(updateObj);
if (!FuncUtil.equals(productInfoDO.getBrandId(),updateReqVO.getBrandId())) {
if (!FuncUtil.equals(productInfoDO.getBrandId(), updateReqVO.getBrandId())) {
// 产品的品牌发生变化时
brandService.updateProductCount(updateReqVO.getBrandId());
brandService.updateProductCount(productInfoDO.getBrandId());
}
if (!FuncUtil.equals(productInfoDO.getDraftDesignDataId(),updateReqVO.getDraftDesignDataId())) {
if (!FuncUtil.equals(productInfoDO.getDraftDesignDataId(), updateReqVO.getDraftDesignDataId())) {
// 产品的品牌发生变化时
draftDesignDataService.updateProductCount(productInfoDO.getDraftDesignDataId());
draftDesignDataService.updateProductCount(updateReqVO.getDraftDesignDataId());
@ -177,12 +184,13 @@ public class ProductInfoServiceImpl implements ProductInfoService {
@Override
public ProductInfoDO getProductInfo(Long id) {
ProductInfoDO productInfoDO = productInfoMapper.selectById(id);
if(FuncUtil.isNotEmpty(productInfoDO)){
if (FuncUtil.isNotEmpty(productInfoDO)) {
productInfoDO.setProductTypeName(togProductTypeName(productInfoDO.getProductTypeId()));
}
return productInfoDO;
}
@Override
public ProductInfoRespVO getFrontProductInfo(Long id) {
ProductInfoDO infoDO = productInfoMapper.selectById(id);
@ -201,15 +209,15 @@ public class ProductInfoServiceImpl implements ProductInfoService {
Set<Long> brandIds = new HashSet<>();
for (ProductInfoDO infoDO : list) {
String customerGroupId = infoDO.getCustomerGroupId();
if(FuncUtil.isNotEmpty(customerGroupId)){
if (FuncUtil.isNotEmpty(customerGroupId)) {
groupIds.add(customerGroupId);
}
Long productTypeId = infoDO.getProductTypeId();
if(FuncUtil.isNotEmpty(productTypeId)){
if (FuncUtil.isNotEmpty(productTypeId)) {
productTypeIds.add(productTypeId);
}
Long brandId = infoDO.getBrandId();
if(FuncUtil.isNotEmpty(brandId)){
if (FuncUtil.isNotEmpty(brandId)) {
brandIds.add(brandId);
}
}
@ -225,7 +233,8 @@ public class ProductInfoServiceImpl implements ProductInfoService {
});
return new PageResult<>(resList, productInfoDOPageResult.getTotal());
}
@Override
@Override
public PageResult<ProductInfoExcelVO> exportExcel(ProductInfoPageReqVO pageReqVO) {
PageResult<ProductInfoDO> productInfoDOPageResult = productInfoMapper.selectPage(pageReqVO);
List<ProductInfoDO> list = productInfoDOPageResult.getList();
@ -235,15 +244,15 @@ public class ProductInfoServiceImpl implements ProductInfoService {
Set<Long> brandIds = new HashSet<>();
for (ProductInfoDO infoDO : list) {
String customerGroupId = infoDO.getCustomerGroupId();
if(FuncUtil.isNotEmpty(customerGroupId)){
if (FuncUtil.isNotEmpty(customerGroupId)) {
groupIds.add(customerGroupId);
}
Long productTypeId = infoDO.getProductTypeId();
if(FuncUtil.isNotEmpty(productTypeId)){
if (FuncUtil.isNotEmpty(productTypeId)) {
productTypeIds.add(productTypeId);
}
Long brandId = infoDO.getBrandId();
if(FuncUtil.isNotEmpty(brandId)){
if (FuncUtil.isNotEmpty(brandId)) {
brandIds.add(brandId);
}
}
@ -260,13 +269,26 @@ public class ProductInfoServiceImpl implements ProductInfoService {
vo.setCode(productInfoDO.getCode());
vo.setName(productInfoDO.getName());
vo.setIntroduction(productInfoDO.getProductionInfo());
vo.setSpecWidth(FuncUtil.toStr(productInfoDO.getSpecSizeWidth(),""));
vo.setSpecHeight(FuncUtil.toStr(productInfoDO.getSpecSizeHeight(),""));
vo.setSpecThickness(FuncUtil.toStr(productInfoDO.getSpecSizeThk(),""));
vo.setMaterial(FuncUtil.toStr(productInfoDO.getSpecMaterial(),""));
vo.setSpecWidth(FuncUtil.toStr(productInfoDO.getSpecSizeWidth(), ""));
vo.setSpecHeight(FuncUtil.toStr(productInfoDO.getSpecSizeHeight(), ""));
vo.setSpecThickness(FuncUtil.toStr(productInfoDO.getSpecSizeThk(), ""));
vo.setMaterial(FuncUtil.toStr(productInfoDO.getSpecMaterial(), ""));
vo.setProductType(respVO.getProductTypeName());
vo.setBrandName(respVO.getBrandName());
vo.setRemarks(productInfoDO.getRemark());
String priceList = productInfoDO.getPriceList();
String priceStr = "";
if (FuncUtil.isNotEmpty(priceList)) {
List<JSONObject> jsonObjects = JsonUtil.readList(priceList, JSONObject.class);
for (JSONObject object : jsonObjects) {
// 获取默认单价
if( FuncUtil.toBoolean(object.get("d"),false)){
priceStr =FuncUtil.toStr(object.get("p"));
break;
}
}
}
vo.setPrice(priceStr);
resList.add(vo);
});
return new PageResult<>(resList, productInfoDOPageResult.getTotal());
@ -281,39 +303,40 @@ public class ProductInfoServiceImpl implements ProductInfoService {
return new PageResult<>(resList, productInfoDOPageResult.getTotal());
}
private void checkCode(Long id, String code){
if(FuncUtil.isNotEmpty(code)){
private void checkCode(Long id, String code) {
if (FuncUtil.isNotEmpty(code)) {
LambdaQueryWrapper<ProductInfoDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.select(ProductInfoDO::getId,ProductInfoDO::getCode, BaseDO::getDeleted);
lambdaQueryWrapper.select(ProductInfoDO::getId, ProductInfoDO::getCode, BaseDO::getDeleted);
lambdaQueryWrapper.eq(ProductInfoDO::getCode, code);
lambdaQueryWrapper.eq(ProductInfoDO::getDeleted,false);
lambdaQueryWrapper.eq(ProductInfoDO::getDeleted, false);
List<ProductInfoDO> dos = productInfoMapper.selectList(lambdaQueryWrapper);
if(FuncUtil.isEmpty(id) && FuncUtil.isNotEmpty(dos)){
if (FuncUtil.isEmpty(id) && FuncUtil.isNotEmpty(dos)) {
throw exception(GlobalErrorCodeConstants.DATA_DUPLICATE);
}
if (FuncUtil.isNotEmpty(id) && FuncUtil.isNotEmpty(dos)) {
for (ProductInfoDO aDo : dos) {
// 出现重复并当前id 不一致
if(!FuncUtil.equals(aDo.getId(), id)){
if (!FuncUtil.equals(aDo.getId(), id)) {
throw exception(GlobalErrorCodeConstants.DATA_DUPLICATE);
}
}
}
}
}
@Override
public String getNewCode() {
String s = "";
int count = 10;
while (true){
count --;
while (true) {
count--;
try {
s = CodingRulesUtils.generateCode(codeId, false);
checkCode(null,s);
s = CodingRulesUtils.generateCode(codeId, false);
checkCode(null, s);
return s;
}catch (ServiceException e){
} catch (ServiceException e) {
log.warn("重复或者下一个编码");
if(count < 0){
if (count < 0) {
log.error("编码获取失败");
return "";
}
@ -324,12 +347,12 @@ public class ProductInfoServiceImpl implements ProductInfoService {
@Override
public BigDecimal queryPriceByProductId(Long productId, String currency) {
ProductInfoDO infoDO = productInfoMapper.selectById(productId);
if(FuncUtil.isNotEmpty(infoDO)){
if (FuncUtil.isNotEmpty(infoDO)) {
String priceList = infoDO.getPriceList();
if(FuncUtil.isNotEmpty(priceList)){
if (FuncUtil.isNotEmpty(priceList)) {
List<PriceListItemDTO> dtos = JsonUtil.readList(priceList, PriceListItemDTO.class);
for (PriceListItemDTO dto : dtos) {
if(FuncUtil.equals(dto.getC(), currency)){
if (FuncUtil.equals(dto.getC(), currency)) {
return dto.getP();
}
}
@ -339,7 +362,7 @@ public class ProductInfoServiceImpl implements ProductInfoService {
}
private static LFUCache<String,Long> brandIdCache = CacheUtil.newLFUCache(10000, 1000 * 60 *30);
private static LFUCache<String, Long> brandIdCache = CacheUtil.newLFUCache(10000, 1000 * 60 * 30);
@Override
public String importExcel(List<ProductInfoExcelVO> list) {
@ -347,13 +370,13 @@ public class ProductInfoServiceImpl implements ProductInfoService {
List<ProductInfoDO> updateList = new ArrayList<>();
LambdaQueryWrapper<BrandDO> brandDOLambdaQueryWrapper = new LambdaQueryWrapper<>();
brandDOLambdaQueryWrapper.select(BrandDO::getName,BrandDO::getId,BrandDO::getCode);
brandDOLambdaQueryWrapper.eq(BaseDO::getDeleted,false);
brandDOLambdaQueryWrapper.select(BrandDO::getName, BrandDO::getId, BrandDO::getCode);
brandDOLambdaQueryWrapper.eq(BaseDO::getDeleted, false);
List<BrandDO> brandDOS = brandMapper.selectList(brandDOLambdaQueryWrapper);
for (BrandDO brandDO : brandDOS) {
brandIdCache.put(brandDO.getName(),brandDO.getId());
brandIdCache.put(brandDO.getName(), brandDO.getId());
}
Map<String, String> priceMap = new HashMap<>();
for (int i = 0; i < list.size(); i++) {
ProductInfoExcelVO excelVO = list.get(i);
// 判断是否为空行 下拉导致很多空行
@ -363,109 +386,144 @@ public class ProductInfoServiceImpl implements ProductInfoService {
ProductInfoDO productInfo = new ProductInfoDO();
productInfo.setName(excelVO.getName());
String price = excelVO.getPrice();
String code = excelVO.getCode();
if(FuncUtil.isNotEmpty(code)){
if (FuncUtil.isNotEmpty(code)) {
// 覆盖
try {
LambdaQueryWrapper<ProductInfoDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ProductInfoDO::getCode, code);
lambdaQueryWrapper.eq(ProductInfoDO::getDeleted,false);
lambdaQueryWrapper.eq(ProductInfoDO::getDeleted, false);
lambdaQueryWrapper.last("limit 1");
ProductInfoDO dos = productInfoMapper.selectOne(lambdaQueryWrapper);
if(FuncUtil.isNotEmpty(dos)){
if (FuncUtil.isNotEmpty(dos)) {
// 合并属性
BeanUtil.copyProperties(dos, productInfo);
productInfo.setName(excelVO.getName());
productInfo.setSummary(excelVO.getIntroduction());
productInfo.setId(dos.getId());
String brandName = excelVO.getBrandName();
productInfo.setCode(code);
productInfo.setSpecSizeWidth(FuncUtil.toDouble(excelVO.getSpecWidth(),null));
productInfo.setSpecSizeHeight(FuncUtil.toDouble(excelVO.getSpecHeight(),null));
productInfo.setSpecSizeThk(FuncUtil.toDouble(excelVO.getSpecThickness(),null));
productInfo.setSpecMaterial(FuncUtil.toStr(excelVO.getMaterial(),null));
productInfo.setRemark(FuncUtil.toStr(excelVO.getRemarks(),null));
// 合并属性
BeanUtil.copyProperties(dos, productInfo);
productInfo.setName(excelVO.getName());
productInfo.setSummary(excelVO.getIntroduction());
productInfo.setId(dos.getId());
String brandName = excelVO.getBrandName();
productInfo.setCode(code);
productInfo.setSpecSizeWidth(FuncUtil.toDouble(excelVO.getSpecWidth(), null));
productInfo.setSpecSizeHeight(FuncUtil.toDouble(excelVO.getSpecHeight(), null));
productInfo.setSpecSizeThk(FuncUtil.toDouble(excelVO.getSpecThickness(), null));
productInfo.setSpecMaterial(FuncUtil.toStr(excelVO.getMaterial(), null));
productInfo.setRemark(FuncUtil.toStr(excelVO.getRemarks(), null));
if(FuncUtil.isNotEmpty(excelVO.getProductType())){
Long productTypeId = toProductTypeId(excelVO.getProductType());
productInfo.setProductTypeId(productTypeId);
}
if (FuncUtil.isNotEmpty(excelVO.getProductType())) {
Long productTypeId = toProductTypeId(excelVO.getProductType());
productInfo.setProductTypeId(productTypeId);
}
if(FuncUtil.isNotEmpty(brandName)){
Long brandId = brandIdCache.get(brandName);
if(FuncUtil.isNotEmpty(brandId)){
productInfo.setBrandId(brandId);
}else {
BrandDO brandDO = brandService.getBrandByName(brandName);
if(FuncUtil.isNotEmpty(brandDO)){
productInfo.setBrandId(brandDO.getId());
brandIdCache.put(brandName,brandDO.getId());
}
}
}
if (FuncUtil.isNotEmpty(brandName)) {
Long brandId = brandIdCache.get(brandName);
if (FuncUtil.isNotEmpty(brandId)) {
productInfo.setBrandId(brandId);
} else {
BrandDO brandDO = brandService.getBrandByName(brandName);
if (FuncUtil.isNotEmpty(brandDO)) {
productInfo.setBrandId(brandDO.getId());
brandIdCache.put(brandName, brandDO.getId());
}
}
}
if (FuncUtil.isNotEmpty(price)) {
String priceList = dos.getPriceList();
JSONObject jsonObject = new JSONObject();
// [{p:100.25,c:"RMB",d:true}]
jsonObject.set("p", price);
jsonObject.set("c", "RMB");
jsonObject.set("d", true);
List<JSONObject> newPriceList = new ArrayList<>();
if(FuncUtil.isNotEmpty(priceList)){
newPriceList = JsonUtil.readList(priceList, JSONObject.class);
newPriceList.forEach(json -> {
json.set("d", false);
});
updateList.add(productInfo);
continue;
}
}catch (Exception e){
return "第"+(i+1)+"行覆盖失败:"+code+e.getMessage();
}
newPriceList.add(0, jsonObject);
productInfo.setPriceList(JsonUtil.toJson(newPriceList));
}
updateList.add(productInfo);
continue;
}
} catch (Exception e) {
return "第" + (i + 1) + "行覆盖失败:" + code + e.getMessage();
}
}else {
} else {
code = productInfo.getCode();
}
if(FuncUtil.isEmpty(code)){
return "第"+(i+1)+"行编码 不能为空:"+code;
if (FuncUtil.isEmpty(code)) {
return "第" + (i + 1) + "行编码 不能为空:" + code;
}
String brandName = FuncUtil.toStr(excelVO.getBrandName(),"").trim();
if(FuncUtil.isEmpty(brandName)){
String brandName = FuncUtil.toStr(excelVO.getBrandName(), "").trim();
if (FuncUtil.isEmpty(brandName)) {
return "第"+(i+1)+"行品牌名称 不能为空:"+brandName;
return "第" + (i + 1) + "行品牌名称 不能为空:" + brandName;
}
String productType = FuncUtil.toStr(excelVO.getProductType(),"").trim();
if(FuncUtil.isEmpty(productType)){
return "第"+(i+1)+"行品类(尺码唛,价钱卡,纸盒,主唛,挂卡,洗水唛) 不能为空:"+productType;
String productType = FuncUtil.toStr(excelVO.getProductType(), "").trim();
if (FuncUtil.isEmpty(productType)) {
return "第" + (i + 1) + "行品类(尺码唛,价钱卡,纸盒,主唛,挂卡,洗水唛) 不能为空:" + productType;
}
Long typeId = toProductTypeId(productType);
if(FuncUtil.isEmpty(typeId)){
if (FuncUtil.isEmpty(typeId)) {
ProductTypeIdCache.clear();
return "第"+(i+1)+"行品类(尺码唛,价钱卡,纸盒,主唛,挂卡,洗水唛) 请维护该分类的的资料:"+productType;
return "第" + (i + 1) + "行品类(尺码唛,价钱卡,纸盒,主唛,挂卡,洗水唛) 请维护该分类的的资料:" + productType;
}
productInfo.setProductTypeId(typeId);
productInfo.setCode(code);
productInfo.setTemplateType("2");
productInfo.setSpecSizeWidth(FuncUtil.toDouble(excelVO.getSpecWidth(),null));
productInfo.setSpecSizeHeight(FuncUtil.toDouble(excelVO.getSpecHeight(),null));
productInfo.setSpecSizeThk(FuncUtil.toDouble(excelVO.getSpecThickness(),null));
productInfo.setSpecSizeWidth(FuncUtil.toDouble(excelVO.getSpecWidth(), null));
productInfo.setSpecSizeHeight(FuncUtil.toDouble(excelVO.getSpecHeight(), null));
productInfo.setSpecSizeThk(FuncUtil.toDouble(excelVO.getSpecThickness(), null));
productInfo.setSpecMaterial(excelVO.getMaterial());
productInfo.setRemark(excelVO.getRemarks());
Long brandId = brandIdCache.get(brandName);
if(FuncUtil.isNotEmpty(brandId)){
if (FuncUtil.isNotEmpty(brandId)) {
productInfo.setBrandId(brandId);
}else {
} else {
BrandDO brandDO = brandService.getBrandByName(brandName);
if(FuncUtil.isEmpty(brandDO)){
return "第"+(i+1)+"行品牌不存在,请维护该品牌的资料:"+brandName;
if (FuncUtil.isEmpty(brandDO)) {
return "第" + (i + 1) + "行品牌不存在,请维护该品牌的资料:" + brandName;
}
productInfo.setBrandId(brandDO.getId());
brandIdCache.put(brandName,brandDO.getId());
brandIdCache.put(brandName, brandDO.getId());
}
Long id = IdUtil.getSnowflakeNextId();
productInfo.setId(id);
if(FuncUtil.isNotEmpty(price)){
if (FuncUtil.isNotEmpty(price)) {
JSONObject jsonObject = new JSONObject();
// [{p:100.25,c:"RMB",d:true}]
jsonObject.set("p", price);
jsonObject.set("c", "RMB");
jsonObject.set("d", true);
List<JSONObject> jsonObjects = new ArrayList<>();
jsonObjects.add(jsonObject);
productInfo.setPriceList(JsonUtil.toJson(jsonObjects));
}
}
newList.add(productInfo);
}
if(FuncUtil.isNotEmpty(newList)){
if (FuncUtil.isNotEmpty(newList)) {
productInfoMapper.insertBatch(newList);
}
if(FuncUtil.isNotEmpty(updateList)){
if (FuncUtil.isNotEmpty(updateList)) {
updateList.forEach(productInfoMapper::updateById);
}
log.info("导出成功{},更新成功{}",newList.size(),updateList.size());
log.info("导出成功{},更新成功{}", newList.size(), updateList.size());
return "";
}
@ -474,14 +532,15 @@ public class ProductInfoServiceImpl implements ProductInfoService {
return true;
}
//
if(FuncUtil.isEmpty(excelVO.getCode())
if (FuncUtil.isEmpty(excelVO.getCode())
&& FuncUtil.isEmpty(excelVO.getName())
){
) {
return true;
}
return false;
}
private List<ProductInfoRespVO> wrapperRespVO(List<ProductInfoDO> list){
private List<ProductInfoRespVO> wrapperRespVO(List<ProductInfoDO> list) {
List<ProductInfoRespVO> resList = new ArrayList<>();
list.forEach(productInfoDO -> {
ProductInfoRespVO vo = BeanUtils.toBean(productInfoDO, ProductInfoRespVO.class);
@ -499,10 +558,11 @@ public class ProductInfoServiceImpl implements ProductInfoService {
ProductTypeIdCache.clear();
return resList;
}
private ProductInfoRespVO wrapperFileIds(ProductInfoRespVO vo){
if(FuncUtil.isNotEmpty(vo)){
private ProductInfoRespVO wrapperFileIds(ProductInfoRespVO vo) {
if (FuncUtil.isNotEmpty(vo)) {
String draftDesignDataIds = vo.getDraftDesignDataId();
if(FuncUtil.isNotEmpty(draftDesignDataIds)){
if (FuncUtil.isNotEmpty(draftDesignDataIds)) {
LambdaQueryWrapper<DraftDesignDataDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(DraftDesignDataDO::getId, Arrays.asList(draftDesignDataIds.split(",")));
queryWrapper.eq(DraftDesignDataDO::getDeleted, false);
@ -510,38 +570,39 @@ public class ProductInfoServiceImpl implements ProductInfoService {
queryWrapper.orderByDesc(BaseDO::getCreateTime);
List<DraftDesignDataDO> dos = draftDesignDataMapper.selectList(queryWrapper);
List<String> fileIds = new ArrayList<>();
if(FuncUtil.isNotEmpty(dos)){
if (FuncUtil.isNotEmpty(dos)) {
for (DraftDesignDataDO designDataDO : dos) {
List<String> strList = FuncUtil.toStrList(designDataDO.getFileIds());
fileIds.addAll(strList);
}
}
if(FuncUtil.isNotEmpty(fileIds)){
vo.setFileIds(String.join(",",fileIds));
if (FuncUtil.isNotEmpty(fileIds)) {
vo.setFileIds(String.join(",", fileIds));
}
}
}
return vo;
}
private static LFUCache<String, String> CustomerGroupNameCache = CacheUtil.newLFUCache(10000, TMP_CACHE_TIME);
private ProductInfoRespVO wrapperCustomerGroupName(ProductInfoRespVO vo){
if(FuncUtil.isNotEmpty(vo)){
if(FuncUtil.isNotEmpty(vo.getCustomerGroupId())){
private ProductInfoRespVO wrapperCustomerGroupName(ProductInfoRespVO vo) {
if (FuncUtil.isNotEmpty(vo)) {
if (FuncUtil.isNotEmpty(vo.getCustomerGroupId())) {
String s = CustomerGroupNameCache.get(vo.getCustomerGroupId());
if(FuncUtil.isNotEmpty(s)){
if (FuncUtil.isNotEmpty(s)) {
vo.setCustomerGroupName(s);
}else {
} else {
LambdaQueryWrapper<CustomerGroupDO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(CustomerGroupDO::getId, FuncUtil.toStrList(vo.getCustomerGroupId()));
wrapper.eq(BaseDO::getDeleted,false);
wrapper.eq(BaseDO::getDeleted, false);
List<CustomerGroupDO> groupDOS = customerGroupMapper.selectList(wrapper);
String name = null;
if(FuncUtil.isNotEmpty(groupDOS)){
if (FuncUtil.isNotEmpty(groupDOS)) {
List<String> names = new ArrayList<>();
for (CustomerGroupDO groupDO : groupDOS) {
if(names.contains(groupDO.getName())){
if (names.contains(groupDO.getName())) {
continue;
}
names.add(groupDO.getName());
@ -556,18 +617,19 @@ public class ProductInfoServiceImpl implements ProductInfoService {
}
return vo;
}
private void initCustomerGroupNameCache(Set<String> ids){
private void initCustomerGroupNameCache(Set<String> ids) {
if (FuncUtil.isNotEmpty(ids)) {
for (String db : ids) {
LambdaQueryWrapper<CustomerGroupDO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(CustomerGroupDO::getId, FuncUtil.toStrList(db));
wrapper.eq(BaseDO::getDeleted,false);
wrapper.eq(BaseDO::getDeleted, false);
List<CustomerGroupDO> groupDOS = customerGroupMapper.selectList(wrapper);
String name = null;
if(FuncUtil.isNotEmpty(groupDOS)){
if (FuncUtil.isNotEmpty(groupDOS)) {
List<String> names = new ArrayList<>();
for (CustomerGroupDO groupDO : groupDOS) {
if(names.contains(groupDO.getName())){
if (names.contains(groupDO.getName())) {
continue;
}
names.add(groupDO.getName());
@ -581,20 +643,22 @@ public class ProductInfoServiceImpl implements ProductInfoService {
}
private static LFUCache<Long, String> ProductTypeNameCache = CacheUtil.newLFUCache(10000, TMP_CACHE_TIME);
private ProductInfoRespVO wrapperProductTypeName(ProductInfoRespVO vo){
if(FuncUtil.isNotEmpty(vo)){
private ProductInfoRespVO wrapperProductTypeName(ProductInfoRespVO vo) {
if (FuncUtil.isNotEmpty(vo)) {
vo.setProductTypeName(togProductTypeName(vo.getProductTypeId()));
}
return vo;
}
private String togProductTypeName(Long productTypeId){
if(FuncUtil.isNotEmpty(productTypeId)){
private String togProductTypeName(Long productTypeId) {
if (FuncUtil.isNotEmpty(productTypeId)) {
String s = ProductTypeNameCache.get(productTypeId);
if (FuncUtil.isNotEmpty(s)){
if (FuncUtil.isNotEmpty(s)) {
return s;
}else {
} else {
ProductTypeDO productTypeDO = productTypeMapper.selectById(productTypeId);
if(FuncUtil.isNotEmpty(productTypeDO)){
if (FuncUtil.isNotEmpty(productTypeDO)) {
ProductTypeNameCache.put(productTypeId, productTypeDO.getLabel());
return productTypeDO.getLabel();
}
@ -603,28 +667,29 @@ public class ProductInfoServiceImpl implements ProductInfoService {
return "";
}
private static LFUCache<String,Long> ProductTypeIdCache = CacheUtil.newLFUCache(10000, TMP_CACHE_TIME);
private static LFUCache<String, Long> ProductTypeIdCache = CacheUtil.newLFUCache(10000, TMP_CACHE_TIME);
private Long toProductTypeId(String name){
if(FuncUtil.isEmpty(name)){
private Long toProductTypeId(String name) {
if (FuncUtil.isEmpty(name)) {
return null;
}
Long s = ProductTypeIdCache.get(name);
if (FuncUtil.isEmpty(s)) {
LambdaQueryWrapper<ProductTypeDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ProductTypeDO::getLabel,name);
lambdaQueryWrapper.eq(ProductTypeDO::getLabel, name);
lambdaQueryWrapper.last("limit 1");
ProductTypeDO productTypeDO = productTypeMapper.selectOne(lambdaQueryWrapper);
if(FuncUtil.isNotEmpty(productTypeDO)){
if (FuncUtil.isNotEmpty(productTypeDO)) {
s = productTypeDO.getId();
ProductTypeIdCache.put(name, productTypeDO.getId());
}
}
return s;
}
private void initProductTypeNameCache(Set<Long> ids){
private void initProductTypeNameCache(Set<Long> ids) {
ProductTypeNameCache.clear();
if(FuncUtil.isNotEmpty(ids)){
if (FuncUtil.isNotEmpty(ids)) {
List<ProductTypeDO> dos = productTypeMapper.selectBatchIds(ids);
for (ProductTypeDO db : dos) {
ProductTypeNameCache.put(db.getId(), db.getLabel());
@ -634,15 +699,16 @@ public class ProductInfoServiceImpl implements ProductInfoService {
private static LFUCache<Long, String> brandNameCache = CacheUtil.newLFUCache(10000, TMP_CACHE_TIME);
private ProductInfoRespVO wrapperBrandName(ProductInfoRespVO vo){
if(FuncUtil.isNotEmpty(vo)){
if(FuncUtil.isNotEmpty(vo.getBrandId())){
private ProductInfoRespVO wrapperBrandName(ProductInfoRespVO vo) {
if (FuncUtil.isNotEmpty(vo)) {
if (FuncUtil.isNotEmpty(vo.getBrandId())) {
String s = brandNameCache.get(vo.getBrandId());
if(FuncUtil.isNotEmpty(s)){
if (FuncUtil.isNotEmpty(s)) {
vo.setBrandName(s);
}else {
} else {
BrandDO brandDO = brandMapper.selectById(vo.getBrandId());
if(FuncUtil.isNotEmpty(brandDO)){
if (FuncUtil.isNotEmpty(brandDO)) {
vo.setBrandName(brandDO.getName());
brandNameCache.put(vo.getBrandId(), brandDO.getName());
}
@ -651,8 +717,9 @@ public class ProductInfoServiceImpl implements ProductInfoService {
}
return vo;
}
private void initBrandNameCache(Set<Long> ids){
if(FuncUtil.isNotEmpty(ids)){
private void initBrandNameCache(Set<Long> ids) {
if (FuncUtil.isNotEmpty(ids)) {
List<BrandDO> brandDOS = brandMapper.selectBatchIds(ids);
for (BrandDO brandDO : brandDOS) {
brandNameCache.put(brandDO.getId(), brandDO.getName());