yangys
2025-06-03 9205ef259eeb6e18e2bbb26b7e8ebbc6b4d450bc
机器组+remove
已修改2个文件
31 ■■■■■ 文件已修改
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineGroupService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineGroupService.java
@@ -5,6 +5,19 @@
import org.springframework.stereotype.Service;
import org.springblade.mdm.basesetting.machine.mapper.MachineGroupMapper;
import org.springblade.mdm.basesetting.machine.entity.MachineGroup;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service
public class MachineGroupService extends BaseServiceImpl<MachineGroupMapper, MachineGroup> {
    @Transactional
    public void removeGroups(List<Long> ids){
        //TODO 检查下面是否有机器
        for(Long id : ids){
            this.removeById(id);
        }
    }
}
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineGroupService;
import org.springblade.mdm.basesetting.machine.entity.MachineGroup;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +17,7 @@
import java.util.Map;
@Slf4j
@RestController
@RequestMapping("/machinegroup")
@Tag(name = "机床组", description = "机床组")
@@ -44,6 +47,21 @@
    }
    /**
     * 删除
     */
    @Operation(summary = "删除", description = "删除")
    @PostMapping("/remove")
    public R<Void> remove(@RequestParam String ids) {
        try {
            grpService.removeGroups(Func.toLongList(ids));
        } catch (Exception e) {
            log.error("删除异常",e);
            return R.fail(e.getMessage());
        }
        return R.status(true);
    }
    /**
     * 分页
     */
    @Operation(summary = "分页查询", description = "名称或编码")