From 1eec62d9733679f74ffff56803931185aa8fa5ba Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期四, 23 一月 2025 14:10:23 +0800
Subject: [PATCH] 新增参数
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java | 4 +++-
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 ++--
5 files changed, 9 insertions(+), 7 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 108b0b1..d694f7a 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(@RequestParam("year") String year);
+ List<ElectricityPriceSegmentedDTO> getElectricityPriceList(@RequestParam("year") String year, @RequestParam("time") String time);
@PostMapping(PREFIX + "/electricityPrice/create")
@Operation(summary = "添加电价时段配置列表")
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 b862c7c..02601f8 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(String year) {
- return electricityPriceSegmentedService.getElectricityPriceList(year);
+ public List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year, String time) {
+ return electricityPriceSegmentedService.getElectricityPriceList(year, time);
}
@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 6a0ee08..b8be6bc 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(@RequestParam String year) {
- List<ElectricityPriceSegmentedDTO> electricityPriceSegmentedList = mcsApi.getElectricityPriceList(year);
+ public CommonResult<List<ElectricityPriceSegmentedDTO>> getElectricityPriceList(@RequestParam("year") String year, @RequestParam("time") String time) {
+ List<ElectricityPriceSegmentedDTO> electricityPriceSegmentedList = mcsApi.getElectricityPriceList(year, time);
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 2efb6ce..82591e1 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
@@ -27,7 +27,7 @@
void deleteByITimeId(String iTimeId);
- List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year);
+ List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year, String time);
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 d4fac7b..7949549 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
@@ -70,7 +70,7 @@
}
@Override
- public List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year) {
+ public List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year, String time) {
List<ElectricityPriceSegmentedDTO> result = new ArrayList<>();
QueryWrapper<ElectricityPriceSegmentedEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(year), "year", year)
@@ -80,6 +80,8 @@
String itimeId = list.get(0).getITimeId();
QueryWrapper<ElectricityPriceSegmentedEntity> wrapper1 = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(itimeId), "i_time_id", itimeId)
+ .ge(StringUtils.isNotBlank(time),"start_time", time)
+ .lt(StringUtils.isNotBlank(time),"end_time", time)
.orderByDesc( "create_time");
result = ConvertUtils.sourceToTarget(baseDao.selectList(wrapper1), ElectricityPriceSegmentedDTO.class);
}
--
Gitblit v1.9.3