From 3e9199c1d0135f92544e811655e0856ca4df6e39 Mon Sep 17 00:00:00 2001 From: 张晓波 <bingbo1993@126.com> Date: 星期四, 19 十月 2023 09:22:21 +0800 Subject: [PATCH] 苏州配置文件简化 --- hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/service/impl/FaceServerImpl.java | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 deletions(-) diff --git a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/service/impl/FaceServerImpl.java b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/service/impl/FaceServerImpl.java index 98cf8ac..e19422e 100644 --- a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/service/impl/FaceServerImpl.java +++ b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/service/impl/FaceServerImpl.java @@ -4,18 +4,20 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.nacos.api.utils.StringUtils; -import com.thhy.general.utils.DeepCopyUtils; import com.thhy.staff.config.EmqxConfig; -import com.thhy.staff.config.EmqxProperties; import com.thhy.staff.modules.biz.face.entity.FaceDevice; import com.thhy.staff.modules.biz.face.entity.FaceResult; import com.thhy.staff.modules.biz.face.entity.UserFaceVo; import com.thhy.staff.modules.biz.face.mapper.FaceDeviceMapper; import com.thhy.staff.modules.biz.face.service.FaceServer; +import com.thhy.staff.modules.biz.platuser.entity.DoorLis; import com.thhy.staff.modules.biz.platuser.mapper.PlatUserMapper; +import com.thhy.staff.utils.MqUtils; +import org.checkerframework.checker.units.qual.A; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -33,6 +35,9 @@ @Autowired private EmqxConfig emqxConfig; + @Value("${file.vfprefix}") + private String vfPrefix; + private Logger logger = LoggerFactory.getLogger(FaceServer.class); @Override @@ -48,6 +53,7 @@ } FaceResult faceResult = new FaceResult(true,faceDevice,emqxConfig.toString()); + logger.info("人脸设备返回:++++++++++"+JSON.toJSONString(faceResult)); return faceResult; } @@ -75,6 +81,7 @@ String userId = userIdArray.getString(0); UserFaceVo userFaceVo = userMapper.queryUserFaceSingle(userId); + userFaceVo.setTemplateImgUrl(vfPrefix+"/"+userFaceVo.getTemplateImgUrl()); JSONObject jsonObject = new JSONObject(); jsonObject.put("code",0); @@ -84,12 +91,14 @@ List<UserFaceVo> faceVoList = new ArrayList<>(); faceVoList.add(userFaceVo); jsonObject.put("person_list",faceVoList); + logger.info("设备查询人员结果:"+JSON.toJSONString(faceVoList)); return jsonObject; } @Override public void personNotify(String mess) { JSONObject reqJson = JSONObject.parseObject(mess); + logger.info("接收设备下发结果通知################"+mess); if(reqJson.containsKey("success")&&reqJson.getBooleanValue("success")){ String userIds = reqJson.getString("successful"); if(!StringUtils.isEmpty(userIds)){ @@ -105,10 +114,32 @@ JSONObject failUserInfo = JSON.parseObject(obj.toString()); String userId = failUserInfo.getString("person_id"); JSONArray failInfoArray = failUserInfo.getJSONArray("info"); - String failReason = failInfoArray.getJSONObject(0).getString("reason"); + String failReason = ""; + if(failInfoArray.size()>0) failReason = failInfoArray.getJSONObject(0).getString("reason"); userMapper.syncFail(userId,failReason); } } } } + + + @Override + public void record(String mess) { + JSONObject jsonObject = JSON.parseObject(mess); + DoorLis doorLis = new DoorLis(jsonObject); + userMapper.insertDoorLis(doorLis); + } + + @Override + public void queryPer(String perId) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("method","get_person"); + jsonObject.put("params",new JSONObject()); + JSONObject dataJson = new JSONObject(); + dataJson.put("path",vfPrefix+"/"+"getPersonDetail"); + dataJson.put("person_id",perId); + jsonObject.put("data",dataJson); + List<String> sns = faceDeviceMapper.queryDevSn(); + MqUtils.createClient(emqxConfig,sns,jsonObject.toJSONString()); + } } -- Gitblit v1.9.3