From 4aff06ac8b5b7b6509b6f45202bf750660529f5a Mon Sep 17 00:00:00 2001 From: weitang Date: Fri, 6 Jun 2025 09:19:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../algorithm/service/impl/AlgorithmTaskManager.java | 2 +- .../controller/SubstationMaindeviceController.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmTaskManager.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmTaskManager.java index eb3199f..a29b867 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmTaskManager.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmTaskManager.java @@ -22,7 +22,7 @@ public class AlgorithmTaskManager { private static final String JOB_GROUP_PREFIX = "STATION_"; // 存储每个 stationCode 对应的 Scheduler - private Map schedulers = new HashMap<>(); + private final Map schedulers = new HashMap<>(); /** * 添加定时任务 diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationMaindeviceController.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationMaindeviceController.java index 49fe25e..76c5d94 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationMaindeviceController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationMaindeviceController.java @@ -25,10 +25,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -113,6 +110,9 @@ public class SubstationMaindeviceController { @GetMapping("/getMainDeviceByType") @ApiOperation("根据主设备类型获取主设备") public ResponseResult getMainDeviceByType(String stationCode, String deviceType) { + if (StrUtil.isBlank(stationCode) || StrUtil.isBlank(deviceType)) { + return ResponseResult.successData(new ArrayList<>()); + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(StrUtil.isNotBlank(stationCode), SubstationMaindevice::getStationCode, stationCode); queryWrapper.eq(StrUtil.isNotBlank(deviceType), SubstationMaindevice::getDeviceType, StrUtil.split(deviceType