【基础信息】个人-根据房间号查人

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/HomeUserResultDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/11/1 10:47
+ */
+@Data
+public class HomeUserResultDTO implements Serializable {
+    private static final long serialVersionUID = -8441112171986914418L;
+    private String userId;
+    private String name;
+}

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

@@ -42,6 +42,7 @@ import com.epmet.dto.form.IcResiUserPageFormDTO;
 import com.epmet.dto.result.CustomerFormResultDTO;
 import com.epmet.dto.result.FormGroupDTO;
 import com.epmet.dto.result.FormItem;
+import com.epmet.dto.result.HomeUserResultDTO;
 import com.epmet.excel.IcResiUserExcel;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.IcResiUserService;
@@ -281,6 +282,18 @@ public class IcResiUserController {
         everySheetHeaderMap.putIfAbsent(item.getLabel(),firstSheetHeaderList);
     }
 
+    /**
+     * @Description 根据房间号查人
+     * @Param formDTO
+     * @Return {@link Result<List<HomeUserResultDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/1 11:04
+     */
+    @PostMapping("getpeoplebyroom")
+    public Result<List<HomeUserResultDTO>> getPeopleByRoom(@RequestBody IcResiUserDTO formDTO) {
+        return new Result<List<HomeUserResultDTO>>().ok(icResiUserService.getPeopleByRoom(formDTO.getHomeId()));
+    }
+
     @PostMapping("listresi")
     public Result<PageData<Map<String,Object>>> queryListResi1(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO){
         //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");

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

@@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.IcResiDetailFormDTO;
 import com.epmet.dto.form.IcResiUserFormDTO;
+import com.epmet.dto.result.HomeUserResultDTO;
 import com.epmet.dto.form.IcResiUserPageFormDTO;
 import com.epmet.entity.IcResiUserEntity;
 
@@ -109,6 +110,15 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      **/
     void edit(TokenDto tokenDto, List<IcResiUserFormDTO> formDTO);
 
+    /**
+     * @Description 获取房间内人员
+     * @Param homeId
+     * @Return {@link List< HomeUserResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/1 10:52
+     */
+    List<HomeUserResultDTO> getPeopleByRoom(String homeId);
+
     PageData<Map<String,Object>> pageResiMap(IcResiUserPageFormDTO formDTO);
     /**
      * 编辑页面，显示居民信息详情

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

@@ -18,6 +18,7 @@
 package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -40,6 +41,7 @@ import com.epmet.dto.form.IcResiDetailFormDTO;
 import com.epmet.dto.form.IcResiUserFormDTO;
 import com.epmet.dto.form.IcResiUserPageFormDTO;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
+import com.epmet.dto.result.HomeUserResultDTO;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.IcFormResColumnDTO;
 import com.epmet.entity.IcResiUserEntity;
@@ -50,13 +52,13 @@ import com.epmet.service.IcResiUserService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.function.Function;
@@ -238,9 +240,39 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     }
 
+    /**
+     * @param homeId
+     * @Description 获取房间内人员
+     * @Param homeId
+     * @Return {@link List<  HomeUserResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/11/1 10:52
+     */
+    @Override
+    public List<HomeUserResultDTO> getPeopleByRoom(String homeId) {
+        if(StringUtils.isBlank(homeId)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcResiUserEntity::getHomeId, homeId);
+        wrapper.orderByAsc(IcResiUserEntity::getYhzgx);
+        List<IcResiUserEntity> list = baseDao.selectList(wrapper);
+
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> {
+            HomeUserResultDTO dto = new HomeUserResultDTO();
+            dto.setUserId(item.getId());
+            dto.setName(item.getName());
+            return dto;
+        }).collect(Collectors.toList());
+    }
 
 
 
+
+    @Override
     public PageData<Map<String, Object>> pageResiMap(IcResiUserPageFormDTO formDTO) {
         // 查询列表展示项，如果没有，直接返回
         CustomerFormQueryDTO queryDTO1=new CustomerFormQueryDTO();