--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/recycleBin/ResourceRecycleBinController.java → com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/recycleBin/RecycleBinController.java

@@ -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.ResourceRecycleBin;
+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 ResourceRecycleBinController {
+public class RecycleBinController {
 	@Autowired
-	private ResourceRecycleBinService 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);
-		ResourceRecycleBin 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)));
+	}*/
 }