From 2e8250c824a5ed0a0720c50fc3421257ee45073b Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期二, 12 十一月 2024 11:00:01 +0800
Subject: [PATCH] 预警配置修改
---
src/main/java/com/product/administration/service/EarlyWarningServer.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/product/administration/service/EarlyWarningServer.java b/src/main/java/com/product/administration/service/EarlyWarningServer.java
index 923ca40..59f30d5 100644
--- a/src/main/java/com/product/administration/service/EarlyWarningServer.java
+++ b/src/main/java/com/product/administration/service/EarlyWarningServer.java
@@ -81,11 +81,15 @@
/**
* 鍗曚釜棰勮,鐗规畩棰勮宸茬粡鏈夐璀︾殑鏁版嵁浜�,鍒殑涓氬姟涓诲姩璋冩鏂规硶锛屽幓鍙戦�侀璀︽秷鎭�
*
- * @param fseWarningConfig
- * @param dtService棰勮鐨勪笟鍔℃暟鎹�
+ * @param configUuid
+ * @param dtService 棰勮鐨勪笟鍔℃暟鎹紝鍏宠仈璁惧鏁版嵁
*/
- public void warningCreate(FieldSetEntity fseWarningConfig,DataTableEntity dtService) {
+ public void warningCreate(String configUuid,DataTableEntity dtService) {
+ FieldSetEntity fseWarningConfig = baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_EARLY_WARNING, configUuid, false);
+ if (!"1".equals(fseWarningConfig.getString(CmnConst.CONFIG_STATUS))) {
+ throw new BaseException(SystemCode.WARN_NO_NORMAL_STATUS_RECORD);
+ }
String mainTableName = fseWarningConfig.getString(CmnConst.SOURCE_TABLE); //涓昏〃鍚�
String mainTableAlias = mainTableName + "1"; //涓昏〃鍒悕
//
@@ -163,7 +167,12 @@
// //鏌ヨ绗﹀悎棰勮鐨勬暟鎹�
// DataTableEntity dtService = baseDao.listTable(serviceSQL.toString(), new Object[]{});
- if (!BaseUtil.dataTableIsEmpty(dtService)) {
+ ///----------------璁鹃璀︽娴嬬殑bean鏂规硶瑙ｅ彂楠岃瘉鏄惁瑙ｅ彂棰勮锛岃繑鍥瀟rue锛屽嵆鍙戠敓棰勮------------------
+ boolean b=false;
+ //-----鍙嶅皠璋僢ean,瑕佹敼
+ //b=xxxxx.month(dtService);
+ ///----------------璁鹃璀︽娴嬬殑bean鏂规硶瑙ｅ彂楠岃瘉鏄惁瑙ｅ彂棰勮锛岃繑鍥瀟rue锛屽嵆鍙戠敓棰勮------------------
+ if (b) {
List<String> collect = dtService.getData().stream().map(item -> item.getString(mainTableAlias + "uuid")).collect(Collectors.toList());
//棰勮uuid
String warnUUID = fseWarningConfig.getUUID();
--
Gitblit v1.9.2