批量生成房屋编码及url调整

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -550,7 +550,7 @@ public class HouseController implements ResultDataResolver {
     */
     @PostMapping("createHouseQrcodeUrl")
     public String createHouseQrcodeUrl(@RequestBody TestFormDTO formDTO) throws Exception {
-        return houseService.createHouseQrcodeUrl(formDTO.getHouseId());
+        return houseService.createHouseQrcodeUrl(formDTO.getHouseId(),null);
 
     }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java

@@ -144,7 +144,7 @@ public interface HouseService {
     * @params [houseId]
     * @return java.lang.String
     */
-    String createHouseQrcodeUrl(String houseId) throws Exception;
+    String createHouseQrcodeUrl(String houseId,String houseCode) throws Exception;
 
     /**
     * @describe: 根据房屋编码获取信息

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -149,7 +149,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         IcHouseEntity entity = new IcHouseEntity();
         entity.setId(icHouseDTO.getId());
         try {
-            entity.setHouseQrcodeUrl(createHouseQrcodeUrl(icHouseDTO.getId()));
+            entity.setHouseQrcodeUrl(createHouseQrcodeUrl(icHouseDTO.getId(),null));
         } catch (Exception e) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"二维码生成失败","二维码生成失败");
         }
@@ -917,7 +917,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     }
 
     @Override
-    public String createHouseQrcodeUrl(String houseId) throws Exception {
+    public String createHouseQrcodeUrl(String houseId,String houseCode) throws Exception {
         if (StringUtils.isBlank(houseId)) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "房屋id不可为空", "房屋id不可为空");
         }
@@ -930,7 +930,14 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         if(null == codePre){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "请先维护二维码前缀信息", "请先维护二维码前缀信息");
         }
-        String url = codePre.getParameterValue() + house.getHouseCode();
+        //默认使用传参的houseCode，如果没有则使用数据库查询到的houseCode
+        String url = "";
+        if(StringUtils.isBlank(houseCode)){
+            url = codePre.getParameterValue() + house.getHouseCode();
+        }else{
+            url = codePre.getParameterValue() + houseCode;
+        }
+
         String fileName = house.getBuildingName() + house.getUnitNum() + house.getDoorName() + ".png";
         BufferedImage image = HouseQRcodeUtils.drawHouseQRImage(house.getBuildingName() + house.getUnitNum() + house.getDoorName(), url);
 
@@ -987,13 +994,14 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             if(StringUtils.isNotBlank(house.getAreaCode())){
                 String areaCode  = numberAfterFillZero(house.getAreaCode(), NumConstant.TWELVE);
                 entity.setHouseCode(createHouseCode(house.getCustomerId(),house.getBuildingId(),areaCode));
-            }
+
                 try {
-                entity.setHouseQrcodeUrl(createHouseQrcodeUrl(house.getHouseId()));
+                    entity.setHouseQrcodeUrl(createHouseQrcodeUrl(house.getHouseId(),entity.getHouseCode()));
                 } catch (Exception e) {
                     e.printStackTrace();
                     throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"二维码生成失败<houseId>:"+house.getHouseId(),"二维码生成失败<houseId>:"+house.getHouseId());
                 }
+            }
             icHouseDao.updateById(entity);
         });
         return new Result().ok("批量生成成功");

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.22__alter_customer_org_parameter.sql

@@ -5,3 +5,7 @@ alter table customer_org_parameter modify column PARAMETER_VALUE varchar(256);
 INSERT INTO `epmet_gov_org`.`customer_org_parameter`(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5', '3fdd0380deff5b30f45376cdf995d1c1', 'house_qrcode_pre', '一户一码前缀', 'https://epmet-cloud.elinkservice.cn/cqrcode-wxls/', '', '0', 0, 'APP_USER', '2022-06-08 09:22:52', 'APP_USER', '2022-06-08 09:22:52');
 
 INSERT INTO `epmet_gov_org`.`customer_org_parameter`(`ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('6', '1530123370795233281', 'house_qrcode_pre', '一户一码前缀', 'https://epmet-cloud.elinkservice.cn/cqrcode-sjt/', '', '0', 0, 'APP_USER', '2022-06-08 09:22:52', 'APP_USER', '2022-06-08 09:22:52');
+
+update `ic_house`
+		set HOUSE_CODE = null,
+		HOUSE_QRCODE_URL = null;