xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

电价配置-列表加时间范围-暂时只取年份

Browse Source
This commit is contained in:
mashili
2025-10-10 11:21:33 +08:00
parent d8d0a83c87
commit 636a2ab73b
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsEnergyPriceConfigController.java
View File

@ -5,14 +5,7 @@ import java.util.List;
import com.xzzn.ems.domain.vo.EnergyPriceVo; import com.xzzn.ems.domain.vo.EnergyPriceVo;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.xzzn.common.annotation.Log; import com.xzzn.common.annotation.Log;
import com.xzzn.common.core.controller.BaseController; import com.xzzn.common.core.controller.BaseController;
import com.xzzn.common.core.domain.AjaxResult; import com.xzzn.common.core.domain.AjaxResult;
@ -38,9 +31,9 @@ public class EmsEnergyPriceConfigController extends BaseController
*/ */
@PreAuthorize("@ss.hasPermi('system:config:list')") @PreAuthorize("@ss.hasPermi('system:config:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list() public TableDataInfo list(String startTime,String endTime)
{ {
List<EnergyPriceVo> list = emsEnergyPriceConfigService.selectEmsEnergyPriceConfigList(); List<EnergyPriceVo> list = emsEnergyPriceConfigService.selectEmsEnergyPriceConfigList(startTime,endTime);
return getDataTable2(list); return getDataTable2(list);
} }

2
ems-system/src/main/java/com/xzzn/ems/service/IEmsEnergyPriceConfigService.java
View File

@ -25,7 +25,7 @@ public interface IEmsEnergyPriceConfigService
* *
* @return 电价配置集合 * @return 电价配置集合
*/ */
public List<EnergyPriceVo> selectEmsEnergyPriceConfigList(); public List<EnergyPriceVo> selectEmsEnergyPriceConfigList(String startTime,String endTime);
/** /**
* 新增电价配置-按月 * 新增电价配置-按月

8
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsEnergyPriceConfigServiceImpl.java
View File

@ -61,12 +61,12 @@ public class EmsEnergyPriceConfigServiceImpl implements IEmsEnergyPriceConfigSer
* @return 电价配置 * @return 电价配置
*/ */
@Override @Override
public List<EnergyPriceVo> selectEmsEnergyPriceConfigList() public List<EnergyPriceVo> selectEmsEnergyPriceConfigList(String startTime,String endTime)
{ {
List<EnergyPriceVo> responses = new ArrayList<>(); List<EnergyPriceVo> responses = new ArrayList<>();
// 仅查询当年配置 // 根据时间截取年份
LocalDate currentDate = LocalDate.now(); String[] startTimeArr = startTime.split("-");
int currentYear = currentDate.getYear(); int currentYear = Integer.valueOf(startTimeArr[0]);
List<EmsEnergyPriceConfig> priceConfigs = emsEnergyPriceConfigMapper.getCurrentYearConfigList(currentYear); List<EmsEnergyPriceConfig> priceConfigs = emsEnergyPriceConfigMapper.getCurrentYearConfigList(currentYear);