Commit f0deacd3 by zhangxingmin

push

parent 562a457f
...@@ -5,7 +5,9 @@ import com.yd.base.feign.client.relobjectcategory.ApiRelObjectCategoryFeignClien ...@@ -5,7 +5,9 @@ import com.yd.base.feign.client.relobjectcategory.ApiRelObjectCategoryFeignClien
import com.yd.base.feign.request.relobjectcategory.ApiRelCategoryObjectListAddRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelCategoryObjectListAddRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryListAddRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryListAddRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQuerySelectedRequest;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse; import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQuerySelectedResponse;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -38,6 +40,16 @@ public class ApiRelObjectCategoryController implements ApiRelObjectCategoryFeign ...@@ -38,6 +40,16 @@ public class ApiRelObjectCategoryController implements ApiRelObjectCategoryFeign
} }
/** /**
* 查询-选中的分类列表
* @param request
* @return
*/
@Override
public Result<List<ApiRelObjectCategoryQuerySelectedResponse>> querySelected(ApiRelObjectCategoryQuerySelectedRequest request) {
return apiRelObjectCategoryService.querySelected(request);
}
/**
* 添加-单个对象和分类列表关系 * 添加-单个对象和分类列表关系
* @param request * @param request
* @return * @return
......
...@@ -3,7 +3,9 @@ package com.yd.base.api.service; ...@@ -3,7 +3,9 @@ package com.yd.base.api.service;
import com.yd.base.feign.request.relobjectcategory.ApiRelCategoryObjectListAddRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelCategoryObjectListAddRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryListAddRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryListAddRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQuerySelectedRequest;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse; import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQuerySelectedResponse;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import java.util.List; import java.util.List;
...@@ -11,6 +13,8 @@ import java.util.List; ...@@ -11,6 +13,8 @@ import java.util.List;
public interface ApiRelObjectCategoryService { public interface ApiRelObjectCategoryService {
Result<List<ApiRelObjectCategoryQueryResponse>> query(ApiRelObjectCategoryQueryRequest request); Result<List<ApiRelObjectCategoryQueryResponse>> query(ApiRelObjectCategoryQueryRequest request);
Result<List<ApiRelObjectCategoryQuerySelectedResponse>> querySelected(ApiRelObjectCategoryQuerySelectedRequest request);
Result addRelObjectCategoryList(ApiRelObjectCategoryListAddRequest request); Result addRelObjectCategoryList(ApiRelObjectCategoryListAddRequest request);
Result addRelCategoryObjectList(ApiRelCategoryObjectListAddRequest request); Result addRelCategoryObjectList(ApiRelCategoryObjectListAddRequest request);
......
...@@ -4,15 +4,26 @@ import com.yd.base.api.service.ApiRelObjectCategoryService; ...@@ -4,15 +4,26 @@ import com.yd.base.api.service.ApiRelObjectCategoryService;
import com.yd.base.feign.request.relobjectcategory.ApiRelCategoryObjectListAddRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelCategoryObjectListAddRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryListAddRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryListAddRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQuerySelectedRequest;
import com.yd.base.feign.response.relobjectcategory.ApiCategorySelectedResponse;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse; import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQuerySelectedResponse;
import com.yd.base.service.dto.CategoryDto;
import com.yd.base.service.dto.RelObjectCategoryDto;
import com.yd.base.service.model.Category;
import com.yd.base.service.model.RelObjectCategory; import com.yd.base.service.model.RelObjectCategory;
import com.yd.base.service.service.ICategoryService;
import com.yd.base.service.service.IRelObjectCategoryService; import com.yd.base.service.service.IRelObjectCategoryService;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.question.feign.dto.ApiRelQuestionsGroupDto;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -23,6 +34,9 @@ public class ApiRelObjectCategoryServiceImpl implements ApiRelObjectCategoryServ ...@@ -23,6 +34,9 @@ public class ApiRelObjectCategoryServiceImpl implements ApiRelObjectCategoryServ
@Autowired @Autowired
private IRelObjectCategoryService iRelObjectCategoryService; private IRelObjectCategoryService iRelObjectCategoryService;
@Autowired
private ICategoryService iCategoryService;
/** /**
* 查询-对象分类关系列表 * 查询-对象分类关系列表
* @param request * @param request
...@@ -35,6 +49,66 @@ public class ApiRelObjectCategoryServiceImpl implements ApiRelObjectCategoryServ ...@@ -35,6 +49,66 @@ public class ApiRelObjectCategoryServiceImpl implements ApiRelObjectCategoryServ
} }
/** /**
* 查询-选中的分类列表
* @param request
* @return
*/
@Override
public Result<List<ApiRelObjectCategoryQuerySelectedResponse>> querySelected(ApiRelObjectCategoryQuerySelectedRequest request) {
List<ApiRelObjectCategoryQuerySelectedResponse> responses = new ArrayList<>();
//根据对象业务ID查询选中的分类列表
List<RelObjectCategory> relObjectCategoryList = iRelObjectCategoryService.queryList(RelObjectCategoryDto.builder()
.objectBizId(request.getObjectBizId()).build());
List<String> selectedCategoryBizIdList = new ArrayList<>();
if (!CollectionUtils.isEmpty(relObjectCategoryList)) {
selectedCategoryBizIdList = relObjectCategoryList.stream()
.map(RelObjectCategory::getCategoryBizId)
.collect(Collectors.toList());
}
List<String> compareSelectedCategoryBizIdList = selectedCategoryBizIdList;
List<Category> categoryList = iCategoryService.queryList(CategoryDto.builder().type(request.getType()).pid("0").build());
ApiRelObjectCategoryQuerySelectedResponse selectedResponse1 = new ApiRelObjectCategoryQuerySelectedResponse();
selectedResponse1.setLevel(1);
if (!CollectionUtils.isEmpty(categoryList)) {
List<ApiCategorySelectedResponse> selectedResponseList = categoryList.stream().map(dto -> {
ApiCategorySelectedResponse response = new ApiCategorySelectedResponse();
BeanUtils.copyProperties(dto,response);
List<String> filterList = compareSelectedCategoryBizIdList.stream().filter(bizId -> bizId.equals(dto.getCategoryBizId())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(filterList)) {
response.setIsSelected(true);
}
return response;
}).collect(Collectors.toList());
selectedResponse1.setSelectedResponseList(selectedResponseList);
responses.add(selectedResponse1);
}
if (!CollectionUtils.isEmpty(compareSelectedCategoryBizIdList)) {
for (String categoryBizId : selectedCategoryBizIdList) {
List<Category> childList = iCategoryService.queryList(CategoryDto.builder().pid(categoryBizId).build());
if (!CollectionUtils.isEmpty(childList)) {
ApiRelObjectCategoryQuerySelectedResponse selectedResponse = new ApiRelObjectCategoryQuerySelectedResponse();
List<ApiCategorySelectedResponse> selectedResponseList = childList.stream().map(dto -> {
selectedResponse.setLevel(dto.getLevel());
ApiCategorySelectedResponse response = new ApiCategorySelectedResponse();
BeanUtils.copyProperties(dto,response);
List<String> filterList = compareSelectedCategoryBizIdList.stream().filter(bizId -> bizId.equals(dto.getCategoryBizId())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(filterList)) {
response.setIsSelected(true);
}
return response;
}).collect(Collectors.toList());
selectedResponse.setSelectedResponseList(selectedResponseList);
responses.add(selectedResponse);
}
}
}
responses = responses.stream()
.sorted(Comparator.comparing(ApiRelObjectCategoryQuerySelectedResponse::getLevel))
.collect(Collectors.toList());
return Result.success(responses);
}
/**
* 添加-单个对象和分类列表关系 * 添加-单个对象和分类列表关系
* @param request * @param request
* @return * @return
...@@ -85,4 +159,5 @@ public class ApiRelObjectCategoryServiceImpl implements ApiRelObjectCategoryServ ...@@ -85,4 +159,5 @@ public class ApiRelObjectCategoryServiceImpl implements ApiRelObjectCategoryServ
} }
return Result.success(); return Result.success();
} }
} }
...@@ -4,7 +4,9 @@ import com.yd.base.feign.fallback.relobjectcategory.ApiRelObjectCategoryFeignFal ...@@ -4,7 +4,9 @@ import com.yd.base.feign.fallback.relobjectcategory.ApiRelObjectCategoryFeignFal
import com.yd.base.feign.request.relobjectcategory.ApiRelCategoryObjectListAddRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelCategoryObjectListAddRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryListAddRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryListAddRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQuerySelectedRequest;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse; import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQuerySelectedResponse;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -27,6 +29,14 @@ public interface ApiRelObjectCategoryFeignClient { ...@@ -27,6 +29,14 @@ public interface ApiRelObjectCategoryFeignClient {
Result<List<ApiRelObjectCategoryQueryResponse>> query(@Validated @RequestBody ApiRelObjectCategoryQueryRequest request); Result<List<ApiRelObjectCategoryQueryResponse>> query(@Validated @RequestBody ApiRelObjectCategoryQueryRequest request);
/** /**
* 查询-选中的分类列表
* @param request
* @return
*/
@PostMapping("/query/selected")
Result<List<ApiRelObjectCategoryQuerySelectedResponse>> querySelected(@Validated @RequestBody ApiRelObjectCategoryQuerySelectedRequest request);
/**
* 添加-单个对象和分类列表关系 * 添加-单个对象和分类列表关系
* @param request * @param request
* @return * @return
......
...@@ -4,7 +4,9 @@ import com.yd.base.feign.client.relobjectcategory.ApiRelObjectCategoryFeignClien ...@@ -4,7 +4,9 @@ import com.yd.base.feign.client.relobjectcategory.ApiRelObjectCategoryFeignClien
import com.yd.base.feign.request.relobjectcategory.ApiRelCategoryObjectListAddRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelCategoryObjectListAddRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryListAddRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryListAddRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQuerySelectedRequest;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse; import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQuerySelectedResponse;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
...@@ -28,6 +30,11 @@ public class ApiRelObjectCategoryFeignFallbackFactory implements FallbackFactory ...@@ -28,6 +30,11 @@ public class ApiRelObjectCategoryFeignFallbackFactory implements FallbackFactory
} }
@Override @Override
public Result<List<ApiRelObjectCategoryQuerySelectedResponse>> querySelected(ApiRelObjectCategoryQuerySelectedRequest request) {
return null;
}
@Override
public Result addRelObjectCategoryList(ApiRelObjectCategoryListAddRequest request) { public Result addRelObjectCategoryList(ApiRelObjectCategoryListAddRequest request) {
return null; return null;
} }
......
package com.yd.base.feign.request.relobjectcategory;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class ApiRelObjectCategoryQuerySelectedRequest {
/**
* 分类类别(产品模块,资讯模块,活动模块等)
*/
private String type;
/**
* 业务对象业务ID
*/
@NotBlank(message = "业务对象业务ID不能为空")
private String objectBizId;
}
package com.yd.base.feign.response.relobjectcategory;
import lombok.Data;
@Data
public class ApiCategorySelectedResponse {
/**
* 分类表唯一业务ID
*/
private String categoryBizId;
/**
* 父级id
*/
private String pid;
/**
* 分类类别(产品模块,资讯模块,活动模块等)
*/
private String type;
/**
* 分类编码
*/
private String code;
/**
* 分类名称
*/
private String name;
/**
* 父子路径
*/
private String path;
/**
* 分类层级
*/
private Integer level;
/**
* 状态(0:停用 1:启用)
*/
private Integer status;
/**
* 选中状态 true-选中 false-未选中
*/
private Boolean isSelected = false;
}
package com.yd.base.feign.response.relobjectcategory;
import lombok.Data;
import java.util.List;
@Data
public class ApiRelObjectCategoryQuerySelectedResponse {
/**
* 分类层级
*/
private Integer level;
/**
* 分类列表
*/
private List<ApiCategorySelectedResponse> selectedResponseList;
}
package com.yd.base.service.dto; package com.yd.base.service.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.util.List;
@Data @Data
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
...@@ -12,6 +15,11 @@ import lombok.NoArgsConstructor; ...@@ -12,6 +15,11 @@ import lombok.NoArgsConstructor;
public class CategoryDto { public class CategoryDto {
/** /**
* 分类类别(产品模块,资讯模块,活动模块等)
*/
private String type;
/**
* 父id * 父id
*/ */
private String pid; private String pid;
...@@ -22,6 +30,11 @@ public class CategoryDto { ...@@ -22,6 +30,11 @@ public class CategoryDto {
private String categoryBizId; private String categoryBizId;
/** /**
* 分类表唯一业务ID
*/
private List<String> categoryBizIdList;
/**
* 分类名称 * 分类名称
*/ */
private String name; private String name;
......
package com.yd.base.service.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class RelObjectCategoryDto {
/**
* 业务对象业务ID
*/
private String objectBizId;
}
...@@ -3,6 +3,7 @@ package com.yd.base.service.service; ...@@ -3,6 +3,7 @@ package com.yd.base.service.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse; import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse;
import com.yd.base.service.dto.RelObjectCategoryDto;
import com.yd.base.service.model.RelObjectCategory; import com.yd.base.service.model.RelObjectCategory;
import java.util.List; import java.util.List;
...@@ -22,4 +23,6 @@ public interface IRelObjectCategoryService extends IService<RelObjectCategory> { ...@@ -22,4 +23,6 @@ public interface IRelObjectCategoryService extends IService<RelObjectCategory> {
Boolean delByObjectBizId(String objectBizId); Boolean delByObjectBizId(String objectBizId);
Boolean delByCategoryBizId(String categoryBizId); Boolean delByCategoryBizId(String categoryBizId);
List<RelObjectCategory> queryList(RelObjectCategoryDto dto);
} }
...@@ -12,6 +12,7 @@ import com.yd.base.service.model.Category; ...@@ -12,6 +12,7 @@ import com.yd.base.service.model.Category;
import com.yd.base.service.service.ICategoryService; import com.yd.base.service.service.ICategoryService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List; import java.util.List;
...@@ -42,6 +43,9 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i ...@@ -42,6 +43,9 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
List<Category> list = baseMapper.selectList(new LambdaQueryWrapper<Category>() List<Category> list = baseMapper.selectList(new LambdaQueryWrapper<Category>()
.eq(StringUtils.isNotBlank(dto.getCategoryBizId()) && !dto.getIsExcludeMy(),Category::getCategoryBizId,dto.getCategoryBizId()) .eq(StringUtils.isNotBlank(dto.getCategoryBizId()) && !dto.getIsExcludeMy(),Category::getCategoryBizId,dto.getCategoryBizId())
.eq(StringUtils.isNotBlank(dto.getName()),Category::getName,dto.getName()) .eq(StringUtils.isNotBlank(dto.getName()),Category::getName,dto.getName())
.eq(StringUtils.isNotBlank(dto.getPid()),Category::getPid,dto.getPid())
.eq(StringUtils.isNotBlank(dto.getType()),Category::getType,dto.getType())
.in(!CollectionUtils.isEmpty(dto.getCategoryBizIdList()),Category::getCategoryBizId,dto.getCategoryBizId())
.ne(dto.getIsExcludeMy(),Category::getCategoryBizId,dto.getCategoryBizId()) .ne(dto.getIsExcludeMy(),Category::getCategoryBizId,dto.getCategoryBizId())
); );
return list; return list;
......
...@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryQueryRequest;
import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse; import com.yd.base.feign.response.relobjectcategory.ApiRelObjectCategoryQueryResponse;
import com.yd.base.service.dao.RelObjectCategoryMapper; import com.yd.base.service.dao.RelObjectCategoryMapper;
import com.yd.base.service.dto.RelObjectCategoryDto;
import com.yd.base.service.model.RelObjectCategory; import com.yd.base.service.model.RelObjectCategory;
import com.yd.base.service.model.Species;
import com.yd.base.service.service.IRelObjectCategoryService; import com.yd.base.service.service.IRelObjectCategoryService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
...@@ -36,4 +39,12 @@ public class RelObjectCategoryServiceImpl extends ServiceImpl<RelObjectCategoryM ...@@ -36,4 +39,12 @@ public class RelObjectCategoryServiceImpl extends ServiceImpl<RelObjectCategoryM
public Boolean delByCategoryBizId(String categoryBizId) { public Boolean delByCategoryBizId(String categoryBizId) {
return this.remove(new LambdaQueryWrapper<RelObjectCategory>().eq(RelObjectCategory::getCategoryBizId,categoryBizId)); return this.remove(new LambdaQueryWrapper<RelObjectCategory>().eq(RelObjectCategory::getCategoryBizId,categoryBizId));
} }
@Override
public List<RelObjectCategory> queryList(RelObjectCategoryDto dto) {
List<RelObjectCategory> list = baseMapper.selectList(new LambdaQueryWrapper<RelObjectCategory>()
.eq(StringUtils.isNotBlank(dto.getObjectBizId()),RelObjectCategory::getObjectBizId,dto.getObjectBizId())
);
return list;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment