feat:全部资源包

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

@@ -332,9 +332,22 @@ public interface EbookMapper extends BaseMapper<Ebook> {
              + " WHERE t1.status = 1 "
              + " like(bb.name,form.keyWord)"
              + " eq(t1.priceOption,form.priceOption)"
-             + " rlike(bdt.code,form.diyTypeCode) "
-             + " rlike(ld.labelContentDiyTypeCode,form.labelContentDiyTypeCode) "
-             + " eq(rr.projectId,form.projectId) "
+             + "<if test='form.diyTypeCode != null and form.diyTypeCode.size > 0' >"
+             + " and bdt.code like"
+             + " <foreach collection=\"form.diyTypeCode\" separator=\" or bdt.code like\" item=\"diyTypeCode\"> '%${diyTypeCode}%'\n"
+             + " </foreach>"
+             + "</if>"
+             + "<if test='form.labelContentDiyTypeCode != null and form.labelContentDiyTypeCode.size > 0' >"
+             + " and ld.labelContentDiyTypeCode like"
+             + " <foreach collection=\"ld.labelContentDiyTypeCode\" separator=\" or ld.labelContentDiyTypeCode like\" item=\"labelContentDiyTypeCode\"> '%${diyTypeCode}%'\n"
+             + " </foreach>"
+             + "</if>"
+             + "<if test='form.projectId != null and form.projectId.size > 0' >"
+             + " and rr.projectId in "
+             + " <foreach collection=\"rr.projectId\" index=\"index\" item=\"id\" open=\"(\" separator=\",\" close=\")\">"
+             + "#{id}"
+             + " </foreach>"
+             + "</if>"
              +"</script>")
     List<ResourceListInfoVO> searchResource(@Param("form") ResourceQueryForm form);
     @Select("<script>"

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

@@ -157,11 +157,26 @@ public interface GoodsLibraryMapper extends BaseMapper<GoodsLibrary> {
             + "SELECT bb.id,16 as resourceType,bb.cover,bb.name,bb.synopsis,bb.createdTime "
             + " FROM res_goods_library bb "
             + " LEFT JOIN res_goods_library_diy_type bdt ON bb.id = bdt.goodsLibraryId"
+            + " LEFT JOIN res_goods_library_label_content_diy_type ld ON bb.id = la.goodsLibraryId"
             + " LEFT JOIN res_project_model_resource rr ON bb.id = rr.resourceId "
             + " WHERE bb.status = 1 "
             + " like(bb.name,form.keyWord)"
-            + " eq(rr.projectId,form.projectId) "
-            + " rlike(bdt.code,form.diyTypeCode) "
+            + "<if test='form.diyTypeCode != null and form.diyTypeCode.size > 0' >"
+            + " and bdt.code like"
+            + " <foreach collection=\"form.diyTypeCode\" separator=\" or bdt.code like\" item=\"diyTypeCode\"> '%${diyTypeCode}%'\n"
+            + " </foreach>"
+            + "</if>"
+            + "<if test='form.labelContentDiyTypeCode != null and form.labelContentDiyTypeCode.size > 0' >"
+            + " and ld.labelContentDiyTypeCode like"
+            + " <foreach collection=\"ld.labelContentDiyTypeCode\" separator=\" or ld.labelContentDiyTypeCode like\" item=\"labelContentDiyTypeCode\"> '%${diyTypeCode}%'\n"
+            + " </foreach>"
+            + "</if>"
+            + "<if test='form.projectId != null and form.projectId.size > 0' >"
+            + " and rr.projectId in "
+            + " <foreach collection=\"rr.projectId\" index=\"index\" item=\"id\" open=\"(\" separator=\",\" close=\")\">"
+            + "#{id}"
+            + " </foreach>"
+            + "</if>"
             +"</script>")
     List<ResourceListInfoVO> searchResource(@Param("form") ResourceQueryForm form);
     @Select("<script>"

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

@@ -3,6 +3,8 @@ package com.zrqx.resource.model.form;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 资源类型查询
  *
@@ -17,11 +19,11 @@ public class ResourceQueryForm {
     @ApiModelProperty("资源类型 2:图书 16:数字资源 5:视频 6：音频")
     private String resourceType;
     @ApiModelProperty("资源分类code")
-    private String diyTypeCode;
+    private List<String> diyTypeCode;
     @ApiModelProperty("付费类型，0：免费，1：付费")
     private String priceOption;
     @ApiModelProperty("资源标签code")
-    private String labelContentDiyTypeCode;
+    private List<String> labelContentDiyTypeCode;
     @ApiModelProperty("系列")
-    private String projectId;
+    private List<String> projectId;
 }

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

@@ -562,6 +562,7 @@ public class GoodsLibraryServiceImpl extends ServiceImpl<GoodsLibraryMapper, Goo
         QueryResourceRelationPublicForm entity = new QueryResourceRelationPublicForm();
         if(!form.getType().equals("0")){
             entity.setResourceType(form.getType());
+            entity.setId(form.getResourceId());
         }
         List<ResourceRelationVO> list = resourceRelationMapper.getResourceRelationWholePublic(entity);
         return resourceRelationService.queryRelationList(list);

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

@@ -65,6 +65,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -364,6 +365,33 @@ public class ResourceRelationServiceImpl extends ServiceImpl<ResourceRelationMap
         if (form.getResourceType() == null) {
             throw new ResourceBizException("资源类型不能为空");
         }
+
+        // 分类
+        /*if (StringUtils.isNotEmpty(form.getDiyTypeCode())) {
+            StringBuffer sb=new StringBuffer();
+            if(form.getDiyTypeCode().contains(",")){
+                List<String> strings = Arrays.asList(form.getDiyTypeCode().split(","));
+                List<String> codes = new ArrayList<>(strings);
+                sb.append(" and (");
+                for (int i = 0; i < codes.size(); i++) {
+                    sb.append(" bdt.code like %" + codes.get(i) + "%");
+                    if (i != codes.size() - 1) {
+                        sb.append(" or ");
+                    }
+                }
+                sb.append(")");
+
+            }
+            form.setDiyTypeCode(sb.toString());
+        }
+        // 系列
+        if (StringUtils.isNotEmpty(form.getProjectId())) {
+
+            if(form.getDiyTypeCode().contains(",")){
+                List<String> strings = Arrays.asList(form.getProjectId().split(","));
+                form.setProjectId(strings);
+            }
+        }*/
         List<ResourceListInfoVO> list = null;
         if(form.getResourceType().equals(AllResourceTypeEnum.VIDEO.getCode())){
             list=videoLibraryMapper.searchResource(form);