From f7b2baec57a19039ca85880bbba4e17fe27f0511 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 三月 2021 18:21:13 +0800
Subject: [PATCH] 删除冗余代码，初步优化首页的推荐专题，3.8.7之后在我的里面添加VIP分类
---
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 225 +++++++++++++++++++++++++-------------------------------
1 files changed, 100 insertions(+), 125 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
index e3d2749..1f3fd7e 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -2,9 +2,13 @@
import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.domain.Collection;
+import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.user.LoginUser;
+import com.yeshi.buwan.dto.user.LoginInfoDto;
+import com.yeshi.buwan.exception.user.LoginUserException;
+import com.yeshi.buwan.exception.user.RegisterUserException;
import com.yeshi.buwan.service.imp.*;
-import com.yeshi.buwan.service.manager.SolrAlbumDataManager;
+import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
import com.yeshi.buwan.util.annotation.RequireUid;
@@ -29,7 +33,7 @@
@Resource
private SystemService systemService;
@Resource
- private ConfigService configService;
+ private DetailSystemConfigService configService;
@Resource
private UserService userService;
@Resource
@@ -49,7 +53,7 @@
@Resource
private VideoInfoService videoInfoService;
@Resource
- private SolrAlbumDataManager solrDataManager;
+ private SolrAlbumVideoDataManager solrDataManager;
@Resource
private ConfigParser configParser;
@@ -195,7 +199,7 @@
private List<VideoDetailInfo> createSearchVideoDetailsVO(VideoInfo video) {
List<VideoDetailInfo> detailList = new ArrayList<>();
if (video.getVideoType() != null && (Integer.parseInt(video.getVideoType().getId() + "") == VideoCategoryConstant.CATEGORY_DIANSHIJU || Integer.parseInt(video.getVideoType().getId() + "") == VideoCategoryConstant.CATEGORY_DONGMAN)) {
- if (video.getVideocount() <= 5) {
+ if (video.getVideocount()!=null&& video.getVideocount() <= 5) {
for (int i = 0; i < video.getVideocount(); i++) {
VideoDetailInfo detail = new VideoDetailInfo();
detail.setTag((i + 1) + "");
@@ -350,104 +354,77 @@
pageIndex = 1;
}
- DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- UserInfo user1 = userService.getUserInfo(acceptData.getUid());
- if (Utils.isTest(request, user1, detailSystem.getId())) {
- detailSystem = systemService.getDetailSystemById(40 + "");
- JSONObject object = new JSONObject();
- object.put("count", 0);
- JSONArray array = new JSONArray();
- object.put("data", array);
- out.print(JsonUtil.loadTrueJson(object.toString()));
- } else {
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion());
- String cacheMD5 = "0";
- if (resourceList != null && resourceList.size() > 0)
- for (Long l : resourceList)
- cacheMD5 += "#" + l;
- cacheMD5 = StringUtil.Md5(cacheMD5);
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+ String cacheMD5 = "0";
+ if (resourceList != null && resourceList.size() > 0)
+ for (Long l : resourceList)
+ cacheMD5 += "#" + l;
+ cacheMD5 = StringUtil.Md5(cacheMD5);
- VideoListResultVO videoListResultVO = searchService.searchNew(detailSystem.getId(), request.getRemoteAddr(),
- acceptData.getUid(), key, pageIndex, Integer.parseInt(type),
- acceptData.getSystem(), resourceList, cacheMD5);
- //缁勭粐鏁版嵁
- for (VideoInfo video : videoListResultVO.getVideoList()) {
- //濡傛灉鏄鐗囷紝涓斾负5澶у垎绫� 灏遍噰鐢ㄧ珫鏉″睍绀�
- if (video.getShowType() == 1) {
- video.setVideoDetailList(createSearchVideoDetailsVO(video));
- }
+ VideoListResultVO videoListResultVO = searchService.searchNew(acceptData.getDetailSystem().getId(), request.getRemoteAddr(),
+ acceptData.getUid(), key, pageIndex, Integer.parseInt(type),
+ acceptData.getSystem(), resourceList, cacheMD5);
+ //缁勭粐鏁版嵁
+ for (VideoInfo video : videoListResultVO.getVideoList()) {
+ //濡傛灉鏄鐗囷紝涓斾负5澶у垎绫� 灏遍噰鐢ㄧ珫鏉″睍绀�
+ if (video.getShowType() == 1) {
+ video.setVideoDetailList(createSearchVideoDetailsVO(video));
}
- cacheMD5 = "0";
- if (videoListResultVO.getVideoList() != null) {
- for (VideoInfo info : videoListResultVO.getVideoList()) {
- cacheMD5 += info.getId() + "#";
- }
- }
- List<VideoInfo> list = banQuanService.getBanQuanVideo(videoListResultVO.getVideoList(), detailSystem.getId(), cacheMD5);
-
- JSONObject object = new JSONObject();
- object.put("count", Constant.isUpdate ? 19 + "" : videoListResultVO.getCount());
- JSONArray array = new JSONArray();
- for (int i = 0; i < list.size(); i++) {
- if (JuheVideoUtil.isNeedDelete((VideoInfo) list.get(i), detailSystem.getId())) {
- list.remove(i);
- i--;
- }
- }
-
- List<String> keyList = banQuanService.getBanQuanKeyListAll(Integer.parseInt(detailSystem.getId()));
- for (int i = 0; i < list.size(); i++) {
-
- boolean delete = false;
- for (int j = 0; j < keyList.size(); j++) {
- if (list.get(i).getName().contains(keyList.get(j))) {
- delete = true;
- break;
- }
- }
- if (delete) {
- list.remove(i);
- i--;
- }
-
- }
-
- for (int i = 0; i < list.size(); i++) {
- ((VideoInfo) list.get(i))
- .setPicture(VideoPictureUtil.getShowPicture((VideoInfo) list.get(i), acceptData.getPlatform(), acceptData.getVersion() + ""));
- array.add(StringUtil.outPutResultJson(list.get(i)));
- }
- object.put("data", array);
- if (pageIndex == 1) {//杩斿洖瀵艰埅鏍�
- List<VideoType> typeList = new ArrayList<>();
- VideoType vt = new VideoType();
- vt.setId(0);
- vt.setName("鍏ㄩ儴");
- typeList.add(vt);
- Set<Long> set = new HashSet<>();
- for (VideoInfo videoInfo : list) {
- if (videoInfo.getShowType() == 1 && videoInfo.getVideoType() != null)
- set.add(videoInfo.getVideoType().getId());
- }
-
- for (Iterator<Long> its = set.iterator(); its.hasNext(); ) {
- Long typeId = its.next();
- String typeName = VideoConstant.getMainCategoryName(typeId);
- if (!StringUtil.isNullOrEmpty(typeName)) {
- vt = new VideoType();
- vt.setId(typeId);
- vt.setName(typeName);
- typeList.add(vt);
- }
- }
- JSONArray array1 = new JSONArray();
- for (VideoType vt1 : typeList)
- array1.add(StringUtil.outPutResultJson(vt1));
- object.put("typeList", array1);
- }
-
- out.print(JsonUtil.loadTrueJson(object.toString()));
}
+ cacheMD5 = "0";
+ if (videoListResultVO.getVideoList() != null) {
+ for (VideoInfo info : videoListResultVO.getVideoList()) {
+ cacheMD5 += info.getId() + "#";
+ }
+ }
+ List<VideoInfo> list = banQuanService.getBanQuanVideo(videoListResultVO.getVideoList(), acceptData.getDetailSystem().getId(), cacheMD5);
+
+ JSONObject object = new JSONObject();
+ object.put("count", Constant.isUpdate ? 19 + "" : videoListResultVO.getCount());
+ JSONArray array = new JSONArray();
+ for (int i = 0; i < list.size(); i++) {
+ if (JuheVideoUtil.isNeedDelete((VideoInfo) list.get(i), acceptData.getDetailSystem().getId())) {
+ list.remove(i);
+ i--;
+ }
+ }
+
+ for (int i = 0; i < list.size(); i++) {
+ ((VideoInfo) list.get(i))
+ .setPicture(VideoPictureUtil.getShowPicture((VideoInfo) list.get(i), acceptData.getPlatform(), acceptData.getVersion() + ""));
+ array.add(StringUtil.outPutResultJson(list.get(i)));
+ }
+ object.put("data", array);
+ if (pageIndex == 1) {//杩斿洖瀵艰埅鏍�
+ List<VideoType> typeList = new ArrayList<>();
+ VideoType vt = new VideoType();
+ vt.setId(0);
+ vt.setName("鍏ㄩ儴");
+ typeList.add(vt);
+ Set<Long> set = new HashSet<>();
+ for (VideoInfo videoInfo : list) {
+ if (videoInfo.getShowType() == 1 && videoInfo.getVideoType() != null)
+ set.add(videoInfo.getVideoType().getId());
+ }
+
+ for (Iterator<Long> its = set.iterator(); its.hasNext(); ) {
+ Long typeId = its.next();
+ String typeName = VideoConstant.getMainCategoryName(typeId);
+ if (!StringUtil.isNullOrEmpty(typeName)) {
+ vt = new VideoType();
+ vt.setId(typeId);
+ vt.setName(typeName);
+ typeList.add(vt);
+ }
+ }
+ JSONArray array1 = new JSONArray();
+ for (VideoType vt1 : typeList)
+ array1.add(StringUtil.outPutResultJson(vt1));
+ object.put("typeList", array1);
+ }
+
+ out.print(JsonUtil.loadTrueJson(object.toString()));
+
}
@@ -755,24 +732,22 @@
if (StringUtil.isNullOrEmpty(nickName))
nickName = "鏃犲悕姘�";
- DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- // 娉ㄥ唽 --鐢ㄦ埛鍚�,鏄电О,瀵嗙爜
- LoginUser user = new LoginUser();
- user.setCreatetime(System.currentTimeMillis() + "");
- user.setDetailsystem(ds.getId());
- user.setDevice(acceptData.getDevice());
- user.setLoginType(3);
- user.setName(nickName);
- user.setOpenid(account);
- user.setPwd(StringUtil.Md5(pwd));
- user.setPortrait(savePortrait(portrait, request.getSession()));
- user.setIpinfo(ip + ":" + port);
- String result = userService.registerByEmail(user);
- if (result.contains("鎴愬姛"))
+ LoginInfoDto loginInfoDto = new LoginInfoDto();
+ loginInfoDto.setEmail(account);
+ loginInfoDto.setSystemId(acceptData.getDetailSystem().getSystem().getId());
+ loginInfoDto.setLoginType(LoginUser.LOGIN_TYPE_EMAIL);
+ loginInfoDto.setPwd(StringUtil.Md5(pwd));
+ loginInfoDto.setIpInfo(ip + ":" + port);
+ loginInfoDto.setNickName(nickName);
+
+
+ try {
+ userService.register(loginInfoDto);
out.print(JsonUtil.loadTrueJson("娉ㄥ唽鎴愬姛"));
- else
- out.print(JsonUtil.loadFalseJson(result));
+ } catch (RegisterUserException e) {
+ out.print(JsonUtil.loadFalseJson(e.getMessage()));
+ }
}
/**
@@ -829,17 +804,17 @@
// systemService.getDetailSystemByPackage(packageName);
// 娉ㄥ唽 --鐢ㄦ埛鍚�,鏄电О,瀵嗙爜
- LoginUser user = new LoginUser();
- user.setDevice(acceptData.getDevice());
- user.setLoginType(3);
- user.setOpenid(account);
- user.setPwd(StringUtil.Md5(pwd));
- user.setPortrait("http://buwan-1255749512.file.myqcloud.com/resource/ic_portrait_default.png");
- user = userService.loginByEmail(user);
- if (user == null || user.getState() != LoginUser.STATE_NORMAL)
- out.print(JsonUtil.loadFalseJson("璐﹀彿鎴栧瘑鐮侀敊璇�"));
- else
+ LoginInfoDto loginInfoDto = new LoginInfoDto();
+ loginInfoDto.setLoginType(LoginUser.LOGIN_TYPE_EMAIL);
+ loginInfoDto.setSystemId(acceptData.getDetailSystem().getSystem().getId());
+ loginInfoDto.setEmail(account);
+ loginInfoDto.setPwd(StringUtil.Md5(pwd));
+ try {
+ LoginUser user = userService.login(loginInfoDto);
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));
+ } catch (LoginUserException e) {
+ out.print(JsonUtil.loadFalseJson(e.getMessage()));
+ }
}
/**
--
Gitblit v1.8.0