From 766effa6e04db9b37b1dc3886d988beaa595c38d Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 12 十二月 2023 09:04:55 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/controller/FaceServer.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/controller/FaceServer.java b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/controller/FaceServer.java
index 1729fca..a2eda24 100644
--- a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/controller/FaceServer.java
+++ b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/controller/FaceServer.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.thhy.general.config.GlobalConfig;
import com.thhy.general.utils.SpringContextUtils;
+import com.thhy.staff.modules.biz.platuser.entity.AreaAdmin;
import com.thhy.staff.modules.biz.platuser.service.PlatUserService;
import org.redisson.api.RBucket;
import org.redisson.api.RedissonClient;
@@ -68,8 +69,28 @@
dataMapList.add(map);
Map<String,Object> map1 = userService.groupUserWork(userToken);
Map<String,Object> map2 = userService.faceRecord(userToken);
+
+
+ List<HashMap<String,Object>> AudioGroupList = userService.queryGroups();
+ Map<String, Object> map3 = new HashMap<>();
+ map3.put("mod","audioGroup");
+ map3.put("groupList",AudioGroupList);
+
+
+ List<HashMap<String,Object>> HelmetWarnList = userService.queryHelmetWarn();
+ Map<String, Object> map4 = new HashMap<>();
+ map4.put("mod","helmetWarn");
+ map4.put("helmetWarnList",HelmetWarnList);
+
+ List<AreaAdmin> areaAdminList = userService.areaAdminInfo();
+ Map<String, Object> map5 = new HashMap<>();
+ map5.put("mod","areaAdmin");
+ map5.put("areaAdminList",areaAdminList);
dataMapList.add(map1);
dataMapList.add(map2);
+ dataMapList.add(map3);
+ dataMapList.add(map4);
+ dataMapList.add(map5);
try {
session.getBasicRemote().sendText(JSON.toJSONString(dataMapList));
} catch (IOException e) {
--
Gitblit v1.9.3