From b459b874c062b1124200f8a591b86d0558c3ffce Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 15 九月 2023 22:47:16 +0800
Subject: [PATCH] 新增源数据惨淡
---
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
index 1fe955e..69a36fc 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -117,6 +117,7 @@
@Override
public PageData<BaseData> findPage(PageWrap<BaseData> pageWrap) {
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
IPage<BaseData> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<BaseData> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
@@ -141,19 +142,19 @@
queryWrapper.lambda().eq(BaseData::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().eq(BaseData::getTitle, pageWrap.getModel().getTitle());
+ queryWrapper.lambda().like(BaseData::getTitle, pageWrap.getModel().getTitle());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(BaseData::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(BaseData::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getSku() != null) {
- queryWrapper.lambda().eq(BaseData::getSku, pageWrap.getModel().getSku());
+ queryWrapper.lambda().like(BaseData::getSku, pageWrap.getModel().getSku());
}
if (pageWrap.getModel().getBrand() != null) {
- queryWrapper.lambda().eq(BaseData::getBrand, pageWrap.getModel().getBrand());
+ queryWrapper.lambda().like(BaseData::getBrand, pageWrap.getModel().getBrand());
}
if (pageWrap.getModel().getCategory() != null) {
- queryWrapper.lambda().eq(BaseData::getCategory, pageWrap.getModel().getCategory());
+ queryWrapper.lambda().like(BaseData::getCategory, pageWrap.getModel().getCategory());
}
if (pageWrap.getModel().getUrl() != null) {
queryWrapper.lambda().eq(BaseData::getUrl, pageWrap.getModel().getUrl());
@@ -363,7 +364,7 @@
if(cModel!= null){
goods.setCategoryId(cModel.getId());
}
- goods.setImgurl(getOssImgurl(ossModel, data.getImgurl()));
+ goods.setImgurl(getOssImgurl(ossModel,ossModel.getGoodsFolder(), data.getImgurl()));
goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()).multiply(Constants.formatBigdecimal(cModel.getPriceRate())));
//鎻掑叆鏂板晢鍝佹暟鎹�
baseGoodsMapper.insert(goods);
@@ -397,7 +398,7 @@
private int addImg(int i,OssModel ossModel, Integer id,String bgImg) {
if(StringUtils.isNotBlank(bgImg)){
- String img =getOssImgurl(ossModel,bgImg);
+ String img =getOssImgurl(ossModel, ossModel.getGoodsFolder() ,bgImg);
if(StringUtils.isNotBlank(img)){
Multifile f = new Multifile();
f.setFileurl(img);
@@ -585,7 +586,7 @@
model.setIsdeleted(Constants.ZERO);
model.setPinyin(PinYinUtil.getFullSpell(model.getName()));
model.setShortPinyin(PinYinUtil.getFirstSpell(model.getName()));
- model.setImgurl(getOssImgurl(ossModel,img));
+ model.setImgurl(getOssImgurl(ossModel, ossModel.getCateFolder() ,img));
//鎻掑叆鏂扮殑鍝佺墝淇℃伅
baseCategoryMapper.insert(model);
//鍔犲叆闆嗗悎涓�
@@ -593,7 +594,7 @@
return model;
}
- private String getOssImgurl(OssModel ossModel, String img) {
+ private String getOssImgurl(OssModel ossModel, String folder,String img) {
if(StringUtils.isBlank(img)){
return null;
}
@@ -603,7 +604,7 @@
nfix = StringUtils.defaultString(nfix,".jpg");
String fileName = UUID.randomUUID() + nfix;
String tempFileName = nowDate + "/" + fileName;
- String key = ossModel.getCateFolder() + tempFileName;// 鏂囦欢鍚�
+ String key =folder+ tempFileName;// 鏂囦欢鍚�
ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
if (obs.uploadOnlineObject(img,ossModel.getBucket(), key,null)) {
--
Gitblit v1.9.3