全部提交

yangys

2025-08-22 538857185263f29b325de9a34ae066c21b7cd371

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

@@ -1,37 +1,28 @@
package org.springblade.mdm.basesetting.machine.controller;

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.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
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.service.MachineImportService;
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.system.pojo.entity.User;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

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

@Slf4j
@RestController
@@ -41,15 +32,20 @@

   @Autowired
   private MachineService service;

   @Autowired
   private MachineImportService machineImportService;
   /**
    * 新增
    */
   @PostMapping("/save")
   @Operation(summary = "新增", description = "机床组信息")
   @Operation(summary = "新增", description = "机床信息")
   public R<Boolean> save(@RequestBody MachineSaveVO vo) {

      service.saveMachine(vo);
      try {
         service.saveMachine(vo);
      }catch (Exception e) {
         log.error("新增机床失败", e);;
         return R.fail(e.getMessage());
      }
      return R.<Boolean>status(true);
   }

@@ -59,7 +55,6 @@
   @Operation(summary = "修改", description = "机床信息")
   @PostMapping("/update")
   public R<Boolean> update(@RequestBody MachineSaveVO vo) {

      return R.<Boolean>status(service.updateMachine(vo));
   }

@@ -69,6 +64,17 @@
      return R.data(service.detail(id));
   }

   @PostMapping("import")
   @ApiOperationSupport(order = 1)
   @Operation(summary = "机床导入", description = "机床导入，全部成功返回空串，部分成功返回具体信息")
   public R<String> importMachines(@RequestParam MultipartFile file) {
      try {
         return R.data(machineImportService.importMachines(file));
      }catch (Exception e){
         log.error("导入错误",e);
         return R.fail(e.getMessage());
      }
   }
   /**
    * 删除
    */
@@ -102,14 +108,14 @@
      query.setSize(Integer.MAX_VALUE);
      IPage<MachineVO> pages = service.pageQuery(query);

      List<MachineExcelVO> list = new ArrayList<>();
      List<MachineExcel> list = new ArrayList<>();
      pages.getRecords().forEach(m ->{
         MachineExcelVO excelVO = new MachineExcelVO();
         MachineExcel excelVO = new MachineExcel();
         BeanUtils.copyProperties(m, excelVO);
         list.add(excelVO);
      });

      ExcelUtil.export(response, "机床数据" + DateUtil.time(), "用户数据表", list, MachineExcelVO.class);
      ExcelUtil.export(response, "机床数据" + DateUtil.time(), "机床数据表", list, MachineExcel.class);
   }

   @Operation(summary = "产生机床回传结构树", description = "产生机床回传结构树")