From 206fefb85f1584baa13d4d7b6750b89f3d928660 Mon Sep 17 00:00:00 2001 From: lijw Date: Mon, 24 Mar 2025 18:02:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=88=A4=E6=96=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partrolresult/service/impl/PatrolResultServiceImpl.java | 5 +++++ .../taskstatus/controller/PatrolTaskStatusController.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java index cd465be..ff647ee 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java @@ -372,10 +372,13 @@ public class PatrolResultServiceImpl implements IPatrolResultService { } public void batchInsertReportData(String reportId, String mainId) { + log.info("batchInsertReportData reportId:" + reportId + ", mainId:" + mainId); long startTime = System.currentTimeMillis(); List patrolResultRefs = patrolResultMapper.selectResultRefByLineId(mainId); + log.info("batchInsertReportData patrolResultRefs:" + patrolResultRefs); startTime = PrintUtil.useTime("SELECT RESULT", startTime); List basePointAreaInfoList = patrolResultMapper.selectBaseInfoByMainId(mainId); + log.info("batchInsertReportData basePointAreaInfoList:" + basePointAreaInfoList); PrintUtil.useTime("AREA INQUERY", startTime); log.info("REPORTS SIZE: {}", patrolResultRefs.size()); List reportDatas = new ArrayList<>(); @@ -441,6 +444,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService { final String reportDataId = reportId + "_" + (100000 + index); reportData.setLineId(reportDataId); reportDatas.add(reportData); + log.info("batchInsertReportData reportData:" + reportData); String resultContent = patrolResultRef.getResultContent(); List results = JSONObject.parseObject(resultContent).getJSONArray("resultList").toJavaList(resultList.class); String imgUrl = results.get(0).getResults().get(0).getResImageUrl(); @@ -455,6 +459,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService { reportImg.setImgType("0"); reportImg.setCreatTime(new Date()); reportImages.add(reportImg); + log.info("batchInsertReportData reportImg:" + reportImg); } index = reportDatas.size() / 50; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java index 50edd4e..82e2544 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java @@ -588,7 +588,7 @@ public class PatrolTaskStatusController extends BaseController { if (!eqpBookMoMains.isEmpty() && eqpBookMoMains.get(0).getMainSystemCode() != null) { receiveCode = eqpBookMoMains.get(0).getMainSystemCode(); } - if (StringUtils.isNotEmpty(receiveCode) && (receiveCode.startsWith("areaPatrolServer") || receiveCode.startsWith("Client05"))) { + if (StringUtils.isNotEmpty(receiveCode)) { SendTask sendTask = new SendTask(); sendTask.setReceiveCode(receiveCode); sendTask.setSendCode(sendCode);