From e0ab89733bf9727440422f9d6e516282c17ad2cd Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 7 Jun 2022 18:44:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=80=E6=88=B7=E4=B8=80?= =?UTF-8?q?=E7=A0=81=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=89=8D=E7=BC=80=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/IcHouseListFormDTO.java | 2 ++ .../dto/result/IcHouseQrcodeConfigDTO.java | 19 +++++++++++++++++++ .../com/epmet/controller/HouseController.java | 10 +++++----- .../main/java/com/epmet/dao/IcHouseDao.java | 9 +++++++++ .../epmet/service/impl/HouseServiceImpl.java | 16 ++++++++-------- .../src/main/resources/mapper/IcHouseDao.xml | 4 ++++ 6 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseQrcodeConfigDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java index cec2d19994..166511d55f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java @@ -79,4 +79,6 @@ public class IcHouseListFormDTO extends PageFormDTO { * 备注 */ private String remark; + + private String customerId; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseQrcodeConfigDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseQrcodeConfigDTO.java new file mode 100644 index 0000000000..d1b837b86f --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseQrcodeConfigDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-07 18:34 + **/ +@Data +public class IcHouseQrcodeConfigDTO implements Serializable { + + private String customerId; + + private String qrcodePre; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index edc1629219..e2cd44b8dd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -47,7 +47,6 @@ import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcHouseDao; -import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.feign.EpmetAdminOpenFeignClient; @@ -446,11 +445,11 @@ public class HouseController implements ResultDataResolver { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到房屋信息", "未查到房屋信息"); } //url组成:小程序地址?房屋编码 - Result> dict = epmetAdminOpenFeignClient.dictDataList("house_qrcode_pre"); - if (!dict.success() || CollectionUtils.isEmpty(dict.getData())) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "一户一码前缀查询异常", "一户一码前缀查询异常"); + IcHouseQrcodeConfigDTO codePre = icHouseDao.selectByCustomerId(house.getCustomerId()); + if(null == codePre){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "请先维护二维码前缀信息", "请先维护二维码前缀信息"); } - String url = dict.getData().get(0).getDictValue() + house.getHouseCode(); + String url = codePre.getQrcodePre() + house.getHouseCode(); BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + house.getUnitNum() + house.getDoorName(), url); //BufferedImage 转 InputStream ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); @@ -491,6 +490,7 @@ public class HouseController implements ResultDataResolver { //效验数据 LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(loginUser, "【查询房屋】查询当前staff所在组织信息失败"); formDTO.setAgencyId(loginUserDetail.getAgencyId()); + formDTO.setCustomerId(loginUser.getCustomerId()); ValidatorUtils.validateEntity(formDTO); houseService.downloadZip(response, formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 138c892445..2c4511348b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -128,4 +128,13 @@ public interface IcHouseDao extends BaseDao { * @return java.util.List */ List selectBatchHouseCodeAndUrl(@Param("customerId") String customerId); + + /** + * @describe: 通过客户id查询 + * @author wangtong + * @date 2022/6/7 18:36 + * @params [customerId] + * @return com.epmet.dto.result.IcHouseQrcodeConfigDTO + */ + IcHouseQrcodeConfigDTO selectByCustomerId(@Param("customerId") String customerId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 20ad6c218a..acc13729bd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -834,14 +834,14 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { List houseList = icHouseDao.searchHouseByPage(formDTO); //获取一户一码前缀地址 - Result> dict = epmetAdminOpenFeignClient.dictDataList("house_qrcode_pre"); - if (!dict.success() || CollectionUtils.isEmpty(dict.getData())) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "一户一码前缀查询异常", "一户一码前缀查询异常"); + IcHouseQrcodeConfigDTO codePre = icHouseDao.selectByCustomerId(formDTO.getCustomerId()); + if(null == codePre){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "请先维护二维码前缀信息", "请先维护二维码前缀信息"); } for (IcHouseListResultDTO house : houseList) { BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + house.getUnitNum() + house.getDoorName(), - dict.getData().get(0).getDictValue() + house.getHouseCode()); + codePre.getQrcodePre() + house.getHouseCode()); try { byte[] buf = new byte[8192]; @@ -929,11 +929,11 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到房屋信息", "未查到房屋信息"); } //url组成:小程序地址?房屋编码 - Result> dict = epmetAdminOpenFeignClient.dictDataList("house_qrcode_pre"); - if (!dict.success() || CollectionUtils.isEmpty(dict.getData())) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "一户一码前缀查询异常", "一户一码前缀查询异常"); + IcHouseQrcodeConfigDTO codePre = icHouseDao.selectByCustomerId(house.getCustomerId()); + if(null == codePre){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "请先维护二维码前缀信息", "请先维护二维码前缀信息"); } - String url = dict.getData().get(0).getDictValue() + house.getHouseCode(); + String url = codePre.getQrcodePre() + house.getHouseCode(); String fileName = house.getBuildingName() + house.getUnitNum() + house.getDoorName() + ".png"; BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + house.getUnitNum() + house.getDoorName(), url); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index dba8738dab..504e3829a3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -415,5 +415,9 @@ and(h.HOUSE_CODE is null or h.HOUSE_CODE = '') order by h.CREATED_TIME desc +