From e8ed1a91c77ab62a924f12acd55777f227bacd7e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 21 十一月 2025 17:15:17 +0800
Subject: [PATCH] 工位组删除后，其下工位移动到默认组
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java | 68 ++++++++++++++++------------------
1 files changed, 32 insertions(+), 36 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java
index b140611..b8998f8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java
@@ -17,6 +17,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,15 +31,15 @@
import com.qianwen.smartman.common.constant.DateConstant;
import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
-import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
-import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
-import com.qianwen.smartman.modules.cps.entity.Workstation;
-import com.qianwen.smartman.modules.cps.enums.TrayEnum;
-import com.qianwen.smartman.modules.cps.enums.WorkstationTypeEnum;
-import com.qianwen.smartman.modules.cps.mapper.WorkstationMapper;
-import com.qianwen.smartman.modules.cps.message.dto.TelemetryDataResponseDTO;
-import com.qianwen.smartman.modules.cps.service.IGlobalWcsService;
-import com.qianwen.smartman.modules.cps.service.IWorkstationService;
+import com.qianwen.smartman.modules.smis.dto.WorkstationWcsDmpDTO;
+import com.qianwen.smartman.modules.smis.entity.GlobalWcs;
+import com.qianwen.smartman.modules.smis.entity.Workstation;
+import com.qianwen.smartman.modules.smis.enums.TrayEnum;
+import com.qianwen.smartman.modules.smis.enums.WorkstationTypeEnum;
+import com.qianwen.smartman.modules.smis.mapper.WorkstationMapper;
+import com.qianwen.smartman.modules.smis.message.dto.TelemetryDataResponseDTO;
+import com.qianwen.smartman.modules.smis.service.IGlobalWcsService;
+import com.qianwen.smartman.modules.smis.service.IWorkstationService;
import com.qianwen.smartman.modules.mdc.entity.WorkstationCollectData;
import com.qianwen.smartman.modules.mdc.mapper.SuperAggregateStateMapper;
import com.qianwen.smartman.modules.mdc.mapper.SuperAlarmMapper;
@@ -55,24 +56,19 @@
public class WorkstationAnalysisServiceImpl implements IWorkstationAnalysisService {
private static final Logger log = LoggerFactory.getLogger(WorkstationAnalysisServiceImpl.class);
public static final String STATUS = "STATUS";
- private final SuperAggregateStateMapper superAggregateStateMapper;
- private final SuperAlarmMapper superAlarmMapper;
- private final IGlobalWcsService globalWcsService;
- private final WorkstationMapper workstationMapper;
- private final SuperProcessParameterMapper superProcessParameterMapper;
- private final IWorkstationService workstationService;
-
+ @Autowired
+ private SuperAggregateStateMapper superAggregateStateMapper;
+ @Autowired
+ private SuperAlarmMapper superAlarmMapper;
+ @Autowired
+ private IGlobalWcsService globalWcsService;
+ @Autowired
+ private WorkstationMapper workstationMapper;
+ @Autowired
+ private IWorkstationService workstationService;
+ @Autowired
private IProcessParameterService processParameterService;
- public WorkstationAnalysisServiceImpl(final SuperAggregateStateMapper superAggregateStateMapper, final SuperAlarmMapper superAlarmMapper, final IGlobalWcsService globalWcsService, final WorkstationMapper workstationMapper, final SuperProcessParameterMapper superProcessParameterMapper, final IWorkstationService workstationService,IProcessParameterService aProcessParameterService) {
- this.superAggregateStateMapper = superAggregateStateMapper;
- this.superAlarmMapper = superAlarmMapper;
- this.globalWcsService = globalWcsService;
- this.workstationMapper = workstationMapper;
- this.superProcessParameterMapper = superProcessParameterMapper;
- this.workstationService = workstationService;
- this.processParameterService = aProcessParameterService;
- }
@Override
public List<StatusAnalysisWorkstationVO> statusByWorkstation(String workstationId) {
@@ -102,6 +98,9 @@
List<AlarmAnalysisWorkstationVO> result;
try {
result = this.superAlarmMapper.alarmByWorkstation(workstationId, Integer.valueOf((query.getCurrent() - 1) * query.getSize()), query.getSize());
+ result.forEach(a -> {
+ a.setAlarmTime(DateUtil.formatDateTime(new Date(a.getTime().getTime())));
+ });
total = this.superAlarmMapper.alarmByWorkstationTotal(workstationId);
} catch (Exception e) {
log.error("鏌ヨ鎶ヨ寮傚父",e);
@@ -179,12 +178,7 @@
List<Workstation> workstationList = this.workstationService.list(Wrappers.<Workstation>lambdaQuery()
.eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode())
.eq(Workstation::getStatus, TrayEnum.StatusEnum.ACTIVATING.getStatus()));
- /*
- List<Workstation> workstationList = this.workstationService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getType();
- }, WorkstationTypeEnum.MACHINE.getCode())).eq((v0) -> {
- return v0.getStatus();
- }, TrayEnum.StatusEnum.ACTIVATING.getStatus()));*/
+
if (Func.isEmpty(workstationList)) {
return wcsList.stream().map(c -> {
return DeviceStatusStatisticsVO.builder().status(c.getCode()).statusName(c.getName()).deviceNum(0L).build();
@@ -193,9 +187,12 @@
Set<String> wIds = workstationList.stream().map(Workstation::getId).map(String::valueOf).collect(Collectors.toSet());
+ //涓嬮潰鏄煡璇㈣澶囩殑鏈�鏂扮姸鎬佸��
//deviceMap key涓簑cs鐨刢ode鍊硷紝value鏄澶囨暟閲忥紙璇ョ姸鎬佺殑锛�
Map<String, Long> deviceMap = wIds.stream().map(wId -> {
- Map<String, Object> realTimeData = WorkstationCache.getWorkstationAllCollect(wId);
+
+ //涓嬮潰鐨勭紦瀛樻槸TelemetryDataRealTimeConsumer涓缃殑锛堟帴鏀舵暟鎹級銆傞渶瑕佸啀collect涓缃紝閬垮厤鏍煎紡闂锛屾垜浠笉闇�瑕佽繖涔堝共浜嗭紝鐩存帴鏌ヨ
+ Map<String, Object> realTimeData = WorkstationCache.getWorkstationAllCollect(wId);
//WorkstationWcsDmpDTO dmpDTO = WorkstationCache.getDmpStatus(wId);//杩欓噷浣跨敤浜哹lade_workstation_wcs blade_dmp_variables琛紝鑰冭檻鍘绘帀浜嗭紝鎴戜滑娌℃湁dmp
WorkstationWcsDmpDTO dmpDTO = new WorkstationWcsDmpDTO();
dmpDTO.setName("DeviceStatus");
@@ -205,11 +202,10 @@
return dto.getV();
}
- //濡傛灉缂撳瓨娌℃湁鏁版嵁
- //this error
+ //濡傛灉浠ヤ笂浠庣紦瀛樻病鏈夋嬁鍒版暟鎹�(鎴戜滑鑲畾娌℃湁缂撳瓨锛屼笉鐭ラ亾缂撳瓨鍝効鏉ョ殑),鏌ヨ鏈�鏂版椂搴忔暟鎹�
//List<WorkstationCollectData> workstationCollectData = this.superProcessParameterMapper.queryLastParameter(wId);//璇ュ伐浣嶆渶鏂扮殑last(ts),last(v)
-
- List<WorkstationCollectData> workstationCollectData = processParameterService.lastParameter(Long.parseLong(wId));
+
+ List<WorkstationCollectData> workstationCollectData = processParameterService.queryLastParameter(Long.parseLong(wId));
if (Func.isNotEmpty(workstationCollectData)) {
//resultMapping ,key:n 锛寁alue锛歍elemetryDataResponseDTO{last(ts),last(v)}
Map<String, Object> resultMapping = workstationCollectData.stream().collect(Collectors.toMap((v0) -> {
--
Gitblit v1.9.3