Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liqin
chnmuseum-party
Commits
7c9a5370
Commit
7c9a5370
authored
Mar 28, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
fba41708
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
48 additions
and
10 deletions
+48
-10
AuditOperationEnum.java
...ergy/chnmuseum/party/common/enums/AuditOperationEnum.java
+2
-2
AuditTypeEnum.java
...wisenergy/chnmuseum/party/common/enums/AuditTypeEnum.java
+40
-0
Asset.java
src/main/java/cn/wisenergy/chnmuseum/party/model/Asset.java
+0
-3
AssetController.java
...nergy/chnmuseum/party/web/controller/AssetController.java
+6
-2
LearningContentController.java
...useum/party/web/controller/LearningContentController.java
+0
-3
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/common/enums/AuditOperationEnum.java
View file @
7c9a5370
...
...
@@ -7,8 +7,8 @@ public enum AuditOperationEnum {
ADD
(
1
,
"新增"
),
EDIT
(
2
,
"修改"
),
REMOVE
(
2
,
"下架"
),
D
ELETE
(
3
,
"删除
"
);
REMOVE
(
3
,
"下架"
),
D
ISABLE
(
4
,
"禁用
"
);
// 错误编码
private
Integer
code
;
...
...
src/main/java/cn/wisenergy/chnmuseum/party/common/enums/AuditTypeEnum.java
0 → 100644
View file @
7c9a5370
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
;
}
}
src/main/java/cn/wisenergy/chnmuseum/party/model/Asset.java
View file @
7c9a5370
...
...
@@ -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
(
"视频分类"
)
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AssetController.java
View file @
7c9a5370
...
...
@@ -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
();
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningContentController.java
View file @
7c9a5370
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment