From 25db770e621f1259b8d5b7fd514207f7481c2d0f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 30 十月 2024 11:25:37 +0800
Subject: [PATCH] blade_cps路径改为smis
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java
index 6dcdfce..7316983 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java
@@ -14,7 +14,7 @@
/**
* 杩囨护浼戞伅鏃ワ紵
* @param <R>
- * @param data 鐘舵�佹暟鎹垪琛�
+ * @param data 鑱氬悎鐘舵�佹暟鎹垪琛�
* @param openTypeEnums RUNNING/ALARM/OEE绛�
* @return
*/
@@ -22,13 +22,15 @@
if (Func.isEmpty(data)) {
return data;
}
- boolean filterType = whetherToFilter(OpenTypeEnums.PARAM_KEY_TYPE, openTypeEnums);//mdc_open_type
- boolean filterShift = whetherToFilter(OpenTypeEnums.PARAM_KEY_SHIFT, openTypeEnums);//mdc_open_shift
+ boolean filterType = whetherToFilter(OpenTypeEnums.PARAM_KEY_TYPE, openTypeEnums);//mdc_open_type锛屾槸鍚﹁繃婊よ绫诲瀷
+ boolean filterShift = whetherToFilter(OpenTypeEnums.PARAM_KEY_SHIFT, openTypeEnums);//mdc_open_shift锛屾槸鍚﹁繃婊ょ彮鍒�
+ //杩欓噷绠�鍖栵紝涓嶈繃婊や簡锛屾暟鎹湪win鏈嶅姟鍣ㄦ湁锛宐lade_boot_blade_param-0418bak.sql鏈夛紝鏄釜json鏁扮粍
+
if (!filterType && !filterShift) {
return data;
}
return data.stream().filter(item -> {
- return (filterType && item.getShiftTimeType().equals(2)) ? false : true;
+ return (filterType && item.getShiftTimeType().equals(2)) ? false : true;//2:浼戞伅鏃堕棿娈碉紝杩欓噷鏄幓鎺変紤鎭殑鐘舵�佹暟鎹�
}).filter(item2 -> {
return !filterShift || item2.getShiftIndex().intValue() > 0;
}).collect(Collectors.toList());
--
Gitblit v1.9.3