fix:基质删除bug修复

src/main/java/com/qyft/ms/app/service/CMDService.java

@@ -318,6 +318,11 @@ public class CMDService {
             for (Supplier<Boolean> 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());

src/main/java/com/qyft/ms/app/service/impl/ISysSettingsServiceImpl.java

@@ -50,6 +50,7 @@ public class ISysSettingsServiceImpl extends ServiceImpl<SysSettingsMapper, SysS
                 "y", Double.parseDouble(positionList[0]),
                 "z", Double.parseDouble(positionList[0])
         );
+
     }
 
     public void updateWorkStatus(String status) {

src/main/java/com/qyft/ms/app/service/impl/MatrixServiceImpl.java

@@ -37,10 +37,12 @@ public class MatrixServiceImpl extends ServiceImpl<MatrixMapper, Matrix> impleme
 
     @Override
     public List<String> deleteMatrix(String ids) {
+        // 不能删除的name集合
         List<String> nameList = new ArrayList<>();
         List<Long> idsArr = Arrays.stream(ids.split(","))
                 .map(Long::parseLong)
                 .toList();
+        // 能删除的id集合
         List<Long> removeIdList = new ArrayList<>();
         for (Long id : idsArr) {
 
@@ -52,9 +54,14 @@ public class MatrixServiceImpl extends ServiceImpl<MatrixMapper, Matrix> 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;
     }
 }