备件调整 导入导出

houjie

2023-08-30 80e8110e4f3a132ee2819f2560a661c6f6693fcf

备件调整  导入导出

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/SparePartImportVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,74 @@
package org.jeecg.modules.eam.entity;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.math.BigDecimal;

/**
 * @author lnl
 */
@Data
@Accessors(chain = true)
public class SparePartImportVo {

    @Excel(name = "备件编码")
    private String num;

    @Excel(name="备件名称")
    private String name;

    @Excel(name="型号")
    private String model;

    @Excel(name="规格")
    private String specification;

    @Excel(name="制造商" ,dicCode = "id",dictTable="mom_base_constructor",dicText="name")
    private String constructorId;

    @Excel(name="单位" ,dicCode = "id",dictTable="mom_base_unit",dicText="name")
    private String mainUnitId;


    @Excel(name = "批次管理标识", width = 15)
    private Integer batchManagedFlag;


    @Excel(name = "有效期管理标识", width = 15)
    private Integer validityManagedFlag;


    @Excel(name = "有效期", width = 15)
    private Integer validityPeriod;

    @Excel(name = "有效期单位", width = 15,dictTable="mom_base_unit",dicText="name")
    private String validityPeriodUnitId;

    @Excel(name = "库存上限制", width = 15)
    private Integer inventoryUpperLimit;

    @Excel(name = "库存下限制", width = 15)
    private Integer inventoryLowerLimit;

    @Excel(name = "库存预警下限", width = 15)
    private Integer inventoryWarnLimit;

    @Excel(name = "经济订货量", width = 15)
    private Integer economicOrderQuantity;


    @Excel(name = "采购提前期", width = 15)
    private Integer purchaseLeadTime;


    @Excel(name = "租户id", width = 15)
    private String tenantId;




}

 lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparePartController.java

@@ -1,271 +1,277 @@
package org.jeecg.modules.spare.controller;

import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.entity.SysUpload;
import org.jeecg.common.system.base.entity.SysUploadRela;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.model.InspectionCycleVo;
import org.jeecg.modules.spare.entity.SparePart;
import org.jeecg.modules.spare.entity.SparesPartInventory;
import org.jeecg.modules.spare.service.ISparePartService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.spare.entity.SparePart;
import org.jeecg.modules.spare.entity.SparesPartInventory;
import org.jeecg.modules.spare.service.ISparePartService;
import org.jeecg.modules.spare.service.ISparesPartInventoryService;
import org.jeecg.modules.spare.vo.AuxiliaryUnitVo;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

 /**
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

/**
 * @Description: mom_eam_spare_part
 * @Author: jeecg-boot
 * @Date:   2023-06-20
 * @Date: 2023-06-20
 * @Version: V1.0
 */
@Api(tags="mom_eam_spare_part")
@Api(tags = "mom_eam_spare_part")
@RestController
@RequestMapping("/spare/sparePart")
@Slf4j
public class SparePartController extends JeecgController<SparePart, ISparePartService> {
    @Autowired
    private ISparePartService sparePartService;
    @Autowired
    private ISparePartService sparePartService;

