From 2d4653b29a231719cfabdddbee7757d378b0a689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=BD=87=E5=87=AF?= <kkktxk@qq.com>
Date: Fri, 6 Jun 2025 16:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E7=AE=A1=E7=90=86=E8=A7=84=E8=8C=83=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/machine/controller/vo/MachineEnvVO.java  |  1 +
 .../module/machine/dal/dataobject/MachineEnvDO.java |  6 +++++-
 .../module/machine/dal/mysql/MachineEnvMapper.java  | 10 ++--------
 .../machine/service/impl/MachineEnvServiceImpl.java | 13 ++++++++++++-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java
index 922daaaa..8d5a5545 100644
--- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java
+++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/vo/MachineEnvVO.java
@@ -5,6 +5,7 @@ import lombok.*;
 import lombok.experimental.Accessors;
 import java.time.LocalDateTime;
 
+@EqualsAndHashCode(callSuper = true)
 @Schema(description = "管理后台 - 机器环境变量信息 Response VO")
 @Data
 @NoArgsConstructor
diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java
index 4c4589a4..61a6e25b 100644
--- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java
+++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/dataobject/MachineEnvDO.java
@@ -15,10 +15,10 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Accessors(chain = true)
-@TableName("machine_env")
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@TableName("machine_env")
 public class MachineEnvDO extends BaseDO  {
 
 
@@ -51,3 +51,7 @@ public class MachineEnvDO extends BaseDO  {
 
 
 }
+
+
+
+
diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java
index a51b31fb..f2cf426e 100644
--- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java
+++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/dal/mysql/MachineEnvMapper.java
@@ -16,13 +16,7 @@ public interface MachineEnvMapper extends BaseMapperX<MachineEnvDO> {
     default PageResult<MachineEnvDO>selectPage(MachineEnvVO machineEnvVO){
         return selectPage(machineEnvVO,new LambdaQueryWrapperX<MachineEnvDO>()
                 .likeIfPresent(MachineEnvDO::getEnvKey, machineEnvVO.getEnvKey())
-                .likeIfPresent(MachineEnvDO::getDescription, machineEnvVO.getDescription())
-                .inIfPresent(MachineEnvDO::getMachineId, machineEnvVO.getMachineId())
-                .orderByDesc( MachineEnvDO::getMachineId));
-    }
-    default void deleteBatchByIds(String ids) {
-        this.delete(new LambdaQueryWrapperX<MachineEnvDO>()
-                .in(MachineEnvDO::getId, ids.split(","))
-        );
+                .likeIfPresent(MachineEnvDO::getDescription, machineEnvVO.getDescription()));
     }
+
 }
\ No newline at end of file
diff --git a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java
index c17fb6b7..a4b4efe5 100644
--- a/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java
+++ b/modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/MachineEnvServiceImpl.java
@@ -10,6 +10,10 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import cd.casic.framework.commons.util.object.BeanUtils;
+
+import java.util.Arrays;
+import java.util.List;
+
 import static cd.casic.framework.commons.exception.util.ServiceExceptionUtil.exception;
 import static cd.casic.module.machine.contants.MachineErrorCodeConstants.*;
 
@@ -56,7 +60,14 @@ public class MachineEnvServiceImpl  implements MachineEnvService {
 
     @Override
     public void deleteEnvList(String ids) {
-        machineEnvMapper.deleteBatchByIds(ids);
+        //ids转换为List,使用流
+        List<Long> machineEnvIds = Arrays.stream(ids.split(","))
+                .map(String::trim)
+                .filter(s -> !s.isEmpty())
+                .map(Long::parseLong)
+                .toList();
+
+        machineEnvMapper.deleteBatchIds(machineEnvIds);
     }
 
     @Override