diff --git a/book-product/src/main/java/com/bookstore/bookmall/product/controller/AttrController.java b/book-product/src/main/java/com/bookstore/bookmall/product/controller/AttrController.java index da0255e..a6a1238 100644 --- a/book-product/src/main/java/com/bookstore/bookmall/product/controller/AttrController.java +++ b/book-product/src/main/java/com/bookstore/bookmall/product/controller/AttrController.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.Map; +import com.bookstore.bookmall.product.vo.AttrRespVo; import com.bookstore.bookmall.product.vo.AttrVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -57,8 +58,10 @@ public class AttrController { @RequestMapping("/info/{attrId}") //@RequiresPermissions("product:attr:info") public R info(@PathVariable("attrId") Long attrId){ - AttrEntity attr = attrService.getById(attrId); - return R.ok().put("attr", attr); + //AttrEntity attr = attrService.getById(attrId); + + AttrRespVo attrRespVo = attrService.getAttrInfo(attrId); + return R.ok().put("attr", attrRespVo); } /** diff --git a/book-product/src/main/java/com/bookstore/bookmall/product/service/AttrService.java b/book-product/src/main/java/com/bookstore/bookmall/product/service/AttrService.java index 113127c..6426269 100644 --- a/book-product/src/main/java/com/bookstore/bookmall/product/service/AttrService.java +++ b/book-product/src/main/java/com/bookstore/bookmall/product/service/AttrService.java @@ -1,6 +1,7 @@ package com.bookstore.bookmall.product.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.bookstore.bookmall.product.vo.AttrRespVo; import com.bookstore.bookmall.product.vo.AttrVo; import com.bookstore.common.utils.PageUtils; import com.bookstore.bookmall.product.entity.AttrEntity; @@ -22,6 +23,8 @@ public interface AttrService extends IService { PageUtils queryBasePage(Map params, Long cateLogId); + AttrRespVo getAttrInfo(Long attrId); } + diff --git a/book-product/src/main/java/com/bookstore/bookmall/product/service/impl/AttrServiceImpl.java b/book-product/src/main/java/com/bookstore/bookmall/product/service/impl/AttrServiceImpl.java index 633e298..332ed03 100644 --- a/book-product/src/main/java/com/bookstore/bookmall/product/service/impl/AttrServiceImpl.java +++ b/book-product/src/main/java/com/bookstore/bookmall/product/service/impl/AttrServiceImpl.java @@ -9,6 +9,7 @@ import com.bookstore.bookmall.product.entity.AttrAttrgroupRelationEntity; import com.bookstore.bookmall.product.entity.AttrGroupEntity; import com.bookstore.bookmall.product.entity.CategoryEntity; import com.bookstore.bookmall.product.service.AttrAttrgroupRelationService; +import com.bookstore.bookmall.product.service.CategoryService; import com.bookstore.bookmall.product.vo.AttrRespVo; import com.bookstore.bookmall.product.vo.AttrVo; import com.mysql.cj.util.StringUtils; @@ -43,6 +44,8 @@ public class AttrServiceImpl extends ServiceImpl implements CategoryDao categoryDao; @Autowired AttrGroupDao attrGroupDao; + @Autowired + CategoryService categoryService; @Override public PageUtils queryPage(Map params) { @@ -112,6 +115,39 @@ public class AttrServiceImpl extends ServiceImpl implements return pageUtils; } + @Override + public AttrRespVo getAttrInfo(Long attrId) { +// log.info("进入service"); +// log.info("查询属性,attrId: {}", attrId); + AttrRespVo respVo = new AttrRespVo(); + AttrEntity attrEntity = this.getById(attrId); + + //设置分组id + BeanUtils.copyProperties(attrEntity, respVo); +// log.info("beanutilzhengchang"); + AttrAttrgroupRelationEntity RelationEntity = RelationDao.selectOne( + new QueryWrapper().eq("attr_id",attrId)); + + if (RelationEntity!=null) { +// log.info("查询属性,relation正常"); + respVo.setAttrGroupId(RelationEntity.getAttrGroupId()); + AttrGroupEntity attrGroupEntity = attrGroupDao.selectById(RelationEntity.getAttrGroupId()); + if (attrGroupEntity!=null) { + respVo.setGroupName(attrGroupEntity.getAttrGroupName()); + } + } +// log.info("设置分组"); + //设置分类信息 + Long catelogId = attrEntity.getCatelogId(); + Long[] catelogPath = categoryService.findCatelogPath(catelogId); + respVo.setCatelogPath(catelogPath); + CategoryEntity categoryEntity = categoryDao.selectById(catelogId); + if (categoryEntity != null) { + respVo.setCatelogName(categoryEntity.getName()); + } +// log.info("设置分类"); + return respVo; + } } \ No newline at end of file diff --git a/book-product/src/main/java/com/bookstore/bookmall/product/vo/AttrRespVo.java b/book-product/src/main/java/com/bookstore/bookmall/product/vo/AttrRespVo.java index 19b0850..7f520a2 100644 --- a/book-product/src/main/java/com/bookstore/bookmall/product/vo/AttrRespVo.java +++ b/book-product/src/main/java/com/bookstore/bookmall/product/vo/AttrRespVo.java @@ -10,4 +10,6 @@ public class AttrRespVo extends AttrVo{ private String catelogName; private String groupName; + private Long[] catelogPath; + }