From 5e54f37b9bfd01874c22c017c768adb2f8fee24d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jul 2022 11:47:39 +0800
Subject: [PATCH] fix column update
---
src/main/java/com/xcong/farmer/cms/conversion/ColumnConversion.java | 3 +
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 58 +++++++++++------------------
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java | 3 +
3 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/conversion/ColumnConversion.java b/src/main/java/com/xcong/farmer/cms/conversion/ColumnConversion.java
index f8a3217..06b70a5 100644
--- a/src/main/java/com/xcong/farmer/cms/conversion/ColumnConversion.java
+++ b/src/main/java/com/xcong/farmer/cms/conversion/ColumnConversion.java
@@ -3,6 +3,7 @@
import com.xcong.farmer.cms.core.tag.data.ColumnData;
import com.xcong.farmer.cms.core.tag.data.NavData;
import com.xcong.farmer.cms.core.tag.model.Column;
+import com.xcong.farmer.cms.modules.system.dto.AdminUpdateColumnDto;
import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
import com.xcong.farmer.cms.modules.test.mapper.TestUserEntityMapper;
import org.mapstruct.Mapper;
@@ -33,4 +34,6 @@
public abstract ColumnData entityToData(ColumnEntity column);
public abstract List<ColumnData> entitiesToDatas(List<ColumnEntity> list);
+
+ public abstract ColumnEntity updateDtoToEntity(AdminUpdateColumnDto dto);
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java
index d8e1f4d..a5ab87d 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java
@@ -5,11 +5,14 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
@Data
@ApiModel(value = "AdminUpdateColumnDto", description = "参数接收类")
public class AdminUpdateColumnDto {
+ @NotNull(message = "参数不能为空")
+ @ApiModelProperty(value = "栏目ID")
private Long id;
@ApiModelProperty(value = "栏目名称")
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 7498eb2..577debd 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
@@ -8,6 +8,7 @@
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;
@@ -187,46 +188,39 @@
@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());
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("栏目编码不能重复");
}
- // 判断是否编辑了栏目编码且此时栏目处于已发布的状态，然后保存之前的编码。因为如果是未发布状态，多次保存的话，容易覆盖真正的最开始的栏目编码
- if (!columnEntity.getColumnCode().equals(columnCode) && columnEntity.getReleaseState() == 1) {
+ // 若编码进行了修改且该栏目为父栏目，则需要同步修改子栏目的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);
- 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);
- }
Long parentId = adminUpdateColumnDto.getParentId();
- // 同栏目编码
- if (!columnEntity.getParentId().equals(parentId) && columnEntity.getReleaseState() == 1) {
+ // 栏目修改时，需判断父级ID及栏目编码的修改。若栏目父级ID修改了，则需记录原父级ID，在发布时，需连同原父级栏目同时编译
+ if (!columnEntity.getParentId().equals(parentId) && columnEntity.getParentId() == -1) {
columnEntity.setBeforeParentId(columnEntity.getParentId());
}
@@ -239,14 +233,6 @@
columnEntity.setPath(parent.getPath() + "/" + columnEntity.getColumnCode());
}
- 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());
- columnEntity.setReleaseState(2);
this.baseMapper.updateById(columnEntity);
return Result.ok("更新成功");
}
--
Gitblit v1.9.1