commit

src/main/java/com/huoran/iasf/common/shiro/ShiroConfig.java

@@ -142,6 +142,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/sys/exportFailure", "anon");
         filterChainDefinitionMap.put("/sysColumnLongPage/getRedisCache", "anon");
         filterChainDefinitionMap.put("/content/classification/allTheQuery", "anon");
+        filterChainDefinitionMap.put("/sysColumn/getsSublevelColumnsUnderALevel", "anon");
+
         /*filterChainDefinitionMap.put("/index/**", "anon");
         filterChainDefinitionMap.put("/doc.html", "anon");
         filterChainDefinitionMap.put("/swagger-resources/**", "anon");

src/main/java/com/huoran/iasf/controller/SysColumnController.java

@@ -205,18 +205,20 @@ public class SysColumnController {
 
     @ApiOperation("获取一级下的子级栏目")
     @PostMapping("/getsTheSubColumn")
-    public R getsTheSubColumn(Integer id) {
+    public R getsTheSubColumn(@ApiParam(name = "id", value = "id", required = true) @RequestParam Integer id,
+                              @ApiParam(name = "siteId", value = "站点id", required = true) @RequestParam Integer siteId) {
         String ids = this.getIds(id);
-        return service.getsTheSubColumn(id, ids);
+        return service.getsTheSubColumn(id, ids,siteId);
 
     }
 
 
     @ApiOperation("获取某层级下的子级栏目")
     @PostMapping("/getsSublevelColumnsUnderALevel")
-    public R getsSublevelColumnsUnderALevel(Integer id) {
+    public R getsSublevelColumnsUnderALevel(@ApiParam(name = "id", value = "id", required = true) @RequestParam Integer id,
+                                            @ApiParam(name = "siteId", value = "站点id", required = true) @RequestParam Integer siteId) {
         String ids = this.getIds(id);
-        return service.getsTheSubColumn(id, ids);
+        return service.getsTheSubColumn(id, ids,siteId);
 
     }
 
@@ -279,11 +281,14 @@ public class SysColumnController {
 
     @ApiOperation("某一级查全部")
     @PostMapping("/oneLevelChecksThemAll")
-    public R oneLevelChecksThemAll(@ApiParam(name = "id", value = "栏目id", required = true) @RequestParam Integer id, @ApiParam(name = "isSort", value = "判断是否为排序接口调用(1为排序接口调用 0我栏目管理列表调用)", required = true) @RequestParam Integer isSort) {
+    public R oneLevelChecksThemAll(@ApiParam(name = "id", value = "栏目id", required = true) @RequestParam Integer id,
+                                   @ApiParam(name = "isSort", value = "判断是否为排序接口调用(1为排序接口调用 0我栏目管理列表调用)", required = true) @RequestParam Integer isSort,
+                                   @ApiParam(name = "ids", value = "主键", required = true) @RequestParam Integer siteId
+    ) {
 
         Integer pid = service.oneLevelChecksThemAll(id);
         String ids = this.getIds(pid);
-        return service.getSubColumn(pid, ids, isSort);
+        return service.getSubColumn(pid, ids, isSort,siteId);
     }
 
 

src/main/java/com/huoran/iasf/entity/SysContent.java

@@ -181,5 +181,34 @@ public class SysContent implements Serializable {
 
     @ApiModelProperty(value = "置顶时间")
     private Date topTime;
+    @ApiModelProperty(value = "专利类别id")
+    private Integer patentClassId;
+
+    @ApiModelProperty(value = "申请时间")
+    private String applicationDate;
+
+    @ApiModelProperty(value = "授权日期")
+    private String dateOfAuthorization;
+
+    @ApiModelProperty(value = "发明人")
+    private String inventor;
+
+    @ApiModelProperty(value = "专利名称")
+    private String patentName;
+
+    @ApiModelProperty(value = "申请号")
+    private String applicationNumber;
+
+    @ApiModelProperty(value = "出版社")
+    private String publishingHouse;
+
+    @ApiModelProperty(value = "著名著作")
+    private String famousWorks;
+
+    @ApiModelProperty(value = "编写人员")
+    private String writersAndEditors;
+
+    @ApiModelProperty(value = "出版日期")
+    private String  publicationTime;
 
 }

src/main/java/com/huoran/iasf/mapper/SysColumnMapper.java

@@ -34,7 +34,7 @@ public interface SysColumnMapper extends BaseMapper<SysColumn> {
     //依据子级查询父级
     List<FatherContentRespVO> getParentInformationBasedOnChild(@Param("id")Integer id);
 
-    List<SysColumn> getsTheSubColumn(@Param("parentId")Integer parentId ,@Param("ids")String ids ,@Param("isSort")Integer isSort);
+    List<SysColumn> getsTheSubColumn(@Param("parentId")Integer parentId ,@Param("ids")String ids ,@Param("isSort")Integer isSort,@Param("siteId")Integer siteId);
 
 
     Integer oneLevelChecksThemAll(@Param("theChildId")Integer theChildId);

src/main/java/com/huoran/iasf/mapper/xml/SysColumnMapper.xml

@@ -156,7 +156,7 @@
         (SELECT sty.path FROM sys_template_style sty WHERE sty.id = s.list_style_id) AS path
         FROM sys_column s
         WHERE deleted = 1
-        AND site_id = 1
+        AND site_id =#{siteId}
         <if test="ids != '' and ids!= null">
             and FIND_IN_SET(s.id, #{ids})
         </if>

src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml

@@ -121,6 +121,51 @@
         </if>
 
 
+        <if test="req.patentClassId != null and req.patentClassId != ''">
+            AND patent_class_id = #{req.patentClassId}
+        </if>
+
+
+        <if test="req.applicationDate != null and req.applicationDate != ''">
+            AND application_date = #{req.applicationDate}
+        </if>
+
+
+        <if test="req.publicationTime != null and req.publicationTime != ''">
+            AND publication_time = #{req.publicationTime}
+        </if>
+
+        <if test="req.publicationYear != null and req.publicationYear != ''">
+            AND publication_year = #{req.publicationYear}
+        </if>
+
+        <if test="req.publicationStartTime != null and req.publicationStartTime != ''  ">
+            AND publication_year &gt; #{req.publicationStartTime}
+        </if>
+
+        <if test="req.endOfPublicationTime != null and req.endOfPublicationTime != ''">
+            AND publication_year &lt; #{req.endOfPublicationTime}
+        </if>
+
+
+        <if test="req.patentQueryKeyWord != null and req.patentQueryKeyWord != ''">
+            AND ( patent_name LIKE CONCAT( '%',#{req.patentQueryKeyWord},'%' ) OR inventor LIKE CONCAT( '%',#{req.patentQueryKeyWord},'%' )OR application_number LIKE CONCAT( '%',#{req.patentQueryKeyWord},'%' ))
+        </if>
+
+
+        <if test="req.monographQueryKeyWord != null and req.monographQueryKeyWord != ''">
+            AND ( famous_works LIKE CONCAT( '%',#{req.monographQueryKeyWord},'%' ) OR writers_and_editors LIKE CONCAT( '%',#{req.monographQueryKeyWord},'%' )OR publishing_house LIKE CONCAT( '%',#{req.monographQueryKeyWord},'%' ))
+        </if>
+
+
+        <if test="req.paperQueryKeyWord != null and req.paperQueryKeyWord != ''">
+            AND ( author LIKE CONCAT( '%',#{req.paperQueryKeyWord},'%' ) OR periodical_name LIKE CONCAT( '%',#{req.paperQueryKeyWord},'%' )OR title LIKE CONCAT( '%',#{req.paperQueryKeyWord},'%' ))
+        </if>
+
+
+
+
+
         <if test="req.columnIds != null and req.columnIds.size() > 0 ">
             and t.column_id in
             <foreach item="item" index="index" collection="req.columnIds"

src/main/java/com/huoran/iasf/service/SysColumnService.java

@@ -30,15 +30,15 @@ public interface SysColumnService extends IService<SysColumn> {
     R longPageColumnList(LongPageColumnReqVO reqVO);
 
 
-    R getsTheSubColumn(Integer parentId,String ids);
+    R getsTheSubColumn(Integer parentId,String ids,Integer siteId);
 
 
-    R getsSublevelColumnsUnderALevel(Integer parentId,String ids);
+    R getsSublevelColumnsUnderALevel(Integer parentId,String ids,Integer siteId);
 
     Integer oneLevelChecksThemAll(Integer theChildId);
 
 
-    R getSubColumn(Integer parentId,String ids,Integer isSort);
+    R getSubColumn(Integer parentId,String ids,Integer isSort,Integer siteId);
 
     R queryArticlesByColumnType(String ids,Integer id);
 

src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java

@@ -155,16 +155,16 @@ public class SysColumnServiceImpl extends ServiceImpl<SysColumnMapper, SysColumn
     }
 
     @Override
-    public R getsTheSubColumn(Integer pid, String ids) {
+    public R getsTheSubColumn(Integer pid, String ids,Integer siteId) {
 
-        List<SysColumn> getsTheSubColumn = baseMapper.getsTheSubColumn(pid, ids, null);
+        List<SysColumn> getsTheSubColumn = baseMapper.getsTheSubColumn(pid, ids, null,siteId);
         return R.success(TreeStructureUtils.buildTree(getsTheSubColumn, pid));
     }
 
     @Override
-    public R getsSublevelColumnsUnderALevel(Integer parentId, String ids) {
+    public R getsSublevelColumnsUnderALevel(Integer parentId, String ids,Integer siteId) {
 
-        List<SysColumn> getsTheSubColumn = baseMapper.getsTheSubColumn(parentId, ids, null);
+        List<SysColumn> getsTheSubColumn = baseMapper.getsTheSubColumn(parentId, ids, null,siteId);
         List<SysColumn> buildTree = TreeStructureUtils.buildTree(getsTheSubColumn, parentId);
         return R.success(buildTree);
     }
@@ -176,8 +176,8 @@ public class SysColumnServiceImpl extends ServiceImpl<SysColumnMapper, SysColumn
     }
 
     @Override
-    public R getSubColumn(Integer parentId, String ids, Integer isSort) {
+    public R getSubColumn(Integer parentId, String ids, Integer isSort,Integer siteId) {
-        List<SysColumn> getsTheSubColumn = baseMapper.getsTheSubColumn(parentId, ids, isSort);
+        List<SysColumn> getsTheSubColumn = baseMapper.getsTheSubColumn(parentId, ids, isSort,siteId);
         return R.success(TreeStructureUtils.forMethod(getsTheSubColumn));
     }
 

src/main/java/com/huoran/iasf/vo/req/PageContentReqVO.java

@@ -85,4 +85,34 @@ public class PageContentReqVO extends PageReqVO {
 
     @ApiModelProperty(value = "是否禁用(0默认，0启用 1禁用)")
     private Integer isDisable;
+
+    @ApiModelProperty(value = "专利类别id")
+    private Integer patentClassId;
+
+    @ApiModelProperty(value = "申请时间")
+    private String applicationDate;
+
+    @ApiModelProperty(value = "专利查询关键词")
+    private String patentQueryKeyWord;
+
+    @ApiModelProperty(value = "专著查询关键词")
+    private String monographQueryKeyWord;
+
+    @ApiModelProperty(value = "论文查询关键词")
+    private String paperQueryKeyWord;
+
+    @ApiModelProperty(value = "出版日期")
+    private String  publicationTime;
+
+
+    @ApiModelProperty(value = "发表年度/出版年度")
+    private String  publicationYear;
+
+
+    @ApiModelProperty(value = "出版开始时间")
+    private String  publicationStartTime;
+
+    @ApiModelProperty(value = "出版结束时间")
+    private String  endOfPublicationTime;
+
 }

src/main/java/com/huoran/iasf/vo/resp/PageContentRespVO.java

@@ -187,4 +187,50 @@ public class PageContentRespVO {
 
     @ApiModelProperty(value = "是否置顶(默认为0 不置顶 1为置顶)")
     private Integer isTop;
+
+
+    @ApiModelProperty(value = "专利类别id")
+    private Integer patentClassId;
+
+    @ApiModelProperty(value = "申请时间")
+    private String applicationDate;
+
+    @ApiModelProperty(value = "授权日期")
+    private String dateOfAuthorization;
+
+    @ApiModelProperty(value = "发明人")
+    private String inventor;
+
+    @ApiModelProperty(value = "专利名称")
+    private String patentName;
+
+    @ApiModelProperty(value = "申请号")
+    private String applicationNumber;
+
+    @ApiModelProperty(value = "出版社")
+    private String publishingHouse;
+
+    @ApiModelProperty(value = "著名著作")
+    private String famousWorks;
+
+    @ApiModelProperty(value = "编写人员")
+    private String writersAndEditors;
+
+    @ApiModelProperty(value = "刊物名称")
+    private String periodicalName;
+
+    @ApiModelProperty(value = "卷")
+    private String reel;
+
+    @ApiModelProperty(value = "文献号")
+    private String documentNumber;
+
+    @ApiModelProperty(value = "文章关键字")
+    private String articleKeyWord;
+
+
+    @ApiModelProperty(value = "出版日期")
+    private String  publicationTime;
+
+
 }