From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 119 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 68 insertions(+), 51 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index e0601bc..6de45a4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -14,13 +14,17 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 鍒嗙被淇℃伅琛⊿ervice瀹炵幇
@@ -51,7 +55,7 @@
insert.setStatus(Constants.ZERO);
insert.setSortnum(category.getSortnum());
insert.setImgurl(category.getImgurl());
- insert.setType(Constants.ZERO);
+ insert.setType(category.getType());
insert.setParentId(category.getParentId());
categoryMapper.insert(insert);
return insert.getId();
@@ -59,7 +63,9 @@
@Override
public void deleteById(Integer id) {
- categoryMapper.deleteById(id);
+ categoryMapper.update(null,new UpdateWrapper<Category>().lambda().set(Category::getIsdeleted,Constants.ONE)
+ .eq(Category::getId,id)
+ );
}
@Override
@@ -73,7 +79,9 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- categoryMapper.deleteBatchIds(ids);
+ categoryMapper.update(null,new UpdateWrapper<Category>().lambda().set(Category::getIsdeleted,Constants.ONE)
+ .in(Category::getId,ids)
+ );
}
@Override
@@ -110,59 +118,38 @@
}
@Override
+ public List<Category> queryList(Category category) {
+ List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
+ .eq(Objects.nonNull(category)&&Objects.nonNull(category.getType()),Category::getType,category.getType())
+ .isNull(Objects.nonNull(category)&&Objects.isNull(category.getParentId()),Category::getParentId)
+ .eq(Objects.nonNull(category)&&Objects.nonNull(category.getParentId()),Category::getParentId,category.getParentId())
+ .eq(Category::getIsdeleted,Constants.ZERO)
+ );
+ return categoryList;
+ }
+
+ @Override
public PageData<Category> findPage(PageWrap<Category> pageWrap) {
IPage<Category> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Category> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Category::getId, pageWrap.getModel().getId());
+ queryWrapper.lambda().eq(Category::getIsdeleted,Constants.ZERO)
+ .eq(Objects.nonNull(pageWrap.getModel().getType()),Category::getType,pageWrap.getModel().getType())
+ .isNull(Category::getParentId);
+ PageData<Category> categoryPageData = PageData.from(categoryMapper.selectPage(page, queryWrapper));
+ //鏌ヨ鎵�鏈変簩绾ф暟鎹�
+ List<Category> categoryList = categoryMapper.selectList(
+ new QueryWrapper<Category>().lambda()
+ .eq(Objects.nonNull(pageWrap.getModel().getType()),Category::getType,pageWrap.getModel().getType())
+ .eq(Category::getIsdeleted,Constants.ZERO).isNotNull(Category::getParentId));
+
+ for (Category category:categoryPageData.getRecords()) {
+ category.setChildCategoryList(
+ categoryList.stream().filter(i->Constants.equalsInteger(i.getParentId(),category.getId())).collect(Collectors.toList())
+ );
}
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(Category::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(Category::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(Category::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(Category::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(Category::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(Category::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(Category::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Category::getName, pageWrap.getModel().getName());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(Category::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(Category::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(Category::getSortnum, pageWrap.getModel().getSortnum());
- }
- if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(Category::getImgurl, pageWrap.getModel().getImgurl());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Category::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getParentId() != null) {
- queryWrapper.lambda().eq(Category::getParentId, pageWrap.getModel().getParentId());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(categoryMapper.selectPage(page, queryWrapper));
+
+ return categoryPageData;
}
@Override
@@ -170,6 +157,36 @@
QueryWrapper<Category> wrapper = new QueryWrapper<>(category);
return categoryMapper.selectCount(wrapper);
}
+ @Override
+ public List<Category> findChileList(Category model) {
+ List<Category> list =findList(model);
+ List<Category> data = new ArrayList<>();
+ if(list!=null){
+ for(Category category : list){
+ if(category.getParentId()!=null){
+ Category pcate = getParentById(category.getParentId(),list);
+ if(pcate!=null){
+ category.setParentName(StringUtils.defaultString(pcate.getName(),""));
+ category.setName(StringUtils.defaultString(category.getName(),""));
+ category.setGroupName( category.getParentName()+"/"+category.getName());
+ data.add(category);
+ }
+ }
+ }
+ }
+ return data;
+ }
+
+ private Category getParentById(Integer parentId, List<Category> list) {
+ if(list!=null){
+ for(Category category : list){
+ if(Constants.equalsInteger(parentId,category.getId())){
+ return category;
+ }
+ }
+ }
+ return null;
+ }
private void checkUnique(Category category){
QueryWrapper<Category> wrapper = new QueryWrapper<>();
--
Gitblit v1.9.3