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/visual/service/impl/VisualStatusServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java
index 1094ec4..2211986 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java
@@ -37,15 +37,15 @@
import com.qianwen.smartman.common.enums.WorkstationParamTypeEnum;
import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
-import com.qianwen.smartman.modules.cps.dto.CalendarShiftTimeSlicesDTO;
-import com.qianwen.smartman.modules.cps.dto.WorkstationAlarmDTO;
-import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
-import com.qianwen.smartman.modules.cps.entity.Workstation;
-import com.qianwen.smartman.modules.cps.entity.WorkstationWcs;
-import com.qianwen.smartman.modules.cps.service.IGlobalWcsService;
-import com.qianwen.smartman.modules.cps.service.IWorkstationService;
-import com.qianwen.smartman.modules.cps.service.IWorkstationWcsService;
-import com.qianwen.smartman.modules.cps.vo.RealTimeStatusVO;
+import com.qianwen.smartman.modules.smis.dto.CalendarShiftTimeSlicesDTO;
+import com.qianwen.smartman.modules.smis.dto.WorkstationAlarmDTO;
+import com.qianwen.smartman.modules.smis.entity.GlobalWcs;
+import com.qianwen.smartman.modules.smis.entity.Workstation;
+import com.qianwen.smartman.modules.smis.entity.WorkstationWcs;
+import com.qianwen.smartman.modules.smis.service.IGlobalWcsService;
+import com.qianwen.smartman.modules.smis.service.IWorkstationService;
+import com.qianwen.smartman.modules.smis.service.IWorkstationWcsService;
+import com.qianwen.smartman.modules.smis.vo.RealTimeStatusVO;
import com.qianwen.smartman.modules.mdc.entity.SuperAggregateState;
import com.qianwen.smartman.modules.mdc.enums.OpenTypeEnums;
import com.qianwen.smartman.modules.mdc.enums.ProductivityTypeEnum;
@@ -130,7 +130,7 @@
return this.wrapper.entityToOee(data);
}
-
+ /*
public ChartDataTableVO getWorkstationRealStatus(VisualBaseVO visualBaseVO) {
List<Long> workStationList = visualBaseVO.getWorkStationIdList();
Map<String, Object> header = new LinkedHashMap<>();
@@ -164,7 +164,7 @@
}).collect(Collectors.toList());
ChartDataTableVO chartDataTableVO = new ChartDataTableVO().setData(list).setHeader(header);
return chartDataTableVO;
- }
+ }*/
public DefaultWcsEnum getWorkstationDefaultWcsEnum(final List<RealTimeStatusVO> realTimeProperties) {
@@ -181,7 +181,7 @@
}).orElse(null);
}
-
+ /*
public ChartDataTableVO getWorkstationAlarm(final VisualBaseVO vo) {
List<Long> workStationList = vo.getWorkStationIdList();
List<ICard> voList = new ArrayList<>();
@@ -211,7 +211,7 @@
ChartDataTableVO chartDataTableVO = new ChartDataTableVO().setData(voList).addHeader("code", "鎶ヨ缂栫爜").addHeader(CommonConstant.ALARM_MSG, "鎶ヨ淇℃伅");
return chartDataTableVO;
}
-
+ */
public ChartNameValueDataVO getAverageEfficiencyAnalysis(VisualBaseVO vo, ProductivityTypeEnum productivityTypeEnum) {
List<Long> workStationIdList = vo.getWorkStationIdList();
--
Gitblit v1.9.3