From 9159c0f50cb45bc365fe2f5d177f181fb778a623 Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Mon, 17 Apr 2023 14:28:04 +0800 Subject: [PATCH] commit --- .../huoran/iasf/common/shiro/ShiroConfig.java | 2 + .../iasf/controller/SysColumnController.java | 17 ++++--- .../com/huoran/iasf/entity/SysContent.java | 29 ++++++++++++ .../huoran/iasf/mapper/SysColumnMapper.java | 2 +- .../iasf/mapper/xml/SysColumnMapper.xml | 2 +- .../iasf/mapper/xml/SysContentMapper.xml | 45 ++++++++++++++++++ .../huoran/iasf/service/SysColumnService.java | 6 +-- .../service/impl/SysColumnServiceImpl.java | 12 ++--- .../huoran/iasf/vo/req/PageContentReqVO.java | 30 ++++++++++++ .../iasf/vo/resp/PageContentRespVO.java | 46 +++++++++++++++++++ 10 files changed, 174 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/huoran/iasf/common/shiro/ShiroConfig.java b/src/main/java/com/huoran/iasf/common/shiro/ShiroConfig.java index 5fcb3c2..c7ba337 100644 --- a/src/main/java/com/huoran/iasf/common/shiro/ShiroConfig.java +++ b/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"); diff --git a/src/main/java/com/huoran/iasf/controller/SysColumnController.java b/src/main/java/com/huoran/iasf/controller/SysColumnController.java index 2770b5c..1adaa55 100644 --- a/src/main/java/com/huoran/iasf/controller/SysColumnController.java +++ b/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); } diff --git a/src/main/java/com/huoran/iasf/entity/SysContent.java b/src/main/java/com/huoran/iasf/entity/SysContent.java index bbd4594..d977871 100644 --- a/src/main/java/com/huoran/iasf/entity/SysContent.java +++ b/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; } \ No newline at end of file diff --git a/src/main/java/com/huoran/iasf/mapper/SysColumnMapper.java b/src/main/java/com/huoran/iasf/mapper/SysColumnMapper.java index 3f1a387..da8bcdc 100644 --- a/src/main/java/com/huoran/iasf/mapper/SysColumnMapper.java +++ b/src/main/java/com/huoran/iasf/mapper/SysColumnMapper.java @@ -34,7 +34,7 @@ public interface SysColumnMapper extends BaseMapper { //依据子级查询父级 List getParentInformationBasedOnChild(@Param("id")Integer id); - List getsTheSubColumn(@Param("parentId")Integer parentId ,@Param("ids")String ids ,@Param("isSort")Integer isSort); + List getsTheSubColumn(@Param("parentId")Integer parentId ,@Param("ids")String ids ,@Param("isSort")Integer isSort,@Param("siteId")Integer siteId); Integer oneLevelChecksThemAll(@Param("theChildId")Integer theChildId); diff --git a/src/main/java/com/huoran/iasf/mapper/xml/SysColumnMapper.xml b/src/main/java/com/huoran/iasf/mapper/xml/SysColumnMapper.xml index 25ae6b0..5200724 100644 --- a/src/main/java/com/huoran/iasf/mapper/xml/SysColumnMapper.xml +++ b/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} and FIND_IN_SET(s.id, #{ids}) diff --git a/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml b/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml index 602ae9d..6b4cb82 100644 --- a/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml +++ b/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml @@ -121,6 +121,51 @@ + + AND patent_class_id = #{req.patentClassId} + + + + + AND application_date = #{req.applicationDate} + + + + + AND publication_time = #{req.publicationTime} + + + + AND publication_year = #{req.publicationYear} + + + + AND publication_year > #{req.publicationStartTime} + + + + AND publication_year < #{req.endOfPublicationTime} + + + + + AND ( patent_name LIKE CONCAT( '%',#{req.patentQueryKeyWord},'%' ) OR inventor LIKE CONCAT( '%',#{req.patentQueryKeyWord},'%' )OR application_number LIKE CONCAT( '%',#{req.patentQueryKeyWord},'%' )) + + + + + AND ( famous_works LIKE CONCAT( '%',#{req.monographQueryKeyWord},'%' ) OR writers_and_editors LIKE CONCAT( '%',#{req.monographQueryKeyWord},'%' )OR publishing_house LIKE CONCAT( '%',#{req.monographQueryKeyWord},'%' )) + + + + + AND ( author LIKE CONCAT( '%',#{req.paperQueryKeyWord},'%' ) OR periodical_name LIKE CONCAT( '%',#{req.paperQueryKeyWord},'%' )OR title LIKE CONCAT( '%',#{req.paperQueryKeyWord},'%' )) + + + + + + and t.column_id in { 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); diff --git a/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java b/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java index 38e00a0..e73a997 100644 --- a/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java +++ b/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java @@ -155,16 +155,16 @@ public class SysColumnServiceImpl extends ServiceImpl getsTheSubColumn = baseMapper.getsTheSubColumn(pid, ids, null); + List 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 getsTheSubColumn = baseMapper.getsTheSubColumn(parentId, ids, null); + List getsTheSubColumn = baseMapper.getsTheSubColumn(parentId, ids, null,siteId); List buildTree = TreeStructureUtils.buildTree(getsTheSubColumn, parentId); return R.success(buildTree); } @@ -176,8 +176,8 @@ public class SysColumnServiceImpl extends ServiceImpl getsTheSubColumn = baseMapper.getsTheSubColumn(parentId, ids, isSort); + public R getSubColumn(Integer parentId, String ids, Integer isSort,Integer siteId) { + List getsTheSubColumn = baseMapper.getsTheSubColumn(parentId, ids, isSort,siteId); return R.success(TreeStructureUtils.forMethod(getsTheSubColumn)); } diff --git a/src/main/java/com/huoran/iasf/vo/req/PageContentReqVO.java b/src/main/java/com/huoran/iasf/vo/req/PageContentReqVO.java index 828a368..2ccf1b9 100644 --- a/src/main/java/com/huoran/iasf/vo/req/PageContentReqVO.java +++ b/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; + } \ No newline at end of file diff --git a/src/main/java/com/huoran/iasf/vo/resp/PageContentRespVO.java b/src/main/java/com/huoran/iasf/vo/resp/PageContentRespVO.java index 2c4af3b..2f2e955 100644 --- a/src/main/java/com/huoran/iasf/vo/resp/PageContentRespVO.java +++ b/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; + + } \ No newline at end of file