From 7519f9a17a3f936c3a608630f1796a17fc38aa01 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 14 Jun 2022 10:51:05 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/EpidemicUserInfoService.java | 7 +- .../controller/BuildingUnitController.java | 39 ++------ .../dao/EpidemicBuildingUnitDao.java | 6 +- .../personroom/dao/EpidemicUnitOwnerDao.java | 11 +++ .../service/EpidemicBuildingUnitService.java | 22 +++++ .../impl/EpidemicBuildingUnitServiceImpl.java | 95 +++++++++++++++++-- .../personroom/EpidemicBuildingUnitDao.xml | 23 ++++- .../personroom/EpidemicUnitOwnerDao.xml | 7 ++ 8 files changed, 162 insertions(+), 48 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java index 6de01a2..8b25514 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java @@ -7,14 +7,15 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO; import com.elink.esua.epdc.dto.personroom.form.BindingFamilyFormDTO; import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO; -import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO; import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; import com.elink.esua.epdc.vaccine.epidemic.dto.*; -import com.elink.esua.epdc.vaccine.epidemic.dto.result.*; +import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO; +import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultV2DTO; +import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO; +import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultV2DTO; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity; import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java index 1c6e857..7836a3c 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java @@ -126,6 +126,12 @@ public class BuildingUnitController { return new Result(); } + @PostMapping("updateErrorRoom") + public Result updateErrorRoom() { + epidemicBuildingUnitService.updateErrorRoom(); + return new Result(); + } + /** * @return void * @describe: 下载房屋编码 @@ -136,38 +142,7 @@ public class BuildingUnitController { @PostMapping("createHouseQrcode") public void createQrCode(@RequestBody HouseQrcodeFormDTO formDTO, HttpServletResponse response) { ValidatorUtils.validateEntity(formDTO); - try { - EpidemicBuildingUnitDetailResultDTO house = epidemicBuildingUnitService.get(formDTO.getId()); - if (null == house) { - throw new RenException("未查到房屋信息"); - } - //url组成:小程序地址?房屋编码 - String url = qrCodeProperties.getPre() + house.getRoomCode(); - BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + house.getUnit() + house.getRoomNo(), url); - //BufferedImage 转 InputStream - ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - ImageOutputStream imageOutput = ImageIO.createImageOutputStream(byteArrayOutputStream); - ImageIO.write(image, "png", imageOutput); - InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray()); - long length = imageOutput.length(); - String fileName = house.getBuildingName() + house.getUnit() + house.getRoomNo() + ".png"; - response.setContentType("application/octet-stream"); - response.setContentLength((int) length); - response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, StrConstant.UTF_8)); - - //输出流 - byte[] bytes = new byte[1024]; - OutputStream outputStream = response.getOutputStream(); - long count = 0; - while (count < length) { - int len = inputStream.read(bytes, 0, 1024); - count += len; - outputStream.write(bytes, 0, len); - } - outputStream.flush(); - } catch (Exception e) { - throw new RenException("生成房屋码失败"); - } + epidemicBuildingUnitService.createQrCode(formDTO.getId(),response); } /** diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java index 7f58b42..4eecd47 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java @@ -72,14 +72,14 @@ public interface EpidemicBuildingUnitDao extends BaseDao listUnitHasNotUrl(); /** - * 展示所有没有二维码的房屋 + * 展示所有包含房屋码的数据 * * @param * @return java.util.List * @author zhy * @date 2022/4/6 17:22 */ - List listUnitHasUrl(); + List listUnitHasCode(); /** * 获取详情 @@ -113,6 +113,8 @@ public interface EpidemicBuildingUnitDao extends BaseDao getErrorRoom(); + /** * 单元列表下拉框 * diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java index ebd0f34..9bfde1b 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java @@ -44,6 +44,17 @@ public interface EpidemicUnitOwnerDao extends BaseDao { */ int deleteByUnitId(@Param("unitId") Long unitId); + /** + * 根据单元ID修改 + * + * @param unitId + * @param newUnitId + * @return int + * @author zhy + * @date 2022/4/2 14:02 + */ + int updateByUnitId(@Param("unitId") Long unitId,@Param("newUnitId") Long newUnitId); + /** * 根据身份证和房屋物理删除 * diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java index 9f55df7..031ac45 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java @@ -24,6 +24,7 @@ import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; +import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeFormDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicUnitInfoResultDTO; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity; @@ -131,6 +132,16 @@ public interface EpidemicBuildingUnitService extends CrudService getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); + String buildingId = (String) params.get("buildingId"); + String unit = (String) params.get("unit"); String roomNo = (String) params.get("roomNo"); String type = (String) params.get("roomType"); String owner = (String) params.get("ownerName"); @@ -137,6 +138,8 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + wrapper.eq(StringUtils.isNotBlank(buildingId), "BUILDING_ID", buildingId); + wrapper.eq(StringUtils.isNotBlank(unit), "UNIT", unit); wrapper.eq(StringUtils.isNotBlank(roomNo), "ROOM_NO", roomNo); wrapper.eq(StringUtils.isNotBlank(type), "ROOM_TYPE", type); wrapper.eq(StringUtils.isNotBlank(owner), "OWNER_NAME", owner); @@ -322,6 +325,29 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl list = baseDao.getErrorRoom(); + list.forEach(item -> { + log.info("正在处理" + item.getBuildingId() + "/" + item.getUnit() + "/" + item.getRoomNo()); + Map params = new HashMap<>(); + params.put("buildingId", item.getBuildingId().toString()); + params.put("unit", item.getUnit()); + params.put("roomNo", item.getRoomNo()); + List dtos = list(params); + EpidemicBuildingUnitDTO base = dtos.get(0); + dtos.forEach(dto -> { + // 更新关系表的房屋ID + epidemicUnitOwnerDao.updateByUnitId(dto.getId(), base.getId()); + if (!dto.getId().equals(base.getId())) { + String[] ids = new String[]{dto.getId().toString()}; + // 删除无用的房屋 + delete(ids); + } + }); + }); + } + @Override public void updateMaCode() { Map params = new HashMap<>(4); @@ -370,14 +396,14 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl - SELECT u.*, b.BUILDING_NAME, @@ -115,7 +115,7 @@ LEFT JOIN epidemic_plot_coordinate p ON b.PLOT_ID = p.id WHERE u.DEL_FLAG = '0' - AND u.MA_URL IS NOT NULL + AND u.ROOM_CODE IS NOT NULL + + From 07efdc8a27b08ba2326dc426a91cdcee0591a3e9 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 15 Jun 2022 10:53:07 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ingErrorController.java => PlotBuildingErrorController.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/{EpidemicPlotBuildingErrorController.java => PlotBuildingErrorController.java} (98%) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/EpidemicPlotBuildingErrorController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingErrorController.java similarity index 98% rename from epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/EpidemicPlotBuildingErrorController.java rename to epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingErrorController.java index f7c451d..b86e6a7 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/EpidemicPlotBuildingErrorController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingErrorController.java @@ -44,7 +44,7 @@ import java.util.Map; */ @RestController @RequestMapping("epidemicplotbuildingerror") -public class EpidemicPlotBuildingErrorController { +public class PlotBuildingErrorController { @Autowired private EpidemicPlotBuildingErrorService epidemicPlotBuildingErrorService; From 1a23d88862f43bdd19a01fce33f451cb2d175363 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 15 Jun 2022 14:04:59 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A6=81=E6=AD=A2=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BuildingUnitController.java | 34 +++++++++++-------- .../impl/EpidemicBuildingUnitServiceImpl.java | 28 +++++++++------ 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java index 7836a3c..3b9a5f0 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java @@ -120,6 +120,11 @@ public class BuildingUnitController { return epidemicBuildingUnitService.importEpidemicHouse(file, gridId); } + /** + * 更新房屋自增序号 + * + * @return + */ @PostMapping("updateMaCode") public Result updateMaCode() { epidemicBuildingUnitService.updateMaCode(); @@ -132,19 +137,6 @@ public class BuildingUnitController { return new Result(); } - /** - * @return void - * @describe: 下载房屋编码 - * @author wangtong - * @date 2022/6/1 17:24 - * @params [formDTO, response] - */ - @PostMapping("createHouseQrcode") - public void createQrCode(@RequestBody HouseQrcodeFormDTO formDTO, HttpServletResponse response) { - ValidatorUtils.validateEntity(formDTO); - epidemicBuildingUnitService.createQrCode(formDTO.getId(),response); - } - /** * 单元下拉框 * @@ -173,6 +165,20 @@ public class BuildingUnitController { return new Result>().ok(list); } + /** + * @return void + * @describe: 下载房屋编码 + * @author wangtong + * @date 2022/6/1 17:24 + * @params [formDTO, response] + */ + @PostMapping("createHouseQrcode") + public void createQrCode(@RequestBody HouseQrcodeFormDTO formDTO, HttpServletResponse response) { + ValidatorUtils.validateEntity(formDTO); + epidemicBuildingUnitService.createQrCode(formDTO.getId(), response); + } + + /** * @return java.lang.String * @describe: 批量生成房屋的房屋编码和一户一档二维码 @@ -192,7 +198,7 @@ public class BuildingUnitController { * @date 2022/5/31 17:58 * @params [loginUser, formDTO, response] */ - @PostMapping(value = "/downloadZip") + @PostMapping("downloadZip") public void downloadZip(HttpServletResponse response) throws Exception { epidemicBuildingUnitService.downloadZip(response); diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java index 5aca7de..b3d61a7 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java @@ -169,6 +169,13 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl params = new HashMap<>(8); + params.put("buildingId", dto.getBuildingId()); + params.put("unit", dto.getUnit()); + params.put("roomNo", dto.getRoomNo()); + if (!list(params).isEmpty()) { + throw new RenException("房屋已存在"); + } checkData(dto); EpidemicBuildingUnitEntity entity = ConvertUtils.sourceToTarget(dto, EpidemicBuildingUnitEntity.class); insert(entity); @@ -368,13 +375,13 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl list = baseDao.listUnitHasNotUrl(); if (!list.isEmpty()) { list.forEach(item -> { - String url = ""; try { - url = createHouseQrcodeUrl(item); + String name = item.getBuildingName() + StrConstant.HYPHEN + item.getUnit() + StrConstant.HYPHEN + item.getRoomNo(); + String maUrl = createHouseQrCodeUrl(item.getRoomCode(), name); + item.setMaUrl(maUrl); } catch (Exception e) { throw new RenException("房屋码上传失败"); } - item.setMaUrl(url); }); List updateList = ConvertUtils.sourceToTarget(list, EpidemicBuildingUnitEntity.class); updateBatchById(updateList); @@ -397,12 +404,12 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl houseList = baseDao.listUnitHasCode(); - String urlRre = qrCodeProperties.getPre(); + String urlPre = qrCodeProperties.getPre(); for (EpidemicBuildingUnitDTO house : houseList) { try { BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + StrConstant.HYPHEN + house.getUnit() + StrConstant.HYPHEN + house.getRoomNo(), - urlRre + house.getRoomCode()); + urlPre + house.getRoomCode()); byte[] buf = new byte[8192]; int len; @@ -431,7 +438,8 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl().ok(houseInfoResultDTO); } - public String createHouseQrcodeUrl(EpidemicBuildingUnitDTO house) throws Exception { + public String createHouseQrCodeUrl(String roomCode, String name) throws Exception { //url组成:小程序地址?房屋编码 - String url = qrCodeProperties.getPre() + house.getRoomCode(); - String fileName = house.getBuildingName() + StrConstant.HYPHEN + house.getUnit() + StrConstant.HYPHEN + house.getRoomNo() + ".png"; - BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + StrConstant.HYPHEN + house.getUnit() + StrConstant.HYPHEN + house.getRoomNo(), url); + String url = qrCodeProperties.getPre() + roomCode; + String fileName = name + ".png"; + BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(name, url); ByteArrayOutputStream out = new ByteArrayOutputStream(); try { ImageIO.write(image, "png", out); From bcfc1bef6fe317cfc70c5a8882d10a0260e6c67b Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 15 Jun 2022 14:58:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=8D=95=E4=B8=AA=E7=BD=91=E6=A0=BC=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BuildingUnitController.java | 18 ++++-------------- .../dao/EpidemicBuildingUnitDao.java | 6 ++++-- .../service/EpidemicBuildingUnitService.java | 4 ++-- .../impl/EpidemicBuildingUnitServiceImpl.java | 6 ++++-- .../personroom/EpidemicBuildingUnitDao.xml | 1 + 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java index 3b9a5f0..678175f 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java @@ -18,8 +18,6 @@ package com.elink.esua.epdc.vaccine.personroom.controller; -import com.elink.esua.epdc.commons.tools.constant.StrConstant; -import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -32,23 +30,15 @@ import com.elink.esua.epdc.config.QrCodeProperties; import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeFormDTO; +import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; -import com.elink.esua.epdc.vaccine.epidemic.utils.HouseQRcodeUtils; import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicBuildingUnitExcel; import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.imageio.ImageIO; -import javax.imageio.stream.ImageOutputStream; import javax.servlet.http.HttpServletResponse; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URLEncoder; import java.util.List; import java.util.Map; @@ -199,9 +189,9 @@ public class BuildingUnitController { * @params [loginUser, formDTO, response] */ @PostMapping("downloadZip") - public void downloadZip(HttpServletResponse response) throws Exception { - epidemicBuildingUnitService.downloadZip(response); - + public void downloadZip(@RequestBody HouseQrcodeZipFormDTO formDTO, HttpServletResponse response) throws Exception { + ValidatorUtils.validateEntity(formDTO); + epidemicBuildingUnitService.downloadZip(formDTO,response); } } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java index 4eecd47..c2b4def 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java @@ -22,6 +22,8 @@ import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; +import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeFormDTO; +import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicUnitInfoResultDTO; import com.elink.esua.epdc.dto.personroom.result.HouseInfoResultDTO; @@ -74,12 +76,12 @@ public interface EpidemicBuildingUnitDao extends BaseDao * @author zhy * @date 2022/4/6 17:22 */ - List listUnitHasCode(); + List listUnitHasCode(HouseQrcodeZipFormDTO formDTO); /** * 获取详情 diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java index 031ac45..2a6c3d6 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java @@ -22,9 +22,9 @@ import com.elink.esua.epdc.commons.mybatis.service.CrudService; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; -import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeFormDTO; +import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicUnitInfoResultDTO; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity; @@ -186,7 +186,7 @@ public interface EpidemicBuildingUnitService extends CrudService