fix

Helius

2022-07-12 6135a57d6c74ca1707ab064ddf6dc7c86f4a041e

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java

@@ -6,21 +6,22 @@
import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.common.contants.AppContants;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.conversion.ColumnConversion;
import com.xcong.farmer.cms.modules.system.dto.AdminAddColumnDto;
import com.xcong.farmer.cms.modules.system.dto.AdminColumnDto;
import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateColumnDto;
import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
import com.xcong.farmer.cms.modules.system.entity.NavigationBarEntity;
import com.xcong.farmer.cms.modules.system.entity.UserEntity;
import com.xcong.farmer.cms.modules.system.entity.*;
import com.xcong.farmer.cms.modules.system.mapper.ArticleMapper;
import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
import com.xcong.farmer.cms.modules.system.mapper.CompanyMapper;
import com.xcong.farmer.cms.modules.system.service.IColumnService;
import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import com.xcong.farmer.cms.modules.system.vo.AdminColumnVo;
import com.xcong.farmer.cms.modules.system.vo.AdminSeeColumnInfoVo;
import com.xcong.farmer.cms.modules.system.vo.WebColumnVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,6 +30,7 @@
import cn.hutool.core.util.ObjectUtil;
import org.springframework.transaction.annotation.Transactional;

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;

@@ -38,6 +40,8 @@

    @Autowired
    private ArticleMapper articleMapper;
    @Autowired
    private CompanyMapper companyMapper;

    @Override
    public Result getColumnInPage(AdminColumnDto adminColumnDto) {
@@ -106,8 +110,11 @@
        Long parentId = adminAddColumnDto.getParentId();
        if(ObjectUtil.isEmpty(parentId)){
            columnEntity.setParentId(ColumnEntity.PARENTID_DEFAULT);
            columnEntity.setPath("/" + columnEntity.getColumnCode());
        }else{
            columnEntity.setParentId(parentId);
            ColumnEntity parent = this.baseMapper.selectById(parentId);
            columnEntity.setPath(parent.getPath() + "/" + columnEntity.getColumnCode());
        }

        columnEntity.setListTemplate(adminAddColumnDto.getListTemplate());
@@ -116,8 +123,9 @@
        columnEntity.setTargetType(adminAddColumnDto.getTargetType());
        columnEntity.setTargetUrl(adminAddColumnDto.getTargetUrl());
        columnEntity.setIsNav(adminAddColumnDto.getIsNav());
        columnEntity.setContentType(adminAddColumnDto.getContentType());
        this.baseMapper.insert(columnEntity);
        return Result.ok("添加成功");
        return Result.ok("添加成功", columnEntity.getId());
    }

    @Override
@@ -156,14 +164,22 @@
        adminSeeColumnInfoVo.setIsNav(columnEntity.getIsNav());
        adminSeeColumnInfoVo.setType(columnEntity.getType());
        adminSeeColumnInfoVo.setTargetType(columnEntity.getTargetType());
        adminSeeColumnInfoVo.setContentType(columnEntity.getContentType());

        CompanyEntity companyEntity = companyMapper.selectById(LoginUserUtil.getCompanyId());

        if (columnEntity.getType() == 2) {
            if (columnEntity.getTargetType() == 1) {
                ArticleEntity articleEntity = articleMapper.selectById(Long.parseLong(columnEntity.getTargetUrl()));
                adminSeeColumnInfoVo.setTargetName(articleEntity.getTitle());
                adminSeeColumnInfoVo.setUrl(companyEntity.getWebAddress() + columnEntity.getPath() + "/" + columnEntity.getTargetUrl() + ".html");
            } else if (columnEntity.getTargetType() == 2) {
                ColumnEntity column = this.baseMapper.selectById(Long.parseLong(columnEntity.getTargetUrl()));
                ColumnEntity column = this.baseMapper.selectByCodeAndCompanyId(columnEntity.getTargetUrl(), LoginUserUtil.getCompanyId());
                adminSeeColumnInfoVo.setTargetName(column.getColumnName());
                adminSeeColumnInfoVo.setUrl(companyEntity.getWebAddress() + column.getPath());
            }
        } else {
            adminSeeColumnInfoVo.setUrl(companyEntity.getWebAddress() + columnEntity.getPath());
        }
        adminSeeColumnInfoVo.setTargetUrl(columnEntity.getTargetUrl());
        return Result.ok(adminSeeColumnInfoVo);
