一户一档二维码地址调整

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

@@ -442,15 +442,15 @@ public class HouseController implements ResultDataResolver {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到房屋信息", "未查到房屋信息");
             }
             //url组成:小程序地址?房屋编码
-            String url = HouseQrcodeEnum.PREFIX.getCode() + "?houseCode=" + house.getHouseCode();
-            BufferedImage image = BarcodeUtils.drawQRImage(house.getNeighborHoodName() + house.getBuildingName() + house.getUnitNum() + house.getDoorName(), url);
+            String url = HouseQrcodeEnum.PREFIX.getCode() + house.getHouseCode();
+            BufferedImage image = BarcodeUtils.drawQRImage(house.getBuildingName() + house.getUnitNum() + house.getDoorName(), 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.getNeighborHoodName() + house.getBuildingName() + house.getUnitNum() + house.getDoorName() + ".png";
+            String fileName = house.getBuildingName() + house.getUnitNum() + house.getDoorName() + ".png";
             response.setContentType("application/octet-stream");
             response.setContentLength((int) length);
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, StrConstant.UTF_8));

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

@@ -832,8 +832,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
         for (IcHouseListResultDTO house : houseList) {
 
-            BufferedImage image = BarcodeUtils.drawQRImage(house.getNeighborHoodName() + house.getBuildingName() + house.getUnitNum() + house.getDoorName(),
-                    HouseQrcodeEnum.PREFIX.getCode() + "?houseCode=" + house.getHouseCode());
+            BufferedImage image = BarcodeUtils.drawQRImage(house.getBuildingName() + house.getUnitNum() + house.getDoorName(),
+                    HouseQrcodeEnum.PREFIX.getCode() +  house.getHouseCode());
 
             try {
                 byte[] buf = new byte[8192];
@@ -921,9 +921,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到房屋信息", "未查到房屋信息");
         }
         //url组成:小程序地址?房屋编码
-        String url = HouseQrcodeEnum.PREFIX.getCode() + "?houseCode=" + house.getHouseCode();
-        String fileName = house.getNeighborHoodName() + house.getBuildingName() + house.getUnitNum() + house.getDoorName() + ".png";
-        BufferedImage image = BarcodeUtils.drawQRImage(house.getNeighborHoodName() + house.getBuildingName() + house.getUnitNum() + house.getDoorName(), url);
+        String url = HouseQrcodeEnum.PREFIX.getCode() + house.getHouseCode();
+        String fileName = house.getBuildingName() + house.getUnitNum() + house.getDoorName() + ".png";
+        BufferedImage image = BarcodeUtils.drawQRImage(house.getBuildingName() + house.getUnitNum() + house.getDoorName(), url);
 
 
         FileItem fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, FileUtils.getAndCreateDirUnderEpmetFilesDir("temp").toFile())