获取一户一码二维码前缀方式调整

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;
 }

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;
+}

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<List<SysDictDataDTO>> dict = epmetAdminOpenFeignClient.dictDataList("house_qrcode_pre");
+            IcHouseQrcodeConfigDTO codePre = icHouseDao.selectByCustomerId(house.getCustomerId());
-            if (!dict.success() || CollectionUtils.isEmpty(dict.getData())) {
+            if(null == codePre){
-                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "一户一码前缀查询异常", "一户一码前缀查询异常");
+                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);
     }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -128,4 +128,13 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     * @return java.util.List<com.epmet.dto.result.CreateHouseCodeAndUrlDTO>
     */
     List<CreateHouseCodeAndUrlDTO> 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);
 }

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<IcHouseListResultDTO> houseList = icHouseDao.searchHouseByPage(formDTO);
 
         //获取一户一码前缀地址
-        Result<List<SysDictDataDTO>> dict = epmetAdminOpenFeignClient.dictDataList("house_qrcode_pre");
+        IcHouseQrcodeConfigDTO codePre = icHouseDao.selectByCustomerId(formDTO.getCustomerId());
-        if (!dict.success() || CollectionUtils.isEmpty(dict.getData())) {
+        if(null == codePre){
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "一户一码前缀查询异常", "一户一码前缀查询异常");
+            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<List<SysDictDataDTO>> dict = epmetAdminOpenFeignClient.dictDataList("house_qrcode_pre");
+        IcHouseQrcodeConfigDTO codePre = icHouseDao.selectByCustomerId(house.getCustomerId());
-        if (!dict.success() || CollectionUtils.isEmpty(dict.getData())) {
+        if(null == codePre){
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "一户一码前缀查询异常", "一户一码前缀查询异常");
+            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);
 

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
     </select>
+    <select id="selectByCustomerId" resultType="com.epmet.dto.result.IcHouseQrcodeConfigDTO">
+        select * from ic_house_qrcode_config
+        where CUSTOMER_ID = #{customerId}
+    </select>
 
 </mapper>