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

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +19913 -946
196 changed files with 19913 additions and 946 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 97c667bd77 - Show all commits

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

@ -123,9 +123,9 @@ public class EmsSiteMonitorController extends BaseController{
* 获取所有电池簇 * 获取所有电池簇
*/ */
@GetMapping("/getClusterNameList") @GetMapping("/getClusterNameList")
public AjaxResult getClusterNameList(@RequestParam String stackDeviceId) public AjaxResult getClusterNameList(@RequestParam String siteId, @RequestParam String stackDeviceId)
{ {
return success(iEmsSiteService.getAllClusterInfo(stackDeviceId)); return success(iEmsSiteService.getAllClusterInfo(siteId, stackDeviceId));
} }
/** /**

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

@ -21,7 +21,7 @@ public interface IEmsSiteService
public List<Map<String,Object>> getAllStackInfo(String siteId); public List<Map<String,Object>> getAllStackInfo(String siteId);
public List<Map<String,Object>> getAllClusterInfo(String stackDeviceId); public List<Map<String,Object>> getAllClusterInfo(String siteId, String stackDeviceId);
public List<EmsSiteSetting> getAllSiteInfoList(String siteName, String startTime, String endTime); public List<EmsSiteSetting> getAllSiteInfoList(String siteName, String startTime, String endTime);

4
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java
View File

@ -52,8 +52,8 @@ public class EmsSiteServiceImpl implements IEmsSiteService
* @return * @return
*/ */
@Override @Override
public List<Map<String, Object>> getAllClusterInfo(String parentId) { public List<Map<String, Object>> getAllClusterInfo(String siteId, String parentId) {
return emsDevicesMapper.getDeviceInfoByParentId(null,parentId); return emsDevicesMapper.getDeviceInfoByParentId(siteId,parentId);
} }
/** /**