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 2075d85..60ae52e 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 @@ -1938,6 +1938,7 @@ public class PatrolResultController extends BaseController { ArrayList items; Iterator iterator; if (contype.equals("2")) { + // 同步任务文件 maintAreaList = patrolTaskService.selectPatrolTaskList(new PatrolTask()); if (null != maintAreaList && !maintAreaList.isEmpty()) { items = new ArrayList<>(); @@ -2009,6 +2010,7 @@ public class PatrolResultController extends BaseController { modelXml = pulseGet.getXml(pd); } } else if (contype.equals("3")) { + // 同步维护区域文件 maintAreaList = maintainRegionService.selectMaintainRegionList(new MaintainRegion()); if (null != maintAreaList && !maintAreaList.isEmpty()) { items = new ArrayList<>(); 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 419edf7..b1ad877 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 @@ -593,7 +593,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService { String AiNum = statisticsAnalyseNumLingZhou(lineIds); // String[] nums = new String[]{AiNum, filterNum}; String[] nums = new String[]{AiNum}; - startTime = PrintUtil.useTime("STATISTICS ANALYZE DATA", startTime); + startTime = PrintUtil.useTime("STATISTICS ANALYZE DATA", startTime); // 26s if (resultList.isEmpty()) { throw new ServiceException("LACK INSPECT RESULT: " + mainId); } else { @@ -681,9 +681,9 @@ public class PatrolResultServiceImpl implements IPatrolResultService { report.setFilter(String.valueOf(i)); report.setStationType(stationType); inspectionReportMapper.insertInspectionReport(report); - PrintUtil.useTime("NEW TASK REPORT", startTime); + PrintUtil.useTime("NEW TASK REPORT", startTime); // 12s batchInsertReportData(String.valueOf(report.getLineId()), lineIds, String.valueOf(i), patrolResultRefs); - PrintUtil.useTime("BATCH INSERT DETAIL", startTime); + PrintUtil.useTime("BATCH INSERT DETAIL", startTime); // 13s log.info("[ARCHIVE] reportId: {}", report.getLineId()); Long lineId = report.getLineId(); reportIds.add(lineId); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 0714bba..5382742 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -669,12 +669,13 @@ public class PatrolTaskController extends BaseController { Long majorId = patrolTask.getTaskId(); PatrolTaskInfo patrolTaskInfo = new PatrolTaskInfo(); patrolTaskInfo.setTaskMajorId(majorId + ""); - List infolist = patrolTaskInfoService.selectPatrolTaskInfoList(patrolTaskInfo); - if (!infolist.isEmpty()) { - for (PatrolTaskInfo arr : infolist) { - patrolTaskInfoService.deletePatrolTaskInfoByLineId(arr.getLineId()); - } - } + patrolTaskInfoService.deletePatrolTaskInfoByMajorId(majorId); +// List infolist = patrolTaskInfoService.selectPatrolTaskInfoList(patrolTaskInfo); +// if (!infolist.isEmpty()) { +// for (PatrolTaskInfo arr : infolist) { +// patrolTaskInfoService.deletePatrolTaskInfoByLineId(arr.getLineId()); +// } +// } // patrolTask.setTaskId((long) taskId); if (patrolTask.getIsUp() == null || StringUtils.isEmpty(patrolTask.getIsUp())) { // PatrolTask patrolTaskTemp = patrolTaskService.selectPatrolTaskByTaskId((long) taskId); @@ -683,8 +684,28 @@ public class PatrolTaskController extends BaseController { patrolTask.setTaskCode(patrolTask.getTaskId() + ""); } List prevPoints = patrolTask.getPrevPoints(); + List eqpBookIds = prevPoints.parallelStream().map(PrevPoint::getEqpBookId).collect(Collectors.toList()); + List parentIds = prevPoints.parallelStream().map(PrevPoint::getParentId) + .filter(Objects::nonNull) + .filter((item) -> item.contains(StringUtils.DASH)) + .map((item) -> item.split(StringUtils.DASH)[1]) + .collect(Collectors.toList()); + List> list = new ArrayList<>(); + Map> eqpBooksMap = new HashMap<>(); + if (eqpBookIds.size() > 0) { + list = patrolTaskInfoService.selectVideoPosByPointIdByEqpbookIds(eqpBookIds); + eqpBooksMap = list.stream().collect(Collectors.toMap(e -> String.valueOf(e.get("eqp_book_id")), e -> e, (e1, e2) -> e2)); + } + List patrolTaskInfoListDb = new ArrayList<>(); + Map patrolTaskInfoMap = new HashMap<>(); + if (parentIds.size() > 0) { + patrolTaskInfoListDb = patrolTaskInfoService.selectTaskInfoByBaseIds(parentIds); + patrolTaskInfoMap = patrolTaskInfoListDb.stream().collect(Collectors.toMap(PatrolTaskInfo::getDeviceId, e -> e, (e1, e2) -> e2)); + } + List patrolTaskInfos = new ArrayList<>(); for (PrevPoint prevPoint : prevPoints) { - Map videoPos = patrolTaskInfoService.selectVideoPosByPointId(prevPoint.getEqpBookId()); +// Map videoPos = patrolTaskInfoService.selectVideoPosByPointId(prevPoint.getEqpBookId()); + Map videoPos = eqpBooksMap.get(prevPoint.getEqpBookId()); String type = videoPos.get("type"); String patrolDeviceCode = videoPos.get("patrol_device_code"); String typeEx; @@ -698,7 +719,8 @@ public class PatrolTaskController extends BaseController { if (prevPoint.getParentId().contains(StringUtils.DASH)) { String[] str = prevPoint.getParentId().split(StringUtils.DASH); - PatrolTaskInfo patrolInfo = patrolTaskInfoService.selectTaskInfoByBaseId(str[1]); +// PatrolTaskInfo patrolInfo = patrolTaskInfoService.selectTaskInfoByBaseId(str[1]); + PatrolTaskInfo patrolInfo = patrolTaskInfoMap.get(str[1]); patrolInfo.setTaskMajorId(String.valueOf(majorId)); patrolInfo.setPresetCode(prevPoint.getPresetCode()); patrolInfo.setDeviceId(str[1]); @@ -707,9 +729,14 @@ public class PatrolTaskController extends BaseController { patrolInfo.setParentId(prevPoint.getParentId()); patrolInfo.setEbookId(prevPoint.getEqpBookId()); patrolInfo.setEbookName(prevPoint.getLabel()); - patrolTaskInfoService.insertPatrolTaskInfo(patrolInfo); + patrolInfo.setCreateTime(new Date()); + patrolTaskInfos.add(patrolInfo); +// patrolTaskInfoService.insertPatrolTaskInfo(patrolInfo); } } + if (patrolTaskInfos.size() > 0) { + patrolTaskInfoService.batchInsertPatrolTaskInfo(patrolTaskInfos); + } } issueTask(patrolTask); // 修改任务，删除原有的任务执行策略，根据新的策略重新生成 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 1b15dbd..4a49588 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 @@ -14,10 +14,14 @@ public interface PatrolTaskInfoMapper { PatrolTaskInfo selectTaskInfoByBaseId(String baseId); + List selectTaskInfoByBaseIds(@Param("baseIds") List baseIds); + String selectAlgSubtypeIdsByPatrolPointId(String patrolPointId); Map selectVideoPosByPointId(String pointId); + List> selectVideoPosByPointIdByEqpbookIds(@Param("list") List pointIds); + Map selectPoseInfo(@Param("devId") String devId, @Param("eqbookId") String eqBookId); List selectPatrolTaskInfoList(PatrolTaskInfo patrolTaskInfo); @@ -34,6 +38,8 @@ public interface PatrolTaskInfoMapper { int insertPatrolTaskInfo(PatrolTaskInfo patrolTaskInfo); + int batchInsertPatrolTaskInfo(@Param("patrolTaskInfos") List patrolTaskInfos); + int updatePatrolTaskInfo(PatrolTaskInfo patrolTaskInfo); int deletePatrolTaskInfoByLineId(Long lineIds); @@ -44,4 +50,5 @@ public interface PatrolTaskInfoMapper { List> selectPatrolTaskInfoCount(@Param("list") List taskInfoIds); + int deletePatrolTaskInfoByMajorId(Long taskMajorId); } 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 ac1c57a..0983b39 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 @@ -10,11 +10,14 @@ public interface IPatrolTaskInfoService { PatrolTaskInfo selectPatrolTaskInfoByLineId(Long lineId); PatrolTaskInfo selectTaskInfoByBaseId(String baseId); + List selectTaskInfoByBaseIds(List baseIds); String selectAlgSubtypeIdsByPatrolPointId(String patrolPointId); Map selectVideoPosByPointId(String pointId); + List> selectVideoPosByPointIdByEqpbookIds(List pointIds); + Map selectPoseInfo(String key, String key2); List selectPatrolTaskInfoList(PatrolTaskInfo info); @@ -27,6 +30,8 @@ public interface IPatrolTaskInfoService { int insertPatrolTaskInfo(PatrolTaskInfo patrolTaskInfo); + int batchInsertPatrolTaskInfo(List patrolTaskInfo); + int updatePatrolTaskInfo(PatrolTaskInfo patrolTaskInfo); int deletePatrolTaskInfoByLineIds(Long[] lineIds); @@ -36,4 +41,6 @@ public interface IPatrolTaskInfoService { int deletePatrolTaskInfoByMajorIds(Long[] majorIds); List> selectPatrolTaskInfoCount(List taskInfoIds); + + int deletePatrolTaskInfoByMajorId(Long majorId); } 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 c1d1f30..485e488 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 @@ -26,6 +26,10 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService { return this.patrolTaskInfoMapper.selectTaskInfoByBaseId(lineId); } + public List selectTaskInfoByBaseIds(List baseIds) { + return this.patrolTaskInfoMapper.selectTaskInfoByBaseIds(baseIds); + } + public String selectAlgSubtypeIdsByPatrolPointId(String patrolPointId) { return this.patrolTaskInfoMapper.selectAlgSubtypeIdsByPatrolPointId(patrolPointId); } @@ -34,6 +38,10 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService { return this.patrolTaskInfoMapper.selectVideoPosByPointId(lineId); } + public List> selectVideoPosByPointIdByEqpbookIds(List pointIds) { + return this.patrolTaskInfoMapper.selectVideoPosByPointIdByEqpbookIds(pointIds); + } + public Map selectPoseInfo(String devId, String eqBookId) { return this.patrolTaskInfoMapper.selectPoseInfo(devId, eqBookId); } @@ -76,6 +84,10 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService { return this.patrolTaskInfoMapper.insertPatrolTaskInfo(patrolTaskInfo); } + public int batchInsertPatrolTaskInfo(List patrolTaskInfos) { + return this.patrolTaskInfoMapper.batchInsertPatrolTaskInfo(patrolTaskInfos); + } + public int updatePatrolTaskInfo(PatrolTaskInfo patrolTaskInfo) { return this.patrolTaskInfoMapper.updatePatrolTaskInfo(patrolTaskInfo); } @@ -95,4 +107,8 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService { public List> selectPatrolTaskInfoCount(List taskInfoIds) { return this.patrolTaskInfoMapper.selectPatrolTaskInfoCount(taskInfoIds); } + + public int deletePatrolTaskInfoByMajorId(Long taskMajorId) { + return this.patrolTaskInfoMapper.deletePatrolTaskInfoByMajorId(taskMajorId); + } } 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 d969520..e90382b 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 @@ -147,6 +147,18 @@ where a.patrol_point_id = #{lineId} + + + @@ -217,6 +237,23 @@ #{createTime}, + + INSERT INTO patrol_task_info ( + task_major_id, device_id, device_name, component_id, component_name, + bay_id, bay_name, main_device_id, main_device_name, phy_asset_id, + dev_type, preset_code, parent_id, ebook_id, ebook_name, dev_no, create_time + ) VALUES + + ( + #{item.taskMajorId}, #{item.deviceId}, #{item.deviceName}, + #{item.componentId}, #{item.componentName}, #{item.bayId}, + #{item.bayName}, #{item.mainDeviceId}, #{item.mainDeviceName}, + #{item.phyAssetId}, #{item.devType}, #{item.presetCode}, + #{item.parentId}, #{item.ebookId}, #{item.ebookName}, + #{item.devNo}, #{item.createTime} + ) + + update patrol_task_info @@ -260,4 +297,7 @@ #{majorId} + + delete from patrol_task_info where task_major_id = #{taskMajorId} + diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml index f6db13e..eeb7b25 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml @@ -144,7 +144,7 @@