From 8eecc7078abc724f8c01a2b4f73e96da666c5c74 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 24 四月 2025 09:40:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
index 9f96eea..a3fb940 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
@@ -5,10 +5,11 @@
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.ansteel.api.dao.*;
import com.iailab.module.ansteel.api.dto.*;
-import com.iailab.module.ansteel.api.entity.PowerCapacitorStatusEntity;
-import com.iailab.module.ansteel.api.entity.PowerControlDetEntity;
-import com.iailab.module.ansteel.api.entity.PowerControlMainEntity;
-import com.iailab.module.ansteel.api.entity.PowerNetFactorEntity;
+import com.iailab.module.ansteel.power.dao.*;
+import com.iailab.module.ansteel.power.entity.PowerCapacitorStatusEntity;
+import com.iailab.module.ansteel.power.entity.PowerControlDetEntity;
+import com.iailab.module.ansteel.power.entity.PowerControlMainEntity;
+import com.iailab.module.ansteel.power.entity.PowerNetFactorEntity;
import com.iailab.module.ansteel.api.service.DataService;
import com.iailab.module.ansteel.common.constant.CommonConstant;
import com.iailab.module.data.api.plan.PlanItemApi;
@@ -138,6 +139,11 @@
}
@Override
+ public Boolean ignoreSuggest(StAlarmAndSuggestReqVO ReqVO) {
+ return mcsApi.ignoreSuggest(ReqVO);
+ }
+
+ @Override
public PreDataChartRespVO getPreDataChart(PreDataSingleChartReqVO reqVO) {
Map<String, String> tMap = new HashMap<>();
List<ChartParamDTO> list = mcsApi.getChartParamList(reqVO.getChartCode());
--
Gitblit v1.9.3