|
|
@ -395,6 +395,7 @@ public class ResultAnalysisController extends BaseController { |
|
|
|
|
|
|
|
|
@GetMapping({"/updateWarn"}) |
|
|
@GetMapping({"/updateWarn"}) |
|
|
public AjaxResult updateWarn(PatrolTaskInfo patrolTaskInfo) { |
|
|
public AjaxResult updateWarn(PatrolTaskInfo patrolTaskInfo) { |
|
|
|
|
|
List<String> algs = Arrays.asList("gis_meter2", "gis_meter", "infrared", "infra_1800", "infra_yu3", "infra_camera", "infra_camera_reverse", "switch", "meter"); |
|
|
if (patrolTaskInfo.getLineIds() == null) { |
|
|
if (patrolTaskInfo.getLineIds() == null) { |
|
|
patrolTaskInfo.setLineIds(patrolTaskInfo.getLineId() + ""); |
|
|
patrolTaskInfo.setLineIds(patrolTaskInfo.getLineId() + ""); |
|
|
} |
|
|
} |
|
|
@ -414,7 +415,7 @@ public class ResultAnalysisController extends BaseController { |
|
|
if (strs.length == 1 |
|
|
if (strs.length == 1 |
|
|
&& (PointStatusEnum.CONFIRMED.getCode().equals(patrolTaskInfo.getStatus()) |
|
|
&& (PointStatusEnum.CONFIRMED.getCode().equals(patrolTaskInfo.getStatus()) |
|
|
|| PointStatusEnum.TRACKING.getCode().equals(patrolTaskInfo.getStatus())) |
|
|
|| PointStatusEnum.TRACKING.getCode().equals(patrolTaskInfo.getStatus())) |
|
|
&& "1".equals(analysis.getFilter()) && !"meter".equals(analysis.getAlgType())) { |
|
|
|
|
|
|
|
|
&& "1".equals(analysis.getFilter()) && !algs.contains(analysis.getAlgType())) { |
|
|
// 初筛大模型都改 都覆盖 |
|
|
// 初筛大模型都改 都覆盖 |
|
|
analysis.setLineId(null); |
|
|
analysis.setLineId(null); |
|
|
analysis.setDescription("缺陷"); |
|
|
analysis.setDescription("缺陷"); |
|
|
|