导入设备excel
This commit is contained in:
parent
0252f6df76
commit
48afb04d94
|
|
@ -2,7 +2,6 @@ package com.nflg.product.bomnew.api.user;
|
||||||
|
|
||||||
|
|
||||||
import cn.hutool.core.collection.CollectionUtil;
|
import cn.hutool.core.collection.CollectionUtil;
|
||||||
import cn.hutool.core.util.NumberUtil;
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
|
||||||
import com.nflg.product.base.core.conmon.util.SessionUtil;
|
import com.nflg.product.base.core.conmon.util.SessionUtil;
|
||||||
|
|
@ -17,6 +16,7 @@ import com.nflg.product.bomnew.service.OptionalEbomImportChildService;
|
||||||
import com.nflg.product.bomnew.service.OptionalEbomImportService;
|
import com.nflg.product.bomnew.service.OptionalEbomImportService;
|
||||||
import com.nflg.product.bomnew.service.OptionalEbomMainService;
|
import com.nflg.product.bomnew.service.OptionalEbomMainService;
|
||||||
import com.nflg.product.bomnew.service.aggreg.AggregOptionConfigService;
|
import com.nflg.product.bomnew.service.aggreg.AggregOptionConfigService;
|
||||||
|
import com.nflg.product.bomnew.service.aggreg.OptionalExcelService;
|
||||||
import io.swagger.annotations.ApiParam;
|
import io.swagger.annotations.ApiParam;
|
||||||
import nflg.product.common.constant.STATE;
|
import nflg.product.common.constant.STATE;
|
||||||
import nflg.product.common.vo.ResultVO;
|
import nflg.product.common.vo.ResultVO;
|
||||||
|
|
@ -24,8 +24,10 @@ import org.springframework.web.bind.annotation.*;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import com.nflg.product.base.core.api.BaseApi;
|
import com.nflg.product.base.core.api.BaseApi;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
import java.io.IOException;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -55,6 +57,12 @@ public class OptionalEbomApi extends BaseApi {
|
||||||
@Resource
|
@Resource
|
||||||
private OptionalEbomImportService optionalEbomImportService;
|
private OptionalEbomImportService optionalEbomImportService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private OptionalExcelService optionalImportExcelService;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页查询所有数据
|
* 分页查询所有数据
|
||||||
*/
|
*/
|
||||||
|
|
@ -64,6 +72,26 @@ public class OptionalEbomApi extends BaseApi {
|
||||||
return ResultVO.success(this.optionalEbomMainService.getListPage(query));
|
return ResultVO.success(this.optionalEbomMainService.getListPage(query));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ApiOperation("导入excel数据")
|
||||||
|
@PostMapping("importDeviceExcel")
|
||||||
|
public ResultVO<Boolean> importData(@RequestParam(required = true, value = "file") MultipartFile file) throws IOException {
|
||||||
|
try {
|
||||||
|
if (file != null && !file.getOriginalFilename().endsWith("xls") && !file.getOriginalFilename().endsWith("xlsx")) {
|
||||||
|
return ResultVO.error("上传的文件非Excel文件");
|
||||||
|
}
|
||||||
|
|
||||||
|
optionalImportExcelService.importExcel(file.getInputStream());
|
||||||
|
return ResultVO.success(true);
|
||||||
|
}
|
||||||
|
catch (NflgBusinessException ex){
|
||||||
|
return ResultVO.error(ex.getState(),ex.getMsg());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@PutMapping("updateStatus")
|
@PutMapping("updateStatus")
|
||||||
@ApiOperation("更改设备状态")
|
@ApiOperation("更改设备状态")
|
||||||
public ResultVO<Boolean> updateStatus(@ApiParam("机型id") @RequestParam("rowId") Long rowId, @ApiParam("状态(0 为隐藏 1显示)") @RequestParam("status") Integer status) {
|
public ResultVO<Boolean> updateStatus(@ApiParam("机型id") @RequestParam("rowId") Long rowId, @ApiParam("状态(0 为隐藏 1显示)") @RequestParam("status") Integer status) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue