From 7efc6ed86025b610cab109a2e9f83362740d8ed4 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 08 十二月 2023 13:29:07 +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/service/impl/PlatUserServiceImpl.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java
index 7be6cd9..f4210ea 100644
--- a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java
+++ b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java
@@ -25,6 +25,7 @@
import com.thhy.staff.utils.ProcessFlag;
import com.thhy.staff.utils.StaffNoUtils;
import io.netty.channel.ChannelHandlerContext;
+import net.bytebuddy.build.Plugin;
import org.checkerframework.checker.units.qual.A;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,6 +35,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.CopyOnWriteArraySet;
@@ -530,13 +532,19 @@
int userCount = platUserMapper.queryPlatUser(userInfo.getCompanyId());
Map<String, Object> map = new HashMap<>();
map.put("mod","facerecord");
- map.put("totalUserCount",userCount);
- map.put("watchUserCount",0);
- map.put("dangerUserCount",0);
+ //map.put("totalUserCount",userCount);
+ //map.put("watchUserCount",0);
+ //map.put("dangerUserCount",0);
+
+ List<String> faceAreas = platUserMapper.faceArea();
+ map.put("faceAreas",faceAreas);
+
List<DoorUserVo> list = platUserMapper.queryDoorUser();
map.put("doorUserList",list);
PlatUserFace platUserFace = platUserMapper.queryFaceUserByJobNum(list.get(0).getJobNum());
- platUserFace.setPassTime(list.get(0).getCreateTime());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ platUserFace.setPassTime(sdf.format(list.get(0).getCreateTime()));
+ platUserFace.setRecordId(list.get(0).getId());
map.put("firstUserInfo",platUserFace);
return map;
}
@@ -592,6 +600,26 @@
platUserMapper.insertDoorListener(doorLisPic);
}
+ @Override
+ public List<HashMap<String, Object>> queryGroups() {
+ return platUserMapper.queryGroups();
+ }
+
+ @Override
+ public List<HashMap<String, Object>> queryHelmetWarn() {
+ return platUserMapper.queryHelmetWarn();
+ }
+
+ @Override
+ public List<AreaAdmin> areaAdminInfo() {
+ List<AreaAdmin> areaAdminList = platUserMapper.queryAreaInfo();
+ for(AreaAdmin areaAdmin : areaAdminList){
+ List<NamePhoneDepart> namePhoneDepartList = platUserMapper.queryAdminByArea(areaAdmin.getAreaId());
+ areaAdmin.setNpdList(namePhoneDepartList);
+ }
+ return areaAdminList;
+ }
+
public static void main(String[] args) {
MqContent mqContent = new MqContent("sync_person", "notify");
String uu = "02d32ee86bec2b11e4b23eb6";
--
Gitblit v1.9.3