diff --git a/matrix-spray.db b/matrix-spray.db index d5176e0..d046a76 100644 Binary files a/matrix-spray.db and b/matrix-spray.db differ diff --git a/src/main/java/com/qyft/ms/app/service/CMDService.java b/src/main/java/com/qyft/ms/app/service/CMDService.java index 25075d2..baa37d2 100644 --- a/src/main/java/com/qyft/ms/app/service/CMDService.java +++ b/src/main/java/com/qyft/ms/app/service/CMDService.java @@ -318,6 +318,11 @@ public class CMDService { for (Supplier 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; } }