From f788607ff771a47bc60d6a86e00b3433c40f3d2c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 九月 2021 15:22:03 +0800
Subject: [PATCH] 接入视频直播
---
src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java | 225 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 165 insertions(+), 60 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
index efa472e..cc8d534 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -1,51 +1,52 @@
package com.yeshi.buwan.controller.parser;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.math.BigDecimal;
-import java.util.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
import com.google.gson.Gson;
import com.yeshi.buwan.domain.*;
-import com.yeshi.buwan.domain.jump.JumpDetail;
-import com.yeshi.buwan.domain.jump.JumpTypeEnum;
+import com.yeshi.buwan.domain.entity.PlayUrl;
import com.yeshi.buwan.domain.recommend.HomeRecommendSpecial;
-import com.yeshi.buwan.domain.system.DetailSystemConfig;
+import com.yeshi.buwan.domain.solr.SolrShortVideo;
+import com.yeshi.buwan.domain.special.SearchSpecialPositionMap;
import com.yeshi.buwan.domain.system.DetailSystem;
+import com.yeshi.buwan.domain.system.DetailSystemConfig;
import com.yeshi.buwan.domain.video.InternetSearchVideo;
import com.yeshi.buwan.domain.video.VideoWatchHistory;
import com.yeshi.buwan.dto.log.BaseLog;
import com.yeshi.buwan.dto.statistic.video.VideoDetailStatisticData;
-import com.yeshi.buwan.mogotv.MogoTVUtil;
-import com.yeshi.buwan.pptv.PPTVApiUtil;
-import com.yeshi.buwan.pptv.PPTVUtil;
-import com.yeshi.buwan.pptv.entity.PPTVProgram;
-import com.yeshi.buwan.pptv.entity.PPTVSeries;
-import com.yeshi.buwan.pptv.entity.VideoPPTVMap;
+import com.yeshi.buwan.exception.video.VideoPlayException;
+import com.yeshi.buwan.videos.mogotv.MogoTVUtil;
+import com.yeshi.buwan.videos.pptv.PPTVApiUtil;
+import com.yeshi.buwan.videos.pptv.PPTVUtil;
+import com.yeshi.buwan.videos.pptv.entity.PPTVProgram;
+import com.yeshi.buwan.videos.pptv.entity.PPTVSeries;
+import com.yeshi.buwan.videos.pptv.entity.VideoPPTVMap;
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.inter.ad.DeviceAdStrategyService;
import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
import com.yeshi.buwan.service.inter.juhe.PPTVService;
-import com.yeshi.buwan.service.inter.juhe.YouKuService;
import com.yeshi.buwan.service.inter.recommend.HomeRecommendSpecialService;
import com.yeshi.buwan.service.inter.recommend.HomeVideoService;
+import com.yeshi.buwan.service.inter.search.SearchSpecialPositionMapService;
import com.yeshi.buwan.service.inter.video.VideoWatchHistoryService;
import com.yeshi.buwan.service.manager.VideoPlayStatisticManager;
-import com.yeshi.buwan.tencent.TencentVideoUtil;
+import com.yeshi.buwan.service.manager.search.SolrShortVideoDataManager;
+import com.yeshi.buwan.videos.tencent.TencentVideoUtil;
import com.yeshi.buwan.util.*;
+import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
import com.yeshi.buwan.util.annotation.RequireUid;
import com.yeshi.buwan.util.factory.VideoInfoFactory;
import com.yeshi.buwan.util.log.LoggerUtil;
import com.yeshi.buwan.util.log.UserActiveLogFactory;
import com.yeshi.buwan.util.log.VideoLogFactory;
+import com.yeshi.buwan.util.mq.CMQManager;
+import com.yeshi.buwan.util.video.VideoDetailUtil;
+import com.yeshi.buwan.util.video.VideoUtil;
+import com.yeshi.buwan.util.zhibo.MeiNvZhiBoUtil;
+import com.yeshi.buwan.videos.bilibili.BilibiliUtil;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.video.VideoDetailVO;
-import com.yeshi.buwan.youku.YouKuUtil;
-import com.yeshi.buwan.youku.entity.YouKuSearchVideoMap;
-import com.yeshi.buwan.youku.entity.YouKuShowDetail;
+import com.yeshi.buwan.videos.youku.YouKuUtil;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.methods.GetMethod;
@@ -53,13 +54,11 @@
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
-import com.yeshi.buwan.domain.entity.PlayUrl;
-import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
-import com.yeshi.buwan.util.video.VideoDetailUtil;
-import com.yeshi.buwan.util.zhibo.MeiNvZhiBoUtil;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.*;
@Controller
public class HomeParser {
@@ -199,15 +198,15 @@
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
JSONObject object = new JSONObject();
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
List<HomeType> list1 = homeTypeService.getHomeType(detailSystem.getId(), acceptData.getPlatform(), acceptData.getVersion(), resourceList,
CacheUtil.getMD5Long(resourceList), -1, special != null ? special.getDataKey() : null);
List<HomeType> list = new ArrayList<>();
for (HomeType ht : list1)
list.add(ht);
- if ("309".equals(vtid)) {
- if (!"ios".equalsIgnoreCase(acceptData.getPlatform())) {
- Map<String, String> confMap = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
+ if ("309" .equals(vtid)) {
+ if (!"ios" .equalsIgnoreCase(acceptData.getPlatform())) {
+ Map<String, String> confMap = configService.getConfigAsMap(acceptData.getChildDetailSystem(), acceptData.getVersion());
String mm = confMap.get("meinv_mm_count");
int count = Integer.parseInt(mm);
if (count > 0) {
@@ -236,8 +235,8 @@
}
if (VersionUtil.isGraterThan387(acceptData.getPlatform(), acceptData.getVersion())) {
- DetailSystemConfig adContent = configService.getConfigByKey("home_banner_ad_content", acceptData.getDetailSystem(), acceptData.getVersion());
- DetailSystemConfig adPosition = configService.getConfigByKey("home_banner_ad_position", acceptData.getDetailSystem(), acceptData.getVersion());
+ DetailSystemConfig adContent = configService.getConfigByKey("home_banner_ad_content", acceptData.getChildDetailSystem(), acceptData.getVersion());
+ DetailSystemConfig adPosition = configService.getConfigByKey("home_banner_ad_position", acceptData.getChildDetailSystem(), acceptData.getVersion());
if (adContent != null && adPosition != null) {
HomeType.HomeTypeAd ad = new Gson().fromJson(adContent.getValue(), HomeType.HomeTypeAd.class);
int adP = Integer.parseInt(adPosition.getValue());
@@ -266,7 +265,7 @@
}
}
- if ("huawei".equalsIgnoreCase(channel)) {
+ if ("huawei" .equalsIgnoreCase(channel)) {
for (int i = 0; i < list.size(); i++) {
if (list.get(i).getName().equalsIgnoreCase("缇庡コ")) {
list.remove(i);
@@ -306,7 +305,7 @@
long count = homeTypeService.countHomeType(acceptData.getDetailSystem().getId(), acceptData.getVersion(), dataKey);
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
List<HomeType> homeTypeList = homeTypeService.getHomeTypeList(acceptData.getDetailSystem().getId(), acceptData.getVersion(), dataKey, Integer.parseInt(page), Integer.parseInt(pageSize));
if (homeTypeList != null)
@@ -329,7 +328,7 @@
homeType.setCount((int) videoCount);
List<HomeVideo> tempHomeVideoList = new ArrayList<>();
tempHomeVideoList.addAll(homeVideoList);
- while (tempHomeVideoList != null && (tempHomeVideoList.size() - bigPictureCount) % homeType.getColumns() != 0)
+ while (tempHomeVideoList != null && tempHomeVideoList.size() > 0 && (tempHomeVideoList.size() - bigPictureCount) % homeType.getColumns() != 0 && homeType.getColumns() < 4)
tempHomeVideoList.remove(tempHomeVideoList.size() - 1);
homeType.setHomeVideoList(tempHomeVideoList);
@@ -337,15 +336,15 @@
try {
if (VersionUtil.isGraterThan387(acceptData.getPlatform(), acceptData.getVersion()) && dataKey.equalsIgnoreCase("recommend")) {
- DetailSystemConfig adContent = configService.getConfigByKey("home_banner_ad_content", acceptData.getDetailSystem(), acceptData.getVersion());
- DetailSystemConfig adPosition = configService.getConfigByKey("home_banner_ad_position", acceptData.getDetailSystem(), acceptData.getVersion());
+ DetailSystemConfig adContent = configService.getConfigByKey("home_banner_ad_content", acceptData.getChildDetailSystem(), acceptData.getVersion());
+ DetailSystemConfig adPosition = configService.getConfigByKey("home_banner_ad_position", acceptData.getChildDetailSystem(), acceptData.getVersion());
if (adContent != null && adPosition != null) {
HomeType.HomeTypeAd ad = new Gson().fromJson(adContent.getValue(), HomeType.HomeTypeAd.class);
int adP = Integer.parseInt(adPosition.getValue());
if (adP < homeTypeList.size() && adP > -1) {
HomeType homeType = new HomeType();
homeType.setAd(ad);
- if ("1".equalsIgnoreCase(page)) {
+ if ("1" .equalsIgnoreCase(page)) {
homeTypeList.add(adP, homeType);
}
count++;
@@ -397,7 +396,7 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
//鏌ヨ澶у浘
List<HomeVideo> bigPictureVideos = new ArrayList<>();
@@ -522,7 +521,13 @@
private TencentVideoUtil tencentVideoUtil;
@Resource
+ private BilibiliUtil bilibiliUtil;
+
+ @Resource
private VideoPlayStatisticManager videoPlayStatisticManager;
+
+ @Resource
+ private VideoResourceService videoResourceService;
private String createVideoDetailSessionId(AcceptData acceptData, String uid, String videoName, String videoId, String resourceId) {
@@ -545,6 +550,31 @@
}
+ @Resource
+ private SolrShortVideoDataManager solrShortVideoDataManager;
+
+ public void getVideoDetailForShortVideo(AcceptData acceptData, String videoId, HttpServletRequest request, PrintWriter out) {
+ String loginUid = request.getParameter("LoginUid");
+ SolrShortVideo solrShortVideo = solrShortVideoDataManager.findOne(videoId);
+ String resourceId = solrShortVideo.getResourceId() + "";
+ VideoResource videoResource = videoResourceService.getResource(resourceId);
+ videoResource.setChecked(true);
+ VideoInfo info = VideoInfoFactory.create(solrShortVideo);
+ info.setResourceList(Arrays.asList(new VideoResource[]{videoResource}));
+ if (info != null)
+ info.setPageSize(1);
+ info.setWatchCount("" + (int) (Math.random() * 1000));
+ info.setPlayPicture(info.getPicture());
+
+ JSONArray array = new JSONArray();
+ JSONObject obj = new JSONObject();
+ out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
+ obj.toString()));
+// out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), deviceAdStrategyService.getVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), loginUid), null, createVideoDetailSessionId(acceptData, loginUid, info.getName(), videoId, resourceId))), array.toString(),
+// obj.toString()));
+ }
+
+
public void getVideoDetailForInternetSearch(AcceptData acceptData, String videoId, HttpServletRequest request, PrintWriter out) {
String loginUid = request.getParameter("LoginUid");
String from = request.getParameter("From");
@@ -561,6 +591,17 @@
if (StringUtil.isNullOrEmpty(resourceId)) {
resourceId = internetSearchVideo.getResourceIds().split(",")[0];
}
+
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
+
+ if (resourceList != null) {
+ if (!resourceList.contains(Long.parseLong(resourceId))) {
+ out.print(JsonUtil.loadFalseAdmin(""));
+ return;
+ }
+ }
+
+
VideoInfo info = null;
if (Integer.parseInt(resourceId) == YouKuUtil.RESOURCE_ID) {
try {
@@ -589,6 +630,14 @@
out.print(JsonUtil.loadFalseAdmin(e.getMessage()));
return;
}
+ } else if (Integer.parseInt(resourceId) == BilibiliUtil.RESOURCE_ID) {
+ try {
+ info = bilibiliUtil.getVideoInfo(internetSearchVideo, pageSize);
+ } catch (Exception e) {
+ logger.error("鍏ㄧ綉鎼滆棰戣鎯呭嚭閿欙細" + videoId);
+ out.print(JsonUtil.loadFalseAdmin(e.getMessage()));
+ return;
+ }
}
if (info != null)
@@ -602,7 +651,7 @@
JSONObject obj = new JSONObject();
if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
- out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), deviceAdStrategyService.getVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), loginUid), null, createVideoDetailSessionId(acceptData, loginUid, info.getName(), videoId, resourceId))), array.toString(),
+ out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), deviceAdStrategyService.getVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), acceptData.getVersion(), acceptData.getChannel(), loginUid), null, createVideoDetailSessionId(acceptData, loginUid, info.getName(), videoId, resourceId))), array.toString(),
obj.toString()));
} else {
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
@@ -616,8 +665,15 @@
if (!NumberUtil.isNumeric(videoId)) {
String[] cidVid = PPTVUtil.parseCidAndVidFromVisualVideoId(videoId);
if (cidVid == null) {
- getVideoDetailForInternetSearch(acceptData, videoId, request, out);
- return;
+ int fromType = VideoUtil.getVideoFromType(videoId);
+ //鐭棰�
+ if (fromType == HomeVideo.FROM_TYPE_SHORT) {
+ getVideoDetailForShortVideo(acceptData, videoId, request, out);
+ return;
+ } else if (fromType == HomeVideo.FROM_TYPE_INTERNET) {
+ getVideoDetailForInternetSearch(acceptData, videoId, request, out);
+ return;
+ }
}
String cid = cidVid[0];
String vid = cidVid[1];
@@ -660,7 +716,7 @@
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
//鑾峰彇浼樺厛灞曠ず鐨勬笭閬�
if (StringUtil.isNullOrEmpty(resourceId)) {
@@ -669,6 +725,12 @@
VideoResource defaultVideoResource = resourceVideoService.getDefaultVideoResource(videoId, rids);
if (defaultVideoResource != null) {
resourceId = defaultVideoResource.getId();
+ }
+ //瑙嗛娌℃湁鏉ユ簮
+ if (StringUtil.isNullOrEmpty(resourceId)) {
+ CMQManager.getInstance().addVideoResourceDeleteMsg(videoId);
+ out.print(JsonUtil.loadFalseJson("瑙嗛宸蹭笅绾�"));
+ return;
}
}
@@ -693,7 +755,7 @@
//PPTV缃戦〉鎾斁
- if (resourceId != null && Integer.parseInt(resourceId) == PPTVUtil.RESOURCE_ID) {
+ if (!StringUtil.isNullOrEmpty(resourceId) && Integer.parseInt(resourceId) == PPTVUtil.RESOURCE_ID) {
JSONObject data = new JSONObject();
VideoPPTVMap map = pptvService.getVideoPPTVMapByVideoId(videoId);
int p = 0;
@@ -727,7 +789,7 @@
data.put("playUrl", playUrl);
data.put("name", videoName);
data.put("pptv", true);
- data.put("vip", "1".equalsIgnoreCase(series.getFree()));
+ data.put("vip", "1" .equalsIgnoreCase(series.getFree()));
data.put("sessionId", sessionId);
out.print(JsonUtil.loadTrueJson(data.toString()));
LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createVideoDetail(new BaseLog(acceptData, loginUid), videoId, series.getName(), from));
@@ -735,10 +797,8 @@
ThreadUtil.run(new Runnable() {
@Override
public void run() {
- //姣忓ぉ灞曠ず涓�娆″箍鍛�
- long showTime = TimeUtil.convertGernalTime(TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd"), "yyyy-MM-dd");
-
- deviceAdStrategyService.setVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), showTime, null);
+ //鐪婸P瑙嗛
+ deviceAdStrategyService.watchPPTVVideo(acceptData.getUtdId(), acceptData.getDetailSystem().getId());
}
});
return;
@@ -800,12 +860,20 @@
if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
String sessionId = createVideoDetailSessionId(acceptData, loginUid, info.getName(), videoId, resourceId);
- out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), deviceAdStrategyService.getVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), loginUid,videoId,from), attention, sessionId)), array.toString(),
+ out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), deviceAdStrategyService.getVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), acceptData.getVersion(), acceptData.getChannel(), loginUid, videoId, from), attention, sessionId)), array.toString(),
obj.toString()));
} else {
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
obj.toString()));
}
+
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ long showTime = TimeUtil.convertGernalTime(TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd"), "yyyy-MM-dd");
+ deviceAdStrategyService.setShortVideoAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), videoId, from, showTime, null);
+ }
+ });
}
@@ -899,17 +967,22 @@
return;
}
- if (StringUtil.isNullOrEmpty(type)) {
- out.print(JsonUtil.loadFalseJson("璇蜂笂浼爐ype"));
- return;
- }
+// if (StringUtil.isNullOrEmpty(type)) {
+// out.print(JsonUtil.loadFalseJson("璇蜂笂浼爐ype"));
+// return;
+// }
if (StringUtil.isNullOrEmpty(id))
id = eid;
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- PlayUrl pu = videoDeailUtil.getPlayUrl(acceptData, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+ PlayUrl pu = null;
+ try {
+ pu = videoDeailUtil.getPlayUrl(acceptData, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+ } catch (VideoPlayException e) {
+ e.printStackTrace();
+ }
if (pu != null) {
if (!StringUtil.isNullOrEmpty(pu.getUrl()))
@@ -963,12 +1036,44 @@
public void isPraise(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- DetailSystemConfig config = configService.getConfigByKey("banner_praise", detailSystem, acceptData.getVersion());
- if ("鏄�".equals(config.getValue())) {
+ DetailSystemConfig config = configService.getConfigByKey("banner_praise", acceptData.getChildDetailSystem(), acceptData.getVersion());
+ if ("鏄�" .equals(config.getValue())) {
out.print(JsonUtil.loadTrueJson("1"));
} else {
out.print(JsonUtil.loadTrueJson("0"));
}
}
+
+ @Resource
+ private SearchSpecialPositionMapService searchSpecialPositionMapService;
+
+ /**
+ * 鑾峰彇鎺ㄨ崘鐨勬悳绱笓棰�
+ *
+ * @param acceptData
+ * @param request
+ * @param out
+ */
+ public void getRecommendSearchSpecial(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+ //鎺ㄨ崘鎼滅储涓撻
+ DetailSystemConfig config = configService.getConfigByKey("recommend_search_special_position", acceptData.getChildDetailSystem(), acceptData.getVersion());
+ if (config == null) {
+ out.print(JsonUtil.loadFalseAdmin("浣嶇疆涓虹┖"));
+ return;
+ }
+ String key = config.getValue();
+ List<SearchSpecialPositionMap> mapList = searchSpecialPositionMapService.listDetailByPosition(key, 1, 20);
+ JSONArray array = new JSONArray();
+ for (SearchSpecialPositionMap map : mapList) {
+ JSONObject item = new JSONObject();
+ item.put("icon", map.getIcon());
+ item.put("name", map.getShowName() == null ? map.getSpecial().getName() : map.getShowName());
+ item.put("id", map.getSpecialId());
+ array.add(item);
+ }
+ out.print(JsonUtil.loadTrueJson(array.toString()));
+ }
+
}
--
Gitblit v1.8.0