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 | 38 ++++++++++++++++++++++++++++++-------- 1 files changed, 30 insertions(+), 8 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 e19422e..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; @@ -19,6 +20,7 @@ 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; @@ -37,6 +39,9 @@ @Value("${file.vfprefix}") private String vfPrefix; + + @Autowired + private FaceConfig faceConfig; private Logger logger = LoggerFactory.getLogger(FaceServer.class); @@ -81,7 +86,10 @@ String userId = userIdArray.getString(0); UserFaceVo userFaceVo = userMapper.queryUserFaceSingle(userId); - userFaceVo.setTemplateImgUrl(vfPrefix+"/"+userFaceVo.getTemplateImgUrl()); + + List<String> url = new ArrayList<>(); + url.add(vfPrefix+userFaceVo.getPhoto()); + userFaceVo.setTemplateImgUrl(url); JSONObject jsonObject = new JSONObject(); jsonObject.put("code",0); @@ -102,11 +110,12 @@ 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){ @@ -136,10 +145,23 @@ jsonObject.put("method","get_person"); jsonObject.put("params",new JSONObject()); JSONObject dataJson = new JSONObject(); - dataJson.put("path",vfPrefix+"/"+"getPersonDetail"); + dataJson.put("path",faceConfig.getUrlPrefix()+"getPersonDetail"); dataJson.put("person_id",perId); jsonObject.put("data",dataJson); List<String> sns = faceDeviceMapper.queryDevSn(); - MqUtils.createClient(emqxConfig,sns,jsonObject.toJSONString()); + 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