Commit 0e99e11c authored by liqin's avatar liqin 💬

bug fixed

parent ff681ad2
...@@ -3,10 +3,10 @@ package cn.wisenergy.chnmuseum.party.common.enums; ...@@ -3,10 +3,10 @@ package cn.wisenergy.chnmuseum.party.common.enums;
public enum LanguageEnum { public enum LanguageEnum {
ZH("Chinese", "汉语"), ZH("Chinese", "汉语"),
EN("English", "英语"),
MN("Mongolian", "蒙语"), MN("Mongolian", "蒙语"),
BO("Tibetan", "藏语"), BO("Tibetan", "藏语"),
UYG("Uyghur", "维吾尔语"), UYG("Uyghur", "维吾尔语");
EN("English", "英语");
// 错误编码 // 错误编码
private String code; private String code;
......
...@@ -40,10 +40,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -40,10 +40,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -344,12 +341,14 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -344,12 +341,14 @@ public class ChinaMobileRestApiController extends BaseController {
final LambdaQueryWrapper<Asset> eq = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId); final LambdaQueryWrapper<Asset> eq = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
final List<Asset> assetList = this.assetService.list(eq); final List<Asset> assetList = this.assetService.list(eq);
final List<String> languageList = assetList.stream().map(Asset::getLanguage).collect(Collectors.toList()); final List<String> languageList = assetList.stream().map(Asset::getLanguage).collect(Collectors.toList());
for (String language : languageList) { for (LanguageEnum languageEnum : LanguageEnum.values()) {
Map<String, String> map = new HashMap<>(2); if (languageList.contains(languageEnum.name())) {
map.put("code", LanguageEnum.valueOf(language).name()); Map<String, String> map = new LinkedHashMap<>(1);
map.put("name", LanguageEnum.valueOf(language).getName()); map.put("code", languageEnum.name());
map.put("name", languageEnum.getName());
list.add(map); list.add(map);
} }
}
resultMap.put("resultCode", "200"); resultMap.put("resultCode", "200");
resultMap.put("message", "成功"); resultMap.put("message", "成功");
resultMap.put("data", list); resultMap.put("data", list);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment