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 +52685 -1113
354 changed files with 52685 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 40e23df66a - Show all commits

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

@ -55,7 +55,7 @@ public class EmsSiteConfigController extends BaseController{
*/ */
@GetMapping("/getDeviceInfoList") @GetMapping("/getDeviceInfoList")
public TableDataInfo getDeviceInfoList(@RequestParam String siteId, public TableDataInfo getDeviceInfoList(@RequestParam String siteId,
@RequestParam String deviceCategory) @RequestParam(value = "deviceCategory", required = false) String deviceCategory)
{ {
startPage(); startPage();
List<SiteDeviceListVo> list = iEmsSiteService.getAllDeviceList(siteId, deviceCategory); List<SiteDeviceListVo> list = iEmsSiteService.getAllDeviceList(siteId, deviceCategory);