diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java index 3e79d2a..22d1602 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java @@ -524,12 +524,14 @@ public class ResultAnalysisController extends BaseController { @GetMapping({"/list_v2"}) public TableDataInfo listV2(PatrolTaskStatus patrolTaskStatus) { logger.info("[RES ANALYZE] listV2 param: {}", patrolTaskStatus); - if("1".equals(patrolTaskStatus.getFilter())) { +// if("1".equals(patrolTaskStatus.getFilter())) { ResultAnalysis resultAnalysis = new ResultAnalysis(); resultAnalysis.setTaskPatrolId(patrolTaskStatus.getTaskPatrolledId()); - resultAnalysis.setResult("0");//初筛结果 + resultAnalysis.setFilter(patrolTaskStatus.getFilter()); + resultAnalysis.setResultType("0"); // 0缺陷 startPage(); List filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); +// logger.info("[RES ANALYZE] filterList1: {}", JSONObject.toJSONString(filterList, true)); List algInfos = patrolResultService.selectAlgInfo(new PatrolResult()); filterList.forEach((item) -> { item.setAlgName((algInfos.stream().anyMatch((alg) -> { @@ -537,57 +539,58 @@ public class ResultAnalysisController extends BaseController { }) ? algInfos.stream().filter((alg) -> { return alg.getAlgSubtypeCode().equals(item.getAlgType()); }).findFirst().get().getAlgSubtypeName() : "")); - if ("0".equals(item.getFilter())) { - List filterDatas = filterList.stream().filter((data) -> { - return data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(data.getAlgType()); - }).collect(Collectors.toList()); - if (!filterDatas.isEmpty()) { - item.setImg((filterDatas.get(0)).getImgAnalyse()); - } else { - item.setImg(""); - } - } else { - item.setImg(item.getImgAnalyse()); - item.setImgAnalyse(""); - } +// if ("0".equals(item.getFilter())) { +// List filterDatas = filterList.stream().filter((data) -> { +// return data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(data.getAlgType()); +// }).collect(Collectors.toList()); +// if (!filterDatas.isEmpty()) { +// logger.info("filterDatas: {}", filterDatas); +// item.setImg((filterDatas.get(0)).getImgAnalyse()); +// } else { +// item.setImg(""); +// } +// } else { +// item.setImg(item.getImgAnalyse()); +//// item.setImgAnalyse(""); +// } }); - // logger.info("[RES ANALYZE] filterList: {}", JSONObject.toJSONString(filterList, true)); +// logger.info("[RES ANALYZE] filterList2: {}", JSONObject.toJSONString(filterList, true)); Collections.sort(filterList); return getDataTable(filterList); - } else { - ResultAnalysis resultAnalysis = new ResultAnalysis(); - resultAnalysis.setTaskPatrolId(patrolTaskStatus.getTaskPatrolledId()); - resultAnalysis.setResult("0"); - List filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); - List algInfos = patrolResultService.selectAlgInfo(new PatrolResult()); - startPage(); - resultAnalysis.setResult("1");//大模型结果 - resultAnalysis.setResultType("1");//结果正常 - List dataList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); - dataList.forEach((item) -> { - item.setAlgName((algInfos.stream().anyMatch((alg) -> { - return alg.getAlgSubtypeCode().equals(item.getAlgType()); - }) ? algInfos.stream().filter((alg) -> { - return alg.getAlgSubtypeCode().equals(item.getAlgType()); - }).findFirst().get().getAlgSubtypeName() : "")); - if("0".equals(item.getFilter())) { - List filterDatas = filterList.stream().filter((data) -> { - return data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(data.getAlgType()); - }).collect(Collectors.toList()); - if(!filterDatas.isEmpty()) { - item.setImg((filterDatas.get(0)).getImgAnalyse()); - } else { - item.setImg(""); - } - } else { - item.setImg(item.getImgAnalyse()); - item.setImgAnalyse(""); - } - - }); - Collections.sort(dataList); - return getDataTable(dataList); - } +// } else if("0".equals(patrolTaskStatus.getFilter())) { +// ResultAnalysis resultAnalysis = new ResultAnalysis(); +// resultAnalysis.setTaskPatrolId(patrolTaskStatus.getTaskPatrolledId()); +// resultAnalysis.setFilter("0"); +// List filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); +// List algInfos = patrolResultService.selectAlgInfo(new PatrolResult()); +// startPage(); +// resultAnalysis.setResult("1");//大模型结果 +// resultAnalysis.setResultType("1");//结果正常 +// List dataList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); +// dataList.forEach((item) -> { +// item.setAlgName((algInfos.stream().anyMatch((alg) -> { +// return alg.getAlgSubtypeCode().equals(item.getAlgType()); +// }) ? algInfos.stream().filter((alg) -> { +// return alg.getAlgSubtypeCode().equals(item.getAlgType()); +// }).findFirst().get().getAlgSubtypeName() : "")); +// if("0".equals(item.getFilter())) { +// List filterDatas = filterList.stream().filter((data) -> { +// return data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(data.getAlgType()); +// }).collect(Collectors.toList()); +// if(!filterDatas.isEmpty()) { +// item.setImg((filterDatas.get(0)).getImgAnalyse()); +// } else { +// item.setImg(""); +// } +// } else { +// item.setImg(item.getImgAnalyse()); +//// item.setImgAnalyse(""); +// } +// +// }); +// Collections.sort(dataList); +// return getDataTable(dataList); +// } } @GetMapping({"/list_v3"}) @@ -628,7 +631,8 @@ public class ResultAnalysisController extends BaseController { resultAnalysis.setTaskPatrolId(patrolTaskStatus.getTaskPatrolledId()); startPage(); resultAnalysis.setFilter(patrolTaskStatus.getFilter()); - resultAnalysis.setResCode("2000"); +// resultAnalysis.setResCode("2000"); + resultAnalysis.setResultType("2"); // 2异常 resultAnalysis.setPosType(patrolTaskStatus.getPosType()); List list = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); List algInfos = patrolResultService.selectAlgInfo(new PatrolResult()); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/bigmodel/service/impl/BigModelResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/bigmodel/service/impl/BigModelResultServiceImpl.java index 2c2729e..caafed6 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/bigmodel/service/impl/BigModelResultServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/bigmodel/service/impl/BigModelResultServiceImpl.java @@ -19,12 +19,11 @@ public class BigModelResultServiceImpl implements IBigModelResultService { public JSONObject getBigModelResult() { String analyseFilter = patrolTaskService.selectConfigByKey("ANALYSE_FILTER_URL"); log.info("-----调用大模型结果接口地址，url:{}", analyseFilter + "/bigModel/record/latest"); - String resultStr; + String resultStr = null; try { resultStr = HttpClientUtils.get(analyseFilter + "/bigModel/record/latest", ""); } catch (Exception e) { log.error("调用大模型结果接口，返回数据异常，exception:{}", e.getMessage()); - throw new RuntimeException(e); } log.error("调用大模型结果接口，返回数据，resultStr:{}", resultStr); JSONObject result = JSONObject.parseObject(resultStr); 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 bf95213..f85f3ea 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 @@ -106,6 +106,14 @@ public class PatrolTaskResultMainController extends BaseController { public TableDataInfo list(PatrolTaskResultMain patrolTaskResultMain) { this.startPage(); List list = this.patrolTaskResultMainService.selectPatrolTaskResultMain(patrolTaskResultMain); + for (PatrolTaskResultMain taskResultMain : list) { + String devType = taskResultMain.getDevType(); + if (StringUtils.isNotEmpty(devType)) { + String[] devTypes = devType.split(","); + List devTypeList = Arrays.stream(devTypes).distinct().collect(Collectors.toList()); + taskResultMain.setDevType(String.join(",", devTypeList)); + } + } return this.getDataTable(list); } 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 736c42d..36d0db6 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 @@ -192,17 +192,27 @@ public class PatrolTaskController extends BaseController { resultAnalysis.setAbnormal(patrolTaskStatus.getAbnormal()); resultAnalysis.setPosType(patrolTaskStatus.getPosType()); resultAnalysis.setResultType(patrolTaskStatus.getResultType()); - resultAnalysis.setResult("0"); + resultAnalysis.setFilter("1"); + logger.info("---------------[TASK] query resultAnalysis {}", resultAnalysis); List filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); + logger.info("---------------[TASK] query filterList {}", filterList); List algInfos = patrolResultService.selectAlgInfo(new PatrolResult()); - resultAnalysis.setResult("1"); + logger.info("----------------[TASK] query algInfos {}", algInfos); + resultAnalysis.setFilter("0"); long t2 = System.currentTimeMillis(); List newList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); + logger.info("----------------[TASK] query newList {}", newList); if (newList == null) { return getDataTable(2, new ArrayList<>(), new ArrayList<>()); } + List resultList = new ArrayList<>(); + resultList.addAll(filterList); + resultList.addAll(newList); + if (resultList == null || resultList.size() == 0) { + return getDataTable(2, new ArrayList<>(), new ArrayList<>()); + } long t3 = System.currentTimeMillis(); - for (PatrolData item : newList) { + for (PatrolData item : resultList) { // item.setAlgName((algInfos.stream().filter((alg) -> { // return alg.getAlgSubtypeCode().equals(item.getAlgType()); // }).findFirst().get()).getAlgSubtypeName()); @@ -214,22 +224,22 @@ public class PatrolTaskController extends BaseController { return alg.getAlgSubtypeCode().equals(item.getAlgType()); }).findFirst().get().getAlgSubtypeName() : "" ); - if ("0".equals(item.getFilter())) { - List filterDatas = filterList.stream().filter((data) -> { - return data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(item.getAlgType()); - }).collect(Collectors.toList()); - if (!filterDatas.isEmpty()) { - item.setImg((filterDatas.get(0)).getImgAnalyse()); - item.setFilterDesc((filterDatas.get(0)).getDesc()); - } else { - item.setImg(""); - } - } else { - item.setImg(item.getImgAnalyse()); - item.setImgAnalyse(""); - item.setFilterDesc(item.getDesc()); - item.setDesc(""); - } +// if ("0".equals(item.getFilter())) { +// List filterDatas = filterList.stream().filter((data) -> { +// return data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(item.getAlgType()); +// }).collect(Collectors.toList()); +// if (!filterDatas.isEmpty()) { +// item.setImg((filterDatas.get(0)).getImgAnalyse()); +// item.setFilterDesc((filterDatas.get(0)).getDesc()); +// } else { +// item.setImg(""); +// } +// } else { +// item.setImg(item.getImgAnalyse()); +// item.setImgAnalyse(""); +// item.setFilterDesc(item.getDesc()); +// item.setDesc(""); +// } AlgValue algValue = new AlgValue(); if(item.getResValue() != null) { @@ -244,13 +254,13 @@ public class PatrolTaskController extends BaseController { } if (StringUtils.isNotEmpty(resultAnalysis.getAlgName())) { - newList = newList.stream().filter((element) -> { + resultList = resultList.stream().filter((element) -> { return element.getAlgName().equals(resultAnalysis.getAlgName()); }).collect(Collectors.toList()); } if (StringUtils.isNotEmpty(resultAnalysis.getFilterDesc())) { - newList = newList.stream().filter((element) -> { + resultList = resultList.stream().filter((element) -> { return element.getFilterDesc().equals(resultAnalysis.getFilterDesc()); }).collect(Collectors.toList()); } @@ -258,15 +268,15 @@ public class PatrolTaskController extends BaseController { PageDomain pageDomain = TableSupport.buildPageRequest(); int pageNum = pageDomain.getPageNum(); int pageSize = pageDomain.getPageSize(); - int toNum = Math.min(newList.size(), pageNum * pageSize); - List pageList = newList.subList((pageNum - 1) * pageSize, toNum); + int toNum = Math.min(resultList.size(), pageNum * pageSize); + List pageList = resultList.subList((pageNum - 1) * pageSize, toNum); // int toNum = newList.size(); // List pageList = newList.subList(0, toNum); long t5 = System.currentTimeMillis(); logger.info("[MAIN TASK] task detail inquery step 1 cost: {}", (t2 - t1)); logger.info("[MAIN TASK] task detail inquery step 2 cost: {}", (t3 - t2)); logger.info("[MAIN TASK] task detail inquery step 3 cost: {}", (t5 - t3)); - return getDataTable(0, pageList, newList); + return getDataTable(0, pageList, resultList); } diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml index 6734d0d..490b5b0 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml @@ -207,7 +207,7 @@ b.result_type as warn_status, b.description as 'desc', b.res_img_url as img, - b.image_normal_url_path as img, + a.file_path as img, a.file_type as img_type, a.data_type, b.filter, @@ -249,10 +249,7 @@ and b.objectId=#{objectId} and b.result = #{result} - and b.result_type = - #{resultType} - - and b.result_type = + and b.result_type = #{resultType} and b.filter = #{filter} and b.point_status 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 adbb5b0..0cf72c4 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 @@ -550,6 +550,7 @@ result_analysis a WHERE a.res_code = '2000' + AND a.result_type = '0' AND a.filter = '1' AND a.point_status = '0' AND a.task_patrol_id = #{taskPatrolledId} @@ -561,6 +562,7 @@ result_analysis a WHERE a.res_code = '2000' + AND a.result_type = '0' AND a.filter = '0' AND a.point_status = '0' AND a.task_patrol_id = #{taskPatrolledId} @@ -571,7 +573,9 @@ FROM result_analysis a WHERE - a.res_code != '2000' + a.res_code = '2000' + AND a.result_type = '2' + AND a.point_status = '0' AND a.filter = '1' AND a.task_patrol_id = #{taskPatrolledId} ) csYcNum, @@ -581,7 +585,9 @@ FROM result_analysis a WHERE - a.res_code != '2000' + a.res_code = '2000' + AND a.result_type = '2' + AND a.point_status = '0' AND a.filter = '0' AND a.task_patrol_id = #{taskPatrolledId} ) aiYcNum