From d6ac72ef17501bc3385f58f23e75512c98c32abe Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期四, 19 十月 2023 10:58:08 +0800
Subject: [PATCH] 苏州配置文件简化
---
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/service/impl/FaceServerImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 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 7b4b626..6c5e856 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
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.api.utils.StringUtils;
import com.thhy.staff.config.EmqxConfig;
+import com.thhy.staff.config.FaceConfig;
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;
@@ -12,11 +13,14 @@
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 org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@@ -33,6 +37,12 @@
@Autowired
private EmqxConfig emqxConfig;
+ @Value("${file.vfprefix}")
+ private String vfPrefix;
+
+ @Autowired
+ private FaceConfig faceConfig;
+
private Logger logger = LoggerFactory.getLogger(FaceServer.class);
@Override
@@ -48,6 +58,7 @@
}
FaceResult faceResult = new FaceResult(true,faceDevice,emqxConfig.toString());
+ logger.info("人脸设备返回：++++++++++"+JSON.toJSONString(faceResult));
return faceResult;
}
@@ -76,6 +87,10 @@
UserFaceVo userFaceVo = userMapper.queryUserFaceSingle(userId);
+ List<String> url = new ArrayList<>();
+ url.add(vfPrefix+userFaceVo.getPhoto());
+ userFaceVo.setTemplateImgUrl(url);
+
JSONObject jsonObject = new JSONObject();
jsonObject.put("code",0);
jsonObject.put("msg","OK");
@@ -84,20 +99,23 @@
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)){
- String[] userIdArray = new String[]{userIds};
- if(userIds.contains(",")){
- userIdArray = userIds.split(",");
- }
- userMapper.syncResult(1,userIdArray);
+ JSONArray jsonArray = JSONArray.parseArray(userIds);
+ logger.info("成功通知结果解析数组"+jsonArray.toJSONString());
+
+ List<String> userIdList = JSONArray.parseArray(userIds,String.class);
+
+ userMapper.syncResult(1,userIdList);
}
JSONArray failJsonArray = reqJson.getJSONArray("failed");
if(failJsonArray.size()>0){
@@ -105,7 +123,8 @@
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);
}
}
@@ -119,4 +138,30 @@
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",faceConfig.getUrlPrefix()+"getPersonDetail");
+ dataJson.put("person_id",perId);
+ jsonObject.put("data",dataJson);
+ List<String> sns = faceDeviceMapper.queryDevSn();
+ String content = jsonObject.toJSONString();
+ logger.info("查询人员"+perId+"："+content);
+ MqUtils.createClient(emqxConfig,sns,content);
+ }
+
+ @Override
+ @Transactional
+ public void deleteNotify(String mess) {
+ JSONObject jsonObject = JSON.parseObject(mess);
+ if(jsonObject.containsKey("success")&&jsonObject.getBooleanValue("success")){
+ JSONObject paramJson = jsonObject.getJSONObject("param");
+ List<String> userIds = JSONArray.parseArray(paramJson.getString("userIds"),String.class);
+ userMapper.syncResult(3,userIds);
+ }
+ }
}
--
Gitblit v1.9.3