Skip to content

C
chnmuseum-party
Commit 8613ad9d authored by liqin's avatar liqin 💬
Browse files
Options

bug fixed

parent a20dd396
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 32 deletions
src/main/java/cn/chnmuseum/party/common/enums/LanguageEnum.java
View file @ 8613ad9d
......@@ -3,10 +3,10 @@ package cn.chnmuseum.party.common.enums;
public enum LanguageEnum {
ZH("Chinese", "汉语"),
EN("English", "英语"),
MN("Mongolian", "蒙语"),
BO("Tibetan", "藏语"),
UYG("Uyghur", "维吾尔语");
UYG("Uyghur", "维吾尔语"),
EN("English", "英语");
// 错误编码
private String code;
......
src/main/java/cn/chnmuseum/party/model/LearningProject.java
View file @ 8613ad9d
......@@ -45,6 +45,10 @@ public class LearningProject implements Serializable {
@Length(max = 20, message = "学习项目名称字数不能超过20")
private String name;
@ApiModelProperty("视频缩略图")
@TableField(exist = false)
private String thumbnail;
@ApiModelProperty("备注")
@TableField("remarks")
@Length(min = 0, max = 100, message = "备注的字数超过最大限制100")
......
src/main/java/cn/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
View file @ 8613ad9d
......@@ -64,9 +64,6 @@ public class ChinaMobileRestApiController extends BaseController {
@Resource
private RunLogServiceImpl runLogService;
@Resource
private TAreaServiceImpl areaService;
@Resource
private AssetServiceImpl assetService;
......@@ -347,29 +344,48 @@ public class ChinaMobileRestApiController extends BaseController {
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "boardId", value = "展板内容ID", paramType = "query", dataType = "String", required = true)
})
@ApiOperation(value = "查询某个展板语言列表", notes = "查询某个展板语言列表")
@GetMapping(value = "/exhibitionBoard/language")
@ApiOperation(value = "查询展板视频/语音导览语言列表", notes = "查询展板视频/语音导览语言列表")
@GetMapping(value = "/exhibitionBoard/video/language")
@RequiresAuthentication
public Map<String, Object> getLanguageList(@RequestParam(value = "boardId") String boardId) {
public Map<String, Object> getExhibitionBoardVideoLanguageList(@RequestParam(value = "boardId") String boardId) {
JSONObject resultMap = new JSONObject();
List<Map<String, String>> list = new ArrayList<>();
Map<String, List<Map<String, String>>> langMap = new LinkedHashMap<>(2);
try {
List<Map<String, String>> videoList = new ArrayList<>();
final ExhibitionBoard exhibitionBoard = this.exhibitionBoardService.getById(boardId);
final String videoContentId = exhibitionBoard.getVideoContentId();
final LambdaQueryWrapper<Asset> eq = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
final List<Asset> assetList = this.assetService.list(eq);
final List<String> languageList = assetList.stream().map(Asset::getLanguage).collect(Collectors.toList());
LambdaQueryWrapper<Asset> assetLambdaQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
List<Asset> assetList = this.assetService.list(assetLambdaQueryWrapper);
List<String> languageList = assetList.stream().map(Asset::getLanguage).collect(Collectors.toList());
for (LanguageEnum languageEnum : LanguageEnum.values()) {
if (languageList.contains(languageEnum.name())) {
Map<String, String> map = new LinkedHashMap<>(1);
map.put("code", languageEnum.name());
map.put("name", languageEnum.getName());
list.add(map);
videoList.add(map);
}
}
langMap.put("video", videoList);
assetLambdaQueryWrapper.clear();
List<Map<String, String>> audioList = new ArrayList<>();
assetLambdaQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, boardId);
assetLambdaQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_AUDIO);
assetList = this.assetService.list(assetLambdaQueryWrapper);
languageList = assetList.stream().map(Asset::getLanguage).collect(Collectors.toList());
for (LanguageEnum languageEnum : LanguageEnum.values()) {
if (languageList.contains(languageEnum.name())) {
Map<String, String> map = new LinkedHashMap<>(1);
map.put("code", languageEnum.name());
map.put("name", languageEnum.getName());
audioList.add(map);
}
}
langMap.put("audio", audioList);
resultMap.put("resultCode", "200");
resultMap.put("message", "成功");
resultMap.put("data", list);
resultMap.put("data", langMap);
return resultMap;
} catch (Exception e) {
resultMap.put("resultCode", "400");
......@@ -522,6 +538,7 @@ public class ChinaMobileRestApiController extends BaseController {
public Map<String, Object> getLearningContentPageList(GenericPageParam genericPageParam,
@RequestParam(value = "learningProjectId", required = false) String learningProjectId) {
LambdaQueryWrapper<LearningContent> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(LearningContent::getPublished, true);
// 对名称或编码模糊查询
if (StringUtils.isNotBlank(learningProjectId)) {
queryWrapper.eq(LearningContent::getLearningProjectId, learningProjectId);
......@@ -536,17 +553,13 @@ public class ChinaMobileRestApiController extends BaseController {
.le(LearningContent::getCreateTime, genericPageParam.getEndDate().atTime(23, 59, 59));
}
// 设置排序规则
queryWrapper.orderByDesc(LearningContent::getCreateTime);
queryWrapper.orderByDesc(LearningContent::getSortorder);
// 设置查询内容
queryWrapper.select(
LearningContent::getId,
LearningContent::getName,
LearningContent::getCover,
LearningContent::getApplicableScope,
LearningContent::getSortorder,
LearningContent::getPublished,
LearningContent::getDeleted,
LearningContent::getAuditStatus,
LearningContent::getCreateTime,
LearningContent::getUpdateTime);
Page<LearningContent> page = this.learningContentService.page(getPage(), queryWrapper);
......@@ -567,7 +580,7 @@ public class ChinaMobileRestApiController extends BaseController {
})
@PostMapping("/learningProject/getPage")
@RequiresAuthentication //@RequiresPermissions("learning:project:page")
@ApiOperation(value = "查询项目", notes = "查询项目")
@ApiOperation(value = "查询学习项目", notes = "查询学习项目")
public Map<String, Object> getLearningProjectPageList(GenericPageParam genericPageParam) {
LambdaQueryWrapper<LearningProject> queryWrapper = new LambdaQueryWrapper<>();
// 对名称或编码模糊查询
......@@ -592,10 +605,11 @@ public class ChinaMobileRestApiController extends BaseController {
for (LearningProject learningProject : page.getRecords()) {
LambdaQueryWrapper<LearningContent> lambdaQueryWrapper = Wrappers.<LearningContent>lambdaQuery()
.eq(LearningContent::getLearningProjectId, learningProject.getId())
.eq(LearningContent::getPublished, true);
lambdaQueryWrapper.select(LearningContent::getName);
.eq(LearningContent::getPublished, true).orderByDesc(LearningContent::getSortorder);
lambdaQueryWrapper.select(LearningContent::getName, LearningContent::getCover);
List<LearningContent> learningContentList = this.learningContentService.list(lambdaQueryWrapper);
String learningContentNames = learningContentList.stream().map(LearningContent::getName).collect(Collectors.joining("、"));
learningProject.setThumbnail(learningContentList.get(0).getCover());
learningProject.setLearningContentNames(learningContentNames);
}
return getResult(page);
......
src/main/java/cn/chnmuseum/party/web/controller/FileUploadController.java
View file @ 8613ad9d
package cn.chnmuseum.party.web.controller;
import cn.hutool.core.util.ArrayUtil;
import cn.chnmuseum.party.common.dfs.FastDFSUtils;
import cn.chnmuseum.party.common.enums.*;
import cn.chnmuseum.party.common.mvc.InterfaceException;
import cn.chnmuseum.party.common.enums.FileCatEnum;
import cn.chnmuseum.party.common.enums.FileTypeEnum;
import cn.chnmuseum.party.common.enums.HANDLE_STATUS_ENUM;
import cn.chnmuseum.party.common.enums.LanguageEnum;
import cn.chnmuseum.party.common.util.LCSUtil;
import cn.chnmuseum.party.common.util.TimeUtils;
import cn.chnmuseum.party.common.video.VideoEncryptUtil;
......@@ -14,6 +15,7 @@ import cn.chnmuseum.party.model.AssetTmp;
import cn.chnmuseum.party.service.AssetService;
import cn.chnmuseum.party.service.AssetTmpService;
import cn.chnmuseum.party.web.controller.base.BaseController;
import cn.hutool.core.util.ArrayUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.tobato.fastdfs.domain.fdfs.FileInfo;
import com.github.tobato.fastdfs.domain.fdfs.MetaData;
......@@ -127,8 +129,8 @@ public class FileUploadController extends BaseController {
continue;
}
String extName = FilenameUtils.getExtension(originalFilename);
String baseName = FilenameUtils.getBaseName(originalFilename);
String extName = FilenameUtils.getExtension(originalFilename);
String finalExtName = extName;
boolean anyMatch = Arrays.stream(DATUM_TYPE).anyMatch(s -> Objects.equals(s, finalExtName.toUpperCase()));
if (anyMatch) {
......@@ -401,11 +403,11 @@ public class FileUploadController extends BaseController {
String fileName = uploadFile.getOriginalFilename();
String extension = FilenameUtils.getExtension(fileName);
if (StringUtils.isBlank(extension)) {
throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "文件格式不支持");
return getFailResult("文件格式不支持");
}
boolean anyMatch = Arrays.stream(IMAGE_TYPE).anyMatch(s -> Objects.equals(s, extension.toUpperCase()));
if (!anyMatch) {
throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "文件格式不支持");
return getFailResult("文件格式不支持");
}
final Set<MetaData> metaDataSet = new HashSet<>();
......@@ -430,7 +432,7 @@ public class FileUploadController extends BaseController {
String fileName = uploadFile.getOriginalFilename();
String extension = FilenameUtils.getExtension(fileName);
if (StringUtils.isBlank(extension)) {
throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "文件格式不支持");
return getFailResult("文件格式不支持");
}
final Set<MetaData> metaDataSet = new HashSet<>();
metaDataSet.add(new MetaData("fileName", fileName));
......@@ -798,9 +800,6 @@ public class FileUploadController extends BaseController {
if (originalFilename.contains("汉语")) {
metaDataSet.add(new MetaData("language", LanguageEnum.ZH.name()));
language = LanguageEnum.ZH.name();
} else if (originalFilename.contains("英语")) {
metaDataSet.add(new MetaData("language", LanguageEnum.EN.name()));
language = LanguageEnum.EN.name();
} else if (originalFilename.contains("蒙语")) {
metaDataSet.add(new MetaData("language", LanguageEnum.MN.name()));
language = LanguageEnum.MN.name();
......
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