机床回传文件调整

yangys

7 天以前 4852d6c95e98ef9390d9cbebce97c1bb7fcb04ad

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

@@ -3,17 +3,26 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.vo.MachineExcelVO;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.machineback.service.MachineBackFileService;
import org.springblade.mdm.machineback.vo.MachineBackFileExcelVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;

@Slf4j
@RestController
@@ -30,7 +39,7 @@
    */
   @Operation(summary = "接收", description = "接收文件")
   @PostMapping("/accept")
   public R<Void> accept(String ids) {
   public R<Void> accept(@RequestParam String ids) {
      service.accept(ids);
      return R.success();
   }
@@ -42,9 +51,9 @@
   @PostMapping("/reject")
   public R<Void> reject(@RequestParam String ids) {
      try {
         service.removeBatchByIds(Func.toLongList(ids));
         service.reject(ids);
      } catch (Exception e) {
         log.error("删除异常",e);
         log.error("拒绝异常",e);
         return R.fail(e.getMessage());
      }
      return R.status(true);
@@ -56,8 +65,27 @@
   @Operation(summary = "分页查询", description = "名称或编码")
   @GetMapping("/page")
   public R<IPage<MachineBackFileVO>> page(MachineBackFileQueryVO query) {

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

   /**
    * 分页
    */
   @Operation(summary = "导出Excel", description = "导出Excel")
   @GetMapping("/export-excel")
   public void exportExcel(MachineBackFileQueryVO query, HttpServletResponse response) {
      query.setCurrent(1);
      query.setSize(Integer.MAX_VALUE);

      IPage<MachineBackFileVO> pages = service.pageQuery(query);
      List<MachineBackFileExcelVO> list = new ArrayList<>();
      pages.getRecords().forEach(m ->{
         MachineBackFileExcelVO excelVO = new MachineBackFileExcelVO();
         BeanUtils.copyProperties(m, excelVO);
         excelVO.setCureStatus(m.getIsCured()==1?"已固化":"未固化");
         list.add(excelVO);
      });
      ExcelUtil.export(response, "机床回传文件" + DateUtil.time(), "机床回传文件表", list, MachineBackFileExcelVO.class);
   }
}