From 10b0e1684418d4cf0dddf3945c1b1b5e9866d833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 13 Nov 2023 18:07:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/common/LawsHomeSearchCommon.java | 28 +++ .../LawsHomeNormalSearchDataController.java | 56 ------ .../controller/LawsHomeSearchController.java | 32 +++- .../home/entity/LawsHomeNormalSearchData.java | 116 ------------ .../LawsHomeNormalSearchDataMapper.java | 20 -- .../home/mapper/LawsHomeSearchMapper.java | 17 ++ .../home/mapper/xml/LawsHomeSearchMapper.xml | 17 ++ .../ILawsHomeNormalSearchDataService.java | 26 --- .../home/service/ILawsHomeSearchService.java | 20 ++ .../LawsHomeNormalSearchDataServiceImpl.java | 108 ----------- .../impl/LawsHomeSearchServiceImpl.java | 179 ++++++++++++++++++ 11 files changed, 287 insertions(+), 332 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/common/LawsHomeSearchCommon.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchDataController.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchData.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeNormalSearchDataMapper.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeNormalSearchDataService.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeNormalSearchDataServiceImpl.java diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/common/LawsHomeSearchCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/home/common/LawsHomeSearchCommon.java new file mode 100644 index 00000000..0ed8df01 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/common/LawsHomeSearchCommon.java @@ -0,0 +1,28 @@ +package com.jero.modules.laws.home.common; + +/** + * @author lqt + * @version 1.0 + * @date 2023/11/13 14:04 + */ +public class LawsHomeSearchCommon { + + private LawsHomeSearchCommon(){} + + /** + * 国内标准 + */ + public static final String LAWS_DOMESTIC_STANDARD = "1"; + /** + * 海外标准 + */ + public static final String LAWS_OVERSEAS_STANDARD = "2"; + /** + * 企业标准 + */ + public static final String LAWS_ENTERPRISE_STANDARD = "3"; + /** + * 动态消息 + */ + public static final String LAWS_NEWS_FEED = "4"; +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchDataController.java b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchDataController.java deleted file mode 100644 index 1d632ace..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchDataController.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.jero.modules.laws.home.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.laws.home.dto.LawsHomeNormalSearchDTO; -import com.jero.modules.laws.home.entity.LawsHomeNormalSearchData; -import com.jero.modules.laws.home.service.ILawsHomeNormalSearchDataService; -import com.jero.modules.laws.home.vo.LawsHomeNormalSearchStatisticsVO; -import com.jero.modules.laws.home.vo.LawsHomeNormalSearchVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - - -/** - * @Description: 首页-一般检索（标题） - * @Author: jero-boot - * @Date: 2023-09-06 - * @Version: V1.0 - */ -@Api(tags = "首页-检索历史") -@RestController -@RequestMapping("/home/lawsHomeNormalSearchData") -@Slf4j -public class LawsHomeNormalSearchDataController extends JeroController { - - @Resource - private ILawsHomeNormalSearchDataService lawsHomeNormalSearchDataService; - - - @AutoLog(value = "首页-一般检索（标题）查询",operateType = 1) - @ApiOperation(value="首页-一般检索（标题）查询", notes="首页-一般检索（标题）查询") - @PostMapping(value = "/getNormalSearchTitlePage") - public Result> getNormalSearchTitlePage(@RequestBody LawsHomeNormalSearchData lawsHomeNormalSearchData, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - // todo 待开发 - return Result.OK(lawsHomeNormalSearchDataService.getNormalSearchTitlePage(lawsHomeNormalSearchData,pageNo,pageSize,req)); - } - - @AutoLog(value = "首页-一般检索（标题）（数据统计）",operateType = 1) - @ApiOperation(value="首页-一般检索（标题）（数据统计）", notes="首页-一般检索（标题）（数据统计）") - @PostMapping(value = "/getNormalSearchTitleCount") - public Result getNormalSearchTitleCount(@RequestBody LawsHomeNormalSearchData lawsHomeNormalSearchData, - HttpServletRequest req) { - // todo 待开发 - return Result.OK(lawsHomeNormalSearchDataService.getNormalSearchTitleCount(lawsHomeNormalSearchData,req)); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java index ebb52b4e..0339aecd 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java @@ -28,10 +28,30 @@ public class LawsHomeSearchController { @Resource private ILawsHomeSearchService lawsHomeSearchService; + + + @AutoLog(value = "首页-一般检索（标题）查询",operateType = 1) + @ApiOperation(value="首页-一般检索（标题）查询", notes="首页-一般检索（标题）查询") + @GetMapping(value = "/getNormalSearchTitlePage") + public Result> getNormalSearchTitlePage(LawsHomeNormalSearchDTO lawsHomeNormalSearchDTO, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + // todo 待开发 + return Result.OK(lawsHomeSearchService.getNormalSearchTitlePage(lawsHomeNormalSearchDTO,pageNo,pageSize)); + } + + @AutoLog(value = "首页-一般检索（标题）（数据统计）",operateType = 1) + @ApiOperation(value="首页-一般检索（标题）（数据统计）", notes="首页-一般检索（标题）（数据统计）") + @GetMapping(value = "/getNormalSearchTitleCount") + public Result getNormalSearchTitleCount(LawsHomeNormalSearchDTO lawsHomeNormalSearchDTO) { + // todo 待开发 + return Result.OK(lawsHomeSearchService.getNormalSearchTitleCount(lawsHomeNormalSearchDTO)); + } + @AutoLog(value = "首页-一般检索（全文）查询",operateType = 1) @ApiOperation(value="首页-一般检索（全文）查询", notes="首页-一般检索（全文）查询") - @PostMapping(value = "/getNormalSearchAllPage") - public Result> getNormalSearchAllPage(@RequestBody LawsHomeNormalSearchDTO homeNormalSearchDTO, + @GetMapping(value = "/getNormalSearchAllPage") + public Result> getNormalSearchAllPage(LawsHomeNormalSearchDTO homeNormalSearchDTO, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { // todo 待开发 @@ -40,16 +60,16 @@ public class LawsHomeSearchController { @AutoLog(value = "首页-一般检索（全文）（数据统计）",operateType = 1) @ApiOperation(value="首页-一般检索（全文）（数据统计）", notes="首页-一般检索（全文）（数据统计）") - @PostMapping(value = "/getNormalSearchAllCount") - public Result getNormalSearchAllCount(@RequestBody LawsHomeNormalSearchDTO homeNormalSearchDTO) { + @GetMapping(value = "/getNormalSearchAllCount") + public Result getNormalSearchAllCount(LawsHomeNormalSearchDTO homeNormalSearchDTO) { // todo 待开发 return Result.OK(lawsHomeSearchService.getNormalSearchAllCount(homeNormalSearchDTO)); } @AutoLog(value = "首页-高级检索查询",operateType = 1) @ApiOperation(value="首页-高级检索查询", notes="首页-高级检索查询") - @PostMapping(value = "/getAdvancedSearchPage") - public Result> getAdvancedSearchPage(@RequestBody LawsHomeNormalSearchDTO homeNormalSearchDTO, + @GetMapping(value = "/getAdvancedSearchPage") + public Result> getAdvancedSearchPage(LawsHomeNormalSearchDTO homeNormalSearchDTO, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { // todo 待开发 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchData.java b/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchData.java deleted file mode 100644 index 288378bf..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchData.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.jero.modules.laws.home.entity; - -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - * 首页一般检索（标题）数据，需要同步1:国内标准法规 2:海外标准法规 3:企业标准 4:动态消息数据 - * @author lqt - * @version 1.0 - * @date 2023/11/9 10:28 - */ -@Data -@TableName("laws_home_normal_search_data") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="laws_home_normal_search_data对象", description="首页一般检索（标题）数据") -public class LawsHomeNormalSearchData implements Serializable { - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - /**资源id*/ - @ApiModelProperty(value = "资源id") - private String resourceId; - /**资源类型*/ - @ApiModelProperty(value = "资源类型") - private String resourceType; - /**标题*/ - @ApiModelProperty(value = "标题") - private String title; - /**正文*/ - @ApiModelProperty(value = "正文") - private String content; - /** - * 发布日期 - */ - @ApiModelProperty(value = "发布日期") - private String releaseDate; - /** - * 标准类别 （数据字典 海外标准法规：standard_type_overseas 国内标准法规：standard_type） (全部传空) - */ - @ApiModelProperty(value = "标准类别 （数据字典 海外标准法规：standard_type_overseas 国内标准法规：standard_type） (全部传空)") - private String standardClass; - /** - * 动力类型 （数据字典 海外标准法规：POWER_TYPE_DOMESTIC_OVERSEAS 国内标准法规：POWER_TYPE_DOMESTIC） (全部传空) - */ - @ApiModelProperty(value = "动力类型 （数据字典 海外标准法规：POWER_TYPE_DOMESTIC_OVERSEAS 国内标准法规：POWER_TYPE_DOMESTIC） (全部传空)") - private String dynamicType; - /** - * 适用车辆类型 （数据字典 海外标准法规：APPLICATIONS_OVERSEAS 国内标准法规：APPLICATIONS_DOMESTIC） (全部传空) - */ - @ApiModelProperty(value = "适用车辆类型 （数据字典 海外标准法规：APPLICATIONS_OVERSEAS 国内标准法规：APPLICATIONS_DOMESTIC） (全部传空)") - private String applicableVehicle; - /** - * 标准类型 （只有国内标准法规 数据字典 standard_property） (全部传空) - */ - @ApiModelProperty(value = "标准类型 （只有国内标准法规 数据字典 standard_property (全部传空)") - private String standardProperty; - /** - * 状态 （国内标准法规/海外标准法规 数据字典 standard_state） (全部传空) - */ - @ApiModelProperty(value = "状态 （国内标准法规/海外标准法规 数据字典 standard_state (全部传空)") - private String standardState; - /** - * 企业标准代号 （只有企业标准 数据字典 enterprise_standard_code） (全部传空) - */ - @ApiModelProperty(value = "企业标准代号 （只有企业标准 数据字典 enterprise_standard_code (全部传空)") - private String standardCode; - /** - * 标准状态 （只有企业标准 数据字典 enterprise_standard_state） (全部传空) - */ - @ApiModelProperty(value = "标准状态 （只有企业标准 数据字典 enterprise_standard_state (全部传空)") - private String enterpriseStandardState; - /** - * 标准等级分类 （只有企业标准 数据字典 standard_grade_classify） (全部传空) - */ - @ApiModelProperty(value = "标准等级分类 （只有企业标准 数据字典 standard_grade_classify (全部传空)") - private String gradeClassification; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy年MM月dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") - private Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") - private Date updateTime; - /**删除状态(0-正常,1-删除)*/ - @ApiModelProperty(value = "删除状态(0-正常,1-删除)") - @TableLogic - private String delFlag; - - /** - * 检索内容 - */ - @TableField(exist = false) - @ApiModelProperty(value = "检索内容") - private String searchContent; -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeNormalSearchDataMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeNormalSearchDataMapper.java deleted file mode 100644 index 0d69957f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeNormalSearchDataMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jero.modules.laws.home.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.modules.laws.home.entity.LawsHomeNormalSearchData; -import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; -import com.jero.modules.laws.home.vo.LawsHomeNormalSearchVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author lqt - * @version 1.0 - * @date 2023/11/9 10:45 - */ -public interface LawsHomeNormalSearchDataMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeSearchMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeSearchMapper.java index 316d4821..f5087d34 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeSearchMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeSearchMapper.java @@ -1,7 +1,14 @@ package com.jero.modules.laws.home.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.laws.home.dto.LawsHomeNormalSearchDTO; import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; +import com.jero.modules.laws.home.vo.LawsHomeNormalSearchVO; +import org.apache.ibatis.annotations.Param; /** * @author lqt @@ -10,4 +17,14 @@ import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; */ public interface LawsHomeSearchMapper extends BaseMapper { + /** + * 首页-一般检索（标题）查询 + * @author LQT + * @date 2023/11/13 11:55 + * @param page + * @param queryWrapper + * @return com.baomidou.mybatisplus.core.metadata.IPage + */ + IPage getPage(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml index 1f03e3da..d808f7bd 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml @@ -2,4 +2,21 @@ + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeNormalSearchDataService.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeNormalSearchDataService.java deleted file mode 100644 index 3ae6f40b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeNormalSearchDataService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.jero.modules.laws.home.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.laws.home.dto.LawsHomeNormalSearchDTO; -import com.jero.modules.laws.home.entity.LawsHomeNormalSearchData; -import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; -import com.jero.modules.laws.home.vo.LawsHomeNormalSearchStatisticsVO; -import com.jero.modules.laws.home.vo.LawsHomeNormalSearchVO; - -import javax.servlet.http.HttpServletRequest; - -/** - * @author lqt - * @version 1.0 - * @date 2023/11/9 10:39 - */ -public interface ILawsHomeNormalSearchDataService extends IService { - - IPage getNormalSearchTitlePage(LawsHomeNormalSearchData lawsHomeNormalSearchData, - Integer pageNo, Integer pageSize,HttpServletRequest req); - - LawsHomeNormalSearchStatisticsVO getNormalSearchTitleCount(LawsHomeNormalSearchData lawsHomeNormalSearchData, - HttpServletRequest req); - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeSearchService.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeSearchService.java index 797902f2..bd6425e3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeSearchService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeSearchService.java @@ -12,6 +12,26 @@ import com.jero.modules.laws.home.vo.LawsHomeNormalSearchVO; */ public interface ILawsHomeSearchService { + /** + * 首页-一般检索（标题）查询 + * @author LQT + * @date 2023/11/13 11:55 + * @param lawsHomeNormalSearchDTO + * @param pageNo + * @param pageSize + * @return com.baomidou.mybatisplus.core.metadata.IPage + */ + IPage getNormalSearchTitlePage(LawsHomeNormalSearchDTO lawsHomeNormalSearchDTO, + Integer pageNo, Integer pageSize); + /** + * 首页-一般检索（标题）（数据统计） + * @author LQT + * @date 2023/11/13 11:56 + * @param lawsHomeNormalSearchDTO + * @return com.jero.modules.laws.home.vo.LawsHomeNormalSearchStatisticsVO + */ + LawsHomeNormalSearchStatisticsVO getNormalSearchTitleCount(LawsHomeNormalSearchDTO lawsHomeNormalSearchDTO); + IPage getNormalSearchAllPage(LawsHomeNormalSearchDTO homeNormalSearchDTO,Integer pageNo,Integer pageSize); LawsHomeNormalSearchStatisticsVO getNormalSearchAllCount(LawsHomeNormalSearchDTO homeNormalSearchDTO); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeNormalSearchDataServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeNormalSearchDataServiceImpl.java deleted file mode 100644 index ab934474..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeNormalSearchDataServiceImpl.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.jero.modules.laws.home.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.query.QueryGenerator; -import com.jero.common.system.vo.LoginUser; -import com.jero.modules.laws.home.dto.LawsHomeNormalSearchDTO; -import com.jero.modules.laws.home.entity.LawsHomeNormalSearchData; -import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; -import com.jero.modules.laws.home.mapper.LawsHomeNormalSearchDataMapper; -import com.jero.modules.laws.home.service.ILawsHomeNormalSearchDataService; -import com.jero.modules.laws.home.service.ILawsHomeNormalSearchHistoryService; -import com.jero.modules.laws.home.vo.LawsHomeNormalSearchStatisticsVO; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.SecurityUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -/** - * @author lqt - * @version 1.0 - * @date 2023/11/9 10:40 - */ -@Service -public class LawsHomeNormalSearchDataServiceImpl extends ServiceImpl implements ILawsHomeNormalSearchDataService { - - - @Resource - private ILawsHomeNormalSearchHistoryService lawsHomeNormalSearchHistoryService; - - - @Override - @Transactional(rollbackFor = JeroBootException.class) - public IPage getNormalSearchTitlePage(LawsHomeNormalSearchData lawsHomeNormalSearchData, - Integer pageNo,Integer pageSize, - HttpServletRequest req) { - if(StringUtils.isBlank(lawsHomeNormalSearchData.getSearchContent())){ - throw new JeroBootException("请输入检索内容"); - } - // 添加检索历史 - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - LawsHomeNormalSearchHistory lawsHomeNormalSearchHistory = new LawsHomeNormalSearchHistory(); - lawsHomeNormalSearchHistory.setUserId(loginUser.getId()); - lawsHomeNormalSearchHistory.setSearchContent(lawsHomeNormalSearchData.getSearchContent()); - lawsHomeNormalSearchHistoryService.save(lawsHomeNormalSearchHistory); - - // todo 分词 - - - List listWord = new ArrayList<>(); - listWord.add(lawsHomeNormalSearchData.getSearchContent()); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsHomeNormalSearchData, req.getParameterMap()); - if(!CollectionUtils.isEmpty(listWord)){ - queryWrapper.and(p->{ - for (int i = 0; i < listWord.size(); i++) { - queryWrapper.gt("instr(title," + listWord.get(i) + ")",0); - if(i != listWord.size() - 1){ - queryWrapper.or(); - } - } - }); - } - Page page = new Page<>(pageNo, pageSize); - IPage pageList = page(page,queryWrapper); - if(!CollectionUtils.isEmpty(pageList.getRecords())){ - List list = pageList.getRecords(); - for (LawsHomeNormalSearchData homeNormalSearchData : list) { - // todo 名词回显高亮 - } - } - return pageList; - } - @Override - public LawsHomeNormalSearchStatisticsVO getNormalSearchTitleCount(LawsHomeNormalSearchData lawsHomeNormalSearchData,HttpServletRequest req) { - if(StringUtils.isBlank(lawsHomeNormalSearchData.getSearchContent())){ - throw new JeroBootException("请输入检索内容"); - } - List listWord = new ArrayList<>(); - listWord.add(lawsHomeNormalSearchData.getSearchContent()); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsHomeNormalSearchData, req.getParameterMap()); - if(!CollectionUtils.isEmpty(listWord)){ - queryWrapper.and(p->{ - for (int i = 0; i < listWord.size(); i++) { - queryWrapper.gt("instr(title," + listWord.get(i) + ")",0); - if(i != listWord.size() - 1){ - queryWrapper.or(); - } - } - }); - } - LawsHomeNormalSearchStatisticsVO lawsHomeNormalSearchStatisticsVO = new LawsHomeNormalSearchStatisticsVO(); - LawsHomeNormalSearchData lawsHomeNormalSearchDataObj = getOne(queryWrapper,false); - if(!Objects.isNull(lawsHomeNormalSearchDataObj)){ - - } - return null; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java index 7d64c02a..9bbe2af6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java @@ -1,11 +1,38 @@ package com.jero.modules.laws.home.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.laws.home.common.LawsHomeSearchCommon; import com.jero.modules.laws.home.dto.LawsHomeNormalSearchDTO; +import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; +import com.jero.modules.laws.home.mapper.LawsHomeSearchMapper; +import com.jero.modules.laws.home.service.ILawsHomeNormalSearchHistoryService; import com.jero.modules.laws.home.service.ILawsHomeSearchService; import com.jero.modules.laws.home.vo.LawsHomeNormalSearchStatisticsVO; import com.jero.modules.laws.home.vo.LawsHomeNormalSearchVO; +import com.jero.modules.laws.standard.entity.LawsDomesticStandard; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.jero.modules.laws.standard.entity.LawsNewsFeed; +import com.jero.modules.laws.standard.entity.LawsOverseasStandard; +import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; +import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; +import com.jero.modules.laws.standard.service.ILawsNewsFeedService; +import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.Optional; /** * @author lqt @@ -15,6 +42,158 @@ import org.springframework.stereotype.Service; @Service public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { + @Resource + private ILawsHomeNormalSearchHistoryService lawsHomeNormalSearchHistoryService; + @Resource + private LawsHomeSearchMapper lawsHomeSearchMapper; + @Resource + private ILawsDomesticStandardService lawsDomesticStandardService; + @Resource + private ILawsOverseasStandardService lawsOverseasStandardService; + @Resource + private ILawsEnterpriseStandardService lawsEnterpriseStandardService; + @Resource + private ILawsNewsFeedService lawsNewsFeedService; + + @Override + @Transactional(rollbackFor = JeroBootException.class) + public IPage getNormalSearchTitlePage(LawsHomeNormalSearchDTO lawsHomeNormalSearchDTO, + Integer pageNo,Integer pageSize) { + String searchContent = lawsHomeNormalSearchDTO.getSearchContent(); + if(StringUtils.isBlank(searchContent)){ + throw new JeroBootException("请输入检索内容"); + } + // 添加检索历史 + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LawsHomeNormalSearchHistory lawsHomeNormalSearchHistory = new LawsHomeNormalSearchHistory(); + lawsHomeNormalSearchHistory.setUserId(loginUser.getId()); + lawsHomeNormalSearchHistory.setSearchContent(searchContent); + lawsHomeNormalSearchHistoryService.save(lawsHomeNormalSearchHistory); + + QueryWrapper queryWrapper = getQueryWrapperNormal(searchContent); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = lawsHomeSearchMapper.getPage(page,queryWrapper); + addContent(searchContent, pageList); + return pageList; + } + + @NotNull + private QueryWrapper getQueryWrapperNormal(String searchContent) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.and(p -> p.gt("instr(standard_number,'" + searchContent + "')", 0).or() + .gt("instr(standard_name,'" + searchContent + "')", 0)); + queryWrapper.orderByAsc("resource_type"); + queryWrapper.orderByDesc("standard_type"); + queryWrapper.orderByAsc("CHAR_LENGTH(standard_number)"); + queryWrapper.orderByAsc("CHAR_LENGTH(standard_name)"); + return queryWrapper; + } + + private void addContent(String searchContent, IPage pageList) { + if(CollectionUtils.isEmpty(pageList.getRecords())) { + return; + } + String searchContentSpan = "" + searchContent + ""; + List list = pageList.getRecords(); + List lawsDomesticStandardIds = new ArrayList<>(); + List lawsOverseasStandardIds = new ArrayList<>(); + List lawsEnterpriseStandardIds = new ArrayList<>(); + List lawsNewsFeedIds = new ArrayList<>(); + for (LawsHomeNormalSearchVO obj : list) { + switch (obj.getResourceType()){ + case LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD: lawsDomesticStandardIds.add(obj.getId());break; + case LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD: lawsOverseasStandardIds.add(obj.getId());break; + case LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD: lawsEnterpriseStandardIds.add(obj.getId());break; + default:lawsNewsFeedIds.add(obj.getId());break; + } + } + List listLawsDomesticStandard = new ArrayList<>(); + if(!CollectionUtils.isEmpty(lawsDomesticStandardIds)){ + listLawsDomesticStandard = lawsDomesticStandardService.listByIds(lawsDomesticStandardIds); + } + List listLawsOverseasStandard = new ArrayList<>(); + if(!CollectionUtils.isEmpty(lawsOverseasStandardIds)){ + listLawsOverseasStandard = lawsOverseasStandardService.listByIds(lawsOverseasStandardIds); + } + List listLawsEnterpriseStandard = new ArrayList<>(); + if(!CollectionUtils.isEmpty(lawsEnterpriseStandardIds)){ + listLawsEnterpriseStandard = lawsEnterpriseStandardService.listByIds(lawsEnterpriseStandardIds); + } + List listLawsNewsFeed = new ArrayList<>(); + if(!CollectionUtils.isEmpty(lawsNewsFeedIds)){ + listLawsNewsFeed = lawsNewsFeedService.listByIds(lawsNewsFeedIds); + } + List finalListLawsDomesticStandard = listLawsDomesticStandard; + List finalListLawsOverseasStandard = listLawsOverseasStandard; + List finalListLawsEnterpriseStandard = listLawsEnterpriseStandard; + List finalListLawsNewsFeed = listLawsNewsFeed; + list.parallelStream().forEach(p->{ + // todo 名词回显高亮 + switch (p.getResourceType()){ + case LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD: + if(!CollectionUtils.isEmpty(finalListLawsDomesticStandard)){ + Optional op = finalListLawsDomesticStandard.stream().filter(o-> Objects.equals(o.getId(),p.getId())).findFirst(); + if(op.isPresent()){ + LawsDomesticStandard obj = op.get(); + p.setTitle(obj.getStandardNumber().replace(searchContent,searchContentSpan) + " " + obj.getStandardName().replace(searchContent,searchContentSpan)); + // todo 生成正文 + + } + } + break; + case LawsHomeSearchCommon.LAWS_OVERSEAS_STANDARD: + if(!CollectionUtils.isEmpty(finalListLawsOverseasStandard)){ + Optional op = finalListLawsOverseasStandard.stream().filter(o->Objects.equals(o.getId(),p.getId())).findFirst(); + if(op.isPresent()){ + LawsOverseasStandard obj = op.get(); + p.setTitle(obj.getStandardNumber().replace(searchContent,searchContentSpan) + " " + obj.getStandardName().replace(searchContent,searchContentSpan)); + // todo 生成正文 + } + } + break; + case LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD: + if(!CollectionUtils.isEmpty(finalListLawsEnterpriseStandard)){ + Optional op = finalListLawsEnterpriseStandard.stream().filter(o->Objects.equals(o.getId(),p.getId())).findFirst(); + if(op.isPresent()){ + LawsEnterpriseStandard obj = op.get(); + p.setTitle(obj.getStandardNumber().replace(searchContent,searchContentSpan) + " " + obj.getStandardName().replace(searchContent,searchContentSpan)); + // todo 生成正文 + } + } + break; + default: + if(!CollectionUtils.isEmpty(finalListLawsNewsFeed)){ + Optional op = finalListLawsNewsFeed.stream().filter(o->Objects.equals(o.getId(),p.getId())).findFirst(); + if(op.isPresent()){ + LawsNewsFeed obj = op.get(); + p.setTitle(obj.getDynamicHeading().replace(searchContent,searchContentSpan)); + // todo 生成正文 + } + } + break; + } + }); + } + + @Override + public LawsHomeNormalSearchStatisticsVO getNormalSearchTitleCount(LawsHomeNormalSearchDTO lawsHomeNormalSearchDTO) { + String searchContent = lawsHomeNormalSearchDTO.getSearchContent(); + if(StringUtils.isBlank(searchContent)){ + throw new JeroBootException("请输入检索内容"); + } + + QueryWrapper queryWrapper = getQueryWrapperNormal(searchContent); + + +// LawsHomeNormalSearchStatisticsVO lawsHomeNormalSearchStatisticsVO = new LawsHomeNormalSearchStatisticsVO(); +// +// LawsHomeNormalSearchData lawsHomeNormalSearchDataObj = getOne(queryWrapper,false); +// if(!Objects.isNull(lawsHomeNormalSearchDataObj)){ +// +// } + return null; + } + @Override public IPage getNormalSearchAllPage(LawsHomeNormalSearchDTO homeNormalSearchDTO,Integer pageNo,Integer pageSize) { return null;