机器环境变量管理规范化

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

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  {
 
 
 }
+
+
+
+

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())
+                .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(","))
-        );
     }
+
 }

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