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

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

Browse Source 
# Conflicts:
#	ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java
#	ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml
This commit is contained in:
dashixiong
2025-06-29 14:04:55 +08:00
parent 747ce8a08d d2824b6087
commit aed3f830f5
6 changed files with 54 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java
View File

@ -2,11 +2,15 @@ package com.xzzn.web.controller.ems;
import com.xzzn.common.core.controller.BaseController;
import com.xzzn.common.core.domain.AjaxResult;
import com.xzzn.common.core.page.TableDataInfo;
import com.xzzn.ems.domain.vo.BatteryDataStatsListVo;
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.*;
import java.util.List;
/**
*
* 单站监控
@ -106,9 +110,11 @@ public class EmsSiteMonitorController extends BaseController{
* 获取电池簇下面的单体电池数据
*/
@GetMapping("/getClusterDataInfoList")
public AjaxResult getClusterDataInfoList(@RequestParam String clusterDeviceId)
public TableDataInfo getClusterDataInfoList(@RequestParam String clusterDeviceId)
{
return success(iSingleSiteService.getClusterDataInfoList(clusterDeviceId));
startPage();
List<BatteryDataStatsListVo> list = iSingleSiteService.getClusterDataInfoList(clusterDeviceId);
return getDataTable(list);
}
/**