1

lefull-lot-api-web/src/main/java/cn/lefull/api/LisaController.java

@@ -3,6 +3,7 @@ package cn.lefull.api;
 import cn.lefull.common.annotation.NoAuth;
 import cn.lefull.common.response.ApiResponse;
 import cn.lefull.interaction.pageresp.Pagination;
+import cn.lefull.interaction.vo.face.EntityListVO;
 import cn.lefull.interaction.vo.face.EquipmentListVO;
 import cn.lefull.service.lisa.EquipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,4 +55,11 @@ public class LisaController {
         equipmentService.updateEntity(entityId, userName, sex, roomNumber, identity, mobile, idCard,imgUrl, employeeId);
         return new ApiResponse<>();
     }
+
+    @NoAuth
+    @GetMapping("/getEntityList")
+    public ApiResponse<Object> getEntityList(int apartmentId, int page, int pageSize) throws Exception {
+        Pagination<EntityListVO> entityListVOPageInfo = equipmentService.getEntityList(apartmentId, page, pageSize);
+        return new ApiResponse<>(entityListVOPageInfo);
+    }
 }

lefull-lot-interaction/src/main/java/cn/lefull/interaction/vo/face/EntityListVO.java

@@ -26,11 +26,15 @@ public class EntityListVO implements Serializable {
      */
     private Byte sex;
 
+    private String sexStr;
+
     /**
      * 门店id
      */
     private Integer apartmentId;
 
+    private String apartmentName;
+
     /**
      * 用户姓名
      */
@@ -41,6 +45,8 @@ public class EntityListVO implements Serializable {
      */
     private Byte identity;
 
+    private String identityStr;
+
     /**
      * 手机号
      */

lefull-lot-service/src/main/java/cn/lefull/service/lisa/EquipmentService.java

 package cn.lefull.service.lisa;
 
 import cn.lefull.interaction.pageresp.Pagination;
+import cn.lefull.interaction.vo.face.EntityListVO;
 import cn.lefull.interaction.vo.face.EquipmentListVO;
 import org.springframework.stereotype.Service;
 
@@ -22,4 +23,6 @@ public interface EquipmentService {
     void addEntity(String userName, Byte sex, int apartmentId, String roomNumber, Byte identity, String mobile, String idCard, String imgUrl, int employeeId) throws Exception;
 
     void updateEntity(int entityId, String userName, Byte sex, String roomNumber, Byte identity, String mobile, String idCard, String imgUrl, int employeeId) throws Exception;
+
+    Pagination<EntityListVO> getEntityList(int apartmentId, int page, int pageSize) throws Exception;
 }

lefull-lot-service/src/main/java/cn/lefull/service/lisa/EquipmentServiceImpl.java

@@ -217,8 +217,19 @@ public class EquipmentServiceImpl implements EquipmentService {
         }
     }
 
-    //@Override
-    public Pagination<EquipmentListVO> getEntityList(int apartmentId, int page, int pageSize) throws Exception {
+    private String getSex(Byte sex)
+    {
+        switch (sex){
+            case 1 : return "男";
+            case 2 : return "女";
+            case 3 : return "未知";
+            default : return "";
+        }
+    }
+
+    @Override
+    public Pagination<EntityListVO> getEntityList(int apartmentId, int page, int pageSize) throws Exception {
+        Utils.checkParamsNotEmpty(apartmentId, "apartmentId");
         Utils.checkParamsNotEmpty(page, "page");
         Utils.checkParamsNotEmpty(pageSize, "pageSize");
         Page<Object> objects = PageHelper.startPage(page, pageSize);
@@ -231,8 +242,17 @@ public class EquipmentServiceImpl implements EquipmentService {
         List<EntityListVO> entityListVOS = new ArrayList<>();
         for (CameraEntityBO entityBO : entityList) {
             EntityListVO vo = new EntityListVO();
-
-
+            vo.setUserName(entityBO.getUserName());
+            vo.setSex(entityBO.getSex());
+            vo.setSexStr(this.getSex(entityBO.getSex()));
+            vo.setApartmentId(entityBO.getApartmentId());
+            vo.setApartmentName(entityBO.getApartmentName());
+            vo.setRoomNumber(entityBO.getRoomNumber());
+            vo.setIdentity(entityBO.getIdentity());
+            vo.setIdentityStr(this.getLabels(entityBO.getIdentity()));
+            vo.setMobile(entityBO.getMobile());
+            vo.setIdCard(entityBO.getIdCard());
+            vo.setImgUrl(entityBO.getImgUrl());
             entityListVOS.add(vo);
         }
         return PageBuilder.buildPageResult(objects, entityListVOS);