     @Autowired
    private ISparesPartInventoryService sparesPartInventoryService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param sparePart
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "mom_eam_spare_part-分页列表查询")
    @ApiOperation(value="mom_eam_spare_part-分页列表查询", notes="mom_eam_spare_part-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<SparePart>> queryPageList(SparePart sparePart,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<SparePart> queryWrapper = QueryGenerator.initQueryWrapper(sparePart, req.getParameterMap());
        Page<SparePart> page = new Page<SparePart>(pageNo, pageSize);
        IPage<SparePart> pageList = sparePartService.page(page, queryWrapper);
        for (SparePart record : pageList.getRecords()) {
            String mainUnitId = record.getMainUnitId();
            List<AuxiliaryUnitVo> auxiliaryUnits = sparePartService.getAuxiliaryUnits(mainUnitId);
            record.setAuxiliaryUnits(auxiliaryUnits);
        }
        return Result.OK(pageList);
    }

     /**
      * åˆ†é¡µåˆ—表查询
      * å¤‡ä»¶åº“存展示页
      */
     @ApiOperation(value="mom_eam_spare_part-分页列表查询", notes="mom_eam_spare_part-分页列表查询")
     @GetMapping(value = "/sparePartInventoryList")
     public Result<IPage<SparePart>> sparePartInventoryList(SparePart sparePart,
                                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                   HttpServletRequest req) {
         QueryWrapper<SparePart> queryWrapper = QueryGenerator.initQueryWrapper(sparePart, req.getParameterMap());
         Page<SparePart> page = new Page<SparePart>(pageNo, pageSize);
         IPage<SparePart> pageList = sparePartService.page(page, queryWrapper);
         for (SparePart record : pageList.getRecords()) {
             String sparePartId = record.getId();

             QueryWrapper<SparesPartInventory> wrapper = new QueryWrapper<>();
             wrapper.eq("spare_part_id", sparePartId)
                     .eq("del_flag", 0);
             wrapper.select("sum(main_quantity) as totalMainQuantity");
             Map<String, Object> map = sparesPartInventoryService.getMap(wrapper);
             BigDecimal totalMainQuantity = new BigDecimal(0);
             if (map != null) {
                 totalMainQuantity = (BigDecimal)map.get("totalMainQuantity");
             }
             record.setTotalMainQuantity(totalMainQuantity);

             wrapper.eq("spare_part_id", sparePartId)
                     .eq("del_flag", 0);
             wrapper.select("sum(auxiliary_quantity) as totalAuxiliaryQuantity");
             Map<String, Object> map2 = sparesPartInventoryService.getMap(wrapper);
             BigDecimal totalAuxiliaryQuantity = new BigDecimal(0);
             if (map != null) {
                 totalAuxiliaryQuantity = (BigDecimal)map2.get("totalAuxiliaryQuantity");
             }
             record.setTotalAuxiliaryQuantity(totalAuxiliaryQuantity);

         }
         return Result.OK(pageList);
     }

	
    /**
     *   æ·»åŠ 
     *
     * @param sparePart
     * @return
     */
    @AutoLog(value = "mom_eam_spare_part-添加")
    @ApiOperation(value="mom_eam_spare_part-添加", notes="mom_eam_spare_part-添加")
    //@RequiresPermissions("org.jeecg.modules:mom_eam_spare_part:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody SparePart sparePart) {
        sparePartService.save(sparePart);
        return Result.OK("添加成功！");
    }
	
    /**
     *  ç¼–辑
     *
     * @param sparePart
     * @return
     */
    @AutoLog(value = "mom_eam_spare_part-编辑")
    @ApiOperation(value="mom_eam_spare_part-编辑", notes="mom_eam_spare_part-编辑")
    //@RequiresPermissions("org.jeecg.modules:mom_eam_spare_part:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody SparePart sparePart) {
        sparePartService.updateById(sparePart);
        return Result.OK("编辑成功!");
    }
	
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "mom_eam_spare_part-通过id删除")
    @ApiOperation(value="mom_eam_spare_part-通过id删除", notes="mom_eam_spare_part-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:mom_eam_spare_part:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        sparePartService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "mom_eam_spare_part-批量删除")
    @ApiOperation(value="mom_eam_spare_part-批量删除", notes="mom_eam_spare_part-批量删除")
    //@RequiresPermissions("org.jeecg.modules:mom_eam_spare_part:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.sparePartService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
	
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "mom_eam_spare_part-通过id查询")
    @ApiOperation(value="mom_eam_spare_part-通过id查询", notes="mom_eam_spare_part-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<SparePart> queryById(@RequestParam(name="id",required=true) String id) {
        SparePart sparePart = sparePartService.getById(id);
        if(sparePart==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(sparePart);
    }
    @Autowired
    private ISparesPartInventoryService sparesPartInventoryService;

    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param sparePart
    */
    //@RequiresPermissions("org.jeecg.modules:mom_eam_spare_part:exportXls")
     * åˆ†é¡µåˆ—表查询
     *
     * @param sparePart
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    @ApiOperation(value = "mom_eam_spare_part-分页列表查询", notes = "mom_eam_spare_part-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<SparePart>> queryPageList(SparePart sparePart,
                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                  HttpServletRequest req) {
        QueryWrapper<SparePart> queryWrapper = QueryGenerator.initQueryWrapper(sparePart, req.getParameterMap());
        Page<SparePart> page = new Page<SparePart>(pageNo, pageSize);
        IPage<SparePart> pageList = sparePartService.page(page, queryWrapper);
        for (SparePart record : pageList.getRecords()) {
            String mainUnitId = record.getMainUnitId();
            List<AuxiliaryUnitVo> auxiliaryUnits = sparePartService.getAuxiliaryUnits(mainUnitId);
            record.setAuxiliaryUnits(auxiliaryUnits);
        }
        return Result.OK(pageList);
    }

    /**
     * åˆ†é¡µåˆ—表查询
     * å¤‡ä»¶åº“存展示页
     */
    @ApiOperation(value = "mom_eam_spare_part-分页列表查询", notes = "mom_eam_spare_part-分页列表查询")
    @GetMapping(value = "/sparePartInventoryList")
    public Result<IPage<SparePart>> sparePartInventoryList(SparePart sparePart,
                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                           HttpServletRequest req) {
        QueryWrapper<SparePart> queryWrapper = QueryGenerator.initQueryWrapper(sparePart, req.getParameterMap());
        Page<SparePart> page = new Page<SparePart>(pageNo, pageSize);
        IPage<SparePart> pageList = sparePartService.page(page, queryWrapper);
        for (SparePart record : pageList.getRecords()) {
            String sparePartId = record.getId();

            QueryWrapper<SparesPartInventory> wrapper = new QueryWrapper<>();
            wrapper.eq("spare_part_id", sparePartId)
                    .eq("del_flag", 0);
            wrapper.select("sum(main_quantity) as totalMainQuantity");
            Map<String, Object> map = sparesPartInventoryService.getMap(wrapper);
            BigDecimal totalMainQuantity = new BigDecimal(0);
            if (map != null) {
                totalMainQuantity = (BigDecimal) map.get("totalMainQuantity");
            }
            record.setTotalMainQuantity(totalMainQuantity);

            wrapper.eq("spare_part_id", sparePartId)
                    .eq("del_flag", 0);
            wrapper.select("sum(auxiliary_quantity) as totalAuxiliaryQuantity");
            Map<String, Object> map2 = sparesPartInventoryService.getMap(wrapper);
            BigDecimal totalAuxiliaryQuantity = new BigDecimal(0);
            if (map != null) {
                totalAuxiliaryQuantity = (BigDecimal) map2.get("totalAuxiliaryQuantity");
            }
            record.setTotalAuxiliaryQuantity(totalAuxiliaryQuantity);

        }
        return Result.OK(pageList);
    }


    /**
     * æ·»åŠ 
     *
     * @param sparePart
     * @return
     */
    @AutoLog(value = "mom_eam_spare_part-添加")
    @ApiOperation(value = "mom_eam_spare_part-添加", notes = "mom_eam_spare_part-添加")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody SparePart sparePart) {
        sparePartService.save(sparePart);
        return Result.OK("添加成功！");
    }

    /**
     * ç¼–辑
     *
     * @param sparePart
     * @return
     */
    @AutoLog(value = "mom_eam_spare_part-编辑")
    @ApiOperation(value = "mom_eam_spare_part-编辑", notes = "mom_eam_spare_part-编辑")
    //@RequiresPermissions("org.jeecg.modules:mom_eam_spare_part:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<String> edit(@RequestBody SparePart sparePart) {
        sparePartService.updateById(sparePart);
        return Result.OK("编辑成功!");
    }

    /**
     * é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "mom_eam_spare_part-通过id删除")
    @ApiOperation(value = "mom_eam_spare_part-通过id删除", notes = "mom_eam_spare_part-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
        sparePartService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "mom_eam_spare_part-批量删除")
    @ApiOperation(value = "mom_eam_spare_part-批量删除", notes = "mom_eam_spare_part-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.sparePartService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    @ApiOperation(value = "mom_eam_spare_part-通过id查询", notes = "mom_eam_spare_part-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<SparePart> queryById(@RequestParam(name = "id", required = true) String id) {
        SparePart sparePart = sparePartService.getById(id);
        if (sparePart == null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(sparePart);
    }

    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param sparePart
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, SparePart sparePart) {
        return super.exportXls(request, sparePart, SparePart.class, "mom_eam_spare_part");
    }

    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("mom_eam_spare_part:importExcel")
     * é€šè¿‡excel导入数据
     *
     * @param request
     * @param response
     * @return
     */

    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, SparePart.class);
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            // èŽ·å–上传文件对象
            MultipartFile file = entity.getValue();
            ImportParams params = new ImportParams();
            params.setTitleRows(2);
            params.setHeadRows(1);
            params.setNeedSave(true);
            try {
                List<SparePart> list = ExcelImportUtil.importExcel(file.getInputStream(), SparePart.class, params);
                long start = System.currentTimeMillis();
                sparePartService.saveBatch(list);
                log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
                return Result.OK("文件导入成功！数据行数：" + list.size());
            } catch (Exception e) {
                log.error(e.getMessage(), e);
                return Result.error("文件导入失败:" + e.getMessage());
            } finally {
                try {
                    file.getInputStream().close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
        }
        return Result.error("文件导入失败！");
    }

     /**
      * é€šè¿‡è®¾å¤‡å¤‡ä»¶èŽ·å–适配的设备
      * qsw 2023-6-21
      */
     @GetMapping("getSpareContactEquipmentList")
     public Result<?> getSpareContactEquipmentList(@RequestParam("pageNo") Integer pageNo,
                                                   @RequestParam("pageSize") Integer pageSize,
                                                   @RequestParam Map<String, Object> params) {
         IPage<Map<String, Object>> spareContactEquipmentList = sparePartService.getSpareContactEquipmentList(pageNo, pageSize, params);
         return Result.ok(spareContactEquipmentList);
     }
    /**
     * é€šè¿‡è®¾å¤‡å¤‡ä»¶èŽ·å–适配的设备
     * qsw 2023-6-21
     */
    @GetMapping("getSpareContactEquipmentList")
    public Result<?> getSpareContactEquipmentList(@RequestParam("pageNo") Integer pageNo,
                                                  @RequestParam("pageSize") Integer pageSize,
                                                  @RequestParam Map<String, Object> params) {
        IPage<Map<String, Object>> spareContactEquipmentList = sparePartService.getSpareContactEquipmentList(pageNo, pageSize, params);
        return Result.ok(spareContactEquipmentList);
    }

     /**
      * æ ¹æ®ä¸»å•ä½èŽ·å–辅单位
      * qsw 2023-6-23
      */
     @GetMapping("getAuxiliaryUnits")
     public Result<?> getAuxiliaryUnits(@RequestParam(name = "mainUnitId", required = true) String mainUnitId) {
         List<AuxiliaryUnitVo> auxiliaryUnits = sparePartService.getAuxiliaryUnits(mainUnitId);
         return Result.ok(auxiliaryUnits);
     }
    /**
     * æ ¹æ®ä¸»å•ä½èŽ·å–辅单位
     * qsw 2023-6-23
     */
    @GetMapping("getAuxiliaryUnits")
    public Result<?> getAuxiliaryUnits(@RequestParam(name = "mainUnitId", required = true) String mainUnitId) {
        List<AuxiliaryUnitVo> auxiliaryUnits = sparePartService.getAuxiliaryUnits(mainUnitId);
        return Result.ok(auxiliaryUnits);
    }

     /**
      * æ ¹æ®ä¸»å•ä½ã€è¾…单位获取 å”¯ä¸€æ¢ç®—比例
      * qsw 2023-6-28
      */
     @GetMapping("getConversionRatio")
     public Result<?> getConversionRatio(@RequestParam(name = "mainUnitId", required = true) String mainUnitId,@RequestParam(name = "auxiliaryUnitId", required = true) String auxiliaryUnitId) {
         List<String> conversionRatio = sparePartService.getConversionRatio(mainUnitId, auxiliaryUnitId);
         if(conversionRatio.size()>0){
             return Result.ok(conversionRatio.get(0));
         }else{
             return Result.ok("");
         }
     }
    /**
     * æ ¹æ®ä¸»å•ä½ã€è¾…单位获取 å”¯ä¸€æ¢ç®—比例
     * qsw 2023-6-28
     */
    @GetMapping("getConversionRatio")
    public Result<?> getConversionRatio(@RequestParam(name = "mainUnitId", required = true) String mainUnitId, @RequestParam(name = "auxiliaryUnitId", required = true) String auxiliaryUnitId) {
        List<String> conversionRatio = sparePartService.getConversionRatio(mainUnitId, auxiliaryUnitId);
        if (conversionRatio.size() > 0) {
            return Result.ok(conversionRatio.get(0));
        } else {
            return Result.ok("");
        }
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/spare/controller/SparesPartInventoryController.java

@@ -10,19 +10,21 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.MaintenanceOrderActualWorkingHour;
import org.jeecg.modules.spare.entity.SparePart;
import org.jeecg.modules.spare.entity.SparesPartInventory;
import org.jeecg.modules.spare.service.ISparePartService;
import org.jeecg.modules.spare.service.ISparesPartInventoryService;
import org.jeecg.modules.spare.vo.AuxiliaryUnitVo;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -167,11 +169,74 @@
     * @param response
     * @return
     */

    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, SparesPartInventory.class);
    /**
     * å¯¼å…¥
     *
     * @return
     */
    @RequestMapping(value = "/importExcel/{mainId}")
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            // èŽ·å–上传文件对象
            MultipartFile file = entity.getValue();
            ImportParams params = new ImportParams();
            params.setTitleRows(2);
            params.setHeadRows(1);
            params.setNeedSave(true);
            try {
                List<SparesPartInventory> list = ExcelImportUtil.importExcel(file.getInputStream(), SparesPartInventory.class, params);
                for (SparesPartInventory temp : list) {
                    temp.setId(mainId);
                }
                long start = System.currentTimeMillis();
                sparesPartInventoryService.saveBatch(list);
                log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
                return Result.OK("文件导入成功！数据行数：" + list.size());
            } catch (Exception e) {
                log.error(e.getMessage(), e);
                return Result.error("文件导入失败:" + e.getMessage());
            } finally {
                try {
                    file.getInputStream().close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
        }
        return Result.error("文件导入失败！");
    }
   /* @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            // èŽ·å–上传文件对象
            MultipartFile file = entity.getValue();
            ImportParams params = new ImportParams();
            params.setTitleRows(2);
            params.setHeadRows(1);
            params.setNeedSave(true);
            try {
                List<SparesPartInventory> list = ExcelImportUtil.importExcel(file.getInputStream(), SparesPartInventory.class, params);
                long start = System.currentTimeMillis();
                sparesPartInventoryService.saveBatch(list);
                log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
                return Result.OK("文件导入成功！数据行数：" + list.size());
            } catch (Exception e) {
                log.error(e.getMessage(), e);
                return Result.error("文件导入失败:" + e.getMessage());
            } finally {
                try {
                    file.getInputStream().close();
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
        }
        return Result.error("文件导入失败！");
    }*/


    /**

 lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java

@@ -35,7 +35,6 @@
    private static final long serialVersionUID = 1L;

    /**备件分类id*/
    @Excel(name = "备件分类id", width = 15)
    @ApiModelProperty(value = "备件分类id")
    private java.lang.String sparePartCategoryId;
    /**备件编码*/
