From 9e5da8899bc21bb5b6b0a3c267108caa00199291 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 19 五月 2024 15:46:08 +0800
Subject: [PATCH] websocket代码整理
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.java | 209 +++++++++++----------------------------------------
1 files changed, 46 insertions(+), 163 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.java
index 11d96e8..28b6414 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.java
@@ -1,10 +1,5 @@
package com.qianwen.smartman.modules.fms.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.Timestamp;
@@ -19,19 +14,24 @@
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.qianwen.core.mp.support.Condition;
+import com.qianwen.core.mp.support.Query;
+import com.qianwen.core.tool.utils.DateUtil;
+import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.common.cache.cps.WorkstationCache;
import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.common.constant.CommonGroupConstant;
import com.qianwen.smartman.common.constant.DateConstant;
import com.qianwen.smartman.common.enums.WcsDataTypeEnums;
import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
-import com.qianwen.core.mp.support.Condition;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.tool.utils.DateUtil;
-import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.dto.TrayWarehouseAreaDTO;
import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
import com.qianwen.smartman.modules.cps.entity.Workstation;
@@ -43,9 +43,13 @@
import com.qianwen.smartman.modules.cps.service.IWorkstationService;
import com.qianwen.smartman.modules.cps.service.IWorkstationWorkbenchService;
import com.qianwen.smartman.modules.fms.dto.FmsOrderProcessDTO;
+import com.qianwen.smartman.modules.fms.entity.FmsInstructionRecord;
import com.qianwen.smartman.modules.fms.entity.FmsOrder;
import com.qianwen.smartman.modules.fms.entity.FmsOrderProcess;
+import com.qianwen.smartman.modules.fms.entity.FmsOrderProcessFixture;
+import com.qianwen.smartman.modules.fms.entity.FmsOrderProcessTool;
import com.qianwen.smartman.modules.fms.entity.FmsRealTimeTray;
+import com.qianwen.smartman.modules.fms.entity.FmsWorkStationRecord;
import com.qianwen.smartman.modules.fms.enums.OrderStatusEnum;
import com.qianwen.smartman.modules.fms.mapper.FmsOrderProcessMapper;
import com.qianwen.smartman.modules.fms.mapper.FmsRealTimeTrayMapper;
@@ -62,11 +66,8 @@
import com.qianwen.smartman.modules.fms.vo.FmsWarehouseAreaTrayVO;
import com.qianwen.smartman.modules.mdc.entity.SuperAlarm;
import com.qianwen.smartman.modules.mdc.mapper.SuperAlarmMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.class */
public class FmsDeviceAnalysisServiceImpl implements IFmsDeviceAnalysisService {
private static final Logger log = LoggerFactory.getLogger(FmsDeviceAnalysisServiceImpl.class);
private final TrayMapper trayMapper;
@@ -82,139 +83,6 @@
private final IFmsInstructionRecordService fmsInstructionRecordService;
private final IWorkstationWorkbenchService workbenchService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1757019252:
- if (implMethodName.equals("getCurrentPosition")) {
- z = true;
- break;
- }
- break;
- case -761264846:
- if (implMethodName.equals("getOrderProcessId")) {
- z = true;
- break;
- }
- break;
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case -401685595:
- if (implMethodName.equals("getOrderCode")) {
- z = true;
- break;
- }
- break;
- case -170250029:
- if (implMethodName.equals("getOrderId")) {
- z = true;
- break;
- }
- break;
- case -75145708:
- if (implMethodName.equals("getSort")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- 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();
- };
- }
- 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();
- };
- }
- 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/fms/entity/FmsOrderProcessTool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- 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/FmsOrderProcessFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- 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/fms/entity/FmsWorkStationRecord") && 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/modules/fms/entity/FmsRealTimeTray") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCurrentPosition();
- };
- }
- 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/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/fms/entity/FmsInstructionRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getOrderCode();
- };
- }
- 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();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public FmsDeviceAnalysisServiceImpl(final TrayMapper trayMapper, final FmsOrderProcessMapper fmsOrderProcessMapper, final FmsRealTimeTrayMapper fmsRealTimeTrayMapper, final SuperAlarmMapper superAlarmMapper, final IFmsOrderService fmsOrderService, final IFmsOrderProcessService fmsOrderProcessService, final IFmsOrderProcessFixtureService fmsOrderProcessFixtureService, final IFmsOrderProcessToolService fmsOrderProcessToolService, final IFmsWorkStationRecordService fmsWorkStationRecordService, final IWorkstationService workstationService, final IFmsInstructionRecordService fmsInstructionRecordService, final IWorkstationWorkbenchService workbenchService) {
this.trayMapper = trayMapper;
@@ -231,7 +99,7 @@
this.workbenchService = workbenchService;
}
- @Override // org.springblade.modules.fms.service.IFmsDeviceAnalysisService
+ @Override
public FMSWorkbenchInfoVO listFMSWorkbenchInfo(Long workstationId) {
Workstation workstation = (Workstation) this.workstationService.getById(workstationId);
String avatar = workstation.getAvatar();
@@ -240,13 +108,17 @@
fmsWorkbenchInfoVO.setAvatar(avatar);
Integer deviceType = workstation.getDeviceType();
String code = workstation.getCode();
+ List<WorkstationWorkbench> list = this.workbenchService.list(Wrappers.<WorkstationWorkbench>lambdaQuery()
+ .eq(WorkstationWorkbench::getWorkstationId, workstationId)
+ .eq(WorkstationWorkbench::getStatus, CommonConstant.ENABLE).orderByAsc(WorkstationWorkbench::getSort));
+ /*
List<WorkstationWorkbench> list = this.workbenchService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationId();
}, workstationId)).eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).orderByAsc((v0) -> {
return v0.getSort();
- }));
+ }));*/
if (list == null || list.size() == 0) {
return fmsWorkbenchInfoVO;
}
@@ -257,7 +129,7 @@
program = getValue(name, String.valueOf(workstationId));
}
String finalProgram = program;
- List<FMSWorkbenchInfoItemVo> data = (List) list.stream().map(item -> {
+ List<FMSWorkbenchInfoItemVo> data = list.stream().map(item -> {
FMSWorkbenchInfoItemVo infoItemVo = new FMSWorkbenchInfoItemVo();
infoItemVo.setCurrentStation(String.valueOf(item.getSort()));
infoItemVo.setWorkbenchName(item.getName());
@@ -265,9 +137,11 @@
return infoItemVo;
}).collect(Collectors.toList());
fmsWorkbenchInfoVO.setWorkbenchInfoList(data);
+ List<FmsRealTimeTray> fmsRealTimeTrays = this.fmsRealTimeTrayMapper.selectList(Wrappers.<FmsRealTimeTray>lambdaQuery().eq(FmsRealTimeTray::getCurrentPosition, code));
+ /*
List<FmsRealTimeTray> fmsRealTimeTrays = this.fmsRealTimeTrayMapper.selectList((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getCurrentPosition();
- }, code));
+ }, code));*/
if (fmsRealTimeTrays == null || fmsRealTimeTrays.size() == 0) {
return fmsWorkbenchInfoVO;
}
@@ -299,18 +173,22 @@
}
Map<Long, FmsOrder> orderMap = new HashMap<>();
if (orderIds.size() > 0) {
+ List<FmsOrder> fmsOrders = this.fmsOrderService.list(Wrappers.<FmsOrder>lambdaQuery().in(FmsOrder::getId, orderIds));
+ /*
List<FmsOrder> fmsOrders = this.fmsOrderService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
- }, orderIds));
+ }, orderIds));*/
fmsOrders.forEach(item3 -> {
- FmsOrder fmsOrder = (FmsOrder) orderMap.put(item3.getId(), item3);
+ FmsOrder fmsOrder = orderMap.put(item3.getId(), item3);
});
}
Map<Long, FmsOrderProcess> orderProcessMap = new HashMap<>();
if (orderProcessIds.size() > 0) {
+ List<FmsOrderProcess> orderProcesses = this.fmsOrderProcessService.list(Wrappers.<FmsOrderProcess>lambdaQuery().in(FmsOrderProcess::getId, orderProcessIds));
+ /*
List<FmsOrderProcess> orderProcesses = this.fmsOrderProcessService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
- }, orderProcessIds));
+ }, orderProcessIds));*/
orderProcesses.forEach(item4 -> {
FmsOrderProcess fmsOrderProcess = (FmsOrderProcess) orderProcessMap.put(item4.getId(), item4);
});
@@ -364,7 +242,7 @@
return fmsWorkbenchInfoVO;
}
- @Override // org.springblade.modules.fms.service.IFmsDeviceAnalysisService
+ @Override
public IPage<FmsAlarmVO> pageFmsAlarm(Long workstationId, Query query) {
IPage<FmsAlarmVO> page = Condition.getPage(query);
if (Func.isEmpty(workstationId)) {
@@ -389,13 +267,13 @@
return page;
}
- @Override // org.springblade.modules.fms.service.IFmsDeviceAnalysisService
+ @Override
public IPage<FmsWarehouseAreaTrayVO> pageTrayInfoList(Long areaId, Query query) {
if (CommonGroupConstant.WARE_ROOT.equals(areaId)) {
areaId = null;
}
IPage<FmsWarehouseAreaTrayVO> result = this.trayMapper.getWarehouseAreaTrayList(areaId, Condition.getPage(query));
- List<FmsWarehouseAreaTrayVO> list = (List) result.getRecords().parallelStream().peek(o -> {
+ List<FmsWarehouseAreaTrayVO> list = result.getRecords().parallelStream().peek(o -> {
if (Func.isNotEmpty(o.getAvailability())) {
o.setAvailability(TrayEnum.StatusEnum.of(Integer.valueOf(o.getAvailability())).getDesc());
}
@@ -404,16 +282,13 @@
return result;
}
- @Override // org.springblade.modules.fms.service.IFmsDeviceAnalysisService
+ @Override
@Transactional
public Boolean reduction(Long areaId, String areaCode) {
List<TrayWarehouseAreaDTO> result = this.trayMapper.getWarehouseAreaTray();
if (Func.isNotEmpty(result)) {
- Map<String, List<String>> areaMap = (Map) result.stream().collect(Collectors.groupingBy((v0) -> {
- return v0.getAreaCode();
- }, Collectors.mapping((v0) -> {
- return v0.getTrayCode();
- }, Collectors.toList())));
+ Map<String, List<String>> areaMap = result.stream().collect(Collectors.groupingBy(TrayWarehouseAreaDTO::getAreaCode, Collectors.mapping(TrayWarehouseAreaDTO::getTrayCode, Collectors.toList())));
+
for (Map.Entry<String, List<String>> stringListEntry : areaMap.entrySet()) {
this.fmsRealTimeTrayMapper.updateReduction(stringListEntry.getValue(), stringListEntry.getKey());
}
@@ -428,6 +303,14 @@
filterOrderCodes.add(orderAndProcessId.getOrderCode());
processIds.add(orderAndProcessId.getId());
}
+
+ this.fmsOrderService.remove(Wrappers.<FmsOrder>lambdaQuery().in(FmsOrder::getId, filterOrderIds));
+ this.fmsOrderProcessService.remove(Wrappers.<FmsOrderProcess>lambdaQuery().in(FmsOrderProcess::getId, processIds));
+ this.fmsOrderProcessToolService.remove(Wrappers.<FmsOrderProcessTool>lambdaQuery().in(FmsOrderProcessTool::getOrderProcessId, processIds));
+ this.fmsOrderProcessFixtureService.remove(Wrappers.<FmsOrderProcessFixture>lambdaQuery().in(FmsOrderProcessFixture::getOrderProcessId, processIds));
+ this.fmsWorkStationRecordService.remove(Wrappers.<FmsWorkStationRecord>lambdaQuery().in(FmsWorkStationRecord::getOrderId, filterOrderIds));
+ this.fmsInstructionRecordService.remove(Wrappers.<FmsInstructionRecord>lambdaQuery().in(FmsInstructionRecord::getOrderCode, filterOrderCodes));
+ /*
this.fmsOrderService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
}, filterOrderIds));
@@ -445,7 +328,7 @@
}, filterOrderIds));
this.fmsInstructionRecordService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getOrderCode();
- }, filterOrderCodes));
+ }, filterOrderCodes));*/
}
return true;
}
--
Gitblit v1.9.3