From bd732b4fea72b65aabade0dfb14ddb1346ad3f8f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 九月 2023 12:39:12 +0800
Subject: [PATCH] sessionkey更换
---
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 143 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 118 insertions(+), 25 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 704db05..e240c3a 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
@@ -13,10 +13,8 @@
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.BaseGoodsJoinMapper;
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.dao.business.model.dto.*;
+import com.doumee.service.business.BaseDataService;
import com.doumee.service.business.BaseGoodsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -33,10 +31,9 @@
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.io.File;
+import java.math.BigDecimal;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -76,6 +73,11 @@
private BaseCategoryMapper baseCategoryMapper;
+ @Autowired
+ @Lazy
+ private BaseDataService baseDataService;
+
+
@Override
public Integer create(BaseGoodsCreateOrUpdateRequest baseGoods) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -92,7 +94,8 @@
insert.setIsdeleted(Constants.ZERO);
insert.setRemark(baseGoods.getRemark());
insert.setName(baseGoods.getName());
- insert.setStatus(Constants.ZERO);
+ //榛樿涓嬫灦
+ insert.setStatus(Constants.ONE);
insert.setSortnum(integer+Constants.ONE);
insert.setImgurl(baseGoods.getImgurl());
insert.setCategoryId(baseGoods.getCategoryId());
@@ -228,29 +231,36 @@
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@Override
- public void updateStatusByIds(List<Integer> idList, Integer status) {
- if (CollectionUtils.isEmpty(idList)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍟嗗搧鐘舵�佷笉鑳戒负绌�");
+ public void updateStatusByIds(BaseGoods param) {
+ if (CollectionUtils.isEmpty(param.getIdList())
+ || param.getStatus() == null
+ || !(Constants.equalsInteger(param.getStatus(), Constants.ONE)||Constants.equalsInteger(param.getStatus() ,Constants.ZERO))){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- idList.forEach(s->updateStatusById(s,status));
-
+ param.getIdList().forEach(s->updateStatusById(s,param.getStatus()));
}
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@Override
public void updateStatusById(Integer id, Integer status) {
-
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if (Objects.isNull(status)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍟嗗搧鐘舵�佷笉鑳戒负绌�");
}
if (Constants.equalsInteger(status,Constants.ZERO)){
+ //濡傛灉鍚敤
BaseGoods baseGoods = new BaseGoods();
baseGoods.setId(id);
+ baseGoods.setEditDate(new Date());
+ baseGoods.setEditor(user.getId());
baseGoods.setStatus(status);
baseGoodsMapper.updateById(baseGoods);
}else if (Constants.equalsInteger(status,Constants.ONE)){
+ //濡傛灉绂佺敤
BaseGoods baseGoods = new BaseGoods();
baseGoods.setId(id);
+ baseGoods.setEditDate(new Date());
+ baseGoods.setEditor(user.getId());
baseGoods.setStatus(status);
baseGoodsMapper.updateById(baseGoods);
@@ -258,7 +268,9 @@
goodsUpdate.lambda()
.eq(Goods::getType,Constants.ONE)
.eq(Goods::getGoodsId,id)
- .set(Goods::getStatus,Constants.ONE);
+ .set(Goods::getStatus,Constants.ONE)
+ .set(Goods::getEditor,user.getId())
+ .set(Goods::getEditDate,new Date());
goodsMapper.update(null,goodsUpdate);
}
}
@@ -296,8 +308,8 @@
.eq(BaseGoods::getId,id);
BaseGoodsDTO baseGoodsDTO = baseGoodsJoinMapper.selectJoinOne(BaseGoodsDTO.class, queryWrapper);
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
baseGoodsDTO.setImgfullurl(prefixUrl+baseGoodsDTO.getImgurl());
List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>()
@@ -365,7 +377,7 @@
return baseGoodsMapper.selectCount(wrapper);
}
-
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
@Override
public Integer importBaseGoodsBatch(MultipartFile file) {
@@ -397,6 +409,10 @@
dataList.forEach(s->{
+ if(baseGoodsMapper.selectCount(new QueryWrapper<BaseGoods>().eq("ISDELETED", Constants.ZERO).eq("name",s.getName()))>0){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+s.getName()+"銆戝凡瀛樺湪");
+ }
+
BaseGoods baseGoods = new BaseGoods();
baseGoods.setCreator(user.getId());
baseGoods.setCreateDate(new Date());
@@ -405,7 +421,8 @@
baseGoods.setIsdeleted(Constants.ZERO);
baseGoods.setName(s.getName());
baseGoods.setStatus(Constants.ZERO);
-
+ baseGoods.setZdPrice(new BigDecimal(s.getZdPrice()));
+ baseGoods.setPrice(new BigDecimal(s.getPrice()));
if (StringUtils.isBlank(s.getCategoryName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍟嗗搧绫诲埆涓嶅彲涓虹┖");
}
@@ -413,26 +430,87 @@
categoryQuery.lambda()
.eq(BaseCategory::getName,s.getCategoryName());
BaseCategory baseCategory = baseCategoryMapper.selectOne(categoryQuery);
-
+ if (Objects.isNull(baseCategory)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍟嗗搧绫诲埆涓嶅瓨鍦�");
+ }
QueryWrapper<Brand> brandQuery = new QueryWrapper<>();
brandQuery.lambda()
.eq(Brand::getName,s.getBrandName());
Brand brand = brandMapper.selectOne(brandQuery);
+ if (Objects.isNull(brand)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍟嗗搧鍝佺墝涓嶅瓨鍦�");
+ }
+ //澶勭悊鎵归噺涓婁紶
+ String proDir =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PLATFORM).getCode();
+
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.GOODS_IMG_DIR).getCode()
+ + proDir + File.separator + s.getId();
+
+ List<String> mulFiles = new ArrayList<>();
+ if(StringUtils.isNotBlank(path)){
+ OssModel ossModel = baseDataService.initOssModel();
+ File dir =new File(path+File.separator);
+ if(dir!=null && dir.isDirectory()){
+ File[] files = dir.listFiles();
+ if(files!=null && files.length>0){
+ for(File f:files){
+ if(isImgFile(f)){
+ //鍙栫涓�寮犲浘鐗囦綔涓哄垪琛ㄥ浘
+ baseGoods.setImgurl(baseDataService.getOssImgurl(ossModel,ossModel.getGoodsFolder(),f));
+ }
+ if(f.isDirectory()){
+ //濡傛灉鏄枃浠跺す
+ File[] fs = f.listFiles();
+ if(fs != null && fs.length > 0){
+ for(File mf : fs){
+ if(isImgFile(mf)){
+ if(mulFiles==null){
+ mulFiles = new ArrayList<>();
+ }
+ mulFiles.add(baseDataService.getOssImgurl(ossModel,ossModel.getGoodsFolder(),mf));
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+
// baseGoods.setImgurl();
baseGoods.setCategoryId(baseCategory.getId());
baseGoods.setBrandId(brand.getId());
baseGoodsMapper.insert(baseGoods);
+ if(mulFiles !=null && mulFiles.size()>0){
+ for(int i=0;i<mulFiles.size();i++){
+ String str = mulFiles.get(i);
+ Multifile f = new Multifile();
+ f.setObjType(Constants.ZERO);
+ f.setName(str);
+ f.setType(Constants.ZERO);
+ f.setObjId(baseGoods.getId());
+ f.setCreateDate(new Date());
+ f.setCreator(user.getId());
+ f.setIsdeleted(Constants.ZERO);
+ f.setSortnum(i);
+ f.setCompanyId(user.getCompanyId());
+ f.setFileurl(str);
+ multifileMapper.insert(f);
+ }
+ }
+
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->{
+// Integer i = 0;
+ for (int i = 0; i < collect.size(); i++){
if (!CollectionUtils.isEmpty(baseCategory.getBaseCateParamList())){
-
+ List<String> s2 = collect.get(i);
BaseCateParam baseCateParam = baseCategory.getBaseCateParamList()
.stream().filter(s3 -> s3.getName().equals(s2.get(0))).findFirst()
.orElseThrow(()->new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閰嶇疆鍙傛暟涓嶅瓨鍦�"));
@@ -452,7 +530,7 @@
baseGoodsParamMapper.insert(baseGoodsParam);
}
- });
+ };
}
@@ -465,4 +543,19 @@
}
return null;
}
+
+ private boolean isImgFile(File f) {
+ if(f!=null && f.isFile() ){
+ String name = f.getName();
+ if(name.endsWith(".jpg")
+ ||name.endsWith(".JPG")
+ ||name.endsWith(".JPEG")
+ ||name.endsWith(".jpeg")
+ ||name.endsWith(".PNG")
+ ||name.endsWith(".png")){
+ return true;
+ }
+ }
+ return false;
+ }
}
--
Gitblit v1.9.3