修改分析接口bug

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -75,6 +75,7 @@ import java.net.URLEncoder;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -1009,7 +1010,13 @@ public class AnalysisServiceImpl implements AnalysisService {
         configAnalysisCodes.stream().forEach(item -> {
             String[] typeStrs = item.split("\\|");
             String flag = analysisTypeMapper.selecFlagByCode(typeStrs[0]);
-            flag = flag.substring(0,flag.lastIndexOf("|") + 1) + typeStrs[1];
+            String dataSource;
+            if(StringUtils.isNotBlank(analysisDto.getScada())){
+                dataSource = analysisDto.getScada();
+            }else{
+                dataSource = typeStrs[1];
+            }
+            flag = flag.substring(0,flag.lastIndexOf("|") + 1) + dataSource;
             flags.add(flag);
         });
         analysisDto.setConfigAnalysis(flags.stream().collect(Collectors.toList()));

energy-manage-service/src/main/resources/mybatis/analysis/AnalysisTypeMapper.xml

@@ -55,5 +55,6 @@
         type_flag
         from analysis_type
         where  type_code = #{typeCode,jdbcType=VARCHAR}
+        limit 1
     </select>
 </mapper>