From af9c8a0bbafc62673b1b44e683479e09310451d8 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期三, 22 一月 2025 17:12:18 +0800
Subject: [PATCH] 新增参数
---
iailab-module-model/iailab-module-model-biz/db/mysql.sql | 14 ++++++++++++++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java | 6 ++++--
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/ElectricityPriceSegmentedService.java | 2 +-
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java | 2 +-
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java | 4 ++--
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 4 ++--
6 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
index fe87a4f..b98dd72 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
@@ -117,7 +117,7 @@
@GetMapping(PREFIX + "/electricityPrice/list")
@Operation(summary = "电价时段配置列表")
- List<ElectricityPriceSegmentedDTO> getElectricityPriceList();
+ List<ElectricityPriceSegmentedDTO> getElectricityPriceList(@RequestParam String year);
@PostMapping(PREFIX + "/electricityPrice/create")
@Operation(summary = "添加电价时段配置列表")
diff --git a/iailab-module-model/iailab-module-model-biz/db/mysql.sql b/iailab-module-model/iailab-module-model-biz/db/mysql.sql
index 6e42fba..2d456f7 100644
--- a/iailab-module-model/iailab-module-model-biz/db/mysql.sql
+++ b/iailab-module-model/iailab-module-model-biz/db/mysql.sql
@@ -880,3 +880,17 @@
alter table t_mm_predict_alarm_config add column `cul_lower` decimal(10, 4) COMMENT '累计值下限';
alter table t_st_schedule_scheme modify column `trigger_condition` varchar(50) COMMENT '触发条件'
+
+
+CREATE TABLE `t_electricity_price_segmented` (
+ `id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'ID',
+ `i_time_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
+ `rec_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
+ `media_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '能介编号',
+ `ref_media_id` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
+ `start_time` timestamp NULL DEFAULT NULL COMMENT '开始时间',
+ `end_time` timestamp NULL DEFAULT NULL COMMENT '结束时间',
+ `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
+ `update_time` timestamp NULL DEFAULT NULL COMMENT '修改时间',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC COMMENT='电价时段配置数据';
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index 3bf35a3..4f8e690 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -733,8 +733,8 @@
}
@Override
- public List<ElectricityPriceSegmentedDTO> getElectricityPriceList() {
- return electricityPriceSegmentedService.getElectricityPriceList();
+ public List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year) {
+ return electricityPriceSegmentedService.getElectricityPriceList(year);
}
@Override
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
index d89675e..6a0ee08 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
@@ -218,8 +218,8 @@
@GetMapping("/electricityPrice/list")
@Operation(summary = "电价表")
- public CommonResult<List<ElectricityPriceSegmentedDTO>> getElectricityPriceList() {
- List<ElectricityPriceSegmentedDTO> electricityPriceSegmentedList = mcsApi.getElectricityPriceList();
+ public CommonResult<List<ElectricityPriceSegmentedDTO>> getElectricityPriceList(@RequestParam String year) {
+ List<ElectricityPriceSegmentedDTO> electricityPriceSegmentedList = mcsApi.getElectricityPriceList(year);
return CommonResult.success(electricityPriceSegmentedList);
}
}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/ElectricityPriceSegmentedService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/ElectricityPriceSegmentedService.java
index 2a72085..beb8dd5 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/ElectricityPriceSegmentedService.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/ElectricityPriceSegmentedService.java
@@ -25,7 +25,7 @@
void delete(String id);
- List<ElectricityPriceSegmentedDTO> getElectricityPriceList();
+ List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year);
List<ElectricityPriceSegmentedDTO> getElectricityPriceListByTime(ElectricityPriceSegmentedDTO dto);
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java
index 8fafe8c..a78ff63 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java
@@ -66,8 +66,10 @@
}
@Override
- public List<ElectricityPriceSegmentedDTO> getElectricityPriceList() {
- return ConvertUtils.sourceToTarget(baseDao.selectList(new QueryWrapper<>()), ElectricityPriceSegmentedDTO.class);
+ public List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year) {
+ QueryWrapper<ElectricityPriceSegmentedEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(year), "year", year);
+ return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), ElectricityPriceSegmentedDTO.class);
}
@Override
--
Gitblit v1.9.3