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 | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 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 071303a..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
@@ -68,7 +68,6 @@
import com.qianwen.smartman.modules.mdc.mapper.SuperAlarmMapper;
@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;
@@ -100,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();
@@ -180,7 +179,7 @@
return v0.getId();
}, 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<>();
@@ -243,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)) {
@@ -268,7 +267,7 @@
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;
@@ -283,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 = 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());
}
--
Gitblit v1.9.3