fix sysfile merge

xueyi-common/xueyi-common-redis/src/main/java/com/xueyi/common/redis/utils/RedisUtil.java

@@ -40,6 +40,10 @@ public class RedisUtil {
         return redisTemplate.opsForList().range(key, 0, -1).stream().map(json-> JSONObject.parseObject(json.toString())).collect(Collectors.toList());
     }
 
+    public static List<Serializable> getList(String key) {
+        return redisTemplate.opsForList().range(key, 0, -1);
+    }
+
     public static List<String> getBytesList(String key) {
         List<Serializable> sers = redisTemplate.opsForList().range(key, 0, -1);
         return sers.stream().map(ser-> (String) ser).collect(Collectors.toList());

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

@@ -429,6 +429,13 @@ public class DmDigitalmanController extends BaseController<DmDigitalmanQuery, Dm
             //取值后清除缓存list，5秒后过期
             RedisUtil.expire("dashboard:skill-consume", 5);
         }
+        Long onlineCount = 0L;
+        if (RedisUtil.existed("group:dgman:device")) {
+            List<DmManDeviceDto> devs =
+                    RedisUtil.getList("group:dgman:device").stream().map(d->(DmManDeviceDto)d).collect(Collectors.toList());
+            onlineCount = devs.stream().filter(d->d.getOnlineStatus().equalsIgnoreCase("1")).count();
+        }
+
         JSONArray jsonArray = new JSONArray();
 //        最近三十天的数据，服务人次，知识库增量
         for (int i = 0; i < 30; i++) {
@@ -443,6 +450,7 @@ public class DmDigitalmanController extends BaseController<DmDigitalmanQuery, Dm
 
         JSONObject json = new JSONObject();
         json.put("manCount",dtos2.size());//数字人数
+        json.put("manOnlineCount",onlineCount);//数字人数
         json.put("recognizedPersonCount", recognition);//注册人员总数
         json.put("serviceTimeCount",serviceTimeCount);//总服务时间
         json.put("chatTimes",conversationTimes);//对话次数

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/resource/controller/DmResourcesController.java

@@ -212,6 +212,9 @@ public class DmResourcesController extends BaseController<DmResourcesQuery, DmRe
     }
 
 
+
+
+
     @GetMapping("/uploadCallback")
     @Log(title = "资源管理 - 上传资源回调", businessType = BusinessType.UPDATE)
     public AjaxResult pdfUploadCallback(@RequestParam("uploadUuid") String uploadUuid) {