@@ -59,23 +58,22 @@
    @ApiModelProperty(value = "规则")
    private java.lang.String specification;
    /**制造商*/
    @Excel(name = "制造商", width = 15)
    @Excel(name = "制造商", width = 15,dictTable="mom_base_constructor",dicText="name")
    @ApiModelProperty(value = "制造商")
    @Dict(dicCode = "id",dictTable="mom_base_constructor",dicText="name")
    private java.lang.String constructorId;
    /**主单位id*/
    @Excel(name = "主单位id", width = 15)
    @Excel(name = "主单位", width = 15,dicCode = "id",dictTable="mom_base_unit",dicText="name")
    @ApiModelProperty(value = "主单位id")
    @Dict(dicCode = "id",dictTable="mom_base_unit",dicText="name")
    private java.lang.String mainUnitId;
    /**辅单位id*/
    @Excel(name = "辅单位id", width = 15)

    @ApiModelProperty(value = "辅单位id")
    @Dict(dicCode = "id",dictTable="mom_base_unit",dicText="name")
    private java.lang.String auxiliaryUnitId;

    /**换算比例*/
    @Excel(name = "换算比例", width = 15)
    @ApiModelProperty(value = "换算比例")
    private java.lang.String conversionRatio;

@@ -92,7 +90,7 @@
    @ApiModelProperty(value = "有效期")
    private java.lang.Integer validityPeriod;
    /**有效期单位*/
    @Excel(name = "有效期单位", width = 15)
    @Excel(name = "有效期单位", width = 15,dictTable="mom_base_unit",dicText="name")
    @ApiModelProperty(value = "有效期单位")
    @Dict(dicCode = "id",dictTable="mom_base_unit",dicText="name")
    private java.lang.String validityPeriodUnitId;
