From 4b479381a65bd3ef526cb92631d3550f2aa17459 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 三月 2024 17:34:53 +0800
Subject: [PATCH] fms工单模块编译错误清理
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessServiceImpl.java | 87 +++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 53 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessServiceImpl.java
index 2457a9c..8cfe6be 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessServiceImpl.java
@@ -1,25 +1,27 @@
package com.qianwen.smartman.modules.fms.service.impl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.lang.invoke.SerializedLambda;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
+
import org.apache.commons.io.IOUtils;
-import com.qianwen.smartman.common.constant.ExtCacheConstant;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+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.redis.cache.BladeRedis;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.ExtCacheConstant;
+import com.qianwen.smartman.modules.cps.entity.CommonGroup;
import com.qianwen.smartman.modules.cps.enums.WorkTypeEnum;
import com.qianwen.smartman.modules.cps.service.ICommonGroupService;
import com.qianwen.smartman.modules.cps.service.IProductionCraftVersionService;
@@ -40,7 +42,6 @@
import com.qianwen.smartman.modules.fms.vo.FmsWorkStationProcessVO;
import com.qianwen.smartman.modules.fms.vo.FmsWorkStationVO;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsOrderProcessServiceImpl.class */
@@ -54,46 +55,6 @@
private final BladeRedis bladeRedis;
private final FmsForestClient fmsForestClient;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -170250029:
- if (implMethodName.equals("getOrderId")) {
- z = false;
- 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/fms/entity/FmsOrderProcess") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderId();
- };
- }
- 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/modules/cps/entity/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public FmsOrderProcessServiceImpl(final FmsOrderMapper fmsOrderMapper, final IProductionCraftVersionService productionCraftVersionService, final IWorkstationService workstationService, final ICommonGroupService commonGroupService, final OssBuilder ossBuilder, final IDncArtFileService artFileService, final BladeRedis bladeRedis, final FmsForestClient fmsForestClient) {
this.fmsOrderMapper = fmsOrderMapper;
@@ -108,27 +69,35 @@
@Override // org.springblade.modules.fms.service.IFmsOrderProcessService
public List<FmsWorkStationProcessVO> listWorkstation(String orderId) {
+ List<FmsOrderProcess> fmsOrderProcesses = this.baseMapper.selectList(Wrappers.<FmsOrderProcess>query().lambda().eq(FmsOrderProcess::getOrderId, orderId));
+ /*
List<FmsOrderProcess> fmsOrderProcesses = ((FmsOrderProcessMapper) this.baseMapper).selectList((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getOrderId();
- }, orderId));
+ }, orderId));*/
+ FmsOrder fmsOrder = this.fmsOrderMapper.selectOne(Wrappers.<FmsOrder>query().lambda().eq(FmsOrder::getId, orderId));
+ /*
FmsOrder fmsOrder = (FmsOrder) this.fmsOrderMapper.selectOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getId();
- }, orderId));
+ }, orderId));*/
CraftVersionLineVO craftVersionLineVO = this.productionCraftVersionService.detailVersion(fmsOrder.getCraftVersionId());
String groupIds = craftVersionLineVO.getGroupId();
String[] groupSplit = groupIds.split(",");
+ List<Long> commonGroupIds = this.commonGroupService.list(Wrappers.<CommonGroup>query().lambda().in(CommonGroup::getId, (Object[])groupSplit)).stream().filter(commonGroup -> commonGroup.getGroupTag().equals(FmsOrderEnum.FMS_BELTLINE.getCode())).map(CommonGroup::getId).collect(Collectors.toList());
+
+ /*
List<Long> commonGroupIds = (List) this.commonGroupService.list((Wrapper) Wrappers.query().lambda().in((v0) -> {
return v0.getId();
}, groupSplit)).stream().filter(commonGroup -> {
return commonGroup.getGroupTag().equals(FmsOrderEnum.FMS_BELTLINE.getCode());
}).map((v0) -> {
return v0.getId();
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
+
List<Long> listGroupIds = new ArrayList<>();
for (Long groupId : commonGroupIds) {
listGroupIds.addAll(this.workstationService.productionLineList(groupId));
}
- List<String> listGroupIdsOfString = (List) listGroupIds.stream().map((v0) -> {
+ List<String> listGroupIdsOfString = listGroupIds.stream().map((v0) -> {
return String.valueOf(v0);
}).collect(Collectors.toList());
List<WorkstationVO> workstationVOList = this.workstationService.getWorkstationByGroupIds(listGroupIdsOfString);
@@ -137,7 +106,7 @@
List<FmsWorkStationVO> fmsWorkStationVOS = new ArrayList<>();
FmsWorkStationProcessVO fmsWorkStationProcessVO = new FmsWorkStationProcessVO();
if (Func.isNotEmpty(fmsOrderProcess.getProcessType())) {
- List<WorkstationVO> workstationVOS = (List) workstationVOList.stream().filter(workstationVO -> {
+ List<WorkstationVO> workstationVOS = workstationVOList.stream().filter(workstationVO -> {
if (Objects.equals(fmsOrderProcess.getProcessType(), WorkTypeEnum.MEASURE.getCode())) {
return Objects.equals(workstationVO.getDeviceType(), fmsOrderProcess.getProcessType()) || Objects.equals(workstationVO.getDeviceType(), WorkTypeEnum.LOAD_AND_UNLOAD.getCode());
}
@@ -220,6 +189,18 @@
}
public static byte[] inputStreamToByteArray(InputStream inputStream) {
+ try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+ byte[] buffer = new byte[1024];
+ int num;
+ while ((num = inputStream.read(buffer)) != -1)
+ byteArrayOutputStream.write(buffer, 0, num);
+ byteArrayOutputStream.flush();
+ return byteArrayOutputStream.toByteArray();
+ } catch (IOException e) {
+ e.printStackTrace();
+ return new byte[0];
+ }
+ /*
try {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];
@@ -243,6 +224,6 @@
} catch (IOException e) {
e.printStackTrace();
return new byte[0];
- }
+ }*/
}
}
--
Gitblit v1.9.3