From 77b06515edaa46cbbb0e55fe5f37db09aa8991fd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 22 四月 2025 16:06:40 +0800
Subject: [PATCH] 调整后的功率因数与无功倒送量
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 13 +++++++++----
ansteel-biz/db/mysql.sql | 4 +++-
ansteel-biz/src/main/java/com/iailab/module/ansteel/power/entity/PowerAdjustedFactorEntity.java | 10 ++++++++++
doc/鞍钢数据接口文档_master.doc | 0
4 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/ansteel-biz/db/mysql.sql b/ansteel-biz/db/mysql.sql
index a879041..8176a16 100644
--- a/ansteel-biz/db/mysql.sql
+++ b/ansteel-biz/db/mysql.sql
@@ -628,8 +628,10 @@
-- ----------------------------
CREATE TABLE `t_power_adjusted_factor` (
`id` varchar(36) NOT NULL,
+ `code` varchar(50) DEFAULT NULL COMMENT '编码',
`name` varchar(50) DEFAULT NULL COMMENT '名称',
- `pointNo` varchar(50) DEFAULT NULL COMMENT '点位',
+ `data_type` varchar(20) NULL DEFAULT NULL COMMENT '数据类型',
+ `point_no` varchar(50) DEFAULT NULL COMMENT '点位',
`sort` varchar(50) DEFAULT NULL COMMENT '排序',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='调整后的功率因数与无功倒送量';
\ No newline at end of file
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 39346d6..4c97a10 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
@@ -464,7 +464,7 @@
}
@GetMapping("/adjust-factor")
- @Operation(summary = "负荷移植-调整后的功率因数与无功倒送量")
+ @Operation(summary = "功率因数-调整后的功率因数与无功倒送量")
public CommonResult<Map<String, Double>> getPowerAdjustFactor(@RequestParam Map<String, Object> params) {
List<PowerAdjustedFactorEntity> list = powerAdjustedFactorService.list(params);
List<PowerAdjustedFactorDTO> dtoList = ConvertUtils.sourceToTarget(list, PowerAdjustedFactorDTO.class);
@@ -475,11 +475,16 @@
List<String> points = new ArrayList<>();
Map<String, Object> dataMap = new HashMap<>();
for (PowerAdjustedFactorDTO dto : dtoList) {
- points.add(dto.getPointNo());
+ if (StringUtils.isNotBlank(dto.getPointNo())) {
+ points.add(dto.getPointNo());
+ }
}
- dataMap = dataPointApi.queryPointsRealValue(points);
+ if (!CollectionUtils.isEmpty(points)) {
+ dataMap = dataPointApi.queryPointsRealValue(points);
+ }
for (PowerAdjustedFactorDTO powerAdjustedFactorDTO : dtoList) {
- result.put(powerAdjustedFactorDTO.getName(), Double.parseDouble(dataMap.get(powerAdjustedFactorDTO.getPointNo()).toString()));
+ Double value = dataMap.get(powerAdjustedFactorDTO.getPointNo()) == null ? 0 : Double.parseDouble(dataMap.get(powerAdjustedFactorDTO.getPointNo()).toString());
+ result.put(powerAdjustedFactorDTO.getName(), value);
}
return success(result);
}
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/entity/PowerAdjustedFactorEntity.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/entity/PowerAdjustedFactorEntity.java
index c720578..2295b3d 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/entity/PowerAdjustedFactorEntity.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/entity/PowerAdjustedFactorEntity.java
@@ -24,9 +24,19 @@
@TableId
private String id;
/**
+ * 编码
+ */
+ private String code;
+ /**
* 名称
*/
private String name;
+
+ /**
+ * 数据类型
+ */
+ private String dataType;
+
/**
*
* 点位
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 7c5211f..b5ab017 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