From 67ca8b45a975a41093c0e52d8129624657089b44 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 十一月 2024 13:24:36 +0800
Subject: [PATCH] 状态和绩效时间设置，修改值后清空缓存的key修正，修改位与collect一致
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/FilterOffUtils.java | 14 ++++++++++----
1 files changed, 10 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 7316983..4a247ee 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
@@ -12,7 +12,7 @@
public class FilterOffUtils {
/**
- * 杩囨护浼戞伅鏃ワ紵
+ * 杩囨护鏁版嵁
* @param <R>
* @param data 鑱氬悎鐘舵�佹暟鎹垪琛�
* @param openTypeEnums RUNNING/ALARM/OEE绛�
@@ -22,9 +22,9 @@
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锛屾槸鍚﹁繃婊ょ彮鍒�
- //杩欓噷绠�鍖栵紝涓嶈繃婊や簡锛屾暟鎹湪win鏈嶅姟鍣ㄦ湁锛宐lade_boot_blade_param-0418bak.sql鏈夛紝鏄釜json鏁扮粍
+ //鑾峰彇"鍒嗘瀽璁剧疆"鐣岄潰涓殑杩囨护閰嶇疆锛屾病鏈夎缃暟鎹垯杩斿洖false(涓嶈繃婊�)
+ boolean filterType = whetherToFilter(OpenTypeEnums.PARAM_KEY_TYPE, openTypeEnums);//mdc_open_type锛屾槸鍚﹁繃婊ゆ帀浼戞伅鏃舵(shiftTimeType=2)
+ boolean filterShift = whetherToFilter(OpenTypeEnums.PARAM_KEY_SHIFT, openTypeEnums);//mdc_open_shift锛屾槸鍚﹁繃婊ょ彮鍒�(shiftIndex>0鐨勬暟鎹繚鐣�)
if (!filterType && !filterShift) {
return data;
@@ -43,6 +43,12 @@
return data;
}
+ /**
+ * 鏄惁杩囨护鏁版嵁(鏍规嵁绯荤粺鍙傛暟涓殑json鏁版嵁,open==1灏辫繃婊�)
+ * @param typeEnums 杩囨护鍒嗙被(鐝埗/鎴栫被鍨�) mdc_open_shift/mdc_open_type
+ * @param enums 杩囨护鐨勯」鐩甌IME_USED_ANALYSIS/ALARM_ANALYSIS ...
+ * @return
+ */
public static boolean whetherToFilter(OpenTypeEnums typeEnums, OpenTypeEnums enums) {
String value = ParamCache.getValue(typeEnums.getMsg());
if (Func.isNull(value)) {
--
Gitblit v1.9.3