From 04d88ef5d6e9f4814ad16f51f1550bd5be7c6fe6 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 15 九月 2023 09:12:31 +0800 Subject: [PATCH] 优化素材库处理源数据 --- server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 38 insertions(+), 6 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 bfd5feb..d4b4034 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 @@ -11,11 +11,13 @@ import com.doumee.dao.business.BrandMapper; import com.doumee.dao.business.model.Brand; import com.doumee.dao.business.model.Category; +import com.doumee.dao.business.model.Goods; import com.doumee.service.business.BrandService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,7 +43,14 @@ @Override public Integer create(Brand brand) { LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); - if(brandMapper.selectCount(new QueryWrapper<Brand>().eq("ISDELETED",Constants.ZERO).eq("name",brand.getName()))>0){ + 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.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()+"銆戝凡瀛樺湪"); }; brand.setStatus(Constants.ZERO); @@ -79,7 +88,14 @@ @Override public void updateById(Brand brand) { LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); - if(brandMapper.selectCount(new QueryWrapper<Brand>().eq("ISDELETED",Constants.ZERO).ne("id",brand.getId()).eq("name",brand.getName()))>0){ + 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.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()+"銆戝凡瀛樺湪"); }; brand.setStatus(Constants.ZERO); @@ -104,7 +120,7 @@ String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode(); Brand brand = brandMapper.selectById(id); - brand.setPrefixUrl(prefixUrl); + brand.setImgfullurl(prefixUrl+brand.getImgurl()); return brand; } @@ -116,21 +132,30 @@ @Override public List<Brand> findList(Brand brand) { + 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().orderByAsc(Brand::getSortnum); + // 绫诲瀷 0浼佷笟 1骞冲彴 + if (Objects.isNull(user.getCompanyId())) { + wrapper.lambda().eq(Brand::getType,Constants.ONE); + }else { + wrapper.lambda().eq(Brand::getType,brand.getCompanyId()) + .or().eq(Brand::getType,Constants.ZERO); + } List<Brand> list = brandMapper.selectList(wrapper); String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode(); for (Brand b:list) { - b.setPrefixUrl(prefixUrl); + b.setImgfullurl(prefixUrl+b.getImgurl()); } return list; } - + @Override public PageData<Brand> findPage(PageWrap<Brand> pageWrap) { + LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); IPage<Brand> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); QueryWrapper<Brand> queryWrapper = new QueryWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); @@ -141,12 +166,19 @@ if (pageWrap.getModel().getStatus() != null) { queryWrapper.lambda().eq(Brand::getStatus, pageWrap.getModel().getStatus()); } + // 绫诲瀷 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().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(); brandIPage.getRecords().forEach(i->{ - i.setPrefixUrl(prefixUrl); + i.setImgfullurl(prefixUrl+i.getImgurl()); }); return PageData.from(brandIPage); } -- Gitblit v1.9.3