--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/articlelibrary/ArticleLibraryController.java

@@ -20,15 +20,13 @@ import com.zrqx.core.exception.ParameterValidateException;
 import com.zrqx.core.form.resource.bg.articlelibrary.BatchUpdateArticleLibraryForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.QueryArticleLibraryForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.SaveUpdateArticleLibraryForm;
+import com.zrqx.core.form.resource.bg.ebook.UpdateEbookRelationForm;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
-import com.zrqx.core.model.resource.resourcerelation.ResourceRelation;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListVO;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryOneVO;
-import com.zrqx.resource.bg.service.ResourceRelationService;
-import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryDiyTypeService;
 import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryService;
 
 import io.swagger.annotations.Api;
@@ -45,10 +43,6 @@ public class ArticleLibraryController {
 
 	@Autowired
 	private ArticleLibraryService service;
-	@Autowired
-	private ArticleLibraryDiyTypeService adrService;
-	@Autowired
-	private ResourceRelationService resourceRelationService;
 
 	@ApiOperation(value = "新增", notes = "新增一个")
 	@PostMapping(value = ResourceRequestPath.SAVE)
@@ -80,9 +74,6 @@ public class ArticleLibraryController {
 			if (!service.updateByPrimaryKey(entity)) {
 				throw new BusinessValidateException("操作失败");
 			}
-			ResourceRelation resource = new ResourceRelation();
-			resource.setObjectId(entity.getId());
-			resourceRelationService.delete(resource);
 		}
 		return CallBack.success();
 	}
@@ -100,9 +91,7 @@ public class ArticleLibraryController {
 			if (entity.getStatus() == LibraryStatusEnum.STATUS_1.getCode()) {
 				throw new BusinessValidateException("不能删除已上架的资源");
 			}
-			ResourceRelation resource = new ResourceRelation();
-			resource.setObjectId(entity.getId());
-			resourceRelationService.delete(resource);
+	
 		}
 		return CallBack.success(service.batchDelete(ids));
 	}
@@ -122,5 +111,15 @@ public class ArticleLibraryController {
 	public CallBack<PageInfo<ArticleLibraryListVO>> page(QueryArticleLibraryForm form, PageParam pageParam) {
 		return CallBack.success(service.page(form, pageParam));
 	}
-
+	@ApiOperation(value = "修改排序号", notes = "修改排序号")
+	@PostMapping(value = ResourceRequestPath.UPDATE + ResourceRequestPath.SORT)
+	public CallBack<Boolean> updateSort(@RequestBody UpdateEbookRelationForm form) {
+		if (form.getId() == null) {
+			throw new ParameterValidateException("分类不能为空");
+		}
+		ArticleLibrary entity = service.selectByPrimaryKey(form.getId());
+		entity.setSort(form.getSort());
+		service.updateByPrimaryKeySelective(entity);
+		return CallBack.success();
+	}
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/imagelibrary/ImageLibraryController.java

 package com.zrqx.resource.bg.controller.imagelibrary;
 
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -24,15 +23,12 @@ import com.zrqx.core.form.resource.bg.imagelibrary.QueryImageLibraryForm;
 import com.zrqx.core.form.resource.bg.imagelibrary.SaveImageLibraryForm;
 import com.zrqx.core.form.resource.bg.imagelibrary.SaveUpdateImageLibraryForm;
 import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
-import com.zrqx.core.model.resource.imagelibrary.ImageResource;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.imagelibrary.ImageLibraryListVO;
 import com.zrqx.core.vo.resource.imagelibrary.ImageLibraryOneVO;
-import com.zrqx.resource.bg.service.imagelibrary.ImageLibraryDiyTypeRelationService;
 import com.zrqx.resource.bg.service.imagelibrary.ImageLibraryService;
-import com.zrqx.resource.bg.service.imagelibrary.ImageResourceService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -48,10 +44,6 @@ public class ImageLibraryController {
 
 	@Autowired
 	private ImageLibraryService service;
-	@Autowired
-	private ImageLibraryDiyTypeRelationService idrService;
-	@Autowired
-	private ImageResourceService resourceService;
 	
 	
 	
@@ -99,14 +91,8 @@ public class ImageLibraryController {
 	@PostMapping(value = ResourceRequestPath.DELETE_OID)
 	public CallBack<Boolean> delete(@PathVariable String oid){
 		ImageLibrary entity = service.selectByPrimaryKey(oid);
-		if(entity.getBookId() != null){
-			throw new BusinessValidateException("图书内拆分出来的文章不支持单独上、下架、删除操作");
-		}
-		//还需删除与自定义分类关系
-		Example example = idrService.createExample();
-		example.createCriteria().andIn("ilId", Arrays.asList(oid));
-		idrService.deleteByExample(example);
-		return CallBack.success(service.deleteByPrimaryKey(oid));
+		service.delete(entity);
+		return CallBack.success();
 	}
 	@ApiOperation(value = "批量删除", notes = "批量删除")
 	@PostMapping(value = ResourceRequestPath.BATCH_DELETE)

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/videoLibrary/VideoLibraryController.java

+package com.zrqx.resource.bg.controller.videoLibrary;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.zrqx.core.enums.resource.LibraryStatusEnum;
+import com.zrqx.core.enums.resource.PriceOptionEnum;
+import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.form.resource.bg.recommend.UpdateRecommendResourceForm;
+import com.zrqx.core.form.resource.bg.videolibrary.BatchUpdateVideoLibraryForm;
+import com.zrqx.core.form.resource.bg.videolibrary.QueryVideoLibraryForm;
+import com.zrqx.core.form.resource.bg.videolibrary.SaveUpdateVideoLibraryForm;
+import com.zrqx.core.form.resource.bg.videolibrary.SaveVideoLibraryForm;
+import com.zrqx.core.model.recommend.RecommendResource;
+import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
+import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
+import com.zrqx.core.model.resource.videolibrary.VideoLibraryDiyType;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.util.response.CallBack;
+import com.zrqx.core.vo.ImportLabelVo;
+import com.zrqx.core.vo.resource.videolibrary.VideoLibraryListVO;
+import com.zrqx.core.vo.resource.videolibrary.VideoLibraryOneVO;
+import com.zrqx.resource.bg.service.recommend.RecommendResourceService;
+import com.zrqx.resource.bg.service.videolibrary.VideoLibraryDiyTypeService;
+import com.zrqx.resource.bg.service.videolibrary.VideoLibraryService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import tk.mybatis.mapper.entity.Example;
+
+/**
+ * 视频库Controller
+ */
+@RestController
+@RequestMapping("/bg/video-library")
+@Api(description = "资源管理-创业大讲堂")
+public class VideoLibraryController {
+	@Autowired
+	private VideoLibraryService service;
+	@Autowired
+	private VideoLibraryDiyTypeService vdrService;
+	/** 推荐位内容 */
+	@Autowired
+	private RecommendResourceService recommendResourceService;
+
+	@ApiOperation(value = "新增/修改  视频资源", notes = "新增/修改  视频资源")
+	@PostMapping(value = "/save")
+	public CallBack<Boolean> save(@RequestBody SaveUpdateVideoLibraryForm form) {
+		if (!service.saveOrUpdate(form)) {
+			throw new BaseException("操作失败");
+		}
+		return CallBack.success();
+	}
+
+	@ApiOperation(value = "导入视频", notes = "导入视频")
+	@PostMapping(value = "/import")
+	public CallBack<Boolean> save(@RequestBody SaveVideoLibraryForm form) {
+		if (!service.batchInsert(form)) {
+			throw new BaseException("操作失败");
+		}
+		return CallBack.success();
+	}
+
+	
+	@ApiOperation(value = "修改排序号", notes = "修改排序号")
+	@PostMapping(value = "/sort/video")
+	public CallBack<Boolean> sortUpdadate(@RequestBody BatchUpdateVideoLibraryForm form) {
+		form.getIds().forEach(ids -> {
+			VideoLibrary video = new VideoLibrary();
+			video.setId(ids);
+			video.setSort(form.getSort());
+            service.updateByPrimaryKeySelective(video);
+		});
+		return CallBack.success(true);
+	}
+	@ApiOperation(value = "获取关联资源的最大排序号", notes = "获取资源最大排序号")
+	@GetMapping(value = "/get/sort")
+	public CallBack<Integer> getMaxSort() {		
+		return CallBack.success(service.getMaxSort());
+	}
+
+	@ApiOperation(value = "批量 上架/下架", notes = "批量 上架/下架")
+	@PostMapping(value = "/batch/update/updown")
+	public CallBack<Boolean> updateShowState(@RequestBody BatchUpdateVideoLibraryForm form) {
+		Example example = service.createExample();
+		example.createCriteria().andIn("id", form.getIds());
+		List<VideoLibrary> list = service.selectByExample(example);
+		VideoLibrary entity = new  VideoLibrary();
+		entity.setStatus(form.getStatus());
+		entity.setUpdateTime(new Date());
+		service.UpdateByExample(entity, example);
+		return CallBack.success();
+	}
+
+	@ApiOperation(value = "删除", notes = "删除")
+	@PostMapping(value = "/delete/{oid}")
+	public CallBack<Boolean> delete(@PathVariable String oid) {
+		VideoLibrary entity = service.selectByPrimaryKey(oid);
+		if (entity.getStatus() == LibraryStatusEnum.STATUS_1.getCode()) {
+			throw new BaseException("不能删除已上架的资源");
+		}
+		if (!service.batchDelete(Arrays.asList(oid))) {
+			throw new BaseException("操作失败");
+		}
+		return CallBack.success(true);
+	}
+
+	@ApiOperation(value = "批量删除", notes = "批量删除")
+	@PostMapping(value = "/batch/delete")
+	public CallBack<Boolean> deleteByIds(@RequestBody List<String> ids) {
+		return CallBack.success(service.batchDelete(ids));
+	}
+
+	@ApiOperation(value = "查询", notes = "根据ID查询")
+	@GetMapping(value = "/get/{oid}")
+	public CallBack<VideoLibraryOneVO> getById(@PathVariable String oid) {
+		VideoLibrary entity = service.selectByPrimaryKey(oid);
+		VideoLibraryOneVO vo = new VideoLibraryOneVO();
+		BeanUtils.copyProperties(entity, vo);
+		return CallBack.success(vo);
+	}
+
+	@ApiOperation(value = "分页查询", notes = "查询列表")
+	@GetMapping(value = "/page")
+	public CallBack<PageInfo<VideoLibraryListVO>> page(QueryVideoLibraryForm form, PageParam pageParam) {
+		return CallBack.success(service.page(form, pageParam));
+	}
+}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/articlelibrary/ArticleLibraryMapper.java

@@ -6,13 +6,11 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
-import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
 import com.zrqx.core.form.resource.bg.QueryStatisticsForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.QueryArticleLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.vo.resource.ResourceRelationListVo;
-import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListStatisticsVO;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListVO;
 /**