broadcast data sync

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/controller/DmDigitalmanController.java

@@ -393,7 +393,7 @@ public class DmDigitalmanController extends BaseController<DmDigitalmanQuery, Dm
     @Master
     public R<JSONObject> mansInfo() {
 
-        List<DmManDeviceDto> dtos = dmManDeviceService.selectListScope(new DmManDeviceQuery());
+        List<DmManDeviceDto> dtos = dmManDeviceService.selectList(new DmManDeviceQuery());
         List<DmManDeviceDto> dtos2 = dtos.stream().filter(dto -> StringUtils.isNotEmpty(dto.getDeviceId())).collect(Collectors.toList());;
         System.err.println(dtos2.size());
         Long serviceTimeCount = 0L;
@@ -402,9 +402,16 @@ public class DmDigitalmanController extends BaseController<DmDigitalmanQuery, Dm
             serviceTimeCount += (System.currentTimeMillis() - dto.getActivateTime().getTime())/3600000;
         }
 
+        Integer meetingServiceCount = (Integer) redisTemplate.opsForValue().get("dashboard:meeting");
+        Integer serverTimes = (Integer) redisTemplate.opsForValue().get("dashboard:server");
+        log.info("meetingServiceCount:{}",meetingServiceCount);
+        log.info("serverTimes:{}",serverTimes);
+
         JSONObject json = new JSONObject();
         json.put("manCount",dtos2.size());
         json.put("serviceTimeCount",serviceTimeCount);
+        json.put("servicePerCount",serverTimes);
+        json.put("meetingServiceCount",meetingServiceCount);
         System.err.println(json.toJSONString());
         return R.ok(json);
     }