Browse Source

fix: 大模型算法新增无人机表计gis_meter2

master
yinhuaiwei 3 weeks ago
parent
commit
1d1d54fcd3
2 changed files with 22 additions and 13 deletions
  1. +21
    -0
      inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/AlgConstants.java
  2. +1
    -13
      inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java

+ 21
- 0
inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/AlgConstants.java View File

@ -1,5 +1,8 @@
package com.inspect.base.core.constant;
import java.util.Arrays;
import java.util.List;
public class AlgConstants {
public static final String METER = "meter";
public static final String GIS_METER_2 = "gis_meter2";
@ -11,4 +14,22 @@ public class AlgConstants {
public static final String XB = "xb";
public static final String ALG_SUBTYPE_CODE = "alg_subtype_code";
/**
* 需要走大模型的算法
*/
public static final List BIG_MODEL_ALG_LIST = Arrays.asList(
METER,
XB,
INFRA_1800,
INFRA_YU3,
INFRA_CAMERA,
INFRA_CAMERA_REVERSE,
INFRARED2,
"isolator",
"gis_meter",
"correction",
"switch",
GIS_METER_2
);
}

+ 1
- 13
inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java View File

@ -178,19 +178,7 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService {
bDefect,
analyseResPoint.getType(),
algType);
if (bDefect || (AlgConstants.METER.equals(algType)
|| AlgConstants.XB.equals(algType)
|| AlgConstants.INFRA_1800.equals(algType)
|| AlgConstants.INFRA_YU3.equals(algType)
|| AlgConstants.INFRA_CAMERA.equals(algType)
|| AlgConstants.INFRA_CAMERA_REVERSE.equals(algType)
|| AlgConstants.INFRARED2.equals(algType)
|| "isolator".equals(algType)
|| "gis_meter".equals(algType)
|| "correction".equals(algType)
|| "switch".equals(algType)
)
) {
if (bDefect || AlgConstants.BIG_MODEL_ALG_LIST.contains(algType)) {
/*
* 先检查结果有缺无缺陷如果有缺陷不用判断算法直接调用大模型*
* 如果无缺陷再去判断算法如果算法是meter, infrared就继续调用大模型*


Loading…
Cancel
Save