From f50a78dd25bfca670219b93c19251a121755fb64 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 22 四月 2025 09:00:05 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/PowerAdjustedFactorService.java | 17 +++++
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 24 ++++++++
ansteel-biz/db/mysql.sql | 12 +++
ansteel-biz/src/main/java/com/iailab/module/ansteel/power/entity/PowerAdjustedFactorEntity.java | 39 +++++++++++++
ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/impl/PowerAdjustedFactorServiceImpl.java | 33 +++++++++++
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerAdjustedFactorDTO.java | 28 +++++++++
ansteel-biz/src/main/java/com/iailab/module/ansteel/power/dao/PowerAdjustedFactorDao.java | 14 ++++
7 files changed, 166 insertions(+), 1 deletions(-)
diff --git a/ansteel-biz/db/mysql.sql b/ansteel-biz/db/mysql.sql
index 3f279dd..acc9237 100644
--- a/ansteel-biz/db/mysql.sql
+++ b/ansteel-biz/db/mysql.sql
@@ -619,4 +619,14 @@
`active_power` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci 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
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='月最大需量，实测需量，有功功率';
+-- ----------------------------
+-- 负荷移植-调整后的功率因数与无功倒送量
+-- ----------------------------
+CREATE TABLE `t_power_adjusted_factor` (
+ `id` varchar(36) NOT NULL,
+ `name` varchar(50) DEFAULT NULL COMMENT '名称',
+ `pointNo` 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 5469334..509298f 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
@@ -60,6 +60,9 @@
@Autowired
private PowerDemandService powerDemandService;
+ @Autowired
+ private PowerAdjustedFactorService powerAdjustedFactorService;
+
@Resource
private DataPointApi dataPointApi;
@@ -465,4 +468,25 @@
}
return result;
}
+
+ @GetMapping("/adjust-factor")
+ @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);
+ Map<String, Double> result = new HashMap<>();
+ if (CollectionUtils.isEmpty(list)) {
+ return success(result);
+ }
+ List<String> points = new ArrayList<>();
+ Map<String, Object> dataMap = new HashMap<>();
+ for (PowerAdjustedFactorDTO dto : dtoList) {
+ points.add(dto.getPointNo());
+ }
+ dataMap = dataPointApi.queryPointsRealValue(points);
+ for (PowerAdjustedFactorDTO powerAdjustedFactorDTO : dtoList) {
+ result.put(powerAdjustedFactorDTO.getName(), Double.parseDouble(dataMap.get(powerAdjustedFactorDTO.getPointNo()).toString()));
+ }
+ return success(result);
+ }
}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerAdjustedFactorDTO.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerAdjustedFactorDTO.java
new file mode 100644
index 0000000..5d318d9
--- /dev/null
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerAdjustedFactorDTO.java
@@ -0,0 +1,28 @@
+package com.iailab.module.ansteel.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author dyk
+ * @date 2025年04月18日
+ */
+@Data
+public class PowerAdjustedFactorDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Schema(description = "id")
+ private String id;
+
+ @Schema(description = "名称")
+ private String name;
+
+ @Schema(description = "点位")
+ private String pointNo;
+
+ @Schema(description = "排序")
+ private Integer sort;
+}
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/dao/PowerAdjustedFactorDao.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/dao/PowerAdjustedFactorDao.java
new file mode 100644
index 0000000..9cb3473
--- /dev/null
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/dao/PowerAdjustedFactorDao.java
@@ -0,0 +1,14 @@
+package com.iailab.module.ansteel.power.dao;
+
+import com.iailab.framework.common.dao.BaseDao;
+import com.iailab.module.ansteel.power.entity.PowerAdjustedFactorEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dyk
+ * @Description
+ * @createTime 2025年04月21日
+ */
+@Mapper
+public interface PowerAdjustedFactorDao extends BaseDao<PowerAdjustedFactorEntity> {
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..c720578
--- /dev/null
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/entity/PowerAdjustedFactorEntity.java
@@ -0,0 +1,39 @@
+package com.iailab.module.ansteel.power.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 负荷移植-调整后的功率因数与无功倒送量
+ *
+ * @author dyk
+ * @Description
+ * @createTime 2025年04月18日
+ */
+@Data
+@TableName("t_power_adjusted_factor")
+public class PowerAdjustedFactorEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ @TableId
+ private String id;
+ /**
+ * 名称
+ */
+ private String name;
+ /**
+ *
+ * 点位
+ */
+ private String pointNo;
+ /**
+ * 排序
+ */
+ private Integer sort;
+}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/PowerAdjustedFactorService.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/PowerAdjustedFactorService.java
new file mode 100644
index 0000000..8ce2db6
--- /dev/null
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/PowerAdjustedFactorService.java
@@ -0,0 +1,17 @@
+package com.iailab.module.ansteel.power.service;
+
+import com.iailab.module.ansteel.power.entity.PowerAdjustedFactorEntity;
+import com.iailab.module.ansteel.power.entity.PowerDemandEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dyk
+ * @Description
+ * @createTime 2025年04月21日
+ */
+public interface PowerAdjustedFactorService {
+
+ List<PowerAdjustedFactorEntity> list(Map<String, Object> params);
+}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/impl/PowerAdjustedFactorServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/impl/PowerAdjustedFactorServiceImpl.java
new file mode 100644
index 0000000..ddaa1a8
--- /dev/null
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/impl/PowerAdjustedFactorServiceImpl.java
@@ -0,0 +1,33 @@
+package com.iailab.module.ansteel.power.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.iailab.module.ansteel.power.entity.PowerAdjustedFactorEntity;
+import com.iailab.module.ansteel.power.dao.PowerAdjustedFactorDao;
+import com.iailab.module.ansteel.power.service.PowerAdjustedFactorService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dyk
+ * @Description
+ * @createTime 2025年04月18日
+ */
+@Slf4j
+@Service
+public class PowerAdjustedFactorServiceImpl implements PowerAdjustedFactorService {
+
+ @Resource
+ private PowerAdjustedFactorDao PowerAdjustedFactorDao;
+
+ @Override
+ public List<PowerAdjustedFactorEntity> list(Map<String, Object> params) {
+ QueryWrapper<PowerAdjustedFactorEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.orderByAsc("sort");
+ return PowerAdjustedFactorDao.selectList(queryWrapper);
+
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3