diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/UserCancelRecord.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/UserCancelRecord.java index 0e97f5fa0..a56d675d7 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/UserCancelRecord.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/UserCancelRecord.java @@ -55,10 +55,6 @@ public class UserCancelRecord { private String userDesc; - private String alipayAccount; - - private String alipayAccountName; - private Date createTime; private Date updateTime; @@ -69,10 +65,6 @@ public class UserCancelRecord { private Byte shareChannel; - private String wxPubFansOpenid; - - private Byte wxPubFansGender; - private String os; private String osversion; @@ -133,14 +125,6 @@ public class UserCancelRecord { private String registerIp; - private String weixinOpenid; - - private String weixinUnionid; - - private String qqOpenid; - - private String qqUnionid; - private String appleUid; private String cancelPhone; @@ -329,22 +313,6 @@ public class UserCancelRecord { this.userDesc = userDesc == null ? null : userDesc.trim(); } - public String getAlipayAccount() { - return alipayAccount; - } - - public void setAlipayAccount(String alipayAccount) { - this.alipayAccount = alipayAccount == null ? null : alipayAccount.trim(); - } - - public String getAlipayAccountName() { - return alipayAccountName; - } - - public void setAlipayAccountName(String alipayAccountName) { - this.alipayAccountName = alipayAccountName == null ? null : alipayAccountName.trim(); - } - public Date getCreateTime() { return createTime; } @@ -385,22 +353,6 @@ public class UserCancelRecord { this.shareChannel = shareChannel; } - public String getWxPubFansOpenid() { - return wxPubFansOpenid; - } - - public void setWxPubFansOpenid(String wxPubFansOpenid) { - this.wxPubFansOpenid = wxPubFansOpenid == null ? null : wxPubFansOpenid.trim(); - } - - public Byte getWxPubFansGender() { - return wxPubFansGender; - } - - public void setWxPubFansGender(Byte wxPubFansGender) { - this.wxPubFansGender = wxPubFansGender; - } - public String getOs() { return os; } @@ -641,38 +593,6 @@ public class UserCancelRecord { this.registerIp = registerIp == null ? null : registerIp.trim(); } - public String getWeixinOpenid() { - return weixinOpenid; - } - - public void setWeixinOpenid(String weixinOpenid) { - this.weixinOpenid = weixinOpenid == null ? null : weixinOpenid.trim(); - } - - public String getWeixinUnionid() { - return weixinUnionid; - } - - public void setWeixinUnionid(String weixinUnionid) { - this.weixinUnionid = weixinUnionid == null ? null : weixinUnionid.trim(); - } - - public String getQqOpenid() { - return qqOpenid; - } - - public void setQqOpenid(String qqOpenid) { - this.qqOpenid = qqOpenid == null ? null : qqOpenid.trim(); - } - - public String getQqUnionid() { - return qqUnionid; - } - - public void setQqUnionid(String qqUnionid) { - this.qqUnionid = qqUnionid == null ? null : qqUnionid.trim(); - } - public String getAppleUid() { return appleUid; } diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/UserCancelRecordMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/UserCancelRecordMapper.xml index 8d7885028..7d55d2132 100644 --- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/UserCancelRecordMapper.xml +++ b/accompany-admin/accompany-admin-service/src/main/resources/mapper/UserCancelRecordMapper.xml @@ -11,8 +11,6 @@ - - @@ -24,15 +22,11 @@ - - - - @@ -49,8 +43,6 @@ - - @@ -63,10 +55,6 @@ - - - - diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/RoomMapperExpand.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/RoomMapperExpand.java index ddbc074ce..c7ac3a9a8 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/RoomMapperExpand.java +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/RoomMapperExpand.java @@ -5,20 +5,12 @@ import com.accompany.core.vo.user.SearchVo; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; public interface RoomMapperExpand { + List searchRoomByKey(@Param("partitionId") Integer partitionId, @Param("key") String key, @Param("start") Integer start, @Param("limit") Integer limit); - List searchRoomByKey(@Param("key") String key, @Param("start") Integer start, @Param("limit") Integer limit); - - List searchUserByKey(@Param("key") String key, @Param("start") Integer start, @Param("limit") Integer limit); - - List selectNewRooms(Map param); - - List selectRadioRooms(Map param); - - List selectPoolRooms(); + List searchUserByKey(@Param("partitionId") Integer partitionId, @Param("key") String key, @Param("start") Integer start, @Param("limit") Integer limit); Long countValidRooms(); @@ -28,12 +20,6 @@ public interface RoomMapperExpand { List listValidRoomsExcludePlayroom(@Param("roomId")Long roomId, @Param("index") Integer index, @Param("size") Integer size); - List selectPoolRoomsV2(@Param("uid") Long uid); - List listValidRoomsByTag(@Param("index") Integer index, @Param("size") Integer size, @Param("roomTag") String roomTag); - List searchRoomByKeyV2(@Param("uidList") List uidList, @Param("key") String key, @Param("start") Integer start, @Param("limit") Integer limit); - - List searchUserByKeyV2(@Param("uidList") List uidList, @Param("key") String key, @Param("start") Integer start, @Param("limit") Integer limit); - } \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/oauth/AccountMapper.xml b/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/oauth/AccountMapper.xml index aa66af53a..9508c84b8 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/oauth/AccountMapper.xml +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/oauth/AccountMapper.xml @@ -12,10 +12,6 @@ - - - - @@ -44,8 +40,7 @@ uid, phone,erban_no,password,netease_token,state,last_login_time,phone_area_code, - last_login_ip,register_ip,weixin_openid,weixin_unionid,qq_openid, - qq_unionid,apple_uid,apple_full_name,os,osVersion,app,imei,channel, + last_login_ip,register_ip,apple_uid,apple_full_name,os,osVersion,app,imei,channel, linkedme_channel,isp_type,net_type,model,device_id,app_version,acc_block_start_time, acc_block_end_time,device_block_start_time,device_block_end_time,sign_time,update_time,signup_app, prefill_invite_code,prefill_invite_uid,device_info diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/RoomMapperExpand.xml b/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/RoomMapperExpand.xml index 287035226..f6537972b 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/RoomMapperExpand.xml +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/RoomMapperExpand.xml @@ -54,7 +54,7 @@ - - - - - - @@ -114,51 +85,7 @@ select * from room where valid = 1 and online_num > 0 and room_id != #{roomId} limit #{index}, #{size} - + select * from room where valid = 1 and online_num > 0 and room_tag = #{roomTag} limit #{index}, #{size} - - - - - - \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/UserCancelRecordBaseMapper.xml b/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/UserCancelRecordBaseMapper.xml index 87c7e6c8a..25357b1e8 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/UserCancelRecordBaseMapper.xml +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/sqlmappers/UserCancelRecordBaseMapper.xml @@ -27,15 +27,11 @@ - - - - @@ -52,8 +48,6 @@ - - @@ -66,10 +60,6 @@ - - - - diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchService.java index 002731d79..4b1992906 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomSearchService.java @@ -39,7 +39,6 @@ import com.alibaba.fastjson.JSONObject; import com.google.common.reflect.TypeToken; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections.CollectionUtils; import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; @@ -122,8 +121,13 @@ public class RoomSearchService extends BaseService { * @throws IllegalAccessException */ public List search(Long uid, String searchText, Integer searchType, Integer page, Integer pageSize) throws Exception { + Users u = usersService.getUsersByUid(uid); + if (null == u) { + throw new ServiceException(BusiStatus.USERNOTEXISTS); + } + // 检查是否命中缓存 - String searchTextKey = String.join("_", searchText, searchType.toString()); + String searchTextKey = String.join("_", u.getPartitionId().toString(), searchText, searchType.toString()); String cacheKey = RedisKey.search_text_cache.getKey(searchTextKey); String result = jedisService.get(cacheKey); @@ -148,7 +152,7 @@ public class RoomSearchService extends BaseService { } Integer pageStart = (page - 1) * pageSize; - List searchVos = searchByKey(searchText, searchType, pageStart, pageSize); + List searchVos = searchByKey(u.getPartitionId(), searchText, searchType, pageStart, pageSize); // 缓存结果默认5秒 jedisService.set(cacheKey, gson.toJson(searchVos)); @@ -165,10 +169,10 @@ public class RoomSearchService extends BaseService { } @SneakyThrows - private List searchByKey(String searchText, Integer searchType, Integer pageStart, Integer pageSize) { + private List searchByKey(Integer partitionId, String searchText, Integer searchType, Integer pageStart, Integer pageSize) { List searchVos = (searchType == 1 ? - searchRoomByKey(searchText, pageStart, pageSize) : - searchUserByKey(searchText, pageStart, pageSize)); + searchRoomByKey(partitionId, searchText, pageStart, pageSize) : + searchUserByKey(partitionId, searchText, pageStart, pageSize)); if (CollectionUtils.isEmpty(searchVos)) { return Collections.emptyList(); @@ -240,12 +244,12 @@ public class RoomSearchService extends BaseService { return searchVos.stream().filter(vo -> !blockedUids.contains(vo.getErbanNo())).collect(Collectors.toList()); } - public List searchRoomByKey(String searchText, Integer start, Integer limit) { - return roomMapperExpand.searchRoomByKey(searchText, start, limit); + public List searchRoomByKey(Integer partitionId, String searchText, Integer start, Integer limit) { + return roomMapperExpand.searchRoomByKey(partitionId, searchText, start, limit); } - public List searchUserByKey(String searchText, Integer start, Integer limit) { - return roomMapperExpand.searchUserByKey(searchText, start, limit); + public List searchUserByKey(Integer partitionId, String searchText, Integer start, Integer limit) { + return roomMapperExpand.searchUserByKey(partitionId, searchText, start, limit); } @@ -439,15 +443,20 @@ public class RoomSearchService extends BaseService { } public List searchByEs(Long uid, String searchText, Integer searchType, Integer page, Integer pageSize, DeviceInfo deviceInfo) throws Exception { + Users u = usersService.getUsersByUid(uid); + if (null == u){ + throw new ServiceException(BusiStatus.USERNOTEXISTS); + } + List validUidList = new ArrayList<>(); QueryBuilder queryBuilder; String index = null; if (SEARCH_TYPE_ROOM.equals(searchType)) { - queryBuilder = genRoomSearchQueryCondition(validUidList, searchText); + queryBuilder = genRoomSearchQueryCondition(u.getPartitionId(), validUidList, searchText); index = elasticsearchConfig.getRoomIndex(); } else { queryBuilder = - genUserSearchQueryCondition(validUidList, searchText); + genUserSearchQueryCondition(u.getPartitionId(), validUidList, searchText); index = elasticsearchConfig.getUserIndex(); } @@ -462,9 +471,10 @@ public class RoomSearchService extends BaseService { return searchVos; } - private QueryBuilder genUserSearchQueryCondition(List validUidList, String searchText) { + private QueryBuilder genUserSearchQueryCondition(Integer partitionId, List validUidList, String searchText) { BoolQueryBuilder queryConditionBuilder = QueryBuilders.boolQuery() .mustNot(QueryBuilders.matchPhraseQuery("defUser", Constant.DefUser.ROBOT)) + .must(QueryBuilders.termQuery("partitionId", partitionId)) .filter( QueryBuilders.boolQuery().should(QueryBuilders.matchPhraseQuery("nick", searchText)) .should(QueryBuilders.matchPhraseQuery("erbanNo", searchText)) @@ -479,10 +489,11 @@ public class RoomSearchService extends BaseService { return queryConditionBuilder; } - private QueryBuilder genRoomSearchQueryCondition(List validUidList, String searchText) { + private QueryBuilder genRoomSearchQueryCondition(Integer partitionId, List validUidList, String searchText) { BoolQueryBuilder queryConditionBuilder = QueryBuilders.boolQuery() .mustNot(QueryBuilders.matchPhraseQuery("defUser", Constant.DefUser.ROBOT)) .must(QueryBuilders.termQuery("valid", Constant.StatusV2.valid)) + .must(QueryBuilders.termQuery("partitionId", partitionId)) .filter( QueryBuilders.boolQuery().should(QueryBuilders.matchPhraseQuery("title", searchText)) .should(QueryBuilders.matchPhraseQuery("erbanNo", searchText)) diff --git a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/HomeTask.java b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/HomeTask.java index a6949b6b0..d916ed42c 100644 --- a/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/HomeTask.java +++ b/accompany-scheduler/accompany-scheduler-service/src/main/java/com/accompany/scheduler/task/HomeTask.java @@ -20,59 +20,10 @@ import java.util.concurrent.TimeUnit; @Component public class HomeTask extends BaseTask { private static final Logger logger = LoggerFactory.getLogger(HomeTask.class); - public static volatile boolean isDoHomeDataJob = false; - @Autowired - private RoomMapperExpand roomMapperExpand; @Autowired private FaceJsonService faceJsonService; - - - /** - * 定时刷新首页数据, 2min - */ -// @Scheduled(cron = "0 */2 * * * ?") -// public void doHomeDataJob(){ -// try { -// isDoHomeDataJob = true; -// logger.info("HomeDataJob doHomeDataJob start....."); -// homeService.doHomeDataJob(); -// logger.info("HomeDataJob doHomeDataJob finish....."); -// } catch (Exception e) { -// logger.error("doHomeDataJob error,", e); -// }finally { -// isDoHomeDataJob = false; -// } -// } - - /** - * 从配置池中获取房间列表，随机排序后保存到缓存； - * 首页加载时从缓存中获取，分页返回 - */ - //@Scheduled(cron = "0 */2 * * * ?") - public void cacheRandomRoom(){ - try { - List list = roomMapperExpand.selectPoolRooms(); - if (BlankUtil.isBlank(list)) { - jedisService.set(RedisKey.home_room_random.getKey(), "[]"); - return; - } - // 打乱列表的排序 - Random random = new Random(); - for (int i = 0; i < list.size(); i++) { - int pos = random.nextInt(list.size()); - Room curRoom = list.get(i); - // 当前位置的元素换成随机位置上的元素 - list.set(i, list.get(pos)); - list.set(pos, curRoom); - } - jedisService.set(RedisKey.home_room_random.getKey(), gson.toJson(list)); - } catch (Exception e) { - logger.error("cacheRandomRoom error", e); - } - } - /** * 缓存当前有效的表情JSON */