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 +14638 -893
169 changed files with 14638 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7dc664446e - Show all commits

11
ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
View File

@ -42,7 +42,7 @@ public class EmsSiteConfigController extends BaseController{
} }
/** /**
* 获取设备列表 * 获取设备列表-分页
*/ */
@GetMapping("/getDeviceInfoList") @GetMapping("/getDeviceInfoList")
public TableDataInfo getDeviceInfoList(@RequestParam String siteId) public TableDataInfo getDeviceInfoList(@RequestParam String siteId)
@ -60,4 +60,13 @@ public class EmsSiteConfigController extends BaseController{
{ {
return success(iEmsDeviceSettingService.getDeviceDetailInfo(deviceId)); return success(iEmsDeviceSettingService.getDeviceDetailInfo(deviceId));
} }
/**
* 获取设备列表-不分页
*/
@GetMapping("/getDeviceList")
public AjaxResult getDeviceInfoList2(@RequestParam String siteId)
{
return success(iEmsSiteService.getAllDeviceList(siteId));
}
} }