@@ -172,50 +188,54 @@
    @Override
    @Transactional
    public Result updateColumn(AdminUpdateColumnDto adminUpdateColumnDto) {
        UserEntity userlogin = LoginUserUtil.getLoginUser();
        long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
        Long id = adminUpdateColumnDto.getId();
        if(ObjectUtil.isEmpty(id)){
            return Result.fail("栏目不存在");
        }
        ColumnEntity columnEntity = this.baseMapper.selectById(id);
        Long companyId = LoginUserUtil.getCompanyId();
        ColumnEntity columnEntity = this.baseMapper.selectById(adminUpdateColumnDto.getId());
        log.info("=======>{}", columnEntity.getParentId());
        if(ObjectUtil.isEmpty(columnEntity)){
            return Result.fail("栏目不存在");
        }
        String columnName = adminUpdateColumnDto.getColumnName();
        columnEntity.setColumnName(columnName);

        String columnCode = adminUpdateColumnDto.getColumnCode();
        QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
        objectQueryWrapper.eq("column_code",columnCode);
        if(UserEntity.USER_BELONG_TOP != companyId){
            objectQueryWrapper.eq("company_id",companyId);
        }
        List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
        if(CollUtil.isNotEmpty(columnEntities) && columnEntities.size() > 1){
        columnEntity = ColumnConversion.INSTANCE.updateDtoToEntity(adminUpdateColumnDto);

        ColumnEntity hasExist = this.baseMapper.selectByCodeAndCompanyId(columnCode, companyId);
        if(ObjectUtil.isNotEmpty(hasExist)){
            return Result.fail("栏目编码不能重复");
        }
        columnEntity.setColumnCode(columnCode);
        String remark = adminUpdateColumnDto.getRemark();
            columnEntity.setRemark(remark);
        String pic = adminUpdateColumnDto.getPic();
            columnEntity.setPic(pic);
        Integer orderNum = adminUpdateColumnDto.getOrderNum();
        if(ObjectUtil.isNotEmpty(orderNum)){
            columnEntity.setOrderNum(orderNum);

        // 若编码进行了修改且该栏目为父栏目，则需要同步修改子栏目的path。
        if (!columnEntity.getColumnCode().equals(columnCode) && "-1".equals(columnEntity.getColumnCode())) {
            columnEntity.setBeforeColumnCode(columnCode);

            if (adminUpdateColumnDto.getParentId() == 0L) {
                List<ColumnEntity> childColumn = this.baseMapper.selectColumnByParentId(columnEntity.getId(), companyId, 2);
                if (CollUtil.isNotEmpty(childColumn)) {
                    for (ColumnEntity child : childColumn) {
                        child.setPath(columnEntity.getPath() + "/" + child.getColumnCode());
                        this.baseMapper.updateById(child);
                    }
                }
            }
        }
        columnEntity.setColumnCode(columnCode);

        Long parentId = adminUpdateColumnDto.getParentId();
        if(ObjectUtil.isEmpty(parentId)){
            columnEntity.setParentId(ColumnEntity.PARENTID_DEFAULT);
        }else{
            columnEntity.setParentId(parentId);
        log.info("---------->{}", parentId);
        log.info("------>{}", columnEntity.getParentId());
        // 栏目修改时，需判断父级ID及栏目编码的修改。若栏目父级ID修改了，则需记录原父级ID，在发布时，需连同原父级栏目同时编译
        if (!parentId.equals(columnEntity.getParentId()) && columnEntity.getBeforeParentId() == -1) {
            columnEntity.setBeforeParentId(columnEntity.getParentId());
        }

        columnEntity.setListTemplate(adminUpdateColumnDto.getListTemplate());
        columnEntity.setArticleTemplate(adminUpdateColumnDto.getArticleTemplate());
        columnEntity.setType(adminUpdateColumnDto.getType());
        columnEntity.setTargetType(adminUpdateColumnDto.getTargetType());
        columnEntity.setTargetUrl(adminUpdateColumnDto.getTargetUrl());
        columnEntity.setIsNav(adminUpdateColumnDto.getIsNav());
        if(ObjectUtil.isEmpty(parentId)){
            columnEntity.setParentId(ColumnEntity.PARENTID_DEFAULT);
            columnEntity.setPath("/" + columnEntity.getColumnCode());
        }else{
            columnEntity.setParentId(parentId);
            ColumnEntity parent = this.baseMapper.selectById(parentId);
            columnEntity.setPath(parent.getPath() + "/" + columnEntity.getColumnCode());
        }

        this.baseMapper.updateById(columnEntity);
        return Result.ok("更新成功");
    }
@@ -242,6 +262,7 @@
                        child.setRemark(columnEntityChild.getRemark());
                        child.setPic(columnEntityChild.getPic());
                        child.setOrderNum(columnEntityChild.getOrderNum());
                        child.setContentType(columnEntityChild.getContentType());
                        adminColumnVoChilds.add(child);
                    }
                }
@@ -267,4 +288,46 @@
        }
        return Result.ok("删除成功");
    }

    @Override
    public Result getWebColumnInList(HttpServletRequest request) {
        String website = request.getHeader(AppContants.WEBSITE_HEADER);
        Long companyId = getCompanyIdFromWebsite(website);
        List<WebColumnVo> records = this.baseMapper.selectWebColumnInListByParentId(ColumnEntity.PARENTID_DEFAULT,companyId);
        if(CollUtil.isNotEmpty(records)){
            for(WebColumnVo webColumnVo : records){
                Long id = webColumnVo.getId();
                QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
                objectQueryWrapper.eq("parent_id",id);
                objectQueryWrapper.eq("company_id",companyId);
                List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
                List<WebColumnVo> adminColumnVoChilds = new ArrayList<>();
                if(CollUtil.isNotEmpty(columnEntities)){
                    for(ColumnEntity columnEntityChild : columnEntities){
                        WebColumnVo child = new WebColumnVo();
                        child.setId(columnEntityChild.getId());
                        child.setColumnName(columnEntityChild.getColumnName());
                        child.setColumnCode(columnEntityChild.getColumnCode());
                        adminColumnVoChilds.add(child);
                    }
                }
                webColumnVo.setChild(adminColumnVoChilds);
            }
        }
        return Result.ok(records);
    }

    private Long getCompanyIdFromWebsite(String website){
        List<CompanyEntity> companyEntities = companyMapper.selectList(new QueryWrapper<>());
        Long companyId = 0L;
        if(CollUtil.isNotEmpty(companyEntities)){
            for(CompanyEntity companyEntity : companyEntities){
                boolean contains = StrUtil.contains(companyEntity.getWebAddress(), website);
                if(contains){
                    companyId = companyEntity.getId();
                }
            }
        }
        return companyId;
    }
}