--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/resourceconnect/ResourceConnectService.java

 package com.zrqx.resource.bg.service.resourceconnect;
 
 
-import com.zrqx.core.form.resource.bg.projectlibrary.QueryProjectLibraryForm;
 import com.zrqx.core.form.resource.bg.resourceconnect.QueryResourceConnectForm;
 import com.zrqx.core.form.resource.bg.resourceconnect.SaveUpdateResourceConnectForm;
 import com.zrqx.core.model.resource.resourceconnect.ResourceConnect;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
-import com.zrqx.core.vo.resource.projectlibrary.ProjectLibraryListVO;
 import com.zrqx.core.vo.resource.resourceconnect.ResourceConnectListVO;
 
-public interface ResourceConnectService extends BaseService<ResourceConnect, Integer> {
+public interface ResourceConnectService extends BaseService<ResourceConnect, String> {
 	
 	
 	/**

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/resourceconnect/ResourceConnectServiceImpl.java

@@ -6,7 +6,6 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.zrqx.core.enums.AllResourceTypeEnum;
 import com.zrqx.core.form.resource.bg.resourceconnect.QueryResourceConnectForm;
 import com.zrqx.core.form.resource.bg.resourceconnect.SaveUpdateResourceConnectForm;
 import com.zrqx.core.mapper.BaseMapper;
@@ -15,7 +14,6 @@ import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
-import com.zrqx.core.vo.resource.projectlibrary.ProjectLibraryListVO;
 import com.zrqx.core.vo.resource.resourceconnect.ResourceConnectListVO;
 import com.zrqx.resource.bg.mapper.resourceconnect.ResourceConnectMapper;
 
@@ -25,7 +23,7 @@ import com.zrqx.resource.bg.mapper.resourceconnect.ResourceConnectMapper;
  * @date 2020年11月20日下午5:00:27
  */
 @Service
-public class ResourceConnectServiceImpl extends BaseServiceImpl<ResourceConnect, Integer>
+public class ResourceConnectServiceImpl extends BaseServiceImpl<ResourceConnect, String>
 		implements ResourceConnectService {
 	
 	@Autowired

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

@@ -11,7 +11,7 @@ import com.zrqx.resource.bg.mapper.videolibrary.VideoLibraryDiyTypeMapper;
  * 视频库和自定义分类
  */
 @Service
-public class VideoLibraryDiyTypeSerivceImpl extends BaseServiceImpl<VideoLibraryDiyType,Integer> implements VideoLibraryDiyTypeService {
+public class VideoLibraryDiyTypeSerivceImpl extends BaseServiceImpl<VideoLibraryDiyType,String> implements VideoLibraryDiyTypeService {
 
 	@Autowired
 	private VideoLibraryDiyTypeMapper mapper;

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

@@ -5,6 +5,6 @@ import com.zrqx.core.service.BaseService;
 /**
  * 视频库和自定义分类
  */
-public interface VideoLibraryDiyTypeService extends BaseService<VideoLibraryDiyType,Integer>{
+public interface VideoLibraryDiyTypeService extends BaseService<VideoLibraryDiyType,String>{
 	
 }

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

@@ -12,15 +12,12 @@ import org.springframework.web.multipart.MultipartFile;
 
 import com.zrqx.core.enums.AllResourceTypeEnum;
 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.QueryResourceForPoPForm;
 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.mapper.BaseMapper;
-import com.zrqx.core.model.resource.record.Record;
-import com.zrqx.core.model.resource.resourcerelation.ResourceRelation;
 import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
 import com.zrqx.core.model.resource.videolibrary.VideoLibraryDiyType;
 import com.zrqx.core.service.BaseServiceImpl;
@@ -32,9 +29,6 @@ import com.zrqx.core.vo.ImportLabelVo;
 import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.videolibrary.ExcelVideoImportVo;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibraryListVO;
-import com.zrqx.resource.bg.client.order.OrderClient;
-import com.zrqx.resource.bg.mapper.ResourceRelationMapper;
-import com.zrqx.resource.bg.mapper.record.RecordMapper;
 import com.zrqx.resource.bg.mapper.videolibrary.VideoLibraryDiyTypeMapper;
 import com.zrqx.resource.bg.mapper.videolibrary.VideoLibraryMapper;
 import com.zrqx.resource.commons.Redis;
@@ -51,15 +45,9 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 	private VideoLibraryMapper mapper;
 	@Autowired
 	private VideoLibraryDiyTypeMapper vdrMapper;
-	@Autowired
-	private OrderClient orderClient;
 	
 	
 	@Autowired
-	private RecordMapper recordMapper;
-	@Autowired
-	private ResourceRelationMapper resourceRelationMapper;
-	@Autowired
 	private Redis redis;
 	
 	@Override
@@ -182,17 +170,6 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 		example = new Example(VideoLibraryDiyType.class);
 		example.createCriteria().andIn("vlId", ids);
 		vdrMapper.deleteByExample(example);
-		//这里需要级联删除其他接口关联资源
-		//----关联资源
-		example = new Example(ResourceRelation.class);
-		example.createCriteria().andIn("objectId", ids).orIn("resourceId", ids);
-		resourceRelationMapper.deleteByExample(example);
-		//删除资源订单相关信息
-		orderClient.deleteOrder(ids);
-		//删除资源浏览记录相关信息
-		example = new Example(Record.class);
-		example.createCriteria().andIn("goodsId", ids);
-		recordMapper.deleteByExample(example);
 		return true;
 	}
 	/**