Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
2025-06-27 12:50:58 +08:00
9 changed files with 254 additions and 4 deletions

View File

@ -2,6 +2,7 @@ package com.xzzn.web.controller.ems;
import com.xzzn.common.core.controller.BaseController;
import com.xzzn.common.core.domain.AjaxResult;
import com.xzzn.ems.service.IEmsSiteService;
import com.xzzn.ems.service.ISingleSiteService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -17,6 +18,8 @@ public class EmsSiteMonitorController extends BaseController{
@Autowired
private ISingleSiteService iSingleSiteService;
@Autowired
private IEmsSiteService iEmsSiteService;
/**
* 获取单站首页数据
@ -78,16 +81,16 @@ public class EmsSiteMonitorController extends BaseController{
@GetMapping("/getStackNameList")
public AjaxResult getStackNameList(@RequestParam Long siteId)
{
return success(iSingleSiteService.getBMSBatteryCluster(siteId));
return success(iEmsSiteService.getAllStackInfo(siteId));
}
/**
* 获取所有电池簇
*/
@GetMapping("/getClusterNameList")
public AjaxResult getClusterNameList(@RequestParam Long siteId)
public AjaxResult getClusterNameList(@RequestParam Long stackDeviceId)
{
return success(iSingleSiteService.getBMSBatteryCluster(siteId));
return success(iEmsSiteService.getAllClusterInfo(stackDeviceId));
}
/**
@ -98,4 +101,13 @@ public class EmsSiteMonitorController extends BaseController{
{
return success(iSingleSiteService.getCoolingDataList(siteId));
}
/**
* 获取电池簇下面的单体电池数据
*/
@GetMapping("/getClusterDataInfoList")
public AjaxResult getClusterDataInfoList(@RequestParam Long clusterDeviceId)
{
return success(iEmsSiteService.getClusterDataInfoList(clusterDeviceId));
}
}