From f4a3c600d4600f211e4599de90545a6974c955de Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 20 九月 2023 10:50:11 +0800
Subject: [PATCH] pp
---
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 79 +++++++++++++++++++++++++++------------
1 files changed, 54 insertions(+), 25 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
index d4b4034..a49825c 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
@@ -42,17 +42,28 @@
private SystemDictDataBiz systemDictDataBiz;
@Override
public Integer create(Brand brand) {
+ if(StringUtils.isBlank(brand.getName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(brandMapper.selectCount(new QueryWrapper<Brand>()
.eq("ISDELETED",Constants.ZERO)
- .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()),"name",brand.getName())
+ .and(user.getType().equals(Constants.UserType.SYSTEM.getKey()), wapper->wapper.lambda().eq(Brand::getType,Constants.ONE).eq(Brand::getName,brand.getName()))
+// .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()),"name",brand.getName())
.and(user.getType().equals(Constants.UserType.COMPANY.getKey()),
i->i.apply(" name = '"+brand.getName()+"' and type = 1 ")
.or().apply( " name = '"+brand.getName()+"' and COMPANY_ID = '"+user.getCompanyId()+"' and type = 0 ")
)
)>0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+brand.getName()+"銆戝凡瀛樺湪");
- };
+ }
+ if(Constants.equalsInteger(user.getType(), Constants.UserType.SYSTEM.getKey())){
+ //骞冲彴鍝佺墝
+ brand.setType(Constants.ONE);
+ }else{
+ brand.setType(Constants.ZERO);
+ brand.setCompanyId(user.getCompanyId());
+ }
brand.setStatus(Constants.ZERO);
brand.setCreateDate(new Date());
brand.setCreator(user.getId());
@@ -88,16 +99,21 @@
@Override
public void updateById(Brand brand) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(brandMapper.selectCount(new QueryWrapper<Brand>()
- .eq("ISDELETED",Constants.ZERO)
- .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()),"name",brand.getName())
+
+ Brand brand1 = brandMapper.selectOne(new QueryWrapper<Brand>()
+ .eq("ISDELETED", Constants.ZERO)
+ .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()), "name", brand.getName())
.and(user.getType().equals(Constants.UserType.COMPANY.getKey()),
- i->i.apply(" name = '"+brand.getName()+"' and type = 1 ")
- .or().apply( " name = '"+brand.getName()+"' and COMPANY_ID = '"+user.getCompanyId()+"' and type = 0 ")
- )
- )>0){
+ i -> i.apply(" name = '" + brand.getName() + "' and type = 1 ")
+ .or().apply(" name = '" + brand.getName() + "' and COMPANY_ID = '" + user.getCompanyId() + "' and type = 0 ")
+ ).last("limit 1")
+ );
+
+ if(Objects.nonNull(brand1) && (!brand.getId().equals(brand.getId()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+brand.getName()+"銆戝凡瀛樺湪");
- };
+ }
+ brand.setType(null);
+ brand.setCompanyId(null);
brand.setStatus(Constants.ZERO);
brand.setEditDate(new Date());
brand.setEditor(user.getId());
@@ -117,10 +133,12 @@
@Override
public Brand findById(Integer id) {
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
Brand brand = brandMapper.selectById(id);
- brand.setImgfullurl(prefixUrl+brand.getImgurl());
+ if(StringUtils.isNotBlank(brand.getImgurl())){
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.BRAND_IMG).getCode();
+ brand.setImgfullurl(prefixUrl+brand.getImgurl());
+ }
return brand;
}
@@ -135,20 +153,24 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<Brand> wrapper = new QueryWrapper<>(brand);
wrapper.lambda().eq(Brand::getIsdeleted,Constants.ZERO);
- wrapper.lambda().eq(Brand::getStatus,Constants.ZERO);
+// wrapper.lambda().eq(Brand::getStatus,Constants.ZERO);
+ wrapper.lambda().orderByAsc(Brand::getType);
wrapper.lambda().orderByAsc(Brand::getSortnum);
// 绫诲瀷 0浼佷笟 1骞冲彴
- if (Objects.isNull(user.getCompanyId())) {
+ if (Constants.equalsInteger(user.getType(), Constants.UserType.SYSTEM.getKey())) {
wrapper.lambda().eq(Brand::getType,Constants.ONE);
}else {
- wrapper.lambda().eq(Brand::getType,brand.getCompanyId())
- .or().eq(Brand::getType,Constants.ZERO);
+ wrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
+ .or().eq(Brand::getType,Constants.ONE)
+ );
}
List<Brand> list = brandMapper.selectList(wrapper);
- 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.BRAND_IMG).getCode();
for (Brand b:list) {
- b.setImgfullurl(prefixUrl+b.getImgurl());
+ if(StringUtils.isNotBlank(b.getImgurl())){
+ b.setImgfullurl(prefixUrl+b.getImgurl());
+ }
}
return list;
}
@@ -166,19 +188,26 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(Brand::getStatus, pageWrap.getModel().getStatus());
}
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(Brand::getType, pageWrap.getModel().getType());
+ }
// 绫诲瀷 0浼佷笟 1骞冲彴
if (Objects.isNull(user.getCompanyId())) {
queryWrapper.lambda().eq(Brand::getType,Constants.ONE);
}else {
- queryWrapper.lambda().eq(Brand::getType,pageWrap.getModel().getCompanyId())
- .or().eq(Brand::getType,Constants.ZERO);
+ queryWrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
+ .or().eq(Brand::getType,Constants.ONE)
+ );
}
+ queryWrapper.lambda().orderByAsc(Brand::getType);
queryWrapper.lambda().orderByAsc(Brand::getSortnum);
IPage<Brand> brandIPage = brandMapper.selectPage(page, 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.BRAND_IMG).getCode();
brandIPage.getRecords().forEach(i->{
- i.setImgfullurl(prefixUrl+i.getImgurl());
+ if(StringUtils.isNotBlank(i.getImgurl())){
+ i.setImgfullurl(prefixUrl+i.getImgurl());
+ }
});
return PageData.from(brandIPage);
}
--
Gitblit v1.9.3