feat：关联内容

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/controller/backend/EbookController.java

@@ -131,8 +131,11 @@ public class EbookController {
     }
     @ApiOperation("根据物料号查询是否存在")
     @GetMapping("/getItemNo")
-    public CallBack<Boolean> getItemNo(String itemNo) {
+    public CallBack<Boolean> getItemNo(String id,String itemNo) {
         LambdaQueryWrapper<Book> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(id)){
+            lambdaQueryWrapper.ne(Book::getId,id);
+        }
         lambdaQueryWrapper.eq(Book::getItemNo,itemNo);
         List<Book> list = bookservice.list(lambdaQueryWrapper);
         if(list.size()>0){

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/controller/backend/ResourceLibraryController.java

@@ -227,7 +227,7 @@ public class ResourceLibraryController {
             ResourceRelation e = new ResourceRelation();
             e.setObjectId(entity.getId());
             e.setResourceId(resourceId);
-            e.setSort(resourceRelationService.getMaxSort(entity.getId()) + index);
+            e.setSort(resourceRelationService.getMaxSort(entity.getId(),entity.getResourceType()) + index);
             e.setCreatedTime(new Date());
             e.setResourceType(entity.getResourceType());
             e.setCreaterId(tokenManager.getUserId());
@@ -265,8 +265,8 @@ public class ResourceLibraryController {
 
     @ApiOperation(value = "获取关联资源的最大排序号", notes = "获取资源最大排序号")
     @GetMapping(value = "/get/sort")
-    public CallBack<Integer> getMaxSort(@RequestParam String objectId) {
-        return CallBack.success(resourceRelationService.getMaxSort(objectId));
+    public CallBack<Integer> getMaxSort(@RequestParam String objectId,String resourceType) {
+        return CallBack.success(resourceRelationService.getMaxSort(objectId,resourceType));
     }
 
     @ApiOperation(value = "选择弹框中的列表", notes = "资源类型 ")

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/mapper/ResourceRelationMapper.java

@@ -102,8 +102,8 @@ public interface ResourceRelationMapper extends BaseMapper<ResourceRelation> {
      *
      * @return
      */
-    @Select("SELECT MAX(sort) FROM res_resource_relation WHERE objectId = #{objectId}")
-    Integer getMaxSort(@Param("objectId") String objectId);
+    @Select("SELECT MAX(sort) FROM res_resource_relation WHERE objectId = #{objectId} and resourceType = #{type}" )
+    Integer getMaxSort(@Param("objectId") String objectId,@Param("type") String type);
 
     /**
      * 根据直播id查询直播信息

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/service/ResourceRelationService.java

@@ -68,7 +68,7 @@ public interface ResourceRelationService extends IService<ResourceRelation> {
      * @param objectId
      * @return
      */
-    Integer getMaxSort(String objectId);
+    Integer getMaxSort(String objectId,String type);
 
     /**
      * 查询直播

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/service/impl/ResourceRelationServiceImpl.java

@@ -330,8 +330,8 @@ public class ResourceRelationServiceImpl extends ServiceImpl<ResourceRelationMap
     }
 
     @Override
-    public Integer getMaxSort(String objectId) {
-        Integer sort = mapper.getMaxSort(objectId);
+    public Integer getMaxSort(String objectId,String type) {
+        Integer sort = mapper.getMaxSort(objectId,type);
         if (sort == null) {
             sort = 1;
         } else {