Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
S
syyl
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
syyl
Commits
3734daf3
提交
3734daf3
authored
3月 17, 2020
作者:
yucaiwei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
42e412c7
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
86 行增加
和
14 行删除
+86
-14
VideoLibraryMapper.java
...m/zrqx/sysuser/bg/mapper/resource/VideoLibraryMapper.java
+4
-2
ImageLibrarySerivceImpl.java
.../sysuser/bg/service/resource/ImageLibrarySerivceImpl.java
+1
-1
ImageLibraryService.java
...zrqx/sysuser/bg/service/resource/ImageLibraryService.java
+1
-1
FgPermissionsController.java
...er/fg/controller/permissions/FgPermissionsController.java
+18
-0
FgResourceLibraryController.java
...r/fg/controller/resource/FgResourceLibraryController.java
+11
-5
FgImageLibraryMapper.java
...zrqx/sysuser/fg/mapper/resource/FgImageLibraryMapper.java
+1
-1
FgImageLibrarySerivce.java
...qx/sysuser/fg/service/resource/FgImageLibrarySerivce.java
+8
-0
FgImageLibrarySerivceImpl.java
...ysuser/fg/service/resource/FgImageLibrarySerivceImpl.java
+24
-0
FgVideoLibrarySerivceImpl.java
...ysuser/fg/service/resource/FgVideoLibrarySerivceImpl.java
+18
-4
没有找到文件。
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/resource/VideoLibraryMapper.java
浏览文件 @
3734daf3
...
@@ -19,10 +19,12 @@ import com.zrqx.core.vo.sysuser.bg.statistics.UserStatisticsListVo;
...
@@ -19,10 +19,12 @@ import com.zrqx.core.vo.sysuser.bg.statistics.UserStatisticsListVo;
public
interface
VideoLibraryMapper
extends
BaseMapper
<
VideoLibrary
>
{
public
interface
VideoLibraryMapper
extends
BaseMapper
<
VideoLibrary
>
{
@Select
(
"<script>"
@Select
(
"<script>"
+
"select a.id, a.name, a.source, a.timeLength,a.size,a.video,a.image,a.uploadTime,a.status,a.userId,a.resourceType, user.userName,user.name realName "
+
"select a.id, a.name, a.source, a.timeLength,a.size,a.video,a.image,a.uploadTime,a.status,a.userId,a.resourceType, user.userName,user.name realName
,d.departmentName
"
+
"from res_Video_Library a "
+
"from res_Video_Library a "
+
"left join sys_user user on a.userId = user.userid "
+
"left join sys_user user on a.userId = user.userid "
+
"where 1=1 "
+
"LEFT JOIN sys_user_department ud ON a.userid = ud.userid "
+
"LEFT JOIN sys_department d ON ud.departmentid = d.departmentid "
+
"where 1=1 AND d.departmentName LIKE '%采集点%' "
+
"<if test='"
+
NOTBLANK
+
"(id)'>"
+
"<if test='"
+
NOTBLANK
+
"(id)'>"
+
" and a.id = #{id} "
+
" and a.id = #{id} "
+
"</if>"
+
"</if>"
...
...
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/resource/ImageLibrarySerivceImpl.java
浏览文件 @
3734daf3
...
@@ -11,7 +11,7 @@ import com.zrqx.sysuser.bg.mapper.resource.ImageLibraryMapper;
...
@@ -11,7 +11,7 @@ import com.zrqx.sysuser.bg.mapper.resource.ImageLibraryMapper;
* 图片库
* 图片库
*/
*/
@Service
@Service
public
class
ImageLibrarySerivceImpl
extends
BaseServiceImpl
<
ImageLibrary
,
Integer
>
implements
ImageLibraryService
{
public
class
ImageLibrarySerivceImpl
extends
BaseServiceImpl
<
ImageLibrary
,
String
>
implements
ImageLibraryService
{
@Autowired
@Autowired
private
ImageLibraryMapper
imageMapper
;
private
ImageLibraryMapper
imageMapper
;
...
...
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/resource/ImageLibraryService.java
浏览文件 @
3734daf3
...
@@ -5,5 +5,5 @@ import com.zrqx.core.service.BaseService;
...
@@ -5,5 +5,5 @@ import com.zrqx.core.service.BaseService;
/**
/**
* 图片库
* 图片库
*/
*/
public
interface
ImageLibraryService
extends
BaseService
<
ImageLibrary
,
Integer
>{
public
interface
ImageLibraryService
extends
BaseService
<
ImageLibrary
,
String
>{
}
}
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/permissions/FgPermissionsController.java
浏览文件 @
3734daf3
...
@@ -25,6 +25,7 @@ import com.zrqx.core.constant.sysuser.SysUserRequestPath;
...
@@ -25,6 +25,7 @@ import com.zrqx.core.constant.sysuser.SysUserRequestPath;
import
com.zrqx.core.enums.StatusEnum
;
import
com.zrqx.core.enums.StatusEnum
;
import
com.zrqx.core.enums.sysuser.UserTypeEnum
;
import
com.zrqx.core.enums.sysuser.UserTypeEnum
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.exception.BusinessValidateException
;
import
com.zrqx.core.form.sysuser.fg.user.LoginForm
;
import
com.zrqx.core.form.sysuser.fg.user.LoginForm
;
import
com.zrqx.core.form.sysuser.fg.user.LoginUserInfo
;
import
com.zrqx.core.form.sysuser.fg.user.LoginUserInfo
;
import
com.zrqx.core.model.sysuser.role.Role
;
import
com.zrqx.core.model.sysuser.role.Role
;
...
@@ -103,4 +104,21 @@ public class FgPermissionsController {
...
@@ -103,4 +104,21 @@ public class FgPermissionsController {
}
}
@ApiOperation
(
value
=
"前台用户切换角色"
,
notes
=
"前台用户切换角色;1:无该权限;2:系统错误"
)
@GetMapping
(
value
=
SysUserRequestPath
.
SWITCH
+
SysUserRequestPath
.
ROLE
)
public
CallBack
<
Boolean
>
switchRole
(
Integer
userType
)
throws
IOException
{
LoginUserInfo
user
=
redis
.
getMember
();
// userType漠然按照最大权限角色登录
List
<
Role
>
roleList
=
roleService
.
queryByUserId
(
user
.
getUserId
());
if
(
ArrayUtils
.
isNotEmpty
(
roleList
)){
List
<
String
>
roleNameList
=
roleList
.
stream
().
map
(
Role
::
getRoleName
).
collect
(
Collectors
.
toList
());
if
(
roleNameList
.
contains
(
UserTypeEnum
.
getName
(
userType
))){
user
.
setUserType
(
userType
);
stringRedisTemplate
.
opsForValue
().
set
(
user
.
getToken
(),
JsonUtil
.
bean2Json
(
user
),
60
*
60
*
24
*
7
,
TimeUnit
.
SECONDS
);
}
else
{
throw
new
BusinessValidateException
(
1
,
"无该权限"
);
}
}
throw
new
BusinessValidateException
(
2
,
"系统错误"
);
}
}
}
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/resource/FgResourceLibraryController.java
浏览文件 @
3734daf3
package
com
.
zrqx
.
sysuser
.
fg
.
controller
.
resource
;
package
com
.
zrqx
.
sysuser
.
fg
.
controller
.
resource
;
import
java.util.Date
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
import
io.swagger.annotations.ApiParam
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -29,11 +31,11 @@ import com.zrqx.core.form.resource.fg.videolibrary.FgQueryVideoLibraryForm;
...
@@ -29,11 +31,11 @@ import com.zrqx.core.form.resource.fg.videolibrary.FgQueryVideoLibraryForm;
import
com.zrqx.core.form.resource.fg.videolibrary.FgSaveResourceForm
;
import
com.zrqx.core.form.resource.fg.videolibrary.FgSaveResourceForm
;
import
com.zrqx.core.form.sysuser.fg.comment.FgSaveCommentForm
;
import
com.zrqx.core.form.sysuser.fg.comment.FgSaveCommentForm
;
import
com.zrqx.core.form.sysuser.fg.user.LoginUserInfo
;
import
com.zrqx.core.form.sysuser.fg.user.LoginUserInfo
;
import
com.zrqx.core.model.resource.imagelibrary.ImageLibrary
;
import
com.zrqx.core.model.resource.videolibrary.VideoLibrary
;
import
com.zrqx.core.model.resource.videolibrary.VideoLibrary
;
import
com.zrqx.core.model.sysuser.content.SignLanguage
;
import
com.zrqx.core.model.sysuser.content.SignLanguage
;
import
com.zrqx.core.model.sysuser.content.SignLanguageRelation
;
import
com.zrqx.core.model.sysuser.content.SignLanguageRelation
;
import
com.zrqx.core.model.sysuser.content.SignLanguageUserRelation
;
import
com.zrqx.core.model.sysuser.content.SignLanguageUserRelation
;
import
com.zrqx.core.util.datatype.ArrayUtils
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.core.vo.resource.videolibrary.FgVideoLibraryListVO
;
import
com.zrqx.core.vo.resource.videolibrary.FgVideoLibraryListVO
;
...
@@ -43,6 +45,7 @@ import com.zrqx.sysuser.fg.service.comment.FgCommentService;
...
@@ -43,6 +45,7 @@ import com.zrqx.sysuser.fg.service.comment.FgCommentService;
import
com.zrqx.sysuser.fg.service.content.FgSignLanguageRelationService
;
import
com.zrqx.sysuser.fg.service.content.FgSignLanguageRelationService
;
import
com.zrqx.sysuser.fg.service.content.FgSignLanguageService
;
import
com.zrqx.sysuser.fg.service.content.FgSignLanguageService
;
import
com.zrqx.sysuser.fg.service.content.FgSignLanguageUserRelationService
;
import
com.zrqx.sysuser.fg.service.content.FgSignLanguageUserRelationService
;
import
com.zrqx.sysuser.fg.service.resource.FgImageLibrarySerivce
;
import
com.zrqx.sysuser.fg.service.resource.FgVideoLibraryService
;
import
com.zrqx.sysuser.fg.service.resource.FgVideoLibraryService
;
/**
/**
...
@@ -57,6 +60,8 @@ public class FgResourceLibraryController {
...
@@ -57,6 +60,8 @@ public class FgResourceLibraryController {
@Autowired
@Autowired
private
FgVideoLibraryService
service
;
private
FgVideoLibraryService
service
;
@Autowired
@Autowired
private
FgImageLibrarySerivce
imageLibraryService
;
@Autowired
private
FgCommentService
commentService
;
private
FgCommentService
commentService
;
@Autowired
@Autowired
private
FgSignLanguageService
signLanguageService
;
private
FgSignLanguageService
signLanguageService
;
...
@@ -129,9 +134,9 @@ public class FgResourceLibraryController {
...
@@ -129,9 +134,9 @@ public class FgResourceLibraryController {
@ApiOperation
(
value
=
"导入视频"
,
notes
=
"导入视频"
)
@ApiOperation
(
value
=
"导入视频"
,
notes
=
"导入视频"
)
@PostMapping
(
value
=
ResourceRequestPath
.
IMPORT
)
@PostMapping
(
value
=
ResourceRequestPath
.
IMPORT
)
public
CallBack
<
Boolean
>
save
(
@RequestBody
FgSaveResourceForm
form
){
public
CallBack
<
Boolean
>
save
(
@RequestBody
FgSaveResourceForm
form
){
if
(
ArrayUtils
.
empty
(
form
.
getResourceList
())){
/*
if(ArrayUtils.empty(form.getResourceList())){
throw new BusinessValidateException("数据不能为空");
throw new BusinessValidateException("数据不能为空");
}
}
*/
if
(!
service
.
batchInsert
(
form
)){
if
(!
service
.
batchInsert
(
form
)){
throw
new
BusinessValidateException
(
"操作失败"
);
throw
new
BusinessValidateException
(
"操作失败"
);
}
}
...
@@ -351,4 +356,5 @@ public class FgResourceLibraryController {
...
@@ -351,4 +356,5 @@ public class FgResourceLibraryController {
}
}
}
}
}
}
}
}
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/resource/ImageLibraryMapper.java
→
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/resource/
Fg
ImageLibraryMapper.java
浏览文件 @
3734daf3
...
@@ -3,6 +3,6 @@ package com.zrqx.sysuser.fg.mapper.resource;
...
@@ -3,6 +3,6 @@ package com.zrqx.sysuser.fg.mapper.resource;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.resource.imagelibrary.ImageLibrary
;
import
com.zrqx.core.model.resource.imagelibrary.ImageLibrary
;
public
interface
ImageLibraryMapper
extends
BaseMapper
<
ImageLibrary
>
{
public
interface
Fg
ImageLibraryMapper
extends
BaseMapper
<
ImageLibrary
>
{
}
}
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/resource/FgImageLibrarySerivce.java
0 → 100644
浏览文件 @
3734daf3
package
com
.
zrqx
.
sysuser
.
fg
.
service
.
resource
;
import
com.zrqx.core.model.resource.imagelibrary.ImageLibrary
;
import
com.zrqx.core.service.BaseService
;
public
interface
FgImageLibrarySerivce
extends
BaseService
<
ImageLibrary
,
String
>
{
}
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/resource/FgImageLibrarySerivceImpl.java
0 → 100644
浏览文件 @
3734daf3
package
com
.
zrqx
.
sysuser
.
fg
.
service
.
resource
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.resource.imagelibrary.ImageLibrary
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.sysuser.fg.mapper.resource.FgImageLibraryMapper
;
@Service
public
class
FgImageLibrarySerivceImpl
extends
BaseServiceImpl
<
ImageLibrary
,
String
>
implements
FgImageLibrarySerivce
{
@Autowired
private
FgImageLibraryMapper
mapper
;
@Override
public
BaseMapper
<
ImageLibrary
>
getMapper
()
{
return
mapper
;
}
}
com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/resource/FgVideoLibrarySerivceImpl.java
浏览文件 @
3734daf3
...
@@ -16,6 +16,7 @@ import com.zrqx.core.form.resource.fg.videolibrary.FgQueryVideoLibraryForm;
...
@@ -16,6 +16,7 @@ import com.zrqx.core.form.resource.fg.videolibrary.FgQueryVideoLibraryForm;
import
com.zrqx.core.form.resource.fg.videolibrary.FgSaveResourceForm
;
import
com.zrqx.core.form.resource.fg.videolibrary.FgSaveResourceForm
;
import
com.zrqx.core.form.sysuser.fg.user.LoginUserInfo
;
import
com.zrqx.core.form.sysuser.fg.user.LoginUserInfo
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.resource.imagelibrary.ImageLibrary
;
import
com.zrqx.core.model.resource.videolibrary.VideoLibrary
;
import
com.zrqx.core.model.resource.videolibrary.VideoLibrary
;
import
com.zrqx.core.model.sysuser.comment.Comment
;
import
com.zrqx.core.model.sysuser.comment.Comment
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.core.service.BaseServiceImpl
;
...
@@ -30,6 +31,7 @@ import com.zrqx.core.vo.resource.videolibrary.FgVideoLibraryOneVO;
...
@@ -30,6 +31,7 @@ import com.zrqx.core.vo.resource.videolibrary.FgVideoLibraryOneVO;
import
com.zrqx.sysuser.commons.redis.Redis
;
import
com.zrqx.sysuser.commons.redis.Redis
;
import
com.zrqx.sysuser.fg.client.file.FgFileInfoClient
;
import
com.zrqx.sysuser.fg.client.file.FgFileInfoClient
;
import
com.zrqx.sysuser.fg.mapper.comment.FgCommentMapper
;
import
com.zrqx.sysuser.fg.mapper.comment.FgCommentMapper
;
import
com.zrqx.sysuser.fg.mapper.resource.FgImageLibraryMapper
;
import
com.zrqx.sysuser.fg.mapper.resource.FgVideoLibraryMapper
;
import
com.zrqx.sysuser.fg.mapper.resource.FgVideoLibraryMapper
;
@Service
@Service
...
@@ -38,6 +40,8 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Stri
...
@@ -38,6 +40,8 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Stri
@Autowired
@Autowired
private
FgVideoLibraryMapper
mapper
;
private
FgVideoLibraryMapper
mapper
;
@Autowired
@Autowired
private
FgImageLibraryMapper
imageLibraryMapper
;
@Autowired
private
FgCommentMapper
commentMapper
;
private
FgCommentMapper
commentMapper
;
@Autowired
@Autowired
private
Redis
redis
;
private
Redis
redis
;
...
@@ -59,9 +63,7 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Stri
...
@@ -59,9 +63,7 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Stri
@Override
@Override
public
boolean
batchInsert
(
FgSaveResourceForm
form
)
{
public
boolean
batchInsert
(
FgSaveResourceForm
form
)
{
LoginUserInfo
member
=
redis
.
getMember
();
LoginUserInfo
member
=
redis
.
getMember
();
List
<
VideoLibrary
>
list
=
BeanUtils
.
copyList
(
form
.
getResourceList
(),
VideoLibrary
.
class
,
li
->
{
VideoLibrary
obj
=
BeanUtils
.
copy
(
form
,
VideoLibrary
.
class
,
li
->
{
li
.
setSignLanguageId
(
form
.
getSignLanguageId
());
li
.
setContentId
(
form
.
getContentId
());
li
.
setStatus
(
LibraryStatusEnum
.
STATUS_3
.
getCode
());
li
.
setStatus
(
LibraryStatusEnum
.
STATUS_3
.
getCode
());
li
.
setStatus_1
(
LibraryStatusEnum
.
STATUS_3
.
getCode
());
li
.
setStatus_1
(
LibraryStatusEnum
.
STATUS_3
.
getCode
());
li
.
setUploadTime
(
new
Date
());
li
.
setUploadTime
(
new
Date
());
...
@@ -69,9 +71,21 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Stri
...
@@ -69,9 +71,21 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Stri
li
.
setUserId
(
member
.
getUserId
());
li
.
setUserId
(
member
.
getUserId
());
li
.
setArea_adminId
(
member
.
getArea_adminId
());
li
.
setArea_adminId
(
member
.
getArea_adminId
());
});
});
list
.
stream
().
forEach
(
li
->
mapper
.
insert
(
li
)
);
mapper
.
insert
(
obj
);
//批量插入视频
//批量插入视频
//mapper.insertList(list);
//mapper.insertList(list);
//添加图组
if
(
ArrayUtils
.
isNotEmpty
(
form
.
getImgList
()))
{
List
<
ImageLibrary
>
ls
=
new
ArrayList
<
ImageLibrary
>();
form
.
getImgList
().
stream
().
forEach
(
li
->
{
ImageLibrary
img
=
new
ImageLibrary
();
img
.
setImage
(
li
);
img
.
setVideoId
(
obj
.
getId
());
img
.
setUploadTime
(
new
Date
());
ls
.
add
(
img
);
});
imageLibraryMapper
.
insertUuidList
(
ls
);
}
return
true
;
return
true
;
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论