From 85bb45834b1a2fd993d9f8653c48d14efc12a59e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 四月 2024 12:09:46 +0800
Subject: [PATCH] 去掉无用注释

---
 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java |  238 ++++++++++++++++-------------------------------------------
 1 files changed, 66 insertions(+), 172 deletions(-)

diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java
index 412fa2d..a080ece 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.java
@@ -1,18 +1,18 @@
 package com.qianwen.smartman.modules.cps.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
 import java.util.List;
 import java.util.stream.Collectors;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.Lambda;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qianwen.core.log.exception.ServiceException;
 import com.qianwen.core.mp.base.BaseServiceImpl;
 import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.Lambda;
+import com.qianwen.smartman.common.utils.MessageUtils;
 import com.qianwen.smartman.modules.cps.convert.WorkstationWorkbenchConvert;
 import com.qianwen.smartman.modules.cps.entity.WorkstationWorkbench;
 import com.qianwen.smartman.modules.cps.mapper.WorkstationWorkbenchMapper;
@@ -26,14 +26,12 @@
 import com.qianwen.smartman.modules.dnc.entity.TransferDirectory;
 import com.qianwen.smartman.modules.dnc.service.IDncWsRelationTdService;
 import com.qianwen.smartman.modules.dnc.service.ITransferDirectoryService;
+import com.qianwen.smartman.modules.trace.entity.TraceFlowSettings;
+import com.qianwen.smartman.modules.trace.entity.TraceRelatedWorkstation;
 import com.qianwen.smartman.modules.trace.service.ITraceFlowSettingsService;
 import com.qianwen.smartman.modules.trace.service.ITraceRelatedWorkstationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
 
 @Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/WorkstationWorkbenchServiceImpl.class */
 public class WorkstationWorkbenchServiceImpl extends BaseServiceImpl<WorkstationWorkbenchMapper, WorkstationWorkbench> implements IWorkstationWorkbenchService {
     @Autowired
     @Lazy
@@ -49,156 +47,18 @@
     private final Integer SORT = 1;
     private final Integer DEFAULT = 1;
 
-    private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
-        String implMethodName = lambda.getImplMethodName();
-        boolean z = true;
-        switch (implMethodName.hashCode()) {
-            case -871043410:
-                if (implMethodName.equals("getTraceFlowSettingId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -557259320:
-                if (implMethodName.equals("getWorkstationId")) {
-                    z = false;
-                    break;
-                }
-                break;
-            case -307107987:
-                if (implMethodName.equals("getWorkstationGroupId")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -75308287:
-                if (implMethodName.equals("getName")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case -75145708:
-                if (implMethodName.equals("getSort")) {
-                    z = true;
-                    break;
-                }
-                break;
-            case 98245393:
-                if (implMethodName.equals("getId")) {
-                    z = true;
-                    break;
-                }
-                break;
-        }
-        switch (z) {
-            case false:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getWorkstationId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getWorkstationId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncWsRelationTd") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getWorkstationId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getWorkstationId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getWorkstationId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getWorkstationId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getWorkstationId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getSort();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
-                    return (v0) -> {
-                        return v0.getSort();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getName();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
-                    return (v0) -> {
-                        return v0.getName();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getId();
-                    };
-                }
-                break;
-            case true:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/trace/entity/TraceRelatedWorkstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getTraceFlowSettingId();
-                    };
-                }
-                break;
-            case RegionCache.VILLAGE_LEVEL /* 5 */:
-                if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/trace/entity/TraceFlowSettings") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
-                    return (v0) -> {
-                        return v0.getWorkstationGroupId();
-                    };
-                }
-                break;
-        }
-        throw new IllegalArgumentException("Invalid lambda deserialization");
-    }
 
-    @Override // org.springblade.modules.cps.service.IWorkstationWorkbenchService
+    @Override
     public Boolean saveWorkstationWorkbench(WorkstationWorkbenchVO vo) {
+    	WorkstationWorkbench workbench = (WorkstationWorkbench)getOne(Wrappers.<WorkstationWorkbench>query().lambda()
+    	        .eq(WorkstationWorkbench::getWorkstationId, vo.getWorkstationId())
+    	        .eq(WorkstationWorkbench::getName, vo.getName()));
+    	/*
         WorkstationWorkbench workbench = (WorkstationWorkbench) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getWorkstationId();
         }, vo.getWorkstationId())).eq((v0) -> {
             return v0.getName();
-        }, vo.getName()));
+        }, vo.getName()));*/
         if (Func.isNull(workbench)) {
             WorkstationWorkbench workstationWorkbench = WorkstationWorkbenchConvert.INSTANCE.convert(vo);
             workstationWorkbench.setId(vo.getId());
@@ -208,15 +68,20 @@
         throw new ServiceException(MessageUtils.message("work.station.work.bench.name.already.exist", new Object[0]));
     }
 
-    @Override // org.springblade.modules.cps.service.IWorkstationWorkbenchService
+    @Override
     public MachineInformationVO listWorkstationWorkbench(Long workstationId) {
         TransferDirectory transferDirectory;
         MachineInformationVO machineInformationVO = new MachineInformationVO();
+        
+        List<WorkstationWorkbench> workbenchList = list(Wrappers.<WorkstationWorkbench>query().lambda()
+                .eq(WorkstationWorkbench::getWorkstationId, workstationId)
+                .orderByAsc(WorkstationWorkbench::getSort));
+        /*
         List<WorkstationWorkbench> workbenchList = list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getWorkstationId();
         }, workstationId)).orderByAsc((v0) -> {
             return v0.getSort();
-        }));
+        }));*/
         WorkstationVO workstationVO = this.workstationService.getDetail(workstationId);
         if (Func.isEmpty(workstationVO)) {
             return machineInformationVO;
@@ -228,38 +93,49 @@
         machineInformationVO.setDeviceType(workstationVO.getDeviceType());
         machineInformationVO.setWorkstationName(workstationVO.getName());
         machineInformationVO.setProperties(workstationVO.getProperties());
-        DncWsRelationTd relationTd = (DncWsRelationTd) this.dncWsRelationTdService.getOne(Lambda.eq((v0) -> {
-            return v0.getWorkstationId();
-        }, workstationId));
+        DncWsRelationTd relationTd = (DncWsRelationTd) this.dncWsRelationTdService.getOne(Lambda.eq(DncWsRelationTd::getWorkstationId, workstationId));
         machineInformationVO.setTransmissionMode(workstationVO.getTransmissionMethod());
-        if (Func.isNotEmpty(relationTd) && (transferDirectory = (TransferDirectory) this.transferDirectoryService.getById(relationTd.getTransferDirectorId())) != null) {
+        if (Func.isNotEmpty(relationTd) && (transferDirectory = this.transferDirectoryService.getById(relationTd.getTransferDirectorId())) != null) {
             machineInformationVO.setFtpCatalogue(transferDirectory.getName());
         }
         return machineInformationVO;
     }
 
-    @Override // org.springblade.modules.cps.service.IWorkstationWorkbenchService
+    @Override
     public Boolean deleteWorkstationWorkbench(WorkstationWorkbenchVO vo) {
         if (vo.getWorkbenchDefault().equals(this.DEFAULT)) {
             throw new ServiceException(MessageUtils.message("work.station.default.work.bench.not.delete", new Object[0]));
         }
+        List<WorkstationWorkbench> list = list(Wrappers.<WorkstationWorkbench>query().lambda()
+                .eq(WorkstationWorkbench::getWorkstationId, vo.getWorkstationId()));
+        /*
         List<WorkstationWorkbench> list = list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getWorkstationId();
-        }, vo.getWorkstationId()));
+        }, vo.getWorkstationId()));*/
         if (list.size() <= 1) {
             throw new ServiceException(MessageUtils.message("work.station.work.bench.is.only.so.not.delete", new Object[0]));
         }
+        
+        boolean remove = remove(Wrappers.<WorkstationWorkbench>update().lambda()
+                .eq(WorkstationWorkbench::getWorkstationId, vo.getWorkstationId())
+                .eq(WorkstationWorkbench::getName, vo.getName()));
+        /*
         boolean remove = remove((Wrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().eq((v0) -> {
             return v0.getWorkstationId();
         }, vo.getWorkstationId())).eq((v0) -> {
             return v0.getName();
-        }, vo.getName()));
+        }, vo.getName()));*/
+        
         if (remove) {
+        	List<WorkstationWorkbench> workbenchList = list(Wrappers.<WorkstationWorkbench>query().lambda()
+        	          .eq(WorkstationWorkbench::getWorkstationId, vo.getWorkstationId())
+        	          .ge(WorkstationWorkbench::getSort, vo.getSort()));
+        	/*
             List<WorkstationWorkbench> workbenchList = list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
                 return v0.getWorkstationId();
             }, vo.getWorkstationId())).ge((v0) -> {
                 return v0.getSort();
-            }, vo.getSort()));
+            }, vo.getSort()));*/
             if (Func.isNotEmpty(workbenchList)) {
                 workbenchList.forEach(workbench -> {
                     workbench.setSort(Integer.valueOf(workbench.getSort().intValue() - this.SORT.intValue()));
@@ -270,19 +146,28 @@
         return Boolean.valueOf(remove);
     }
 
-    @Override // org.springblade.modules.cps.service.IWorkstationWorkbenchService
+    @Override 
     public Boolean updateWorkstationWorkbench(WorkstationWorkbenchVO vo) {
+    	WorkstationWorkbench workbench = getOne(Wrappers.<WorkstationWorkbench>query().lambda()
+    	        .eq(WorkstationWorkbench::getWorkstationId, vo.getWorkstationId())
+    	        .eq(WorkstationWorkbench::getName, vo.getName()));
+    	/*
         WorkstationWorkbench workbench = (WorkstationWorkbench) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
             return v0.getWorkstationId();
         }, vo.getWorkstationId())).eq((v0) -> {
             return v0.getName();
         }, vo.getName()));
+        */
         if (Func.isNull(workbench) || vo.getId().equals(workbench.getId())) {
+        	return Boolean.valueOf(update(Wrappers.<WorkstationWorkbench>update().lambda()
+                    .eq(WorkstationWorkbench::getId, vo.getId())
+                    .set(WorkstationWorkbench::getName, vo.getName()))); 
+        	/*
             return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().eq((v0) -> {
                 return v0.getId();
             }, vo.getId())).set((v0) -> {
                 return v0.getName();
-            }, vo.getName())));
+            }, vo.getName())));*/
         }
         throw new ServiceException(MessageUtils.message("work.station.work.bench.name.already.exist", new Object[0]));
     }
@@ -291,23 +176,32 @@
     public List<WorkstationOfWorkbenchVO> listByGroupId(Long groupId, Long settingsId, String keyWord) {
         List<Long> groupIds = this.workstationService.productionLineList(groupId);
         if (Func.isEmpty(groupId)) {
-            return ((WorkstationWorkbenchMapper) this.baseMapper).listByGroupId(groupIds, keyWord);
+            return this.baseMapper.listByGroupId(groupIds, keyWord);
         }
+        List<Long> settingsIdList = this.traceFlowSettingsService.list(Wrappers.<TraceFlowSettings>lambdaQuery()
+        		.eq(TraceFlowSettings::getWorkstationGroupId, groupId)
+        		.ne(Func.isNotEmpty(settingsId), TraceFlowSettings::getId, settingsId))
+        		.stream().map(TraceFlowSettings::getId).collect(Collectors.toList());
+        /*
         List<Long> settingsIdList = (List) this.traceFlowSettingsService.list(((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
             return v0.getWorkstationGroupId();
         }, groupId)).ne(Func.isNotEmpty(settingsId), (v0) -> {
             return v0.getId();
         }, settingsId)).stream().map((v0) -> {
             return v0.getId();
-        }).collect(Collectors.toList());
+        }).collect(Collectors.toList());*/
         if (Func.isEmpty(settingsIdList)) {
-            return ((WorkstationWorkbenchMapper) this.baseMapper).listByGroupId(groupIds, keyWord);
+            return this.baseMapper.listByGroupId(groupIds, keyWord);
         }
+        List<Long> workstationIdList = this.traceRelatedWorkstationService.list(Wrappers.<TraceRelatedWorkstation>lambdaQuery()
+        		.in(TraceRelatedWorkstation::getTraceFlowSettingId, settingsIdList))
+        		.stream().map(TraceRelatedWorkstation::getWorkstationId).collect(Collectors.toList());
+        /*
         List<Long> workstationIdList = (List) this.traceRelatedWorkstationService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
             return v0.getTraceFlowSettingId();
         }, settingsIdList)).stream().map((v0) -> {
             return v0.getWorkstationId();
-        }).collect(Collectors.toList());
+        }).collect(Collectors.toList());*/
         return ((WorkstationWorkbenchMapper) this.baseMapper).listByGroupIdAndWorkstationNotIn(groupIds, keyWord, workstationIdList);
     }
 }

--
Gitblit v1.9.3