对比excel数据
This commit is contained in:
+19
-11
@@ -2,26 +2,19 @@ package com.adc.da.slrs.ImportExcelDatas.controller;
|
|||||||
|
|
||||||
import com.adc.da.base.web.BaseController;
|
import com.adc.da.base.web.BaseController;
|
||||||
import com.adc.da.common.ReadExcel;
|
import com.adc.da.common.ReadExcel;
|
||||||
import com.adc.da.http.ResponseMessage;
|
import com.adc.da.slrs.ImportExcelDatas.comment.Analysis;
|
||||||
|
import com.adc.da.slrs.ImportExcelDatas.comment.Contrast;
|
||||||
import com.adc.da.slrs.ImportExcelDatas.comment.ExclErrorOut;
|
import com.adc.da.slrs.ImportExcelDatas.comment.ExclErrorOut;
|
||||||
import com.adc.da.slrs.ImportExcelDatas.comment.ExclExport;
|
import com.adc.da.slrs.ImportExcelDatas.comment.ExclExport;
|
||||||
import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto;
|
import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto;
|
||||||
import com.adc.da.slrs.ImportExcelDatas.service.ImportExcelService;
|
import com.adc.da.slrs.ImportExcelDatas.service.ImportExcelService;
|
||||||
import com.adc.da.slrs.ImportExcelDatas.service.impl.ImportExcelServiceImpl;
|
|
||||||
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
|
|
||||||
import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStar;
|
|
||||||
import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStarEO;
|
|
||||||
import com.adc.da.util.exception.AdcDaBaseException;
|
import com.adc.da.util.exception.AdcDaBaseException;
|
||||||
import com.adc.da.util.utils.IOUtils;
|
import com.adc.da.util.utils.IOUtils;
|
||||||
import com.adc.da.util.utils.StringUtils;
|
|
||||||
import com.adc.da.utils.util.BussStandExportUtil;
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.apache.poi.ss.usermodel.Workbook;
|
import org.apache.poi.ss.usermodel.Workbook;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
@@ -97,7 +90,7 @@ public class ImportExcelController extends BaseController<ImportDto> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ApiOperation("从excl中导入标准信息")
|
@ApiOperation("从excl分解")
|
||||||
@PostMapping("/analysisExcl")
|
@PostMapping("/analysisExcl")
|
||||||
public void analysisExcl(MultipartFile exclFile,MultipartFile standSort, HttpServletResponse response, HttpServletRequest request) throws IOException {
|
public void analysisExcl(MultipartFile exclFile,MultipartFile standSort, HttpServletResponse response, HttpServletRequest request) throws IOException {
|
||||||
/**
|
/**
|
||||||
@@ -140,10 +133,25 @@ public class ImportExcelController extends BaseController<ImportDto> {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ApiOperation("从excl中导入标准信息")
|
@ApiOperation("excel表中的信息是否在数据库中存在")
|
||||||
@PostMapping("/isExist")
|
@PostMapping("/isExist")
|
||||||
public String isExist(MultipartFile exclFile){
|
public String isExist(MultipartFile exclFile){
|
||||||
return importExcelService.isExist(exclFile);
|
return importExcelService.isExist(exclFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation("对比")
|
||||||
|
@PostMapping("/contrast")
|
||||||
|
public void contrast(MultipartFile all,MultipartFile excel) throws IOException {
|
||||||
|
Contrast contrast = new Contrast();
|
||||||
|
contrast.run(all,excel);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ApiOperation("根据标准从excl中分解出标准号,类别,年份")
|
||||||
|
@PostMapping("/analysis")
|
||||||
|
public void analysis(MultipartFile exclFile,MultipartFile standSort) throws IOException {
|
||||||
|
Analysis analysis = new Analysis();
|
||||||
|
analysis.run(exclFile,standSort);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user