Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -1,7 +1,9 @@
 package com.epmet.feign;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
@@ -614,4 +616,14 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/ichouse/houses-name")
     Result<List<HousesNameResultDTO>> getHousesNameByIdCards(@RequestBody List<String> idCards);
+
+    /**
+     * Desc: 房屋更新
+     * @param tokenDTO
+     * @param formDTO
+     * @author zxc
+     * @date 2022/5/11 09:46
+     */
+    @PostMapping("/gov/org/house/houseupdate")
+    Result houseUpdate(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseAddFormDTO formDTO);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -2,6 +2,7 @@ package com.epmet.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
@@ -398,4 +399,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<List<HousesNameResultDTO>> getHousesNameByIdCards(List<String> idCards) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getHousesNameByIdCards", idCards);
     }
+
+    @Override
+    public Result houseUpdate(TokenDto tokenDTO, IcHouseAddFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "houseUpdate", tokenDTO,formDTO);
+    }
 }