@@ -122,32 +120,33 @@
    @ApiModelProperty(value = "租户id")
    private java.lang.String tenantId;
    /**删除状态(0-正常,1-已删除)*/
    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)


    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
    @TableLogic
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    /**备注*/
    @Excel(name = "备注", width = 15)

    @ApiModelProperty(value = "备注")
    private java.lang.String remark;
    /**备用字段1*/
    @Excel(name = "备用字段1", width = 15)

    @ApiModelProperty(value = "备用字段1")
    private java.lang.String uda1;
    /**备用字段2*/
    @Excel(name = "备用字段2", width = 15)

    @ApiModelProperty(value = "备用字段2")
    private java.lang.String uda2;
    /**备用字段3*/
    @Excel(name = "备用字段3", width = 15)

    @ApiModelProperty(value = "备用字段3")
    private java.lang.String uda3;
    /**备用字段4*/
    @Excel(name = "备用字段4", width = 15)

    @ApiModelProperty(value = "备用字段4")
    private java.lang.String uda4;
    /**备用字段5*/
    @Excel(name = "备用字段5", width = 15)

    @ApiModelProperty(value = "备用字段5")
    private java.lang.String uda5;


 lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparesPartInventory.java

@@ -27,7 +27,6 @@
    /**
     * å¤‡ä»¶id
     */
    @Excel(name = "备件id", width = 15)
    @ApiModelProperty(value = "备件id")
    private java.lang.String sparePartId;
    /**
@@ -54,36 +53,36 @@
    /**
     * åˆ¶é€ å•†
     */
    @Excel(name = "制造商", width = 15)
    @Excel(name = "制造商", width = 15,dictTable = "mom_base_constructor", dicCode = "id", dicText = "name")
    @ApiModelProperty(value = "制造商")
    @Dict(dictTable = "mom_base_constructor", dicCode = "id", dicText = "name")
    private java.lang.String constructorId;
    /**
     * ä¸»å•ä½id
     */
    @Excel(name = "主单位id", width = 15)
    @Excel(name = "主单位id", width = 15,dictTable = "mom_base_unit", dicCode = "id", dicText = "name")
    @ApiModelProperty(value = "主单位id")
    @Dict(dictTable = "mom_base_unit", dicCode = "id", dicText = "name")
    private java.lang.String mainUnitId;
    /**
     * è¾…单位id
     */
    @Excel(name = "辅单位id", width = 15)

    @ApiModelProperty(value = "辅单位id")
    @Dict(dictTable = "mom_base_unit", dicCode = "id", dicText = "name")
    private java.lang.String auxiliaryUnitId;

    @Excel(name = "仓库id", width = 15)
    @Excel(name = "仓库id", width = 15,dictTable = "mom_base_warehouse", dicCode = "id", dicText = "name")
    @ApiModelProperty(value = "仓库id")
    @Dict(dictTable = "mom_base_warehouse", dicCode = "id", dicText = "name")
    private java.lang.String warehouseId;

    @Excel(name = "库区id", width = 15)
    @Excel(name = "库区id", width = 15,dictTable = "mom_base_warehouse_area", dicCode = "id", dicText = "name")
    @ApiModelProperty(value = "库区id")
    @Dict(dictTable = "mom_base_warehouse_area", dicCode = "id", dicText = "name")
    private java.lang.String warehouseAreaId;

    @Excel(name = "库位id", width = 15)
    @Excel(name = "库位id", width = 15,dictTable = "mom_base_warehouse_location", dicCode = "id", dicText = "name")
    @ApiModelProperty(value = "库位id")
    @Dict(dictTable = "mom_base_warehouse_location", dicCode = "id", dicText = "name")
    private java.lang.String warehouseLocationId;
