Jay
2025-01-22 af9c8a0bbafc62673b1b44e683479e09310451d8
新增参数
已修改6个文件
32 ■■■■ 文件已修改
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/db/mysql.sql 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/ElectricityPriceSegmentedService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ElectricityPriceSegmentedServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 = "添加电价时段配置列表")
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='电价时段配置数据';
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
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);
    }
}
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);
}
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