From d4be41ccac01b155c7a067c73f2045f9ea0aa805 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 21 十月 2024 15:15:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java index 080fc0b..09dd59b 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformWaterGasCloudController.java @@ -9,15 +9,19 @@ import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.dao.business.model.PlatformWaterGas; +import com.doumee.dao.business.vo.PlatformWaterGasForExcelVO; import com.doumee.service.business.PlatformWaterGasService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.*; +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 javax.servlet.http.HttpServletResponse; +import java.io.File; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * @author 姹熻箘韫� @@ -81,9 +85,34 @@ @PostMapping("/exportExcel") @CloudRequiredPermission("business:platformwatergas:exportExcel") public void exportExcel (@RequestBody PageWrap<PlatformWaterGas> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { - ExcelExporter.build(PlatformWaterGas.class).export(platformWaterGasService.findPage(pageWrap).getRecords(), "鏈堝彴_鐢ㄦ按鐢ㄦ皵淇℃伅璁板綍琛�", response); + List<PlatformWaterGas> waterGasPageData = platformWaterGasService.findPage(pageWrap).getRecords(); + if(Objects.nonNull(pageWrap.getModel()) + && Objects.nonNull(pageWrap.getModel().getType()) && !Constants.equalsInteger(pageWrap.getModel().getType(),Constants.TWO)){ + List<PlatformWaterGasForExcelVO> pageData = new ArrayList<>(); + for (PlatformWaterGas platformWaterGas:waterGasPageData) { + PlatformWaterGasForExcelVO platformWaterGasForExcelVO = new PlatformWaterGasForExcelVO(); + BeanUtils.copyProperties(platformWaterGas,platformWaterGasForExcelVO); + pageData.add(platformWaterGasForExcelVO); + } + ExcelExporter.build(PlatformWaterGasForExcelVO.class).export(pageData, Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ZERO)?"鏈堝彴_鐢ㄦ按淇℃伅璁板綍琛�":"鏈堝彴_鐢ㄦ皵淇℃伅璁板綍琛�", response); + }else{ + ExcelExporter.build(PlatformWaterGas.class).export(waterGasPageData, "鏈堝彴_娌硅�椾俊鎭褰曡〃", response); + } } + + + @ApiOperation(value = "娌硅�椾俊鎭鍏�") + @PostMapping("/importExcel") + @ApiImplicitParams({ + @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class), + }) + @CloudRequiredPermission("business:platformwatergas:exportExcel") + public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + return ApiResponse.success(platformWaterGasService.importBatch(file,this.getLoginUser(token))); + } + + @ApiOperation("鏍规嵁ID鏌ヨ") @GetMapping("/{id}") @CloudRequiredPermission("business:platformwatergas:query") -- Gitblit v1.9.3