编译错误修改yys

yangys

2024-03-27 44c06e730b392ca2160a843cf54e221156a2b1a2

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupServiceImpl.java

@@ -18,6 +18,8 @@
import java.util.UUID;
import java.util.stream.Collectors;
import org.apache.commons.compress.utils.Lists;
import java.util.Arrays;

import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.common.constant.CommonGroupConstant;
@@ -154,6 +156,14 @@

    @Override // org.springblade.modules.cps.service.ICommonGroupService
    public String getGroupIdsByFuzzy(String tenantId, String groupNames, String groupType, Integer groupCategory) {
       LambdaQueryWrapper<CommonGroup> queryWrapper = Wrappers.<CommonGroup>query().lambda().eq(CommonGroup::getTenantId, tenantId).eq(CommonGroup::getGroupType, groupType).eq(CommonGroup::getGroupCategory, groupCategory);
        queryWrapper.and(wrapper -> {
              List<String> names = Func.toStrList(groupNames);
              names.forEach(name -> {
                  LambdaQueryWrapper lambdaQueryWrapper = (LambdaQueryWrapper) (wrapper.like(CommonGroup::getName, name)).or();
              });
            });
        /*
        Wrapper wrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
            return v0.getTenantId();
        }, tenantId)).eq((v0) -> {
@@ -168,12 +178,10 @@
                    return v0.getName();
                }, name)).or();
            });
        });
        List<CommonGroup> groupList = this.baseMapper.selectList(wrapper);
        });*/
        List<CommonGroup> groupList = this.baseMapper.selectList(queryWrapper);
        if (groupList != null && groupList.size() > 0) {
            return (String) groupList.stream().map(group -> {
                return Func.toStr(group.getId());
            }).distinct().collect(Collectors.joining(","));
            return groupList.stream().map(group -> Func.toStr(group.getId())).distinct().collect(Collectors.joining(","));
        }
        return null;
    }
@@ -185,9 +193,11 @@

    @Override // org.springblade.modules.cps.service.ICommonGroupService
    public boolean removeGroup(String ids) {
       Long cnt = this.baseMapper.selectCount(Wrappers.<CommonGroup>query().lambda().in(CommonGroup::getParentId, Func.toLongList(ids)));
       /*
        Long cnt = this.baseMapper.selectCount((Wrapper) Wrappers.query().lambda().in((v0) -> {
            return v0.getParentId();
        }, Func.toLongList(ids)));
        }, Func.toLongList(ids)));*/
        if (cnt.longValue() > 0) {
            throw new ServiceException(MessageUtils.message("cps.group.delete.child.node", new Object[0]));
        }
@@ -243,36 +253,52 @@
    @Override // org.springblade.modules.cps.service.ICommonGroupService
    public List<CommonGroup> getGroupChildren(Long parentId, boolean recursive, String groupType, Integer groupCategory) {
        if (!recursive) {
           return this.baseMapper.selectList(Wrappers.<CommonGroup>query().lambda()
                     .eq(CommonGroup::getParentId, parentId)
                     .eq(CommonGroup::getGroupType, groupType)
                     .eq(CommonGroup::getGroupCategory, groupCategory));
           /*
            return this.baseMapper.selectList((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
                return v0.getParentId();
            }, parentId)).eq((v0) -> {
                return v0.getGroupType();
            }, groupType)).eq((v0) -> {
                return v0.getGroupCategory();
            }, groupCategory));
            }, groupCategory));*/
        }
        if (null == parentId) {
           return this.baseMapper.selectList(
                     Wrappers.<CommonGroup>query().lambda()
                     .eq(CommonGroup::getGroupType, groupType)
                     .eq(CommonGroup::getGroupCategory, groupCategory)); 
           /*
            return this.baseMapper.selectList((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
                return v0.getGroupType();
            }, groupType)).eq((v0) -> {
                return v0.getGroupCategory();
            }, groupCategory));
            */
        }
        String codeOrDefault = getCodeOrDefault(parentId);
        return this.baseMapper.selectList(Wrappers.<CommonGroup>query().lambda()
                .likeRight(CommonGroup::getCode, codeOrDefault)
                .ne(CommonGroup::getId, parentId));
        /*
        return this.baseMapper.selectList((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().likeRight((v0) -> {
            return v0.getCode();
        }, codeOrDefault)).ne((v0) -> {
            return v0.getId();
        }, parentId));
        }, parentId));*/
    }

    @Override // org.springblade.modules.cps.service.ICommonGroupService
    public List<CommonGroupVO> search(String groupName, Long parentId, String groupType, Integer groupCategory) {
        Wrapper wrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
       LambdaQueryWrapper<CommonGroup> wrapper = Wrappers.<CommonGroup>query().lambda().eq(CommonGroup::getGroupType, groupType).eq(CommonGroup::getGroupCategory, groupCategory);
        /*Wrapper wrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
            return v0.getGroupType();
        }, groupType)).eq((v0) -> {
            return v0.getGroupCategory();
        }, groupCategory);
        }, groupCategory);*/
        if (Func.isNotEmpty(groupName)) {
            wrapper.like((v0) -> {
                return v0.getName();
@@ -300,15 +326,8 @@
    }

    private List<CommonGroup> getCommonGroupChildList(String code, String groupType, Integer groupCategory, Integer status) {
        return this.baseMapper.selectList((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
            return v0.getGroupType();
        }, groupType)).eq((v0) -> {
            return v0.getGroupCategory();
        }, groupCategory)).eq(Func.isNotEmpty(status), (v0) -> {
            return v0.getStatus();
        }, status).likeRight(Func.isNotEmpty(code), (v0) -> {
            return v0.getCode();
        }, code));
        return this.baseMapper.selectList(Wrappers.<CommonGroup>query().lambda().eq(CommonGroup::getGroupType, groupType)
              .eq(CommonGroup::getGroupCategory, groupCategory).eq(Func.isNotEmpty(status), CommonGroup::getStatus, status).likeRight(Func.isNotEmpty(code),  CommonGroup::getCode, code));
    }

    @Override // org.springblade.modules.cps.service.ICommonGroupService
@@ -356,21 +375,13 @@
            for (int i = 0; i < codes.length; i++) {
                codeList.add(code.substring(0, 5 * (i + 1)));
            }
            List<CommonGroup> parentList = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
                return v0.getGroupType();
            }, groupType)).eq((v0) -> {
                return v0.getGroupCategory();
            }, groupCategory)).eq(Func.isNotEmpty(status), (v0) -> {
                return v0.getStatus();
            }, status).in((v0) -> {
                return v0.getCode();
            }, codeList));
            //CommonGroup::getCode
            List<CommonGroup> parentList = list( Wrappers.<CommonGroup>lambdaQuery().eq(CommonGroup::getGroupType, groupType)
                  .eq(CommonGroup::getGroupCategory, groupCategory)
                  .eq(Func.isNotEmpty(status), CommonGroup::getStatus, status)
                  .in(CommonGroup::getCode, codeList));
            if (Func.isNotEmpty(parentList)) {
                id = (Long) parentList.stream().filter(x -> {
                    return x.getCode().equals(code);
                }).map((v0) -> {
                    return v0.getId();
                }).findFirst().orElse(id);
                id = parentList.stream().filter(x -> x.getCode().equals(code)).map(CommonGroup::getId).findFirst().orElse(id);
                parentName = getParentName(codeList, parentList);
            }
        }
@@ -380,13 +391,11 @@

    @Override // org.springblade.modules.cps.service.ICommonGroupService
    public CommonGroup getRootNode(String groupType, Integer groupCategory) {
        List<CommonGroup> commonGroupList = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getGroupType();
        }, groupType)).eq((v0) -> {
            return v0.getGroupCategory();
        }, groupCategory)).eq((v0) -> {
            return v0.getParentId();
        }, BladeConstant.TOP_PARENT_ID));
       //CommonGroup::getParentId
        List<CommonGroup> commonGroupList = list(Wrappers.<CommonGroup>lambdaQuery().eq(CommonGroup::getGroupType, groupType)
              .eq(CommonGroup::getGroupCategory, groupCategory)
              .eq(CommonGroup::getParentId, BladeConstant.TOP_PARENT_ID));
        
        if (Func.isEmpty(commonGroupList) || commonGroupList.size() > 1) {
            throw new IllegalArgumentException(ROOT_NODE_CONFIGURE_ERROR);
        }
@@ -458,35 +467,31 @@

    @Override // org.springblade.modules.cps.service.ICommonGroupService
    public List<WorkstationGroupVO> listWorkstationGroup(String groupType, String groupCategory, String groupTag) {
        List<CommonGroup> commonGroupList = list(Wrappers.<CommonGroup>lambdaQuery()
                  .eq(Func.isNotBlank(groupType), CommonGroup::getGroupType, groupType)
                  .eq(Func.isNotBlank(groupCategory), CommonGroup::getGroupCategory, groupCategory)
                  .eq(Func.isNotBlank(groupTag), CommonGroup::getGroupTag, groupTag));
        /*
        List<CommonGroup> commonGroupList = list(Wrappers.lambdaQuery().eq(Func.isNotBlank(groupType), (v0) -> {
            return v0.getGroupType();
        }, groupType).eq(Func.isNotBlank(groupCategory), (v0) -> {
            return v0.getGroupCategory();
        }, groupCategory).eq(Func.isNotBlank(groupTag), (v0) -> {
            return v0.getGroupTag();
        }, groupTag));
        }, groupTag));*/
        List<WorkstationGroupVO> result = CommonGroupConvert.INSTANCE.convert1(commonGroupList);
        if (CollectionUtil.isNotEmpty(result)) {
            List<String> codeList = (List) result.stream().map((v0) -> {
                return v0.getCode();
            }).distinct().collect(Collectors.toList());
            if (CollectionUtil.isNotEmpty(codeList)) {
                List<CommonGroup> groupList = list((Wrapper) Wrappers.lambdaQuery().eq(Func.isNotBlank(groupType), (v0) -> {
                    return v0.getGroupType();
                }, groupType).eq(Func.isNotBlank(groupCategory), (v0) -> {
                    return v0.getGroupCategory();
                }, groupCategory).eq(Func.isNotBlank(groupTag), (v0) -> {
                    return v0.getGroupTag();
                }, groupTag).in((v0) -> {
                    return v0.getCode();
                }, codeList));
                Map<String, String> map = (Map) groupList.stream().collect(Collectors.toMap((v0) -> {
                    return v0.getCode();
                }, (v0) -> {
                    return v0.getName();
                }, v1, v2 -> {
                    return v1;
                }));
                List<CommonGroup> groupList = list(Wrappers.<CommonGroup>lambdaQuery()
                      .eq(Func.isNotBlank(groupType), CommonGroup::getGroupType, groupType)
                      .eq(Func.isNotBlank(groupCategory), CommonGroup::getGroupCategory, groupCategory)
                      .eq(Func.isNotBlank(groupTag),CommonGroup::getGroupTag, groupTag).in(CommonGroup::getCode, codeList));
                
                Map<String, String> map = groupList.stream().collect(Collectors.toMap(CommonGroup::getCode, CommonGroup::getName, (v1, v2) -> v1));
               
                result.forEach(i -> {
                    i.setPath(CommonGroup.appendName(i.getCode(), map));
                });
@@ -497,19 +502,22 @@

    @Override // org.springblade.modules.cps.service.ICommonGroupService
    public List<WorkstationInGroupVO> groupWorkstationListType(CommonGroupTypeVO commonGroupTypeVO) {
       List<CommonGroup> groupList = list(Wrappers.<CommonGroup>lambdaQuery()
               .eq(CommonGroup::getGroupType, commonGroupTypeVO.getGroupType())
               .eq(CommonGroup::getGroupCategory, commonGroupTypeVO.getGroupCategory())
               .orderByAsc(CommonGroup::getSort));
       /*
        List<CommonGroup> groupList = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getGroupType();
        }, commonGroupTypeVO.getGroupType())).eq((v0) -> {
            return v0.getGroupCategory();
        }, commonGroupTypeVO.getGroupCategory())).orderByAsc((v0) -> {
            return v0.getSort();
        }));
        }));*/
        List<Long> groupIds = (List) groupList.stream().map((v0) -> {
            return v0.getId();
        }).collect(Collectors.toList());
        List<CommonGroupOfItem> itemList = this.commonGroupOfItemService.list(Wrappers.lambdaQuery().in(Func.isNotEmpty(groupIds), (v0) -> {
            return v0.getGroupId();
        }, groupIds));
        List<CommonGroupOfItem> itemList = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery().in(Func.isNotEmpty(groupIds),  CommonGroupOfItem::getGroupId, groupIds));
        List<Workstation> workstations = this.workstationService.listMachine(commonGroupTypeVO.getStatus(), commonGroupTypeVO.getKeyword());
        List<WorkstationInGroupVO> list = (List) groupList.stream().filter(o -> {
            return Func.isNotEmpty(o.getParentId());
@@ -535,28 +543,22 @@

    @Override // org.springblade.modules.cps.service.ICommonGroupService
    public List<WorkstationInGroupVO> groupWorkstationListLazy(Long groupId) {
        List<CommonGroup> commonGroupList = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getParentId();
        }, groupId)).orderByAsc((v0) -> {
            return v0.getSort();
        }));
       //CommonGroup::getSort
        List<CommonGroup> commonGroupList = list(Wrappers.<CommonGroup>lambdaQuery().eq(CommonGroup::getParentId, groupId).orderByAsc(CommonGroup::getSort));
        List<WorkstationInGroupVO> collect = (List) commonGroupList.stream().map(commonGroup -> {
            return WorkstationInGroupVO.builder().parentId(groupId).isWorkstation(false).isGroup(true).code(commonGroup.getCode()).title(commonGroup.getName()).groupTag(commonGroup.getGroupTag()).id(commonGroup.getId()).build();
        }).collect(Collectors.toList());
        List<CommonGroupOfItem> commonGroupOfItemList = this.commonGroupOfItemService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getGroupId();
        }, groupId)).eq((v0) -> {
            return v0.getGroupType();
        }, CommonGroupTypeEnum.WORKSTATION.getName()));
        Map<Long, Long> workstationIdToGroupId = (Map) commonGroupOfItemList.stream().collect(Collectors.toMap((v0) -> {
            return v0.getItemId();
        }, (v0) -> {
            return v0.getGroupId();
        }));
        //CommonGroupOfItem::getGroupType
        List<CommonGroupOfItem> commonGroupOfItemList = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery()
              .eq(CommonGroupOfItem::getGroupId, groupId).eq(CommonGroupOfItem::getGroupType, CommonGroupTypeEnum.WORKSTATION.getName()));
        
        Map<Long, Long> workstationIdToGroupId = commonGroupOfItemList.stream().collect(Collectors.toMap(CommonGroupOfItem::getItemId, CommonGroupOfItem::getGroupId));
        if (Func.isNotEmpty(commonGroupOfItemList)) {
           List<Long> workstationIds = (List<Long>)commonGroupOfItemList.stream().map(CommonGroupOfItem::getItemId).collect(Collectors.toList());
           /*
            List<Long> workstationIds = (List) commonGroupOfItemList.stream().map((v0) -> {
                return v0.getItemId();
            }).collect(Collectors.toList());
            }).collect(Collectors.toList());*/
            List<Workstation> workstations = (List) this.workstationService.listByIds(workstationIds).stream().filter(s -> {
                return CommonConstant.ENABLE.equals(s.getStatus());
            }).filter((v0) -> {
@@ -573,22 +575,22 @@
    }

    private List<WorkstationInGroupVO> groupWorkstationList(Long groupId) {
        List<CommonGroup> commonGroupList = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getParentId();
        }, groupId)).orderByAsc((v0) -> {
            return v0.getSort();
        }));
       //CommonGroup::getSort
        List<CommonGroup> commonGroupList = list(Wrappers.<CommonGroup>lambdaQuery().eq(CommonGroup::getParentId, groupId).orderByAsc(CommonGroup::getSort));
        List<WorkstationInGroupVO> collect = Lists.newArrayList();
        if (Func.isNotEmpty(commonGroupList)) {
            List<Long> ids = (List) commonGroupList.stream().map((v0) -> {
                return v0.getId();
            }).distinct().collect(Collectors.toList());
            List<CommonGroupOfItem> commonGroupOfItemList = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getGroupId, ids)
                  .eq(CommonGroupOfItem::getGroupType, CommonGroupTypeEnum.WORKSTATION.getName()));
            /*
            List<CommonGroupOfItem> commonGroupOfItemList = this.commonGroupOfItemService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().in((v0) -> {
                return v0.getGroupId();
            }, ids)).eq((v0) -> {
                return v0.getGroupType();
            }, CommonGroupTypeEnum.WORKSTATION.getName()));
            Map<Long, Long> workstationIdToGroupId = (Map) commonGroupOfItemList.stream().collect(Collectors.toMap((v0) -> {
            }, CommonGroupTypeEnum.WORKSTATION.getName()));*/
            Map<Long, Long> workstationIdToGroupId = commonGroupOfItemList.stream().collect(Collectors.toMap((v0) -> {
                return v0.getItemId();
            }, (v0) -> {
                return v0.getGroupId();
@@ -615,23 +617,24 @@

    @Override // org.springblade.modules.cps.service.ICommonGroupService
    public List<WorkstationInGroupVO> groupFtpDirectoryListLazy(Long groupId) {
       List<CommonGroup> commonGroupList = list(Wrappers.<CommonGroup>lambdaQuery().eq(CommonGroup::getParentId, groupId).orderByAsc(Arrays.asList(CommonGroup::getSort)) );
    	
       /*
        List<CommonGroup> commonGroupList = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getParentId();
        }, groupId)).orderByAsc((v0) -> {
            return v0.getSort();
        }));
        }));*/
        List<WorkstationInGroupVO> collect = (List) commonGroupList.stream().map(commonGroup -> {
            return WorkstationInGroupVO.builder().parentId(groupId).isWorkstation(false).isGroup(true).code(commonGroup.getCode()).title(commonGroup.getName()).groupTag(commonGroup.getGroupTag()).id(commonGroup.getId()).build();
        }).collect(Collectors.toList());
        List<Long> bindingFtps = (List) this.wsRelationTdService.list().stream().map((v0) -> {
            return v0.getWorkstationId();
        }).collect(Collectors.toList());
        List<CommonGroupOfItem> commonGroupOfItemList = this.commonGroupOfItemService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getGroupId();
        }, groupId)).eq((v0) -> {
            return v0.getGroupType();
        }, CommonGroupTypeEnum.WORKSTATION.getName()));
        Map<Long, Long> workstationIdToGroupId = (Map) commonGroupOfItemList.stream().collect(Collectors.toMap((v0) -> {
        //CommonGroupOfItem::getGroupType
        List<CommonGroupOfItem> commonGroupOfItemList = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery()
              .eq(CommonGroupOfItem::getGroupId, groupId).eq(CommonGroupOfItem::getGroupType, CommonGroupTypeEnum.WORKSTATION.getName()));
        Map<Long, Long> workstationIdToGroupId = commonGroupOfItemList.stream().collect(Collectors.toMap((v0) -> {
            return v0.getItemId();
        }, (v0) -> {
            return v0.getGroupId();
@@ -657,30 +660,29 @@

    @Override // org.springblade.modules.cps.service.ICommonGroupService
    public List<WorkstationInGroupVO> groupFtpDirectoryWorkstationList(CommonGroupFtpVO commonGroupFtpVO) {
        List<CommonGroup> groupList = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getGroupType();
        }, commonGroupFtpVO.getGroupType())).eq((v0) -> {
            return v0.getGroupCategory();
        }, commonGroupFtpVO.getGroupCategory())).orderByAsc((v0) -> {
            return v0.getSort();
        }));
       List<CommonGroup> groupList = list(Wrappers.<CommonGroup>lambdaQuery()
               .eq(CommonGroup::getGroupType, commonGroupFtpVO.getGroupType())
               .eq(CommonGroup::getGroupCategory, commonGroupFtpVO.getGroupCategory())
               .orderByAsc(CommonGroup::getSort));
        
        List<Long> groupIds = (List) groupList.stream().map((v0) -> {
            return v0.getId();
        }).collect(Collectors.toList());
        List<CommonGroupOfItem> itemList = this.commonGroupOfItemService.list((Wrapper) Wrappers.lambdaQuery().in(Func.isNotEmpty(groupIds), (v0) -> {
            return v0.getGroupId();
        }, groupIds).eq((v0) -> {
            return v0.getGroupType();
        }, commonGroupFtpVO.getGroupType()));
        //CommonGroupOfItem::getGroupType
        List<CommonGroupOfItem> itemList = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery()
              .in(Func.isNotEmpty(groupIds), CommonGroupOfItem::getGroupId, groupIds)
              .eq(CommonGroupOfItem::getGroupType, commonGroupFtpVO.getGroupType()));
        
        List<Long> bindingFtps = (List) this.wsRelationTdService.list().stream().map((v0) -> {
            return v0.getWorkstationId();
        }).collect(Collectors.toList());
        
        if (Func.isNotEmpty(commonGroupFtpVO.getTransferDirectorId())) {
            List<DncWsRelationTd> list = this.wsRelationTdService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                return v0.getTransferDirectorId();
            }, commonGroupFtpVO.getTransferDirectorId()));
           //DncWsRelationTd::getTransferDirectorId
            List<DncWsRelationTd> list = this.wsRelationTdService.list(Wrappers.<DncWsRelationTd>lambdaQuery()
                  .eq(DncWsRelationTd::getTransferDirectorId, commonGroupFtpVO.getTransferDirectorId()));
            if (Func.isNotEmpty(list)) {
                List<Long> ftpRelationIds = (List) list.stream().map((v0) -> {
                List<Long> ftpRelationIds = list.stream().map((v0) -> {
                    return v0.getWorkstationId();
                }).collect(Collectors.toList());
                if (Func.isNotEmpty(ftpRelationIds)) {
@@ -691,16 +693,18 @@
            }
        }
        List<Long> finalBindingFtps = bindingFtps;
        List<Workstation> workstations = (List) this.workstationService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getStatus();
        }, commonGroupFtpVO.getStatus() == null ? CommonConstant.ENABLE : commonGroupFtpVO.getStatus())).stream().filter(item -> {
        //Workstation::getStatus
        List<Workstation> workstations = this.workstationService.list(Wrappers.<Workstation>lambdaQuery()
              .eq(Workstation::getStatus, commonGroupFtpVO.getStatus() == null ? CommonConstant.ENABLE : commonGroupFtpVO.getStatus())).stream().filter(item -> {
            return !finalBindingFtps.contains(item.getId());
        }).collect(Collectors.toList());
        List<WorkstationInGroupVO> list2 = (List) groupList.stream().filter(o -> {
        
        List<WorkstationInGroupVO> list2 =  groupList.stream().filter(o -> {
            return Func.isNotEmpty(o.getParentId());
        }).map(o2 -> {
            return WorkstationInGroupVO.builder().id(o2.getId()).parentId(o2.getParentId()).title(o2.getName()).code("").isWorkstation(Boolean.FALSE).isGroup(Boolean.TRUE).groupTag(o2.getGroupTag()).build();
        }).collect(Collectors.toList());
        
        list2.addAll((Collection) workstations.stream().flatMap(o1 -> {
            Long id = o1.getId();
            return itemList.stream().filter(o22 -> {
@@ -718,9 +722,8 @@
        param.setUserId(AuthUtil.getUserId());
        param.setParamKey("mdc_chosen_groups");
        ParamBiz detail = (ParamBiz) this.paramService.getOne(Condition.getQueryWrapper(param));
        List<CommonGroup> groupList = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getGroupType();
        }, CommonGroupTypeEnum.WORKSTATION.getName()));
        //CommonGroup::getGroupType
        List<CommonGroup> groupList = list(Wrappers.<CommonGroup>lambdaQuery().eq(CommonGroup::getGroupType, CommonGroupTypeEnum.WORKSTATION.getName()));
        if (detail == null) {
            return new ArrayList();
        }
@@ -743,9 +746,7 @@
    @Override // org.springblade.modules.cps.service.ICommonGroupService
    @Transactional(rollbackFor = {Exception.class})
    public Boolean deleteGroup(Long groupId) {
        CommonGroup commonGroup = (CommonGroup) getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getId();
        }, groupId));
        CommonGroup commonGroup = (CommonGroup) getOne(Wrappers.<CommonGroup>lambdaQuery().eq(CommonGroup::getId, groupId));
        List<String> dictItems = getDictItems();
        deleteCheckGroup(commonGroup);
        verificationProductionLineCommonGroup(commonGroup);
@@ -754,19 +755,16 @@
        List<Long> groupIdList = (List) this.baseMapper.getAllSubGroup(groupId, commonGroup.getGroupType(), commonGroup.getGroupCategory()).stream().map((v0) -> {
            return v0.getId();
        }).collect(Collectors.toList());
        List<CommonGroupOfItem> commonGroupOfItemList = this.commonGroupOfItemService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
            return v0.getGroupId();
        }, groupIdList));
        //CommonGroupOfItem::getGroupId
        List<CommonGroupOfItem> commonGroupOfItemList = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery()
              .in(CommonGroupOfItem::getGroupId, groupIdList));
        if (Func.isBlank(groupTag)) {
            CommonGroup rootNode = getDefaultGroup(commonGroup.getGroupType(), commonGroup.getGroupCategory());
            String groupType = commonGroup.getGroupType();
            if (Func.equals(groupType, CommonGroupConstant.NG_TYPE)) {
                List<CommonGroup> list = list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                    return v0.getParentId();
                }, groupId));
                List<CommonGroupOfItem> commonGroupOfItemList2 = this.commonGroupOfItemService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
                    return v0.getGroupId();
                }, groupId));
               //CommonGroup::getParentId
                List<CommonGroup> list = list(Wrappers.<CommonGroup>lambdaQuery().eq(CommonGroup::getParentId, groupId));
                List<CommonGroupOfItem> commonGroupOfItemList2 = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery().eq(CommonGroupOfItem::getGroupId, groupId));
                commonGroupOfItemList2.forEach(c -> {
                    c.setGroupId(rootNode.getParentId());
                });
@@ -844,42 +842,33 @@

    @Override // org.springblade.modules.cps.service.ICommonGroupService
    public CommonGroup getDefaultGroup(String groupType, Integer groupCategory) {
        return (CommonGroup) getOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getGroupType();
        }, groupType)).eq((v0) -> {
            return v0.getGroupCategory();
        }, groupCategory)).eq((v0) -> {
            return v0.getCode();
        }, CommonGroupConstant.DEFAULT_CODE)).eq((v0) -> {
            return v0.getName();
        }, CommonGroupConstant.WORKSTATION_TYPE.equals(groupType) ? CommonGroupConstant.DEFAULT_NAME : CommonGroupConstant.DEFAULT_GROUP_NAME));
  
        return (CommonGroup) getOne(Wrappers.<CommonGroup>lambdaQuery()
              .eq(CommonGroup::getGroupType, groupType)
              .eq(CommonGroup::getGroupCategory, groupCategory)
              .eq(CommonGroup::getCode, CommonGroupConstant.DEFAULT_CODE)
              .eq(CommonGroup::getName, CommonGroupConstant.WORKSTATION_TYPE.equals(groupType) ? CommonGroupConstant.DEFAULT_NAME : CommonGroupConstant.DEFAULT_GROUP_NAME));
    }

    @Override // org.springblade.modules.cps.service.ICommonGroupService
    public List<WorkstationInGroupVO> groupWorkstationList(CommonGroupTypeVO commonGroupTypeVO) {
        List<CommonGroup> groupList = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getGroupType();
        }, commonGroupTypeVO.getGroupType())).eq((v0) -> {
            return v0.getGroupCategory();
        }, commonGroupTypeVO.getGroupCategory())).orderByAsc((v0) -> {
            return v0.getSort();
        }));
        List<CommonGroup> groupList = list(Wrappers.<CommonGroup>lambdaQuery().eq(CommonGroup::getGroupType, commonGroupTypeVO.getGroupType())
              .eq(CommonGroup::getGroupCategory, commonGroupTypeVO.getGroupCategory())
              .orderByAsc(CommonGroup::getSort));
        List<Long> groupIds = (List) groupList.stream().map((v0) -> {
            return v0.getId();
        }).collect(Collectors.toList());
        List<CommonGroupOfItem> itemList = this.commonGroupOfItemService.list((Wrapper) Wrappers.lambdaQuery().in(Func.isNotEmpty(groupIds), (v0) -> {
            return v0.getGroupId();
        }, groupIds).eq((v0) -> {
            return v0.getGroupType();
        }, commonGroupTypeVO.getGroupType()));
        List<Workstation> workstations = this.workstationService.list(((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getStatus();
        }, commonGroupTypeVO.getStatus() == null ? CommonConstant.ENABLE : commonGroupTypeVO.getStatus())).eq(Func.isNotEmpty(commonGroupTypeVO.getWorkType()), (v0) -> {
            return v0.getDeviceType();
        }, commonGroupTypeVO.getWorkType()).in(Func.isNotEmpty(commonGroupTypeVO.getWorkstationIdList()), (v0) -> {
            return v0.getId();
        }, commonGroupTypeVO.getWorkstationIdList()));
        Map<Long, String> groupMap = (Map) groupList.stream().collect(Collectors.toMap((v0) -> {
        
        //CommonGroupOfItem::getId
        List<CommonGroupOfItem> itemList = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery()
              .in(Func.isNotEmpty(groupIds), CommonGroupOfItem::getGroupId, groupIds)
              .eq(CommonGroupOfItem::getGroupType, commonGroupTypeVO.getGroupType()));
        //Workstation::getDeviceType
        List<Workstation> workstations = this.workstationService.list(Wrappers.<Workstation>lambdaQuery()
              .eq(Workstation::getStatus, commonGroupTypeVO.getStatus() == null ? CommonConstant.ENABLE : commonGroupTypeVO.getStatus())
              .eq(Func.isNotEmpty(commonGroupTypeVO.getWorkType()),Workstation::getDeviceType, commonGroupTypeVO.getWorkType())
              .in(Func.isNotEmpty(commonGroupTypeVO.getWorkstationIdList()),Workstation::getId, commonGroupTypeVO.getWorkstationIdList()));
        Map<Long, String> groupMap = groupList.stream().collect(Collectors.toMap((v0) -> {
            return v0.getId();
        }, (v0) -> {
            return v0.getName();
@@ -902,10 +891,10 @@

    @Override // org.springblade.modules.cps.service.ICommonGroupService
    public Map<Long, Set<Long>> groupWorkstationMap(List<String> groupIds) {
        List<CommonGroupOfItem> groupOfItems = this.commonGroupOfItemService.list(Wrappers.lambdaQuery().in(Func.isNotEmpty(groupIds), (v0) -> {
            return v0.getGroupId();
        }, groupIds));
        return (Map) groupOfItems.stream().collect(Collectors.groupingBy((v0) -> {
       //CommonGroupOfItem::getGroupId
        List<CommonGroupOfItem> groupOfItems = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery()
              .in(Func.isNotEmpty(groupIds), CommonGroupOfItem::getGroupId, groupIds));
        return groupOfItems.stream().collect(Collectors.groupingBy((v0) -> {
            return v0.getGroupId();
        }, Collectors.mapping((v0) -> {
            return v0.getItemId();
@@ -918,15 +907,13 @@
        if (Func.isEmpty(pid)) {
            pid = String.valueOf(CommonGroupConstant.ROOT);
        }
        List<CommonGroup> groupList = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getGroupType();
        }, CommonGroupTypeEnum.WORKSTATION.getName())).eq((v0) -> {
            return v0.getGroupCategory();
        }, CommonGroupConstant.DEFAULT_CATEGORY)).eq((v0) -> {
            return v0.getParentId();
        }, pid)).orderByAsc((v0) -> {
            return v0.getSort();
        }));
        
        List<CommonGroup> groupList = list(Wrappers.<CommonGroup>lambdaQuery()
                .eq(CommonGroup::getGroupType, CommonGroupTypeEnum.WORKSTATION.getName())
                .eq(CommonGroup::getGroupCategory, CommonGroupConstant.DEFAULT_CATEGORY)
                .eq(CommonGroup::getParentId, pid)
                .orderByAsc(CommonGroup::getSort));
       
        List<Workstation> workstationList = this.workstationMapper.listWorkstationDataByGroup(pid);
        String finalPid = pid;
        if (Func.isNotEmpty(groupList)) {
@@ -971,6 +958,13 @@
    }

    private boolean getOrCreateIdUnable(Long parentId, String name, CommonGroupTypeVO commonGroupTypeVO) {
       CommonGroup commonGroup = getOne(Wrappers.<CommonGroup>lambdaQuery()
               .eq(CommonGroup::getGroupType, commonGroupTypeVO.getGroupType())
               .eq(CommonGroup::getGroupCategory, commonGroupTypeVO.getGroupCategory())
               .eq(CommonGroup::getParentId, Func.isEmpty(parentId) ? BladeConstant.TOP_PARENT_ID : parentId)
               .eq(CommonGroup::getStatus, CommonConstant.DEACTIVATE)
               .eq(CommonGroup::getName, name));
       /*
        CommonGroup commonGroup = (CommonGroup) getOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getGroupType();
        }, commonGroupTypeVO.getGroupType())).eq((v0) -> {
@@ -981,14 +975,21 @@
            return v0.getStatus();
        }, CommonConstant.DEACTIVATE)).eq((v0) -> {
            return v0.getName();
        }, name));
        }, name));*/
        if (commonGroup != null) {
            return Boolean.TRUE.booleanValue();
            return true;
        }
        return Boolean.FALSE.booleanValue();
        return false;
    }

    private Long getOrCreateId(Long parentId, String name, CommonGroupTypeVO commonGroupTypeVO) {
       CommonGroup commonGroup = getOne(Wrappers.<CommonGroup>lambdaQuery()
               .eq(CommonGroup::getGroupType, commonGroupTypeVO.getGroupType())
               .eq(CommonGroup::getGroupCategory, commonGroupTypeVO.getGroupCategory())
               .eq(CommonGroup::getParentId, Func.isEmpty(parentId) ? BladeConstant.TOP_PARENT_ID : parentId)
               .eq(CommonGroup::getStatus, CommonConstant.ENABLE)
               .eq(CommonGroup::getName, name));
       /*
        CommonGroup commonGroup = (CommonGroup) getOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
            return v0.getGroupType();
        }, commonGroupTypeVO.getGroupType())).eq((v0) -> {
@@ -999,7 +1000,7 @@
            return v0.getStatus();
        }, CommonConstant.ENABLE)).eq((v0) -> {
            return v0.getName();
        }, name));
        }, name));*/
        if (Func.isNotEmpty(commonGroup)) {
            return commonGroup.getId();
        }
@@ -1012,6 +1013,16 @@
    protected void validateGroup(CommonGroup commonGroup) {
        Long pId = Long.valueOf(Func.isEmpty(commonGroup.getParentId()) ? 0L : commonGroup.getParentId().longValue());
        Long id = Long.valueOf(Func.isEmpty(commonGroup.getId()) ? 0L : commonGroup.getId().longValue());
        
        List<CommonGroup> siblings = this.baseMapper.selectList(
                Wrappers.<CommonGroup>query().lambda()
                .eq(CommonGroup::getGroupType, commonGroup.getGroupType())
                .eq(CommonGroup::getGroupCategory, commonGroup.getGroupCategory())
                .eq(CommonGroup::getParentId, pId)
                .eq(CommonGroup::getStatus, CommonConstant.ENABLE)
                .ne(CommonGroup::getId, id));
        
        /*
        List<CommonGroup> siblings = this.baseMapper.selectList((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
            return v0.getGroupType();
        }, commonGroup.getGroupType())).eq((v0) -> {
@@ -1022,7 +1033,7 @@
            return v0.getStatus();
        }, CommonConstant.ENABLE)).ne((v0) -> {
            return v0.getId();
        }, id));
        }, id));*/
        if (siblings.stream().anyMatch(g -> {
            return g.getName().equals(commonGroup.getName());
        })) {
@@ -1036,6 +1047,14 @@
    protected void validateUnableGroup(CommonGroup commonGroup) {
        Long pId = Long.valueOf(Func.isEmpty(commonGroup.getParentId()) ? 0L : commonGroup.getParentId().longValue());
        Long id = Long.valueOf(Func.isEmpty(commonGroup.getId()) ? 0L : commonGroup.getId().longValue());
        List<CommonGroup> siblings = this.baseMapper.selectList(
                Wrappers.<CommonGroup>query().lambda()
                .eq(CommonGroup::getGroupType, commonGroup.getGroupType())
                .eq(CommonGroup::getGroupCategory, commonGroup.getGroupCategory())
                .eq(CommonGroup::getParentId, pId)
                .eq(CommonGroup::getStatus, CommonConstant.DEACTIVATE)
                .ne(CommonGroup::getId, id));
        /*
        List<CommonGroup> siblings = this.baseMapper.selectList((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
            return v0.getGroupType();
        }, commonGroup.getGroupType())).eq((v0) -> {
@@ -1046,7 +1065,7 @@
            return v0.getStatus();
        }, CommonConstant.DEACTIVATE)).ne((v0) -> {
            return v0.getId();
        }, id));
        }, id));*/
        if (siblings.stream().anyMatch(g -> {
            return g.getName().equals(commonGroup.getName());
        })) {
@@ -1072,6 +1091,15 @@
    }

    public CommonGroup getLastChildOrNull(Long parentId, String groupType, Integer groupCategory) {
       return this.baseMapper.selectOne(
              Lambda.<CommonGroup>create()
               .eq(CommonGroup::getParentId, parentId)
               .eq(CommonGroup::getGroupType, groupType)
               .eq(CommonGroup::getGroupCategory, groupCategory)
               .eq(CommonGroup::getStatus, CommonConstant.ENABLE)
               .orderByDesc(CommonGroup::getCode)
               .limit(1));
       /*
        return (CommonGroup) this.baseMapper.selectOne(((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) ((ExtraLambdaQueryWrapper) Lambda.create().eq((v0) -> {
            return v0.getParentId();
        }, parentId)).eq((v0) -> {
@@ -1083,5 +1111,6 @@
        }, CommonConstant.ENABLE)).orderByDesc((v0) -> {
            return v0.getCode();
        })).limit(1));
        */
    }
}