fix

Helius

2022-07-07 d5319cffb668574b726a52d08afd3aa5323e3d7b

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

@@ -11,16 +11,15 @@
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 +28,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 +38,8 @@

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

    @Override
    public Result getColumnInPage(AdminColumnDto adminColumnDto) {
@@ -106,8 +108,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());
@@ -118,7 +123,7 @@
        columnEntity.setIsNav(adminAddColumnDto.getIsNav());
        columnEntity.setContentType(adminAddColumnDto.getContentType());
        this.baseMapper.insert(columnEntity);
        return Result.ok("添加成功");
        return Result.ok("添加成功", columnEntity.getId());
    }

    @Override
@@ -208,8 +213,11 @@
        Long parentId = adminUpdateColumnDto.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(adminUpdateColumnDto.getListTemplate());
@@ -271,4 +279,41 @@
        }
        return Result.ok("删除成功");
    }

    @Override
    public Result getWebColumnInList(HttpServletRequest request) {
        StringBuffer requestURL = request.getRequestURL();
        List<CompanyEntity> companyEntities = companyMapper.selectList(new QueryWrapper<>());
        Long companyId = 0L;
        if(CollUtil.isNotEmpty(companyEntities)){
            for(CompanyEntity companyEntity : companyEntities){
                boolean contains = StrUtil.contains(requestURL, companyEntity.getWebAddress());
                if(contains){
                    companyId = companyEntity.getId();
                }
            }
        }
        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);
    }
}