From 06fe0bb632197b04cf11670cbee9878db3433e7d Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Thu, 28 Aug 2025 15:46:17 +0800 Subject: [PATCH] =?UTF-8?q?/*=E7=BB=8D=E5=85=B4=E7=AB=99=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=8B=97=E6=9C=BA=E5=99=A8=E4=BA=BA=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=B8=8A=E6=8A=A5=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=B4=8A?= =?UTF-8?q?=E4=B9=B1=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AnalyseResponseServiceImpl.java | 138 ++++++++++-------- .../controller/PatrolResultController.java | 20 ++- .../AnalyseRequestRetryableDelegate.java | 9 +- .../service/AnalyseRequestServiceImpl.java | 6 +- ...asedataMontPatrolPointHandleComponent.java | 21 +-- .../BasedataMontEvnDataConsumerHandle.java | 2 +- .../BasedataMontHeartBeatConsumerHandle.java | 2 +- ...BasedataMontNestRunDataConsumerHandle.java | 2 +- ...BasedataMontNestStaDataConsumerHandle.java | 2 +- ...asedataMontPatDevAlmAbnConsumerHandle.java | 2 +- ...BasedataMontPatDevCoordConsumerHandle.java | 2 +- ...edataMontPatDevPatRouteConsumerHandle.java | 2 +- ...sedataMontPatDevRunDataConsumerHandle.java | 2 +- ...sedataMontPatDevStaDataConsumerHandle.java | 2 +- ...BasedataMontPatrolPointConsumerHandle.java | 10 +- .../BasedataMontTaskResultConsumerHandle.java | 2 +- 16 files changed, 132 insertions(+), 92 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java index a54be42..e7e9157 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java @@ -731,71 +731,93 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { return resMap; } + private Map selectObj2PatrolResultMap(String filter, String patrolTaskId, String deviceId) { + log.info("OBJ_TO_PATROL_RESULT_S taskPatrolId: {}, filter: {}, deviceId: {}", patrolTaskId, filter, deviceId); + List resultMainList = + patrolTaskResultMainService.selectPatrolTaskResultMainList(new PatrolTaskResultMain(patrolTaskId)); + assert resultMainList != null; + assert !resultMainList.isEmpty(); + PatrolTaskResultMain resultMain = resultMainList.get(0); + PatrolResult patrolResult = new PatrolResult(); + patrolResult.setMainId(String.valueOf(resultMain.getLineId())); + patrolResult.setDeviceId(deviceId); + List patrolResultList = + patrolResultService.selectPatrolResultList(patrolResult); + Map resultMap = new HashMap<>(); + patrolResultList.forEach((item) -> resultMap.put(item.getDeviceId(), item)); + log.info("OBJ_TO_PATROL_RESULT_E taskPatrolId: {}, deviceId: {}, resultMap: {}", patrolTaskId, deviceId, resultMap); + return resultMap; + } + public void repositAnalyseAlgorithmResult(AnalyseResult analyseResult) { List websocketDataList = new ArrayList<>(); - Map resMap = selectObj2PatrolResultMap(analyseResult.getTaskPatrolId()); + //Map resultMap = selectObj2PatrolResultMap(analyseResult.getTaskPatrolId()); List resultList = analyseResult.getResultList(); - PatrolResult patrolResult; - for (Iterator iterator = resultList.iterator(); - iterator.hasNext(); - patrolResultService.updatePatrolResult(patrolResult)) { + PatrolResult patrolResult = new PatrolResult(); + for (Iterator iterator = resultList.iterator(); iterator.hasNext(); patrolResultService.updatePatrolResult(patrolResult)) { AnalyseResItem resItem = iterator.next(); - patrolResult = resMap.get(resItem.getObjectId()); - List resultAnalysisList = new ArrayList<>(); - StringJoiner valueJoiner = new StringJoiner(StringUtils.COMMA); - StringJoiner validJoiner = new StringJoiner(StringUtils.COMMA); - for (AnalyseResPoint analyseResPoint : resItem.getResults()) { - ResultAnalysis resultAnalysis = combineAnalyse(analyseResult, - String.valueOf(resMap.get(resItem.getObjectId()).getLineId()), - resItem.getObjectId(), - patrolResult.getFilePath(), - analyseResPoint); - resultAnalysisList.add(resultAnalysis); - valueJoiner.add(resultAnalysis.getResValue()); - String pointStatus = resultAnalysis.getPointStatus(); - String resultType = resultAnalysis.getResultType(); - String resStatus = resultAnalysis.getResStatus(); - // resultType:0-告警 1-正常 2-异常 - if ("0".equals(resultType)) { - // 判别异常 - validJoiner.add("2"); - } else if ("1".equals(resultType)) { - // 成功 - validJoiner.add("1"); - } else if ("2".equals(resultType)) { - // 失败 - validJoiner.add("0"); - } - log.info(Color.GREEN + "[analysis] createTime: {}, insertResultAnalysis: {}" + Color.END, resultAnalysis.getCreateTime(), resultAnalysis); - try { - resultAnalysisService.insertResultAnalysis(resultAnalysis); - } catch (Exception e) { - log.error("error", e); + Map resultMap = + selectObj2PatrolResultMap(analyseResult.getFilter(), analyseResult.getTaskPatrolId(), resItem.getObjectId()); + if (!resultMap.isEmpty()) { + patrolResult = resultMap.get(resItem.getObjectId()); + List resultAnalysisList = new ArrayList<>(); + StringJoiner valueJoiner = new StringJoiner(StringUtils.COMMA); + StringJoiner validJoiner = new StringJoiner(StringUtils.COMMA); + for (AnalyseResPoint analyseResPoint : resItem.getResults()) { + ResultAnalysis resultAnalysis = combineAnalyse(analyseResult, + String.valueOf(patrolResult.getLineId()), + resItem.getObjectId(), + patrolResult.getFilePath(), + analyseResPoint); + resultAnalysisList.add(resultAnalysis); + valueJoiner.add(resultAnalysis.getResValue()); + String pointStatus = resultAnalysis.getPointStatus(); + String resultType = resultAnalysis.getResultType(); + String resStatus = resultAnalysis.getResStatus(); + // resultType:0-告警 1-正常 2-异常 + if ("0".equals(resultType)) { + // 判别异常 + validJoiner.add("2"); + } else if ("1".equals(resultType)) { + // 成功 + validJoiner.add("1"); + } else if ("2".equals(resultType)) { + // 失败 + validJoiner.add("0"); + } + log.info(Color.GREEN + "[analysis] createTime: {}, insertResultAnalysis: {}" + Color.END, resultAnalysis.getCreateTime(), resultAnalysis); + try { + resultAnalysisService.insertResultAnalysis(resultAnalysis); + } catch (Exception e) { + log.error("error", e); + } } - } - patrolResult.setValue(valueJoiner.toString()); - patrolResult.setValid(validJoiner.toString()); - List algAliasList = DictUtils.getDictCache(Tags.DEFECT_TYPE); - JSONObject algAliasMap = new JSONObject(); - Objects.requireNonNull(algAliasList).stream().filter((item) -> { - return !StringUtils.isEmpty(item.getRemark()); - }).forEach((item) -> { - algAliasMap.put(item.getDictValue(), item.getRemark()); - }); - String algType = resultAnalysisList.stream().map((item) -> { - return algAliasMap.containsKey(item.getAlgType()) ? algAliasMap.getString(item.getAlgType()) : item.getAlgType(); - }).collect(Collectors.joining(StringUtils.COMMA)); - patrolResult.setRecognitionType(algType); - long alarmCount = resultAnalysisList.stream().filter((item) -> { - return "1".equals(item.getResultType()); - }).count(); - if (alarmCount > 0L) { - patrolResult.setValueUnit(messageUtils.get("有缺陷")); - websocketDataList.add(new WebsocketData(resItem.getObjectId(), patrolResult.getValueUnit())); + patrolResult.setValue(valueJoiner.toString()); + patrolResult.setValid(validJoiner.toString()); + List algAliasList = DictUtils.getDictCache(Tags.DEFECT_TYPE); + JSONObject algAliasMap = new JSONObject(); + Objects.requireNonNull(algAliasList).stream().filter((item) -> { + return !StringUtils.isEmpty(item.getRemark()); + }).forEach((item) -> { + algAliasMap.put(item.getDictValue(), item.getRemark()); + }); + String algType = resultAnalysisList.stream().map((item) -> { + return algAliasMap.containsKey(item.getAlgType()) ? algAliasMap.getString(item.getAlgType()) : item.getAlgType(); + }).collect(Collectors.joining(StringUtils.COMMA)); + patrolResult.setRecognitionType(algType); + long alarmCount = resultAnalysisList.stream().filter((item) -> { + return "1".equals(item.getResultType()); + }).count(); + if (alarmCount > 0L) { + patrolResult.setValueUnit(messageUtils.get("有缺陷")); + websocketDataList.add(new WebsocketData(resItem.getObjectId(), patrolResult.getValueUnit())); + } else { + patrolResult.setValueUnit(messageUtils.get("无缺陷")); + } } else { - patrolResult.setValueUnit(messageUtils.get("无缺陷")); + log.info("OBJ_TO_PATROL_RESULT_ERROR taskPatrolId: {}, filter: {}, deviceId: {}", analyseResult.getTaskPatrolId(), analyseResult.getFilter(), resItem.getObjectId()); } } @@ -868,7 +890,7 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { patrolTaskStatus.setTaskEstimatedTime(algorithmProgress); if ("100.0".equals(algorithmProgress)) { patrolTaskStatus.setEndTime(DateUtil.formatDateTime(new Date())); - log.info(Color.GREEN + "DONE CALC_REMOTE_ALGORITHM_PROGRESS: taskPatrolledId: {}, objectId: {}, curNumber: {}, totalNumer: {}, algorithmProgress: {}, db-taskProgress: {}" + Color.END, + log.info(Color.GREEN + "DONE CALC_REMOTE_ALGORITHM_PROGRESS taskPatrolledId: {}, objectId: {}, curNumber: {}, totalNumer: {}, algorithmProgress: {}, db-taskProgress: {}" + Color.END, taskPatrolledId, objectId, resultAnalysisList.size(), 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 6779909..cce908c 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 @@ -792,6 +792,9 @@ public class PatrolResultController extends BaseController { analyseReqItem.setTypeList(strings); //改为走初筛-20250827-qinyl //infraredList.add(analyseReqItem.clone()); + + + analyseReqItem.setTypeList(infraredAlgInfoList.stream().map(AlgInfo::getAlgSubtypeCode).toArray(String[]::new)); filterList.add(analyseReqItem.clone()); } @@ -1163,10 +1166,16 @@ public class PatrolResultController extends BaseController { runProgress = Double.parseDouble(runProgressStr); dbProgress = Double.parseDouble(dbProgressStr); } catch (Exception e) { - logger.error("patrol_task_status error number, run_progress: {}, db_progress: {}", patrolTaskStatusItem.getTaskProgress(), patrolTaskStatusOfDb.getTaskProgress()); + logger.error("patrol_task_status error number, run_progress: {}, db_progress: {}, cal_progress: {}", + patrolTaskStatusItem.getTaskProgress(), + patrolTaskStatusOfDb.getTaskProgress(), + patrolTaskStatusOfDb.getTaskEstimatedTime()); } - logger.info("patrol_task_status run_progress: {}, db_progress: {}", runProgress, dbProgress); + logger.info("patrol_task_status run_progress: {}, db_progress: {}, cal_progress: {}", + runProgress, + dbProgress, + patrolTaskStatusOfDb.getTaskEstimatedTime()); if (runProgress > dbProgress) { patrolTaskStatusItem.setLineId(patrolTaskStatusOfDb.getLineId()); if (patrolTaskStatusItem.getTaskName().contains("联合") && !patrolTaskStatusItem.getTaskName().startsWith(sendCode)) { @@ -1202,13 +1211,14 @@ public class PatrolResultController extends BaseController { if (!statusList.isEmpty()) { PatrolTaskStatus taskStatus = statusList.get(0); if (TaskStatus.RUNNING.getCode().equals(taskStatus.getTaskState())) { - logger.info(Color.CYAN + "updating patrol_task_status state, taskPatrolledId: {}, taskState: {}, taskCurCodeInRedis: {}" + Color.END, + logger.info(Color.CYAN + "updating patrol_task_status state taskPatrolledId: {}, runProgress: {}, taskState: {}, taskCurCodeInRedis: {}, cal_progress_db: {}" + Color.END, patrolTaskStatusItem.getTaskPatrolledId(), runProgress, patrolTaskStatusItem.getTaskState(), - RedisConst.TASK_CURRENT_CODE + patrolTaskStatusItem.getTaskCode()); + RedisConst.TASK_CURRENT_CODE + patrolTaskStatusItem.getTaskCode(), + patrolTaskStatusOfDb.getTaskEstimatedTime()); patrolTaskStatusItem.setTaskState(TaskStatus.RUNNING.getCode()); - //patrolTaskStatusItem.setTaskEstimatedTime(""); + patrolTaskStatusItem.setTaskEstimatedTime(patrolTaskStatusOfDb.getTaskEstimatedTime()); i = iPatrolTaskStatusService.updatePatrolTaskStatus(patrolTaskStatusItem); } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestRetryableDelegate.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestRetryableDelegate.java index 9a04304..446b5c2 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestRetryableDelegate.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestRetryableDelegate.java @@ -25,8 +25,13 @@ public class AnalyseRequestRetryableDelegate { public boolean callRemoteAnalyseService(final AnalyseRequest analyseReq) throws IOException { RetryContext retryContext = RetrySynchronizationManager.getContext(); int retryCount = retryContext != null ? retryContext.getRetryCount() : 0; - log.info("CALL_REMOTE_ANALYZE retryCount: {}, requestId: {}, isFilter: {}, URL: {}, PARAMS: {}", - retryCount, analyseReq.getRequestId(), analyseReq.isFilter(), analyseReq.getRequestUrl(), analyseReq); + log.info("CALL_REMOTE_ANALYZE taskPatrolId: {}, retryCount: {}, requestId: {}, isFilter: {}, URL: {}, PARAMS: {}", + analyseReq.getTaskPatrolId(), + retryCount, + analyseReq.getRequestId(), + analyseReq.isFilter(), + analyseReq.getRequestUrl(), + analyseReq); String result = SimpleHttpClient.doPostJson(analyseReq.getRequestUrl(), analyseReq.toString()); log.info("CALL_REMOTE_ANALYZE RESULT: {}", result); if (!"200".equals(JSONObject.parseObject(result).getString(AnalyseConstants.ANALYSE_CODE))) { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java index f002a21..9ccf3cb 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java @@ -136,9 +136,9 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { } if (retryDelegate.callRemoteAnalyseService(analyseReq)) { - log.info("CALL_REMOTE_ANALYSE SUCCESS, requestId: {}, taskPatrolId: {}", - analyseReq.getRequestId(), - analyseReq.getTaskPatrolId()); + log.info("CALL_REMOTE_ANALYSE SUCCESS, taskPatrolId: {}, requestId: {}", + analyseReq.getTaskPatrolId(), + analyseReq.getRequestId()); final String objectId = analyseReq.getObjectList() != null && !analyseReq.getObjectList().isEmpty() ? analyseReq.getObjectList().get(0).getObjectId() : "00000000"; diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java index 2b7db61..64ca94b 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java @@ -78,15 +78,15 @@ public class BasedataMontPatrolPointHandleComponent { String convertFlag = "0"; String algConvertFlag = "0"; if (null != SendCode) { - BasedataBdConfigMainSystem mainSystem = this.basedataBdconfigMainsystemMapper.selectBasedataBdConfigMainSystemByMainSystemCode(SendCode); + BasedataBdConfigMainSystem mainSystem = basedataBdconfigMainsystemMapper.selectBasedataBdConfigMainSystemByMainSystemCode(SendCode); if (null != mainSystem) { String flag = mainSystem.getConvertFlag(); if (null != flag && flag.equals("1")) { convertFlag = "1"; } - String algflag = mainSystem.getAlgConvertFlag(); - if (null != algflag && algflag.equals("1")) { + String algFlag = mainSystem.getAlgConvertFlag(); + if (null != algFlag && algFlag.equals("1")) { algConvertFlag = "1"; } } @@ -94,8 +94,8 @@ public class BasedataMontPatrolPointHandleComponent { JSONObject jsonObject1 = XmlToJsonUtil.xmlToJsonObject(pointModel); assert jsonObject1 != null; - this.log.info("===========模型xml转json===========:: {}", jsonObject1.toJSONString()); - this.handleJsonObject(jsonObject1, SendCode); + log.info("MODEL_SYNC XML_TO_JSON: {}", jsonObject1.toJSONString()); + handleJsonObject(jsonObject1, SendCode); } private void handleJsonObject(JSONObject jsonObject, String sendCode) { @@ -158,10 +158,13 @@ public class BasedataMontPatrolPointHandleComponent { String main_device_id = modelItem.getMain_device_id(); String originalDeviceId = modelItem.getComponent_id(); String originalAlgSubtypeIds = modelItem.getRecognition_type_list(); + /** + * 根据patrol_point_code(机器人sendCode+"|"+机器人上报点位device_id)从basedata_patrolpoint表中查询 + */ BasedataPatrolPoint basedataPatrolpoint = new BasedataPatrolPoint(); basedataPatrolpoint.setPatrolPointCode(sendCode + "|" + device_id); List patrolpointList = this.basedataPatrolPointService.selectBasedataPatrolPointList(basedataPatrolpoint); - if (null != patrolpointList && !patrolpointList.isEmpty()) { + if (patrolpointList != null && !patrolpointList.isEmpty()) { BasedataPatrolPoint patrolPoint = patrolpointList.get(0); DevicePointModelItem item = new DevicePointModelItem(); this.handPointPresetNew(patrolPoint.getPatrolPointId(), item, sendCode); @@ -184,11 +187,11 @@ public class BasedataMontPatrolPointHandleComponent { patrolPointInsert.setMainDeviceId(device.getParentId()); patrolPointInsert.setDeviceTypeId(978L); patrolPointInsert.setAreaId(device.getAreaId()); - this.setAlgIdS(patrolPointInsert, sendCode, originalAlgSubtypeIds, algConvertFlag); - BasedataPatrolPoint patrolPointInsertRet = this.basedataPatrolPointService.insertBasedataPatrolPoint(patrolPointInsert); + setAlgIdS(patrolPointInsert, sendCode, originalAlgSubtypeIds, algConvertFlag); + BasedataPatrolPoint patrolPointInsertRet = basedataPatrolPointService.insertBasedataPatrolPoint(patrolPointInsert); Long patrolPointId = patrolPointInsertRet.getPatrolPointId(); DevicePointModelItem item = new DevicePointModelItem(); - this.handPointPresetNew(patrolPointId, item, sendCode); + handPointPresetNew(patrolPointId, item, sendCode); } } } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontEvnDataConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontEvnDataConsumerHandle.java index 96adf7f..751d3b3 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontEvnDataConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontEvnDataConsumerHandle.java @@ -38,7 +38,7 @@ public class BasedataMontEvnDataConsumerHandle implements IBasedataMontDataHandl private FeignMsgClient feignMsgClient; public void handleMontData(JSONObject jsonObject) { - log.info(Color.BLUE + "handleMontData-21: {}" + Color.END, jsonObject.toString()); + log.info("handleMontData-21: {}", jsonObject.toString()); String Type = jsonObject.getString("Type"); JSONArray jsonObjectItems = jsonObject.getJSONArray("Items"); List list = jsonObjectItems.toJavaList(BasedataMontEvnData.class); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java index 1d284a8..a2187a2 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontHeartBeatConsumerHandle.java @@ -42,7 +42,7 @@ public class BasedataMontHeartBeatConsumerHandle implements IBasedataMontDataHan private String liveSIPB_URL; public void handleMontData(JSONObject jsonObject) { - log.info(Color.BLUE + "handleMontData-heartbeat: {}" + Color.END, jsonObject.toString()); + log.info("handleMontData-heartbeat: {}", jsonObject.toString()); String Type = jsonObject.getString("Type"); String uuid = jsonObject.getString("uuid"); log.info(Color.GREEN + "[METADATA] handMontData 会话: {}, 类型: {}, 消息体: {}" + Color.END, uuid, Type, jsonObject.toJSONString()); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestRunDataConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestRunDataConsumerHandle.java index a11830b..decd547 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestRunDataConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestRunDataConsumerHandle.java @@ -39,7 +39,7 @@ public class BasedataMontNestRunDataConsumerHandle implements IBasedataMontDataH private FeignMsgClient feignMsgClient; public void handleMontData(JSONObject jsonObject) { - log.info(Color.BLUE + "handleMontData-10004: {}" + Color.END, jsonObject.toString()); + log.info("handleMontData-10004: {}", jsonObject.toString()); String Type = jsonObject.getString("Type"); JSONArray jsonObjectItems = jsonObject.getJSONArray("Items"); List list = jsonObjectItems.toJavaList(BasedataMontNestRunData.class); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestStaDataConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestStaDataConsumerHandle.java index 5570664..4628973 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestStaDataConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontNestStaDataConsumerHandle.java @@ -39,7 +39,7 @@ public class BasedataMontNestStaDataConsumerHandle implements IBasedataMontDataH private RedisService redisService; public void handleMontData(JSONObject jsonObject) { - log.info(Color.BLUE + "handleMontData-20001: {}" + Color.END, jsonObject.toString()); + log.info("handleMontData-20001: {}", jsonObject.toString()); String Type = jsonObject.getString("Type"); JSONArray jsonObjectItems = jsonObject.getJSONArray("Items"); List list = jsonObjectItems.toJavaList(BasedataMontNestStaData.class); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevAlmAbnConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevAlmAbnConsumerHandle.java index 9112f73..67e59ed 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevAlmAbnConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevAlmAbnConsumerHandle.java @@ -37,7 +37,7 @@ public class BasedataMontPatDevAlmAbnConsumerHandle implements IBasedataMontData private FeignMsgClient feignMsgClient; public void handleMontData(JSONObject jsonObject) { - log.info(Color.BLUE + "handleMontData-5: {}" + Color.END, jsonObject.toString()); + log.info("handleMontData-5: {}", jsonObject.toString()); JSONArray jsonObjectItems = jsonObject.getJSONArray("Items"); List list = jsonObjectItems.toJavaList(BasedataMontPatDevAlmAbn.class); if (null != list && !list.isEmpty()) { diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevCoordConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevCoordConsumerHandle.java index 590b386..780d2e5 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevCoordConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevCoordConsumerHandle.java @@ -38,7 +38,7 @@ public class BasedataMontPatDevCoordConsumerHandle implements IBasedataMontDataH private FeignMsgClient feignMsgClient; public void handleMontData(JSONObject jsonObject) { - log.info(Color.BLUE + "handleMontData-3: {}" + Color.END, jsonObject.toString()); + log.info("handleMontData-3: {}", jsonObject.toString()); String Type = jsonObject.getString("Type"); JSONArray jsonObjectItems = jsonObject.getJSONArray("Items"); List list = jsonObjectItems.toJavaList(BasedataMontPatDevCoord.class); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevPatRouteConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevPatRouteConsumerHandle.java index dd07d73..63a7638 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevPatRouteConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevPatRouteConsumerHandle.java @@ -37,7 +37,7 @@ public class BasedataMontPatDevPatRouteConsumerHandle implements IBasedataMontDa private FeignMsgClient feignMsgClient; public void handleMontData(JSONObject jsonObject) { - log.info(Color.BLUE + "handleMontData-4: {}" + Color.END, jsonObject.toString()); + log.info("handleMontData-4: {}", jsonObject.toString()); String Type = jsonObject.getString("Type"); JSONArray jsonObjectItems = jsonObject.getJSONArray("Items"); List list = jsonObjectItems.toJavaList(BasedataMontPatDevPatRoute.class); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevRunDataConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevRunDataConsumerHandle.java index 233b2d4..1873c92 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevRunDataConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevRunDataConsumerHandle.java @@ -38,7 +38,7 @@ public class BasedataMontPatDevRunDataConsumerHandle implements IBasedataMontDat RedisService redisService; public void handleMontData(JSONObject jsonObject) { - log.info(Color.BLUE + "handleMontData-2: {}" + Color.END, jsonObject.toString()); + log.info("handleMontData-2: {}", jsonObject.toString()); String Type = jsonObject.getString("Type"); JSONArray jsonObjectItems = jsonObject.getJSONArray("Items"); List list = jsonObjectItems.toJavaList(BasedataMontPatDevRunData.class); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevStaDataConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevStaDataConsumerHandle.java index cc9ba8d..26734b5 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevStaDataConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevStaDataConsumerHandle.java @@ -38,7 +38,7 @@ public class BasedataMontPatDevStaDataConsumerHandle implements IBasedataMontDat RedisService redisService; public void handleMontData(JSONObject jsonObject) { - log.info(Color.BLUE + "handleMontData-1: {}" + Color.END, jsonObject.toString()); + log.info("handleMontData-1: {}", jsonObject.toString()); String Type = jsonObject.getString("Type"); JSONArray jsonObjectItems = jsonObject.getJSONArray("Items"); List list = jsonObjectItems.toJavaList(BasedataMontPatDevStaData.class); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java index a58d186..dbc3a23 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java @@ -67,7 +67,7 @@ public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataH private BasedataPatrolPointMapper basedataPatrolpointMapper; public void handleMontData(JSONObject jsonObject) { - log.info(Color.BLUE + "handleMontData-modelup-1024: {}" + Color.END, jsonObject.toString()); + log.info(Color.CYAN + "handleMontData-modelup-1024: {}" + Color.END, jsonObject.toString()); String Type = jsonObject.getString("Type"); String convertFlag = "0"; String SendCode = jsonObject.getString("SendCode"); @@ -84,14 +84,14 @@ public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataH JSONArray jsonObjectItems = jsonObject.getJSONArray("Items"); List list = jsonObjectItems.toJavaList(ModelFileItem.class); - log.info(Color.BLUE + "[METADATA] 模型同步-----list--{}-------------jsonObject-----: {}" + Color.END, list, jsonObject); - if (null != list && !list.isEmpty()) { + log.info("MODEL_SYNC list: {}, jsonObject: {}", list, jsonObject); + if (list != null && !list.isEmpty()) { String modelString; for (Iterator iterator = list.iterator(); iterator.hasNext(); basedataMontPatrolPointHandleComponent.handPointModelData(SendCode, modelString)) { ModelFileItem item = iterator.next(); String deviceFilePath = item.getDevice_file_path(); String source = deviceFilePath; - log.info(Color.BLUE + "[METADATA] TCPSERVER文件路径: {}" + Color.END, deviceFilePath); + log.info("MODEL_SYNC filePath: {}", deviceFilePath); ByteBuf byteBuf = Unpooled.buffer(); try { sftpClient.downLoad(source, (inputStream) -> { @@ -116,7 +116,7 @@ public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataH } } - System.out.println("model file:" + jsonObject.toJSONString()); + log.info("MODEL_SYNC modelFile: {}, jsonObject: {}", list, jsonObject); } } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskResultConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskResultConsumerHandle.java index 38e44e2..8905c9c 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskResultConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskResultConsumerHandle.java @@ -32,7 +32,7 @@ public class BasedataMontTaskResultConsumerHandle implements IBasedataMontDataHa private FeignMsgClient feignMsgClient; public void handleMontData(JSONObject jsonObject) { - log.info(Color.BLUE + "handleMontData-61: {}" + Color.END, jsonObject.toString()); + log.info(Color.GREEN + "handleMontData-61: {}" + Color.END, jsonObject.toString()); String Type = jsonObject.getString("Type"); JSONArray jsonObjectItems = jsonObject.getJSONArray("Items"); List list = jsonObjectItems.toJavaList(BasedataMontTaskResult.class);