机床回传文件调整

yangys

6 天以前 7551b1ae51da67627f7ed03276707127dfc9cdc6

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java

@@ -2,31 +2,33 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jakarta.servlet.ServletOutputStream;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.machineback.entity.MachineBackFile;
import org.springblade.mdm.machineback.mapper.MachineBackFileMapper;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
import org.springblade.mdm.program.service.NcProgramService;
import org.springframework.stereotype.Service;

import java.util.List;

@AllArgsConstructor
@Service
public class MachineBackFileService extends BizServiceImpl<MachineBackFileMapper, MachineBackFile> {
   /*
   @Transactional
   public void save(MachineSaveVO vo){
      //TODO
      Machine machine = new Machine();
      BeanUtil.copyProperties(vo, machine);
      this.save(machine);
   }
   */

   private final NcProgramService progService;
   private final OssTemplate ossTemplate;
   /**
    * 接受
    * @param ids
    */
   public void accept(String ids) {

      List<Long> idList = Func.toLongList(ids);
@@ -34,17 +36,25 @@
      for(Long id : idList){
         MachineBackFile backFile = this.getById(id);
         backFile.setStatus(MachineBackFile.STATUS_ACCEPTED);
         backFile.setConfirmTime(DateUtil.now());
         this.updateById(backFile);


      }

   }

   /**
    * 拒绝
    * @param ids
    */
   public void reject(String ids) {
      List<Long> idList = Func.toLongList(ids);

      for(Long id : idList){
         MachineBackFile backFile = this.getById(id);
         backFile.setStatus(MachineBackFile.STATUS_REJECTED);
         backFile.setConfirmTime(DateUtil.now());
         this.updateById(backFile);
      }

@@ -60,4 +70,16 @@

      return page;
   }

   /**
    * 机床回传程序处理分页查询
    * @param query 查询参数对象
    * @return 分页数据
    */
   public IPage<MachineBackFileVO> handlePageQuery(MachineBackFileHandleQueryVO query) {
      IPage<MachineBackFileVO> page = this.getBaseMapper().handlePageQuery(Condition.getPage(query),query);
      return page;
   }


}