@@ -96,7 +95,6 @@
    /**
     * è¾…数量
     */
    @Excel(name = "辅数量", width = 15)
    @ApiModelProperty(value = "辅数量")
    private java.lang.Double auxiliaryQuantity;

@@ -113,6 +111,7 @@
     * ä¾›åº”商id
     */
    @Excel(name = "供应商id", width = 15)
    @Dict(dictTable = "mom_base_supplier", dicCode = "id", dicText = "name")
    @ApiModelProperty(value = "供应商id")
    private String supplierId;

@@ -154,31 +153,31 @@
    /**
     * å¤‡ç”¨å­—段1
     */
    @Excel(name = "备用字段1", width = 15)

    @ApiModelProperty(value = "备用字段1")
    private java.lang.String sparesUda1;
    /**
     * å¤‡ç”¨å­—段2
     */
    @Excel(name = "备用字段2", width = 15)

    @ApiModelProperty(value = "备用字段2")
    private java.lang.String sparesUda2;
    /**
     * å¤‡ç”¨å­—段3
     */
    @Excel(name = "备用字段3", width = 15)

    @ApiModelProperty(value = "备用字段3")
    private java.lang.String sparesUda3;
    /**
     * å¤‡ç”¨å­—段4
     */
    @Excel(name = "备用字段4", width = 15)

    @ApiModelProperty(value = "备用字段4")
    private java.lang.String sparesUda4;
    /**
     * å¤‡ç”¨å­—段5
     */
    @Excel(name = "备用字段5", width = 15)

    @ApiModelProperty(value = "备用字段5")
    private java.lang.String sparesUda5;