1

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -183,6 +183,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         return R.ok(list);
     }
 
+
     @PostMapping("eventList")
     @ApiOperation("根据事件编码查询设备")
     public R<PageBean<DeviceInfoDto.EventListVo>> eventList(@RequestBody @Validated DeviceInfoDto.EventList eventList) {
@@ -911,7 +912,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         if (CollUtil.isEmpty(mercDevices)) {
             return R.ok(mercHomeStatisticalVO);
         }
-     
+
 
         //在线、离线
         List<DeviceStatus> deviceStatuses = deviceStatusService.listByIds(myDeviceIds);

device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -68,6 +68,14 @@ public class DeviceInfoDto {
         private String regionName;
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class GroupByAdmin {
+        @ApiModelProperty(value = "商户ID", required = true)
+        private Long mercId;
+    }
+
+
     @Data
     @Accessors(chain = true)
     public static class GroupByAdminNameDto {
@@ -101,12 +109,17 @@ public class DeviceInfoDto {
         @ApiModelProperty("设备ID")
         private Long deviceId;
 
+
         @ApiModelProperty("设备名称")
         private String deviceName;
 
         @ApiModelProperty("管理员姓名")
         private String adminName;
 
+
+        @ApiModelProperty("管理员ID")
+        private String adminId;
+
         @ApiModelProperty("设备类型")
         private Integer deviceType;
 
@@ -126,6 +139,7 @@ public class DeviceInfoDto {
         private String mercCode;
     }
 
+
     @Data
     @Accessors(chain = true)
     public static class TyDeviceDTO {