From 81182562d3328ff9b722e807d07277478c7690bb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 18 九月 2023 15:08:02 +0800
Subject: [PATCH] 休bug
---
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 113 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
index b6e046d..562835a 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
@@ -1,6 +1,7 @@
package com.doumee.service.business.impl;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -14,6 +15,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.dto.BaseGoodsCreateOrUpdateRequest;
import com.doumee.dao.business.model.dto.BaseGoodsDTO;
+import com.doumee.dao.business.model.dto.BaseGoodsImportDTO;
import com.doumee.dao.business.model.dto.BaseGoodsParamCreatRequest;
import com.doumee.service.business.BaseGoodsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,6 +23,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,16 +31,20 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 绱犳潗搴�-鍟嗗搧淇℃伅琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
* @date 2023/09/07 11:41
*/
+@Slf4j
@Service
public class BaseGoodsServiceImpl implements BaseGoodsService {
@@ -64,6 +71,10 @@
@Autowired
private GoodsMapper goodsMapper;
+
+ @Autowired
+ private BaseCategoryMapper baseCategoryMapper;
+
@Override
public Integer create(BaseGoodsCreateOrUpdateRequest baseGoods) {
@@ -342,7 +353,7 @@
.selectAs(BaseCategory::getName,BaseGoods::getCategoryName)
.eq(BaseGoods::getIsdeleted, Constants.ZERO)
.like(StringUtils.isNotBlank(pageWrap.getModel().getName()), BaseGoods::getName,pageWrap.getModel().getName())
- .eq(pageWrap.getModel().getId()!=null,BaseGoods::getId, pageWrap.getModel().getId())
+ .like(pageWrap.getModel().getId()!=null,BaseGoods::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCategoryId()!=null,BaseGoods::getCategoryId, pageWrap.getModel().getCategoryId())
.eq(pageWrap.getModel().getBrandId()!=null,BaseGoods::getBrandId, pageWrap.getModel().getBrandId())
.eq(pageWrap.getModel().getStatus()!=null,BaseGoods::getStatus, pageWrap.getModel().getStatus());
@@ -362,4 +373,105 @@
QueryWrapper<BaseGoods> wrapper = new QueryWrapper<>(baseGoods);
return baseGoodsMapper.selectCount(wrapper);
}
+
+
+ @Override
+ public Integer importBaseGoodsBatch(MultipartFile file) {
+
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ try {
+
+ ExcelImporter ie = new ExcelImporter(file,0,0);
+ List<BaseGoodsImportDTO> dataList = ie.getDataList(BaseGoodsImportDTO.class,null);
+ if(dataList == null || dataList.size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁涓虹┖锛�");
+ }
+ List<String> comNameList = dataList.stream().map(s -> s.getName().trim()).distinct().collect(Collectors.toList());
+
+ if (!(dataList.size() == comNameList.size())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍟嗗搧鍚嶇О鏈夊凡瀛樺湪");
+ }
+
+// List<String> collect1 = dataList.stream().filter(s->{
+// if (StringUtils.isBlank(s.getBrandName())){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST);
+// }else {
+// return true;
+// }
+// }).map(s -> s.getCategoryName()).collect(Collectors.toList());
+// QueryWrapper<BaseCategory> wrapper = new QueryWrapper<>();
+// wrapper.lambda()
+// .in(BaseCategory::getName,collect1);
+// List<BaseCategory> baseCategories = baseCategoryMapper.selectList(wrapper);
+
+ dataList.forEach(s->{
+
+ BaseGoods baseGoods = new BaseGoods();
+ baseGoods.setCreator(user.getId());
+ baseGoods.setCreateDate(new Date());
+ baseGoods.setEditor(user.getId());
+ baseGoods.setEditDate(new Date());
+ baseGoods.setIsdeleted(Constants.ZERO);
+ baseGoods.setName(s.getName());
+ baseGoods.setStatus(Constants.ZERO);
+
+ if (StringUtils.isBlank(s.getCategoryName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍟嗗搧绫诲埆涓嶅彲涓虹┖");
+ }
+ QueryWrapper<BaseCategory> categoryQuery = new QueryWrapper<>();
+ categoryQuery.lambda()
+ .eq(BaseCategory::getName,s.getCategoryName());
+ BaseCategory baseCategory = baseCategoryMapper.selectOne(categoryQuery);
+
+
+ QueryWrapper<Brand> brandQuery = new QueryWrapper<>();
+ brandQuery.lambda()
+ .eq(Brand::getName,s.getBrandName());
+ Brand brand = brandMapper.selectOne(brandQuery);
+
+// baseGoods.setImgurl();
+ baseGoods.setCategoryId(baseCategory.getId());
+ baseGoods.setBrandId(brand.getId());
+ baseGoodsMapper.insert(baseGoods);
+
+ String baseGoodsParamString = s.getBaseGoodsParamString();
+ List<List<String>> collect = Arrays.asList(baseGoodsParamString.split("\n"))
+ .stream().map(s1 -> Arrays.asList(s1.split("[锛�,:]")) ).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(collect)){
+ Integer i = 0;
+ collect.forEach(s2->{
+ if (!CollectionUtils.isEmpty(baseCategory.getBaseCateParamList())){
+
+ BaseCateParam baseCateParam = baseCategory.getBaseCateParamList()
+ .stream().filter(s3 -> s3.getName().equals(s2.get(0))).findFirst()
+ .orElseThrow(()->new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閰嶇疆鍙傛暟涓嶅瓨鍦�"));
+ BaseGoodsParam baseGoodsParam = new BaseGoodsParam();
+ baseGoodsParam.setCreator(user.getId());
+ baseGoodsParam.setCreateDate(new Date());
+ baseGoodsParam.setEditor(user.getId());
+ baseGoodsParam.setEditDate(new Date());
+ baseGoodsParam.setIsdeleted(Constants.ZERO);
+ baseGoodsParam.setName(baseCateParam.getName());
+ baseGoodsParam.setRemark(baseCateParam.getRemark());
+ baseGoodsParam.setStatus(Constants.ZERO);
+ baseGoodsParam.setSortnum(i+Constants.ONE);
+ baseGoodsParam.setPramaId(baseCateParam.getId());
+ baseGoodsParam.setVal(s2.size() > 1 ? s2.get(1) : null );
+ baseGoodsParam.setGoodsId(baseGoods.getId());
+ baseGoodsParamMapper.insert(baseGoodsParam);
+
+ }
+ });
+
+ }
+
+ });
+ }catch (Exception e) {
+ log.error(String.format("鎵归噺鎻掑叆寮傚父%s ",e.getMessage()));
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),e.getMessage());
+ }finally {
+
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3