From 2c2bd93f3c55641badd902c5b45451323ede9b18 Mon Sep 17 00:00:00 2001 From: guoapeng Date: Wed, 5 Mar 2025 21:41:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=9F=BA=E8=B4=A8=E5=88=A0=E9=99=A4bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- matrix-spray.db | Bin 36864 -> 36864 bytes .../java/com/qyft/ms/app/service/CMDService.java | 19 ++++++++++++------- .../app/service/impl/ISysSettingsServiceImpl.java | 1 + .../qyft/ms/app/service/impl/MatrixServiceImpl.java | 13 ++++++++++--- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/matrix-spray.db b/matrix-spray.db index d5176e0e185087faa1c2d637c10925ecd7404f82..d046a7633296c46f5958ddb0641b19f3e5c76a18 100644 GIT binary patch delta 136 zcmZozz|^pSX@WFk)kGO*#;T18&H9Xdo1f^*3h?vqWnkp5V&JdhH{mzod%0Oq;2PiL zXMTQeE_|#E;_mK7U|?Wms%v1ZYhW5;WME}#0z`TyCI-gFriKOvM))KrSNS`$FfcGU KZ$9X6?*IU&q#@}5 delta 136 zcmZozz|^pSX@WFk`9v9K#`28`&H9YIo1f^*3h*;9Ffj2~G4Su@ui`i1d%0Oq;2PiL zXMTQePMoX^!tU command : cmdList) { boolean result = command.get(); + try { + Thread.sleep(100); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } if(!running) { log.error("指令线程停止: {}", JSONUtil.toJsonStr(form)); executionResult.setStatus(CMDResultCode.FAILURE.getCode()); @@ -330,13 +335,13 @@ public class CMDService { // } catch (InterruptedException e) { // throw new RuntimeException(e); // } -// if (!result) { -// log.error("指令执行异常: {}", JSONUtil.toJsonStr(form)); -// executionResult.setStatus(CMDResultCode.FAILURE.getCode()); -// executionResult.setMessage(CMDResultCode.FAILURE.getMsg()); -// webSocketService.pushMsg(WebSocketMessageType.CMD, executionResult); -// return; -// } + if (!result) { + log.error("指令执行异常: {}", JSONUtil.toJsonStr(form)); + executionResult.setStatus(CMDResultCode.FAILURE.getCode()); + executionResult.setMessage(CMDResultCode.FAILURE.getMsg()); + webSocketService.pushMsg(WebSocketMessageType.CMD, executionResult); + return; + } } log.info("指令执行成功: {}", JSONUtil.toJsonStr(form)); executionResult.setStatus(CMDResultCode.SUCCESS.getCode()); diff --git a/src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java b/src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java index 9a8bc36..f7e66ab 100644 --- a/src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java +++ b/src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java @@ -50,6 +50,7 @@ public class ISysSettingsServiceImpl extends ServiceImpl impleme @Override public List deleteMatrix(String ids) { + // 不能删除的name集合 List nameList = new ArrayList<>(); List idsArr = Arrays.stream(ids.split(",")) .map(Long::parseLong) .toList(); + // 能删除的id集合 List removeIdList = new ArrayList<>(); for (Long id : idsArr) { @@ -52,9 +54,14 @@ public class MatrixServiceImpl extends ServiceImpl impleme nameList.add(matrix.getName()); } } - if(!this.removeByIds(removeIdList)){ - return null; + + if (removeIdList.isEmpty()) { + // 无可删除项时直接返回不可删除的nameList(可能为空) + return nameList.isEmpty() ? null : nameList; } - return nameList; + + // 执行删除并返回结果 + boolean result = this.removeByIds(removeIdList); + return result ? nameList : null; } }