From 627af3e26fe1b901d226b101b0b075f78bb8df8c Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Thu, 17 Mar 2022 17:44:08 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=89=8D=E7=AB=AFicon=E4=BB=A5?=
=?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=202=E3=80=81=E5=B1=9E?=
=?UTF-8?q?=E6=80=A7=E5=88=86=E7=BB=84=E6=9F=A5=E5=87=BA=E5=88=86=E7=B1=BB?=
=?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mall/product/attribute/attr-group.vue | 9 ++-
.../mall/product/attribute/base-attr.vue | 6 +-
.../product/service/AttrGroupService.java | 2 -
.../mall/product/service/CategoryService.java | 4 --
.../service/impl/AttrGroupServiceImpl.java | 59 ++++++++++++-------
.../service/impl/CategoryServiceImpl.java | 12 ----
.../mall/product/vo/AttrGroupResponseVo.java | 46 +++++++++++++++
7 files changed, 97 insertions(+), 41 deletions(-)
create mode 100644 xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/vo/AttrGroupResponseVo.java
diff --git a/ruoyi-ui/src/views/mall/product/attribute/attr-group.vue b/ruoyi-ui/src/views/mall/product/attribute/attr-group.vue
index 81bcdad1..7733389e 100644
--- a/ruoyi-ui/src/views/mall/product/attribute/attr-group.vue
+++ b/ruoyi-ui/src/views/mall/product/attribute/attr-group.vue
@@ -40,8 +40,13 @@
-
-
+
+
+
+
+
+
+
多选
-
+
+
+
+
+
diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/AttrGroupService.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/AttrGroupService.java
index 1ed65e5c..a44325a5 100644
--- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/AttrGroupService.java
+++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/AttrGroupService.java
@@ -15,8 +15,6 @@ import java.util.Map;
*/
public interface AttrGroupService extends IService {
- PageUtils queryPage(Map params);
-
/**
* 分页
* @param params 条件
diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/CategoryService.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/CategoryService.java
index 9f3eb579..9f95341e 100644
--- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/CategoryService.java
+++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/CategoryService.java
@@ -1,11 +1,9 @@
package com.xjs.mall.product.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.xjs.utils.PageUtils;
import com.xjs.mall.product.entity.CategoryEntity;
import java.util.List;
-import java.util.Map;
/**
* 商品三级分类
@@ -16,8 +14,6 @@ import java.util.Map;
*/
public interface CategoryService extends IService {
- PageUtils queryPage(Map params);
-
/**
* 查询树形结构分类
* @return list
diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/AttrGroupServiceImpl.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/AttrGroupServiceImpl.java
index 1c379fd0..ab79fdef 100644
--- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/AttrGroupServiceImpl.java
+++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/AttrGroupServiceImpl.java
@@ -1,60 +1,79 @@
package com.xjs.mall.product.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xjs.mall.product.dao.AttrGroupDao;
import com.xjs.mall.product.entity.AttrGroupEntity;
+import com.xjs.mall.product.entity.CategoryEntity;
import com.xjs.mall.product.service.AttrGroupService;
+import com.xjs.mall.product.service.CategoryService;
+import com.xjs.mall.product.vo.AttrGroupResponseVo;
import com.xjs.utils.PageUtils;
import com.xjs.utils.Query;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Service("attrGroupService")
@Transactional
public class AttrGroupServiceImpl extends ServiceImpl implements AttrGroupService {
- @Override
- public PageUtils queryPage(Map params) {
- IPage page = this.page(
- new Query().getPage(params),
- new QueryWrapper<>()
- );
-
- return new PageUtils(page);
- }
+ @Autowired
+ private CategoryService categoryService;
@Override
public PageUtils queryPage(Map params, Long categoryId) {
String key = (String) params.get(Query.KEY_NAME);
LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
- if(!StringUtils.isEmpty(key)){
- wrapper.and((obj)->{
- obj.eq(AttrGroupEntity::getAttrGroupId,key)
- .or().like(AttrGroupEntity::getDescript,key)
- .or().like(AttrGroupEntity::getAttrGroupName,key);
+ if (!StringUtils.isEmpty(key)) {
+ wrapper.and((obj) -> {
+ obj.eq(AttrGroupEntity::getAttrGroupId, key)
+ .or().like(AttrGroupEntity::getDescript, key)
+ .or().like(AttrGroupEntity::getAttrGroupName, key);
});
}
- if( categoryId == 0){
+ if (categoryId == 0) {
IPage page = this.page(new Query().getPage(params),
wrapper);
- return new PageUtils(page);
- }else {
- wrapper.eq(AttrGroupEntity::getCatelogId,categoryId);
+
+ List responseVoList = this.setList(page.getRecords());
+ PageUtils pageUtils = new PageUtils(page);
+ pageUtils.setList(responseVoList);
+ return pageUtils;
+ } else {
+ wrapper.eq(AttrGroupEntity::getCatelogId, categoryId);
IPage page = this.page(new Query().getPage(params),
wrapper);
- return new PageUtils(page);
+
+ List responseVoList = this.setList(page.getRecords());
+ PageUtils pageUtils = new PageUtils(page);
+ pageUtils.setList(responseVoList);
+ return pageUtils;
}
+ }
+
+ private List setList(List records) {
+ return records.stream().map(attrGroupEntity -> {
+ AttrGroupResponseVo attrGroupResponseVo = new AttrGroupResponseVo();
+ BeanUtils.copyProperties(attrGroupEntity, attrGroupResponseVo);
+ //获取分类实体类，主要为了获取分类名称给vo
+ CategoryEntity categoryEntity = categoryService.getById(attrGroupEntity.getCatelogId());
+ attrGroupResponseVo.setCategoryName(categoryEntity.getName());
+ return attrGroupResponseVo;
+ }).collect(Collectors.toList());
}
+
}
diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/CategoryServiceImpl.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/CategoryServiceImpl.java
index 77d9a668..dcf39725 100644
--- a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/CategoryServiceImpl.java
+++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/service/impl/CategoryServiceImpl.java
@@ -1,14 +1,10 @@
package com.xjs.mall.product.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xjs.mall.product.dao.CategoryDao;
import com.xjs.mall.product.entity.CategoryEntity;
import com.xjs.mall.product.service.CategoryBrandRelationService;
import com.xjs.mall.product.service.CategoryService;
-import com.xjs.utils.PageUtils;
-import com.xjs.utils.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -28,15 +24,7 @@ public class CategoryServiceImpl extends ServiceImpl params) {
- IPage page = this.page(
- new Query().getPage(params),
- new QueryWrapper<>()
- );
- return new PageUtils(page);
- }
@Override
public List listWithTree() {
diff --git a/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/vo/AttrGroupResponseVo.java b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/vo/AttrGroupResponseVo.java
new file mode 100644
index 00000000..150c3211
--- /dev/null
+++ b/xjs-business/xjs-project-mall/mall-product/src/main/java/com/xjs/mall/product/vo/AttrGroupResponseVo.java
@@ -0,0 +1,46 @@
+package com.xjs.mall.product.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * AttrGroupVo
+ * @author xiejs
+ * @since 2022-03-17
+ */
+@Data
+public class AttrGroupResponseVo {
+ private Long attrGroupId;
+ /**
+ * 组名
+ */
+ private String attrGroupName;
+ /**
+ * 排序
+ */
+ private Integer sort;
+ /**
+ * 描述
+ */
+ private String descript;
+ /**
+ * 组图标
+ */
+ private String icon;
+ /**
+ * 所属分类id
+ */
+ private Long catelogId;
+
+ /**
+ * 分类id完整路径
+ */
+ private List catelogPath;
+
+ /**
+ * 分类名称
+ */
+ private String categoryName;
+
+}