机床导入1

yangys

2025-08-22 ddafa0375398053baaafdee8612f68c1b75ff7cb

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

@@ -2,28 +2,48 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
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.mapper.MachineMapper;
import org.springblade.mdm.basesetting.machine.vo.MachineExcel;
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.springblade.mdm.basesetting.producedivision.entity.MdmDept;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.service.MdmDeptService;
import org.springblade.mdm.basesetting.producedivision.vo.DivisionExcel;
import org.springblade.mdm.basesetting.producedivision.vo.ImportResult;
import org.springblade.mdm.basesetting.producedivision.vo.QinzheFgbExcel;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dept;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;

@Service
public class MachineService extends BizServiceImpl<MachineMapper, Machine> {

   @Autowired
   private ISysClient sysClient;
   @Autowired
   private MdmDeptService mdmDeptService;
   @Transactional
   public void saveMachine(MachineSaveVO vo){
      checkMachine(vo);
@@ -86,11 +106,13 @@
      machine.setOperator(vo.getOperator());
      machine.setControlSystem(vo.getControlSystem());
      machine.setOwnerDept(vo.getOwnerDept());
      machine.setPollingHours(vo.getPollingHours());
      machine.setProgSendDir(vo.getProgSendDir());
      machine.setProgReceiveDir(vo.getProgReceiveDir());
      machine.setProgTempDir(vo.getProgTempDir());
      machine.setStatus(vo.getStatus());
      machine.setRemark(vo.getRemark());
      machine.setSendDirExpiryHours(vo.getSendDirExpiryHours());
      machine.setReceiveDirExpiryHours(vo.getReceiveDirExpiryHours());

      return this.updateById(machine);
   }
@@ -105,13 +127,13 @@
    */
   public IPage<MachineVO> pageQuery(MachineQueryVO query) {

      LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();
      //queryWrapper.eq(query.getMachineGroupCode()!=null, Machine::getMachineGroupCode, query.getMachineGroupCode());
      //String keys = query.getKeyword();

      //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;
      if (query.getDeptId() != null) {
         R<Dept> rs = sysClient.getDept(query.getDeptId());
         if(rs.isSuccess()){
            query.setDeptAncestors(rs.getData().getAncestors()+","+rs.getData().getId());
         }
      }
      return this.getBaseMapper().pageQuery(Condition.getPage(query), query);
   }

   /**
@@ -178,4 +200,6 @@
   public Machine getByCode(String machineCode) {
      return this.lambdaQuery().eq(Machine::getCode, machineCode).one();
   }


}