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-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java | 215 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 178 insertions(+), 37 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java b/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java
index 9de4153..486a859 100644
--- a/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java
+++ b/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java
@@ -1,11 +1,13 @@
package com.java110.user.bmo.owner.impl;
import com.java110.dto.RoomDto;
+import com.java110.dto.basePrivilege.BasePrivilegeDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
@@ -19,6 +21,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
@Service
public class ComprehensiveQueryImpl implements IComprehensiveQuery {
@@ -50,33 +53,36 @@
@Autowired
private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+ @Autowired
+ private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
+
@Override
- public ResponseEntity<String> query(String communityId, String searchValue, String searchType) {
+ public ResponseEntity<String> query(String communityId, String searchValue, String searchType, String userId) {
OwnerDto ownerDto = null;
switch (searchType) {
case SEARCH_TYPE_ROOM:
- ownerDto = queryByRoom(communityId, searchValue);
+ ownerDto = queryByRoom(communityId, searchValue, userId);
break;
case SEARCH_TYPE_OWNER_NAME:
- ownerDto = queryByOwnerName(communityId, searchValue);
+ ownerDto = queryByOwnerName(communityId, searchValue, userId);
break;
case SEARCH_TYPE_OWNER_TEL:
- ownerDto = queryByOwnerTel(communityId, searchValue);
+ ownerDto = queryByOwnerTel(communityId, searchValue, userId);
break;
case SEARCH_TYPE_OWNER_IDCARD:
- ownerDto = queryByOwnerIdCard(communityId, searchValue);
+ ownerDto = queryByOwnerIdCard(communityId, searchValue, userId);
break;
case SEARCH_TYPE_OWNER_CAR:
- ownerDto = queryByOwnerCar(communityId, searchValue);
+ ownerDto = queryByOwnerCar(communityId, searchValue, userId);
break;
case SEARCH_TYPE_OWNER_MEMBER_NAME:
- ownerDto = queryByOwnerMemberName(communityId, searchValue);
+ ownerDto = queryByOwnerMemberName(communityId, searchValue, userId);
break;
case SEARCH_TYPE_OWNER_MEMBER_TEL:
- ownerDto = queryByOwnerMemberTel(communityId, searchValue);
+ ownerDto = queryByOwnerMemberTel(communityId, searchValue, userId);
break;
case SEARCH_TYPE_OWNER_MEMBER_IDCARD:
- ownerDto = queryByOwnerMemberIdCard(communityId, searchValue);
+ ownerDto = queryByOwnerMemberIdCard(communityId, searchValue, userId);
break;
}
return ResultVo.createResponseEntity(1, 1, ownerDto);
@@ -89,16 +95,29 @@
* @param searchValue
* @return
*/
- private OwnerDto queryByOwnerMemberIdCard(String communityId, String searchValue) {
-
+ private OwnerDto queryByOwnerMemberIdCard(String communityId, String searchValue, String userId) {
OwnerDto ownerDto = new OwnerDto();
ownerDto.setCommunityId(communityId);
ownerDto.setIdCard(searchValue);
ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER, OwnerDto.OWNER_TYPE_CD_RENTING});
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
Assert.listOnlyOne(ownerDtos, "鏈壘鍒版垚鍛樹俊鎭垨鑰呮煡璇㈠埌澶氭潯锛岃鎹㈠叾浠栨潯浠舵煡璇�");
-
- return queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
+ OwnerDto owner = queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
+ //鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
+ List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
+ //瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
+ String idCard = owner.getIdCard();
+ if (mark.size() == 0 && idCard != null && idCard != null) {
+ idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
+ owner.setIdCard(idCard);
+ }
+ //瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
+ String link = owner.getLink();
+ if (mark.size() == 0 && link != null && !link.equals("")) {
+ link = link.substring(0, 3) + "****" + link.substring(7);
+ owner.setLink(link);
+ }
+ return owner;
}
/**
@@ -108,16 +127,29 @@
* @param searchValue
* @return
*/
- private OwnerDto queryByOwnerMemberTel(String communityId, String searchValue) {
-
+ private OwnerDto queryByOwnerMemberTel(String communityId, String searchValue, String userId) {
OwnerDto ownerDto = new OwnerDto();
ownerDto.setCommunityId(communityId);
ownerDto.setLink(searchValue);
ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER, OwnerDto.OWNER_TYPE_CD_RENTING});
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
Assert.listOnlyOne(ownerDtos, "鏈壘鍒版垚鍛樹俊鎭垨鑰呮煡璇㈠埌澶氭潯锛岃鎹㈠叾浠栨潯浠舵煡璇�");
-
- return queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
+ OwnerDto owner = queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
+ //鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
+ List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
+ //瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
+ String idCard = owner.getIdCard();
+ if (mark.size() == 0 && idCard != null && idCard != null) {
+ idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
+ owner.setIdCard(idCard);
+ }
+ //瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
+ String link = owner.getLink();
+ if (mark.size() == 0 && link != null && !link.equals("")) {
+ link = link.substring(0, 3) + "****" + link.substring(7);
+ owner.setLink(link);
+ }
+ return owner;
}
/**
@@ -127,7 +159,7 @@
* @param searchValue
* @return
*/
- private OwnerDto queryByOwnerMemberName(String communityId, String searchValue) {
+ private OwnerDto queryByOwnerMemberName(String communityId, String searchValue, String userId) {
OwnerDto ownerDto = new OwnerDto();
ownerDto.setCommunityId(communityId);
@@ -135,8 +167,22 @@
ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER, OwnerDto.OWNER_TYPE_CD_RENTING});
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
Assert.listOnlyOne(ownerDtos, "鏈壘鍒版垚鍛樹俊鎭垨鑰呮煡璇㈠埌澶氭潯锛岃鎹㈠叾浠栨潯浠舵煡璇�");
-
- return queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
+ OwnerDto owner = queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
+ //鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
+ List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
+ //瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
+ String idCard = owner.getIdCard();
+ if (mark.size() == 0 && idCard != null && idCard != null) {
+ idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
+ owner.setIdCard(idCard);
+ }
+ //瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
+ String link = owner.getLink();
+ if (mark.size() == 0 && link != null && !link.equals("")) {
+ link = link.substring(0, 3) + "****" + link.substring(7);
+ owner.setLink(link);
+ }
+ return owner;
}
/**
@@ -146,7 +192,7 @@
* @param searchValue
* @return
*/
- private OwnerDto queryByOwnerCar(String communityId, String searchValue) {
+ private OwnerDto queryByOwnerCar(String communityId, String searchValue, String userId) {
OwnerCarDto ownerCarDto = new OwnerCarDto();
ownerCarDto.setCommunityId(communityId);
ownerCarDto.setCarNum(searchValue);
@@ -156,7 +202,22 @@
throw new IllegalArgumentException("鏈煡鍒拌溅杈嗕俊鎭�");
}
- return queryByOwnerId(communityId, ownerCarDtos.get(0).getOwnerId());
+ OwnerDto owner = queryByOwnerId(communityId, ownerCarDtos.get(0).getOwnerId());
+ //鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
+ List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
+ //瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
+ String idCard = owner.getIdCard();
+ if (mark.size() == 0 && idCard != null && idCard != null) {
+ idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
+ owner.setIdCard(idCard);
+ }
+ //瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
+ String link = owner.getLink();
+ if (mark.size() == 0 && link != null && !link.equals("")) {
+ link = link.substring(0, 3) + "****" + link.substring(7);
+ owner.setLink(link);
+ }
+ return owner;
}
@@ -204,16 +265,34 @@
* @param searchValue
* @return
*/
- private OwnerDto queryByOwnerIdCard(String communityId, String searchValue) {
+ private OwnerDto queryByOwnerIdCard(String communityId, String searchValue, String userId) {
OwnerDto ownerDto = new OwnerDto();
ownerDto.setCommunityId(communityId);
ownerDto.setIdCard(searchValue);
ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
Assert.listOnlyOne(ownerDtos, "鏈壘鍒颁笟涓讳俊鎭垨鑰呮煡璇㈠埌澶氭潯锛岃鎹㈠叾浠栨潯浠舵煡璇�");
- OwnerDto resOwnerDto = ownerDtos.get(0);
+ //鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
+ List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
+ List<OwnerDto> ownerDtoList = new ArrayList<>();
+ for (OwnerDto owner : ownerDtos) {
+ //瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
+ String idCard = owner.getIdCard();
+ if (mark.size() == 0 && idCard != null && !idCard.equals("")) {
+ idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
+ }
+ //瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
+ String link = owner.getLink();
+ if (mark.size() == 0 && link != null && !link.equals("")) {
+ link = link.substring(0, 3) + "****" + link.substring(7);
+ }
+ owner.setIdCard(idCard);
+ owner.setLink(link);
+ ownerDtoList.add(owner);
+ }
+ OwnerDto resOwnerDto = ownerDtoList.get(0);
OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
- ownerRoomRelDto.setOwnerId(ownerDtos.get(0).getOwnerId());
+ ownerRoomRelDto.setOwnerId(ownerDtoList.get(0).getOwnerId());
List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
//娌℃湁鎴垮眿
@@ -241,16 +320,34 @@
* @param searchValue
* @return
*/
- private OwnerDto queryByOwnerTel(String communityId, String searchValue) {
+ private OwnerDto queryByOwnerTel(String communityId, String searchValue, String userId) {
OwnerDto ownerDto = new OwnerDto();
ownerDto.setCommunityId(communityId);
ownerDto.setLink(searchValue);
ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
Assert.listOnlyOne(ownerDtos, "鏈壘鍒颁笟涓讳俊鎭垨鑰呮煡璇㈠埌澶氭潯锛岃鎹㈠叾浠栨潯浠舵煡璇�");
- OwnerDto resOwnerDto = ownerDtos.get(0);
+ //鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
+ List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
+ List<OwnerDto> ownerDtoList = new ArrayList<>();
+ for (OwnerDto owner : ownerDtos) {
+ //瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
+ String idCard = owner.getIdCard();
+ if (mark.size() == 0 && idCard != null && !idCard.equals("")) {
+ idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
+ }
+ //瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
+ String link = owner.getLink();
+ if (mark.size() == 0 && link != null && !link.equals("")) {
+ link = link.substring(0, 3) + "****" + link.substring(7);
+ }
+ owner.setIdCard(idCard);
+ owner.setLink(link);
+ ownerDtoList.add(owner);
+ }
+ OwnerDto resOwnerDto = ownerDtoList.get(0);
OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
- ownerRoomRelDto.setOwnerId(ownerDtos.get(0).getOwnerId());
+ ownerRoomRelDto.setOwnerId(ownerDtoList.get(0).getOwnerId());
List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
//娌℃湁鎴垮眿
@@ -278,17 +375,34 @@
* @param searchValue
* @return
*/
- private OwnerDto queryByOwnerName(String communityId, String searchValue) {
-
+ private OwnerDto queryByOwnerName(String communityId, String searchValue, String userId) {
OwnerDto ownerDto = new OwnerDto();
ownerDto.setCommunityId(communityId);
ownerDto.setName(searchValue);
ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
Assert.listOnlyOne(ownerDtos, "鏈壘鍒颁笟涓讳俊鎭垨鑰呮煡璇㈠埌澶氭潯锛岃鎹㈠叾浠栨潯浠舵煡璇�");
- OwnerDto resOwnerDto = ownerDtos.get(0);
+ //鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
+ List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
+ List<OwnerDto> ownerDtoList = new ArrayList<>();
+ for (OwnerDto owner : ownerDtos) {
+ //瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
+ String idCard = owner.getIdCard();
+ if (mark.size() == 0 && idCard != null && !idCard.equals("")) {
+ idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
+ }
+ //瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
+ String link = owner.getLink();
+ if (mark.size() == 0 && link != null && !link.equals("")) {
+ link = link.substring(0, 3) + "****" + link.substring(7);
+ }
+ owner.setIdCard(idCard);
+ owner.setLink(link);
+ ownerDtoList.add(owner);
+ }
+ OwnerDto resOwnerDto = ownerDtoList.get(0);
OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
- ownerRoomRelDto.setOwnerId(ownerDtos.get(0).getOwnerId());
+ ownerRoomRelDto.setOwnerId(ownerDtoList.get(0).getOwnerId());
List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
//娌℃湁鎴垮眿
@@ -316,7 +430,7 @@
* @param searchValue
* @return
*/
- private OwnerDto queryByRoom(String communityId, String searchValue) {
+ private OwnerDto queryByRoom(String communityId, String searchValue, String userId) {
if (!searchValue.contains("-")) {
throw new IllegalArgumentException("鏌ヨ鍐呭鏍煎紡閿欒锛岃杈撳叆 妤兼爧-鍗曞厓-鎴垮眿 濡� 1-1-1");
@@ -335,7 +449,6 @@
roomDto.setCommunityId(communityId);
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
-
Assert.listOnlyOne(roomDtos, "鏈壘鍒版埧灞嬩俊鎭�");
OwnerDto ownerDto = new OwnerDto();
@@ -343,15 +456,43 @@
ownerDto.setRoomId(roomDtos.get(0).getRoomId());
ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
-
Assert.listOnlyOne(ownerDtos, "鏈壘鍒颁笟涓讳俊鎭�");
+ //鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
+ List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
+ List<OwnerDto> ownerDtoList = new ArrayList<>();
+ for (OwnerDto owner : ownerDtos) {
+ //瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
+ String idCard = owner.getIdCard();
+ if (mark.size() == 0 && idCard != null && !idCard.equals("")) {
+ idCard = idCard.substring(0, 6) + "**********" + idCard.substring(16);
+ }
+ //瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
+ String link = owner.getLink();
+ if (mark.size() == 0 && link != null && !link.equals("")) {
+ link = link.substring(0, 3) + "****" + link.substring(7);
+ }
+ owner.setIdCard(idCard);
+ owner.setLink(link);
+ ownerDtoList.add(owner);
+ }
- OwnerDto resOwnerDto = ownerDtos.get(0);
+ OwnerDto resOwnerDto = ownerDtoList.get(0);
resOwnerDto.setRooms(roomDtos);
return resOwnerDto;
}
-
+ /**
+ * 鑴辨晱澶勭悊
+ *
+ * @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