Commit aa364006 authored by liqin's avatar liqin 💬

bug fixed

parent 084dc60f
...@@ -5,10 +5,10 @@ package cn.wisenergy.chnmuseum.party.common.enums; ...@@ -5,10 +5,10 @@ package cn.wisenergy.chnmuseum.party.common.enums;
*/ */
public enum AuditTypeEnum { public enum AuditTypeEnum {
ASSET(1, "新增"), ASSET(1, "视频内容"),
EXHIBITION_BOARD(2, "修改"), EXHIBITION_BOARD(2, "展板内容"),
LEARNING_CONTENT(3, "下架"), LEARNING_CONTENT(3, "学习内容"),
ACCOUNT(4, "禁用"); ACCOUNT(4, "账户");
// 错误编码 // 错误编码
private Integer code; private Integer code;
......
...@@ -9,12 +9,10 @@ import cn.wisenergy.chnmuseum.party.common.validator.groups.Add; ...@@ -9,12 +9,10 @@ import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Update; import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
import cn.wisenergy.chnmuseum.party.common.vo.AudioVo; import cn.wisenergy.chnmuseum.party.common.vo.AudioVo;
import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam; import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
import cn.wisenergy.chnmuseum.party.model.Asset;
import cn.wisenergy.chnmuseum.party.model.Audit; import cn.wisenergy.chnmuseum.party.model.Audit;
import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard; import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard;
import cn.wisenergy.chnmuseum.party.service.AuditService; import cn.wisenergy.chnmuseum.party.service.*;
import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerService;
import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardCatService;
import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardService;
import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController; import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...@@ -60,6 +58,8 @@ public class ExhibitionBoardController extends BaseController { ...@@ -60,6 +58,8 @@ public class ExhibitionBoardController extends BaseController {
private CopyrightOwnerService copyrightOwnerService; private CopyrightOwnerService copyrightOwnerService;
@Resource @Resource
private AuditService auditService; private AuditService auditService;
@Resource
private AssetService assetService;
@PostMapping("/save") @PostMapping("/save")
@RequiresPermissions("exhibition:board:save") @RequiresPermissions("exhibition:board:save")
...@@ -311,6 +311,14 @@ public class ExhibitionBoardController extends BaseController { ...@@ -311,6 +311,14 @@ public class ExhibitionBoardController extends BaseController {
if (boardCopyrightOwnerId != null) { if (boardCopyrightOwnerId != null) {
exhibitionBoard.setBoardCopyrightOwnerName(this.copyrightOwnerService.getById(boardCopyrightOwnerId).getName()); exhibitionBoard.setBoardCopyrightOwnerName(this.copyrightOwnerService.getById(boardCopyrightOwnerId).getName());
} }
final String assetId = exhibitionBoard.getAssetId();
final Asset asset = this.assetService.getById(assetId);
final String videoUrl = asset.getVideoUrl();
return getResult(exhibitionBoard); return getResult(exhibitionBoard);
} }
......
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