From ac2e912c9dd7bafc9101775462fbe7060ce27a91 Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期五, 18 十月 2024 16:38:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0 into dev
---
src/main/java/com/product/administration/service/EarlyWarningServer.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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..206ac6e 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 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"; //涓昏〃鍒悕
//
--
Gitblit v1.9.2