Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
N
nrgl
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
nrgl
Commits
ab8bf248
提交
ab8bf248
authored
2月 20, 2019
作者:
renjiancai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
83dee47b
显示空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
31 行增加
和
5 行删除
+31
-5
RecycleBinController.java
...source/bg/controller/recycleBin/RecycleBinController.java
+31
-5
没有找到文件。
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/recycleBin/Re
sourceRe
cycleBinController.java
→
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/recycleBin/RecycleBinController.java
浏览文件 @
ab8bf248
...
...
@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RestController;
import
tk.mybatis.mapper.entity.Example.Criteria
;
import
com.zrqx.core.constant.resource.ResourceRequestPath
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.form.resource.bg.QueryResourceRelationForm
;
import
com.zrqx.core.form.resource.bg.recycleBin.QueryResourceRecycleBinForm
;
import
com.zrqx.core.model.resource.achievementLibrary.AchievementGoods
;
import
com.zrqx.core.model.resource.achievementLibrary.AchievementLibraryDiyType
;
...
...
@@ -49,7 +51,7 @@ import com.zrqx.core.model.resource.patentLibrary.PatentLibraryLable;
import
com.zrqx.core.model.resource.pdffilelibrary.PdfGoods
;
import
com.zrqx.core.model.resource.pdffilelibrary.PdfLibraryDiyType
;
import
com.zrqx.core.model.resource.pdffilelibrary.PdfLibraryLableDiyType
;
import
com.zrqx.core.model.resource.recycleBin.Re
sourceRe
cycleBin
;
import
com.zrqx.core.model.resource.recycleBin.RecycleBin
;
import
com.zrqx.core.model.resource.statuteLibrary.StatuteGoods
;
import
com.zrqx.core.model.resource.statuteLibrary.StatuteLibraryDiyType
;
import
com.zrqx.core.model.resource.statuteLibrary.StatuteLibraryLable
;
...
...
@@ -59,8 +61,10 @@ import com.zrqx.core.model.resource.videolibrary.VideoLibraryLableDiyType;
import
com.zrqx.core.util.CallBack
;
import
com.zrqx.core.util.PageInfo
;
import
com.zrqx.core.util.PageParam
;
import
com.zrqx.core.vo.resource.ResourceRelationVo
;
import
com.zrqx.core.vo.resource.recycleBin.ResourceRecycleBinListVO
;
import
com.zrqx.core.vo.resource.recycleBin.ResourceRecycleBinOneVO
;
import
com.zrqx.resource.bg.service.ResourceRelationService
;
import
com.zrqx.resource.bg.service.achievementLibrary.AchievementGoodsService
;
import
com.zrqx.resource.bg.service.achievementLibrary.AchievementLibraryDiyTypeService
;
import
com.zrqx.resource.bg.service.achievementLibrary.AchievementLibraryLableService
;
...
...
@@ -90,7 +94,8 @@ import com.zrqx.resource.bg.service.patentLibrary.PatentLibraryLableService;
import
com.zrqx.resource.bg.service.pdffilelibrary.PdfGoodsService
;
import
com.zrqx.resource.bg.service.pdffilelibrary.PdfLibraryDiyTypeService
;
import
com.zrqx.resource.bg.service.pdffilelibrary.PdfLibraryLableService
;
import
com.zrqx.resource.bg.service.recycleBin.ResourceRecycleBinService
;
import
com.zrqx.resource.bg.service.periodical.PeriodVolumeResourceService
;
import
com.zrqx.resource.bg.service.recycleBin.RecycleBinService
;
import
com.zrqx.resource.bg.service.statuteLibrary.StatuteGoodsService
;
import
com.zrqx.resource.bg.service.statuteLibrary.StatuteLibraryDiyTypeService
;
import
com.zrqx.resource.bg.service.statuteLibrary.StatuteLibraryLableService
;
...
...
@@ -106,9 +111,9 @@ import com.zrqx.resource.bg.service.videolibrary.VideoLibraryLableService;
@RestController
@RequestMapping
(
ResourceRequestPath
.
BG
+
ResourceRequestPath
.
RECYCLE_BIN
)
@Api
(
description
=
"资源管理-回收站"
)
public
class
Re
sourceRe
cycleBinController
{
public
class
RecycleBinController
{
@Autowired
private
Re
sourceRe
cycleBinService
service
;
private
RecycleBinService
service
;
@Autowired
private
ImageLibraryDiyTypeRelationService
imageTypeService
;
@Autowired
...
...
@@ -179,6 +184,10 @@ public class ResourceRecycleBinController {
private
AuthorLibraryDiytypeService
authorTypeService
;
@Autowired
private
AuthorLibraryLabelContentDiyTypeService
authorLableService
;
/*@Autowired
private RelationService resourceService;*/
@Autowired
private
ResourceRelationService
resourceRelationService
;
@ApiOperation
(
value
=
"分页查询"
,
notes
=
"查询列表"
)
@GetMapping
(
value
=
ResourceRequestPath
.
PAGE
)
...
...
@@ -214,7 +223,7 @@ public class ResourceRecycleBinController {
public
CallBack
<
ResourceRecycleBinOneVO
>
getById
(
@PathVariable
String
oid
)
{
Criteria
cr
=
service
.
createCriteria
();
cr
.
andEqualTo
(
"id"
,
oid
);
Re
sourceRe
cycleBin
entity
=
service
.
selectOneByCriteria
();
RecycleBin
entity
=
service
.
selectOneByCriteria
();
ResourceRecycleBinOneVO
vo
=
new
ResourceRecycleBinOneVO
();
BeanUtils
.
copyProperties
(
entity
,
vo
);
...
...
@@ -551,4 +560,21 @@ public class ResourceRecycleBinController {
}
return
CallBack
.
success
(
vo
);
}
/* @ApiOperation("相关资源列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.PAGE)
public CallBack<PageInfo<ResourceRelationVo>> reousrceRelationPage(QueryResourceRelationForm entity,
PageParam pageParam) {
if (entity == null || entity.getId() == null) {
throw new BaseException("资源id不能为空!");
}
if (null != pageParam && StringUtils.isBlank(pageParam.getOrderBy())) {
pageParam.setOrderBy("createTime desc");
}
List<ResourceRelationVo> list = resourceService.queryByIdAndResourceType(entity, pageParam);
if (list == null || list.size() == 0) {
return CallBack.success(null);
}
return CallBack.success(new PageInfo<ResourceRelationVo>(resourceRelationService.queryRelationList(list)));
}*/
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论