增加swagger注解

yangys

2025-06-04 b36c53b1ff6e6eee74be0f84ffc9257d651c37b7

增加swagger注解

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java

@@ -1,22 +1,18 @@
package org.springblade.mdm.basesetting.machine;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.entity.MachineSpec;
import org.springblade.mdm.basesetting.machine.mapper.MachineMapper;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@Service
public class MachineService extends BizServiceImpl<MachineMapper, Machine> {
@@ -33,27 +29,33 @@
        Machine machine = this.getById(vo.getId());

        machine.setMachineSpec(vo.getMachineSpec());

        machine.setName(vo.getName());
        machine.setMachineGroupId(vo.getMachineGroupId());
        return this.updateById(machine);
    }



    @Transactional
    public void removeMachines(List<Long> ids) {
        for(Long id : ids){

            this.removeById(id);
        }
    }



    /**
     * æŸ¥è¯¢åˆ†é¡µ
     * @param query æŸ¥è¯¢å‚æ•°
     * @return åˆ†é¡µæ•°æ®
     */
    public IPage<MachineVO> pageQuery(MachineQueryVO query) {

        LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(query.getMachineGroupId()!=null, Machine::getMachineGroupId, query.getMachineGroupId());
        IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),queryWrapper);

        //MachineSpec.valueOf()
        for (MachineVO record : page.getRecords()) {
            if(record.getMachineSpec() != null){
                MachineSpec spec = MachineSpec.valueOf(record.getMachineSpec());
                record.setMachineSpecName(spec.getText());
            }

        }
        return page;
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java

@@ -54,7 +54,7 @@
    @PostMapping("/remove")
    public R<Void> remove(@RequestParam String ids) {
        try {
            service.removeMachines(Func.toLongList(ids));
            service.removeBatchByIds(Func.toLongList(ids));
        } catch (Exception e) {
            log.error("删除异常",e);
            return R.fail(e.getMessage());
@@ -68,15 +68,7 @@
    @Operation(summary = "分页查询", description = "名称或编码")
    @GetMapping("/page")
    public R<IPage<MachineVO>> page(MachineQueryVO query) {
        /*
        LambdaQueryWrapper<MachineGroup> wrapper = new LambdaQueryWrapper<>();
        //wrapper.like(StringUtils.isNotBlank(keyword),MachineGroup::getName, "%"+keyword+"%");
        wrapper.and(StringUtils.isNotBlank(keyword),(w1)->{
            w1.like(MachineGroup::getName,"%"+keyword+"%")
                .or().like(MachineGroup::getCode,"%"+keyword+"%");
        });

         */

        IPage<MachineVO> pages = service.pageQuery(query);
        return R.data(pages);

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/MachineSpec.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.springblade.mdm.basesetting.machine.entity;

import lombok.Getter;
@Getter
public enum MachineSpec {

    TURNING("车床"),
    /**
     * é€šçŸ¥ç±»åž‹
     */
    MILLING("铣床");

    MachineSpec(String text){
        this.text = text;
    }

    private final String text;

}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineQueryVO.java

@@ -1,13 +1,21 @@
package org.springblade.mdm.basesetting.machine.vo;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springblade.core.mp.support.Query;

/**
 * åˆ†é¡µæ‹†çº¿å‘¢
 */

@Schema(description = "机床查询对象")
@Setter
@Getter
public class MachineQueryVO extends Query {
    @Schema(description = "名称或编码")
    private String keyword;
    @Schema(description = "机床组id")
    private Long machineGroupId;

}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java

@@ -18,6 +18,8 @@
     * æœºå™¨è§„æ ¼:01车床/02铣床,在业务字典配置（key=machine_spec）
     */
    private String machineSpec;

    private String machineSpecName;
    /**
     * æ“ä½œå‘˜ï¼Œæ–‡æœ¬å½•å…¥
     */