Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
S
syyl
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
syyl
Commits
bfdae58c
提交
bfdae58c
authored
4月 08, 2020
作者:
renjiancai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
df7f0394
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
30 行增加
和
21 行删除
+30
-21
SaveContributeForm.java
...x/core/form/sysuser/fg/contribute/SaveContributeForm.java
+2
-1
FgContributeOneVo.java
...zrqx/core/vo/sysuser/fg/contribute/FgContributeOneVo.java
+5
-3
FgContributeController.java
...user/fg/controller/contribute/FgContributeController.java
+23
-17
没有找到文件。
com.zrqx.core/src/main/java/com/zrqx/core/form/sysuser/fg/contribute/SaveContributeForm.java
浏览文件 @
bfdae58c
...
...
@@ -10,7 +10,8 @@ import lombok.Data;
@Data
@ApiModel
(
value
=
"SaveContributeForm"
,
description
=
"保存内容form"
)
public
class
SaveContributeForm
{
@ApiModelProperty
(
"id,新增不需要"
)
private
String
id
;
@ApiModelProperty
(
"标题"
)
private
String
title
;
@ApiModelProperty
(
"视频说明"
)
...
...
com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/fg/contribute/FgContributeOneVo.java
浏览文件 @
bfdae58c
...
...
@@ -28,9 +28,11 @@ public class FgContributeOneVo {
@ApiModelProperty
(
"区域管理员"
)
private
String
userType_2
;
@ApiModelProperty
(
"视频"
)
private
String
video
;
private
String
video
Path
;
@ApiModelProperty
(
"上传时间"
)
private
Date
uploadTime
;
@ApiModelProperty
(
"头像"
)
private
String
image
;
@ApiModelProperty
(
"中心管理员头像"
)
private
String
image_1
;
@ApiModelProperty
(
"区域管理员头像"
)
private
String
image_2
;
}
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/contribute/FgContributeController.java
浏览文件 @
bfdae58c
...
...
@@ -74,23 +74,29 @@ public class FgContributeController {
User
user
=
fgUserService
.
selectByPrimaryKey
(
userId
);
//查询当前用户所属区域部门
Integer
deptId
=
fgUserService
.
getDeptIdByUserId
(
userId
).
get
(
0
);
if
(
count
<
5
)
{
Contribute
contibute
=
new
Contribute
();
BeanUtils
.
copyProperties
(
form
,
contibute
);
contibute
.
setUploadTime
(
new
Date
());
contibute
.
setUserId
(
userId
);
contibute
.
setStatus
(
ContributeEnum
.
NOT_REVIEW
.
getCode
());
contibute
.
setUserName
(
userName
);
contibute
.
setArea_adminId
(
user
.
getArea_adminId
());
if
(
deptId
!=
null
)
{
DeptVO
deptVO
=
fgDepartmentService
.
get
(
deptId
);
if
(
deptVO
!=
null
)
{
contibute
.
setDepartment
(
deptVO
.
getDeptName
());
contibute
.
setDepartmentId
(
deptVO
.
getDeptId
());
if
(
form
.
getId
()==
null
)
{
BeanUtils
.
copyProperties
(
form
,
contibute
);
contibute
.
setUploadTime
(
new
Date
());
contibute
.
setUserId
(
userId
);
contibute
.
setStatus
(
ContributeEnum
.
NOT_REVIEW
.
getCode
());
contibute
.
setUserName
(
userName
);
contibute
.
setArea_adminId
(
user
.
getArea_adminId
());
if
(
deptId
!=
null
)
{
DeptVO
deptVO
=
fgDepartmentService
.
get
(
deptId
);
if
(
deptVO
!=
null
)
{
contibute
.
setDepartment
(
deptVO
.
getDeptName
());
contibute
.
setDepartmentId
(
deptVO
.
getDeptId
());
}
}
service
.
insert
(
contibute
);
}
else
{
contibute
=
service
.
selectByPrimaryKey
(
contibute
.
getId
());
BeanUtils
.
copyProperties
(
form
,
contibute
);
contibute
.
setUpdateTime
(
new
Date
());
service
.
updateByPrimaryKeySelective
(
contibute
);
}
service
.
insert
(
contibute
);
}
else
{
throw
new
BusinessValidateException
(
1
,
"投稿条数上限!"
);
}
...
...
@@ -117,7 +123,7 @@ public class FgContributeController {
vo
.
setUserType_2
(
"区域管理员"
);
User
user
=
fgUserService
.
selectByPrimaryKey
(
contributeRelation
.
getUserId
());
if
(
user
!=
null
)
{
vo
.
setImage
(
user
.
getImg
());
vo
.
setImage
_1
(
user
.
getImg
());
}
}
else
if
(
contributeRelation
.
getUserType
().
equals
(
UserTypeEnum
.
TYPE_2
.
getCode
())){
vo
.
setOpinion_1
(
contributeRelation
.
getOpinion
());
...
...
@@ -125,14 +131,14 @@ public class FgContributeController {
vo
.
setUserType_1
(
"中心管理员"
);
User
user
=
fgUserService
.
selectByPrimaryKey
(
contributeRelation
.
getUserId
());
if
(
user
!=
null
)
{
vo
.
setImage
(
user
.
getImg
());
vo
.
setImage
_2
(
user
.
getImg
());
}
}
}
List
<
String
>
fileNameList
=
Arrays
.
asList
(
vo
.
getVideo
());
List
<
String
>
fileNameList
=
Arrays
.
asList
(
vo
.
getVideo
Path
());
CallBack
<
List
<
String
>>
result
=
fileInfoClient
.
getFilePath
(
fileNameList
);
if
(
result
.
hasEntity
()
&&
ArrayUtils
.
isNotEmpty
(
result
.
getData
()))
{
vo
.
setVideo
(
result
.
getData
().
get
(
0
));
vo
.
setVideo
Path
(
result
.
getData
().
get
(
0
));
}
return
CallBack
.
success
(
vo
);
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论