生成房屋编码调整

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/HouseQrcodeEnum.java

@@ -10,7 +10,7 @@ package com.epmet.commons.tools.enums;
 public enum HouseQrcodeEnum {
 
     SUFFIX(".png", "二维码格式的后缀"),
-    PREFIX("http://localhost:8080/epmet-oper-gov", "二维码地址的前缀");
+    PREFIX("/subpages/mine/pages/family/register", "二维码地址的前缀");
 
 
     private String code;

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/TestFormDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+* @describe: 根据房屋编码获取房屋信息
+* @author wangtong
+* @date 2022/6/1 18:17
+* @params
+* @return
+*/
+@Data
+public class TestFormDTO extends PageFormDTO {
+
+    private static final long serialVersionUID = -1L;
+
+    private String buildingId;
+
+    private String customerId;
+
+    private String areaCode;
+
+    private String houseId;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java

@@ -16,6 +16,8 @@ public class IcHouseListResultDTO implements Serializable {
 
     private static final long serialVersionUID = 4963952996288796744L;
 
+    private String customerId;
+
     private String houseId;
 
     private String doorName;

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

@@ -500,4 +500,17 @@ public class HouseController implements ResultDataResolver {
         return houseService.getHouseInfoByCode(formDTO);
 
     }
+
+    @PostMapping("createHouseCode")
+    public String createHouseCode(@RequestBody TestFormDTO formDTO) {
+        //效验数据
+        return houseService.createHouseCode(formDTO.getCustomerId(),formDTO.getBuildingId(),formDTO.getAreaCode());
+
+    }
+
+    @PostMapping("createHouseQrcodeUrl")
+    public String createHouseQrcodeUrl(@RequestBody TestFormDTO formDTO) {
+        return houseService.createHouseQrcodeUrl(formDTO.getHouseId());
+
+    }
 }

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

@@ -31,4 +31,13 @@ public interface IcHouseCodeInfoDao extends BaseDao<IcHouseCodeInfoEntity> {
     * @return com.epmet.entity.IcHouseCodeInfoEntity
     */
     IcHouseCodeInfoEntity selectMaxHouseMaxNum();
+
+    /**
+    * @describe: 根据客户id和楼栋id更新房屋最大编码
+    * @author wangtong
+    * @date 2022/6/2 9:37
+    * @params [codeEntity]
+    * @return void
+    */
+    void updateByCuIdAndBuId(IcHouseCodeInfoEntity codeEntity);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseCodeInfoEntity.java

@@ -1,7 +1,6 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,7 +13,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("ic_house_code_info")
-public class IcHouseCodeInfoEntity extends BaseEpmetEntity {
+public class IcHouseCodeInfoEntity {
 
 	private static final long serialVersionUID = 1L;
 

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

@@ -852,6 +852,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
     @Override
     public String createHouseCode(String customerId, String buildingId, String areaCode) {
+        if(StringUtils.isBlank(customerId) || StringUtils.isBlank(buildingId) ||StringUtils.isBlank(areaCode)){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所有字段不可为空", "所有字段不可为空");
+        }
         String result = "";
         IcHouseCodeInfoEntity codeEntity = icHouseCodeInfoDao.selectByCuIdAndBuilId(customerId, buildingId);
         if (null == codeEntity) {
@@ -862,6 +865,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             if (null != maxCodeEntity) {
                 Integer buildingMaxNum = Integer.valueOf(maxCodeEntity.getBuildingMaxNum()) + 1;
                 result = areaCode + getNewMaxIndex(buildingMaxNum) + "00001";
+                newEntity.setBuildingMaxNum(getNewMaxIndex(buildingMaxNum));
+                newEntity.setHouseMaxNum("00001");
             } else {
                 //数据库里面的第一条数据
                 result = areaCode + "00001" + "00001";
@@ -876,7 +881,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             result = areaCode + codeEntity.getBuildingMaxNum() + getNewMaxIndex(houseMaxNum);
             //更新该楼栋下最大的房间编号
             codeEntity.setHouseMaxNum(getNewMaxIndex(houseMaxNum));
-            icHouseCodeInfoDao.updateById(codeEntity);
+            icHouseCodeInfoDao.updateByCuIdAndBuId(codeEntity);
         }
         return result;
     }
@@ -902,7 +907,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             byte[] imageByte = out.toByteArray();
             //将 byte[] 转为 MultipartFile
             MultipartFile multipartFile = new ConvertToMultipartFile(imageByte, "newNamepic", "pic1", "png", imageByte.length);
-            Result<UploadImgResultDTO> uploadResult = ossFeignClient.uploadImportTaskDescFile(multipartFile);
+            Result<UploadImgResultDTO> uploadResult = ossFeignClient.uploadQrCodeV2(multipartFile,house.getCustomerId());
             if (uploadResult == null || !uploadResult.success()) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "上传一户一档二维码失败", "上传一户一档二维码失败");
             } else {

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

@@ -19,6 +19,12 @@
         order by BUILDING_MAX_NUM desc
         limit 1
     </select>
+    <update id="updateByCuIdAndBuId">
+        update ic_house_code_info
+                set HOUSE_MAX_NUM=#{houseMaxNum}
+        where CUSTOMER_ID = #{customerId}
+              and BUILDING_ID = #{buildingId}
+    </update>
 
 
 </mapper>

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

@@ -386,7 +386,8 @@
             b.BUILDING_NAME as buildingName,
             CONCAT(d.UNIT_NUM,'单元') as unitNum,
             a.DOOR_NAME as doorName,
-            a.HOUSE_CODE
+            a.HOUSE_CODE,
+            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'