hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/controller/ExecFaceListener.java
@@ -4,6 +4,7 @@ import com.thhy.general.common.BasicResult; 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.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; @@ -19,6 +20,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArraySet; @@ -70,8 +72,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) { hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/entity/AreaAdmin.java
对比新文件 @@ -0,0 +1,16 @@ package com.thhy.staff.modules.biz.platuser.entity; import lombok.Data; import java.io.Serializable; import java.util.List; @Data public class AreaAdmin implements Serializable { private String areaId; private String areaName; private List<NamePhoneDepart> npdList; } hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/entity/NamePhoneDepart.java
对比新文件 @@ -0,0 +1,19 @@ package com.thhy.staff.modules.biz.platuser.entity; import lombok.Data; import java.io.Serializable; @Data public class NamePhoneDepart implements Serializable { private String userId; private String realName; private String phone; private String photo; private String departName; } hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/mapper/PlatUserMapper.java
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Component; import java.io.Serializable; import java.util.HashMap; import java.util.List; /** @@ -119,4 +120,14 @@ int countByFaceId(String faceId); void insertSamplePlatUser(PlatUser platUser); List<HashMap<String,Object>> queryGroups(); List<HashMap<String,Object>> queryHelmetWarn(); List<AreaAdmin> queryAreaInfo(); List<NamePhoneDepart> queryAdminByArea(String regionWarrantyId); List<String> faceArea(); } hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/PlatUserService.java
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.Serializable; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -55,4 +56,10 @@ Map<String,Object> groupUserWork(String token); void doorlisWithPic(DoorLisPic doorLisPic); List<HashMap<String,Object>> queryGroups(); List<HashMap<String,Object>> queryHelmetWarn(); List<AreaAdmin> areaAdminInfo(); } hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/service/impl/PlatUserServiceImpl.java
@@ -535,6 +535,10 @@ //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()); @@ -596,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"; hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
@@ -964,4 +964,34 @@ </trim> </insert> <select id="queryGroups" resultType="hashmap"> select id,group_id as groupId,group_name as groupName from t_audio_groups </select> <select id="queryHelmetWarn" resultType="hashmap"> select hr.device_id as deviceId,hr.sos_type,hr.user_name as userName,'' as position,hr.sm_time from t_helmet_report hr order by hr.sm_time limit 10 </select> <select id="queryAreaInfo" resultType="com.thhy.staff.modules.biz.platuser.entity.AreaAdmin"> select reg.id as areaId,reg.region as areaName from t_region_hazard_inform reg </select> <select id="queryAdminByArea" resultType="com.thhy.staff.modules.biz.platuser.entity.NamePhoneDepart"> select rwu.user_id,spu.real_name as realName,spu.phone,spu.photo,sd.departName from t_region_warranty_user rwu left join sys_plat_user spu on spu.user_id = rwu.user_id left join sys_depart_user sdu on sdu.user_id = spu.user_id left join sys_depart sd on sd.depart_id = sdu.depart_id where rwu.region_warranty_id = #{regionWarrantyId} order by user_type </select> <select id="faceArea" resultType="string"> select DISTINCT area_name as areaName from t_face_device where area_name is not null </select> </mapper>
