二维码添加参数

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

@@ -331,6 +331,7 @@ public class HouseController implements ResultDataResolver {
 
     /**
      * Desc: 根据类型更新排序
+     *
      * @param formDTO
      * @author zxc
      * @date 2022/5/6 08:50
@@ -426,11 +427,11 @@ public class HouseController implements ResultDataResolver {
     }
 
     /**
+     * @return void
      * @describe: 下载房屋编码
      * @author wangtong
      * @date 2022/6/1 17:24
      * @params [formDTO, response]
-    * @return void
      */
     @PostMapping("createHouseQrcode")
     public void createQrCode(@RequestBody HouseQrcodeFormDTO formDTO, HttpServletResponse response) {
@@ -441,7 +442,7 @@ public class HouseController implements ResultDataResolver {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到房屋信息", "未查到房屋信息");
             }
             //url组成:小程序地址?房屋编码
-            String url = HouseQrcodeEnum.PREFIX.getCode()+"?houseCode="+house.getHouseCode();
+            String url = HouseQrcodeEnum.PREFIX.getCode() + "?houseCode=" + house.getHouseCode() + "&customerId=" + house.getCustomerId() + "&gridId=" + house.getGridId();
             BufferedImage image = BarcodeUtils.drawQRImage(house.getNeighborHoodName() + house.getBuildingName() + house.getUnitNum() + house.getDoorName(), url);
             //BufferedImage 转 InputStream
             ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -470,11 +471,11 @@ public class HouseController implements ResultDataResolver {
     }
 
     /**
+     * @return void
      * @describe: 批量下载一户一档的二维码
      * @author wangtong
      * @date 2022/5/31 17:58
      * @params [loginUser, formDTO, response]
-    * @return void
      */
     @PostMapping(value = "/downloadZip")
     public void downloadZip(@LoginUser TokenDto loginUser, @RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception {
@@ -486,11 +487,11 @@ public class HouseController implements ResultDataResolver {
     }
 
     /**
+     * @return com.epmet.dto.result.IcHouseInfoResultDTO
      * @describe: 根据房屋编码获取信息
      * @author wangtong
      * @date 2022/6/1 18:24
      * @params [formDTO]
-    * @return com.epmet.dto.result.IcHouseInfoResultDTO
      */
     @PostMapping("getHouseInfoByCode")
     public Result<IcHouseInfoResultDTO> getHouseInfoByCode(@LoginUser TokenDto loginUser, @RequestBody IcHouseInfoFormDTO formDTO) {

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

@@ -153,6 +153,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
     /**
      * 更新
+     *
      * @param customerId
      * @param formDTO
      */
@@ -181,6 +182,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
     /**
      * Desc: 房屋变更记录
+     *
      * @param houseId
      * @param customerId
      * @param houseDTO
@@ -280,6 +282,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
     /**
      * 删除
+     *
      * @param houseId
      */
     @Override
@@ -319,6 +322,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
         return new PageData<>(records == null ? new ArrayList<>() : records, pageInfo.getTotal());
     }
+
     public String getPids(String agencyId) {
         String pids = null;
         CustomerAgencyDTO agency = agencyservice.getAgencyById(agencyId);
@@ -402,6 +406,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
     /**
      * Desc  小区管理中批量删除
+     *
      * @param formDTO
      * @author zxc
      * @date 2022/3/1 4:57 下午
@@ -596,6 +601,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
     /**
      * Desc: 根据类型更新排序
+     *
      * @param formDTO
      * @author zxc
      * @date 2022/5/6 08:50
@@ -694,6 +700,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
     /**
      * desc:分情况获取 房屋内居民
+     *
      * @param resiParam
      * @param memberMap
      * @param haveSearchCache
@@ -811,7 +818,7 @@ 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());
+                    HouseQrcodeEnum.PREFIX.getCode() + "?houseCode=" + house.getHouseCode() + "&customerId=" + house.getCustomerId() + "&gridId=" + house.getGridId());
 
             try {
                 byte[] buf = new byte[8192];
@@ -899,7 +906,7 @@ 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 url = HouseQrcodeEnum.PREFIX.getCode() + "?houseCode=" + house.getHouseCode() + "&customerId=" + house.getCustomerId() + "&gridId=" + house.getGridId();
         String fileName = house.getNeighborHoodName() + house.getBuildingName() + house.getUnitNum() + house.getDoorName() + ".png";
         BufferedImage image = BarcodeUtils.drawQRImage(house.getNeighborHoodName() + house.getBuildingName() + house.getUnitNum() + house.getDoorName(), url);
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -113,7 +113,8 @@
         ag.ORGANIZATION_NAME agencyName,
         c.GRID_ID as gridId,
         gr.GRID_NAME,
-        IFNULL(a.sort,0) as sort
+        IFNULL(a.sort,0) as sort,
+        a.CUSTOMER_ID
         from ic_house a
         LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
         LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'
@@ -387,7 +388,8 @@
             CONCAT(d.UNIT_NUM,'单元') as unitNum,
             a.DOOR_NAME as doorName,
             a.HOUSE_CODE,
-            a.CUSTOMER_ID
+            a.CUSTOMER_ID,
+            c.GRID_ID
         from ic_house a
         LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
         LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'