From 498288ba58aaeaea0453424a8f9b8448582ff0df Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 十二月 2020 14:52:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-api/src/main/java/com/java110/api/listener/fee/ListRoomsWhereFeeSetListener.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/ListRoomsWhereFeeSetListener.java b/service-api/src/main/java/com/java110/api/listener/fee/ListRoomsWhereFeeSetListener.java
index beb026a..7bd5eae 100644
--- a/service-api/src/main/java/com/java110/api/listener/fee/ListRoomsWhereFeeSetListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/ListRoomsWhereFeeSetListener.java
@@ -4,6 +4,8 @@
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
+import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
@@ -23,6 +25,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
@@ -30,7 +33,6 @@
*/
@Java110Listener("listRoomsWhereFeeSetListener")
public class ListRoomsWhereFeeSetListener extends AbstractServiceApiListener {
-
@Autowired
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
@@ -40,6 +42,9 @@
@Autowired
private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
@Override
public String getServiceCode() {
@@ -81,8 +86,8 @@
apiRoomVo.setTotal(total);
if (total > 0) {
List<RoomDto> roomDtoList = roomInnerServiceSMOImpl.queryRooms(roomDto);
-
- refreshRoomOwners(reqJson.getString("communityId"), roomDtoList);
+ String userId = context.getUserId();
+ refreshRoomOwners(userId, reqJson.getString("communityId"), roomDtoList);
apiRoomVo.setRooms(BeanConvertUtil.covertBeanList(roomDtoList, ApiRoomDataVo.class));
}
@@ -153,8 +158,7 @@
*
* @param roomDtos
*/
- private void refreshRoomOwners(String communityId, List<RoomDto> roomDtos) {
-
+ private void refreshRoomOwners(String userId, String communityId, List<RoomDto> roomDtos) {
List<String> roomIds = new ArrayList<>();
for (RoomDto roomDto : roomDtos) {
roomIds.add(roomDto.getRoomId());
@@ -162,15 +166,25 @@
OwnerDto ownerDto = new OwnerDto();
ownerDto.setCommunityId(communityId);
ownerDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
+ List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
-
for (RoomDto roomDto : roomDtos) {
for (OwnerDto tmpOwnerDto : ownerDtos) {
if (roomDto.getRoomId().equals(tmpOwnerDto.getRoomId())) {
roomDto.setOwnerId(tmpOwnerDto.getOwnerId());
roomDto.setOwnerName(tmpOwnerDto.getName());
- roomDto.setIdCard(tmpOwnerDto.getIdCard());
- roomDto.setLink(tmpOwnerDto.getLink());
+ //瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
+ String idCard = tmpOwnerDto.getIdCard();
+ if (mark.size() == 0 && idCard != null && !idCard.equals("")) {
+ idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
+ }
+ //瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
+ String link = tmpOwnerDto.getLink();
+ if (mark.size() == 0 && link != null && !link.equals("")) {
+ link = link.substring(0, 3) + "****" + link.substring(7);
+ }
+ roomDto.setIdCard(idCard);
+ roomDto.setLink(link);
}
}
}
@@ -199,4 +213,17 @@
public void setOwnerRoomRelInnerServiceSMOImpl(IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl) {
this.ownerRoomRelInnerServiceSMOImpl = ownerRoomRelInnerServiceSMOImpl;
}
+
+ /**
+ * 鑴辨晱澶勭悊
+ *
+ * @return
+ */
+ public List<Map> getPrivilegeOwnerList(String resource, String userId) {
+ BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
+ basePrivilegeDto.setResource(resource);
+ basePrivilegeDto.setUserId(userId);
+ List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
+ return privileges;
+ }
}
--
Gitblit v1.8.0