From e703d415ff36584518a76d4d26363bfd1556b43b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 05 Jul 2022 12:01:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
index ad1f443..f09992a 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
+++ b/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();
@@ -80,6 +87,9 @@
String columnCode = adminAddColumnDto.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)){
return Result.fail("栏目编码不能重复");
@@ -99,6 +109,14 @@
}else{
columnEntity.setParentId(parentId);
}
+
+ columnEntity.setListTemplate(adminAddColumnDto.getListTemplate());
+ columnEntity.setArticleTemplate(adminAddColumnDto.getArticleTemplate());
+ columnEntity.setType(adminAddColumnDto.getType());
+ columnEntity.setTargetType(adminAddColumnDto.getTargetType());
+ columnEntity.setTargetUrl(adminAddColumnDto.getTargetUrl());
+ columnEntity.setIsNav(adminAddColumnDto.getIsNav());
+ columnEntity.setContentType(adminAddColumnDto.getContentType());
this.baseMapper.insert(columnEntity);
return Result.ok("添加成功");
}
@@ -134,12 +152,30 @@
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());
+ adminSeeColumnInfoVo.setContentType(columnEntity.getContentType());
+ 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.selectByCodeAndCompanyId(columnEntity.getTargetUrl(), LoginUserUtil.getCompanyId());
+ adminSeeColumnInfoVo.setTargetName(column.getColumnName());
+ }
+ }
+ adminSeeColumnInfoVo.setTargetUrl(columnEntity.getTargetUrl());
return Result.ok(adminSeeColumnInfoVo);
}
@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("栏目不存在");
@@ -153,6 +189,9 @@
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){
return Result.fail("栏目编码不能重复");
@@ -172,6 +211,14 @@
}else{
columnEntity.setParentId(parentId);
}
+
+ columnEntity.setListTemplate(adminUpdateColumnDto.getListTemplate());
+ columnEntity.setArticleTemplate(adminUpdateColumnDto.getArticleTemplate());
+ columnEntity.setType(adminUpdateColumnDto.getType());
+ columnEntity.setTargetType(adminUpdateColumnDto.getTargetType());
+ columnEntity.setTargetUrl(adminUpdateColumnDto.getTargetUrl());
+ columnEntity.setIsNav(adminUpdateColumnDto.getIsNav());
+ columnEntity.setContentType(adminUpdateColumnDto.getContentType());
this.baseMapper.updateById(columnEntity);
return Result.ok("更新成功");
}
@@ -198,6 +245,7 @@
child.setRemark(columnEntityChild.getRemark());
child.setPic(columnEntityChild.getPic());
child.setOrderNum(columnEntityChild.getOrderNum());
+ child.setContentType(columnEntityChild.getContentType());
adminColumnVoChilds.add(child);
}
}
--
Gitblit v1.9.1