From cbc1f9db3d796683d88d6d30df3659984dfbeda3 Mon Sep 17 00:00:00 2001
From: webapp <webapp@home-server.attdns.com>
Date: 星期一, 30 九月 2019 22:56:12 +0800
Subject: [PATCH] 取消java110-common jar包，提升为CommonService服务,将之前的Java110-common内容变更为Java110-utils包
---
CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 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 9a1a984..1a6f5a8 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.PageDto;
import com.java110.dto.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;
@@ -44,10 +46,15 @@
@Override
public List<FloorDto> queryFloors(@RequestParam("page") int page, @RequestParam("row") int row, @RequestParam("communityId") String communityId) {
Map<String, Object> floorInfo = new HashMap<String, Object>();
- floorInfo.put("page", page);
- floorInfo.put("row", row);
+ floorInfo.put("page", (page - 1) * row);
+ floorInfo.put("row", row * page);
floorInfo.put("communityId", communityId);
List<FloorDto> floors = BeanConvertUtil.covertBeanList(floorServiceDaoImpl.queryFloors(floorInfo), FloorDto.class);
+
+
+ if (floors == null || floors.size() == 0) {
+ return floors;
+ }
String[] userIds = getUserIds(floors);
//鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
@@ -70,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瀵硅薄涓�
*
@@ -91,12 +134,12 @@
* @return 鎵归噺userIds 淇℃伅
*/
private String[] getUserIds(List<FloorDto> floors) {
- List<String> userIds = new ArrayList<>();
+ List<String> userIds = new ArrayList<String>();
for (FloorDto floor : floors) {
userIds.add(floor.getUserId());
}
- return (String[]) userIds.toArray();
+ return userIds.toArray(new String[userIds.size()]);
}
public IFloorServiceDao getFloorServiceDaoImpl() {
--
Gitblit v1.8.0