From 8a524787c88a9128cc69af890d4181a01aad0e8c Mon Sep 17 00:00:00 2001
From: 吴学文 <wuxuewen@wuxuewendeMacBook-Pro.local>
Date: 星期六, 06 七月 2019 23:09:33 +0800
Subject: [PATCH] 修改代码生成器生成的app 加入user_id 的问题
---
CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 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 2d08a75..f1d8254 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
@@ -6,8 +6,11 @@
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.UnitDto;
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,13 +47,13 @@
@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-1)*row);
- floorInfo.put("row", row*page);
+ 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){
+ if (floors == null || floors.size() == 0) {
return floors;
}
@@ -74,6 +77,43 @@
public int queryFloorsCount(String communityId) {
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());
+ floorDto.setRow(page * 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瀵硅薄涓�
@@ -101,7 +141,7 @@
userIds.add(floor.getUserId());
}
- return userIds.toArray(new String[userIds.size()]);
+ return userIds.toArray(new String[userIds.size()]);
}
public IFloorServiceDao getFloorServiceDaoImpl() {
--
Gitblit v1.8.0