feat:图书关联全部资源、图书关联系列

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/controller/frontend/GoodsLibraryController.java

@@ -16,6 +16,7 @@ import com.zrqx.resource.model.po.goodslibrary.GoodsLibrary;
 import com.zrqx.resource.model.po.goodslibrary.GoodsLibraryDiyTypePO;
 import com.zrqx.resource.model.po.goodslibrary.GoodsLibraryLabelContentDiyTypePO;
 import com.zrqx.resource.model.po.qrcode.QrCode;
+import com.zrqx.resource.model.vo.ResourceRelationVO;
 import com.zrqx.resource.model.vo.goodslibrary.GoodsLibraryListVO;
 import com.zrqx.resource.model.vo.goodslibrary.GoodsLibraryVO;
 import com.zrqx.resource.service.GoodsLibraryService;
@@ -72,5 +73,9 @@ public class GoodsLibraryController {
         }
         return CallBack.success(vo);
     }
-
+    @ApiOperation(value = "分页查询", notes = "查询列表")
+    @GetMapping(value = "/list")
+    public CallBack<ResourceRelationVO> queryByGoods(String resourceId,String resourceType) {
+        return CallBack.success(service.queryByGoods(resourceId,resourceType));
+    }
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/controller/frontend/ProjectLibraryController.java

@@ -318,5 +318,4 @@ public class ProjectLibraryController {
         }
         return li;
     }
-
 }

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

@@ -205,4 +205,24 @@ public interface ResourceRelationMapper extends BaseMapper<ResourceRelation> {
             + "</if>"
             + "</script>")
     Integer getCourseEchartsData(@Param("form") QueryCourseLibraryEchartsDataForm form);
+    @Select("<script>"
+            + "SELECT id ,resourceId,objectId,resourceType,createdTime,sort,creater,createrId "
+            + "FROM res_resource_relation "
+            + "WHERE resourceId = #{oid} "
+            + "<if test='" + MapperConstants.NOT_BLANK + "(resourceType)'> "
+            + " AND resourceType = #{resourceType} "
+            + "</if>"
+            + " order by sort desc LIMIT 1 "
+            + "</script>")
+    List<ResourceRelationVO> getResourceRelationProject(@Param("oid") String oid, @Param("resourceType") String resourceType);
+    @Select("<script>"
+            + "SELECT id ,resourceId,resourceType,createdTime,sort,creater,createrId "
+            + "FROM res_resource_relation "
+            + "WHERE objectId = #{resourceId} "
+            + "<if test='" + MapperConstants.NOT_BLANK + "(resourceType)'> "
+            + " AND resourceType = #{resourceType} "
+            + "</if>"
+            + " order by sort desc LIMIT 1"
+            + "</script>")
+    ResourceRelationVO queryByGoods(@Param("resourceId") String resourceId, @Param("resourceType") String resourceType);
 }

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

@@ -11,6 +11,7 @@ import com.zrqx.resource.model.form.goodslibrary.QueryGoodsLibraryForm;
 import com.zrqx.resource.model.form.recommend.QueryRecommedResourceForm;
 import com.zrqx.resource.model.po.goodslibrary.GoodsLibrary;
 import com.zrqx.resource.model.vo.ResourceListInfoVO;
+import com.zrqx.resource.model.vo.ResourceRelationVO;
 import com.zrqx.resource.model.vo.courselibrary.CourseLibraryListVO;
 import com.zrqx.resource.model.vo.goodslibrary.GoodsLibraryListVO;
 import com.zrqx.resource.model.vo.videolibrary.VideoLibraryListVO;

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/vo/ResourceRelationVO.java

