房主相关修改

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

@@ -326,6 +326,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcHouseEntity::getCustomerId, formDTO.getCustomerId());
         wrapper.eq(IcHouseEntity::getOwnerIdCard, formDTO.getOwnerIdCard());
+        wrapper.ne(IcHouseEntity::getHouseCode, formDTO.getHouseCode());
         List<IcHouseEntity> list = baseDao.selectList(wrapper);
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/MyHomeController.java

@@ -10,6 +10,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.IcResiUserConfirmDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -205,8 +206,8 @@ public class MyHomeController {
      * @Date 2022/7/19 16:46
      */
     @PostMapping("getOwnerHouseList")
-    public Result<List<HomeInfoResultDTO>> getOwnerHouseList(@LoginUser TokenDto tokenDto) {
+    public Result<List<HomeInfoResultDTO>> getOwnerHouseList(@LoginUser TokenDto tokenDto, @RequestBody IcHouseDTO formDTO) {
-        List<HomeInfoResultDTO> result = myHomeService.getOwnerHouseList(tokenDto);
+        List<HomeInfoResultDTO> result = myHomeService.getOwnerHouseList(tokenDto, formDTO);
         return new Result<List<HomeInfoResultDTO>>().ok(result);
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/MyHomeService.java

@@ -1,6 +1,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.IcResiUserConfirmSubmitDTO;
 import com.epmet.dto.form.RegisterAndBindFormDTO;
 import com.epmet.dto.result.HomeInfoResultDTO;
@@ -54,7 +55,7 @@ public interface MyHomeService {
      * @Author zhaoqifeng
      * @Date 2022/7/19 16:48
      */
-    List<HomeInfoResultDTO> getOwnerHouseList(TokenDto tokenDto);
+    List<HomeInfoResultDTO> getOwnerHouseList(TokenDto tokenDto, IcHouseDTO formDTO);
 
     /**
      * 变更绑定的房屋

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java

@@ -32,9 +32,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.text.Collator;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.stream.Collectors;
 
 /**
@@ -242,25 +244,23 @@ public class MyHomeServiceImpl implements MyHomeService {
      * @Date 2022/7/19 16:48
      */
     @Override
-    public List<HomeInfoResultDTO> getOwnerHouseList(TokenDto tokenDto) {
+    public List<HomeInfoResultDTO> getOwnerHouseList(TokenDto tokenDto, IcHouseDTO formDTO) {
         //通过用户ID获取居民端用户信息
         ResiUserBaseInfoResultDTO baseInfo = userBaseInfoDao.selecUserBaseInfoByUserId(tokenDto.getUserId());
         if (null == baseInfo) {
             return Collections.emptyList();
         }
 
-        IcHouseDTO dto = new IcHouseDTO();
+        formDTO.setCustomerId(tokenDto.getCustomerId());
-        dto.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setOwnerIdCard(baseInfo.getIdNum());
-        dto.setOwnerIdCard(baseInfo.getIdNum());
+        Result<List<HouseInfoDTO>> houseResult = govOrgOpenFeignClient.getOwnerHouseList(formDTO);
-        Result<List<HouseInfoDTO>> houseResult = govOrgOpenFeignClient.getOwnerHouseList(dto);
         if (!houseResult.success()) {
             throw new EpmetException(houseResult.getCode(), houseResult.getMsg());
         }
         if (CollectionUtils.isEmpty(houseResult.getData())) {
             return Collections.emptyList();
         }
-
+        List<HomeInfoResultDTO> list = houseResult.getData().stream().map(item -> {
-        return houseResult.getData().stream().map(item -> {
             HomeInfoResultDTO result = new HomeInfoResultDTO();
             result.setHouseId(item.getHomeId());
             result.setHouseName(item.getAllName());
@@ -268,6 +268,9 @@ public class MyHomeServiceImpl implements MyHomeService {
             result.setQrCodeUrl(item.getHouseQrcodeUrl());
             return result;
         }).collect(Collectors.toList());
+        return list.stream().sorted((o1, o2) ->
+                Collator.getInstance(Locale.SIMPLIFIED_CHINESE)
+                        .compare(o1.getHouseName(),o2.getHouseName())).collect(Collectors.toList());
     }
 
     /**