fix 上传模板和查看栏目修改

Helius

2022-07-04 2736d16a8b1804f7291a56a147f76ef3584d6619

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

@@ -11,15 +11,18 @@
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.mapper.ArticleMapper;
import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import cn.hutool.core.util.StrUtil;
@@ -32,6 +35,10 @@
@Service
@Slf4j
public class ColumnServiceImpl extends ServiceImpl<ColumnMapper, ColumnEntity> implements IColumnService {

    @Autowired
    private ArticleMapper articleMapper;

    @Override
    public Result getColumnInPage(AdminColumnDto adminColumnDto) {
        UserEntity userlogin = LoginUserUtil.getLoginUser();
@@ -108,6 +115,7 @@
        columnEntity.setType(adminAddColumnDto.getType());
        columnEntity.setTargetType(adminAddColumnDto.getTargetType());
        columnEntity.setTargetUrl(adminAddColumnDto.getTargetUrl());
        columnEntity.setIsNav(adminAddColumnDto.getIsNav());
        this.baseMapper.insert(columnEntity);
        return Result.ok("添加成功");
    }
@@ -143,6 +151,21 @@
        adminSeeColumnInfoVo.setParentId(columnEntity.getParentId());
        adminSeeColumnInfoVo.setOrderNum(columnEntity.getOrderNum());
        adminSeeColumnInfoVo.setPic(columnEntity.getPic());
        adminSeeColumnInfoVo.setListTemplate(columnEntity.getListTemplate());
        adminSeeColumnInfoVo.setArticleTemplate(columnEntity.getArticleTemplate());
        adminSeeColumnInfoVo.setIsNav(columnEntity.getIsNav());
        adminSeeColumnInfoVo.setType(columnEntity.getType());
        adminSeeColumnInfoVo.setTargetType(columnEntity.getTargetType());
        if (columnEntity.getType() == 2) {
            if (columnEntity.getTargetType() == 1) {
                ArticleEntity articleEntity = articleMapper.selectById(Long.parseLong(columnEntity.getTargetUrl()));
                adminSeeColumnInfoVo.setTargetName(articleEntity.getTitle());
            } else if (columnEntity.getTargetType() == 2) {
                ColumnEntity column = this.baseMapper.selectById(Long.parseLong(columnEntity.getTargetUrl()));
                adminSeeColumnInfoVo.setTargetName(column.getColumnName());
            }
        }
        adminSeeColumnInfoVo.setTargetUrl(columnEntity.getTargetUrl());
        return Result.ok(adminSeeColumnInfoVo);
    }

@@ -192,6 +215,7 @@
        columnEntity.setType(adminUpdateColumnDto.getType());
        columnEntity.setTargetType(adminUpdateColumnDto.getTargetType());
        columnEntity.setTargetUrl(adminUpdateColumnDto.getTargetUrl());
        columnEntity.setIsNav(adminUpdateColumnDto.getIsNav());
        this.baseMapper.updateById(columnEntity);
        return Result.ok("更新成功");
    }