diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/AttrDefinitionCustomService.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/AttrDefinitionCustomService.java index afd58257..2cff110f 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/AttrDefinitionCustomService.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/AttrDefinitionCustomService.java @@ -31,4 +31,6 @@ public interface AttrDefinitionCustomService extends SkyeyeBusinessService> beans); } diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/impl/AttrDefinitionCustomServiceImpl.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/impl/AttrDefinitionCustomServiceImpl.java index 3815d907..beda336f 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/impl/AttrDefinitionCustomServiceImpl.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/impl/AttrDefinitionCustomServiceImpl.java @@ -17,6 +17,7 @@ import com.skyeye.attr.service.AttrDefinitionService; import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; import com.skyeye.business.entity.BusinessApi; import com.skyeye.business.service.BusinessApiService; +import com.skyeye.common.constans.CommonConstants; import com.skyeye.common.constans.CommonNumConstants; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; @@ -159,4 +160,18 @@ public class AttrDefinitionCustomServiceImpl extends SkyeyeBusinessServiceImpl> beans) { + List dsFormComponentId = beans.stream().map(bean -> bean.get("id").toString()).collect(Collectors.toList()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in(MybatisPlusUtil.toColumns(AttrDefinitionCustom::getComponentId), dsFormComponentId); + queryWrapper.select(CommonConstants.ID, MybatisPlusUtil.toColumns(AttrDefinitionCustom::getComponentId)); + List list = list(queryWrapper); + Map collect = list.stream().collect(Collectors.groupingBy(AttrDefinitionCustom::getComponentId, Collectors.counting())); + beans.forEach(bean -> { + String id = bean.get("id").toString(); + bean.put("attrUseNum", collect.get(id)); + }); + } } diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/service/impl/DsFormComponentServiceImpl.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/service/impl/DsFormComponentServiceImpl.java index 24883fc4..cf39fcbd 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/service/impl/DsFormComponentServiceImpl.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/service/impl/DsFormComponentServiceImpl.java @@ -6,8 +6,8 @@ package com.skyeye.dsform.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.tree.Tree; -import cn.hutool.core.util.StrUtil; import com.google.common.base.Joiner; +import com.skyeye.attr.service.AttrDefinitionCustomService; import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; import com.skyeye.common.constans.CommonCharConstants; import com.skyeye.common.constans.CommonNumConstants; @@ -18,6 +18,7 @@ import com.skyeye.dsform.classenum.ComponentApplyRange; import com.skyeye.dsform.dao.DsFormComponentDao; import com.skyeye.dsform.entity.DsFormComponent; import com.skyeye.dsform.service.DsFormComponentService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -36,11 +37,15 @@ import java.util.stream.Collectors; @Service public class DsFormComponentServiceImpl extends SkyeyeBusinessServiceImpl implements DsFormComponentService { + @Autowired + private AttrDefinitionCustomService attrDefinitionCustomService; + @Override public List> queryPageDataList(InputObject inputObject) { CommonPageInfo commonPageInfo = inputObject.getParams(CommonPageInfo.class); List> beans = skyeyeBaseMapper.queryDsFormComponentList(commonPageInfo); iSysDictDataService.setNameForMap(beans, "typeId", "typeName"); + attrDefinitionCustomService.setDsFormComponentUseNum(beans); return beans; }