diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java index 7461fd7..b5ab9b7 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java @@ -64,6 +64,8 @@ public interface ResultAnalysisMapper { ResultAnalysis selectTaskAbnormalData(ResultAnalysis resultAnalysis); + List> selectTaskAbnormalDataBatch(@Param("list") List taskPatrolledIds); + List selectResultAnalyseForAlarm(AnalyseSummaryAlarmModel alarmModel); List selectResultAnalysisListForAlarm(AnalyseSummaryAlarmModel alarmModel); @@ -73,4 +75,6 @@ public interface ResultAnalysisMapper { List selectResultAnalysisListByMainIds(@Param("lineIds") List lineIds); List selectResultAnalysisListByMainIdsNew(@Param("lineIds") List lineIds, @Param("filter") String filter); + + List selectResultAnalysisListBatch(@Param("list") List taskPatrolIds, @Param("resultType") String resultType); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java index 00740c3..ade6d7d 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java @@ -48,8 +48,11 @@ public interface IResultAnalysisService { ResultAnalysis selectTaskAbnormalData(ResultAnalysis resultAnalysis); + Map selectTaskAbnormalDataBatch(List taskPatrolledIds); + List selectResultAnalyseForAlarm(AnalyseSummaryAlarmModel alarmModel); List selectResultAnalysisListForAlarm(AnalyseSummaryAlarmModel alarmModel); + List selectResultAnalysisListBatch(List taskPatrolIds, String resultType); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java index 0f782a6..dfff707 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java @@ -10,6 +10,7 @@ import com.inspect.partrolresult.domain.PatrolResult; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import com.inspect.task.domain.PatrolData; import org.springframework.beans.factory.annotation.Autowired; @@ -105,6 +106,32 @@ public class ResultAnalysisServiceImpl implements IResultAnalysisService { return this.resultAnalysisMapper.selectTaskAbnormalData(resultAnalysis); } + public Map selectTaskAbnormalDataBatch(List taskPatrolledIds) { + if (taskPatrolledIds == null || taskPatrolledIds.isEmpty()) { + return new HashMap<>(); + } + + List> resultList = resultAnalysisMapper.selectTaskAbnormalDataBatch(taskPatrolledIds); + + return resultList.stream().collect(Collectors.toMap( + item -> (String) item.get("taskPatrolledId"), + item -> { + ResultAnalysis analysis = new ResultAnalysis(); + analysis.setTaskPatrolledId((String) item.get("taskPatrolledId")); + analysis.setCsQxNum(((Number) item.get("csQxNum")).intValue()); + analysis.setAiQxNum(((Number) item.get("aiQxNum")).intValue()); + analysis.setCsYcNum(((Number) item.get("csYcNum")).intValue()); + analysis.setAiYcNum(((Number) item.get("aiYcNum")).intValue()); + return analysis; + } + )); + } + + @Override + public List selectResultAnalysisListBatch(List taskPatrolIds, String resultType) { + return resultAnalysisMapper.selectResultAnalysisListBatch(taskPatrolIds, resultType); + } + public List selectResultAnalyseForAlarm(AnalyseSummaryAlarmModel alarmModel) { return this.resultAnalysisMapper.selectResultAnalyseForAlarm(alarmModel); } 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 ff076dc..5c93c6d 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 @@ -1461,10 +1461,17 @@ public class PatrolResultController extends BaseController { if (patrolPointId != null) { patrolResult.setDeviceId(patrolPointId.toString()); } +// InputStream is = null; +// String filePath = patrolResult.getFilePath(); +// if (filePath != null && !filePath.isEmpty()) { +// String[] filePathArr = filePath.split(StringUtils.COMMA); +// for (String s : filePathArr) { +// is = doGetRequestForInputStream(intranetFtpAddress + s); +// } +// } +// InputStream is = doGetRequestForInputStream(intranetFtpAddress + patrolResult.getFilePath()); - InputStream is = doGetRequestForInputStream(intranetFtpAddress + patrolResult.getFilePath()); - - logger.info("feedback from robot image size: {}", (is != null)); +// logger.info("feedback from robot image size: {}", (is != null)); // if (is != null) { // try { // is = ImageUtil.overlaying(is, patrolResult.getRectangle(), patrolResult.getValue()); 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 33cdc4b..7c69c87 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 @@ -44,10 +44,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service +@RefreshScope public class PatrolResultServiceImpl implements IPatrolResultService { private static final Logger log = LoggerFactory.getLogger(PatrolResultServiceImpl.class); @@ -1201,7 +1203,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService { return String.format(messageUtils.get("缺陷点位：%d个。"), count); } else { int totalNum = analyses.size(); - log.info("lineIds:{},statisticsAnalyseNum analyses:{}", lineIds, analyses); + log.info("lineIds:{},statisticsAnalyseNum analyses size:{}", lineIds, totalNum); for (ResultAnalysis analyse : analyses) { String resultType = analyse.getResultType(); if ("0".equals(resultType)) { @@ -1428,7 +1430,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService { } String resultType = patrolResultRef.getResultType(); - log.info("[RESULT] resultType: {}, patrolResultRef: {}", resultType, patrolResultRef); +// log.info("[RESULT] resultType: {}, patrolResultRef: {}", resultType, patrolResultRef); if(resultType == null) { continue; } else if (resultType.equals("0")) { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java index b2b8295..2a5de5d 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java @@ -3327,12 +3327,14 @@ public class PatrolTaskResultMainController extends BaseController { InspectionReportData inspectionReportQxData = new InspectionReportData(); inspectionReportQxData.setPointStatus(MessageUtils.get("缺陷")); list.add(inspectionReportQxData); -// InspectionReportData inspectionReportZcData = new InspectionReportData(); -// inspectionReportZcData.setPointStatus(MessageUtils.get("正常")); -// list.add(inspectionReportZcData); -// InspectionReportData inspectionReportYcData = new InspectionReportData(); -// inspectionReportYcData.setPointStatus(MessageUtils.get("异常")); -// list.add(inspectionReportYcData); + if ("1".equals(exportReportFlag)) { + InspectionReportData inspectionReportZcData = new InspectionReportData(); + inspectionReportZcData.setPointStatus(MessageUtils.get("正常")); + list.add(inspectionReportZcData); + InspectionReportData inspectionReportYcData = new InspectionReportData(); + inspectionReportYcData.setPointStatus(MessageUtils.get("异常")); + list.add(inspectionReportYcData); + } int total = 0; label186: for (Iterator var74 = list.iterator(); var74.hasNext(); total += 2) { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java index d6094aa..5140165 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java @@ -28,7 +28,7 @@ public interface PatrolTaskResultMainMapper { int deletePatrolTaskResultMainByLineIds(Long[] lineIds); - List selectMainFileStatus(String patrolIds); + List selectMainFileStatus(@Param("list") List patrolIds); List selectLineIds(Long lineId); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java index fdff3ad..b9077c7 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java @@ -25,7 +25,7 @@ public interface IPatrolTaskResultMainService { int deletePatrolTaskResultMainByLineId(Long lineId); - List selectMainFileStatus(String patrolIds); + List selectMainFileStatus(List patrolIds); List selectLineIds(Long lineId); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java index b8268cf..2a3c07c 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java @@ -60,7 +60,7 @@ public class PatrolTaskResultMainServiceImpl implements IPatrolTaskResultMainSer return this.patrolTaskResultMainMapper.deletePatrolTaskResultMainByLineId(lineId); } - public List selectMainFileStatus(String patrolIds) { + public List selectMainFileStatus(List patrolIds) { return this.patrolTaskResultMainMapper.selectMainFileStatus(patrolIds); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java index 5919bdf..1b15dbd 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java @@ -42,6 +42,6 @@ public interface PatrolTaskInfoMapper { int deletePatrolTaskInfoByMajorIds(Long[] majorIds); - List> selectPatrolTaskInfoCount(String taskInfoIds); + List> selectPatrolTaskInfoCount(@Param("list") List taskInfoIds); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java index 1b684f9..ac1c57a 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java @@ -35,5 +35,5 @@ public interface IPatrolTaskInfoService { int deletePatrolTaskInfoByMajorIds(Long[] majorIds); - List> selectPatrolTaskInfoCount(String taskInfoIds); + List> selectPatrolTaskInfoCount(List taskInfoIds); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java index 8955770..c1d1f30 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java @@ -55,9 +55,8 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService { String value = listFull.get(i); if (listFull.get(i).contains("|") && listFull.get(i).indexOf("|") < listFull.get(i).length()-1) { value = value.substring(value.indexOf("|") + 1); - } - if (listFull.get(i).contains("_") && listFull.get(i).indexOf("_") < listFull.get(i).length()-1) { - value = value.substring(0, value.indexOf("_") + 1); + } else if (listFull.get(i).contains("_") && listFull.get(i).indexOf("_") < listFull.get(i).length()-1) { + value = value.substring(value.indexOf("_") + 1); } list1.add(value); } @@ -93,7 +92,7 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService { return this.patrolTaskInfoMapper.deletePatrolTaskInfoByMajorIds(majorIds); } - public List> selectPatrolTaskInfoCount(String taskInfoIds) { + public List> selectPatrolTaskInfoCount(List taskInfoIds) { return this.patrolTaskInfoMapper.selectPatrolTaskInfoCount(taskInfoIds); } } 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 6d991ca..5233ce6 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 @@ -139,26 +139,28 @@ public class PatrolTaskStatusController extends BaseController { @GetMapping({"/list"}) public TableDataInfo list(PatrolTaskStatus patrolTaskStatus) { - log.info("PATROL_TASK_STATUS LIST patrolTaskStatus: {}", patrolTaskStatus.toString()); this.startPage(); List list = patrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus); - log.info("PATROL_TASK_STATUS LIST cnt: {}", list.size()); - String taskPatrolIds = "'" + list.stream().map((item) -> { - return item.getTaskPatrolledId(); - }).collect(Collectors.joining("','")) + "'"; - log.info("PATROL_TASK_STATUS LIST taskPatrolIds: {}", taskPatrolIds); + if (list == null || list.size() == 0) { + return this.getDataTable(list); + } + List taskPatrolIds = list.stream().map(PatrolTaskStatus::getTaskPatrolledId).collect(Collectors.toList()); List resultMains = patrolTaskResultMainService.selectMainFileStatus(taskPatrolIds); - String taskCodeIds = "'" + list.stream().map((item) -> { - return item.getTaskCode(); - }).collect(Collectors.joining("','")) + "'"; - log.info("PATROL_TASK_STATUS LIST resultMains size: {}", resultMains.size()); + List taskCodeIds = list.stream().map(PatrolTaskStatus::getTaskCode).collect(Collectors.toList()); List> pointList = patrolTaskInfoService.selectPatrolTaskInfoCount(taskCodeIds); Map pointMap = pointList.stream().collect(Collectors.toMap((item) -> { return (String) item.get("taskMajorId"); }, (item) -> { return String.valueOf(item.get("num")); })); - log.info("PATROL_TASK_STATUS LIST pointMap size: {}", pointMap.size()); + + Map abnormalDataBatchMap = resultAnalysisService.selectTaskAbnormalDataBatch(taskPatrolIds); + List allQxAnalysisList = resultAnalysisService.selectResultAnalysisListBatch(taskPatrolIds, "0"); + Map>> groupedAnalysisMap = allQxAnalysisList.stream() + .collect(Collectors.groupingBy( + ResultAnalysis::getTaskPatrolId, + Collectors.groupingBy(data -> new GroupKey(data.getObjectId(), data.getAlgType())) + )); list.forEach((item) -> { item.setPatrolStatus("1"); item.setPointCount(pointMap.get(item.getTaskCode())); @@ -174,31 +176,19 @@ public class PatrolTaskStatusController extends BaseController { item.setFileStatus("0"); } } - - ResultAnalysis resultAnalysis = new ResultAnalysis(); - resultAnalysis.setTaskPatrolledId(item.getTaskPatrolledId()); - ResultAnalysis analysisRes = resultAnalysisService.selectTaskAbnormalData(resultAnalysis); - item.setCsQxNum(analysisRes == null ? 0 : analysisRes.getCsQxNum()); - item.setAiQxNum(analysisRes == null ? 0 : analysisRes.getAiQxNum()); - item.setCsYcNum(analysisRes == null ? 0 : analysisRes.getCsYcNum()); - item.setAiYcNum(analysisRes == null ? 0 : analysisRes.getAiYcNum()); - log.info("PATROL_TASK_STATUS LIST analysisRes: {}", analysisRes == null ? -1 : analysisRes); - resultAnalysis.setResultType("0"); - resultAnalysis.setTaskPatrolId(item.getTaskPatrolledId()); - List filterList = resultAnalysisService.selectResultAnalysisList(resultAnalysis); - log.info("PATROL_TASK_STATUS LIST filterList size: {}", filterList.size()); - Map> groupedFilterList = filterList.stream().collect(Collectors.groupingBy( - data -> new GroupKey(data.getObjectId(), data.getAlgType()) - )); - item.setQxNum(groupedFilterList.size()); - if(StringUtils.isEmpty(item.getTaskEstimatedTime())) { + // 异常数据统计 + ResultAnalysis resultAnalysis = abnormalDataBatchMap.getOrDefault(item.getTaskPatrolledId(), new ResultAnalysis()); + item.setCsQxNum(resultAnalysis.getCsQxNum()); + item.setAiQxNum(resultAnalysis.getAiQxNum()); + item.setCsYcNum(resultAnalysis.getCsYcNum()); + item.setAiYcNum(resultAnalysis.getAiYcNum()); + Map> groupKeyListMap = groupedAnalysisMap.get(item.getTaskPatrolledId()); + item.setQxNum(groupKeyListMap == null ? 0 : groupKeyListMap.size()); + if (StringUtils.isEmpty(item.getTaskEstimatedTime())) { item.setTaskEstimatedTime("0"); } }); - - log.info("PATROL_TASK_STATUS LIST END"); return this.getDataTable(list); - } private static class GroupKey { diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml index 7bb71fd..d969520 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml @@ -166,9 +166,12 @@ and b.eqp_book_id = #{eqbookId} - select task_major_id as taskMajorId,count(1) as num from patrol_task_info - where task_major_id in (${ids}) + where task_major_id in + + #{item} + group by taskMajorId diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml index 76ff477..d0a314f 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml @@ -127,7 +127,7 @@ where line_id = #{lineId} - SELECT line_id, task_patrolled_id, @@ -135,7 +135,10 @@ FROM patrol_task_result_main WHERE - task_patrolled_id in (${ids}) + task_patrolled_id in + + #{taskPatrolledId} + + + + + +