Commit 7c9a5370 authored by liqin's avatar liqin 💬

bug fixed

parent fba41708
......@@ -7,8 +7,8 @@ public enum AuditOperationEnum {
ADD(1, "新增"),
EDIT(2, "修改"),
REMOVE(2, "下架"),
DELETE(3, "删除");
REMOVE(3, "下架"),
DISABLE(4, "禁用");
// 错误编码
private Integer code;
......
package cn.wisenergy.chnmuseum.party.common.enums;
/**
* 审核状态
*/
public enum AuditTypeEnum {
ASSET(1, "新增"),
EXHIBITION_BOARD(2, "修改"),
LEARNING_CONTENT(3, "下架"),
ACCOUNT(4, "禁用");
// 错误编码
private Integer code;
// 信息
private String operation;
// 相应编码有参构造函数
AuditTypeEnum(Integer code, String operation) {
this.code = code;
this.operation = operation;
}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
public String getOperation() {
return operation;
}
public void setOperation(String operation) {
this.operation = operation;
}
}
......@@ -59,7 +59,6 @@ public class Asset implements Serializable {
@ApiModelProperty("下载链接")
@TableField("video_url")
@NotBlank(message = "下载链接不能为空", groups = {Add.class, Update.class})
private String videoUrl;
@ApiModelProperty("审核状态")
......@@ -72,12 +71,10 @@ public class Asset implements Serializable {
@ApiModelProperty("创建日期")
@TableField(value = "create_time", fill = FieldFill.INSERT)
@NotNull(message = "创建日期不能为空", groups = {Add.class, Update.class})
private LocalDateTime createTime;
@ApiModelProperty("修改日期")
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@NotNull(message = "修改日期不能为空", groups = {Add.class, Update.class})
private LocalDateTime updateTime;
@ApiModelProperty("视频分类")
......
......@@ -12,6 +12,7 @@ import cn.wisenergy.chnmuseum.party.model.AssetType;
import cn.wisenergy.chnmuseum.party.model.CopyrightOwner;
import cn.wisenergy.chnmuseum.party.service.AssetService;
import cn.wisenergy.chnmuseum.party.service.AssetTypeService;
import cn.wisenergy.chnmuseum.party.service.AuditService;
import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerService;
import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
import com.alibaba.fastjson.JSONObject;
......@@ -52,12 +53,12 @@ public class AssetController extends BaseController {
@Resource
private AssetService assetService;
@Resource
private CopyrightOwnerService copyrightOwnerService;
@Resource
private AssetTypeService assetTypeService;
@Resource
private AuditService auditService;
@PostMapping(value = "/save")
@RequiresPermissions("asset:save")
......@@ -87,6 +88,9 @@ public class AssetController extends BaseController {
asset.setPublished(false);
// 保存业务节点信息
boolean result = assetService.save(asset);
// 返回操作结果
if (result) {
return getSuccessResult();
......
......@@ -223,9 +223,6 @@ public class LearningContentController extends BaseController {
learningContent.setLearningProjectName(learningProject.getName());
}
// final List<LearningContentBoard> learningContentBoardList = learningContentBoardService.getBoardListByLearningContentId(id);
// learningContent.setLearningContentBoardList(learningContentBoardList);
return getResult(learningContent);
}
......
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