|
@@ -1,27 +1,21 @@
|
|
package com.fdkk.sxz.webApi.service.custom.impl;
|
|
package com.fdkk.sxz.webApi.service.custom.impl;
|
|
|
|
|
|
-import cn.hutool.core.bean.BeanUtil;
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
-import com.fdkk.sxz.base.Result;
|
|
|
|
import com.fdkk.sxz.base.impl.BaseServiceImpl;
|
|
import com.fdkk.sxz.base.impl.BaseServiceImpl;
|
|
-import com.fdkk.sxz.constant.ResponseConstant;
|
|
|
|
import com.fdkk.sxz.entity.custuom.CustomEntity;
|
|
import com.fdkk.sxz.entity.custuom.CustomEntity;
|
|
import com.fdkk.sxz.vo.request.RequestCustom;
|
|
import com.fdkk.sxz.vo.request.RequestCustom;
|
|
-import com.fdkk.sxz.vo.request.RequestCustomProductFirstclassify;
|
|
|
|
import com.fdkk.sxz.vo.response.ResponseCustomMenu;
|
|
import com.fdkk.sxz.vo.response.ResponseCustomMenu;
|
|
import com.fdkk.sxz.webApi.mapper.custom.ICustomMapper;
|
|
import com.fdkk.sxz.webApi.mapper.custom.ICustomMapper;
|
|
import com.fdkk.sxz.webApi.service.custom.ICustomComponentClassifyService;
|
|
import com.fdkk.sxz.webApi.service.custom.ICustomComponentClassifyService;
|
|
-import com.fdkk.sxz.webApi.service.custom.ICustomComponentService;
|
|
|
|
import com.fdkk.sxz.webApi.service.custom.ICustomProductFirstclassifyService;
|
|
import com.fdkk.sxz.webApi.service.custom.ICustomProductFirstclassifyService;
|
|
import com.fdkk.sxz.webApi.service.custom.ICustomService;
|
|
import com.fdkk.sxz.webApi.service.custom.ICustomService;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.github.pagehelper.PageInfo;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
-import org.springframework.cache.annotation.Cacheable;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
@@ -49,23 +43,24 @@ public class CustomServiceImpl extends BaseServiceImpl<ICustomMapper, CustomEnti
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public PageInfo<CustomEntity> listByPage(RequestCustom param) {
|
|
public PageInfo<CustomEntity> listByPage(RequestCustom param) {
|
|
- LambdaQueryWrapper<CustomEntity> wrapper = Wrappers.lambdaQuery();
|
|
|
|
- if (ObjectUtil.isNotNull(param.getType())){
|
|
|
|
- wrapper.eq(CustomEntity::getType,param.getType());
|
|
|
|
|
|
+ LambdaQueryWrapper<CustomEntity> wrapper = Wrappers.lambdaQuery();
|
|
|
|
+ if (ObjectUtil.isNotNull(param.getType())) {
|
|
|
|
+ wrapper.eq(CustomEntity::getType, param.getType());
|
|
}
|
|
}
|
|
- return super.listByPage(param,wrapper);
|
|
|
|
|
|
+ return super.listByPage(param, wrapper);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<ResponseCustomMenu> findAllCustomTree() {
|
|
public List<ResponseCustomMenu> findAllCustomTree() {
|
|
- List<CustomEntity> list= this.list();
|
|
|
|
- List<ResponseCustomMenu> res=new ArrayList<>();
|
|
|
|
- list.forEach(a->{
|
|
|
|
- ResponseCustomMenu responseCustomMenu=new ResponseCustomMenu();
|
|
|
|
|
|
+ List<CustomEntity> list = this.list();
|
|
|
|
+ List<ResponseCustomMenu> res = new ArrayList<>();
|
|
|
|
+ list.forEach(a -> {
|
|
|
|
+ ResponseCustomMenu responseCustomMenu = new ResponseCustomMenu();
|
|
responseCustomMenu.setId(a.getId());
|
|
responseCustomMenu.setId(a.getId());
|
|
responseCustomMenu.setType(a.getType());
|
|
responseCustomMenu.setType(a.getType());
|
|
responseCustomMenu.setName(a.getName());
|
|
responseCustomMenu.setName(a.getName());
|
|
- switch (a.getType()){
|
|
|
|
|
|
+ responseCustomMenu.setIsShow(a.getIsShow());
|
|
|
|
+ switch (a.getType()) {
|
|
case "product":
|
|
case "product":
|
|
//家具
|
|
//家具
|
|
responseCustomMenu.setChildren(JSONArray.parseArray(JSON.toJSONString(productFirstclassifyService.list())));
|
|
responseCustomMenu.setChildren(JSONArray.parseArray(JSON.toJSONString(productFirstclassifyService.list())));
|