From e5ecb373760bcdaaa5ae7549eecd6660c38874e9 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 25 Dec 2025 18:10:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E6=97=A5=E5=BF=97=E6=94=B9=E6=88=90de?= =?UTF-8?q?bug=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LocationApiController.java | 2 +- .../controller/HatAlarmServerController.java | 51 ++++++++++--------- .../controller/UfaceCallbackController.java | 2 +- .../java/com/zhgd/xmgl/util/QYUfaceUtil.java | 2 +- .../com/zhgd/xmgl/util/StandardDevUtil.java | 2 +- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationApiController.java b/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationApiController.java index 0c981c0d4..60a9762b1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationApiController.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/controller/LocationApiController.java @@ -36,7 +36,7 @@ public class LocationApiController { @ApiOperation(value = "上传全量人员定位实时数据", notes = "上传全量人员定位实时数据", httpMethod = "POST") @PostMapping(value = "/api/uploadLocationDataList") public JiLianDaRt uploadLocationDataList(@ApiIgnore @RequestBody HashMap paramMap) { - log.info("uploadLocationDataList:{}", JSON.toJSONString(paramMap)); + log.debug("uploadLocationDataList:{}", JSON.toJSONString(paramMap)); return locationDataService.uploadLocationDataList(paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/HatAlarmServerController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/HatAlarmServerController.java index 9ae0e9a1c..b72dc7a40 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/HatAlarmServerController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/HatAlarmServerController.java @@ -77,31 +77,31 @@ public class HatAlarmServerController { if (dev == null) { throw new OpenAlertException(MessageUtil.get("EquipmentNumIncorrectErr")); } - JSONObject additional = alarmInfo.getJSONObject("additional"); - AiAnalyseHardWareAlarmRecord aiAnalyseHardWareAlarmRecord = new AiAnalyseHardWareAlarmRecord(); - aiAnalyseHardWareAlarmRecord.setCreateTime(DateUtil.formatDateTime(new Date(additional.getLong("alarm_time")))); - DictionaryItem dict = dictionaryItemService.getDictByRemark("ai_analyse_hard_ware_alarm_record_type", additional.getString("alarm_minor"), dev.getProjectSn()); - aiAnalyseHardWareAlarmRecord.setAlarmType(Optional.ofNullable(dict).map(m -> Integer.valueOf(m.getData())).orElse(null)); - aiAnalyseHardWareAlarmRecord.setHardwareId(dev.getHardwareId()); - aiAnalyseHardWareAlarmRecord.setHardwareName(dev.getHardwareName()); - List videoItems = videoItemService.list(new LambdaQueryWrapper() - .eq(VideoItem::getHatAiVideoId, additional.getInt("stream_id")) - .eq(VideoItem::getAiHardwareId, deviceSn) - .last(Cts.IGNORE_DATA_SCOPE_CONDITION) - ); - if (CollUtil.isNotEmpty(videoItems)) { - aiAnalyseHardWareAlarmRecord.setLocation(videoItems.get(0).getVideoName()); - aiAnalyseHardWareAlarmRecord.setAlarmDesc(videoItems.get(0).getVideoName()); - } - aiAnalyseHardWareAlarmRecord.setProjectSn(dev.getProjectSn()); - aiAnalyseHardWareAlarmRecord.setStatus(1); - byte[] data = pics[1].getBytes(); - String uuid = alarmInfo.getJSONObject("global_info").getString("data_uuid"); - String fileName = uuid.replace(':', '_'); - File dir = new File(PathUtil.getBasePath(), "/hat_ai_http_alarm"); - dir.mkdir(); - String name = "/" + fileName + "_" + 1 + ".jpg"; try { + JSONObject additional = alarmInfo.getJSONObject("additional"); + AiAnalyseHardWareAlarmRecord aiAnalyseHardWareAlarmRecord = new AiAnalyseHardWareAlarmRecord(); + aiAnalyseHardWareAlarmRecord.setCreateTime(DateUtil.formatDateTime(new Date(additional.getLong("alarm_time")))); + DictionaryItem dict = dictionaryItemService.getDictByRemark("ai_analyse_hard_ware_alarm_record_type", additional.getString("alarm_minor"), dev.getProjectSn()); + aiAnalyseHardWareAlarmRecord.setAlarmType(Optional.ofNullable(dict).map(m -> Integer.valueOf(m.getData())).orElse(null)); + aiAnalyseHardWareAlarmRecord.setHardwareId(dev.getHardwareId()); + aiAnalyseHardWareAlarmRecord.setHardwareName(dev.getHardwareName()); + List videoItems = videoItemService.list(new LambdaQueryWrapper() + .eq(VideoItem::getHatAiVideoId, additional.getInt("stream_id")) + .eq(VideoItem::getAiHardwareId, deviceSn) + .last(Cts.IGNORE_DATA_SCOPE_CONDITION) + ); + if (CollUtil.isNotEmpty(videoItems)) { + aiAnalyseHardWareAlarmRecord.setLocation(videoItems.get(0).getVideoName()); + aiAnalyseHardWareAlarmRecord.setAlarmDesc(videoItems.get(0).getVideoName()); + } + aiAnalyseHardWareAlarmRecord.setProjectSn(dev.getProjectSn()); + aiAnalyseHardWareAlarmRecord.setStatus(1); + byte[] data = pics[1].getBytes(); + String uuid = alarmInfo.getJSONObject("global_info").getString("data_uuid"); + String fileName = uuid.replace(':', '_'); + File dir = new File(PathUtil.getBasePath(), "/hat_ai_http_alarm"); + dir.mkdir(); + String name = "/" + fileName + "_" + 1 + ".jpg"; fos = new FileOutputStream(dir + name, false); fos.write(data); aiAnalyseHardWareAlarmRecord.setImageUrl("hat_ai_http_alarm" + name); @@ -110,7 +110,8 @@ public class HatAlarmServerController { //将数据通过MQTT转发到前台 asyncAiAnalyse.sendAiAnalyse(aiAnalyseHardWareAlarmRecord, Cts.PROJECT_LEVEL); } catch (Exception e) { - log.error("华安泰获取ai报警错误", e); + log.error("华安泰获取ai报警错误:{}", e.getMessage()); + log.debug("华安泰获取ai报警错误", e); } finally { if (fos != null) { fos.close(); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceCallbackController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceCallbackController.java index f182039ed..765a733da 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceCallbackController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceCallbackController.java @@ -76,7 +76,7 @@ public class UfaceCallbackController { @ApiOperation(value = "芊熠人脸识别回调", notes = "芊熠人脸识别回调", httpMethod = "POST") @PostMapping(value = "/ufaceQYCallbackUrl", produces = {"application/json;charset=UTF-8"}) public String ufaceQyCallbackUrl(@RequestBody final JSONObject json) { - log.info("-------芊熠人脸识别回调------:"+json.toJSONString()); + log.debug("-------芊熠人脸识别回调------:"+json.toJSONString()); workerAttendanceService.ufaceQyCallbackUrl(json.getJSONObject("body")); JSONObject rtn = new JSONObject(); rtn.put(TYPE,json.getString(TYPE)); diff --git a/src/main/java/com/zhgd/xmgl/util/QYUfaceUtil.java b/src/main/java/com/zhgd/xmgl/util/QYUfaceUtil.java index fc6b746c0..6ce48ef33 100644 --- a/src/main/java/com/zhgd/xmgl/util/QYUfaceUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/QYUfaceUtil.java @@ -332,7 +332,7 @@ public class QYUfaceUtil { if (resp.getStatusLine().getStatusCode() == 200) { HttpEntity he = resp.getEntity(); String s = EntityUtils.toString(he, "UTF-8"); - log.info("sendHttpPostWithJson的rs:{}", s); + log.debug("sendHttpPostWithJson的rs:{}", s); return s; } return null; diff --git a/src/main/java/com/zhgd/xmgl/util/StandardDevUtil.java b/src/main/java/com/zhgd/xmgl/util/StandardDevUtil.java index b3d27e6ce..bd4e30877 100644 --- a/src/main/java/com/zhgd/xmgl/util/StandardDevUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/StandardDevUtil.java @@ -61,7 +61,7 @@ public class StandardDevUtil { String urlString = url + "/app/GetDeviceData"; log.info("url:{},param:{},headerMap:{}", urlString, param, headerMap); String result = get(urlString, param, headerMap); - log.info("result:{}", result); + log.debug("result:{}", result); if (StringUtils.isNotEmpty(result)) { log.info("------------获取标样室实时数据结果---------"); JSONObject object = JSONObject.parseObject(result);