From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerRoomRelInnerServiceSMOImpl.java | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/OwnerRoomRelInnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/OwnerRoomRelInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index b6c977b..947d9d8
--- a/service-user/src/main/java/com/java110/user/smo/impl/OwnerRoomRelInnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/OwnerRoomRelInnerServiceSMOImpl.java
@@ -1,14 +1,15 @@
package com.java110.user.smo.impl;
-import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.user.IOwnerRoomRelInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
-import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.PageDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.user.UserDto;
+import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.po.owner.OwnerRoomRelPo;
import com.java110.user.dao.IOwnerRoomRelServiceDao;
+import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -34,7 +35,7 @@
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@Override
- public List<OwnerRoomRelDto> queryOwnerRoomRels(@RequestBody OwnerRoomRelDto ownerRoomRelDto) {
+ public List<OwnerRoomRelDto> queryOwnerRoomRels(@RequestBody OwnerRoomRelDto ownerRoomRelDto) {
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
@@ -46,17 +47,17 @@
List<OwnerRoomRelDto> ownerRoomRels = BeanConvertUtil.covertBeanList(ownerRoomRelServiceDaoImpl.getOwnerRoomRelInfo(BeanConvertUtil.beanCovertMap(ownerRoomRelDto)), OwnerRoomRelDto.class);
- if (ownerRoomRels == null || ownerRoomRels.size() == 0) {
- return ownerRoomRels;
- }
-
- String[] userIds = getUserIds(ownerRoomRels);
- //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
- List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
-
- for (OwnerRoomRelDto ownerRoomRel : ownerRoomRels) {
- refreshOwnerRoomRel(ownerRoomRel, users);
- }
+// if (ownerRoomRels == null || ownerRoomRels.size() == 0) {
+// return ownerRoomRels;
+// }
+//
+// String[] userIds = getUserIds(ownerRoomRels);
+// //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
+// List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+//
+// for (OwnerRoomRelDto ownerRoomRel : ownerRoomRels) {
+// refreshOwnerRoomRel(ownerRoomRel, users);
+// }
return ownerRoomRels;
}
@@ -64,7 +65,7 @@
* 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
*
* @param ownerRoomRel 灏忓尯涓氫富鎴垮眿淇℃伅
- * @param users 鐢ㄦ埛鍒楄〃
+ * @param users 鐢ㄦ埛鍒楄〃
*/
private void refreshOwnerRoomRel(OwnerRoomRelDto ownerRoomRel, List<UserDto> users) {
for (UserDto user : users) {
@@ -91,7 +92,26 @@
@Override
public int queryOwnerRoomRelsCount(@RequestBody OwnerRoomRelDto ownerRoomRelDto) {
- return ownerRoomRelServiceDaoImpl.queryOwnerRoomRelsCount(BeanConvertUtil.beanCovertMap(ownerRoomRelDto)); }
+ return ownerRoomRelServiceDaoImpl.queryOwnerRoomRelsCount(BeanConvertUtil.beanCovertMap(ownerRoomRelDto));
+ }
+
+ @Override
+ public int saveOwnerRoomRels(@RequestBody OwnerRoomRelPo ownerRoomRelPo) {
+ return ownerRoomRelServiceDaoImpl.saveOwnerRoomRels(BeanConvertUtil.beanCovertMap(ownerRoomRelPo));
+ }
+
+ @Override
+ public int saveBusinessOwnerRoomRels(@RequestBody OwnerRoomRelPo ownerRoomRelPo) {
+ ownerRoomRelServiceDaoImpl.saveBusinessOwnerRoomRelInfo(BeanConvertUtil.beanCovertMap(ownerRoomRelPo));
+ return 1;
+ }
+
+
+ @Override
+ public int updateOwnerRoomRels(@RequestBody OwnerRoomRelPo ownerRoomRelPo) {
+ return ownerRoomRelServiceDaoImpl.updateOwnerRoomRels(BeanConvertUtil.beanCovertMap(ownerRoomRelPo));
+ }
+
public IOwnerRoomRelServiceDao getOwnerRoomRelServiceDaoImpl() {
return ownerRoomRelServiceDaoImpl;
--
Gitblit v1.8.0