Merge branch 'dev' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone into dev

dk-common/common-core/src/main/java/org/dromara/common/core/constant/AiCompareStatusConstants.java

@@ -33,8 +33,7 @@ public interface AiCompareStatusConstants {
     String QUEUW_TYPE_0="0";
 
     String QUEUW_TYPE_1="1";
-    /** 平台类型  2:天眼巡*/
-    Integer COMPARETYPE=2;
+
 
 
 }

dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java

@@ -153,11 +153,12 @@ public class AiCompareServiceImpl implements IAiCompareService {
 
             String compareUrl = remoteSystemFeign.getConfigKeyFeign("ai_algorithm_compare");
             if(StrUtil.isNotEmpty(compareUrl)){
+                Integer compareType = Convert.toInt(remoteSystemFeign.getConfigKeyFeign("compareType"),2);
                 //添加到算法平台
                 Map<String,Object>compareMap = new HashMap<>();
                 compareMap.put("id",aiCompareEntity.getId());
                 compareMap.put("totalNum",aiCompareEntity.getTotalNum());
-                compareMap.put("compareType",AiCompareStatusConstants.COMPARETYPE);
+                compareMap.put("compareType",compareType);
                 compareMap.put("compareName",aiCompareEntity.getWaylineName());
                 compareMap.put("parm",mediaFileDTOS);
                 compareMap.put("mateTask",templateId);
@@ -229,11 +230,12 @@ public class AiCompareServiceImpl implements IAiCompareService {
         //平台url
         String compareUrl = remoteSystemFeign.getConfigKeyFeign("ai_algorithm_compare");
         if(StrUtil.isNotEmpty(compareUrl)){
+            Integer compareType = Convert.toInt(remoteSystemFeign.getConfigKeyFeign("compareType"),2);
             //添加到算法平台
             Map<String,Object>compareMap = new HashMap<>();
             compareMap.put("id",aiCompareEntity.getId());
             compareMap.put("totalNum",aiCompareEntity.getTotalNum());
-            compareMap.put("compareType",AiCompareStatusConstants.COMPARETYPE);
+            compareMap.put("compareType",compareType);
             compareMap.put("compareName",aiCompareEntity.getWaylineName());
             compareMap.put("parm",mediaFileDTOS);
             compareMap.put("mateTask",templateId);
@@ -305,7 +307,8 @@ public class AiCompareServiceImpl implements IAiCompareService {
             //添加到算法平台
             String compareUrl = remoteSystemFeign.getConfigKeyFeign("ai_algorithm_frame");
             if(StrUtil.isNotEmpty(compareUrl)){
-                frameDTO.setCompareType(AiCompareStatusConstants.COMPARETYPE);
+                Integer compareType = Convert.toInt(remoteSystemFeign.getConfigKeyFeign("compareType"),2);
+                frameDTO.setCompareType(compareType);
                 try(CloseableHttpClient httpClient = HttpClients.createDefault()) {
                     HttpPost httpPost =new HttpPost();
                     httpPost.setHeader("Content-Type","application/json");