From 2d1076fd9c72cb672c45f68c908c998e13b1da75 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:13:41 +0800
Subject: [PATCH] 巡检计划CommunityService-smo

---
 CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java b/CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java
index ddb4ee3..e7576fa 100644
--- a/CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java
+++ b/CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java
@@ -1,13 +1,15 @@
 package com.java110.community.smo.impl;
 
-import com.java110.common.util.BeanConvertUtil;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.community.dao.IFloorServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.floor.IFloorInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
 import com.java110.dto.FloorDto;
-import com.java110.dto.UserDto;
+import com.java110.dto.PageDto;
+import com.java110.dto.user.UserDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -75,6 +77,42 @@
         return floorServiceDaoImpl.queryFloorsCount(communityId);
     }
 
+    @Override
+    public List<FloorDto> queryFloors(@RequestBody  FloorDto floorDto) {
+
+        //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+        int page = floorDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            floorDto.setPage((page - 1) * floorDto.getRow());
+        }
+
+
+        List<FloorDto> floors = BeanConvertUtil.covertBeanList(
+                floorServiceDaoImpl.queryFloors(BeanConvertUtil.beanCovertMap(floorDto)), FloorDto.class);
+
+
+        if (floors == null || floors.size() == 0) {
+            return floors;
+        }
+
+        String[] userIds = getUserIds(floors);
+        //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
+        List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+
+        for (FloorDto floor : floors) {
+            refreshFloor(floor, users);
+        }
+        return floors;
+    }
+
+    @Override
+    public int queryFloorsCount(@RequestBody FloorDto floorDto) {
+        return floorServiceDaoImpl.queryFloorsCount(BeanConvertUtil.beanCovertMap(floorDto));
+    }
+
+
     /**
      * 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
      *

--
Gitblit v1.8.0