Merge remote-tracking branch 'origin/dev-0' into dev-0

common/common-core/src/main/java/com/hdkj/lt/core/plugins/security/SqlExecuterTimeInterceptor.java

@@ -49,7 +49,7 @@ public class SqlExecuterTimeInterceptor implements Interceptor {
         } finally {
             // 拼接日志打印过程
             long costTime = endTime - startTime;
-            logger.info("\n 执行SQL耗时：{}ms 执行SQL：{}", costTime, printSql.length() > 200 ? printSql.substring(0, 200) : printSql);
+            logger.info("\n 执行SQL耗时：{}ms 执行SQL：{}", costTime, printSql.length() > 1000 ? printSql.substring(0, 1000) : printSql);
         }
         return proceed;
     }

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/service/base/impl/FhzgPlanSchemeScoreServiceImpl2.java

@@ -175,8 +175,8 @@ public class FhzgPlanSchemeScoreServiceImpl2 implements FhzgSchemeScoreService {
         @Override
         public int compare(Object o1, Object o2) {
             if (o1 == o2) return 0;
-            if (o1 == null) return -1;
-            if (o2 == null) return 1;
+            if (o1 == null) return 1;
+            if (o2 == null) return -1;
             return ((Comparable) o1).compareTo(o2);
         }
     }
@@ -185,8 +185,8 @@ public class FhzgPlanSchemeScoreServiceImpl2 implements FhzgSchemeScoreService {
         @Override
         public int compare(Object o1, Object o2) {
             if (o1 == o2) return 0;
-            if (o1 == null) return -1;
-            if (o2 == null) return 1;
+            if (o1 == null) return 1;
+            if (o2 == null) return -1;
             return ((Comparable) o2).compareTo(o1);
         }
     }

services/load-transfer-si/src/main/java/com/hdkj/lt/si/service/svg/impl/SvgGenerationServiceImpl.java

@@ -538,7 +538,7 @@ public class SvgGenerationServiceImpl implements ISvgGenerationService {
                                               List<FeederBaseVO> feederList, List<StateEstimation.StateEstimationSwitchResult> list) {
         List<String> kgPsrTypes = Arrays.asList(DictConstants.KG_PSR_TYPE.split(","));
         // 线路下的事件场景对象
-        SvgObjectDTO svgObject = svgGeneration.getSvgObject();
+        SvgObjectDTO svgObject = Optional.ofNullable(svgGeneration.getSvgObject()).orElse(SvgObjectDTO.builder().build());
         List<AppendDeviceDTO> deviceList = distLineSwitchSectionService.getLineSwitchSectionDetails(svgObject.getObjId(), feeder, kgPsrTypes);
         // 分组所属开关开关信息
         Map<String, List<AppendDeviceDTO>> deviceMap = deviceList.stream().collect(Collectors.groupingBy(AppendDeviceDTO::getSwitchId));