From f69073b835f1a0c66590130e1830edcdd75ebb8a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 十一月 2024 16:59:35 +0800
Subject: [PATCH] 去掉dmpvar
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationAnalysisServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 42da7cc..1bbc554 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
@@ -31,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;
@@ -98,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);
--
Gitblit v1.9.3