From 49dbcdadd860b7613063ee618fbe38a0593d5bd9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 15:45:29 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 86 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 80 insertions(+), 6 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 c18c3e7..287fe8c 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
@@ -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.configurations.properties.CmsProperties;
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,10 @@
@Autowired
private ArticleMapper articleMapper;
+ @Autowired
+ private CompanyMapper companyMapper;
+ @Autowired
+ private CmsProperties cmsProperties;
@Override
public Result getColumnInPage(AdminColumnDto adminColumnDto) {
@@ -106,8 +112,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 +125,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 +166,19 @@
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());
+ adminSeeColumnInfoVo.setUrl(cmsProperties.getBaseUrl() + 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(cmsProperties.getBaseUrl() + column.getPath());
}
+ } else {
+ adminSeeColumnInfoVo.setUrl(cmsProperties.getBaseUrl() + columnEntity.getPath());
}
adminSeeColumnInfoVo.setTargetUrl(columnEntity.getTargetUrl());
return Result.ok(adminSeeColumnInfoVo);
@@ -194,7 +209,13 @@
if(CollUtil.isNotEmpty(columnEntities) && columnEntities.size() > 1){
return Result.fail("栏目编码不能重复");
}
+
+ // 判断是否编辑了栏目编码且此时栏目处于已发布的状态，然后保存之前的编码。因为如果是未发布状态，多次保存的话，容易覆盖真正的最开始的栏目编码
+ if (!columnEntity.getColumnCode().equals(columnCode) && columnEntity.getReleaseState() == 1) {
+ columnEntity.setBeforeColumnCode(columnCode);
+ }
columnEntity.setColumnCode(columnCode);
+
String remark = adminUpdateColumnDto.getRemark();
columnEntity.setRemark(remark);
String pic = adminUpdateColumnDto.getPic();
@@ -204,10 +225,18 @@
columnEntity.setOrderNum(orderNum);
}
Long parentId = adminUpdateColumnDto.getParentId();
+ // 同栏目编码
+ if (!columnEntity.getParentId().equals(parentId) && columnEntity.getReleaseState() == 1) {
+ columnEntity.setBeforeParentId(columnEntity.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());
@@ -216,6 +245,8 @@
columnEntity.setTargetType(adminUpdateColumnDto.getTargetType());
columnEntity.setTargetUrl(adminUpdateColumnDto.getTargetUrl());
columnEntity.setIsNav(adminUpdateColumnDto.getIsNav());
+ columnEntity.setContentType(adminUpdateColumnDto.getContentType());
+ columnEntity.setReleaseState(2);
this.baseMapper.updateById(columnEntity);
return Result.ok("更新成功");
}
@@ -242,6 +273,7 @@
child.setRemark(columnEntityChild.getRemark());
child.setPic(columnEntityChild.getPic());
child.setOrderNum(columnEntityChild.getOrderNum());
+ child.setContentType(columnEntityChild.getContentType());
adminColumnVoChilds.add(child);
}
}
@@ -267,4 +299,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;
+ }
}
--
Gitblit v1.9.1