@@ -11,6 +11,8 @@ public class ResourceRelationVO {
     private String id;
     @ApiModelProperty("关联资源ID")
     private String resourceId;
+    @ApiModelProperty("对象id")
+    private String objectId;
     @ApiModelProperty("资源名")
     private String name;
     @ApiModelProperty("封面")
@@ -41,4 +43,7 @@ public class ResourceRelationVO {
     private Integer sort;
     @ApiModelProperty("播放数，默认值：0")
     private Integer browseNum;
+    //查看全部资源需要
+    @ApiModelProperty("资源包下关联的资源")
+    private List<ResourceRelationVO> resourceList;
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/vo/ebook/EbookVO.java

@@ -174,4 +174,8 @@ public class EbookVO {
     private String languages;
     @ApiModelProperty(value = "图组图片")
     private List<EbookImgs> imgList;
+    @ApiModelProperty("专题id，新增时不需要填写")
+    private String projectId;
+    @ApiModelProperty("专题名称")
+    private String projectName;
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/vo/goodslibrary/GoodsLibraryListVO.java

 package com.zrqx.resource.model.vo.goodslibrary;
 
+import com.zrqx.resource.model.vo.ResourceRelationVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @ApiModel(value = "GoodsLibraryListVO", description = "查询课程集合返回的实体")
@@ -32,4 +34,5 @@ public class GoodsLibraryListVO {
     private Date createdTime;
     @ApiModelProperty("更新时间")
     private Date updatedTime;
+
 }

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

@@ -88,4 +88,11 @@ public interface GoodsLibraryService extends IService<GoodsLibrary> {
      * @date 2022/4/19 14:43
      */
     PageInfo<GoodsLibraryListVO>  queryPage(QueryGoodsLibraryForm form, PageParam pageParam);
+    /**
+     * 查询图书关联的商品信息
+     * @param: ${tags}
+     * @author rjc
+     * @date 2022/4/20 9:34
+     */
+    ResourceRelationVO queryByGoods(String resourceId,String resourceType);
 }

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

@@ -105,4 +105,11 @@ public interface ResourceRelationService extends IService<ResourceRelation> {
      * @date 2021/11/30 14:18
      */
     List<ResourceRelationVO> getResourceRelationPublic(QueryResourceRelationForm entity);
+    /**
+     * 查询图书关联的专题
+     * @param: ${tags}
+     * @author rjc
+     * @date 2022/4/20 11:07
+     */
+    List<ResourceRelationVO> getResourceRelationProject(String oid,String resourceType);
 }

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

@@ -31,6 +31,7 @@ import com.zrqx.resource.mapper.ebook.*;
 import com.zrqx.resource.mapper.membercollection.MemberCollectionMapper;
 import com.zrqx.resource.mapper.pdffilelibrary.PdfLibraryMapper;
 import com.zrqx.resource.mapper.phybook.PhysicalBookMapper;
+import com.zrqx.resource.mapper.projectlibrary.ProjectLibraryMapper;
 import com.zrqx.resource.mapper.projectlibrary.ProjectModelResourceMapper;
 import com.zrqx.resource.mapper.qrcode.QrCodeMapper;
 import com.zrqx.resource.mapper.recommend.RecommendResourceMapper;
@@ -47,9 +48,11 @@ import com.zrqx.resource.model.po.ebook.*;
 import com.zrqx.resource.model.po.membercollection.MemberCollection;
 import com.zrqx.resource.model.po.pdflibrary.PdfLibrary;
 import com.zrqx.resource.model.po.phybook.PhysicalBookImgs;
+import com.zrqx.resource.model.po.projectlibrary.ProjectLibrary;
 import com.zrqx.resource.model.po.qrcode.QrCode;
 import com.zrqx.resource.model.po.record.Record;
 import com.zrqx.resource.model.po.resourcerelation.RelationAuthor;
+import com.zrqx.resource.model.vo.ResourceRelationVO;
 import com.zrqx.resource.model.vo.StatisticsResourceExportVO;
 import com.zrqx.resource.model.vo.StatisticsResourceVO;
 import com.zrqx.resource.model.vo.authorlibrary.AboutEbookListVO;
@@ -160,6 +163,11 @@ public class EbookServiceImpl extends ServiceImpl<EbookMapper, Ebook> implements
     private EbookImgsMapper imgsMapper;
     @Resource
     private EbookImgsService ebookImgsService;
+    @Resource
+    private ResourceRelationService resourceRelationService;
+    @Resource
+    private ProjectLibraryMapper projectLibraryMapper;
+
 
 
     @Override
@@ -570,6 +578,15 @@ public class EbookServiceImpl extends ServiceImpl<EbookMapper, Ebook> implements
         if(mapperListByEbId.size()>0){
             vo.setImgList(mapperListByEbId);
         }
+        //获取系列
+        List<ResourceRelationVO> list = resourceRelationService.getResourceRelationProject(oid,GoodsTypeEnum.EBOOK.getCode());
+        if(list.size()>0){
+            ProjectLibrary sc = projectLibraryMapper.selectById(list.get(0).getObjectId());
+            if (sc != null) {
+                vo.setProjectName(sc.getName());
+                vo.setProjectId(sc.getId());
+            }
+        }
         // 二维码
         LambdaQueryWrapper<QrCode> qrCodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
         qrCodeLambdaQueryWrapper.eq(QrCode::getResourceId, oid);

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

@@ -104,33 +104,17 @@ public class GoodsLibraryServiceImpl extends ServiceImpl<GoodsLibraryMapper, Goo
     @Resource
     private GoodsLibraryDiyTypeService diyTypeService;
     @Resource
-    private VideoLibraryMapper videoMapper;
-    @Resource
-    private RecordMapper recordMapper;
-    @Resource
-    private ScheduleRecordMapper scheduleRecordMapper;
-    @Resource
-    private GoodsLibraryDiyTypeMapper goodsLibraryDiyTypeMapper;
-    @Resource
-    private QuestionClient questionClient;
-    @Resource
     private OrganClient organClient;
     @Resource
     private OrderClient orderClient;
     @Resource
     private GoodsLibraryLabelContentDiyTypeService labelService;
     @Resource
-    private CourseVideoService courseVideoService;
-    @Resource
     private MemberCollectionService memberCollectionService;
     @Resource
     private TokenManager tokenManager;
     @Resource
     private Redis redis;
-    @Value("${qrcode-path}")
-    private String qrCodeUrl;
-    @Resource
-    private QrCodeManage qrCodeManage;
     @Value("${qrcode-upload-path}")
     private String qrCodeUploadPath;
     @Value("${realm-name-path}")
@@ -140,12 +124,6 @@ public class GoodsLibraryServiceImpl extends ServiceImpl<GoodsLibraryMapper, Goo
     @Resource
     private MemberClient memberClient;
     @Resource
-    private ExamPaperLibraryClient examPaperLibraryClient;
-    @Resource
-    private ResourceRelationService resourceRelationService;
-    @Resource
-    private ProjectModelResourceMapper projectModelResourceMapper;
-    @Resource
     private MemberCollectionMapper memberCollectionMapper;
     @Resource
     private RecommendResourceMapper recommendResourceMapper;
@@ -154,14 +132,7 @@ public class GoodsLibraryServiceImpl extends ServiceImpl<GoodsLibraryMapper, Goo
     @Resource
     private SolrManage solrManage;
     @Resource
-    private MyCourseLibraryMapper myCourseLibraryMapper;
-    @Resource
     private SystemAdminClient systemAdminClient;
-    @Resource
-    private VideoLibraryMapper videoLibraryMapper;
-    @Resource
-    private AudioLibraryMapper audioLibraryMapper;
-
     /**
      * 保存或修改课程
      */
@@ -565,5 +536,14 @@ public class GoodsLibraryServiceImpl extends ServiceImpl<GoodsLibraryMapper, Goo
         vo.setMessageCode(CoursePromptMessageEnum.STATUS_5.getCode());
         return vo;
     }
-
+  public ResourceRelationVO queryByGoods(String resourceId,String resourceType){
+      ResourceRelationVO resourceRelationVO = resourceRelationMapper.queryByGoods(resourceId, resourceType);
+      if(resourceRelationVO!=null){
+          QueryResourceRelationForm entity = new QueryResourceRelationForm();
+          entity.setId(resourceRelationVO.getResourceId());
+          List<ResourceRelationVO> list = resourceRelationService.getResourceRelationPublic(entity);
+          resourceRelationVO.setResourceList(resourceRelationService.queryRelationList(list));
+      }
+      return resourceRelationVO;
+  }
 }

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

@@ -375,6 +375,11 @@ public class ResourceRelationServiceImpl extends ServiceImpl<ResourceRelationMap
         return mapper.getResourceRelationPublic(entity);
     }
 
+    @Override
+    public List<ResourceRelationVO> getResourceRelationProject(String oid,String resourceType) {
+        return mapper.getResourceRelationProject(oid,resourceType);
+    }
+
     /**
      * 获取相关资源列表
      *