From e19227de97d21c10fd22536f85c8153e63072d0c Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 06 五月 2024 11:30:54 +0800
Subject: [PATCH] 代码整理1
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java | 653 ++++++++++++++--------------------------------------------
1 files changed, 160 insertions(+), 493 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java
index 11051b0..f94191e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/WorkstationServiceImpl.java
@@ -1,20 +1,10 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.alibaba.excel.write.merge.AbstractMergeStrategy;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAccessor;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
@@ -28,11 +18,34 @@
import java.util.function.Function;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+
import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.collections.MapUtils;
import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import com.qianwen.core.cache.utils.CacheUtil;
+import com.qianwen.core.excel.util.ExcelUtil;
+import com.qianwen.core.log.exception.ServiceException;
+import com.qianwen.core.mp.base.BaseServiceImpl;
+import com.qianwen.core.mp.support.Condition;
+import com.qianwen.core.mp.support.Query;
+import com.qianwen.core.oss.model.BladeFile;
+import com.qianwen.core.secure.utils.AuthUtil;
+import com.qianwen.core.tool.utils.CollectionUtil;
+import com.qianwen.core.tool.utils.DateUtil;
+import com.qianwen.core.tool.utils.Func;
+import com.qianwen.core.tool.utils.StringUtil;
import com.qianwen.smartman.common.cache.DictCache;
-import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.smartman.common.cache.cps.WorkstationCache;
import com.qianwen.smartman.common.constant.CalendarConstant;
import com.qianwen.smartman.common.constant.CommonConstant;
@@ -51,18 +64,6 @@
import com.qianwen.smartman.common.utils.ValidatorUtils;
import com.qianwen.smartman.common.websocket.entity.FmsWorkBench;
import com.qianwen.smartman.common.websocket.entity.FmsWorkstation;
-import com.qianwen.core.cache.utils.CacheUtil;
-import com.qianwen.core.excel.util.ExcelUtil;
-import com.qianwen.core.log.exception.ServiceException;
-import com.qianwen.core.mp.base.BaseServiceImpl;
-import com.qianwen.core.mp.support.Condition;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.oss.model.BladeFile;
-import com.qianwen.core.secure.utils.AuthUtil;
-import com.qianwen.core.tool.utils.CollectionUtil;
-import com.qianwen.core.tool.utils.DateUtil;
-import com.qianwen.core.tool.utils.Func;
-import com.qianwen.core.tool.utils.StringUtil;
import com.qianwen.smartman.modules.cps.convert.CommonGroupConvert;
import com.qianwen.smartman.modules.cps.convert.WorkstationConvert;
import com.qianwen.smartman.modules.cps.convert.WorkstationWorkbenchConvert;
@@ -123,12 +124,7 @@
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
import com.qianwen.smartman.modules.tdengine.service.IWorkstationDynamicCollectService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/WorkstationServiceImpl.class */
public class WorkstationServiceImpl extends BaseServiceImpl<WorkstationMapper, Workstation> implements IWorkstationService {
private static final Pattern CHINESE = Pattern.compile("^[A-Za-z0-9]+$");
private final IMachineService machineService;
@@ -155,326 +151,6 @@
private final Integer FTP_CORRELATION_DIRECTORY = 1;
private final Integer FTP_SAME_DIRECTORY = 2;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -2038138413:
- if (implMethodName.equals("getShortCode")) {
- z = true;
- break;
- }
- break;
- case -1710716399:
- if (implMethodName.equals("getGroupTag")) {
- z = true;
- break;
- }
- break;
- case -1492577373:
- if (implMethodName.equals("getGroupType")) {
- z = true;
- break;
- }
- break;
- case -1041904421:
- if (implMethodName.equals("getParentId")) {
- z = true;
- break;
- }
- break;
- case -858902114:
- if (implMethodName.equals("getMachineCode")) {
- z = true;
- break;
- }
- break;
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = true;
- break;
- }
- break;
- case -75106384:
- if (implMethodName.equals("getType")) {
- z = true;
- break;
- }
- break;
- case -74977101:
- if (implMethodName.equals("getYear")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 483442342:
- if (implMethodName.equals("getDeviceType")) {
- z = true;
- break;
- }
- break;
- case 517353092:
- if (implMethodName.equals("getItemId")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = true;
- break;
- }
- break;
- case 985326823:
- if (implMethodName.equals("getGroupCategory")) {
- z = true;
- break;
- }
- break;
- case 1330288580:
- if (implMethodName.equals("getGroupId")) {
- z = true;
- break;
- }
- break;
- case 1984111180:
- if (implMethodName.equals("getCalendarCodeWaiting")) {
- 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/WorkstationOfMachine") && 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/Workstation") && 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();
- };
- }
- 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/cps/entity/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getGroupType();
- };
- }
- 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/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- 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/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- 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/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- 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/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- 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/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- 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/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- 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/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getGroupId();
- };
- }
- 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/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getGroupId();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCalendarCodeWaiting();
- };
- }
- 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/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getMachineCode();
- };
- }
- 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/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getMachineCode();
- };
- }
- 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/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getItemId();
- };
- }
- 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/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getItemId();
- };
- }
- 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/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getItemId();
- };
- }
- 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/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getItemId();
- };
- }
- 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/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getYear();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getType();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getDeviceType();
- };
- }
- 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/Machine") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getShortCode();
- };
- }
- 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/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getGroupTag();
- };
- }
- 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/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getGroupCategory();
- };
- }
- 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/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getParentId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public WorkstationServiceImpl(final IMachineService machineService, final IWorkstationOfMachineService workstationOfMachineService, final IWorkstationWcsService workstationWcsService, final ICommonGroupOfItemService commonGroupOfItemService, final ICommonGroupService commonGroupService, final ICalendarService calendarService, final WorkstationMapper workstationMapper, final OssBuilder ossBuilder, final IDmpVariablesService dmpVariablesService, final ITransferDirectoryService transferDirectoryService, final ITransferDirectoryGroupService transferDirectoryGroupService, final IWorkstationWorkbenchService workbenchService, final IDncWsRelationTdService wsRelationTdService, final IDncFixedSpaceService dncFixedSpaceService, final InsertWorkstationProducer workstationProducer, final IWorkstationDynamicCollectService dynamicCollectService) {
this.machineService = machineService;
@@ -504,24 +180,24 @@
return Long.valueOf(seconds);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<WorkstationWcsDmpDTO> queryWcsList(String workstationId) {
- return (List) ((WorkstationMapper) this.baseMapper).queryWcsList(workstationId).stream().filter(c -> {
+ return this.baseMapper.queryWcsList(workstationId).stream().filter(c -> {
return (WcsDataTypeEnums.WcsDataType.ALARM.getCode().equals(c.getWcsDataType()) || WcsDataTypeEnums.WcsDataType.ALARM_NUM.getCode().equals(c.getWcsDataType()) || WcsDataTypeEnums.WcsDataType.ALARM_INFO.getCode().equals(c.getWcsDataType())) ? false : true;
}).collect(Collectors.toList());
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public WorkstationWcsDmpDTO queryDateTypeState(Integer code, String workstationId) {
return ((WorkstationMapper) this.baseMapper).queryDateTypeState(code, workstationId);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<DmpVariablesVO> queryDmpList(String workstationId) {
return ((WorkstationMapper) this.baseMapper).queryDmpList(workstationId);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public WorkstationVO submit(WorkstationSubmitVO workstationSubmitVO) {
checkWorkstation(workstationSubmitVO);
@@ -538,9 +214,8 @@
}
saveOrUpdate(workstation);
if (Func.isNotEmpty(workstationSubmitVO.getGroupId())) {
- if (Func.isEmpty(this.commonGroupOfItemService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getItemId();
- }, workstation.getId())))) {
+ List<CommonGroupOfItem> itemList = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery().eq(CommonGroupOfItem::getItemId, workstation.getId()));
+ if (Func.isEmpty(itemList)) {
CommonGroupOfItem commonGroupOfItem = new CommonGroupOfItem(workstationSubmitVO.getGroupId(), workstation.getId(), CommonGroupTypeEnum.WORKSTATION.getName(), CommonGroupConstant.DEFAULT_CATEGORY);
this.commonGroupOfItemService.save(commonGroupOfItem);
} else {
@@ -555,7 +230,7 @@
CacheUtil.clear(ExtCacheConstant.POSTING_WORKSTATION, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.POSTING_MACHINE, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.WORKSTATION_MACHINE, Boolean.FALSE);
- String redisKey = ExtCacheConstant.CPS_CACHE.concat(SystemPropertyUtils.VALUE_SEPARATOR).concat(SystemPropertyUtils.VALUE_SEPARATOR).concat(WorkstationCache.CRC);
+ String redisKey = ExtCacheConstant.CPS_CACHE.concat(":").concat(":").concat(WorkstationCache.CRC);
CacheUtil.clear(redisKey, Boolean.FALSE);
WorkstationVO workstationVO = WorkstationConvert.INSTANCE.convertSaveVO(workstationSubmitVO);
workstationVO.setId(workstation.getId());
@@ -599,9 +274,12 @@
return;
}
if (Func.isEmpty(workstationSubmitVO.getMachineId())) {
+ Machine machine1 = this.machineService.getOne(Wrappers.<Machine>lambdaQuery().eq(Machine::getMachineCode, workstationSubmitVO.getMachineCode()));
+ workstationSubmitVO.setMachineId(machine1.getId());
+ /*
workstationSubmitVO.setMachineId(((Machine) this.machineService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getMachineCode();
- }, workstationSubmitVO.getMachineCode()))).getId());
+ }, workstationSubmitVO.getMachineCode()))).getId());*/
}
WorkstationOfMachine workstationOfMachine2 = new WorkstationOfMachine(workstation.getId(), workstationSubmitVO.getMachineId());
this.workstationOfMachineService.save(workstationOfMachine2);
@@ -630,7 +308,7 @@
}
List<WorkstationWorkbenchVO> workbenchVOList = workstationSubmitVO.getWorkbenchVOList();
List<WorkstationWorkbench> workstationWorkbenchList = new ArrayList<>();
- Map<String, List<WorkstationWorkbenchVO>> map = (Map) workbenchVOList.stream().collect(Collectors.groupingBy(c -> {
+ Map<String, List<WorkstationWorkbenchVO>> map = workbenchVOList.stream().collect(Collectors.groupingBy(c -> {
return c.getName();
}));
map.values().forEach(workbenchList -> {
@@ -668,15 +346,15 @@
}
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public Boolean changeCollectSwitch(Long workstationId, Integer collectSwitch) {
return this.machineService.changeCollectSwitch(workstationId, collectSwitch);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean delete(List<Long> workstationIds, Integer type) {
- String redisKey = ExtCacheConstant.CPS_CACHE.concat(SystemPropertyUtils.VALUE_SEPARATOR).concat(SystemPropertyUtils.VALUE_SEPARATOR).concat(WorkstationCache.CRC);
+ String redisKey = ExtCacheConstant.CPS_CACHE.concat(":").concat(":").concat(WorkstationCache.CRC);
if (StatusType.REMOVE.getType().equals(type)) {
workstationIds.forEach(id -> {
this.transferDirectoryService.deleteWorkstationDirectory(id);
@@ -685,12 +363,15 @@
removeByIds(workstationIds);
this.dynamicCollectService.removeTableByDelWorkstations(workstationIds);
this.workstationWcsService.deleteByWorkstationIdList(workstationIds);
+ this.workstationOfMachineService.remove(Wrappers.<WorkstationOfMachine>lambdaQuery().in(WorkstationOfMachine::getWorkstationId, workstationIds));
+ this.commonGroupOfItemService.remove(Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getItemId, workstationIds));
+ /*
this.workstationOfMachineService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getWorkstationId();
}, workstationIds));
this.commonGroupOfItemService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getItemId();
- }, workstationIds));
+ }, workstationIds));*/
WorkstationCache.clearWorkstationCache();
CacheUtil.clear(ExtCacheConstant.POSTING_WORKSTATION, Boolean.FALSE);
CacheUtil.clear(ExtCacheConstant.POSTING_MACHINE, Boolean.FALSE);
@@ -706,12 +387,12 @@
return true;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public IPage<WorkstationVO> listPage(IPage<WorkstationVO> workstationVOIPage, String keyWord, Long groupId, Integer status, Integer type) {
List<String> workStationGroupIdList = new ArrayList<>();
if (!Objects.equals(groupId, CommonGroupConstant.ALL_WORKSTATION_ID) && Func.isNotEmpty(groupId)) {
workStationGroupIdList.add(String.valueOf(groupId));
- workStationGroupIdList.addAll((Collection) getCommonGroupIds(workStationGroupIdList, new ArrayList()).stream().map(item -> {
+ workStationGroupIdList.addAll(getCommonGroupIds(workStationGroupIdList, new ArrayList<>()).stream().map(item -> {
return String.valueOf(item.getId());
}).collect(Collectors.toList()));
}
@@ -725,7 +406,7 @@
return workstationVOIPage.setRecords(workstationVOS);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<WorkstationVO> getWorkstationByGroupIds(final List<String> groupIds) {
List<WorkstationVO> workstationVOS = this.workstationMapper.listWorkstation(groupIds);
workstationVOS.forEach(workstationVO -> {
@@ -746,7 +427,7 @@
@NotNull
private List<FmsWorkBench> wrapperBench(WorkstationOfWorkbenchVO station) {
- return (List) station.getWorkstationWorkbenchVOList().stream().map(bench -> {
+ return station.getWorkstationWorkbenchVOList().stream().map(bench -> {
FmsWorkBench workBench = new FmsWorkBench();
workBench.setId(Func.toStr(bench.getId()));
workBench.setName(bench.getName());
@@ -755,14 +436,12 @@
}).collect(Collectors.toList());
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<FmsWorkstation> getFmsWorkstation(final List<Long> workstationIds) {
- List<Long> commonGroupIds = (List) this.commonGroupService.list(Lambda.eq((v0) -> {
- return v0.getGroupTag();
- }, FmsOrderEnum.FMS_BELTLINE.getCode())).stream().map((v0) -> {
+ List<Long> commonGroupIds = this.commonGroupService.list(Lambda.eq(CommonGroup::getGroupTag, FmsOrderEnum.FMS_BELTLINE.getCode())).stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
- List<FmsWorkstation> fmsWorkstations = (List) commonGroupIds.stream().flatMap(id -> {
+ List<FmsWorkstation> fmsWorkstations = commonGroupIds.stream().flatMap(id -> {
return this.commonGroupService.getAllSubGroup(id, CommonGroupTypeEnum.WORKSTATION.getName(), CommonGroupConstant.DEFAULT_CATEGORY).stream();
}).map((v0) -> {
return v0.getId();
@@ -778,27 +457,25 @@
fmsWorkstation.setWorkBenchList(wrapperBench(station2));
return fmsWorkstation;
}).collect(Collectors.collectingAndThen(Collectors.toCollection(() -> {
- return new TreeSet(Comparator.comparing((v0) -> {
+ return new TreeSet<>(Comparator.comparing((v0) -> {
return v0.getId();
}));
}), (v1) -> {
- return new ArrayList(v1);
+ return new ArrayList<>(v1);
}));
return fmsWorkstations;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public Boolean changeCalendarCode(WorkstationChangeCalendarVO workstationChangeCalendarVO) {
Workstation workstation = (Workstation) getById(workstationChangeCalendarVO.getWorkstationId());
workstation.setCalendarCodeWaiting(workstationChangeCalendarVO.getCalendarCodeWaiting());
return Boolean.valueOf(updateById(workstation));
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public void updateWorkstationCalendar() {
- List<Workstation> list = list((Wrapper) new QueryWrapper().lambda().isNotNull((v0) -> {
- return v0.getCalendarCodeWaiting();
- }));
+ List<Workstation> list = list(new QueryWrapper<Workstation>().lambda().isNotNull(Workstation::getCalendarCodeWaiting));
List<Workstation> workstationList = new ArrayList<>();
if (Func.isNotEmpty(list)) {
list.stream().filter(workstation -> {
@@ -813,13 +490,11 @@
WorkstationCache.clearWorkstationCache();
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean changeWorkstationGroup(Long groupId, List<Long> workstationIdList) {
CommonGroup commonGroup = (CommonGroup) this.commonGroupService.getById(groupId);
- List<CommonGroupOfItem> list = this.commonGroupOfItemService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getItemId();
- }, workstationIdList));
+ List<CommonGroupOfItem> list = this.commonGroupOfItemService.list( Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getItemId, workstationIdList));
list.forEach(commonGroupOfItem -> {
commonGroupOfItem.setGroupId(groupId);
commonGroupOfItem.setGroupType(commonGroup.getGroupType());
@@ -832,12 +507,10 @@
return true;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean deleteGroup(Long groupId) {
- if (this.commonGroupOfItemService.count(Lambda.eq((v0) -> {
- return v0.getGroupId();
- }, groupId)) > 0) {
+ if (this.commonGroupOfItemService.count(Lambda.eq(CommonGroupOfItem::getGroupId, groupId)) > 0) {
throw new ServiceException(MessageUtils.message("cps.common.group.production.line.delete.fail", new Object[0]));
}
this.transferDirectoryGroupService.deleteWorkstationGroup(groupId);
@@ -845,7 +518,7 @@
return true;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public BladeFile importWorkstation(List<WorkstationImport> data) {
if (Func.isEmpty(data)) {
@@ -855,10 +528,8 @@
throw new ServiceException(MessageUtils.message("excel.import.size.failed", new Object[0]));
}
HashMap<String, Long> commonGroupNameMap = this.commonGroupService.getCommonGroupNameMap(CommonGroupTypeEnum.WORKSTATION.getName(), CommonGroupConstant.DEFAULT_CATEGORY);
- List<Machine> machineList = this.machineService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE));
- List<String> calendarCodeList = (List) this.calendarService.getCalendarList(AuthUtil.getTenantId()).stream().map((v0) -> {
+ List<Machine> machineList = this.machineService.list(Wrappers.<Machine>lambdaQuery().eq(Machine::getStatus, CommonConstant.ENABLE));
+ List<String> calendarCodeList = this.calendarService.getCalendarList(AuthUtil.getTenantId()).stream().map((v0) -> {
return v0.getCode();
}).collect(Collectors.toList());
Boolean flag = Boolean.TRUE;
@@ -869,7 +540,7 @@
List<String> workstationCodeList = new ArrayList<>();
List<String> machineCodeList = new ArrayList<>();
List<MachineVO> machineVOList = this.machineService.listHaveBand();
- Set<String> machineCodeSet = (Set) machineVOList.stream().map((v0) -> {
+ Set<String> machineCodeSet = machineVOList.stream().map((v0) -> {
return v0.getMachineCode();
}).collect(Collectors.toSet());
CodeMapDTO codeMapDTO = new CodeMapDTO(pinCodeMap, shortCodeMap, workstationCodeList, machineCodeList, importPinCodeMap, importShortCodeMap);
@@ -880,7 +551,7 @@
}
}
if (!flag.booleanValue()) {
- MultipartFile multipartFile = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "workstationFailTemplate" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "宸ヤ綅淇℃伅琛�", (List) data.stream().filter(x -> {
+ MultipartFile multipartFile = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "workstationFailTemplate" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "宸ヤ綅淇℃伅琛�", data.stream().filter(x -> {
return Func.isNotEmpty(x.getFailReason());
}).collect(Collectors.toList()), (Object) null, (AbstractMergeStrategy) null);
BladeFile bladeFile = this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
@@ -893,7 +564,7 @@
return null;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public BladeFile exportWorkstation(String keyWord, Long groupId, HttpServletResponse response) {
Query query = new Query();
query.setSize(-1);
@@ -909,20 +580,20 @@
return bladeFile;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public IPage<WorkstationRealTimeStatusVO> getRealTimeStatus(WorkstationRealTimeStatusDTO dto, Query query) {
List<String> workStationGroupIdList = dto.getWorkStationGroupIdList();
if (workStationGroupIdList.size() == 1) {
- List<String> workStationGroupIdByParentList = (List) getCommonGroupIds(workStationGroupIdList, new ArrayList()).stream().map(item -> {
+ List<String> workStationGroupIdByParentList = getCommonGroupIds(workStationGroupIdList, new ArrayList<>()).stream().map(item -> {
return String.valueOf(item.getId());
}).collect(Collectors.toList());
dto.getWorkStationGroupIdList().addAll(workStationGroupIdByParentList);
}
- List<WorkstationRealTimeStatusVO> result = ((WorkstationMapper) this.baseMapper).getWorkstationListByWorkStationGroupIdList(new Page().setSize(-1L), dto);
+ List<WorkstationRealTimeStatusVO> result = this.baseMapper.getWorkstationListByWorkStationGroupIdList(new Page<WorkstationRealTimeStatusVO>().setSize(-1L), dto);
return manualBuildIPage(query, buildProperties(result, dto.getDeviceStatus()));
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<RealTimeStatusVO> getRealTimeProperties(Long workstationId, Long machineId) {
List<RealTimeStatusVO> properties = new ArrayList<>();
Map<String, Object> map = WorkstationCache.getWorkstationRealTime(String.valueOf(workstationId));
@@ -951,11 +622,11 @@
Map<Long, List<RealTimeStatusVO>> properties = new HashMap<>();
List<DmpVariablesVO> list = this.dmpVariablesService.getDmpVariablesByWorkstationIds(workstationIdList);
if (Func.isNotEmpty(list)) {
- Map<Long, List<DmpVariablesVO>> dmpVariablesMap = (Map) list.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, List<DmpVariablesVO>> dmpVariablesMap =list.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}));
- dmpVariablesMap.forEach(k, v -> {
- ArrayList arrayList = new ArrayList();
+ dmpVariablesMap.forEach((k, v) -> {
+ ArrayList<RealTimeStatusVO> arrayList = new ArrayList<>();
Map<String, Object> map = WorkstationCache.getWorkstationRealTime(String.valueOf(k));
v.forEach(dmpVariablesVO -> {
RealTimeStatusVO vo = new RealTimeStatusVO();
@@ -978,82 +649,75 @@
return properties;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public IPage<Workstation> listWorkStationOnShiftIndex(List<String> ids, LocalDate localDate, Query query, Integer shift, Integer type) {
return ((WorkstationMapper) this.baseMapper).listWorkStationOnShiftIndex(Condition.getPage(query), Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate), shift, type, ids);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Workstation> listWorkStationOnShift(List<Long> ids, LocalDate localDate, List<Integer> shifts, Integer type) {
return ((WorkstationMapper) this.baseMapper).listWorkStationOnShift(Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate), shifts, type, ids);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public Integer countWorkStationOnShiftIndex(List<String> ids, LocalDate localDate, Integer shift, Integer type) {
return ((WorkstationMapper) this.baseMapper).countWorkStationOnShiftIndex(Integer.valueOf(localDate.getYear()), DateUtil.formatDate(localDate), shift, type, ids);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Workstation> listWorkStationByGroupId(List<String> ids) {
return ((WorkstationMapper) this.baseMapper).listWorkStationByGroupId(ids);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Workstation> listWorkStationByGroup(List<Long> ids) {
- return ((WorkstationMapper) this.baseMapper).listWorkStationByGroupId((List) ids.stream().map((v0) -> {
+ return ((WorkstationMapper) this.baseMapper).listWorkStationByGroupId(ids.stream().map((v0) -> {
return String.valueOf(v0);
}).collect(Collectors.toList()));
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public Set<Long> findByIndexAndDateAndTypeAndYear(Integer year, String queryDate, Integer shiftIndex, Integer code) {
return ((WorkstationMapper) this.baseMapper).findByIndexAndDateAndTypeAndYear(year, queryDate, shiftIndex, code);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Long> findByMachineShortCode(String code) {
return ((WorkstationMapper) this.baseMapper).findByMachineShortCode(code);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Workstation> workStationList(List<Long> ids) {
- return list((Wrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().in((v0) -> {
- return v0.getId();
- }, ids)).orderByAsc((v0) -> {
- return v0.getName();
- }));
+ return list(new QueryWrapper<Workstation>().lambda().in(Workstation::getId, ids).orderByAsc(Workstation::getName));
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public Map<Long, GroupWorkDTO> queryGroupWorkStation(List<Long> ids) {
- List<GroupWorkDTO> groupWorkDTOS = ((WorkstationMapper) this.baseMapper).queryGroupWorkStation(ids);
- return (Map) groupWorkDTOS.stream().collect(Collectors.toMap((v0) -> {
+ List<GroupWorkDTO> groupWorkDTOS = this.baseMapper.queryGroupWorkStation(ids);
+ return groupWorkDTOS.stream().collect(Collectors.toMap((v0) -> {
return v0.getItemId();
}, v -> {
return v;
}));
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public ProductionCalendarDay getDayShift(Long workstationId, String calendarDate) {
return ((WorkstationMapper) this.baseMapper).getDayShift(workstationId, calendarDate);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Long> productionLineList(Long groupId) {
List<Long> ids = Lists.newArrayList();
CommonGroup commonGroup = (CommonGroup) this.commonGroupService.getById(groupId);
if (commonGroup != null) {
String code = commonGroup.getCode();
- List<CommonGroup> commonGroupList = this.commonGroupService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getGroupCategory();
- }, CommonGroupConstant.DEFAULT_CATEGORY)).eq((v0) -> {
- return v0.getGroupType();
- }, CommonGroupTypeEnum.WORKSTATION.getName())).likeRight((v0) -> {
- return v0.getCode();
- }, code));
+ List<CommonGroup> commonGroupList = this.commonGroupService.list(Wrappers.<CommonGroup>lambdaQuery()
+ .eq(CommonGroup::getGroupCategory, CommonGroupConstant.DEFAULT_CATEGORY)
+ .eq(CommonGroup::getGroupType, CommonGroupTypeEnum.WORKSTATION.getName())
+ .likeRight(CommonGroup::getCode, code));
if (Func.isNotEmpty(commonGroupList)) {
- List<Long> collect = (List) commonGroupList.stream().map((v0) -> {
+ List<Long> collect = commonGroupList.stream().map((v0) -> {
return v0.getId();
}).distinct().collect(Collectors.toList());
ids.addAll(collect);
@@ -1062,7 +726,7 @@
return ids;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<WorkstationDmpDTO> getDmpVar(String workstationId) {
return ((WorkstationMapper) this.baseMapper).getDmpVar(workstationId);
}
@@ -1075,18 +739,16 @@
Map<String, String> importPinCodeMap = codeMapDTO.getImportPinCodeMap();
Map<String, String> importShortCodeMap = codeMapDTO.getImportShortCodeMap();
Map<String, Machine> machineDeaMap = null;
- List<Machine> deactivateList = this.machineService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ List<Machine> deactivateList = this.machineService.list( Wrappers.<Machine>lambdaQuery().eq(Machine::getStatus, CommonConstant.DEACTIVATE));
if (Func.isNotEmpty(deactivateList)) {
- machineDeaMap = (Map) deactivateList.stream().collect(Collectors.toMap((v0) -> {
+ machineDeaMap = deactivateList.stream().collect(Collectors.toMap((v0) -> {
return v0.getMachineCode();
}, Function.identity()));
}
- List<String> machineShortCodeList = (List) machineList.stream().map((v0) -> {
+ List<String> machineShortCodeList = machineList.stream().map((v0) -> {
return v0.getShortCode();
}).distinct().collect(Collectors.toList());
- Map<String, Machine> machineCodeToValue = (Map) machineList.stream().collect(Collectors.toMap((v0) -> {
+ Map<String, Machine> machineCodeToValue = machineList.stream().collect(Collectors.toMap((v0) -> {
return v0.getMachineCode();
}, v -> {
return v;
@@ -1101,9 +763,7 @@
workstationImport.setFailReason(MessageUtils.message("cps.workstation.code.already.exists.stop.status", new Object[0]));
} else if (ValidatorUtils.stringFilter(workstationImport.getCode())) {
workstationImport.setFailReason(MessageUtils.message("cps.workstation.code.exist.special.symbols.error", new Object[0]));
- } else if (count((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCode();
- }, workstationImport.getCode())) > 0) {
+ } else if (count(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getCode, workstationImport.getCode())) > 0) {
workstationImport.setFailReason(MessageUtils.message("cps.workstation.code.already.exists", new Object[0]));
} else if (!codeList.contains(workstationImport.getCode())) {
codeList.add(workstationImport.getCode());
@@ -1248,11 +908,8 @@
workstationImport.setFailReason(StringUtil.format(MessageUtils.message("cps.tpm.machine.short.code.length", new Object[0]), new Object[]{4, 8}));
return true;
}
- Long count = Long.valueOf(this.machineService.count(((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getShortCode();
- }, shortCode)).ne(Func.isNotEmpty(code), (v0) -> {
- return v0.getMachineCode();
- }, code)));
+ Long count = Long.valueOf(this.machineService.count(Wrappers.<Machine>lambdaQuery().eq(Machine::getShortCode, shortCode)
+ .ne(Func.isNotEmpty(code), Machine::getMachineCode, code)));
if (count.longValue() > 0) {
workstationImport.setFailReason(MessageUtils.message("cps.tpm.machine.short.code.exists", new Object[0]));
return true;
@@ -1279,25 +936,29 @@
return false;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public WorkstationVO getDetail(Long workstationId) {
SpaceRootNodeVO ftpDirectory;
Workstation workstation = (Workstation) getById(workstationId);
if (workstation != null) {
WorkstationVO workstationVO = WorkstationConvert.INSTANCE.convert(workstation);
+
+ ProductionCalendar calendar = this.calendarService.getOne(Wrappers.<ProductionCalendar>lambdaQuery()
+ .eq(ProductionCalendar::getCode, workstation.getCalendarCode())
+ .eq(ProductionCalendar::getYear, Integer.valueOf(LocalDate.now().getYear())));
+ /*
ProductionCalendar calendar = (ProductionCalendar) this.calendarService.getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getCode();
}, workstation.getCalendarCode())).eq((v0) -> {
return v0.getYear();
- }, Integer.valueOf(LocalDate.now().getYear())));
+ }, Integer.valueOf(LocalDate.now().getYear())));*/
+
if (Func.notNull(calendar)) {
workstationVO.setCalendarName(calendar.getName());
} else {
workstationVO.setCalendarName("绯荤粺鏃ュ巻");
}
- CommonGroupOfItem commonGroupOfItem = (CommonGroupOfItem) this.commonGroupOfItemService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getItemId();
- }, workstationId));
+ CommonGroupOfItem commonGroupOfItem = this.commonGroupOfItemService.getOne(Wrappers.<CommonGroupOfItem>lambdaQuery().eq(CommonGroupOfItem::getItemId, workstationId));
if (commonGroupOfItem != null) {
CommonGroup commonGroup = (CommonGroup) this.commonGroupService.getById(commonGroupOfItem.getGroupId());
if (Func.isNotEmpty(commonGroup)) {
@@ -1332,13 +993,13 @@
return null;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<DmpVariablesVO> getDmpVariables(String workstationId, String machineId) {
if (Func.isBlank(machineId)) {
throw new ServiceException(MessageUtils.message("workstation.not.turn.on.acquisition.function", new Object[0]));
}
List<DmpVariablesVO> dmpVariablesVOS = this.dmpVariablesService.getDmpVariablesByWorkstationId(Long.valueOf(workstationId));
- return (List) dmpVariablesVOS.stream().filter((v0) -> {
+ return dmpVariablesVOS.stream().filter((v0) -> {
return v0.getRealTimeData();
}).collect(Collectors.toList());
}
@@ -1347,24 +1008,33 @@
if (Func.isNotEmpty(workstationSubmitVO.getCode()) && workstationSubmitVO.getCode().length() > 24) {
throw new ServiceException(MessageUtils.message("cps.workstation.code.length.too.long", new Object[0]));
}
+ Long count = Long.valueOf(count(Wrappers.<Workstation>lambdaQuery()
+ .ne(Func.isNotEmpty(workstationSubmitVO.getId()), Workstation::getId, workstationSubmitVO.getId())
+ .eq(Workstation::getCode, workstationSubmitVO.getCode())
+ .eq(Workstation::getStatus, CommonConstant.ENABLE)));
+ /*
Long count = Long.valueOf(count((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(workstationSubmitVO.getId()), (v0) -> {
return v0.getId();
}, workstationSubmitVO.getId()).eq((v0) -> {
return v0.getCode();
}, workstationSubmitVO.getCode())).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.ENABLE)));
+ }, CommonConstant.ENABLE)));*/
if (count.longValue() > 0) {
throw new ServiceException(MessageUtils.message("cps.workstation.code.already.exists", new Object[0]));
}
}
private boolean checkUnableImportWorkstation(String code) {
+ Workstation workstation = getOne(Wrappers.<Workstation>lambdaQuery()
+ .eq(Workstation::getCode, code)
+ .eq(Workstation::getStatus, CommonConstant.DEACTIVATE));
+ /*
Workstation workstation = (Workstation) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getCode();
}, code)).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ }, CommonConstant.DEACTIVATE));*/
if (workstation != null) {
return Boolean.TRUE.booleanValue();
}
@@ -1372,13 +1042,17 @@
}
private void checkUnableWorkstation(WorkstationSubmitVO workstationSubmitVO) {
+ Workstation workstation = getOne(Wrappers.<Workstation>lambdaQuery().ne(Func.isNotEmpty(workstationSubmitVO.getId()), Workstation::getId, workstationSubmitVO.getId())
+ .eq(Workstation::getCode, workstationSubmitVO.getCode())
+ .eq(Workstation::getStatus, CommonConstant.DEACTIVATE));
+ /*
Workstation workstation = (Workstation) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().ne(Func.isNotEmpty(workstationSubmitVO.getId()), (v0) -> {
return v0.getId();
}, workstationSubmitVO.getId()).eq((v0) -> {
return v0.getCode();
}, workstationSubmitVO.getCode())).eq((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE));
+ }, CommonConstant.DEACTIVATE));*/
if (workstation != null) {
throw new ServiceException(MessageUtils.message("cps.workstation.code.already.exists.stop.status", new Object[0]));
}
@@ -1391,14 +1065,14 @@
if (Func.isEmpty(commonGroupList)) {
return list;
}
- List<String> ids = (List) commonGroupList.stream().map(item -> {
+ List<String> ids = commonGroupList.stream().map(item -> {
return String.valueOf(item.getId());
}).collect(Collectors.toList());
list.addAll(commonGroupList);
return getCommonGroupIds(ids, list);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<FmsWorkstation> assemblyWorkstationData(List<String> workstationIds, Map<String, FmsRealTimeTray> realTimeTrayMap, List<FmsRealTimeTray> realTimeTrayList, List<String> positionList) {
List<FmsWorkstation> fmsWorkstationList = new ArrayList<>();
List<MachineInformationVO> informationList = new ArrayList<>();
@@ -1406,60 +1080,53 @@
MachineInformationVO machineInformationVO = this.workbenchService.listWorkstationWorkbench(Long.valueOf(Func.toLong(id)));
informationList.add(machineInformationVO);
});
- List<MachineInformationVO> informationVOS = (List) informationList.stream().filter(s -> {
+ List<MachineInformationVO> informationVOS = informationList.stream().filter(s -> {
return Func.isNotEmpty(s.getDeviceType());
}).collect(Collectors.toList());
- Map<Integer, List<MachineInformationVO>> workstationMap = (Map) informationVOS.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Integer, List<MachineInformationVO>> workstationMap = informationVOS.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getDeviceType();
}));
- workstationMap.forEach(key, value -> {
+ workstationMap.forEach((key, value) -> {
dealWorkstation(fmsWorkstationList, value, key, realTimeTrayList, positionList);
});
return fmsWorkstationList;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public WorkMachineEasyVO getWorkMachine(String workstationId) {
return ((WorkstationMapper) this.baseMapper).getWorkMachine(workstationId);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<FmsWorkstationGroupVO> fmsTreeWorkstation(FmsWorkstationQueryVO queryVO) {
WorkTypeEnum workTypeEnum;
List<CommonGroup> allSubGroup = this.commonGroupService.getAllSubGroup(CommonGroupConstant.WARE_ROOT, CommonGroupTypeEnum.WORKSTATION.getName(), CommonGroupConstant.DEFAULT_CATEGORY);
if (Func.isEmpty(allSubGroup)) {
- return new ArrayList();
+ return new ArrayList<>();
}
- List<Long> groupIds = (List) allSubGroup.stream().map((v0) -> {
+ List<Long> groupIds = allSubGroup.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<FmsWorkstationGroupVO> fmsWorkstationGroupVOS = CommonGroupConvert.INSTANCE.convertFmsList(allSubGroup);
- List<CommonGroupOfItem> list = this.commonGroupOfItemService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getGroupId();
- }, groupIds));
- Map<Long, CommonGroupOfItem> groupOfItemMap = (Map) list.stream().collect(Collectors.toMap((v0) -> {
+ List<CommonGroupOfItem> list = this.commonGroupOfItemService.list(Wrappers.<CommonGroupOfItem>lambdaQuery().in(CommonGroupOfItem::getGroupId, groupIds));
+ Map<Long, CommonGroupOfItem> groupOfItemMap = list.stream().collect(Collectors.toMap((v0) -> {
return v0.getItemId();
}, item -> {
return item;
}));
- List<Long> workstationIds = (List) list.stream().map((v0) -> {
+ List<Long> workstationIds = list.stream().map((v0) -> {
return v0.getItemId();
}).collect(Collectors.toList());
- List<FmsWorkstationGroupVO> roots = (List) fmsWorkstationGroupVOS.stream().filter(item2 -> {
+ List<FmsWorkstationGroupVO> roots = fmsWorkstationGroupVOS.stream().filter(item2 -> {
return Func.equals(item2.getParentId(), Long.valueOf(CommonGroupConstant.ROOT.longValue()));
}).collect(Collectors.toList());
if (Func.isEmpty(workstationIds)) {
return roots;
}
- List<Workstation> workstations = list(((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getId();
- }, workstationIds)).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE)).in(Func.isNotEmpty(queryVO.getTypeList()), (v0) -> {
- return v0.getType();
- }, queryVO.getTypeList()).in(Func.isNotEmpty(queryVO.getDeviceTypeList()), (v0) -> {
- return v0.getDeviceType();
- }, queryVO.getDeviceTypeList()));
+ List<Workstation> workstations = list(Wrappers.<Workstation>lambdaQuery().in(Workstation::getId, workstationIds).eq(Workstation::getStatus, CommonConstant.ENABLE)
+ .in(Func.isNotEmpty(queryVO.getTypeList()),Workstation::getType, queryVO.getTypeList())
+ .in(Func.isNotEmpty(queryVO.getDeviceTypeList()), Workstation::getDeviceType, queryVO.getDeviceTypeList()));
+
List<FmsWorkstationGroupVO> vos = WorkstationConvert.INSTANCE.convertListFms(workstations);
for (FmsWorkstationGroupVO fmsWorkstationVO : vos) {
CommonGroupOfItem commonGroupOfItem = groupOfItemMap.get(fmsWorkstationVO.getId());
@@ -1474,31 +1141,31 @@
return roots;
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<Workstation> listMachine(Integer status, String keyword) {
return ((WorkstationMapper) this.baseMapper).listMachine(status, keyword);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<WorkstationVO> getWorkstationListInMaintainOrRepairById(Long orderProcessId, Set<Long> workstationIdList) {
return ((WorkstationMapper) this.baseMapper).getWorkstationListInMaintainOrRepairById(orderProcessId, workstationIdList);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public List<WorkstationVO> getWorkstationListInMaintainOrRepairByIdList(List<Long> orderProcessIdList, Set<Long> workstationIdList) {
return ((WorkstationMapper) this.baseMapper).getWorkstationListInMaintainOrRepairByIdList(orderProcessIdList, workstationIdList);
}
- @Override // org.springblade.modules.cps.service.IWorkstationService
+ @Override
public IPage<WorkstationRealTimeStatusVO> pageH5(Query query, WorkstationPageQueryVO workstationPageQueryVO) {
- IPage<WorkstationVO> workstationVOIPage = listPage(new Page().setSize(-1L), workstationPageQueryVO.getKeyWord(), null, workstationPageQueryVO.getStatus(), workstationPageQueryVO.getType());
+ IPage<WorkstationVO> workstationVOIPage = listPage(new Page<WorkstationVO>().setSize(-1L), workstationPageQueryVO.getKeyWord(), null, workstationPageQueryVO.getStatus(), workstationPageQueryVO.getType());
IPage<WorkstationRealTimeStatusVO> convert = WorkstationConvert.INSTANCE.convertPage(workstationVOIPage);
List<WorkstationRealTimeStatusVO> result = buildProperties(convert.getRecords(), workstationPageQueryVO.getDeviceStatus());
return manualBuildIPage(query, result);
}
private IPage<WorkstationRealTimeStatusVO> manualBuildIPage(Query query, List<WorkstationRealTimeStatusVO> result) {
- Page page = new Page(query.getCurrent().intValue(), query.getSize().intValue(), result.size());
+ Page<WorkstationRealTimeStatusVO> page = new Page<>(query.getCurrent().intValue(), query.getSize().intValue(), result.size());
if (result.size() == 0) {
return page;
}
@@ -1517,15 +1184,15 @@
if (Func.isEmpty(list)) {
return dataList;
}
- Map<Long, List<RealTimeStatusVO>> realTimePropertiesMap = getRealTimeProperties((List) list.stream().map((v0) -> {
+ Map<Long, List<RealTimeStatusVO>> realTimePropertiesMap = getRealTimeProperties( list.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList()));
- return (List) list.stream().filter(i -> {
+ return list.stream().filter(i -> {
boolean filter = Boolean.TRUE.booleanValue();
if (Func.isEmpty(i.getMachineId())) {
filter = false;
}
- List<RealTimeStatusVO> properties = (List) realTimePropertiesMap.get(i.getId());
+ List<RealTimeStatusVO> properties = realTimePropertiesMap.get(i.getId());
if (Func.isNotEmpty(deviceStatus)) {
if (Func.isEmpty(properties)) {
filter = false;
@@ -1555,7 +1222,7 @@
}
List<FmsWorkstationGroupVO> itemGroups = new ArrayList<>();
for (FmsWorkstationGroupVO vo : roots) {
- List<FmsWorkstationGroupVO> vos = (List) fmsWorkstationGroupVOS.stream().filter(item -> {
+ List<FmsWorkstationGroupVO> vos = fmsWorkstationGroupVOS.stream().filter(item -> {
return Func.equals(item.getParentId(), vo.getId());
}).collect(Collectors.toList());
vo.setChildren(vos);
@@ -1602,8 +1269,8 @@
List<WorkstationWorkbench> workbenchList = workstation.getWorkstationList();
if (Func.isNotEmpty(workbenchList)) {
if (!WorkTypeEnum.HANDLE.getCode().equals(key)) {
- fmsWorkstation.setWorkBenchList((List) workbenchList.stream().map(s -> {
- List<FmsRealTimeTray> collect = (List) realTimeTrayList.stream().filter(r -> {
+ fmsWorkstation.setWorkBenchList(workbenchList.stream().map(s -> {
+ List<FmsRealTimeTray> collect = realTimeTrayList.stream().filter(r -> {
return workstation.getWorkstationCode().equals(r.getCurrentPosition()) && String.valueOf(s.getSort()).equals(r.getCurrentStation());
}).collect(Collectors.toList());
FmsWorkBench fmsWorkBench = new FmsWorkBench();
@@ -1620,8 +1287,8 @@
return fmsWorkBench;
}).collect(Collectors.toList()));
} else {
- fmsWorkstation.setWorkBenchList((List) workbenchList.stream().map(s2 -> {
- List<FmsRealTimeTray> collect = (List) realTimeTrayList.stream().filter(r -> {
+ fmsWorkstation.setWorkBenchList(workbenchList.stream().map(s2 -> {
+ List<FmsRealTimeTray> collect = realTimeTrayList.stream().filter(r -> {
return workstation.getWorkstationCode().equals(r.getCurrentPosition());
}).collect(Collectors.toList());
FmsWorkBench fmsWorkBench = new FmsWorkBench();
@@ -1640,7 +1307,7 @@
}
}
if ((WorkTypeEnum.LOAD_AND_UNLOAD.getCode().equals(key) || WorkTypeEnum.PROCESS.getCode().equals(key)) && positionList.contains(workstation.getWorkstationCode())) {
- List<FmsRealTimeTray> collect = (List) realTimeTrayList.stream().filter(r -> {
+ List<FmsRealTimeTray> collect = realTimeTrayList.stream().filter(r -> {
return workstation.getWorkstationCode().equals(r.getCurrentPosition());
}).collect(Collectors.toList());
FmsRealTimeTray trayRealTimeData = collect.get(0);
--
Gitblit v1.9.3