feat:全部资源包

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

@@ -218,13 +218,13 @@ public interface ResourceRelationMapper extends BaseMapper<ResourceRelation> {
             + "</script>")
     List<ResourceRelationVO> getResourceRelationProject(@Param("oid") String oid, @Param("resourceType") String resourceType);
     @Select("<script>"
-            + "SELECT id ,resourceId,resourceType,createdTime,sort,creater,createrId "
+            + "SELECT ar.id ,ar.resourceId,ar.resourceType,ar.createdTime,ar.sort,ar.creater,ar.createrId "
             + "FROM res_resource_relation ar "
             + "left join res_goods_library_label_content_diy_type co on ar.resourceId = co.labelId "
             + "WHERE 1=1 "
             + "eq(objectId,form.resourceId)"
             + "<if test='" + MapperConstants.NOT_BLANK + "(form.resourceType)'> "
-            + " AND resourceType = #{form.resourceType} "
+            + " AND ar.resourceType = #{form.resourceType} "
             + "</if>"
             + " LIKE(co.labelContentDiyTypeCode,form.labelCode)   "
             + " order by sort desc "

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/form/audiolibrary/SaveUpdateAudioLibraryForm.java

@@ -52,4 +52,6 @@ public class SaveUpdateAudioLibraryForm {
     private List<AudioLabelPO> labelList;
     @ApiModelProperty("来源")
     private String source;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/form/ebook/SaveUpdateEbookForm.java

@@ -104,6 +104,8 @@ public class SaveUpdateEbookForm {
     private String languages;
     @ApiModelProperty(value = "图组图片")
     private List<String> imgList;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 	/*@ApiModelProperty(value = "作者名称和id（用,隔开）")
 	private String authorNameAndId;
 	@ApiModelProperty(value = "译者名称和id（用,隔开）")

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/form/goodslibrary/SaveUpdateGoodsLibraryForm.java

@@ -27,6 +27,8 @@ public class SaveUpdateGoodsLibraryForm {
     private String synopsis;
     @ApiModelProperty("状态1已上架，2已下架")
     private Integer status;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
     @ApiModelProperty("标签id")
     private List<GoodsLibraryLabelContentDiyTypePO> labelList;
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/form/pdffilelibrary/SaveUpdatePdfLibraryForm.java

@@ -35,6 +35,8 @@ public class SaveUpdatePdfLibraryForm {
     private List<String> diyTypeCode;
     @ApiModelProperty("pdf名称")
     private String pdfName;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
     @ApiModelProperty(value = "作者集合")
     private List<RelationAuthor> authorList;
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/form/projectlibrary/SaveProjectLibraryForm.java

@@ -32,6 +32,8 @@ public class SaveProjectLibraryForm {
     private Integer template;
     @ApiModelProperty("状态 0下线，1上线")
     private String status;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
     @ApiModelProperty("自定义模块名称")
     private List<SaveDiyModelForm> diyModelList;
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/form/projectlibrary/UpdateProjectLibraryForm.java

@@ -31,6 +31,8 @@ public class UpdateProjectLibraryForm {
     private Integer template;
     @ApiModelProperty("状态 0下线，1上线")
     private String status;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
     @ApiModelProperty("新增/修改自定义模块")
     private List<SaveDiyModelForm> diyModelList;
     @ApiModelProperty("删除自定义模块")

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/form/videolibrary/SaveUpdateVideoLibraryForm.java

@@ -47,5 +47,7 @@ public class SaveUpdateVideoLibraryForm {
     private List<VideoLabelPO> labelList;
     @ApiModelProperty("来源")
     private String source;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/po/audiolibrary/AudioLibrary.java

@@ -72,4 +72,6 @@ public class AudioLibrary {
     private Integer  departmentId;
     @ApiModelProperty(value = "部门")
     private String  departmentCode;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/po/ebook/Ebook.java

@@ -97,4 +97,7 @@ public class Ebook {
     private Integer sales;
     @ApiModelProperty("阅读人数")
     private Integer readerNum;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
+
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/po/goodslibrary/GoodsLibrary.java

@@ -42,4 +42,6 @@ public class GoodsLibrary {
     private Date updateTime;
     @ApiModelProperty(value = "二维码")
     private String qrCode;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/po/pdflibrary/PdfLibrary.java

@@ -46,4 +46,6 @@ public class PdfLibrary {
     private Integer  departmentId;
     @ApiModelProperty(value = "部门")
     private String  departmentCode;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/po/projectlibrary/ProjectLibrary.java

@@ -44,4 +44,6 @@ public class ProjectLibrary extends BasePO {
     private Integer  departmentId;
     @ApiModelProperty(value = "部门")
     private String  departmentCode;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 }

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/model/po/videolibrary/VideoLibrary.java

@@ -74,4 +74,6 @@ public class VideoLibrary {
     private Integer  departmentId;
     @ApiModelProperty(value = "部门")
     private String  departmentCode;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 }

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

@@ -49,6 +49,8 @@ public class ResourceRelationVO {
     private Integer browseNum;
     @ApiModelProperty("所属图书")
     private String source;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 
     //查看全部资源需要
     @ApiModelProperty(value = "资源包下关联的资源")

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

@@ -54,4 +54,6 @@ public class AudioLibraryOneVO {
     private List<RelationAuthor> authorList;
     @ApiModelProperty("广告语")
     private String adSlogan;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 }

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

@@ -178,4 +178,6 @@ public class EbookVO {
     private String projectId;
     @ApiModelProperty("专题名称")
     private String projectName;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 }

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

@@ -38,4 +38,6 @@ public class GoodsLibraryVO {
     private List<Integer> labelContentDiyTypeIds;
     @ApiModelProperty("二维码")
     private String qrCode;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 }

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

@@ -30,6 +30,8 @@ public class PdfLibraryOneVO {
     private List<String> diyTypeCode;
     @ApiModelProperty("pdf名称")
     private String pdfName;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
     @ApiModelProperty(value = "作者集合")
     private List<RelationAuthor> authorList;
 }

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

@@ -39,6 +39,8 @@ public class ProjectLibraryVO {
     private Date updatedTime;
     @ApiModelProperty("浏览数量")
     private Integer browseNum;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
     @ApiModelProperty("自定义模块集合")
     private List<ProjectDiyModelVO> dms;
     @ApiModelProperty("专题关联资源集合")

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

@@ -61,4 +61,6 @@ public class VideoLibraryOneVO {
     private List<Integer> labelContentDiyTypeIds;
     @ApiModelProperty("来源")
     private String source;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 }

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

@@ -94,4 +94,6 @@ public class VideoLibraryVO {
     private String imgPath;
     @ApiModelProperty("二维码")
     private String qrCode;
+    @ApiModelProperty("下载状态  0：下载  1:禁止下载")
+    private String isDownload;
 }

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

@@ -249,6 +249,7 @@ public class AudioLibrarySerivceImpl extends ServiceImpl<AudioLibraryMapper, Aud
             entity.setStatus(LibraryStatusEnum.STATUS_0.getCode());
             entity.setCreatedTime(new Date());
             entity.setUpdateTime(new Date());
+            entity.getIsDownload("0")
             if (StringUtils.isNotBlank(f.getAudioName())) {
                 entity.setName(f.getAudioName().substring(0, f.getAudioName().lastIndexOf(".")));
             }

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

@@ -156,6 +156,7 @@ public class PdfLibrarySerivceImpl extends ServiceImpl<PdfLibraryMapper, PdfLibr
             BeanUtils.copyProperties(f, obj);
             obj.setCreatedTime(new Date());
             obj.setStatus(LibraryStatusEnum.STATUS_0.getCode());
+            obj.setIsDownload("0");
             ObjectMapper mapper1 = new ObjectMapper();
             String jsonString = systemAdminClient.infoJson(Integer.parseInt(tokenManager.getUserId()));
             try {

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

@@ -271,6 +271,7 @@ public class VideoLibrarySerivceImpl extends ServiceImpl<VideoLibraryMapper, Vid
             entity.setStatus(LibraryStatusEnum.STATUS_0.getCode());
             entity.setCreatedTime(new Date());
             entity.setCreatedTime(new Date());
+            entity.setIsDownload("0");
             if (StringUtils.isNotBlank(f.getVideoName())) {
                 entity.setName(f.getVideoName().substring(0, f.getVideoName().lastIndexOf(".")));
             }