Jay
2025-01-23 e63c532ea03fd05855a21744a559b25b0363453d
修改查询和新增电价时段表的逻辑
已修改4个文件
45 ■■■■■ 文件已修改
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | 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 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
@@ -117,10 +117,10 @@
    @GetMapping(PREFIX + "/electricityPrice/list")
    @Operation(summary = "电价时段配置列表")
    List<ElectricityPriceSegmentedDTO> getElectricityPriceList(@RequestParam String year);
    List<ElectricityPriceSegmentedDTO> getElectricityPriceList(@RequestParam("year") String year);
    @PostMapping(PREFIX + "/electricityPrice/create")
    @Operation(summary = "添加电价时段配置列表")
    Boolean createElectricityPrice(@RequestBody ElectricityPriceSegmentedDTO dto);
    Boolean createElectricityPrice(@RequestBody List<ElectricityPriceSegmentedDTO> list);
}
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -738,8 +738,9 @@
    }
    @Override
    public Boolean createElectricityPrice(ElectricityPriceSegmentedDTO dto) {
        electricityPriceSegmentedService.create(dto);
    public Boolean createElectricityPrice(List<ElectricityPriceSegmentedDTO> list) {
        electricityPriceSegmentedService.deleteByITimeId(list.get(0).getITimeId());
        list.forEach(dto -> electricityPriceSegmentedService.create(dto));
        return true;
    }
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/ElectricityPriceSegmentedService.java
@@ -25,6 +25,8 @@
    void delete(String id);
    void deleteByITimeId(String iTimeId);
    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
@@ -38,13 +38,10 @@
    @Override
    public void create(ElectricityPriceSegmentedDTO dto) {
        List<ElectricityPriceSegmentedDTO> list =  getElectricityPriceListByTime(dto);
        if (CollectionUtils.isEmpty(list)){
            ElectricityPriceSegmentedEntity entity = ConvertUtils.sourceToTarget(dto, ElectricityPriceSegmentedEntity.class);
            entity.setId(UUID.randomUUID().toString());
            entity.setCreateTime(new Date());
            baseDao.insert(entity);
        }
        ElectricityPriceSegmentedEntity entity = ConvertUtils.sourceToTarget(dto, ElectricityPriceSegmentedEntity.class);
        entity.setId(UUID.randomUUID().toString());
        entity.setCreateTime(new Date());
        baseDao.insert(entity);
    }
    @Override
@@ -66,10 +63,27 @@
    }
    @Override
    public List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year) {
    public void deleteByITimeId(String iTimeId) {
        QueryWrapper<ElectricityPriceSegmentedEntity> wrapper = new QueryWrapper<>();
        wrapper.eq(StringUtils.isNotBlank(year), "year", year);
        return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), ElectricityPriceSegmentedDTO.class);
        wrapper.eq(StringUtils.isNotBlank(iTimeId), "i_time_id", iTimeId);
        baseDao.delete(wrapper);
    }
    @Override
    public List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year) {
        List<ElectricityPriceSegmentedDTO> result = new ArrayList<>();
        QueryWrapper<ElectricityPriceSegmentedEntity> wrapper = new QueryWrapper<>();
        wrapper.eq(StringUtils.isNotBlank(year), "year", year)
                .orderByDesc( "create_time");
        List<ElectricityPriceSegmentedEntity> list = baseDao.selectList(wrapper);
        if(CollectionUtils.isNotEmpty(list)){
            String itimeId = list.get(0).getITimeId();
            QueryWrapper<ElectricityPriceSegmentedEntity> wrapper1 = new QueryWrapper<>();
            wrapper.eq(StringUtils.isNotBlank(itimeId), "i_time_id", itimeId)
                    .orderByDesc( "create_time");
            result = ConvertUtils.sourceToTarget(baseDao.selectList(wrapper1), ElectricityPriceSegmentedDTO.class);
        }
        return result;
    }
    @Override