From 88f47af35e85f7bc1920627207cfa0d726b6a5b7 Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 22 Jun 2022 16:32:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=88=BF=E5=B1=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=80=BB=E8=BE=91=EF=BC=8Corg=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=BC=96=E5=86=99feignClient?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/GovOrgOpenFeignClient.java | 11 ++++ .../GovOrgOpenFeignClientFallback.java | 5 ++ .../epmet/controller/IcHouseController.java | 15 ++++++ .../com/epmet/service/IcHouseService.java | 12 ++++- .../service/impl/IcHouseServiceImpl.java | 17 +++++- .../controller/IcResiUserController.java | 8 +++ .../java/com/epmet/dao/IcResiUserDao.java | 4 ++ .../com/epmet/service/IcResiUserService.java | 8 +++ .../service/impl/IcResiUserServiceImpl.java | 52 ++++++++++++++----- .../main/resources/mapper/IcResiUserDao.xml | 6 ++- 10 files changed, 123 insertions(+), 15 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 7e21d51a83..1168a9871d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -632,4 +632,15 @@ public interface GovOrgOpenFeignClient { */ @GetMapping("/gov/org/customeragency/subOrgList/{agencyId}") Result> subOrgList(@PathVariable("agencyId")String agencyId); + + /** + * 根据houseId查询数据 + * + * @param houseId + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/22 16:20 + */ + @PostMapping("/gov/org/ichouse/getHouseAgencyInfo") + Result getHouseAgencyInfo(@RequestParam("houseId")String houseId); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index adac11545a..1070e14175 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -414,4 +414,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { public Result> subOrgList(String agencyId) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "subOrgList",agencyId); } + + @Override + public Result getHouseAgencyInfo(String houseId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "subOrgList",houseId); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index edbdde8625..d9dfe3d17e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.HouseFormDTO; +import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HousesNameResultDTO; import com.epmet.service.IcHouseService; @@ -90,4 +91,18 @@ public class IcHouseController { return new Result>().ok(icHouseService.getHousesNameByIdCards(idCards)); } + /** + * 根据houseId查询数据 + * + * @param houseId + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/22 16:18 + */ + @PostMapping("getHouseAgencyInfo") + public Result getHouseAgencyInfo(@RequestParam("houseId") String houseId){ + HouseAgencyInfoResultDTO dto = icHouseService.getHouseAgencyInfo(houseId); + return new Result().ok(dto); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index bd82a396c1..37342f20c9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -7,6 +7,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.HouseFormDTO; +import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HousesNameResultDTO; import com.epmet.entity.IcHouseEntity; @@ -125,4 +126,13 @@ public interface IcHouseService extends BaseService { */ List getHousesNameByIdCards(List idCards); -} \ No newline at end of file + /** + * 根据houseId查询数据 + * + * @param houseId + * @return com.epmet.dto.result.HouseAgencyInfoResultDTO + * @author LZN + * @date 2022/6/22 16:18 + */ + HouseAgencyInfoResultDTO getHouseAgencyInfo(String houseId); +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index e884a6904c..8e1397c965 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -21,6 +21,7 @@ import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.HouseFormDTO; +import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HousesNameResultDTO; @@ -292,4 +293,18 @@ public class IcHouseServiceImpl extends BaseServiceImpl().ok(icResiUserService.getUserByIdCard(formDTO)); } + /** + * 绑定房屋 + * + * @param form + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/22 16:29 + */ @PostMapping("/bindHome") public Result bindHome(@RequestBody BindHomeFormDTO form){ ValidatorUtils.validateEntity(form); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index b6fb26c637..65e1083532 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -333,4 +333,8 @@ public interface IcResiUserDao extends BaseDao { void updateByIdCard(@Param("entity") IcResiUserEntity entity); + + String seletIdByIdCard(@Param("customerId") String customerId,@Param("idCard") String idCard); + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 4073b75252..9c22fa648b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -375,5 +375,13 @@ public interface IcResiUserService extends BaseService { */ IcResiUserInfoDTO getUserByIdCard(IcResiUserDTO formDTO); + /** + * 绑定房屋 + * + * @param form + * @return void + * @author LZN + * @date 2022/6/22 16:30 + */ void bindHome(BindHomeFormDTO form); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index b1b947d080..361329c76f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -58,7 +58,6 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.entity.*; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.feign.*; -import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO; import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO; import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO; import com.epmet.opendata.feign.GuardarDatosFeignClient; @@ -82,9 +81,10 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; -import java.sql.Date; + import java.sql.Timestamp; import java.text.NumberFormat; +import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; @@ -145,6 +145,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); @@ -2265,6 +2267,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resultDTOResult = getGovOrgOpenFeignClient.getHouseAgencyInfo(houseInfo.getHomeId()); + entity.setGridId(resultDTOResult.getData().getGridId()); + entity.setPids(resultDTOResult.getData().getPids()); } else { throw new RenException("房屋信息不全"); } + if (baseDao.selectCountByIdCard(form.getIdCard(), form.getCustomerId()) > 0) { - baseDao.updateByIdCard(entity); + String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard()); + baseDao.updateByIdCard(entity); + } else { baseDao.insert(entity); + String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard()); + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 02be1b1054..884d5994fe 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -221,7 +221,8 @@ home_id = #{entity.homeId}, village_id = #{entity.villageId}, build_id = #{entity.buildId}, - unit_id = #{entity.unitId} + unit_id = #{entity.unitId}, + updated_time = now() where id_card = #{entity.idCard} AND customer_id = #{entity.customerId} @@ -1084,5 +1085,8 @@ and customer_id = #{customerId} and del_flag = '0' +