From c84da043c4cc7363f8be88e6a10ce2323d991176 Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Tue, 25 Mar 2025 10:37:29 +0800 Subject: [PATCH] =?UTF-8?q?/*=E4=BF=AE=E6=94=B9monitor=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E7=82=B9?= =?UTF-8?q?=E4=BD=8D=E6=8A=A5=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/GatewayExceptionHandler.java | 1 + .../controller/PatrolResultController.java | 6 ++--- .../impl/BasedataPatrolPointServiceImpl.java | 27 +++++++++++-------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/inspect-gateway/src/main/java/com/inspect/gateway/handler/GatewayExceptionHandler.java b/inspect-gateway/src/main/java/com/inspect/gateway/handler/GatewayExceptionHandler.java index 347d807..09dd864 100644 --- a/inspect-gateway/src/main/java/com/inspect/gateway/handler/GatewayExceptionHandler.java +++ b/inspect-gateway/src/main/java/com/inspect/gateway/handler/GatewayExceptionHandler.java @@ -32,6 +32,7 @@ public class GatewayExceptionHandler implements ErrorWebExceptionHandler { msg = "INTERNAL SERVER ERROR!"; } + ex.printStackTrace(); log.error("[GATEWAY EXCEPTION] PATH: {}, INFO: {}", exchange.getRequest().getPath(), ex.getMessage()); return ServletUtils.webFluxResponseWriter(response, msg); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index b86157d..aaa746d 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -735,11 +735,11 @@ public class PatrolResultController extends BaseController { if (patrolResultTemp.getAlgId() != null && !patrolResultTemp.getAlgId().isEmpty()) { algInfoList = patrolResultService.selectAlgInfo(patrolResultTemp); } - logger.info("callRemoteAlgorithm algInfoList start: " + algInfoList); + logger.info("callRemoteAlgorithm algInfoList start: {}", algInfoList); reqItem.setImageUrlList(image.split(StringUtils.COMMA)); String pictureFrame = patrolTaskService.selectConfigByKey("PICTURE_FRAME"); - logger.info("callRemoteAlgorithm pictureFrame: " + pictureFrame); + logger.info("callRemoteAlgorithm pictureFrame: {}", pictureFrame); String type; if (!algInfoList.isEmpty()) { @@ -838,7 +838,7 @@ public class PatrolResultController extends BaseController { } } - logger.info("callRemoteAlgorithm firList.isEmpty(): " + firList.isEmpty()); + logger.info("callRemoteAlgorithm firList.isEmpty(): {}", firList.isEmpty()); if (!firList.isEmpty() && "true".equals(pictureFrame)) { String uuid = UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY); redisService.setCacheObject(uuid, patrolResultList.get(0).getTaskPatrolledId(), 1L, TimeUnit.DAYS); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java index 583abca..17175c0 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java @@ -2,6 +2,7 @@ package com.inspect.metadata.patrolpointmnt.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.inspect.base.core.constant.Color; import com.inspect.base.core.utils.StringUtils; import com.inspect.metadata.alg.domain.BasedataAlgSubtype; import com.inspect.metadata.alg.mapper.BasedataAlgSubtypeMapper; @@ -75,25 +76,29 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi } public List selectBasedataMonitorList(BasedataPatrolPoint basedataPatrolpoint) { - List pointList = this.basedataPatrolpointMapper.selectBasedataMonitorList(basedataPatrolpoint); + List pointList = basedataPatrolpointMapper.selectBasedataMonitorList(basedataPatrolpoint); logger.info("[META] pointList cnt: {}", pointList.size()); if (null != basedataPatrolpoint.getDeviceId()) { - BasedataDevice basedataDevice = this.basedataDeviceMapper.selectBasedataDeviceByDeviceId(basedataPatrolpoint.getDeviceId()); - basedataPatrolpoint.setDeviceTypeId(basedataDevice.getDeviceTypeId()); - List stdPointList = this.basedataPatrolpointMapper.selectBasedataMonitorUnionList(basedataPatrolpoint); - logger.info("[META] stdPointList cnt: {}", stdPointList.size()); - for (BasedataPatrolPoint stdPoint : stdPointList) { - if (!pointList.isEmpty()) { - if (pointList.stream().filter((item) -> stdPoint.getStdParolPointId().equals(item.getStdParolPointId())).count() == 0) { + BasedataDevice basedataDevice = basedataDeviceMapper.selectBasedataDeviceByDeviceId(basedataPatrolpoint.getDeviceId()); + if(basedataDevice != null) { + basedataPatrolpoint.setDeviceTypeId(basedataDevice.getDeviceTypeId()); + List stdPointList = basedataPatrolpointMapper.selectBasedataMonitorUnionList(basedataPatrolpoint); + logger.info("[META] stdPointList cnt: {}", stdPointList.size()); + for (BasedataPatrolPoint stdPoint : stdPointList) { + if (!pointList.isEmpty()) { + if (pointList.stream().filter((item) -> stdPoint.getStdParolPointId().equals(item.getStdParolPointId())).count() == 0) { + pointList.add(stdPoint); + } + } else { pointList.add(stdPoint); } - } else { - pointList.add(stdPoint); } + } else { + logger.warn(Color.RED + "[META] basedataDevice deviceId: {} not exist!" + Color.END, basedataPatrolpoint.getDeviceId()); } } - List basedataAlgSubtypes = this.basedataAlgSubtypeMapper.selectBasedataAlgSubtypeList(new BasedataAlgSubtype()); + List basedataAlgSubtypes = basedataAlgSubtypeMapper.selectBasedataAlgSubtypeList(new BasedataAlgSubtype()); logger.info("[META] basedataAlgSubtypes cnt: {}", basedataAlgSubtypes.size()); Map algSubtypeMap = new HashMap<>(); basedataAlgSubtypes.forEach((item) -> {