From bd41a1f5a197ef5d1c9d65c0ba9b4e4df667cb49 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 15 四月 2025 17:41:53 +0800
Subject: [PATCH] 电网拓扑预警信息接口
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 58 ++++++++++++++++-------------
doc/鞍钢数据接口文档_dev_li.doc | 0
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/PowerNetFactorServiceImpl.java | 12 ------
doc/鞍钢数据接口文档_master.doc | 0
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/PowerNetFactorService.java | 2 -
5 files changed, 32 insertions(+), 40 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
index e3aeb13..8260a43 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
@@ -91,41 +91,47 @@
@GetMapping("/net-factor/alarm")
@Operation(summary = "功率因数-电网拓扑预警信息")
- public CommonResult<String> getPowerNetFactorAlarm(@RequestParam Map<String, Object> params) {
- String result = "";
- PowerNetFactorDTO dto = powerNetFactorService.selectById(params);
- if (Objects.isNull(dto)) {
+ public CommonResult<List<String>> getPowerNetFactorAlarm(@RequestParam Map<String, Object> params) {
+ List<String> result = new ArrayList<>();
+ List<PowerNetFactorEntity> list = powerNetFactorService.list(params);
+ List<PowerNetFactorDTO> dtoList = ConvertUtils.sourceToTarget(list, PowerNetFactorDTO.class);
+ if (CollectionUtils.isEmpty(dtoList)) {
return success(result);
}
- List<String> points = new ArrayList<>();
- if (StringUtils.isNotBlank(dto.getCurQ())) {
- points.add(dto.getCurQ());
- }
- if (CollectionUtils.isEmpty(points)) {
- return success(result);
- }
- Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
- if (pointsRealValue.get(dto.getCurQ()) == null) {
- return success(result);
- }
- BigDecimal curQ = new BigDecimal(pointsRealValue.get(dto.getCurQ()).toString());
- if (dto.getCurFlag().compareTo(BigDecimal.ZERO) > 0) {
- if (curQ.compareTo(BigDecimal.ZERO) > 0) {
- result = dto.getNodeName() + "发生无功返送;";
+ for (PowerNetFactorDTO dto : dtoList) {
+ String message = "";
+ List<String> points = new ArrayList<>();
+ if (StringUtils.isNotBlank(dto.getCurQ())) {
+ points.add(dto.getCurQ());
}
- } else {
- if (curQ.compareTo(BigDecimal.ZERO) < 0) {
- result = dto.getNodeName() + "发生无功返送;";
+ if (CollectionUtils.isEmpty(points)) {
+ return success(result);
}
- }
- if (dto.getStatus() > 0) {
+ Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
+ if (pointsRealValue.get(dto.getCurQ()) == null) {
+ return success(result);
+ }
+ BigDecimal curQ = new BigDecimal(pointsRealValue.get(dto.getCurQ()).toString());
+ if (dto.getCurFlag().compareTo(BigDecimal.ZERO) > 0) {
+ if (curQ.compareTo(BigDecimal.ZERO) > 0) {
+ message = dto.getNodeName() + "发生无功返送;";
+ }
+ } else {
+ if (curQ.compareTo(BigDecimal.ZERO) < 0) {
+ message = dto.getNodeName() + "发生无功返送;";
+ }
+ }
BigDecimal curCos = new BigDecimal(dto.getCurCos());
if (curCos.compareTo(dto.getLimitH()) > 0) {
- result += dto.getNodeName() + "功率因数超上限";
+ message += dto.getNodeName() + "功率因数超上限";
}else if (curCos.compareTo(dto.getLimitL()) < 0) {
- result += dto.getNodeName() + "功率因数超下限";
+ message += dto.getNodeName() + "功率因数超下限";
+ }
+ if(!"".equals(message)) {
+ result.add(message);
}
}
+
return success(result);
}
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/PowerNetFactorService.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/PowerNetFactorService.java
index a8b25cd..52f88ef 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/PowerNetFactorService.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/PowerNetFactorService.java
@@ -1,6 +1,5 @@
package com.iailab.module.ansteel.api.service;
-import com.iailab.module.ansteel.api.dto.PowerNetFactorDTO;
import com.iailab.module.ansteel.api.entity.PowerNetFactorEntity;
import java.util.List;
@@ -15,5 +14,4 @@
List<PowerNetFactorEntity> list(Map<String, Object> params);
- PowerNetFactorDTO selectById(Map<String, Object> params);
}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/PowerNetFactorServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/PowerNetFactorServiceImpl.java
index d61e6af..9a7d777 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/PowerNetFactorServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/PowerNetFactorServiceImpl.java
@@ -1,19 +1,15 @@
package com.iailab.module.ansteel.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.ansteel.api.dao.PowerNetFactorDao;
-import com.iailab.module.ansteel.api.dto.PowerNetFactorDTO;
import com.iailab.module.ansteel.api.entity.PowerNetFactorEntity;
import com.iailab.module.ansteel.api.service.PowerNetFactorService;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
/**
* @author PanZhibao
@@ -35,12 +31,4 @@
}
- @Override
- public PowerNetFactorDTO selectById(Map<String, Object> params) {
- String id = (String) params.get("id");
- if(!StringUtils.isNotBlank(id)) {
- return null;
- }
- return ConvertUtils.sourceToTarget(powerNetFactorDao.selectById(id),PowerNetFactorDTO.class);
- }
}
\ No newline at end of file
diff --git "a/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_dev_li.doc" "b/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_dev_li.doc"
index 96b052d..81cada8 100644
--- "a/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_dev_li.doc"
+++ "b/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_dev_li.doc"
Binary files differ
diff --git "a/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_master.doc" "b/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_master.doc"
index 63ba765..b2b9987 100644
--- "a/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_master.doc"
+++ "b/doc/\351\236\215\351\222\242\346\225\260\346\215\256\346\216\245\345\217\243\346\226\207\346\241\243_master.doc"
Binary files differ
--
Gitblit v1.9.3