机床类型去掉枚举

yangys

2025-07-29 ee0c27cf30140d50b91fe4e08fa48052e910fd1f

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

@@ -7,16 +7,13 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
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 org.springframework.util.FileSystemUtils;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
@@ -38,6 +35,7 @@
      Machine machine = this.getById(vo.getId());

      machine.setMachineSpec(vo.getMachineSpec());
      machine.setCode(vo.getCode());
      machine.setName(vo.getName());
      machine.setMachineGroupCode(vo.getMachineGroupCode());
      machine.setManufacturer(vo.getManufacturer());
@@ -47,6 +45,7 @@
      machine.setPollingHours(vo.getPollingHours());
      machine.setProgSendDir(vo.getProgSendDir());
      machine.setProgReceiveDir(vo.getProgReceiveDir());
      machine.setStatus(vo.getStatus());
      machine.setRemark(vo.getRemark());

      return this.updateById(machine);
@@ -63,17 +62,11 @@
   public IPage<MachineVO> pageQuery(MachineQueryVO query) {

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

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

      }
      //queryWrapper.and(StringUtils.isNotEmpty(keys), wrapper -> wrapper.like(Machine::getCode, keys).or().like(Machine::getName, keys));
      IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);
      return page;
   }

@@ -139,7 +132,6 @@
    * @return
    */
   public Machine getByCode(String machineCode) {

      return this.getOne(this.lambdaQuery().eq(Machine::getCode, machineCode));
      return this.lambdaQuery().eq(Machine::getCode, machineCode).one();
   }
}