diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java index cf4840a..193af00 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java @@ -17,29 +17,18 @@ package com.elink.esua.epdc.vaccine.personroom.controller; -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; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; -import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO; -import com.elink.esua.epdc.dto.personroom.form.*; -import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotCoordinateResultDTO; +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.vaccine.epidemic.service.EpidemicUserInfoService; -import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicPlotCoordinateExcel; import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService; -import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotCoordinateService; 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.util.List; -import java.util.Map; /** @@ -66,7 +55,7 @@ public class AppFamilyController { * @Author wanggongfeng */ @GetMapping("getFamilyMember") - public Result getFamilyMember(@RequestBody GetMemberListFormDTO formDTO){ + public Result getFamilyMember(@RequestBody GetMemberListFormDTO formDTO) { //效验数据 ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); return epidemicUserInfoService.getFamilyMember(formDTO); @@ -80,7 +69,7 @@ public class AppFamilyController { * @Author wanggongfeng */ @PostMapping("addFamilyMember") - public Result addFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO){ + public Result addFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO) { //效验数据 ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); return epidemicUserInfoService.addFamilyMember(formDTO); @@ -94,7 +83,7 @@ public class AppFamilyController { * @Author wanggongfeng */ @PostMapping("updateFamilyMember") - public Result updateFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO){ + public Result updateFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO) { //效验数据 ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); return epidemicUserInfoService.updateFamilyMember(formDTO); @@ -108,7 +97,7 @@ public class AppFamilyController { * @Author wanggongfeng */ @GetMapping("getHouseInfo") - public Result getHouseInfo(@RequestBody GetHouseInfoFormDTO formDTO){ + public Result getHouseInfo(@RequestBody GetHouseInfoFormDTO formDTO) { //效验数据 ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); return epidemicBuildingUnitService.getHouseInfo(formDTO); @@ -122,13 +111,11 @@ public class AppFamilyController { * @Author wanggongfeng */ @PostMapping("bindingFamily") - public Result bindingFamily(@RequestBody BindingFamilyFormDTO formDTO){ + public Result bindingFamily(@RequestBody BindingFamilyFormDTO formDTO) { //效验数据 ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); return epidemicUserInfoService.bindingFamily(formDTO); } - - } 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..e119d05 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; @@ -120,6 +110,11 @@ public class BuildingUnitController { return epidemicBuildingUnitService.importEpidemicHouse(file, gridId); } + /** + * 更新房屋自增序号 + * + * @return + */ @PostMapping("updateMaCode") public Result updateMaCode() { epidemicBuildingUnitService.updateMaCode(); @@ -132,19 +127,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 +155,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,10 +188,10 @@ public class BuildingUnitController { * @date 2022/5/31 17:58 * @params [loginUser, formDTO, response] */ - @PostMapping(value = "/downloadZip") - public void downloadZip(HttpServletResponse response) throws Exception { - epidemicBuildingUnitService.downloadZip(response); - + @PostMapping("downloadZip") + 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/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; 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..3b2661f 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 @@ -20,8 +20,8 @@ package com.elink.esua.epdc.vaccine.personroom.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; 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.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 +74,12 @@ public interface EpidemicBuildingUnitDao extends BaseDao * @author zhy * @date 2022/4/6 17:22 */ - List listUnitHasCode(); + List listUnitHasCode(HouseQrcodeZipFormDTO formDTO); /** * 获取详情 @@ -138,6 +138,7 @@ public interface EpidemicBuildingUnitDao extends BaseDao 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 +376,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); @@ -383,7 +391,7 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl