--no commit message

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

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.zrqx.core.enums.resource.LibraryStatusEnum;
 import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.form.resource.bg.ebook.UpdateEbookRelationForm;
 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;
@@ -62,8 +63,8 @@ public class VideoLibraryController {
 	
 	@ApiOperation(value = "修改排序号", notes = "修改排序号")
 	@PostMapping(value = "/sort/video")
-	public CallBack<Boolean> sortUpdadate(@RequestBody BatchUpdateVideoLibraryForm form) {
-		form.getIds().forEach(ids -> {
+	public CallBack<Boolean> sortUpdadate(@RequestBody UpdateEbookRelationForm form) {
+		form.getId().forEach(ids -> {
 			VideoLibrary video = new VideoLibrary();
 			video.setId(ids);
 			video.setSort(form.getSort());
@@ -83,10 +84,11 @@ public class VideoLibraryController {
 		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);
+		for (VideoLibrary videoLibrary : list) {
+			videoLibrary.setStatus(form.getStatus());
+			videoLibrary.setUpdateTime(new Date());
+			service.updateByPrimaryKey(videoLibrary);
+		}
 		return CallBack.success();
 	}
 

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/articlelibrary/ArticleLibrarySerivceImpl.java

@@ -15,19 +15,13 @@ import com.zrqx.core.form.resource.bg.articlelibrary.QueryArticleLibraryForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.SaveUpdateArticleLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
-import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
-import com.zrqx.core.model.resource.record.Record;
-import com.zrqx.core.model.resource.resourcerelation.ResourceRelation;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListStatisticsVO;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListVO;
-import com.zrqx.resource.bg.mapper.ResourceRelationMapper;
-import com.zrqx.resource.bg.mapper.articlelibrary.ArticleLibraryDiyTypeMapper;
 import com.zrqx.resource.bg.mapper.articlelibrary.ArticleLibraryMapper;
-import com.zrqx.resource.bg.mapper.record.RecordMapper;
 
 import tk.mybatis.mapper.entity.Example;
 
@@ -39,12 +33,6 @@ public class ArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,St
 
 	@Autowired
 	private ArticleLibraryMapper mapper;
-	@Autowired
-	private ArticleLibraryDiyTypeMapper adrMapper;
-	@Autowired
-	private RecordMapper recordMapper;
-	@Autowired
-	private ResourceRelationMapper resourceRelationMapper;
 	@Override
 	public BaseMapper<ArticleLibrary> getMapper() {
 		return mapper;
@@ -73,18 +61,6 @@ public class ArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,St
 		Example example = createExample();
 		example.createCriteria().andIn("id", ids);
 		mapper.deleteByExample(example);
-		//还需删除与自定义分类关系
-		example = new Example(ArticleLibraryDiyType.class);
-		example.createCriteria().andIn("alId", ids);
-		adrMapper.deleteByExample(example);
-		//----关联资源
-		example = new Example(ResourceRelation.class);
-		example.createCriteria().andIn("objectId", ids).orIn("resourceId", ids);
-		resourceRelationMapper.deleteByExample(example);
-		//删除资源浏览记录相关信息
-		example = new Example(Record.class);
-		example.createCriteria().andIn("goodsId", ids);
-		recordMapper.deleteByExample(example);
 		return true;
 	}
 	@Override

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibrarySerivceImpl.java

@@ -19,7 +19,6 @@ import com.zrqx.core.form.resource.bg.videolibrary.SaveUpdateVideoLibraryForm;
 import com.zrqx.core.form.resource.bg.videolibrary.SaveVideoLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
-import com.zrqx.core.model.resource.videolibrary.VideoLibraryDiyType;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.excelutil.ExcelUtil;
@@ -31,7 +30,6 @@ import com.zrqx.core.vo.resource.videolibrary.ExcelVideoImportVo;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibraryListVO;
 import com.zrqx.resource.bg.mapper.videolibrary.VideoLibraryDiyTypeMapper;
 import com.zrqx.resource.bg.mapper.videolibrary.VideoLibraryMapper;
-import com.zrqx.resource.commons.Redis;
 
 import tk.mybatis.mapper.entity.Example;
 
@@ -43,13 +41,6 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 
 	@Autowired
 	private VideoLibraryMapper mapper;
-	@Autowired
-	private VideoLibraryDiyTypeMapper vdrMapper;
-	
-	
-	@Autowired
-	private Redis redis;
-	
 	@Override
 	public BaseMapper<VideoLibrary> getMapper() {
 		return mapper;
@@ -147,10 +138,6 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 			}
 		}
 		mapper.deleteByExample(example);
-		//还需删除与自定义分类关系
-		example = new Example(VideoLibraryDiyType.class);
-		example.createCriteria().andIn("vlId", ids);
-		vdrMapper.deleteByExample(example);
 		return true;
 	}
 	/**
@@ -164,7 +151,7 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 	@Override
 	public PageInfo<VideoLibraryListVO> page(QueryVideoLibraryForm form, PageParam pageParam) {
 		if(pageParam != null && StringUtils.isBlank(pageParam.getOrderBy())){
-			pageParam.setOrderBy(" updateTime desc");
+			pageParam.setOrderBy(" sort ,updateTime desc");
 		}
 		startPage(pageParam);
 		List<VideoLibraryListVO> list = mapper.query(form);